diff --git a/icons/_nanomaps/sd_deck1.png b/icons/_nanomaps/sd_deck1.png
index 6b2be044b80..835180e3310 100644
Binary files a/icons/_nanomaps/sd_deck1.png and b/icons/_nanomaps/sd_deck1.png differ
diff --git a/maps/expedition_vr/aerostat/aerostat_science_outpost.dmm b/maps/expedition_vr/aerostat/aerostat_science_outpost.dmm
index 1f476ba5939..117275c22c0 100644
--- a/maps/expedition_vr/aerostat/aerostat_science_outpost.dmm
+++ b/maps/expedition_vr/aerostat/aerostat_science_outpost.dmm
@@ -3027,6 +3027,9 @@
/area/offmap/aerostat/inside/arm/se)
"kN" = (
/obj/machinery/door/firedoor/glass,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
/turf/simulated/floor/tiled/steel_ridged,
/area/offmap/aerostat/inside/powercontrol)
"kO" = (
@@ -3548,6 +3551,14 @@
/obj/machinery/power/solar,
/turf/simulated/floor/plating/virgo2,
/area/offmap/aerostat/solars)
+"na" = (
+/obj/machinery/light/small,
+/obj/machinery/power/quantumpad/scioutpost,
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/turf/simulated/floor/bluegrid,
+/area/offmap/aerostat/inside/powercontrol)
"nb" = (
/obj/machinery/vending/tool,
/turf/simulated/floor/tiled/white,
@@ -7597,6 +7608,13 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/offmap/aerostat/inside/airlock/south)
+"FD" = (
+/obj/effect/floor_decal/industrial/warning/dust,
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/turf/simulated/floor/tiled/dark,
+/area/offmap/aerostat/inside/lobby)
"FF" = (
/obj/machinery/atmospherics/unary/vent_pump/on,
/obj/machinery/camera/network/research_outpost,
@@ -8654,6 +8672,15 @@
/obj/machinery/door/firedoor/glass,
/turf/simulated/floor/tiled/steel_ridged,
/area/offmap/aerostat/inside/toxins)
+"JX" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/turf/simulated/floor/tiled/dark,
+/area/offmap/aerostat/inside/lobby)
"JZ" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -12099,6 +12126,9 @@
/obj/effect/floor_decal/industrial/warning/dust/corner{
dir = 8
},
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
/turf/simulated/floor/tiled/dark,
/area/offmap/aerostat/inside/lobby)
"ZO" = (
@@ -22156,10 +22186,10 @@ cP
dK
dM
dN
-Mj
+aQ
kN
-Ym
-MC
+Ff
+FD
VG
VG
VG
@@ -22298,7 +22328,7 @@ dh
dL
dL
dO
-aR
+na
GB
Ym
ZN
@@ -22443,7 +22473,7 @@ EQ
yk
GB
zE
-Ym
+xl
Ym
Ym
Ym
@@ -22585,7 +22615,7 @@ TB
GB
GB
xl
-Ym
+xl
Ym
Ym
Ym
@@ -22727,7 +22757,7 @@ vg
eE
Ym
BF
-Ff
+JX
Ff
Ff
sK
diff --git a/maps/gateway_vr/eggnogtown.dmm b/maps/gateway_vr/eggnogtown.dmm
index 32197280886..bd5ed9b94c2 100644
--- a/maps/gateway_vr/eggnogtown.dmm
+++ b/maps/gateway_vr/eggnogtown.dmm
@@ -1284,7 +1284,7 @@
},
/area/gateway/eggnogtown/greenhouse)
"kG" = (
-/obj/machinery/telecomms/relay/preset/tether,
+/obj/machinery/telecomms/relay,
/turf/simulated/floor/reinforced,
/area/gateway/eggnogtown/gateway)
"kI" = (
diff --git a/maps/gateway_vr/variable/arynthilake_a.dmm b/maps/gateway_vr/variable/arynthilake_a.dmm
index 11f7326b984..24a790b1772 100644
--- a/maps/gateway_vr/variable/arynthilake_a.dmm
+++ b/maps/gateway_vr/variable/arynthilake_a.dmm
@@ -641,7 +641,7 @@
/obj/item/clothing/under/dress/dress_saloon,
/obj/item/clothing/under/dress/lilacdress,
/obj/item/clothing/under/dress/littleblackdress,
-/obj/item/clothing/under/dress/qipao/red,
+/obj/item/clothing/under/qipao/red,
/obj/item/clothing/under/dress/red_swept_dress,
/obj/item/clothing/under/dress/redeveninggown,
/obj/item/clothing/under/dress/sailordress,
@@ -1258,7 +1258,7 @@
},
/area/gateway/arynthilake/dome)
"ug" = (
-/obj/machinery/telecomms/relay/preset/tether,
+/obj/machinery/telecomms/relay,
/turf/simulated/floor/tiled/eris,
/area/gateway/arynthilake/engine)
"uo" = (
@@ -2324,7 +2324,7 @@
/obj/item/clothing/under/dress/wench,
/obj/item/clothing/under/dress/white,
/obj/item/clothing/under/haltertop,
-/obj/item/clothing/under/hephaestus,
+/obj/item/clothing/under/corp/hephaestus,
/obj/item/clothing/under/lawyer/blue,
/obj/item/clothing/under/lawyer/bluesuit,
/obj/item/clothing/under/lawyer/bluesuit/skirt,
diff --git a/maps/gateway_vr/variable/arynthilake_b.dmm b/maps/gateway_vr/variable/arynthilake_b.dmm
index 9f2634d8d50..06169e3a6ba 100644
--- a/maps/gateway_vr/variable/arynthilake_b.dmm
+++ b/maps/gateway_vr/variable/arynthilake_b.dmm
@@ -356,7 +356,7 @@
/obj/item/clothing/under/dress/wench,
/obj/item/clothing/under/dress/white,
/obj/item/clothing/under/haltertop,
-/obj/item/clothing/under/hephaestus,
+/obj/item/clothing/under/corp/hephaestus,
/obj/item/clothing/under/lawyer/blue,
/obj/item/clothing/under/lawyer/bluesuit,
/obj/item/clothing/under/lawyer/bluesuit/skirt,
@@ -1262,7 +1262,7 @@
/turf/simulated/floor/tiled/techfloor,
/area/gateway/arynthilake/gateway)
"Bg" = (
-/obj/machinery/telecomms/relay/preset/tether,
+/obj/machinery/telecomms/relay,
/turf/simulated/floor/tiled/eris,
/area/gateway/arynthilake/engine)
"Bz" = (
@@ -1810,7 +1810,7 @@
/obj/item/clothing/under/dress/dress_saloon,
/obj/item/clothing/under/dress/lilacdress,
/obj/item/clothing/under/dress/littleblackdress,
-/obj/item/clothing/under/dress/qipao/red,
+/obj/item/clothing/under/qipao/red,
/obj/item/clothing/under/dress/red_swept_dress,
/obj/item/clothing/under/dress/redeveninggown,
/obj/item/clothing/under/dress/sailordress,
diff --git a/maps/gateway_vr/variable/honlethhighlands_a.dmm b/maps/gateway_vr/variable/honlethhighlands_a.dmm
index d273f3b5fe0..a3ca7db3966 100644
--- a/maps/gateway_vr/variable/honlethhighlands_a.dmm
+++ b/maps/gateway_vr/variable/honlethhighlands_a.dmm
@@ -2519,7 +2519,7 @@
/turf/simulated/floor/tiled,
/area/gateway/honlethhighlands/town/engineering)
"QB" = (
-/obj/machinery/telecomms/relay/preset/tether,
+/obj/machinery/telecomms/relay,
/turf/simulated/floor/tiled,
/area/gateway/honlethhighlands/town/engineering)
"QG" = (
diff --git a/maps/stellardelight/stellar_delight1.dmm b/maps/stellardelight/stellar_delight1.dmm
index a3139f94f37..3517a361a90 100644
--- a/maps/stellardelight/stellar_delight1.dmm
+++ b/maps/stellardelight/stellar_delight1.dmm
@@ -4282,7 +4282,7 @@
id = "xenospace2"
},
/turf/simulated/floor/reinforced,
-/area/rnd/xenobiology)
+/area/rnd/workshop)
"jc" = (
/obj/machinery/light_switch{
dir = 4;
@@ -5027,7 +5027,7 @@
id = "xenospace4"
},
/turf/simulated/floor/reinforced,
-/area/rnd/xenobiology)
+/area/rnd/workshop)
"kO" = (
/obj/structure/cable/green{
color = "#42038a";
@@ -5072,10 +5072,6 @@
},
/turf/simulated/floor/tiled/techmaint,
/area/stellardelight/deck1/port)
-"kX" = (
-/obj/item/weapon/bikehorn/rubberducky,
-/turf/simulated/floor/tiled/steel_ridged,
-/area/stellardelight/deck1/shower)
"kY" = (
/obj/structure/cable/pink{
icon_state = "1-2"
@@ -10872,6 +10868,9 @@
},
/turf/simulated/floor/tiled/eris/white/gray_platform,
/area/gateway)
+"xo" = (
+/turf/simulated/floor/reinforced,
+/area/rnd/workshop)
"xq" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 8
@@ -11344,6 +11343,7 @@
/obj/structure/table/standard,
/obj/machinery/recharger,
/obj/item/device/retail_scanner/science,
+/obj/item/device/multitool/scioutpost,
/turf/simulated/floor/tiled/steel_grid,
/area/rnd/research)
"yr" = (
@@ -17404,6 +17404,8 @@
/obj/item/weapon/material/minihoe,
/obj/item/inflatable/door,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/item/weapon/storage/box/botanydisk,
+/obj/item/weapon/storage/box/botanydisk,
/turf/simulated/floor/tiled/eris,
/area/rnd/xenobiology/xenoflora)
"LA" = (
@@ -20757,7 +20759,7 @@
id = "xenospace6"
},
/turf/simulated/floor/reinforced,
-/area/rnd/xenobiology)
+/area/rnd/workshop)
"SS" = (
/obj/structure/cable/yellow{
icon_state = "1-4"
@@ -21595,6 +21597,10 @@
},
/turf/simulated/floor/tiled,
/area/rnd/storage)
+"Uy" = (
+/obj/item/weapon/bikehorn/rubberducky,
+/turf/simulated/floor/tiled/steel_ridged,
+/area/stellardelight/deck1/shower)
"Uz" = (
/obj/structure/bookcase/bookcart,
/turf/simulated/floor/carpet,
@@ -32051,7 +32057,7 @@ SX
it
zP
pS
-kX
+Uy
SV
Ms
Dy
@@ -38166,16 +38172,16 @@ bD
bD
ym
ym
-RN
-RN
+xo
+xo
jb
ym
-RN
-RN
+xo
+xo
kN
ym
-RN
-RN
+xo
+xo
SR
Vg
pQ
diff --git a/maps/stellardelight/stellar_delight2.dmm b/maps/stellardelight/stellar_delight2.dmm
index 9b025de8419..259e61b0d3a 100644
--- a/maps/stellardelight/stellar_delight2.dmm
+++ b/maps/stellardelight/stellar_delight2.dmm
@@ -12879,7 +12879,6 @@
/turf/simulated/floor/airless,
/area/stellardelight/deck2/exterior)
"Du" = (
-/obj/structure/closet/secure_closet/personal,
/obj/effect/floor_decal/industrial/outline,
/obj/effect/floor_decal/steeldecal/steel_decals9,
/obj/effect/floor_decal/steeldecal/steel_decals9{
@@ -12891,11 +12890,10 @@
/obj/effect/floor_decal/steeldecal/steel_decals9{
dir = 8
},
-/obj/item/clothing/shoes/black,
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 1
},
-/obj/item/device/communicator,
+/obj/structure/undies_wardrobe,
/turf/simulated/floor/holofloor/tiled/dark,
/area/crew_quarters/locker)
"Dv" = (
diff --git a/maps/stellardelight/stellar_delight3.dmm b/maps/stellardelight/stellar_delight3.dmm
index 053d9d9d0e0..2ab4fb98b1a 100644
--- a/maps/stellardelight/stellar_delight3.dmm
+++ b/maps/stellardelight/stellar_delight3.dmm
@@ -2130,6 +2130,13 @@
req_access = list(11,24);
stripe_color = "#e6ab22"
},
+/obj/machinery/door/airlock/angled_bay/hatch{
+ door_color = "#e6ab22";
+ name = "Shield Generator";
+ req_access = null;
+ req_one_access = list(11,24);
+ stripe_color = "#e6ab22"
+ },
/turf/simulated/floor/tiled/steel_ridged,
/area/stellardelight/deck3/commandhall)
"iI" = (
@@ -4857,7 +4864,8 @@
dir = 4;
door_color = "#e6ab22";
name = "Shield Generator";
- req_access = list(11,24);
+ req_access = null;
+ req_one_access = list(11,24);
stripe_color = "#e6ab22"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -5946,7 +5954,9 @@
/obj/machinery/power/apc/angled{
dir = 8;
name = "night shift APC";
- nightshift_setting = 2
+ nightshift_setting = 2;
+ req_access = null;
+ req_one_access = list(11,67)
},
/obj/structure/cable{
icon_state = "0-4"
@@ -8159,7 +8169,9 @@
cell_type = /obj/item/weapon/cell/super;
dir = 1;
name = "night shift APC";
- nightshift_setting = 2
+ nightshift_setting = 2;
+ req_access = null;
+ req_one_access = list(11,67)
},
/turf/simulated/floor/tiled/eris/dark/cargo,
/area/shuttle/sdboat/aft)
@@ -11757,7 +11769,8 @@
dir = 4;
door_color = "#e6ab22";
name = "Shield Generator";
- req_access = list(11,24);
+ req_access = null;
+ req_one_access = list(11,24);
stripe_color = "#e6ab22"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
diff --git a/maps/stellardelight/stellar_delight_things.dm b/maps/stellardelight/stellar_delight_things.dm
index adc256b0644..1b2e056ee6c 100644
--- a/maps/stellardelight/stellar_delight_things.dm
+++ b/maps/stellardelight/stellar_delight_things.dm
@@ -34,7 +34,7 @@
/obj/item/weapon/paper/sdshield
name = "ABOUT THE SHIELD GENERATOR"
- info = "ABOUT THE SHIELD GENERATOR
If you're up here you are more than likely worried about hitting rocks or some other such thing. It is good to worry about such things as that is an inevitability.
The Stellar Delight is a rather compact vessel, so a setting of 55 to the range will just barely cover her aft.
It is recommended that you turn off all of the different protection types except multi dimensional warp and whatever it is you're worried about running into. (probably meteors (hyperkinetic)).
With only those two and all the other default settings, the shield uses more than 6 MW to run, which is more than the ship can ordinarily produce. AS SUCH, it is also recommended that you reduce the input cap to whatever you find reasonable (being as it defaults to 1 MW, which is the entirety of the stock power supply) and activate and configure the shield BEFORE you need it.
The shield takes some time to expand its range to the desired specifications, and on top of that, under the default low power setting, takes around 40 seconds to spool up. Once it is active, the fully charged internal capacitors will last for around 1 to 2 minutes before depleting fully. You can increase the passive energy use to decrease the spool up time, but it also uses the stored energy much faster, so, that is not recommended except in dire emergencies.
So, this shield is not intended to be run indefinitely, unless you seriously beef up the ship's engine and power supply.
Fortunately, if you've got a good pilot, you shouldn't really need the shield generator except in rare cases and only for short distances. Still, it is a good idea to configure the shield to be ready before you need it.
Good luck out there - Budly Gregington"
+ info = "ABOUT THE SHIELD GENERATOR
If you're up here you are more than likely worried about hitting rocks or some other such thing. It is good to worry about such things as that is an inevitability.
The Stellar Delight is a rather compact vessel, so a setting of 55 to the range will just barely cover her aft.
It is recommended that you turn off all of the different protection types except multi dimensional warp and whatever it is you're worried about running into. (probably meteors (hyperkinetic)).
With only those two and all the other default settings, the shield uses more than 2 MW to run, which is more than the ship can ordinarily produce. AS SUCH, it is also recommended that you reduce the input cap to whatever you find reasonable (being as it defaults to 1 MW, which is the entirety of the stock power supply) and activate and configure the shield BEFORE you need it.
The shield takes some time to expand its range to the desired specifications, and on top of that, under the default low power setting, takes around 40 seconds to spool up. Once it is active, the fully charged internal capacitors will last for a few minutes before depleting fully. You can increase the passive energy use to decrease the spool up time, but it also uses the stored energy much faster, so, that is not recommended except in dire emergencies.
So, this shield is not intended to be run indefinitely, unless you seriously beef up the ship's engine and power supply.
Fortunately, if you've got a good pilot, you shouldn't really need the shield generator except in rare cases and only for short distances. Still, it is a good idea to configure the shield to be ready before you need it.
Good luck out there - Budly Gregington"
/obj/item/weapon/book/manual/sd_guide
name = "Stellar Delight User's Guide"
@@ -158,4 +158,19 @@
/obj/structure/mirror
layer = ABOVE_WINDOW_LAYER
/obj/structure/noticeboard
- layer = ABOVE_WINDOW_LAYER
\ No newline at end of file
+ layer = ABOVE_WINDOW_LAYER
+
+/obj/item/device/multitool/scioutpost
+ name = "science outpost linked multitool"
+ desc = "It has the data for the science outpost's quantum pad pre-loaded... assuming you didn't override it."
+
+/obj/item/device/multitool/scioutpost/Initialize()
+ . = ..()
+ for(var/obj/machinery/power/quantumpad/scioutpost/outpost in world)
+ connectable = outpost
+ if(connectable)
+ icon_state = "multitool_red"
+ return
+
+/obj/machinery/power/quantumpad/scioutpost
+