From 4bccbedc916f3932d31a471ce5c7776fb06630dc Mon Sep 17 00:00:00 2001 From: Unknown Date: Sat, 24 Aug 2019 18:26:50 -0400 Subject: [PATCH 01/13] Minor Fixes - Brings pizza back at 50 points which it was supposed to be. --- code/datums/supplypacks/hospitality_vr.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/datums/supplypacks/hospitality_vr.dm b/code/datums/supplypacks/hospitality_vr.dm index 822773b6f9a..decb7027db1 100644 --- a/code/datums/supplypacks/hospitality_vr.dm +++ b/code/datums/supplypacks/hospitality_vr.dm @@ -1,3 +1,6 @@ +/datum/supply_pack/randomised/hospitality/pizza + cost = 50 + /datum/supply_pack/randomised/hospitality/burgers_vr num_contained = 5 contains = list( From 5aad52346a3caf443d54892941d1de84a0c7e351 Mon Sep 17 00:00:00 2001 From: Unknown Date: Sun, 25 Aug 2019 12:38:34 -0400 Subject: [PATCH 02/13] More Fixes --- .../subtypes/humanoid/mercs/mercs_vr.dm | 14 ++++++- .../surface_submaps/plains/Thiefc_vr.dmm | 39 +++++++++++++------ maps/tether/tether-07-station3.dmm | 10 +---- 3 files changed, 42 insertions(+), 21 deletions(-) diff --git a/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs_vr.dm b/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs_vr.dm index e7bb82bb5d7..55a9172c07f 100644 --- a/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs_vr.dm +++ b/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs_vr.dm @@ -10,4 +10,16 @@ /mob/living/simple_mob/humanoid/merc/ranged/space name = "mercenary commando" - maxbodytemp = 700 \ No newline at end of file + maxbodytemp = 700 + +/mob/living/simple_mob/humanoid/merc/ranged/virgo + name = "suspicious individual" + min_oxy = 0 + max_oxy = 0 + min_tox = 0 + max_tox = 0 + min_co2 = 0 + max_co2 = 0 + min_n2 = 0 + max_n2 = 0 + minbodytemp = 0 \ No newline at end of file diff --git a/maps/submaps/surface_submaps/plains/Thiefc_vr.dmm b/maps/submaps/surface_submaps/plains/Thiefc_vr.dmm index 956eb21ac18..aab0b0eb080 100644 --- a/maps/submaps/surface_submaps/plains/Thiefc_vr.dmm +++ b/maps/submaps/surface_submaps/plains/Thiefc_vr.dmm @@ -64,23 +64,27 @@ "j" = ( /obj/structure/table/steel, /obj/item/weapon/beartrap, +/obj/item/device/survivalcapsule, /turf/simulated/floor/outdoors/dirt{ outdoors = 0 }, /area/submap/Thiefc) "k" = ( /obj/vehicle/train/trolley, -/obj/item/weapon/storage/firstaid/combat, +/obj/random/firstaid, +/obj/random/firstaid, +/obj/random/firstaid, +/obj/random/firstaid, +/obj/random/firstaid, /turf/simulated/floor/outdoors/dirt{ outdoors = 0 }, /area/submap/Thiefc) "l" = ( /obj/structure/closet/crate, -/obj/item/weapon/folder/blue, -/obj/item/weapon/folder/red, -/obj/item/weapon/folder/white, -/obj/item/weapon/folder/yellow, +/obj/item/device/nif, +/obj/item/device/nif/bad, +/obj/item/device/nif/bad, /turf/simulated/floor/outdoors/dirt{ outdoors = 0 }, @@ -97,6 +101,9 @@ /area/submap/Thiefc) "n" = ( /obj/vehicle/train/trolley, +/obj/random/multiple/voidsuit, +/obj/random/multiple/voidsuit, +/obj/random/multiple/voidsuit, /turf/simulated/floor/outdoors/dirt{ outdoors = 0 }, @@ -105,6 +112,9 @@ /obj/structure/closet/crate, /obj/item/weapon/cell/device/weapon, /obj/item/weapon/cell/device/weapon, +/obj/item/weapon/cell/device/weapon, +/obj/item/weapon/cell/device/weapon, +/obj/item/device/perfect_tele/one_beacon, /turf/simulated/floor/outdoors/dirt{ outdoors = 0 }, @@ -113,12 +123,19 @@ /obj/structure/closet/crate, /obj/item/weapon/storage/box/shotgunammo, /obj/item/weapon/storage/box/practiceshells, +/obj/item/weapon/grenade/spawnergrenade/manhacks/station, /turf/simulated/floor/outdoors/dirt{ outdoors = 0 }, /area/submap/Thiefc) -"I" = ( -/mob/living/simple_mob/humanoid/merc/melee/sword/space, +"u" = ( +/mob/living/simple_mob/humanoid/merc/ranged/virgo, +/turf/simulated/floor/outdoors/dirt{ + outdoors = 0 + }, +/area/submap/Thiefc) +"P" = ( +/obj/machinery/door/airlock, /turf/simulated/floor/outdoors/dirt{ outdoors = 0 }, @@ -269,7 +286,7 @@ c c c c -h +P c c b @@ -305,7 +322,7 @@ a c c c -h +u h h h @@ -371,7 +388,7 @@ a c e h -I +u h h h @@ -397,7 +414,7 @@ i h h h -h +u c c c diff --git a/maps/tether/tether-07-station3.dmm b/maps/tether/tether-07-station3.dmm index a4c0f9cd6ea..55e3162cda3 100644 --- a/maps/tether/tether-07-station3.dmm +++ b/maps/tether/tether-07-station3.dmm @@ -2681,14 +2681,6 @@ }, /turf/simulated/floor/tiled/dark, /area/security/security_lockerroom) -"er" = ( -/obj/machinery/shuttle_sensor{ - dir = 5; - id_tag = "shuttlesens_exp"; - pixel_y = -6 - }, -/turf/simulated/wall/thull, -/area/shuttle/excursion/tether) "es" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/railing{ @@ -41527,7 +41519,7 @@ cG VB WD dE -er +dj TY dj dj From 28bc1e9bc7fb99a5b4df288ae0ebee8bf6c9e9b0 Mon Sep 17 00:00:00 2001 From: Unknown Date: Sun, 25 Aug 2019 22:05:59 -0400 Subject: [PATCH 03/13] Removes shuttle cryopod --- maps/tether/tether-07-station3.dmm | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/maps/tether/tether-07-station3.dmm b/maps/tether/tether-07-station3.dmm index 55e3162cda3..b74573743a7 100644 --- a/maps/tether/tether-07-station3.dmm +++ b/maps/tether/tether-07-station3.dmm @@ -6334,12 +6334,6 @@ }, /turf/simulated/floor/bluegrid, /area/ai) -"kn" = ( -/obj/machinery/cryopod{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/shuttle/excursion/tether) "ko" = ( /turf/simulated/wall/r_wall, /area/security/security_equiptment_storage) @@ -40818,7 +40812,7 @@ Um dj iK jY -kn +iW WS dj XN From 74c6d018c8130e00997c72db8dfe32ff27c960a4 Mon Sep 17 00:00:00 2001 From: Unknown Date: Sun, 25 Aug 2019 22:34:22 -0400 Subject: [PATCH 04/13] Blood Packs stored hygenically --- maps/tether/tether-07-station3.dmm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/maps/tether/tether-07-station3.dmm b/maps/tether/tether-07-station3.dmm index b74573743a7..c3e6a6fa487 100644 --- a/maps/tether/tether-07-station3.dmm +++ b/maps/tether/tether-07-station3.dmm @@ -12478,13 +12478,15 @@ /turf/simulated/wall, /area/quartermaster/office) "tC" = ( -/obj/structure/table/standard, /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/white/border, /obj/machinery/button/windowtint{ id = "surgery_2"; pixel_y = -26 }, +/obj/item/weapon/reagent_containers/blood/OMinus, +/obj/item/weapon/reagent_containers/blood/OMinus, +/obj/structure/closet/crate/freezer, /turf/simulated/floor/tiled/white, /area/medical/surgery2) "tD" = ( @@ -21000,7 +21002,6 @@ /turf/simulated/floor/tiled/white, /area/medical/surgery) "Hn" = ( -/obj/structure/table/standard, /obj/effect/floor_decal/borderfloorwhite{ dir = 1 }, @@ -21013,6 +21014,7 @@ pixel_x = 0; pixel_y = 26 }, +/obj/structure/closet/crate/freezer, /obj/item/weapon/reagent_containers/blood/OMinus, /turf/simulated/floor/tiled/white, /area/medical/surgery) @@ -23618,7 +23620,6 @@ /turf/simulated/floor/tiled/white, /area/medical/medbay_primary_storage) "Lv" = ( -/obj/structure/table/standard, /obj/item/weapon/reagent_containers/blood/OMinus, /obj/item/weapon/reagent_containers/blood/OMinus, /obj/item/weapon/reagent_containers/blood/OMinus, @@ -23634,6 +23635,7 @@ /obj/effect/floor_decal/corner/paleblue/bordercorner2{ dir = 8 }, +/obj/structure/closet/crate/freezer, /turf/simulated/floor/tiled/white, /area/medical/surgery_hallway) "Lw" = ( @@ -24204,7 +24206,6 @@ /turf/simulated/floor/tiled/white, /area/medical/exam_room) "Mp" = ( -/obj/structure/table/standard, /obj/item/weapon/reagent_containers/blood/AMinus, /obj/item/weapon/reagent_containers/blood/APlus, /obj/item/weapon/reagent_containers/blood/BMinus, @@ -24216,6 +24217,7 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 8 }, +/obj/structure/closet/crate/freezer, /turf/simulated/floor/tiled/white, /area/medical/surgery_hallway) "Mq" = ( @@ -25101,8 +25103,6 @@ /obj/structure/table/standard, /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/white/border, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, /turf/simulated/floor/tiled/white, /area/medical/surgery2) "Nt" = ( From 6166d271065264b14d13780138270f49e6fd4d48 Mon Sep 17 00:00:00 2001 From: Unknown Date: Mon, 26 Aug 2019 13:58:20 -0400 Subject: [PATCH 05/13] Changes shuttle walls to reinforced steel --- maps/tether/tether-07-station3.dmm | 32 +++++++++++++++--------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/maps/tether/tether-07-station3.dmm b/maps/tether/tether-07-station3.dmm index c3e6a6fa487..304b25f68dd 100644 --- a/maps/tether/tether-07-station3.dmm +++ b/maps/tether/tether-07-station3.dmm @@ -1984,7 +1984,7 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "dj" = ( -/turf/simulated/wall/thull, +/turf/simulated/wall/rshull, /area/shuttle/excursion/tether) "dk" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -3112,7 +3112,7 @@ /obj/machinery/light/spot{ pixel_y = 32 }, -/turf/simulated/wall/thull, +/turf/simulated/wall/rshull, /area/shuttle/excursion/tether) "fi" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -5533,13 +5533,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/yellow{ dir = 6 }, -/turf/simulated/wall/thull, +/turf/simulated/wall/rshull, /area/shuttle/excursion/tether) "iY" = ( /obj/machinery/atmospherics/pipe/simple/hidden/yellow{ dir = 4 }, -/turf/simulated/wall/thull, +/turf/simulated/wall/rshull, /area/shuttle/excursion/tether) "iZ" = ( /obj/effect/floor_decal/borderfloorblack/full, @@ -27731,7 +27731,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/yellow{ dir = 10 }, -/turf/simulated/wall/thull, +/turf/simulated/wall/rshull, /area/shuttle/excursion/tether) "Rw" = ( /obj/structure/catwalk, @@ -28774,7 +28774,7 @@ dir = 8; icon_state = "pipe-c" }, -/turf/simulated/wall/thull, +/turf/simulated/wall/rshull, /area/shuttle/excursion/tether) "UK" = ( /obj/effect/floor_decal/industrial/hatch/yellow, @@ -28832,7 +28832,7 @@ dir = 6; icon_state = "intact" }, -/turf/simulated/wall/thull, +/turf/simulated/wall/rshull, /area/shuttle/excursion/tether) "US" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -28968,7 +28968,7 @@ dir = 2; id_tag = "shuttlesens_exp_psg" }, -/turf/simulated/wall/thull, +/turf/simulated/wall/rshull, /area/shuttle/excursion/tether) "Vm" = ( /obj/structure/bed/chair/shuttle{ @@ -29091,7 +29091,7 @@ dir = 8; icon_state = "map" }, -/turf/simulated/wall/thull, +/turf/simulated/wall/rshull, /area/shuttle/excursion/tether) "VR" = ( /obj/machinery/atmospherics/binary/pump{ @@ -29149,7 +29149,7 @@ dir = 5; id_tag = "shuttlesens_exp_int" }, -/turf/simulated/wall/thull, +/turf/simulated/wall/rshull, /area/shuttle/excursion/tether) "Wo" = ( /obj/structure/bed/chair/shuttle, @@ -29160,7 +29160,7 @@ /area/shuttle/excursion/tether) "Ws" = ( /obj/machinery/atmospherics/pipe/simple/hidden, -/turf/simulated/wall/thull, +/turf/simulated/wall/rshull, /area/shuttle/excursion/tether) "Wx" = ( /obj/structure/grille, @@ -29240,7 +29240,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/simulated/wall/thull, +/turf/simulated/wall/rshull, /area/shuttle/excursion/tether) "Xc" = ( /obj/structure/grille, @@ -29329,7 +29329,7 @@ /area/tether/exploration) "Xr" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/yellow, -/turf/simulated/wall/thull, +/turf/simulated/wall/rshull, /area/shuttle/excursion/tether) "XA" = ( /obj/structure/shuttle/engine/heater, @@ -29355,7 +29355,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/yellow{ dir = 5 }, -/turf/simulated/wall/thull, +/turf/simulated/wall/rshull, /area/shuttle/excursion/tether) "XE" = ( /obj/machinery/conveyor_switch/oneway{ @@ -29597,13 +29597,13 @@ dir = 5; id_tag = "shuttlesens_exp" }, -/turf/simulated/wall/thull, +/turf/simulated/wall/rshull, /area/shuttle/excursion/tether) "ZD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/yellow{ dir = 9 }, -/turf/simulated/wall/thull, +/turf/simulated/wall/rshull, /area/shuttle/excursion/tether) "ZE" = ( /obj/machinery/door/airlock/glass_external{ From 6b81965253d29092f9538b03e286215e63a43b4b Mon Sep 17 00:00:00 2001 From: Unknown Date: Mon, 26 Aug 2019 22:30:03 -0400 Subject: [PATCH 06/13] Map Changes - Adds Command Consoles to Heads of Staff Offices (except HoP/CD since they are next to the bridge) - Adds two keycard authentication devices in the command conference room - Adds some micrometeorite shielding for the CMO's office, because runtime must live. --- maps/tether/tether-02-surface2.dmm | 3 ++ maps/tether/tether-05-station1.dmm | 16 +++++++-- maps/tether/tether-06-station2.dmm | 11 ++++++- maps/tether/tether-07-station3.dmm | 53 ++++++++++++++++-------------- 4 files changed, 54 insertions(+), 29 deletions(-) diff --git a/maps/tether/tether-02-surface2.dmm b/maps/tether/tether-02-surface2.dmm index 41a48c7e8a5..0ed23dab208 100644 --- a/maps/tether/tether-02-surface2.dmm +++ b/maps/tether/tether-02-surface2.dmm @@ -5685,6 +5685,9 @@ /obj/effect/floor_decal/corner/mauve/bordercorner2{ dir = 10 }, +/obj/machinery/computer/communications{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/rnd/rdoffice) "md" = ( diff --git a/maps/tether/tether-05-station1.dmm b/maps/tether/tether-05-station1.dmm index 745de78959a..c079db281e3 100644 --- a/maps/tether/tether-05-station1.dmm +++ b/maps/tether/tether-05-station1.dmm @@ -22328,6 +22328,16 @@ }, /turf/simulated/floor/tiled, /area/bridge_hallway) +"gkC" = ( +/obj/machinery/status_display, +/turf/simulated/wall/r_wall, +/area/bridge) +"hhC" = ( +/obj/machinery/computer/communications{ + dir = 1 + }, +/turf/simulated/floor/carpet/oracarpet, +/area/crew_quarters/heads/chief) "hPi" = ( /obj/machinery/light/small, /turf/simulated/floor, @@ -27410,7 +27420,7 @@ agc aYF aRX aSe -aRX +hhC aVz aRb bYg @@ -31538,7 +31548,7 @@ awy awy awy awy -awy +gkC awy awy awy @@ -32958,7 +32968,7 @@ awA awE awE awy -awy +gkC boL awy bqR diff --git a/maps/tether/tether-06-station2.dmm b/maps/tether/tether-06-station2.dmm index 6b845eafc12..251de4e3f16 100644 --- a/maps/tether/tether-06-station2.dmm +++ b/maps/tether/tether-06-station2.dmm @@ -15085,6 +15085,9 @@ "wR" = ( /obj/structure/table/woodentable, /obj/machinery/chemical_dispenser/bar_soft/full, +/obj/machinery/keycard_auth{ + pixel_y = 28 + }, /turf/simulated/floor/wood, /area/bridge/meeting_room) "wS" = ( @@ -20152,6 +20155,12 @@ }, /turf/simulated/floor, /area/maintenance/station/sec_lower) +"HU" = ( +/obj/machinery/keycard_auth{ + pixel_y = -28 + }, +/turf/simulated/floor/wood, +/area/bridge/meeting_room) "Ik" = ( /obj/machinery/light/small{ dir = 8 @@ -35883,7 +35892,7 @@ wV ys wV wV -wV +HU wo ac ac diff --git a/maps/tether/tether-07-station3.dmm b/maps/tether/tether-07-station3.dmm index 304b25f68dd..e8e48e2d469 100644 --- a/maps/tether/tether-07-station3.dmm +++ b/maps/tether/tether-07-station3.dmm @@ -9253,6 +9253,13 @@ d2 = 8; icon_state = "4-8" }, +/obj/item/device/taperecorder{ + pixel_y = 0 + }, +/obj/item/weapon/reagent_containers/food/drinks/flask/barflask{ + pixel_x = -4; + pixel_y = 8 + }, /turf/simulated/floor/wood, /area/crew_quarters/heads/hos) "oX" = ( @@ -14091,6 +14098,7 @@ pixel_x = -20; pixel_y = -25 }, +/obj/structure/flora/pottedplant/stoutbush, /turf/simulated/floor/tiled/white, /area/crew_quarters/heads/cmo) "wg" = ( @@ -24323,7 +24331,6 @@ /turf/simulated/open, /area/medical/surgery_hallway) "My" = ( -/obj/structure/flora/pottedplant/stoutbush, /obj/effect/floor_decal/borderfloorwhite{ dir = 9 }, @@ -24339,6 +24346,7 @@ /obj/machinery/camera/network/medbay{ dir = 4 }, +/obj/machinery/computer/communications, /turf/simulated/floor/tiled/white, /area/crew_quarters/heads/cmo) "Mz" = ( @@ -28415,13 +28423,8 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "SP" = ( -/obj/structure/table/woodentable, -/obj/item/device/taperecorder{ - pixel_y = 0 - }, -/obj/item/weapon/reagent_containers/food/drinks/flask/barflask{ - pixel_x = -4; - pixel_y = 8 +/obj/machinery/computer/communications{ + dir = 1 }, /turf/simulated/floor/wood, /area/crew_quarters/heads/hos) @@ -35038,12 +35041,12 @@ ab ab aa aa -aa -aa -aa -aa -aa -aa +ad +ad +ae +ad +ad +ae aa aa aa @@ -35182,10 +35185,10 @@ ab ab aa aa +ae aa aa -aa -aa +ad aa aa aa @@ -35324,10 +35327,10 @@ ab ab aa aa +ae aa aa -aa -aa +ad aa aa aa @@ -35467,9 +35470,9 @@ Me uK uK Me -aa -aa -aa +ae +ae +ad aa aa aa @@ -35611,7 +35614,7 @@ wf xh aa aa -aa +ae aa aa aa @@ -35753,7 +35756,7 @@ NP xh aa aa -aa +ad aa aa aa @@ -35895,7 +35898,7 @@ NP xh aa aa -aa +ad aa aa aa @@ -36037,7 +36040,7 @@ NQ Me ab aa -aa +ad aa aa aa From fdb3ed2695da2c00cd1e79703e4e7132bff4d58d Mon Sep 17 00:00:00 2001 From: Unknown Date: Mon, 26 Aug 2019 22:44:41 -0400 Subject: [PATCH 07/13] Modular computers instead --- maps/tether/tether-02-surface2.dmm | 2 +- maps/tether/tether-05-station1.dmm | 10 ++-------- maps/tether/tether-07-station3.dmm | 4 ++-- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/maps/tether/tether-02-surface2.dmm b/maps/tether/tether-02-surface2.dmm index 0ed23dab208..394dbcdc46e 100644 --- a/maps/tether/tether-02-surface2.dmm +++ b/maps/tether/tether-02-surface2.dmm @@ -5685,7 +5685,7 @@ /obj/effect/floor_decal/corner/mauve/bordercorner2{ dir = 10 }, -/obj/machinery/computer/communications{ +/obj/item/modular_computer/console/preset/command{ dir = 4 }, /turf/simulated/floor/tiled, diff --git a/maps/tether/tether-05-station1.dmm b/maps/tether/tether-05-station1.dmm index c079db281e3..4eda0973a83 100644 --- a/maps/tether/tether-05-station1.dmm +++ b/maps/tether/tether-05-station1.dmm @@ -17153,7 +17153,7 @@ /turf/simulated/floor/carpet, /area/engineering/foyer) "bft" = ( -/obj/machinery/computer/atmos_alert{ +/obj/item/modular_computer/console/preset/command{ dir = 4 }, /turf/simulated/floor/tiled, @@ -22332,12 +22332,6 @@ /obj/machinery/status_display, /turf/simulated/wall/r_wall, /area/bridge) -"hhC" = ( -/obj/machinery/computer/communications{ - dir = 1 - }, -/turf/simulated/floor/carpet/oracarpet, -/area/crew_quarters/heads/chief) "hPi" = ( /obj/machinery/light/small, /turf/simulated/floor, @@ -27420,7 +27414,7 @@ agc aYF aRX aSe -hhC +aRX aVz aRb bYg diff --git a/maps/tether/tether-07-station3.dmm b/maps/tether/tether-07-station3.dmm index e8e48e2d469..a6f155c1e30 100644 --- a/maps/tether/tether-07-station3.dmm +++ b/maps/tether/tether-07-station3.dmm @@ -24346,7 +24346,7 @@ /obj/machinery/camera/network/medbay{ dir = 4 }, -/obj/machinery/computer/communications, +/obj/item/modular_computer/console/preset/command, /turf/simulated/floor/tiled/white, /area/crew_quarters/heads/cmo) "Mz" = ( @@ -28423,7 +28423,7 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "SP" = ( -/obj/machinery/computer/communications{ +/obj/item/modular_computer/console/preset/command{ dir = 1 }, /turf/simulated/floor/wood, From 20d87447a998155c559d26a1e40ce72c937d858c Mon Sep 17 00:00:00 2001 From: Unknown Date: Wed, 28 Aug 2019 01:24:48 -0400 Subject: [PATCH 08/13] Removes HoS Voidsuit Stats --- code/modules/vore/fluffstuff/custom_clothes_vr.dm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/code/modules/vore/fluffstuff/custom_clothes_vr.dm b/code/modules/vore/fluffstuff/custom_clothes_vr.dm index 4396932eab7..fa24a83424f 100644 --- a/code/modules/vore/fluffstuff/custom_clothes_vr.dm +++ b/code/modules/vore/fluffstuff/custom_clothes_vr.dm @@ -693,9 +693,6 @@ icon_override = 'icons/vore/custom_clothes_vr.dmi' item_state = "rig-hos_mob" - //Slightly improved security voidsuit, which when made, was: - //armor = list(melee = 50, bullet = 25, laser = 25, energy = 5, bomb = 45, bio = 100, rad = 10) - armor = list("melee" = 60, "bullet" = 35, "laser" = 35, "energy" = 15, "bomb" = 50, "bio" = 100, "rad" = 10) species_restricted = null //HOS Hardsuit Helmet @@ -709,7 +706,6 @@ icon_override = 'icons/vore/custom_clothes_vr.dmi' item_state = "rig0-hos_mob" - armor = list("melee" = 60, "bullet" = 35, "laser" = 35, "energy" = 15, "bomb" = 50, "bio" = 100, "rad" = 10) species_restricted = null //adk09:Lethe From 14eb5250301e8f4f444dcc691964ceeed45c0eff Mon Sep 17 00:00:00 2001 From: Unknown Date: Wed, 28 Aug 2019 04:06:19 -0400 Subject: [PATCH 09/13] Adjusts Vorestation pills and pillbottles --- .../items/weapons/storage/firstaid_vr.dm | 10 +++++++ .../reagents/reagent_containers/pill_vr.dm | 30 ++++++++++++------- 2 files changed, 30 insertions(+), 10 deletions(-) diff --git a/code/game/objects/items/weapons/storage/firstaid_vr.dm b/code/game/objects/items/weapons/storage/firstaid_vr.dm index 6f9bf71fb46..55cce5358c1 100644 --- a/code/game/objects/items/weapons/storage/firstaid_vr.dm +++ b/code/game/objects/items/weapons/storage/firstaid_vr.dm @@ -12,51 +12,61 @@ name = "bottle of Rezadone pills" desc = "A powder with almost magical properties, this substance can effectively treat genetic damage in humanoids, though excessive consumption has side effects." starts_with = list(/obj/item/weapon/reagent_containers/pill/rezadone = 7) + wrapper_color = COLOR_GREEN_GRAY /obj/item/weapon/storage/pill_bottle/peridaxon name = "bottle of Peridaxon pills" desc = "Used to encourage recovery of internal organs and nervous systems. Medicate cautiously." starts_with = list(/obj/item/weapon/reagent_containers/pill/peridaxon = 7) + wrapper_color = COLOR_PURPLE /obj/item/weapon/storage/pill_bottle/carthatoline name = "bottle of Carthatoline pills" desc = "Carthatoline is strong evacuant used to treat severe poisoning." starts_with = list(/obj/item/weapon/reagent_containers/pill/carthatoline = 7) + wrapper_color = COLOR_GREEN_GRAY /obj/item/weapon/storage/pill_bottle/alkysine name = "bottle of Alkysine pills" desc = "Alkysine is a drug used to lessen the damage to neurological tissue after a catastrophic injury. Can heal brain tissue." starts_with = list(/obj/item/weapon/reagent_containers/pill/alkysine = 7) + wrapper_color = COLOR_YELLOW /obj/item/weapon/storage/pill_bottle/imidazoline name = "bottle of Imidazoline pills" desc = "Heals eye damage." starts_with = list(/obj/item/weapon/reagent_containers/pill/imidazoline = 7) + wrapper_color = COLOR_PURPLE_GRAY /obj/item/weapon/storage/pill_bottle/osteodaxon name = "bottle of Osteodaxon pills" desc = "An experimental drug used to heal bone fractures." starts_with = list(/obj/item/weapon/reagent_containers/pill/osteodaxon = 7) + wrapper_color = COLOR_WHITE /obj/item/weapon/storage/pill_bottle/myelamine name = "bottle of Myelamine pills" desc = "Used to rapidly clot internal hemorrhages by increasing the effectiveness of platelets." starts_with = list(/obj/item/weapon/reagent_containers/pill/myelamine = 7) + wrapper_color = COLOR_PALE_PURPLE_GRAY /obj/item/weapon/storage/pill_bottle/hyronalin name = "bottle of Hyronalin pills" desc = "Hyronalin is a medicinal drug used to counter the effect of radiation poisoning." starts_with = list(/obj/item/weapon/reagent_containers/pill/hyronalin = 7) + wrapper_color = COLOR_TEAL /obj/item/weapon/storage/pill_bottle/arithrazine name = "bottle of Arithrazine pills" desc = "Arithrazine is an unstable medication used for the most extreme cases of radiation poisoning." starts_with = list(/obj/item/weapon/reagent_containers/pill/arithrazine = 7) + wrapper_color = COLOR_TEAL /obj/item/weapon/storage/pill_bottle/corophizine name = "bottle of Corophizine pills" desc = "A wide-spectrum antibiotic drug. Powerful and uncomfortable in equal doses." starts_with = list(/obj/item/weapon/reagent_containers/pill/corophizine = 7) + wrapper_color = COLOR_PALE_GREEN_GRAY /obj/item/weapon/storage/pill_bottle/healing_nanites name = "bottle of Healing nanites capsules" diff --git a/code/modules/reagents/reagent_containers/pill_vr.dm b/code/modules/reagents/reagent_containers/pill_vr.dm index ad9663d0201..30d084570fc 100644 --- a/code/modules/reagents/reagent_containers/pill_vr.dm +++ b/code/modules/reagents/reagent_containers/pill_vr.dm @@ -1,7 +1,7 @@ /obj/item/weapon/reagent_containers/pill/nutriment name = "Nutriment pill" desc = "Used to feed people on the field. Contains 30 units of Nutriment." - icon_state = "pill6" + icon_state = "pill10" /obj/item/weapon/reagent_containers/pill/nutriment/Initialize() ..() @@ -10,7 +10,7 @@ /obj/item/weapon/reagent_containers/pill/protein name = "Meat pill" desc = "Used to feed carnivores on the field. Contains 30 units of Protein." - icon_state = "pill20" + icon_state = "pill24" /obj/item/weapon/reagent_containers/pill/protein/Initialize() ..() @@ -19,11 +19,12 @@ /obj/item/weapon/reagent_containers/pill/rezadone name = "Rezadone pill" desc = "A powder with almost magical properties, this substance can effectively treat genetic damage in humanoids, though excessive consumption has side effects." - icon_state = "pill13" + icon_state = "pill2" /obj/item/weapon/reagent_containers/pill/rezadone/Initialize() ..() reagents.add_reagent("rezadone", 5) + color = reagents.get_color() /obj/item/weapon/reagent_containers/pill/peridaxon name = "Peridaxon pill" @@ -37,38 +38,42 @@ /obj/item/weapon/reagent_containers/pill/carthatoline name = "Carthatoline pill" desc = "Carthatoline is strong evacuant used to treat severe poisoning." - icon_state = "pill17" + icon_state = "pill4" /obj/item/weapon/reagent_containers/pill/carthatoline/Initialize() ..() reagents.add_reagent("carthatoline", 10) + color = reagents.get_color() /obj/item/weapon/reagent_containers/pill/alkysine name = "Alkysine pill" desc = "Alkysine is a drug used to lessen the damage to neurological tissue after a catastrophic injury. Can heal brain tissue." - icon_state = "pill7" + icon_state = "pill3" /obj/item/weapon/reagent_containers/pill/alkysine/Initialize() ..() reagents.add_reagent("alkysine", 10) + color = reagents.get_color() /obj/item/weapon/reagent_containers/pill/imidazoline name = "Imidazoline pill" desc = "Heals eye damage." - icon_state = "pill9" + icon_state = "pill3" /obj/item/weapon/reagent_containers/pill/imidazoline/Initialize() ..() reagents.add_reagent("imidazoline", 15) + color = reagents.get_color() /obj/item/weapon/reagent_containers/pill/osteodaxon name = "Osteodaxon pill" desc = "An experimental drug used to heal bone fractures." - icon_state = "pill19" + icon_state = "pill2" /obj/item/weapon/reagent_containers/pill/osteodaxon/Initialize() ..() reagents.add_reagent("osteodaxon", 10) + color = reagents.get_color() /obj/item/weapon/reagent_containers/pill/myelamine name = "Myelamine pill" @@ -78,15 +83,17 @@ /obj/item/weapon/reagent_containers/pill/myelamine/Initialize() ..() reagents.add_reagent("myelamine", 10) + color = reagents.get_color() /obj/item/weapon/reagent_containers/pill/hyronalin name = "Hyronalin pill" desc = "Hyronalin is a medicinal drug used to counter the effect of radiation poisoning." - icon_state = "pill17" + icon_state = "pill4" /obj/item/weapon/reagent_containers/pill/hyronalin/Initialize() ..() reagents.add_reagent("hyronalin", 15) + color = reagents.get_color() /obj/item/weapon/reagent_containers/pill/arithrazine name = "Arithrazine pill" @@ -96,21 +103,24 @@ /obj/item/weapon/reagent_containers/pill/arithrazine/Initialize() ..() reagents.add_reagent("arithrazine", 5) + color = reagents.get_color() /obj/item/weapon/reagent_containers/pill/corophizine name = "Corophizine pill" desc = "A wide-spectrum antibiotic drug. Powerful and uncomfortable in equal doses." - icon_state = "pill9" + icon_state = "pill2" /obj/item/weapon/reagent_containers/pill/corophizine/Initialize() ..() reagents.add_reagent("corophizine", 5) + color = reagents.get_color() /obj/item/weapon/reagent_containers/pill/healing_nanites name = "Healing nanites capsule" desc = "Miniature medical robots that swiftly restore bodily damage." - icon_state = "pill5" + icon_state = "pill1" /obj/item/weapon/reagent_containers/pill/healing_nanites/Initialize() ..() reagents.add_reagent("healing_nanites", 30) + color = reagents.get_color() From 485a458cc5699db0fd68e8228858cdf5a3776b7f Mon Sep 17 00:00:00 2001 From: Unknown Date: Thu, 29 Aug 2019 01:35:35 -0400 Subject: [PATCH 10/13] Fixes ERT Frequencies on the Tether --- maps/tether/tether-10-colony.dmm | 128 ++++++++++++++++++++++--------- maps/tether/tether_telecomms.dm | 27 +++++++ 2 files changed, 118 insertions(+), 37 deletions(-) diff --git a/maps/tether/tether-10-colony.dmm b/maps/tether/tether-10-colony.dmm index 9ced842fdb0..517c9d7b215 100644 --- a/maps/tether/tether-10-colony.dmm +++ b/maps/tether/tether-10-colony.dmm @@ -16848,6 +16848,24 @@ icon_state = "dark" }, /area/centcom/specops) +"Hv" = ( +/obj/machinery/telecomms/relay/preset/centcom/tether/station_mid, +/turf/unsimulated/floor{ + icon_state = "steel" + }, +/area/centcom/command) +"HL" = ( +/obj/machinery/telecomms/relay/preset/centcom/tether/midpoint, +/turf/unsimulated/floor{ + icon_state = "steel" + }, +/area/centcom/command) +"JB" = ( +/obj/machinery/telecomms/relay/preset/centcom/tether/station_low, +/turf/unsimulated/floor{ + icon_state = "steel" + }, +/area/centcom/command) "JC" = ( /obj/machinery/power/thermoregulator, /turf/unsimulated/floor{ @@ -16860,6 +16878,18 @@ icon_state = "dark" }, /area/centcom/specops) +"JW" = ( +/obj/machinery/telecomms/relay/preset/centcom/tether/base_low, +/turf/unsimulated/floor{ + icon_state = "steel" + }, +/area/centcom/command) +"Lb" = ( +/obj/machinery/telecomms/relay/preset/centcom/tether/base_high, +/turf/unsimulated/floor{ + icon_state = "steel" + }, +/area/centcom/command) "Nt" = ( /obj/structure/reagent_dispensers/watertank, /turf/unsimulated/floor{ @@ -16893,6 +16923,18 @@ icon_state = "dark" }, /area/centcom/specops) +"Rx" = ( +/obj/machinery/telecomms/relay/preset/centcom/underdark, +/turf/unsimulated/floor{ + icon_state = "steel" + }, +/area/centcom/command) +"Sp" = ( +/obj/machinery/telecomms/relay/preset/centcom/tether/station_high, +/turf/unsimulated/floor{ + icon_state = "steel" + }, +/area/centcom/command) "UC" = ( /obj/structure/table/steel_reinforced, /obj/item/stack/cable_coil, @@ -16911,6 +16953,12 @@ icon_state = "dark" }, /area/centcom/specops) +"Xi" = ( +/obj/machinery/telecomms/relay/preset/centcom/tether/base_mid, +/turf/unsimulated/floor{ + icon_state = "steel" + }, +/area/centcom/command) "XA" = ( /obj/structure/table/steel_reinforced, /obj/item/weapon/smes_coil, @@ -16922,6 +16970,12 @@ icon_state = "dark" }, /area/centcom/specops) +"YM" = ( +/obj/machinery/telecomms/relay/preset/centcom/tether/sci_outpost, +/turf/unsimulated/floor{ + icon_state = "steel" + }, +/area/centcom/command) (1,1,1) = {" aa @@ -34372,7 +34426,7 @@ ac nK nK nK -nK +CZ nK nK ac @@ -34511,12 +34565,12 @@ Cg ho ho ac -ac -ac -ac -ac -ac -ac +nK +JW +CE +CE +JB +nK ac ac ac @@ -34653,12 +34707,12 @@ Ch Ct ho ac -ac -ac -ac -ac -ac -ac +nK +Xi +CE +CE +Hv +nK ac ac ac @@ -34795,12 +34849,12 @@ Ch BW ho ac -ac -ac -ac -ac -ac -ac +nK +Lb +CE +CE +Sp +nK ac ac ac @@ -34937,12 +34991,12 @@ Ch Ct ho ac -ac -ac -ac -ac -ac -ac +nK +CE +CE +CE +YM +nK ac ac ac @@ -35079,12 +35133,12 @@ Ch BW ho ac -ac -ac -ac -ac -ac -ac +nK +HL +CE +CE +Rx +nK ac ac ac @@ -35221,12 +35275,12 @@ Ch Ct ho ac -ac -ac -ac -ac -ac -ac +nK +nK +nK +nK +nK +nK ac ac ac diff --git a/maps/tether/tether_telecomms.dm b/maps/tether/tether_telecomms.dm index d60188b834a..e64a33d40c2 100644 --- a/maps/tether/tether_telecomms.dm +++ b/maps/tether/tether_telecomms.dm @@ -8,48 +8,75 @@ listening_level = Z_LEVEL_SURFACE_LOW autolinkers = list("tbl_relay") +/obj/machinery/telecomms/relay/preset/centcom/tether/base_low + listening_level = Z_LEVEL_SURFACE_LOW + /obj/machinery/telecomms/relay/preset/tether/base_mid id = "Base Relay 2" listening_level = Z_LEVEL_SURFACE_MID autolinkers = list("tbm_relay") +/obj/machinery/telecomms/relay/preset/centcom/tether/base_mid + listening_level = Z_LEVEL_SURFACE_MID + /obj/machinery/telecomms/relay/preset/tether/base_high id = "Base Relay 3" listening_level = Z_LEVEL_SURFACE_HIGH autolinkers = list("tbh_relay") +/obj/machinery/telecomms/relay/preset/centcom/tether/base_high + listening_level = Z_LEVEL_SURFACE_HIGH + //Some coverage for midpoint /obj/machinery/telecomms/relay/preset/tether/midpoint id = "Midpoint Relay" listening_level = Z_LEVEL_TRANSIT autolinkers = list("tmp_relay") +/obj/machinery/telecomms/relay/preset/centcom/tether/midpoint + listening_level = Z_LEVEL_TRANSIT + // The station of course needs relays fluff-wise to connect to ground station. But again, no multi-z so, we need one for each z level. /obj/machinery/telecomms/relay/preset/tether/station_low id = "Station Relay 1" listening_level = Z_LEVEL_SPACE_LOW autolinkers = list("tsl_relay") +/obj/machinery/telecomms/relay/preset/centcom/tether/station_low + listening_level = Z_LEVEL_SPACE_LOW + /obj/machinery/telecomms/relay/preset/tether/station_mid id = "Station Relay 2" listening_level = Z_LEVEL_SPACE_MID autolinkers = list("tsm_relay") +/obj/machinery/telecomms/relay/preset/centcom/tether/station_mid + listening_level = Z_LEVEL_SPACE_MID + /obj/machinery/telecomms/relay/preset/tether/station_high id = "Station Relay 3" listening_level = Z_LEVEL_SPACE_HIGH autolinkers = list("tsh_relay") +/obj/machinery/telecomms/relay/preset/centcom/tether/station_high + listening_level = Z_LEVEL_SPACE_HIGH + /obj/machinery/telecomms/relay/preset/tether/sci_outpost id = "Science Outpost Relay" listening_level = Z_LEVEL_SOLARS autolinkers = list("sci_o_relay") +/obj/machinery/telecomms/relay/preset/centcom/tether/sci_outpost + listening_level = Z_LEVEL_SOLARS + /obj/machinery/telecomms/relay/preset/underdark id = "Mining Underground Relay" listening_level = Z_LEVEL_UNDERDARK autolinkers = list("ud_relay") +/obj/machinery/telecomms/relay/preset/centcom/underdark + listening_level = Z_LEVEL_UNDERDARK + // #### Hub #### /obj/machinery/telecomms/hub/preset/tether id = "Hub" From 083a0634a072d59d73c6e340541418945b2cda3d Mon Sep 17 00:00:00 2001 From: Anewbe Date: Thu, 29 Aug 2019 17:26:45 -0500 Subject: [PATCH 11/13] Merge pull request #6429 from Heroman3003/idfix Fixes editing colony director IDs editing global 'station access' list --- code/game/antagonist/station/highlander.dm | 4 ++-- code/game/objects/items/weapons/id cards/station_ids.dm | 4 ++-- code/modules/admin/verbs/debug.dm | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/code/game/antagonist/station/highlander.dm b/code/game/antagonist/station/highlander.dm index e2ec983818a..f483b1df3bd 100644 --- a/code/game/antagonist/station/highlander.dm +++ b/code/game/antagonist/station/highlander.dm @@ -47,8 +47,8 @@ var/datum/antagonist/highlander/highlanders var/obj/item/weapon/card/id/W = new(player) W.name = "[player.real_name]'s ID Card" W.icon_state = "centcom" - W.access = get_all_station_access() - W.access += get_all_centcom_access() + W.access = get_all_station_access().Copy + W.access |= get_all_centcom_access() W.assignment = "Highlander" W.registered_name = player.real_name player.equip_to_slot_or_del(W, slot_wear_id) diff --git a/code/game/objects/items/weapons/id cards/station_ids.dm b/code/game/objects/items/weapons/id cards/station_ids.dm index 867085be090..4d37f154b36 100644 --- a/code/game/objects/items/weapons/id cards/station_ids.dm +++ b/code/game/objects/items/weapons/id cards/station_ids.dm @@ -171,7 +171,7 @@ /obj/item/weapon/card/id/synthetic/Initialize() . = ..() - access = get_all_station_access() + access_synth + access = get_all_station_access().Copy() + access_synth /obj/item/weapon/card/id/centcom name = "\improper CentCom. ID" @@ -182,7 +182,7 @@ /obj/item/weapon/card/id/centcom/Initialize() . = ..() - access = get_all_centcom_access() + access = get_all_centcom_access().Copy() /obj/item/weapon/card/id/centcom/station/Initialize() . = ..() diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index 321655bb15a..11541128c50 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -282,11 +282,11 @@ var/obj/item/device/pda/pda = H.wear_id id = pda.id id.icon_state = "gold" - id.access = get_all_accesses() + id.access = get_all_accesses().Copy() else var/obj/item/weapon/card/id/id = new/obj/item/weapon/card/id(M); id.icon_state = "gold" - id.access = get_all_accesses() + id.access = get_all_accesses().Copy() id.registered_name = H.real_name id.assignment = "Colony Director" id.name = "[id.registered_name]'s ID Card ([id.assignment])" From 9278ad11d3aecd09326e84a81840d87d4008c726 Mon Sep 17 00:00:00 2001 From: Heroman Date: Fri, 30 Aug 2019 10:06:36 +1000 Subject: [PATCH 13/13] Maps in distilleries --- maps/tether/tether-03-surface3.dmm | 35 +++++++++++----------- maps/tether/tether-07-station3.dmm | 47 +++++++++++++++--------------- 2 files changed, 42 insertions(+), 40 deletions(-) diff --git a/maps/tether/tether-03-surface3.dmm b/maps/tether/tether-03-surface3.dmm index 2127ee7d9d3..f325ca6d4b6 100644 --- a/maps/tether/tether-03-surface3.dmm +++ b/maps/tether/tether-03-surface3.dmm @@ -1069,6 +1069,15 @@ }, /turf/simulated/floor/wood, /area/tether/surfacebase/reading_room) +"cj" = ( +/obj/structure/table/woodentable, +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -24 + }, +/obj/machinery/portable_atmospherics/powered/reagent_distillery, +/turf/simulated/floor/wood, +/area/tether/surfacebase/bar_backroom) "ck" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -1104,6 +1113,11 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/atrium_three) +"cm" = ( +/obj/structure/shuttle/engine/propulsion, +/turf/simulated/floor/reinforced, +/turf/simulated/shuttle/plating/carry, +/area/shuttle/tether/surface) "cn" = ( /obj/machinery/atm{ pixel_y = 31 @@ -20261,11 +20275,6 @@ /obj/machinery/light, /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) -"HG" = ( -/obj/structure/shuttle/engine/propulsion, -/turf/simulated/floor/reinforced, -/turf/simulated/shuttle/plating/carry, -/area/shuttle/tether/surface) "HH" = ( /obj/structure/disposalpipe/segment, /obj/effect/floor_decal/borderfloor{ @@ -21321,14 +21330,6 @@ /obj/item/weapon/storage/briefcase/inflatable, /turf/simulated/floor/plating, /area/maintenance/lower/atrium) -"OV" = ( -/obj/structure/table/woodentable, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 - }, -/turf/simulated/floor/wood, -/area/tether/surfacebase/bar_backroom) "Pe" = ( /obj/structure/table, /turf/simulated/floor/carpet, @@ -36777,7 +36778,7 @@ Jr Js Wh JE -HG +cm IY bg RO @@ -36919,7 +36920,7 @@ Js Js Jz JE -HG +cm IY bg RO @@ -37061,7 +37062,7 @@ Jt Js Jz JE -HG +cm IY bg RO @@ -37905,7 +37906,7 @@ Tv Hw TP NO -OV +cj RB ac ac diff --git a/maps/tether/tether-07-station3.dmm b/maps/tether/tether-07-station3.dmm index a6f155c1e30..cebc9444282 100644 --- a/maps/tether/tether-07-station3.dmm +++ b/maps/tether/tether-07-station3.dmm @@ -2681,6 +2681,11 @@ }, /turf/simulated/floor/tiled/dark, /area/security/security_lockerroom) +"er" = ( +/obj/structure/shuttle/engine/propulsion, +/turf/simulated/floor/reinforced, +/turf/simulated/shuttle/plating/airless/carry, +/area/shuttle/excursion/tether) "es" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/railing{ @@ -2926,10 +2931,16 @@ /turf/simulated/floor, /area/maintenance/station/ai) "eN" = ( -/obj/structure/shuttle/engine/propulsion, -/turf/simulated/floor/reinforced, -/turf/simulated/shuttle/plating/airless/carry, -/area/shuttle/excursion/tether) +/obj/structure/table/reinforced, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 1 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 1 + }, +/obj/machinery/portable_atmospherics/powered/reagent_distillery, +/turf/simulated/floor/tiled/white, +/area/medical/chemistry) "eS" = ( /obj/item/frame, /obj/effect/floor_decal/rust, @@ -19160,16 +19171,6 @@ /obj/item/weapon/reagent_containers/dropper, /turf/simulated/floor/tiled/white, /area/medical/chemistry) -"DX" = ( -/obj/structure/table/reinforced, -/obj/effect/floor_decal/borderfloorwhite{ - dir = 1 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 1 - }, -/turf/simulated/floor/tiled/white, -/area/medical/chemistry) "DY" = ( /obj/machinery/chemical_dispenser/full, /obj/structure/table/reinforced, @@ -38576,7 +38577,7 @@ Aq Aw Ck Dq -DX +eN ES FH Gx @@ -40535,7 +40536,7 @@ Zy WG dj XA -eN +er ms Oz be @@ -40677,7 +40678,7 @@ UJ Xb dj XN -eN +er ms Xq be @@ -40819,7 +40820,7 @@ iW WS dj XN -eN +er ms Vb be @@ -41102,7 +41103,7 @@ jZ WR Xo XN -eN +er cK ms Xq @@ -41670,7 +41671,7 @@ ea kx dj XN -eN +er cK ms mq @@ -41955,7 +41956,7 @@ kQ TG dj XN -eN +er ms nA be @@ -42097,7 +42098,7 @@ kR Vd dj XN -eN +er ms QL be @@ -42239,7 +42240,7 @@ ZE ZB dj XB -eN +er ms Sq be