diff --git a/.vscode/launch.json b/.vscode/launch.json
new file mode 100644
index 0000000000..543058728f
--- /dev/null
+++ b/.vscode/launch.json
@@ -0,0 +1,12 @@
+{
+ "version": "0.2.0",
+ "configurations": [
+ {
+ "type": "byond",
+ "request": "launch",
+ "name": "Launch DreamSeeker",
+ "preLaunchTask": "Build All",
+ "dmb": "${workspaceFolder}/${command:CurrentDMB}"
+ }
+ ]
+}
diff --git a/.vscode/settings.json b/.vscode/settings.json
index f290e9f369..849a5165e1 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -6,8 +6,11 @@
"typescript.tsdk": "./tgui/.yarn/sdks/typescript/lib",
"typescript.enablePromptUseWorkspaceTsdk": true,
"search.exclude": {
- "tgui/.yarn": true,
- "tgui/.pnp.*": true
+ "**/.yarn": true,
+ "**/.pnp.*": true
+ },
+ "editor.codeActionsOnSave": {
+ "source.fixAll.eslint": true
},
"workbench.editorAssociations": [
{
@@ -17,5 +20,14 @@
],
"files.eol": "\n",
"gitlens.advanced.blame.customArguments": ["-w"],
- "tgstationTestExplorer.project.resultsType": "json"
+ "tgstationTestExplorer.project.resultsType": "json",
+ "[javascript]": {
+ "editor.rulers": [80]
+ },
+ "[typescript]": {
+ "editor.rulers": [80]
+ },
+ "[scss]": {
+ "editor.rulers": [80]
+ }
}
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
new file mode 100644
index 0000000000..b7d12f0527
--- /dev/null
+++ b/.vscode/tasks.json
@@ -0,0 +1,55 @@
+{
+ "version": "2.0.0",
+ "tasks": [
+ {
+ "type": "process",
+ "command": "tools/build/build",
+ "windows": {
+ "command": ".\\tools\\build\\build.bat"
+ },
+ "options": {
+ "env": {
+ "DM_EXE": "${config:dreammaker.byondPath}"
+ }
+ },
+ "problemMatcher": [
+ "$dreammaker",
+ "$tsc",
+ "$eslint-stylish"
+ ],
+ "group": {
+ "kind": "build",
+ "isDefault": true
+ },
+ "dependsOn": "dm: reparse",
+ "label": "Build All"
+ },
+ {
+ "type": "dreammaker",
+ "dme": "tgstation.dme",
+ "problemMatcher": [
+ "$dreammaker"
+ ],
+ "group": "build",
+ "label": "dm: build - tgstation.dme"
+ },
+ {
+ "type": "shell",
+ "command": "tgui/bin/tgui",
+ "windows": {
+ "command": ".\\tgui\\bin\\tgui.bat"
+ },
+ "problemMatcher": [
+ "$tsc",
+ "$eslint-stylish"
+ ],
+ "group": "build",
+ "label": "tgui: build"
+ },
+ {
+ "command": "${command:dreammaker.reparse}",
+ "group": "build",
+ "label": "dm: reparse"
+ }
+ ]
+}
diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm
index 19c8e68546..39688c1db8 100644
--- a/_maps/map_files/Deltastation/DeltaStation2.dmm
+++ b/_maps/map_files/Deltastation/DeltaStation2.dmm
@@ -7322,6 +7322,22 @@
},
/turf/open/floor/plasteel,
/area/maintenance/starboard/fore)
+"avT" = (
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 5
+ },
+/turf/open/floor/plasteel/dark,
+/area/science/xenobiology)
"avX" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/door/airlock/maintenance_hatch{
@@ -7726,6 +7742,13 @@
},
/turf/open/floor/plasteel,
/area/hallway/primary/fore)
+"ayq" = (
+/obj/structure/sign/warning/electricshock,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/turf/closed/wall/r_wall,
+/area/science/xenobiology)
"ayS" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
@@ -18573,6 +18596,18 @@
},
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/ai)
+"bxE" = (
+/obj/structure/cable/white{
+ icon_state = "1-2"
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+ dir = 1
+ },
+/turf/open/floor/plasteel,
+/area/science/xenobiology)
"bxV" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 6
@@ -39771,6 +39806,7 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel/dark,
/area/science/xenobiology)
"cQw" = (
@@ -40614,6 +40650,7 @@
id = "xeno4";
name = "Creature Cell #4"
},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plating,
/area/science/xenobiology)
"cRX" = (
@@ -40654,6 +40691,7 @@
id = "xeno4";
name = "Creature Cell #4"
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plating,
/area/science/xenobiology)
"cRZ" = (
@@ -40665,6 +40703,7 @@
id = "xeno5";
name = "Creature Cell #5"
},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plating,
/area/science/xenobiology)
"cSa" = (
@@ -40705,6 +40744,7 @@
id = "xeno5";
name = "Creature Cell #5"
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plating,
/area/science/xenobiology)
"cSc" = (
@@ -40716,6 +40756,7 @@
id = "xeno6";
name = "Creature Cell #6"
},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plating,
/area/science/xenobiology)
"cSd" = (
@@ -40756,6 +40797,7 @@
id = "xeno6";
name = "Creature Cell #6"
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plating,
/area/science/xenobiology)
"cSf" = (
@@ -41528,6 +41570,10 @@
/area/science/xenobiology)
"cTA" = (
/obj/structure/sign/warning/electricshock,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
/turf/closed/wall/r_wall,
/area/science/xenobiology)
"cTB" = (
@@ -41539,6 +41585,9 @@
id = "xenosecure";
name = "Secure Pen Shutters"
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
/turf/open/floor/plating,
/area/science/xenobiology)
"cTC" = (
@@ -41548,16 +41597,19 @@
network = list("xeno")
},
/obj/effect/turf_decal/bot,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
/turf/open/floor/plasteel,
/area/science/xenobiology)
"cTD" = (
/obj/structure/cable/white{
icon_state = "1-2"
},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
- dir = 4
- },
/obj/effect/turf_decal/bot,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
+ dir = 1
+ },
/turf/open/floor/plasteel,
/area/science/xenobiology)
"cTE" = (
@@ -41600,6 +41652,7 @@
req_access_txt = "55"
},
/obj/effect/turf_decal/bot,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel,
/area/science/xenobiology)
"cTI" = (
@@ -41622,6 +41675,7 @@
dir = 1
},
/obj/effect/turf_decal/bot,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel,
/area/science/xenobiology)
"cTK" = (
@@ -41639,6 +41693,7 @@
req_access_txt = "55"
},
/obj/effect/turf_decal/bot,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel,
/area/science/xenobiology)
"cTM" = (
@@ -41654,6 +41709,7 @@
dir = 1
},
/obj/effect/turf_decal/bot,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel,
/area/science/xenobiology)
"cTN" = (
@@ -41679,6 +41735,7 @@
req_access_txt = "55"
},
/obj/effect/turf_decal/bot,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel,
/area/science/xenobiology)
"cTP" = (
@@ -42650,6 +42707,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 8
},
+/obj/machinery/atmospherics/components/unary/vent_pump/on,
/turf/open/floor/plasteel,
/area/science/xenobiology)
"cVF" = (
@@ -42751,18 +42809,6 @@
},
/turf/open/floor/plasteel,
/area/science/xenobiology)
-"cVN" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/turf/open/floor/plasteel,
-/area/science/xenobiology)
"cVO" = (
/obj/structure/cable/white{
icon_state = "1-2"
@@ -43488,10 +43534,12 @@
dir = 4;
name = "emergency shower"
},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
/obj/effect/turf_decal/stripes/end{
dir = 8
},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
+ dir = 4
+ },
/turf/open/floor/plasteel/white,
/area/science/xenobiology)
"cXd" = (
@@ -43539,12 +43587,12 @@
dir = 8;
name = "emergency shower"
},
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
- dir = 1
- },
/obj/effect/turf_decal/stripes/end{
dir = 4
},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+ dir = 8
+ },
/turf/open/floor/plasteel/white,
/area/science/xenobiology)
"cXh" = (
@@ -43560,6 +43608,9 @@
/obj/effect/turf_decal/stripes/line{
dir = 4
},
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 8
+ },
/turf/open/floor/plasteel,
/area/science/xenobiology)
"cXi" = (
@@ -44311,6 +44362,7 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
/turf/open/floor/plasteel/dark,
/area/science/xenobiology)
"cYL" = (
@@ -44386,11 +44438,11 @@
/turf/open/floor/plasteel,
/area/science/xenobiology)
"cYS" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
+/obj/machinery/atmospherics/pipe/manifold4w/scrubbers,
/turf/open/floor/plasteel,
/area/science/xenobiology)
"cYT" = (
@@ -45144,22 +45196,26 @@
id = "xenosecure";
name = "Secure Pen Shutters"
},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
/turf/open/floor/plating,
/area/science/xenobiology)
"dar" = (
/obj/structure/table/reinforced,
/obj/machinery/cell_charger,
/obj/effect/turf_decal/bot,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
/turf/open/floor/plasteel,
/area/science/xenobiology)
"das" = (
/obj/structure/cable/white{
icon_state = "1-2"
},
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
- dir = 4
- },
/obj/effect/turf_decal/bot,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/turf/open/floor/plasteel,
/area/science/xenobiology)
"dat" = (
@@ -45191,6 +45247,7 @@
/obj/machinery/disposal/bin,
/obj/structure/disposalpipe/trunk,
/obj/effect/turf_decal/bot,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel,
/area/science/xenobiology)
"daw" = (
@@ -45220,6 +45277,7 @@
req_access_txt = "55"
},
/obj/effect/turf_decal/bot,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel,
/area/science/xenobiology)
"day" = (
@@ -45233,6 +45291,7 @@
},
/obj/structure/disposalpipe/trunk,
/obj/effect/turf_decal/bot,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel,
/area/science/xenobiology)
"daz" = (
@@ -45246,6 +45305,7 @@
req_access_txt = "55"
},
/obj/effect/turf_decal/bot,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel,
/area/science/xenobiology)
"daA" = (
@@ -45259,6 +45319,7 @@
req_access_txt = "55"
},
/obj/effect/turf_decal/bot,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel,
/area/science/xenobiology)
"daB" = (
@@ -46056,6 +46117,9 @@
dir = 5
},
/obj/machinery/shieldwallgen/xenobiologyaccess,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 4
+ },
/turf/open/floor/plating,
/area/science/xenobiology)
"dcd" = (
@@ -46067,6 +46131,10 @@
pixel_y = -22
},
/obj/effect/turf_decal/delivery,
+/obj/machinery/atmospherics/components/binary/valve/digital{
+ icon_state = "dvalve_map-2";
+ dir = 8
+ },
/turf/open/floor/plasteel,
/area/science/xenobiology)
"dce" = (
@@ -46075,6 +46143,9 @@
},
/obj/effect/turf_decal/bot,
/obj/machinery/portable_atmospherics/canister/bz,
+/obj/machinery/atmospherics/components/unary/portables_connector/visible{
+ dir = 8
+ },
/turf/open/floor/plasteel,
/area/science/xenobiology)
"dcf" = (
@@ -46100,6 +46171,7 @@
id = "xeno1";
name = "Creature Cell #1"
},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plating,
/area/science/xenobiology)
"dch" = (
@@ -46138,6 +46210,7 @@
id = "xeno1";
name = "Creature Cell #1"
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plating,
/area/science/xenobiology)
"dcj" = (
@@ -46150,6 +46223,7 @@
id = "xeno2";
name = "Creature Cell #2"
},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plating,
/area/science/xenobiology)
"dck" = (
@@ -46188,6 +46262,7 @@
id = "xeno2";
name = "Creature Cell #2"
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plating,
/area/science/xenobiology)
"dcm" = (
@@ -46200,6 +46275,7 @@
id = "xeno3";
name = "Creature Cell #3"
},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plating,
/area/science/xenobiology)
"dcn" = (
@@ -46238,6 +46314,7 @@
id = "xeno3";
name = "Creature Cell #3"
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plating,
/area/science/xenobiology)
"dcp" = (
@@ -47050,7 +47127,9 @@
/turf/open/floor/plasteel,
/area/maintenance/port)
"ddQ" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 9
+ },
/turf/closed/wall/r_wall,
/area/science/xenobiology)
"ddR" = (
@@ -47068,6 +47147,7 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel/dark,
/area/science/xenobiology)
"ddS" = (
@@ -47718,8 +47798,8 @@
"dfb" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- dir = 4
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 10
},
/turf/open/floor/plating,
/area/maintenance/port)
@@ -48270,6 +48350,7 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel,
/area/maintenance/port)
"dgn" = (
@@ -65044,6 +65125,10 @@
network = list("ss13","medbay")
},
/obj/effect/turf_decal/delivery,
+/obj/machinery/airalarm{
+ dir = 8;
+ pixel_x = 24
+ },
/turf/open/floor/plasteel,
/area/medical/virology)
"dQh" = (
@@ -73719,6 +73804,11 @@
},
/turf/open/floor/plasteel,
/area/engineering/main)
+"fdK" = (
+/obj/effect/turf_decal/delivery,
+/obj/machinery/atmospherics/pipe/manifold4w/scrubbers,
+/turf/open/floor/plasteel,
+/area/science/xenobiology)
"fdM" = (
/obj/structure/cable/white{
icon_state = "1-2"
@@ -77437,6 +77527,13 @@
},
/turf/open/floor/plasteel,
/area/engineering/main)
+"grf" = (
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ icon_state = "pipe11-2";
+ dir = 5
+ },
+/turf/closed/wall/r_wall,
+/area/science/xenobiology)
"grh" = (
/obj/item/kirbyplants/random,
/turf/open/floor/plasteel/dark,
@@ -77551,6 +77648,10 @@
icon_state = "wood-broken2"
},
/area/service/abandoned_gambling_den/secondary)
+"gux" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/closed/wall,
+/area/service/abandoned_gambling_den)
"guH" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -77753,6 +77854,23 @@
},
/turf/open/floor/plasteel/white,
/area/command/heads_quarters/cmo)
+"gzQ" = (
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/machinery/atmospherics/components/unary/outlet_injector/on{
+ icon_state = "inje_map-2";
+ dir = 4
+ },
+/turf/open/floor/plasteel/dark,
+/area/science/xenobiology)
"gAA" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
@@ -80895,6 +81013,16 @@
/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel,
/area/cargo/storage)
+"hDD" = (
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/manifold4w/supply,
+/turf/open/floor/plasteel,
+/area/science/xenobiology)
"hDE" = (
/obj/machinery/light{
dir = 4
@@ -84800,6 +84928,11 @@
},
/turf/open/floor/plasteel/dark,
/area/ai_monitored/command/nuke_storage)
+"iMf" = (
+/obj/effect/turf_decal/delivery,
+/obj/machinery/atmospherics/pipe/manifold4w/supply,
+/turf/open/floor/plasteel,
+/area/science/xenobiology)
"iMm" = (
/obj/structure/cable{
icon_state = "2-4"
@@ -86986,6 +87119,14 @@
},
/turf/open/floor/plasteel/white,
/area/command/heads_quarters/cmo)
+"jyy" = (
+/obj/structure/cable/white{
+ icon_state = "4-8"
+ },
+/obj/effect/turf_decal/delivery,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/plasteel,
+/area/science/xenobiology)
"jyI" = (
/obj/structure/chair/stool/bar,
/obj/item/radio/intercom{
@@ -87613,6 +87754,24 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/cargo/qm)
+"jJL" = (
+/obj/structure/cable/white{
+ icon_state = "2-4"
+ },
+/obj/structure/cable/white{
+ icon_state = "1-4"
+ },
+/obj/structure/cable/white{
+ icon_state = "4-8"
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/science/xenobiology)
"jJT" = (
/obj/machinery/photocopier,
/obj/machinery/firealarm{
@@ -89077,6 +89236,20 @@
},
/turf/open/floor/plasteel/dark/corner,
/area/engineering/atmospherics_engine)
+"kiv" = (
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/plasteel/dark,
+/area/science/xenobiology)
"kiP" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/tile/neutral{
@@ -92058,6 +92231,14 @@
icon_state = "chapel"
},
/area/service/chapel/main)
+"lnO" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/obj/effect/turf_decal/delivery,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/plasteel,
+/area/science/xenobiology)
"lnY" = (
/obj/structure/weightmachine/stacklifter,
/obj/effect/turf_decal/tile/neutral{
@@ -93157,6 +93338,20 @@
},
/turf/open/floor/plasteel/dark,
/area/ai_monitored/aisat/exterior)
+"lIV" = (
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
+/turf/open/floor/plasteel/dark,
+/area/science/xenobiology)
"lIY" = (
/obj/effect/turf_decal/tile/blue,
/obj/effect/turf_decal/tile/green{
@@ -95681,6 +95876,13 @@
},
/turf/open/floor/plasteel,
/area/engineering/main)
+"mFc" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/plating,
+/area/maintenance/port)
"mFj" = (
/obj/machinery/disposal/bin,
/obj/machinery/airalarm{
@@ -96639,6 +96841,16 @@
/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel,
/area/engineering/main)
+"mSI" = (
+/obj/structure/cable/white{
+ icon_state = "4-8"
+ },
+/obj/effect/turf_decal/delivery,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/science/xenobiology)
"mSP" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/reagent_dispensers/fueltank,
@@ -96685,6 +96897,17 @@
},
/turf/open/floor/plasteel,
/area/engineering/atmos)
+"mTS" = (
+/obj/structure/cable/white{
+ icon_state = "4-8"
+ },
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/plasteel/white,
+/area/science/xenobiology)
"mTU" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/disposalpipe/segment{
@@ -96979,6 +97202,12 @@
/obj/structure/chair/office/dark,
/turf/open/floor/wood,
/area/commons/dorms)
+"mYQ" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/turf/closed/wall/r_wall,
+/area/science/circuit)
"mYT" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/closet/cardboard,
@@ -97895,6 +98124,20 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/closed/wall,
/area/service/hydroponics/garden/abandoned)
+"nqC" = (
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/plasteel/dark,
+/area/science/xenobiology)
"nqX" = (
/obj/structure/table/wood,
/obj/item/storage/dice,
@@ -100236,6 +100479,12 @@
"ohd" = (
/turf/open/floor/plasteel/freezer,
/area/service/kitchen)
+"ohp" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 6
+ },
+/turf/closed/wall/r_wall,
+/area/science/xenobiology)
"ohv" = (
/obj/effect/decal/cleanable/dirt,
/obj/item/kirbyplants/random,
@@ -101343,6 +101592,17 @@
/obj/structure/sign/poster/random,
/turf/closed/wall,
/area/service/bar/atrium)
+"oCR" = (
+/obj/structure/cable/white{
+ icon_state = "4-8"
+ },
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/plasteel/white,
+/area/science/xenobiology)
"oDg" = (
/obj/structure/lattice,
/turf/open/space,
@@ -101730,6 +101990,17 @@
},
/turf/open/floor/plasteel/dark,
/area/service/chapel/office)
+"oJE" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/plasteel,
+/area/science/xenobiology)
"oKj" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/effect/turf_decal/tile/neutral{
@@ -101788,6 +102059,20 @@
},
/turf/open/floor/plasteel/dark,
/area/ai_monitored/command/storage/eva)
+"oKZ" = (
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on,
+/turf/open/floor/plasteel/dark,
+/area/science/xenobiology)
"oLg" = (
/obj/machinery/vending/cart,
/obj/machinery/computer/security/telescreen/entertainment{
@@ -102573,6 +102858,22 @@
},
/turf/open/floor/plating,
/area/command/heads_quarters/hos)
+"paH" = (
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+ dir = 1
+ },
+/turf/open/floor/plasteel/dark,
+/area/science/xenobiology)
"paM" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on,
/obj/structure/disposalpipe/segment{
@@ -103613,6 +103914,12 @@
},
/turf/open/floor/plasteel,
/area/cargo/sorting)
+"puJ" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 6
+ },
+/turf/closed/wall,
+/area/science/circuit)
"puK" = (
/obj/machinery/light,
/obj/machinery/status_display/evac{
@@ -107266,6 +107573,14 @@
icon_state = "chapel"
},
/area/service/chapel/main)
+"qMB" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/effect/turf_decal/delivery,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/plasteel,
+/area/science/xenobiology)
"qMI" = (
/obj/structure/table/wood,
/obj/item/storage/briefcase,
@@ -111076,6 +111391,7 @@
/turf/open/floor/wood,
/area/service/library/abandoned)
"saw" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/closed/wall,
/area/science/circuit)
"sax" = (
@@ -111947,6 +112263,12 @@
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plating,
/area/engineering/main)
+"spV" = (
+/obj/machinery/atmospherics/components/unary/outlet_injector/on{
+ dir = 1
+ },
+/turf/open/floor/plating,
+/area/science/xenobiology)
"sqb" = (
/obj/structure/cable/white,
/obj/effect/turf_decal/stripes/line{
@@ -114385,6 +114707,10 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/cargo/storage)
+"thh" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/closed/wall,
+/area/science/research/abandoned)
"tin" = (
/obj/machinery/light{
dir = 1
@@ -115245,7 +115571,7 @@
/turf/open/floor/plasteel/dark,
/area/engineering/atmos)
"tvv" = (
-/obj/machinery/atmospherics/pipe/simple/yellow/visible{
+/obj/machinery/atmospherics/pipe/layer_manifold{
dir = 4
},
/turf/closed/wall/r_wall,
@@ -116748,6 +117074,19 @@
},
/turf/open/floor/plating,
/area/command/heads_quarters/ce)
+"tXb" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/plasteel,
+/area/science/xenobiology)
"tXd" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -118682,6 +119021,12 @@
},
/turf/open/floor/plasteel,
/area/engineering/atmospherics_engine)
+"uGN" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 9
+ },
+/turf/closed/wall/r_wall,
+/area/science/circuit)
"uGQ" = (
/obj/structure/table/glass,
/obj/item/clipboard,
@@ -121009,6 +121354,11 @@
/obj/machinery/status_display/evac,
/turf/closed/wall,
/area/cargo/qm)
+"vDi" = (
+/obj/structure/grille,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/closed/wall/r_wall,
+/area/space/nearstation)
"vDp" = (
/obj/structure/cable/white{
icon_state = "2-4"
@@ -122486,6 +122836,22 @@
},
/turf/closed/wall/r_wall,
/area/engineering/atmospherics_engine)
+"wiI" = (
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 10
+ },
+/turf/open/floor/plasteel/dark,
+/area/science/xenobiology)
"wiL" = (
/obj/structure/table/reinforced,
/obj/item/paper_bin,
@@ -124099,6 +124465,22 @@
},
/turf/closed/wall/r_wall,
/area/engineering/gravity_generator)
+"wKw" = (
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 1
+ },
+/turf/open/floor/plasteel/dark,
+/area/science/xenobiology)
"wKz" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 4
@@ -126005,6 +126387,14 @@
},
/turf/open/floor/plasteel,
/area/security/office)
+"xxJ" = (
+/obj/structure/cable/white{
+ icon_state = "4-8"
+ },
+/obj/effect/turf_decal/delivery,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/plasteel,
+/area/science/xenobiology)
"xxK" = (
/obj/structure/table/reinforced,
/obj/item/crowbar/red,
@@ -127019,6 +127409,22 @@
},
/turf/open/floor/plasteel/dark,
/area/commons/fitness/recreation)
+"xPN" = (
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 6
+ },
+/turf/open/floor/plasteel/dark,
+/area/science/xenobiology)
"xQl" = (
/obj/machinery/airalarm{
dir = 1;
@@ -152893,6 +153299,7 @@ cLs
cJT
caE
caE
+puJ
saw
saw
saw
@@ -152900,18 +153307,17 @@ saw
saw
saw
saw
-saw
-dhQ
-dhQ
-dhQ
-dhQ
-dhQ
-dhQ
-dhQ
-dhQ
-efN
-ajr
-aaa
+thh
+thh
+thh
+thh
+thh
+thh
+thh
+thh
+gux
+vDi
+spV
aaa
aad
aaa
@@ -153150,7 +153556,7 @@ cEo
ddO
cQt
dgl
-dhR
+mYQ
djn
dle
dmr
@@ -153407,7 +153813,7 @@ cRP
ddP
deW
cKk
-dhR
+mYQ
jjN
hNZ
hic
@@ -153661,10 +154067,10 @@ cMY
cMY
cMY
cMY
-cMY
-cCM
+ohp
+mFc
dgm
-dhR
+uGN
djp
qpq
dmt
@@ -153918,7 +154324,7 @@ cWV
cNd
cNd
cNd
-cMY
+cLI
cLO
lEm
gmj
@@ -154175,7 +154581,7 @@ cON
cON
cON
dcb
-cMY
+cLI
deX
dgn
dhR
@@ -154426,13 +154832,13 @@ cMW
cOG
cMY
cNd
+xPN
+paH
+gzQ
+oKZ
+avT
cNd
-cNd
-cNd
-cNd
-cNd
-cNd
-cMY
+cLI
deX
dgo
dhR
@@ -154683,13 +155089,13 @@ ceb
cCM
cMY
cMY
-cTA
-cNd
+ayq
cNd
+wiI
cYK
cTA
-cMY
-cMY
+grf
+cLI
deY
cKl
dhR
@@ -154946,7 +155352,7 @@ cWW
cYL
daq
dcc
-cMY
+cLI
cOD
cKj
dhR
@@ -155202,8 +155608,8 @@ cVD
cWX
cYM
dar
-cRS
-cMY
+mSI
+cLI
deZ
dgo
dhR
@@ -155455,12 +155861,12 @@ cOJ
cNc
cRT
cTD
-cVE
+bxE
cWY
cVE
das
dcd
-cMY
+cLI
deX
dgo
dhR
@@ -155717,7 +156123,7 @@ cWZ
cYN
dat
dce
-cMY
+cLI
dfa
dgp
fGq
@@ -156479,17 +156885,17 @@ caE
cJZ
cLI
cNd
-cNd
-cNd
+oKZ
+kiv
cRW
cTH
-cVI
-cRS
-cYQ
+iMf
+xxJ
+lnO
dav
dcg
ddR
-cNd
+wKw
cNd
cMY
djz
@@ -156741,7 +157147,7 @@ cNd
cRX
cTI
cVJ
-cWY
+jJL
cYR
daw
dch
@@ -156993,17 +157399,17 @@ caE
cKa
cLI
cNd
-cNd
+lIV
cQv
cRY
cTJ
-cVK
+tXb
cXc
cYS
dax
dci
-cNd
-cNd
+nqC
+paH
cNd
cMY
djB
@@ -157507,17 +157913,17 @@ caE
cKg
cLI
cNd
-cNd
-cNd
+oKZ
+kiv
cRZ
cTL
-cVK
-cXd
-cYU
+hDD
+mTS
+oJE
day
dcj
ddR
-cNd
+wKw
cNd
cMY
djD
@@ -158021,17 +158427,17 @@ cqL
cKi
cLI
cNd
-cNd
+lIV
cQv
cSb
cTM
-cVK
-cXd
-cYU
+tXb
+oCR
+cYS
daz
dcl
-cNd
-cNd
+nqC
+paH
cNd
cMY
sYo
@@ -158535,17 +158941,17 @@ cjp
cJZ
cLI
cNd
-cNd
-cNd
+oKZ
+kiv
cSc
cTO
-cVN
+hDD
cXg
-cYU
+oJE
dav
dcm
ddR
-cNd
+wKw
cNd
cMY
djH
@@ -159049,17 +159455,17 @@ ceb
cJZ
cLI
cNd
-cNd
+lIV
cQv
cSe
cTJ
-cVI
-cRS
-cYQ
+qMB
+jyy
+fdK
daA
dco
-cNd
-cNd
+nqC
+paH
cNd
cMY
djJ
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index f39dbc578d..216b2a3db7 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -44290,6 +44290,9 @@
/obj/effect/turf_decal/stripes/line{
dir = 1
},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
/turf/open/floor/plasteel/white,
/area/science/xenobiology)
"cRW" = (
@@ -44301,10 +44304,13 @@
name = "containment blast door"
},
/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
/turf/open/floor/plating,
/area/science/xenobiology)
"cRX" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden,
/turf/open/floor/plasteel/white,
/area/science/xenobiology)
"cRY" = (
@@ -44316,6 +44322,7 @@
name = "test chamber blast door"
},
/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plating,
/area/science/xenobiology)
"cRZ" = (
@@ -44328,6 +44335,9 @@
name = "containment blast door"
},
/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
/turf/open/floor/plating,
/area/science/xenobiology)
"cSa" = (
@@ -44398,10 +44408,12 @@
/turf/open/floor/engine,
/area/science/xenobiology)
"cSi" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+ dir = 8
+ },
/turf/open/floor/plasteel/white,
/area/science/xenobiology)
"cSj" = (
@@ -44432,6 +44444,9 @@
/obj/effect/turf_decal/stripes/line{
dir = 1
},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
/turf/open/floor/plasteel/white,
/area/science/xenobiology)
"cSm" = (
@@ -44446,6 +44461,9 @@
/obj/effect/turf_decal/stripes/line{
dir = 10
},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
/turf/open/floor/plasteel,
/area/science/xenobiology)
"cSn" = (
@@ -44477,10 +44495,16 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
/turf/open/floor/engine,
/area/science/xenobiology)
"cSr" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
/turf/open/floor/plasteel/white,
/area/science/xenobiology)
"cSs" = (
@@ -44492,6 +44516,9 @@
/obj/effect/turf_decal/stripes/line{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
/turf/open/floor/plasteel,
/area/science/xenobiology)
"cSt" = (
@@ -44510,6 +44537,9 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
/turf/open/floor/engine,
/area/science/xenobiology)
"cSw" = (
@@ -44523,6 +44553,9 @@
/obj/effect/turf_decal/stripes/line{
dir = 8
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
/turf/open/floor/plasteel,
/area/science/xenobiology)
"cSx" = (
@@ -44540,16 +44573,6 @@
/mob/living/simple_animal/slime,
/turf/open/floor/engine,
/area/science/xenobiology)
-"cSA" = (
-/obj/structure/cable/yellow{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/stripes/corner{
- dir = 1
- },
-/turf/open/floor/plasteel/white,
-/area/science/xenobiology)
"cSB" = (
/obj/structure/table/reinforced,
/obj/machinery/button/door{
@@ -44567,6 +44590,9 @@
/obj/effect/turf_decal/stripes/line{
dir = 5
},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
/turf/open/floor/plasteel,
/area/science/xenobiology)
"cSD" = (
@@ -44579,6 +44605,9 @@
name = "containment blast door"
},
/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
/turf/open/floor/plating,
/area/science/xenobiology)
"cSE" = (
@@ -44628,10 +44657,12 @@
/turf/open/floor/plasteel/white,
/area/science/xenobiology)
"cSK" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/effect/turf_decal/stripes/corner{
dir = 4
},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+ dir = 8
+ },
/turf/open/floor/plasteel/white,
/area/science/xenobiology)
"cSL" = (
@@ -44644,6 +44675,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 1
},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel/white,
/area/science/xenobiology)
"cSM" = (
@@ -44658,6 +44690,9 @@
/obj/effect/turf_decal/stripes/line{
dir = 10
},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
/turf/open/floor/plasteel,
/area/science/xenobiology)
"cSN" = (
@@ -44675,6 +44710,9 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
/turf/open/floor/engine,
/area/science/xenobiology)
"cSO" = (
@@ -44686,6 +44724,9 @@
/obj/effect/turf_decal/stripes/line{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
/turf/open/floor/plasteel,
/area/science/xenobiology)
"cSP" = (
@@ -44708,6 +44749,9 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
/turf/open/floor/engine,
/area/science/xenobiology)
"cSR" = (
@@ -44721,6 +44765,9 @@
/obj/effect/turf_decal/stripes/line{
dir = 8
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
/turf/open/floor/plasteel,
/area/science/xenobiology)
"cSS" = (
@@ -44740,6 +44787,9 @@
/obj/effect/turf_decal/stripes/line{
dir = 5
},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
/turf/open/floor/plasteel,
/area/science/xenobiology)
"cST" = (
@@ -44759,6 +44809,9 @@
/obj/effect/turf_decal/stripes/line{
dir = 5
},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+ dir = 1
+ },
/turf/open/floor/plasteel,
/area/science/xenobiology)
"cSV" = (
@@ -44806,6 +44859,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 1
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel/white,
/area/science/xenobiology)
"cTa" = (
@@ -44826,6 +44880,9 @@
/obj/effect/turf_decal/stripes/line{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
/turf/open/floor/plasteel,
/area/science/xenobiology)
"cTc" = (
@@ -44843,18 +44900,14 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
/turf/open/floor/engine,
/area/science/xenobiology)
"cTe" = (
-/obj/machinery/door/window/northleft{
- base_state = "right";
- dir = 8;
- icon_state = "right";
- name = "Containment Pen #6";
- req_access_txt = "55"
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 8
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
+ dir = 1
},
/turf/open/floor/plasteel,
/area/science/xenobiology)
@@ -44871,6 +44924,9 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
/turf/open/floor/engine,
/area/science/xenobiology)
"cTj" = (
@@ -44955,6 +45011,7 @@
},
/obj/structure/table/reinforced,
/obj/effect/turf_decal/stripes/line,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel,
/area/science/xenobiology)
"cTs" = (
@@ -44996,6 +45053,7 @@
/obj/item/clothing/glasses/science,
/obj/structure/table,
/obj/effect/turf_decal/stripes/line,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel,
/area/science/xenobiology)
"cTA" = (
@@ -45060,6 +45118,9 @@
icon_state = "1-2"
},
/obj/machinery/holopad,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
/turf/open/floor/plasteel/white,
/area/science/xenobiology)
"cUN" = (
@@ -45095,6 +45156,7 @@
icon_state = "4-8"
},
/obj/effect/turf_decal/stripes/line,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel/white,
/area/science/xenobiology)
"cVd" = (
@@ -45552,6 +45614,7 @@
/area/science/xenobiology)
"daC" = (
/obj/structure/sign/warning/electricshock,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/closed/wall/r_wall,
/area/science/xenobiology)
"daD" = (
@@ -46193,6 +46256,9 @@
/area/science/xenobiology)
"dcy" = (
/obj/machinery/holopad,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
/turf/open/floor/plasteel/white,
/area/science/xenobiology)
"dcz" = (
@@ -46207,8 +46273,8 @@
/turf/open/floor/plasteel/white,
/area/science/xenobiology)
"dcB" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
- dir = 8
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 9
},
/turf/open/floor/plasteel/white,
/area/science/xenobiology)
@@ -46358,6 +46424,9 @@
/obj/effect/turf_decal/stripes/corner{
dir = 8
},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
/turf/open/floor/plasteel/white,
/area/science/xenobiology)
"dcR" = (
@@ -46369,6 +46438,9 @@
name = "containment blast door"
},
/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
/turf/open/floor/plating,
/area/science/xenobiology)
"dcS" = (
@@ -46419,6 +46491,9 @@
/obj/effect/turf_decal/stripes/line{
dir = 10
},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
/turf/open/floor/plasteel,
/area/science/xenobiology)
"dcW" = (
@@ -46430,6 +46505,9 @@
name = "containment blast door"
},
/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
/turf/open/floor/plating,
/area/science/xenobiology)
"dcX" = (
@@ -46442,16 +46520,21 @@
name = "containment blast door"
},
/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
/turf/open/floor/plating,
/area/science/xenobiology)
"dcY" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/cable/yellow{
icon_state = "4-8"
},
/obj/effect/turf_decal/stripes/corner{
dir = 1
},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+ dir = 4
+ },
/turf/open/floor/plasteel/white,
/area/science/xenobiology)
"dcZ" = (
@@ -46476,6 +46559,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 9
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel,
/area/science/xenobiology)
"ddb" = (
@@ -46683,6 +46767,7 @@
name = "test chamber blast door"
},
/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plating,
/area/science/xenobiology)
"ddx" = (
@@ -49271,6 +49356,9 @@
/area/hallway/secondary/exit/departure_lounge)
"dDI" = (
/obj/effect/landmark/event_spawn,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 6
+ },
/turf/open/floor/plasteel/white,
/area/science/xenobiology)
"dDJ" = (
@@ -50816,6 +50904,14 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel,
/area/commons/fitness/recreation)
+"ezU" = (
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/plasteel/white,
+/area/science/xenobiology)
"eAd" = (
/obj/machinery/door/airlock/highsecurity{
name = "Secure Tech Storage";
@@ -53469,6 +53565,13 @@
},
/turf/open/floor/wood,
/area/service/theater)
+"ggU" = (
+/obj/machinery/atmospherics/components/binary/pump/on{
+ dir = 8;
+ name = "Air to Distro"
+ },
+/turf/open/floor/plasteel/white,
+/area/science/xenobiology)
"ghb" = (
/turf/open/floor/plating,
/area/engineering/main)
@@ -54419,6 +54522,12 @@
},
/turf/open/floor/plasteel,
/area/security/office)
+"gLN" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+ dir = 8
+ },
+/turf/open/floor/engine,
+/area/science/xenobiology)
"gLV" = (
/obj/machinery/vending/boozeomat,
/obj/machinery/light/small{
@@ -54656,6 +54765,12 @@
/obj/item/clothing/under/suit/tan,
/turf/open/floor/carpet,
/area/commons/dorms)
+"gTs" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+ dir = 1
+ },
+/turf/open/floor/engine,
+/area/science/xenobiology)
"gTN" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 10
@@ -54783,6 +54898,9 @@
/obj/effect/turf_decal/stripes/line{
dir = 5
},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+ dir = 1
+ },
/turf/open/floor/plasteel,
/area/engineering/gravity_generator)
"gZF" = (
@@ -56621,6 +56739,12 @@
"icE" = (
/turf/closed/wall,
/area/security/office)
+"idm" = (
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+ dir = 1
+ },
+/turf/open/floor/plasteel/white,
+/area/science/xenobiology)
"idx" = (
/obj/structure/cable/yellow{
icon_state = "2-8"
@@ -57342,6 +57466,11 @@
"izZ" = (
/turf/open/floor/engine/n2o,
/area/engineering/atmos)
+"iAD" = (
+/obj/structure/sign/warning/electricshock,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/closed/wall/r_wall,
+/area/science/xenobiology)
"iAK" = (
/obj/structure/window/reinforced,
/obj/effect/turf_decal/tile/red{
@@ -57468,6 +57597,9 @@
/obj/effect/turf_decal/stripes/line{
dir = 9
},
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 4
+ },
/turf/open/floor/plasteel,
/area/engineering/gravity_generator)
"iFq" = (
@@ -57645,6 +57777,12 @@
},
/turf/open/floor/plasteel/dark,
/area/ai_monitored/command/nuke_storage)
+"iIk" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/turf/open/floor/engine,
+/area/science/xenobiology)
"iIJ" = (
/obj/item/instrument/violin,
/obj/structure/table/wood,
@@ -58605,6 +58743,12 @@
},
/turf/open/floor/plasteel,
/area/service/bar)
+"jqj" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 8
+ },
+/turf/open/floor/engine,
+/area/science/xenobiology)
"jra" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -60105,6 +60249,13 @@
},
/turf/open/floor/plasteel,
/area/engineering/break_room)
+"kje" = (
+/obj/machinery/atmospherics/components/unary/portables_connector/visible{
+ dir = 8;
+ name = "Xenobiology air connection"
+ },
+/turf/open/floor/plasteel/white,
+/area/science/xenobiology)
"kjA" = (
/obj/item/clothing/gloves/color/yellow,
/obj/item/clothing/gloves/color/yellow,
@@ -61596,6 +61747,12 @@
dir = 5
},
/area/service/kitchen)
+"lbz" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+ dir = 4
+ },
+/turf/open/floor/engine,
+/area/science/xenobiology)
"lbV" = (
/obj/item/folder/white{
pixel_x = 4;
@@ -61820,6 +61977,12 @@
},
/turf/open/floor/plasteel,
/area/service/hydroponics/garden)
+"lhY" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 1
+ },
+/turf/open/floor/engine,
+/area/science/xenobiology)
"lix" = (
/obj/structure/window/reinforced{
dir = 1
@@ -63141,6 +63304,12 @@
dir = 1
},
/area/engineering/atmos)
+"lYC" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 1
+ },
+/turf/open/floor/plasteel/white,
+/area/science/xenobiology)
"lYW" = (
/obj/machinery/disposal/bin,
/obj/structure/disposalpipe/trunk{
@@ -65519,6 +65688,16 @@
},
/turf/open/floor/plating,
/area/commons/fitness/pool)
+"nBJ" = (
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/turf/open/floor/plasteel/white,
+/area/science/xenobiology)
"nBX" = (
/obj/structure/table/wood,
/obj/item/paper_bin{
@@ -65816,6 +65995,10 @@
/obj/effect/landmark/event_spawn,
/turf/open/floor/wood,
/area/service/library)
+"nPc" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/closed/wall,
+/area/science/xenobiology)
"nPf" = (
/obj/structure/disposalpipe/segment{
dir = 6
@@ -70937,10 +71120,10 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 1
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
- },
/obj/effect/turf_decal/stripes/line,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
+ dir = 1
+ },
/turf/open/floor/plasteel,
/area/engineering/gravity_generator)
"qID" = (
@@ -73740,11 +73923,6 @@
},
/turf/open/floor/plasteel/dark,
/area/ai_monitored/command/storage/eva)
-"spO" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/atmospherics/pipe/simple/yellow/visible,
-/turf/open/floor/plating,
-/area/engineering/atmos)
"spZ" = (
/obj/structure/chair/stool,
/turf/open/floor/plasteel/chapel,
@@ -75262,6 +75440,10 @@
dir = 5
},
/area/service/kitchen)
+"tpE" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/engine,
+/area/science/xenobiology)
"tpO" = (
/obj/structure/cable/yellow{
icon_state = "1-2"
@@ -76675,13 +76857,18 @@
},
/turf/open/floor/wood,
/area/service/library)
+"uiZ" = (
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/turf/open/floor/plasteel/white,
+/area/science/xenobiology)
"ujb" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 5
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/turf/open/floor/plasteel,
/area/engineering/gravity_generator)
"ujE" = (
@@ -78599,6 +78786,13 @@
/obj/effect/landmark/start/atmospheric_technician,
/turf/open/floor/plasteel,
/area/engineering/atmos)
+"vzs" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 8
+ },
+/mob/living/simple_animal/slime,
+/turf/open/floor/engine,
+/area/science/xenobiology)
"vzO" = (
/obj/effect/turf_decal/stripes/line{
dir = 5
@@ -79000,6 +79194,10 @@
},
/turf/open/floor/plasteel/dark,
/area/engineering/storage/tech)
+"vNv" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/closed/wall,
+/area/science/xenobiology)
"vNx" = (
/obj/machinery/computer/security,
/obj/machinery/computer/security/telescreen{
@@ -81539,6 +81737,12 @@
},
/turf/open/floor/plasteel,
/area/commons/toilet/auxiliary)
+"xjK" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 4
+ },
+/turf/open/floor/engine,
+/area/science/xenobiology)
"xjY" = (
/obj/machinery/holopad,
/turf/open/floor/wood,
@@ -82350,6 +82554,12 @@
dir = 1
},
/area/engineering/atmos)
+"xGQ" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/turf/open/floor/engine,
+/area/science/xenobiology)
"xGS" = (
/obj/structure/window/reinforced{
dir = 8
@@ -82432,6 +82642,10 @@
},
/turf/open/floor/plasteel,
/area/cargo/storage)
+"xIL" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/engine,
+/area/science/xenobiology)
"xJf" = (
/obj/structure/window/reinforced{
dir = 8
@@ -116073,16 +116287,16 @@ cRi
cRe
cRi
cSg
-cSn
-cSn
+lbz
+xjK
cSd
cSg
-cSn
-cSn
+lbz
+xjK
cSd
cSg
-cSn
-cSn
+lbz
+xjK
cRi
cTA
cTn
@@ -116330,16 +116544,16 @@ cRi
cRD
cSd
cSg
-cSn
-cSn
+xGQ
+iIk
cSd
cSg
-cSn
-cSn
+xGQ
+iIk
cSd
cSg
-cSn
-cSn
+xGQ
+iIk
cRi
cRi
cTq
@@ -116854,14 +117068,14 @@ cSI
cSj
cTb
cST
-cSd
+nPc
cSL
cVa
cTr
cRY
daC
-cSn
-cSn
+xIL
+lhY
cSn
cRi
dmq
@@ -117102,11 +117316,11 @@ dcG
cSe
cSi
cSr
-cSA
+dcY
cSG
cSK
cSr
-cSA
+dcY
cSW
cSK
cSr
@@ -117358,15 +117572,15 @@ cRk
dcH
cSf
cSl
-cSJ
+uiZ
cSa
cSJ
-cSJ
+nBJ
cUM
cUN
cSJ
-cSJ
-cSJ
+nBJ
+uiZ
cSV
cSJ
cSX
@@ -117882,14 +118096,14 @@ cSI
dcV
cTe
dda
-cSd
+vNv
cSZ
-ddn
+ezU
cTz
ddv
-daC
-cSn
-cSn
+iAD
+tpE
+gTs
daN
cRi
dmr
@@ -118124,8 +118338,8 @@ aaa
cRi
doj
dcp
-cSt
-cSt
+idm
+lYC
dcK
cSd
cRW
@@ -118385,16 +118599,16 @@ dcy
cSt
dcL
cSd
-cSn
-cSn
+iIk
+xGQ
cSg
cSd
-cSn
-cSn
+iIk
+xGQ
cSg
cSd
-cSn
-cSn
+iIk
+xGQ
cSg
cRi
cRi
@@ -118638,20 +118852,20 @@ aaa
cRi
dce
cSt
-cSt
+ggU
dcC
dcM
cSd
-cSn
-cSn
+iIk
+gLN
cSg
cSd
-cSn
-cSn
+iIk
+gLN
cSg
cSd
-cSn
-cSn
+iIk
+gLN
cSg
cRi
ddh
@@ -118895,19 +119109,19 @@ aaa
cRi
dcf
dcr
-dcr
+kje
dcD
dcN
cSd
-cSn
+jqj
cSx
cSF
cSd
-cSy
+vzs
dbp
cSF
cSd
-cSn
+jqj
dbt
cSF
cRi
@@ -125275,7 +125489,7 @@ mMn
mMn
iAK
tie
-spO
+rid
cfw
mTL
ilE
@@ -125729,7 +125943,7 @@ mNX
xXs
pHX
qIq
-kCp
+jgc
gZo
nPJ
kCp
@@ -126303,7 +126517,7 @@ mMn
tSa
guR
elE
-spO
+rid
cfw
mTL
ygg
diff --git a/_maps/shuttles/pirate_default.dmm b/_maps/shuttles/pirate_default.dmm
index e23159a2bd..56d0ca606f 100644
--- a/_maps/shuttles/pirate_default.dmm
+++ b/_maps/shuttles/pirate_default.dmm
@@ -1,102 +1,415 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"aa" = (
-/obj/structure/chair/comfy/shuttle{
- dir = 1
+/obj/machinery/porta_turret/syndicate/energy/pirate{
+ dir = 1;
+ faction = list("pirate");
+ icon_state = "standard_lethal"
},
-/obj/machinery/light/small{
- dir = 8
- },
-/obj/machinery/airalarm/all_access{
- dir = 4;
- pixel_x = -24
- },
-/obj/machinery/atmospherics/components/unary/vent_pump/on,
-/obj/machinery/atmospherics/components/unary/vent_pump/on,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/pod/dark,
+/turf/closed/wall/r_wall/syndicate/pirate/nodiagonal,
/area/shuttle/pirate)
"ab" = (
-/obj/structure/table,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/recharger,
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
- dir = 8
- },
-/turf/open/floor/plasteel/dark,
+/obj/structure/grille,
+/turf/open/floor/plating/airless,
/area/shuttle/pirate)
"ac" = (
-/obj/machinery/computer/shuttle/pirate,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
- dir = 8
+/obj/structure/girder,
+/obj/item/stack/rods{
+ amount = 3
},
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plating/airless,
/area/shuttle/pirate)
"ad" = (
-/obj/structure/table,
-/obj/machinery/button/door{
- id = "piratebridge";
- name = "Bridge Shutters Control";
- pixel_y = -5
+/obj/structure/girder,
+/obj/item/stack/rods{
+ amount = 5
},
-/obj/item/radio/intercom{
- pixel_y = 5
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
- dir = 4
- },
-/obj/effect/turf_decal/tile/red{
- dir = 8
- },
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plating/airless,
/area/shuttle/pirate)
"ae" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/turf/open/floor/plasteel/dark,
+/turf/closed/wall/r_wall/syndicate/pirate,
/area/shuttle/pirate)
"af" = (
/turf/template_noop,
/area/template_noop)
"ag" = (
-/obj/structure/chair/comfy/shuttle{
- dir = 1
- },
-/turf/open/floor/plasteel/dark,
+/obj/structure/window/reinforced,
+/obj/structure/frame/machine,
+/obj/item/crowbar,
+/turf/open/floor/plating/airless,
/area/shuttle/pirate)
"ah" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/tile/red{
- dir = 4
- },
-/turf/open/floor/plasteel/dark,
+/obj/structure/window/reinforced,
+/obj/structure/frame/machine,
+/obj/item/stack/cable_coil/cut/red,
+/turf/open/floor/plating/airless,
/area/shuttle/pirate)
"ai" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
- dir = 1
+/obj/structure/window/reinforced{
+ dir = 1;
+ pixel_y = 1
+ },
+/obj/structure/frame/computer{
+ anchored = 1
},
/obj/effect/decal/cleanable/dirt,
-/obj/machinery/light/small,
/turf/open/floor/pod/dark,
/area/shuttle/pirate)
"aj" = (
/turf/closed/wall/r_wall/syndicate/pirate/nodiagonal,
/area/shuttle/pirate)
"ak" = (
-/obj/machinery/airalarm/all_access{
+/obj/structure/grille,
+/obj/structure/window/plastitanium/pirate,
+/obj/machinery/door/poddoor/shutters{
+ id = "cuttershutters";
+ name = "Blast Shutters"
+ },
+/turf/open/floor/plating,
+/area/shuttle/pirate)
+"al" = (
+/obj/structure/chair/comfy/shuttle{
+ dir = 1
+ },
+/obj/machinery/light/small{
+ dir = 8
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on,
+/obj/machinery/atmospherics/components/unary/vent_pump/on,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/airalarm/syndicate{
dir = 4;
pixel_x = -24
},
+/turf/open/floor/pod/dark,
+/area/shuttle/pirate)
+"am" = (
+/obj/structure/rack,
+/obj/machinery/nuclearbomb/beer{
+ desc = "A nuclear fission warhead designed to be fired from a high-speed matter-propellent cannon to turn some unlucky sod in the distance into a sun. This one has a jolly roger crudely painted on the side of it. Interestingly, there's a tap on the back and it sloshes when it moves.";
+ name = "\improper Very Real Nuclear Explosive"
+ },
/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/pod/dark,
+/area/shuttle/pirate)
+"an" = (
+/obj/machinery/porta_turret/syndicate/energy/pirate{
+ dir = 4;
+ faction = list("pirate");
+ icon_state = "standard_lethal"
+ },
+/turf/closed/wall/r_wall/syndicate/pirate,
+/area/shuttle/pirate)
+"aq" = (
+/obj/structure/rack,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/pod/dark,
+/area/shuttle/pirate)
+"ar" = (
+/obj/structure/chair/comfy/shuttle{
+ dir = 1
+ },
+/obj/machinery/light/small{
+ dir = 4
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/airalarm/syndicate{
+ dir = 8;
+ pixel_x = 24
+ },
+/turf/open/floor/pod/dark,
+/area/shuttle/pirate)
+"as" = (
+/obj/machinery/door/airlock/hatch{
+ aiControlDisabled = 1;
+ name = "Port Gun Battery";
+ req_access_txt = "150"
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/barricade/wooden/crude{
+ layer = 3.13
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/pod/dark,
+/area/shuttle/pirate)
+"at" = (
+/obj/machinery/door/poddoor/shutters/preopen{
+ id = "piratebridge"
+ },
+/obj/structure/grille,
+/obj/structure/window/plastitanium/pirate,
+/obj/machinery/door/poddoor/shutters{
+ id = "cuttershutters";
+ name = "Blast Shutters"
+ },
+/turf/open/floor/plating,
+/area/shuttle/pirate)
+"ay" = (
+/obj/machinery/recharger{
+ pixel_x = -4;
+ pixel_y = 4
+ },
+/obj/structure/table/reinforced,
+/obj/machinery/button/door{
+ id = "cuttershutters";
+ name = "Corvette Shutters Control";
+ pixel_x = 6;
+ pixel_y = -3;
+ req_access_txt = "150"
+ },
+/obj/effect/turf_decal/stripes/corner{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/pod/dark,
+/area/shuttle/pirate)
+"az" = (
+/obj/machinery/door/airlock/hatch{
+ aiControlDisabled = 1;
+ name = "Starboard Gun Battery";
+ req_access_txt = "150"
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/barricade/wooden/crude{
+ layer = 3.13
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/pod/dark,
+/area/shuttle/pirate)
+"aA" = (
+/obj/machinery/porta_turret/syndicate/energy/pirate{
+ dir = 8;
+ faction = list("pirate");
+ icon_state = "standard_lethal"
+ },
+/turf/closed/wall/r_wall/syndicate/pirate,
+/area/shuttle/pirate)
+"aB" = (
+/obj/effect/turf_decal/tile/bar,
+/obj/effect/turf_decal/tile/bar{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel,
+/area/shuttle/pirate)
+"aC" = (
+/obj/structure/rack{
+ icon = 'icons/obj/stationobjs.dmi';
+ icon_state = "minibar_left";
+ name = "skeletal minibar"
+ },
+/obj/machinery/chem_dispenser/drinks{
+ dir = 0;
+ pixel_y = 12
+ },
+/obj/effect/turf_decal/tile/bar,
+/obj/effect/turf_decal/tile/bar{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel,
+/area/shuttle/pirate)
+"aD" = (
+/obj/structure/rack{
+ icon = 'icons/obj/stationobjs.dmi';
+ icon_state = "minibar_right";
+ name = "skeletal minibar"
+ },
+/obj/effect/turf_decal/tile/bar,
+/obj/effect/turf_decal/tile/bar{
+ dir = 1
+ },
+/obj/item/bedsheet/pirate{
+ pixel_y = 8
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light{
+ dir = 1
+ },
+/turf/open/floor/plasteel,
+/area/shuttle/pirate)
+"aE" = (
+/obj/machinery/vending/boozeomat,
+/obj/effect/turf_decal/tile/bar,
+/obj/effect/turf_decal/tile/bar{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/bar,
+/obj/effect/turf_decal/tile/bar{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel,
+/area/shuttle/pirate)
+"aF" = (
+/obj/effect/turf_decal/bot,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/computer/shuttle/pirate,
+/turf/open/floor/pod/dark,
+/area/shuttle/pirate)
+"aG" = (
+/obj/structure/chair/comfy/shuttle{
+ dir = 8
+ },
+/obj/machinery/turretid{
+ icon_state = "control_kill";
+ lethal = 1;
+ locked = 0;
+ pixel_y = -24;
+ req_access = "150"
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 9
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/mineral/plastitanium/red,
+/area/shuttle/pirate)
+"aH" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/airalarm/syndicate{
+ dir = 1;
+ pixel_y = -24
+ },
+/turf/open/floor/mineral/plastitanium/red,
+/area/shuttle/pirate)
+"aI" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on,
+/obj/structure/cable/yellow{
+ icon_state = "2-4"
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/mineral/plastitanium/red,
+/area/shuttle/pirate)
+"aJ" = (
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/firealarm{
+ dir = 1;
+ pixel_y = -24
+ },
+/turf/open/floor/mineral/plastitanium/red,
+/area/shuttle/pirate)
+"aK" = (
+/obj/structure/chair/comfy/shuttle{
+ dir = 4
+ },
+/obj/machinery/button/door{
+ id = "piratebridgebolt";
+ name = "Bridge Bolt Control";
+ normaldoorcontrol = 1;
+ pixel_y = -24;
+ req_access_txt = "150";
+ specialfunctions = 4
+ },
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 5
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/mineral/plastitanium/red,
+/area/shuttle/pirate)
+"aL" = (
+/obj/machinery/computer/security,
+/obj/effect/turf_decal/bot,
+/obj/effect/turf_decal/stripes/corner,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/pod/dark,
+/area/shuttle/pirate)
+"aM" = (
+/obj/structure/table/reinforced,
+/obj/item/storage/backpack/duffelbag/med{
+ pixel_y = 8
+ },
+/obj/item/wirecutters{
+ pixel_y = 8
+ },
+/obj/item/weldingtool/mini{
+ pixel_y = -6
+ },
+/obj/item/reagent_containers/medspray/sterilizine{
+ pixel_x = 6;
+ pixel_y = -12
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/pod/dark,
+/area/shuttle/pirate)
+"aN" = (
+/obj/structure/table/optable,
+/obj/effect/decal/cleanable/blood/old,
+/obj/effect/decal/cleanable/robot_debris{
+ layer = 2.81;
+ pixel_x = -2;
+ pixel_y = 6
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/sign/poster/contraband/random{
+ pixel_y = 32
+ },
+/obj/machinery/light{
+ dir = 1
+ },
+/obj/effect/turf_decal/bot_white,
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/pirate)
+"aO" = (
+/obj/structure/window/reinforced{
+ dir = 4
+ },
+/obj/structure/frame/computer{
+ anchored = 1;
+ dir = 8
+ },
+/obj/structure/sign/departments/showers{
+ pixel_y = 32
+ },
+/obj/item/shard{
+ pixel_x = -4;
+ pixel_y = -4
+ },
+/obj/effect/decal/cleanable/glass,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/bot_white,
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/pirate)
+"aP" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/mineral/plastitanium/red,
+/area/shuttle/pirate)
+"aQ" = (
+/obj/machinery/shuttle_scrambler,
+/obj/item/radio/intercom{
+ freerange = 1;
+ name = "Station Intercom (General)";
+ pixel_x = -26
+ },
+/obj/effect/turf_decal/box,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light{
+ dir = 8
+ },
+/turf/open/floor/pod/dark,
+/area/shuttle/pirate)
+"aR" = (
/obj/machinery/light/small{
dir = 8
},
@@ -116,31 +429,30 @@
pixel_y = -6
},
/obj/item/reagent_containers/food/snacks/chocolatebar,
-/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/tile/bar,
/obj/effect/turf_decal/tile/bar{
dir = 1
},
/obj/item/reagent_containers/food/condiment/milk,
-/obj/item/reagent_containers/food/condiment/milk,
+/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel,
/area/shuttle/pirate)
-"al" = (
-/obj/machinery/loot_locator,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/tile/red{
+"aS" = (
+/obj/effect/turf_decal/tile/bar,
+/obj/effect/turf_decal/tile/bar{
dir = 1
},
-/obj/effect/turf_decal/tile/red{
- dir = 4
- },
-/obj/effect/turf_decal/tile/red{
- dir = 8
- },
-/turf/open/floor/plasteel/dark,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/blood/old,
+/turf/open/floor/plasteel,
/area/shuttle/pirate)
-"am" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on,
+"aT" = (
+/obj/machinery/door/airlock/hatch{
+ aiControlDisabled = 1;
+ id_tag = "piratebridgebolt";
+ name = "Bridge";
+ req_access_txt = "150"
+ },
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
@@ -151,60 +463,82 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
-/turf/open/floor/plasteel/dark,
-/area/shuttle/pirate)
-"an" = (
-/obj/structure/chair/comfy/shuttle{
- dir = 4
- },
-/obj/machinery/button/door{
- id = "piratebridgebolt";
- name = "Bridge Bolt Control";
- normaldoorcontrol = 1;
- pixel_y = -24;
- specialfunctions = 4
- },
-/obj/effect/turf_decal/tile/red,
-/turf/open/floor/plasteel/dark,
-/area/shuttle/pirate)
-"ao" = (
-/obj/structure/chair/comfy/shuttle{
- dir = 1
- },
-/obj/machinery/light/small{
- dir = 4
- },
-/obj/machinery/airalarm/all_access{
- dir = 8;
- pixel_x = 24
- },
-/obj/machinery/atmospherics/components/unary/vent_pump/on,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/pod/dark,
-/area/shuttle/pirate)
-"ap" = (
-/obj/machinery/door/airlock/hatch{
- name = "Port Gun Battery"
- },
-/obj/structure/barricade/wooden/crude,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/door/firedoor,
+/turf/open/floor/pod/dark,
+/area/shuttle/pirate)
+"aU" = (
+/obj/structure/table/reinforced,
+/obj/structure/window/reinforced,
+/obj/item/book/manual/wiki/surgery{
+ pixel_x = -2;
+ pixel_y = 4
+ },
+/obj/item/clipboard{
+ pixel_x = 2
+ },
+/obj/item/clothing/gloves/color/latex,
+/obj/item/clothing/suit/apron/surgical,
+/obj/item/clothing/mask/surgical,
+/obj/item/surgical_drapes,
+/obj/item/scalpel{
+ pixel_y = 16
+ },
+/obj/item/wrench{
+ pixel_y = 12
+ },
+/obj/item/pen{
+ pixel_x = -4;
+ pixel_y = 12
+ },
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/pod/dark,
/area/shuttle/pirate)
-"aq" = (
-/obj/structure/chair/stool,
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
+"aV" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/blood/old,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/pod/dark,
+/area/shuttle/pirate)
+"aW" = (
+/obj/structure/window/reinforced{
dir = 4
},
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
- dir = 1
+/obj/structure/window/reinforced,
+/obj/structure/sink{
+ dir = 4;
+ pixel_x = 6
+ },
+/obj/machinery/shower{
+ dir = 1;
+ pixel_y = 4
+ },
+/obj/structure/curtain,
+/obj/effect/decal/cleanable/blood/old,
+/obj/structure/window/reinforced{
+ dir = 1;
+ pixel_y = 1
},
-/turf/open/floor/plasteel,
-/area/shuttle/pirate)
-"ar" = (
/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/box/white,
+/turf/open/floor/pod/dark,
+/area/shuttle/pirate)
+"aX" = (
+/obj/structure/closet/crate/medical,
+/obj/effect/turf_decal/bot,
+/obj/effect/decal/cleanable/blood/old,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/clothing/under/rank/medical/doctor/blue,
+/obj/item/clothing/shoes/sneakers/white,
+/turf/open/floor/pod/dark,
+/area/shuttle/pirate)
+"aY" = (
/obj/structure/table,
/obj/item/storage/fancy/cigarettes{
pixel_x = 2;
@@ -232,388 +566,853 @@
pixel_x = -10;
pixel_y = -2
},
-/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/tile/bar,
/obj/effect/turf_decal/tile/bar{
dir = 1
},
-/turf/open/floor/plasteel,
-/area/shuttle/pirate)
-"as" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on,
-/obj/structure/closet/secure_closet/personal,
/obj/effect/decal/cleanable/dirt,
-/obj/item/bedsheet/pirate,
+/obj/structure/sign/poster/official/high_class_martini{
+ pixel_x = -32
+ },
/turf/open/floor/plasteel,
/area/shuttle/pirate)
-"at" = (
-/obj/structure/closet/secure_closet/personal,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/item/bedsheet/pirate,
-/turf/open/floor/plasteel,
-/area/shuttle/pirate)
-"au" = (
-/obj/machinery/door/airlock/hatch{
- id_tag = "piratebridgebolt";
- name = "Bridge"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/tile/neutral{
+"aZ" = (
+/obj/structure/chair/stool,
+/obj/effect/turf_decal/tile/bar,
+/obj/effect/turf_decal/tile/bar{
dir = 1
},
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral{
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 8
},
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
/area/shuttle/pirate)
-"av" = (
-/obj/machinery/door/airlock/hatch{
- name = "Starboard Gun Battery"
+"ba" = (
+/obj/structure/table/wood,
+/obj/item/reagent_containers/food/drinks/bottle/whiskey{
+ pixel_x = -4;
+ pixel_y = 4
+ },
+/obj/item/shard,
+/obj/item/chair/stool/bar,
+/obj/effect/turf_decal/tile/bar,
+/obj/effect/turf_decal/tile/bar{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/glass,
+/turf/open/floor/plasteel,
+/area/shuttle/pirate)
+"bb" = (
+/obj/structure/table/wood,
+/obj/item/reagent_containers/food/drinks/flask,
+/obj/item/reagent_containers/food/condiment/milk{
+ pixel_x = -12;
+ pixel_y = 4
+ },
+/obj/effect/turf_decal/tile/bar,
+/obj/effect/turf_decal/tile/bar{
+ dir = 1
+ },
+/obj/structure/sign/poster/contraband/random{
+ pixel_x = 32
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel,
+/area/shuttle/pirate)
+"bc" = (
+/obj/structure/chair/comfy/shuttle{
+ dir = 1
},
-/obj/structure/barricade/wooden/crude,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/pod/dark,
/area/shuttle/pirate)
-"aw" = (
+"bd" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/pod/dark,
+/area/shuttle/pirate)
+"be" = (
+/obj/machinery/loot_locator,
+/obj/item/radio/intercom{
+ dir = 4;
+ name = "Station Intercom (General)";
+ pixel_x = 27
+ },
+/obj/effect/turf_decal/box,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light{
+ dir = 4
+ },
+/turf/open/floor/pod/dark,
+/area/shuttle/pirate)
+"bf" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
+/obj/effect/turf_decal/stripes/corner{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/mineral/plastitanium/red,
+/area/shuttle/pirate)
+"bg" = (
+/obj/machinery/power/apc{
+ dir = 1;
+ name = "Pirate Corvette APC";
+ pixel_y = 23;
+ req_access = null
+ },
+/obj/structure/cable/yellow{
+ icon_state = "0-2"
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/blood/old,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/mineral/plastitanium/red,
+/area/shuttle/pirate)
+"bh" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light{
+ dir = 1
+ },
+/obj/machinery/airalarm/syndicate{
+ pixel_y = 24
+ },
+/turf/open/floor/mineral/plastitanium/red,
+/area/shuttle/pirate)
+"bi" = (
+/obj/effect/turf_decal/delivery,
+/obj/machinery/door/poddoor/shutters{
+ id = "cuttermedbay";
+ name = "Blast Shutters"
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/pod/dark,
+/area/shuttle/pirate)
+"bj" = (
+/obj/effect/turf_decal/caution/stand_clear/white{
+ dir = 4
+ },
+/obj/effect/turf_decal/bot_white,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/door/firedoor,
+/turf/open/floor/pod/dark,
+/area/shuttle/pirate)
+"bk" = (
+/obj/structure/sign/departments/medbay/alt{
+ pixel_x = -32;
+ pixel_y = 32
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/turf/open/floor/mineral/plastitanium/red,
+/area/shuttle/pirate)
+"bl" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/turf/open/floor/mineral/plastitanium/red,
+/area/shuttle/pirate)
+"bm" = (
+/obj/effect/decal/cleanable/vomit/old,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 4
+ },
+/turf/open/floor/mineral/plastitanium/red,
+/area/shuttle/pirate)
+"bn" = (
+/obj/effect/decal/cleanable/blood/old,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/corner{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+ dir = 4
+ },
+/turf/open/floor/mineral/plastitanium/red,
+/area/shuttle/pirate)
+"bo" = (
+/obj/machinery/sleeper{
+ dir = 8
+ },
+/obj/effect/turf_decal/delivery,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/sign/poster/official/medical_green_cross{
+ pixel_x = 32
+ },
+/turf/open/floor/pod/dark,
+/area/shuttle/pirate)
+"bq" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/plasteel/dark,
+/area/shuttle/pirate)
+"br" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/dark,
+/area/shuttle/pirate)
+"bs" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/blood/old,
+/turf/open/floor/plasteel/dark,
+/area/shuttle/pirate)
+"bt" = (
+/obj/structure/chair/stool/bar,
+/obj/item/shard,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/glass,
+/turf/open/floor/plasteel/dark,
+/area/shuttle/pirate)
+"bu" = (
+/obj/structure/chair/office/dark{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/sign/departments/cargo{
+ pixel_x = -32
+ },
+/turf/open/floor/mineral/plastitanium/red,
+/area/shuttle/pirate)
+"bv" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/mineral/plastitanium/red,
+/area/shuttle/pirate)
+"bw" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/structure/cable/yellow{
+ icon_state = "2-4"
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/mineral/plastitanium/red,
+/area/shuttle/pirate)
+"bx" = (
+/obj/effect/turf_decal/stripes/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/corner,
+/obj/effect/turf_decal/stripes/corner{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+ dir = 8
+ },
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/obj/structure/cable/yellow{
+ icon_state = "1-8"
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/mineral/plastitanium/red,
+/area/shuttle/pirate)
+"by" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/structure/cable/yellow{
+ icon_state = "1-8"
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/mineral/plastitanium/red,
+/area/shuttle/pirate)
+"bz" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/mineral/plastitanium/red,
+/area/shuttle/pirate)
+"bA" = (
+/obj/effect/turf_decal/delivery,
+/obj/machinery/door/poddoor/shutters{
+ id = "cuttermedbay";
+ name = "Blast Shutters"
+ },
+/obj/machinery/button/door{
+ id = "cuttermedbay";
+ pixel_y = -24;
+ req_access_txt = "150"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/pod/dark,
+/area/shuttle/pirate)
+"bB" = (
+/obj/effect/turf_decal/caution/stand_clear/white{
+ dir = 4
+ },
+/obj/effect/turf_decal/bot_white,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/machinery/door/firedoor,
+/turf/open/floor/pod/dark,
+/area/shuttle/pirate)
+"bC" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/stripes/line,
+/obj/structure/sign/departments/examroom{
+ pixel_x = -32;
+ pixel_y = -32
+ },
+/turf/open/floor/mineral/plastitanium/red,
+/area/shuttle/pirate)
+"bD" = (
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/stripes/corner{
+ dir = 1
+ },
+/turf/open/floor/mineral/plastitanium/red,
+/area/shuttle/pirate)
+"bE" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/stripes/corner,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/turf/open/floor/mineral/plastitanium/red,
+/area/shuttle/pirate)
+"bF" = (
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 9
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/stripes/line{
+ dir = 6
+ },
+/obj/structure/sign/directions/dorms{
+ dir = 1;
+ pixel_y = -22
+ },
+/turf/open/floor/mineral/plastitanium/red,
+/area/shuttle/pirate)
+"bG" = (
+/obj/machinery/sleeper{
+ dir = 8
+ },
+/obj/effect/turf_decal/delivery,
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/firealarm{
+ dir = 8;
+ pixel_x = 24
+ },
+/turf/open/floor/pod/dark,
+/area/shuttle/pirate)
+"bH" = (
+/obj/structure/table,
+/obj/machinery/microwave{
+ pixel_y = 5
+ },
+/obj/item/book/manual/wiki/barman_recipes{
+ pixel_x = -8
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/dark,
+/area/shuttle/pirate)
+"bI" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 5
},
/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
- dir = 1
- },
-/turf/open/floor/plasteel,
-/area/shuttle/pirate)
-"ax" = (
-/obj/machinery/firealarm{
- pixel_y = 24
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
- dir = 1
- },
-/turf/open/floor/plasteel,
-/area/shuttle/pirate)
-"ay" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 10
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/vomit/old,
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
- dir = 1
- },
-/turf/open/floor/plasteel,
-/area/shuttle/pirate)
-"az" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/table,
-/obj/machinery/chem_dispenser/drinks{
- dir = 8
- },
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
- dir = 1
- },
-/turf/open/floor/plasteel,
-/area/shuttle/pirate)
-"aA" = (
-/obj/structure/closet/secure_closet/personal,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/stripes/line,
-/obj/item/bedsheet/pirate,
-/turf/open/floor/wood,
-/area/shuttle/pirate)
-"aB" = (
-/obj/machinery/light/small{
- dir = 4
- },
-/obj/machinery/computer/monitor/secret{
- dir = 8
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/airalarm/all_access{
+/obj/item/chair/stool,
+/obj/machinery/light,
+/obj/machinery/airalarm/syndicate{
dir = 1;
pixel_y = -24
},
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
- dir = 8
- },
/turf/open/floor/plasteel/dark,
/area/shuttle/pirate)
-"aC" = (
-/obj/machinery/shuttle_scrambler,
+"bJ" = (
/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
- dir = 4
- },
-/turf/open/floor/plasteel/dark,
-/area/shuttle/pirate)
-"aD" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
-/area/shuttle/pirate)
-"aF" = (
-/obj/machinery/door/airlock/external/glass{
- id_tag = "pirateportexternal"
- },
-/obj/effect/mapping_helpers/airlock/locked,
-/obj/effect/mapping_helpers/airlock/cyclelink_helper,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
-/area/shuttle/pirate)
-"aG" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/machinery/power/port_gen/pacman{
- anchored = 1
- },
-/obj/structure/cable{
- icon_state = "0-4"
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
-/area/shuttle/pirate)
-"aH" = (
-/obj/structure/shuttle/engine/propulsion/left,
-/turf/open/floor/plating/airless,
-/area/shuttle/pirate)
-"aI" = (
-/obj/machinery/light/small{
- dir = 8
- },
-/obj/structure/sign/warning/vacuum/external{
- pixel_x = -32
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
-/area/shuttle/pirate)
-"aJ" = (
-/obj/machinery/door/airlock/external/glass{
- id_tag = "pirateportexternal"
- },
-/obj/effect/mapping_helpers/airlock/locked,
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 1
- },
-/obj/structure/fans/tiny,
-/turf/open/floor/plating,
-/area/shuttle/pirate)
-"aK" = (
-/obj/structure/shuttle/engine/propulsion,
-/turf/open/floor/plating/airless,
-/area/shuttle/pirate)
-"aL" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
-/area/shuttle/pirate)
-"aN" = (
-/obj/machinery/light/small,
-/obj/machinery/button/door{
- id = "pirateportexternal";
- name = "External Bolt Control";
- normaldoorcontrol = 1;
- pixel_x = -4;
- pixel_y = -24;
- specialfunctions = 4
- },
-/obj/effect/turf_decal/stripes/corner{
dir = 1
},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
-/area/shuttle/pirate)
-"aO" = (
-/obj/machinery/light/small,
-/obj/machinery/button/door{
- id = "piratestarboardexternal";
- name = "External Bolt Control";
- normaldoorcontrol = 1;
- pixel_x = 4;
- pixel_y = -24;
- specialfunctions = 4
- },
-/obj/effect/turf_decal/stripes/corner,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
-/area/shuttle/pirate)
-"aQ" = (
-/obj/machinery/porta_turret/syndicate/energy/pirate{
- dir = 1;
- faction = list("pirate");
- icon_state = "standard_lethal"
- },
-/turf/closed/wall/r_wall/syndicate/pirate/nodiagonal,
-/area/shuttle/pirate)
-"aR" = (
-/obj/machinery/porta_turret/syndicate/energy/pirate{
- faction = list("pirate");
- icon_state = "standard_lethal"
- },
-/turf/closed/wall/r_wall/syndicate/pirate,
-/area/shuttle/pirate)
-"aS" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
-/area/shuttle/pirate)
-"aU" = (
-/obj/structure/sign/departments/engineering,
-/turf/closed/wall/r_wall/syndicate/pirate/nodiagonal,
-/area/shuttle/pirate)
-"aV" = (
-/obj/effect/mob_spawn/human/pirate{
- dir = 1
- },
-/obj/effect/turf_decal/stripes/line,
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
/turf/open/floor/plasteel/dark,
/area/shuttle/pirate)
-"aW" = (
-/obj/machinery/light/small{
- dir = 8
+"bK" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/dark,
+/area/shuttle/pirate)
+"bL" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/hatch{
+ aiControlDisabled = 1;
+ name = "Spirits Lounge";
+ req_access_txt = "150"
+ },
+/turf/open/floor/pod/dark,
+/area/shuttle/pirate)
+"bM" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/pod/dark,
+/area/shuttle/pirate)
+"bN" = (
/obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/pirate{
dir = 4;
+ req_access = "150";
x_offset = -3;
y_offset = 7
},
+/obj/effect/turf_decal/bot,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/pod/dark,
+/area/shuttle/pirate)
+"bO" = (
+/obj/machinery/computer/monitor/secret{
+ dir = 8
+ },
+/obj/structure/cable/yellow{
+ icon_state = "0-8"
+ },
+/obj/effect/turf_decal/bot,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/pod/dark,
+/area/shuttle/pirate)
+"bP" = (
+/obj/structure/table/reinforced,
+/obj/item/storage/backpack/duffelbag/syndie/x4{
+ pixel_y = 8
+ },
+/obj/item/grenade/smokebomb{
+ pixel_x = -5
+ },
+/obj/item/grenade/smokebomb{
+ pixel_x = 5
+ },
+/obj/effect/turf_decal/box/red,
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/pod/dark,
+/area/shuttle/pirate)
+"bQ" = (
+/obj/effect/turf_decal/stripes/red/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/pirate)
+"bR" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/vending/cigarette,
+/obj/effect/turf_decal/box/white,
+/turf/open/floor/pod/dark,
+/area/shuttle/pirate)
+"bS" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/corner,
+/turf/open/floor/mineral/plastitanium/red,
+/area/shuttle/pirate)
+"bT" = (
+/obj/structure/table/reinforced,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/reagent_containers/glass/bottle/bicaridine{
+ pixel_x = -6;
+ pixel_y = 6
+ },
+/obj/item/reagent_containers/glass/bottle/kelotane{
+ pixel_x = 2;
+ pixel_y = 6
+ },
+/obj/item/reagent_containers/glass/bottle/antitoxin{
+ layer = 3.01;
+ pixel_x = 2
+ },
+/obj/item/reagent_containers/glass/bottle/epinephrine{
+ layer = 3.01;
+ pixel_x = -6
+ },
+/obj/item/clipboard{
+ layer = 2.99;
+ pixel_x = 16;
+ pixel_y = 4
+ },
+/obj/item/reagent_containers/syringe{
+ pixel_x = 14;
+ pixel_y = 6
+ },
+/obj/item/reagent_containers/dropper{
+ pixel_x = 15;
+ pixel_y = -2
+ },
+/obj/item/reagent_containers/hypospray/medipen{
+ pixel_x = 16;
+ pixel_y = 11
+ },
+/obj/item/reagent_containers/hypospray/medipen{
+ pixel_x = 16;
+ pixel_y = 7
+ },
+/obj/machinery/light,
+/obj/machinery/airalarm/syndicate{
+ dir = 1;
+ pixel_y = -24
+ },
+/turf/open/floor/pod/dark,
+/area/shuttle/pirate)
+"bU" = (
+/obj/structure/table/reinforced,
+/obj/item/storage/box/bodybags{
+ pixel_y = 4
+ },
+/obj/item/reagent_containers/spray/cleaner{
+ pixel_x = 8;
+ pixel_y = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/item/reagent_containers/glass/bottle/charcoal{
+ layer = 3.01;
+ pixel_x = -6
+ },
+/obj/item/reagent_containers/glass/bottle/dexalin{
+ layer = 3.01;
+ pixel_x = 2
+ },
+/turf/open/floor/pod/dark,
+/area/shuttle/pirate)
+"bV" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/hatch{
+ aiControlDisabled = 1;
+ name = "Captain's Quarters";
+ req_access_txt = "150"
+ },
+/turf/open/floor/pod/dark,
+/area/shuttle/pirate)
+"bX" = (
+/obj/item/shard{
+ pixel_x = 6;
+ pixel_y = 6
+ },
+/obj/effect/decal/cleanable/glass,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/bot_white,
+/obj/machinery/door/window/southleft{
+ name = "Surgical Ward";
+ req_access_txt = "150"
+ },
+/turf/open/floor/pod/dark,
+/area/shuttle/pirate)
+"bZ" = (
+/obj/machinery/computer/piratepad_control{
+ dir = 0
+ },
+/obj/effect/turf_decal/bot,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/sign/directions/medical{
+ dir = 4;
+ pixel_y = 22
+ },
+/obj/structure/sign/directions/supply{
+ pixel_y = 30
+ },
+/turf/open/floor/pod/dark,
+/area/shuttle/pirate)
+"ca" = (
+/obj/effect/turf_decal/stripes/red/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/pirate)
+"cb" = (
+/obj/effect/turf_decal/stripes/red/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 6
+ },
+/obj/effect/decal/cleanable/blood/old,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/pirate)
+"cc" = (
+/obj/machinery/piratepad{
+ pixel_y = 6
+ },
+/obj/effect/decal/cleanable/blood/old,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/box,
+/obj/machinery/light{
+ dir = 1
+ },
+/obj/structure/sign/directions/command{
+ dir = 1;
+ pixel_y = 22
+ },
+/obj/structure/sign/directions/engineering{
+ pixel_y = 30
+ },
+/turf/open/floor/pod/dark,
+/area/shuttle/pirate)
+"cd" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/hatch{
+ aiControlDisabled = 1;
+ name = "Crew's Quarters";
+ req_access_txt = "150"
+ },
+/turf/open/floor/pod/dark,
+/area/shuttle/pirate)
+"ce" = (
+/obj/structure/closet/secure_closet/personal/cabinet,
+/obj/item/bedsheet/pirate,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood,
+/area/shuttle/pirate)
+"cf" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood,
+/area/shuttle/pirate)
+"cg" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood,
+/area/shuttle/pirate)
+"ch" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/airalarm/syndicate{
+ pixel_y = 24
+ },
+/turf/open/floor/wood,
+/area/shuttle/pirate)
+"ci" = (
+/obj/structure/closet/crate,
+/obj/item/storage/bag/money/vault,
+/obj/item/stack/sheet/mineral/gold{
+ amount = 3;
+ pixel_x = -2;
+ pixel_y = 2
+ },
+/obj/item/stack/sheet/mineral/silver{
+ amount = 8;
+ pixel_x = 2;
+ pixel_y = -1
+ },
+/obj/effect/turf_decal/bot,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/pod/dark,
+/area/shuttle/pirate)
+"cj" = (
+/obj/machinery/vending/dinnerware,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/firealarm{
+ dir = 4;
+ pixel_x = -24
+ },
+/obj/effect/turf_decal/bot_white,
+/turf/open/floor/plasteel/dark,
+/area/shuttle/pirate)
+"ck" = (
+/turf/open/floor/plating/airless,
+/area/shuttle/pirate)
+"cl" = (
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
+/obj/effect/decal/cleanable/vomit/old,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/turf/open/floor/pod/dark,
+/area/shuttle/pirate)
+"cm" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden,
+/turf/open/floor/mineral/plastitanium/red,
+/area/shuttle/pirate)
+"cn" = (
+/obj/item/tank/internals/oxygen/yellow,
+/obj/item/clothing/suit/space/syndicate/green/dark{
+ pixel_x = 2;
+ pixel_y = -2
+ },
+/obj/item/clothing/head/helmet/space/syndicate/green/dark{
+ pixel_x = -4;
+ pixel_y = 4
+ },
+/obj/item/tank/jetpack/carbondioxide{
+ pixel_x = -2;
+ pixel_y = -2
+ },
+/obj/item/clothing/mask/breath,
+/obj/structure/closet/crate/large,
+/obj/effect/turf_decal/bot,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/sign/poster/contraband/random{
+ pixel_x = -32
+ },
+/turf/open/floor/pod/dark,
+/area/shuttle/pirate)
+"co" = (
+/obj/effect/decal/cleanable/blood/old,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/pod/dark,
+/area/shuttle/pirate)
+"cp" = (
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/pod/dark,
+/area/shuttle/pirate)
+"cq" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/blood/old,
+/turf/open/floor/plasteel/dark,
+/area/shuttle/pirate)
+"cr" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/airalarm/syndicate{
+ pixel_y = 24
+ },
+/turf/open/floor/plasteel/dark,
+/area/shuttle/pirate)
+"cs" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
/obj/effect/decal/cleanable/dirt,
/obj/machinery/firealarm{
dir = 1;
pixel_y = -24
},
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
- dir = 4
- },
-/obj/effect/turf_decal/tile/red{
- dir = 8
- },
-/turf/open/floor/plasteel/dark,
+/obj/machinery/light,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/mineral/plastitanium/red,
/area/shuttle/pirate)
-"be" = (
-/obj/machinery/space_heater,
-/obj/effect/turf_decal/bot,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
+"ct" = (
+/obj/structure/mirror{
+ pixel_y = 32
},
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/oil,
-/turf/open/floor/plating,
-/area/shuttle/pirate)
-"bf" = (
-/obj/structure/chair/comfy/shuttle{
- dir = 8
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/turretid{
- icon_state = "control_kill";
- lethal = 1;
- locked = 0;
- pixel_y = -24;
- req_access = null
- },
-/obj/effect/turf_decal/tile/red{
- dir = 8
- },
-/turf/open/floor/plasteel/dark,
-/area/shuttle/pirate)
-"bg" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/table,
-/obj/item/gun/energy/laser{
- pixel_x = -3;
- pixel_y = 6
- },
-/obj/item/gun/energy/laser{
- pixel_y = 3
- },
-/obj/machinery/recharger,
-/turf/open/floor/pod/light,
-/area/shuttle/pirate)
-"bk" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/machinery/power/smes/engineering{
- charge = 1e+006
- },
-/obj/structure/cable,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
-/area/shuttle/pirate)
-"bl" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 6
- },
-/obj/machinery/light/small{
- dir = 1
- },
-/obj/machinery/airalarm/all_access{
+/obj/structure/sink{
pixel_y = 24
},
+/obj/structure/curtain,
+/obj/machinery/shower{
+ dir = 1
+ },
/obj/effect/decal/cleanable/dirt,
-/obj/structure/table,
-/obj/item/gun/energy/laser{
- pixel_x = -3;
- pixel_y = 6
- },
-/obj/item/gun/energy/laser{
- pixel_y = 3
- },
-/turf/open/floor/pod/light,
-/area/shuttle/pirate)
-"bm" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/effect/decal/cleanable/blood/old,
+/obj/effect/turf_decal/box/white,
/turf/open/floor/pod/dark,
/area/shuttle/pirate)
-"bo" = (
-/obj/machinery/light/small{
- dir = 4
+"cu" = (
+/obj/structure/table/reinforced,
+/obj/machinery/recharger,
+/obj/item/gun/energy/laser{
+ pixel_x = -3;
+ pixel_y = 2
},
-/obj/structure/sign/warning/vacuum/external{
+/obj/item/gun/energy/laser{
+ pixel_y = -1
+ },
+/obj/item/gun/energy/laser{
+ pixel_x = 2;
+ pixel_y = -4
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/sign/poster/contraband/random{
pixel_x = 32
},
-/turf/open/floor/plating,
+/turf/open/floor/pod/dark,
/area/shuttle/pirate)
-"br" = (
+"cv" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/blood/old,
+/obj/structure/chair/wood/normal{
+ dir = 4
+ },
+/turf/open/floor/wood,
+/area/shuttle/pirate)
+"cw" = (
/obj/structure/table/wood,
/obj/item/storage/box/matches,
/obj/item/reagent_containers/food/drinks/bottle/rum{
@@ -627,244 +1426,398 @@
},
/obj/item/clothing/mask/cigarette/cigar,
/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/stripes/line,
+/obj/machinery/firealarm{
+ dir = 1;
+ pixel_y = -24
+ },
+/obj/machinery/light,
+/obj/structure/sign/poster/contraband/random{
+ pixel_x = 32
+ },
/turf/open/floor/wood,
/area/shuttle/pirate)
-"bt" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 10
- },
-/obj/machinery/light/small{
- dir = 1
- },
-/obj/machinery/firealarm{
- pixel_y = 24
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/table,
-/obj/item/melee/transforming/energy/sword/pirate{
- pixel_x = -1;
- pixel_y = 6
- },
-/obj/item/melee/transforming/energy/sword/pirate{
- pixel_x = 6;
- pixel_y = 6
- },
-/obj/item/melee/transforming/energy/sword/pirate{
- pixel_x = 13;
- pixel_y = 6
- },
-/turf/open/floor/pod/light,
-/area/shuttle/pirate)
-"bu" = (
-/obj/machinery/firealarm{
- pixel_y = 24
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
-/area/shuttle/pirate)
-"bv" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 9
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
-/area/shuttle/pirate)
-"bx" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
- dir = 1
- },
-/turf/open/floor/plasteel,
-/area/shuttle/pirate)
-"by" = (
-/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/piratepad,
-/turf/open/floor/pod/dark,
-/area/shuttle/pirate)
-"bA" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/turf/open/floor/pod/dark,
-/area/shuttle/pirate)
-"bB" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
-/area/shuttle/pirate)
-"bC" = (
-/obj/machinery/airalarm/all_access{
- dir = 8;
- pixel_x = 24
- },
-/obj/machinery/light/small{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/tile/neutral,
-/turf/open/floor/plasteel,
-/area/shuttle/pirate)
-"bF" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/table,
-/obj/machinery/microwave{
- pixel_y = 5
- },
-/obj/item/book/manual/wiki/barman_recipes{
- pixel_x = -8
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
- dir = 1
- },
-/turf/open/floor/plasteel,
-/area/shuttle/pirate)
-"bH" = (
-/obj/machinery/vending/boozeomat,
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
- dir = 1
- },
-/turf/open/floor/plasteel,
-/area/shuttle/pirate)
-"bI" = (
-/obj/machinery/light/small,
-/obj/machinery/computer/piratepad_control{
- dir = 1
- },
-/turf/open/floor/pod/dark,
-/area/shuttle/pirate)
-"bJ" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+"cy" = (
+/obj/effect/mob_spawn/human/pirate/captain{
dir = 8
},
/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/turf/open/floor/plasteel,
+/obj/effect/decal/cleanable/blood/old,
+/turf/open/floor/wood,
/area/shuttle/pirate)
-"bK" = (
+"cz" = (
/obj/effect/decal/cleanable/dirt,
-/obj/structure/sink{
- pixel_y = 24
- },
-/obj/structure/toilet{
- dir = 8
- },
-/obj/machinery/light/small,
+/turf/closed/wall/r_wall/syndicate/pirate/nodiagonal,
+/area/shuttle/pirate)
+"cA" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
- dir = 8
- },
-/turf/open/floor/plasteel/showroomfloor,
-/area/shuttle/pirate)
-"bM" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/door/airlock{
- name = "Crew Cabin"
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/tile/neutral{
dir = 1
},
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/mob_spawn/human/pirate{
+ dir = 1
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
+/obj/effect/turf_decal/box/red,
+/obj/machinery/firealarm{
+ dir = 1;
+ pixel_y = -24
+ },
+/obj/machinery/light,
+/obj/structure/sign/poster/contraband/random{
+ pixel_x = -32
},
/turf/open/floor/plasteel/dark,
/area/shuttle/pirate)
-"bO" = (
-/obj/structure/cable{
- icon_state = "0-2"
- },
-/obj/machinery/power/apc{
- dir = 1;
- name = "Pirate Corvette APC";
- pixel_y = 23;
- req_access = null
- },
-/obj/structure/reagent_dispensers/watertank,
-/obj/effect/turf_decal/bot,
+"cB" = (
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
-/area/shuttle/pirate)
-"bP" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
+/obj/effect/mob_spawn/human/pirate{
dir = 1
},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
+/obj/effect/turf_decal/box/red,
+/turf/open/floor/plasteel/dark,
/area/shuttle/pirate)
-"bQ" = (
-/obj/structure/cable{
+"cC" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/bot,
+/obj/structure/closet/crate/large,
+/obj/machinery/jukebox{
+ anchored = 0;
+ desc = "Formally known as the SSDD, the Space Shanty Delivery Device is employed by various rings of the piracy scene for its capability of raising crew morale with its inspiring tunes. Unfortunately, this one doesn't seem as if it has many records pertaining to its designated topic on hand.";
+ name = "\improper Space Shanty Delivery Device";
+ req_one_access = null
+ },
+/obj/item/clothing/head/collectable/pirate{
+ pixel_x = 1;
+ pixel_y = 4
+ },
+/turf/open/floor/pod/dark,
+/area/shuttle/pirate)
+"cD" = (
+/obj/machinery/suit_storage_unit/pirate,
+/obj/effect/turf_decal/box,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/pod/dark,
+/area/shuttle/pirate)
+"cE" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/bot,
+/obj/structure/closet/crate/large,
+/obj/structure/reagent_dispensers/fueltank,
+/turf/open/floor/pod/dark,
+/area/shuttle/pirate)
+"cF" = (
+/obj/structure/shuttle/engine/heater,
+/obj/effect/spawner/structure/window/plastitanium/pirate,
+/obj/structure/window/reinforced/tinted{
+ layer = 3.1
+ },
+/turf/open/floor/plating/airless,
+/area/shuttle/pirate)
+"cG" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/closed/wall/r_wall/syndicate/pirate/nodiagonal,
+/area/shuttle/pirate)
+"cH" = (
+/obj/structure/table/reinforced,
+/obj/item/stack/sheet/mineral/plastitanium{
+ amount = 20
+ },
+/obj/item/stack/cable_coil/yellow{
+ pixel_x = -2;
+ pixel_y = 2
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/item/stack/cable_coil/yellow{
+ pixel_x = 2;
+ pixel_y = -2
+ },
+/turf/open/floor/pod/dark,
+/area/shuttle/pirate)
+"cI" = (
+/obj/effect/turf_decal/bot,
+/obj/effect/turf_decal/stripes/line,
+/obj/structure/tank_dispenser/oxygen,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/pirate)
+"cJ" = (
+/obj/structure/table/reinforced,
+/obj/item/pickaxe,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/pickaxe{
+ pixel_x = 6;
+ pixel_y = 6
+ },
+/obj/item/extinguisher/mini{
+ pixel_x = 4
+ },
+/obj/item/extinguisher/mini{
+ pixel_x = -2;
+ pixel_y = 2
+ },
+/obj/item/flashlight/seclite{
+ pixel_x = -12;
+ pixel_y = 6
+ },
+/obj/item/flashlight/seclite{
+ pixel_x = -10
+ },
+/obj/item/crowbar/red{
+ pixel_x = -20;
+ pixel_y = 2
+ },
+/obj/item/crowbar/red{
+ pixel_x = -16;
+ pixel_y = -4
+ },
+/obj/structure/sign/poster/contraband/random{
+ pixel_y = -32
+ },
+/turf/open/floor/pod/dark,
+/area/shuttle/pirate)
+"cK" = (
+/obj/structure/table/reinforced,
+/obj/item/storage/box/lethalshot{
+ pixel_y = 8
+ },
+/obj/item/gun/ballistic/shotgun/automatic/combat{
+ pixel_y = 16
+ },
+/obj/item/melee/transforming/energy/sword/pirate{
+ pixel_x = -1;
+ pixel_y = 0
+ },
+/obj/item/melee/transforming/energy/sword/pirate{
+ pixel_x = 6;
+ pixel_y = 0
+ },
+/obj/item/melee/transforming/energy/sword/pirate{
+ pixel_x = 13;
+ pixel_y = 0
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/pod/dark,
+/area/shuttle/pirate)
+"cL" = (
+/obj/structure/closet/secure_closet/personal,
+/obj/item/bedsheet/pirate,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/bedsheet/pirate,
+/obj/item/storage/backpack/satchel,
+/turf/open/floor/plasteel/dark,
+/area/shuttle/pirate)
+"cM" = (
+/obj/structure/shuttle/engine/heater,
+/obj/effect/spawner/structure/window/plastitanium/pirate,
+/obj/structure/window/reinforced/tinted{
+ layer = 3.1
+ },
+/obj/structure/window/reinforced/tinted{
+ dir = 4;
+ layer = 3.1
+ },
+/turf/open/floor/plating/airless,
+/area/shuttle/pirate)
+"cN" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/dresser,
+/turf/open/floor/wood,
+/area/shuttle/pirate)
+"cO" = (
+/obj/structure/cable/yellow{
icon_state = "1-2"
},
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/hatch{
+ aiControlDisabled = 1;
+ name = "Engineering";
+ req_access_txt = "150"
+ },
+/turf/open/floor/pod/dark,
/area/shuttle/pirate)
-"bX" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/power/terminal{
+"cP" = (
+/obj/structure/shuttle/engine/heater,
+/obj/effect/spawner/structure/window/plastitanium/pirate,
+/obj/structure/window/reinforced/tinted{
+ layer = 3.1
+ },
+/obj/structure/window/reinforced/tinted{
+ dir = 8;
+ layer = 3.1
+ },
+/turf/open/floor/plating/airless,
+/area/shuttle/pirate)
+"cR" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/corner{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/structure/cable{
- icon_state = "0-8"
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/mineral/plastitanium/red,
+/area/shuttle/pirate)
+"cS" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 5
},
-/obj/structure/rack,
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/blood/old,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/firealarm{
+ pixel_y = 24
+ },
+/obj/machinery/light{
+ dir = 1
+ },
+/obj/machinery/airalarm/syndicate{
+ dir = 8;
+ pixel_x = 24
+ },
+/turf/open/floor/mineral/plastitanium/red,
+/area/shuttle/pirate)
+"cT" = (
+/obj/structure/reagent_dispensers/watertank,
+/obj/effect/turf_decal/bot,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light,
+/turf/open/floor/pod/dark,
+/area/shuttle/pirate)
+"cV" = (
+/obj/machinery/suit_storage_unit/pirate,
+/obj/effect/turf_decal/box,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/structure/window/reinforced{
+ dir = 4
+ },
+/obj/structure/sign/poster/official/safety_eye_protection{
+ pixel_x = -32
+ },
+/turf/open/floor/pod/dark,
+/area/shuttle/pirate)
+"cW" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/firealarm{
+ pixel_y = 24
+ },
+/obj/effect/turf_decal/stripes/white/full,
+/obj/machinery/power/smes/engineering{
+ charge = 1e+006
+ },
+/obj/structure/cable/yellow{
+ icon_state = "0-4"
+ },
+/turf/open/floor/pod/light,
+/area/shuttle/pirate)
+"cX" = (
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/supply/visible{
+ dir = 6
+ },
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/obj/structure/sign/warning/electricshock{
+ pixel_y = 32
+ },
+/turf/open/floor/pod/light,
+/area/shuttle/pirate)
+"cY" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable/yellow{
+ icon_state = "1-8"
+ },
+/obj/machinery/atmospherics/components/binary/pump/on{
+ dir = 4;
+ target_pressure = 405.3
+ },
+/turf/open/floor/pod/light,
+/area/shuttle/pirate)
+"cZ" = (
+/obj/structure/sign/warning/vacuum/external,
+/turf/closed/wall/r_wall/syndicate/pirate/nodiagonal,
+/area/shuttle/pirate)
+"da" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 10
+ },
+/obj/structure/chair/comfy/shuttle{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/vomit/old,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/mineral/plastitanium/red,
+/area/shuttle/pirate)
+"db" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 6
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/sign/poster/official/safety_internals{
+ pixel_x = 32
+ },
+/turf/open/floor/mineral/plastitanium/red,
+/area/shuttle/pirate)
+"dc" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light{
+ dir = 1
+ },
+/obj/effect/turf_decal/bot,
+/obj/machinery/meter,
+/obj/machinery/atmospherics/pipe/manifold4w/supply/visible,
+/obj/machinery/airalarm/syndicate{
+ pixel_y = 24
+ },
+/turf/open/floor/pod/light,
+/area/shuttle/pirate)
+"dd" = (
+/obj/machinery/atmospherics/components/unary/thermomachine/heater/on{
+ dir = 8
+ },
+/obj/effect/turf_decal/box,
+/obj/structure/sign/departments/engineering{
+ pixel_y = 32
+ },
+/turf/open/floor/pod/light,
+/area/shuttle/pirate)
+"de" = (
+/obj/item/storage/box/lights/bulbs,
/obj/item/storage/toolbox/mechanical{
pixel_y = 4
},
+/obj/item/multitool,
+/obj/item/storage/belt/utility{
+ pixel_x = 2;
+ pixel_y = -4
+ },
/obj/item/flashlight{
pixel_x = 3;
pixel_y = 3
},
-/obj/item/storage/box/lights/bulbs,
/obj/item/stack/sheet/mineral/plasma{
amount = 10
},
-/obj/item/multitool,
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/turf/open/floor/plating,
-/area/shuttle/pirate)
-"bZ" = (
-/obj/machinery/door/airlock/external/glass{
- id_tag = "piratestarboardexternal"
- },
-/obj/effect/mapping_helpers/airlock/locked,
-/obj/effect/mapping_helpers/airlock/cyclelink_helper,
+/obj/structure/rack,
+/obj/effect/turf_decal/bot,
/obj/effect/decal/cleanable/dirt,
+/obj/structure/sign/warning/fire{
+ pixel_x = 32
+ },
/turf/open/floor/plating,
/area/shuttle/pirate)
-"ce" = (
-/obj/machinery/door/airlock/external/glass{
- id_tag = "piratestarboardexternal"
- },
-/obj/effect/mapping_helpers/airlock/locked,
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 1
- },
+"dg" = (
/obj/docking_port/mobile/pirate{
dwidth = 11;
height = 16;
@@ -872,7 +1825,7 @@
movement_force = list("KNOCKDOWN" = 0, "THROW" = 0);
name = "Pirate Ship";
port_direction = 2;
- width = 17
+ width = 23
},
/obj/docking_port/stationary{
dwidth = 11;
@@ -882,612 +1835,798 @@
width = 17
},
/obj/structure/fans/tiny,
-/turf/open/floor/plating,
+/obj/machinery/door/poddoor/shutters{
+ id = "cuttereva";
+ name = "EVA Shutters"
+ },
+/obj/machinery/button/door{
+ id = "cuttereva";
+ name = "EVA Shutters";
+ pixel_x = 26;
+ req_access_txt = "150"
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/barricade/wooden/crude{
+ layer = 3.13
+ },
+/turf/open/floor/pod/dark,
/area/shuttle/pirate)
-"db" = (
-/obj/structure/shuttle/engine/heater,
-/obj/effect/spawner/structure/window/plastitanium/pirate,
+"dk" = (
+/obj/structure/shuttle/engine/large,
/turf/open/floor/plating/airless,
/area/shuttle/pirate)
-"df" = (
+"dl" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/machinery/door/window/eastleft{
+ name = "EVA Storage";
+ req_access_txt = "150"
+ },
+/turf/open/floor/mineral/plastitanium/red,
+/area/shuttle/pirate)
+"dm" = (
+/obj/effect/decal/cleanable/blood/old,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 1
+ },
+/obj/machinery/power/terminal{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/visible{
+ dir = 6
+ },
+/obj/effect/turf_decal/stripes/line,
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/turf/open/floor/pod/light,
+/area/shuttle/pirate)
+"dn" = (
+/obj/effect/turf_decal/stripes/white/corner{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/manifold/supply/visible{
+ dir = 4
+ },
+/obj/machinery/meter,
+/obj/effect/turf_decal/stripes/line,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/pod/light,
+/area/shuttle/pirate)
+"do" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/stripes/corner{
+ dir = 1
+ },
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/turf/open/floor/pod/light,
+/area/shuttle/pirate)
+"dp" = (
+/obj/machinery/porta_turret/syndicate/energy/pirate{
+ faction = list("pirate");
+ icon_state = "standard_lethal"
+ },
+/turf/closed/wall/r_wall/syndicate/pirate,
+/area/shuttle/pirate)
+"dq" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/manifold/supply/visible{
+ dir = 8
+ },
+/turf/open/floor/pod/light,
+/area/shuttle/pirate)
+"dr" = (
+/obj/machinery/atmospherics/pipe/simple/supply/visible{
+ dir = 4
+ },
+/turf/open/floor/pod/light,
+/area/shuttle/pirate)
+"ds" = (
+/obj/item/crowbar,
+/obj/effect/decal/cleanable/oil,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/supply/visible{
+ dir = 4
+ },
+/turf/open/floor/pod/light,
+/area/shuttle/pirate)
+"dt" = (
+/obj/machinery/door/airlock/external/glass{
+ aiControlDisabled = 1;
+ id_tag = "piratestarboardexternal";
+ name = "EVA Airlock";
+ req_access_txt = "150"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/door/firedoor,
+/obj/structure/barricade/wooden/crude{
+ layer = 3.13
+ },
+/turf/open/floor/pod/dark,
+/area/shuttle/pirate)
+"dv" = (
+/obj/effect/decal/cleanable/oil,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/structure/window/reinforced{
+ dir = 4
+ },
+/obj/structure/sign/poster/official/wtf_is_co2{
+ pixel_y = -32
+ },
+/turf/open/floor/mineral/plastitanium/red,
+/area/shuttle/pirate)
+"dw" = (
+/obj/machinery/portable_atmospherics/canister/carbon_dioxide,
+/obj/effect/turf_decal/delivery,
+/obj/machinery/atmospherics/components/unary/portables_connector/visible{
+ dir = 1
+ },
+/turf/open/floor/pod/light,
+/area/shuttle/pirate)
+"dx" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/components/unary/tank/air{
+ dir = 1
+ },
+/obj/effect/turf_decal/bot,
+/turf/open/floor/pod/light,
+/area/shuttle/pirate)
+"dy" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/power/port_gen/pacman{
+ anchored = 1
+ },
+/obj/item/wrench,
+/obj/effect/turf_decal/bot,
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/structure/cable,
+/turf/open/floor/plating,
+/area/shuttle/pirate)
+"dz" = (
+/obj/effect/decal/cleanable/blood/old,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 1
+ },
+/obj/structure/sign/poster/contraband/random{
+ pixel_y = -32
+ },
+/turf/open/floor/pod/light,
+/area/shuttle/pirate)
+"dA" = (
+/turf/open/floor/pod/light,
+/area/shuttle/pirate)
+"dB" = (
+/obj/effect/decal/cleanable/vomit/old,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/closet/crate/large,
+/obj/item/stack/sheet/mineral/plastitanium{
+ amount = 20
+ },
+/obj/item/clothing/gloves/color/fyellow/old{
+ pixel_y = 2
+ },
+/obj/item/clothing/gloves/color/fyellow/old{
+ pixel_y = -2
+ },
+/turf/open/floor/pod/light,
+/area/shuttle/pirate)
+"dC" = (
+/obj/structure/shuttle/engine/propulsion/left,
+/turf/open/floor/plating,
+/area/shuttle/pirate)
+"dD" = (
+/obj/structure/shuttle/engine/propulsion,
+/turf/open/floor/plating,
+/area/shuttle/pirate)
+"dE" = (
+/obj/structure/shuttle/engine/propulsion/right,
+/turf/open/floor/plating,
+/area/shuttle/pirate)
+"kI" = (
+/obj/structure/sign/barsign,
+/turf/closed/wall/r_wall/syndicate/pirate/nodiagonal,
+/area/shuttle/pirate)
+"mq" = (
+/obj/machinery/porta_turret/syndicate/energy/pirate{
+ dir = 8;
+ faction = list("pirate");
+ icon_state = "standard_lethal"
+ },
+/turf/closed/wall/r_wall/syndicate/pirate/nodiagonal,
+/area/shuttle/pirate)
+"ol" = (
+/obj/effect/turf_decal/tile/bar,
+/obj/effect/turf_decal/tile/bar{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/plasteel,
+/area/shuttle/pirate)
+"pw" = (
/obj/machinery/porta_turret/syndicate/energy/pirate{
dir = 4;
faction = list("pirate");
icon_state = "standard_lethal"
},
-/turf/closed/wall/r_wall/syndicate/pirate,
+/turf/closed/wall/r_wall/syndicate/pirate/nodiagonal,
/area/shuttle/pirate)
-"dy" = (
-/obj/structure/chair/wood/normal,
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
+"sE" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/stripes/red/line{
+ dir = 8
+ },
+/turf/open/floor/wood,
+/area/shuttle/pirate)
+"un" = (
+/obj/effect/turf_decal/stripes/red/line{
+ dir = 8
+ },
+/turf/open/floor/wood,
+/area/shuttle/pirate)
+"vT" = (
+/obj/effect/turf_decal/tile/bar,
+/obj/effect/turf_decal/tile/bar{
dir = 1
},
-/obj/machinery/light/small{
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/blood/old,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/plasteel,
+/area/shuttle/pirate)
+"yP" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/wood,
-/area/shuttle/pirate)
-"dU" = (
-/obj/machinery/light/small{
- dir = 8
- },
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
+/obj/structure/sign/directions/dorms{
+ pixel_y = -22
},
/turf/open/floor/plasteel/dark,
/area/shuttle/pirate)
-"ek" = (
-/obj/effect/turf_decal/stripes/line,
+"BD" = (
/obj/effect/decal/cleanable/dirt,
-/obj/structure/table,
-/obj/structure/sign/poster/contraband/revolver{
- pixel_x = 32
- },
-/obj/item/storage/backpack/duffelbag/syndie/x4{
- pixel_y = 8
- },
-/obj/item/grenade/smokebomb{
- pixel_x = -5
- },
-/obj/item/grenade/smokebomb{
- pixel_x = 5
- },
-/obj/item/pickaxe/drill/diamonddrill,
-/obj/item/pickaxe/drill/diamonddrill,
-/obj/item/pickaxe/drill/diamonddrill,
-/turf/open/floor/pod/light,
-/area/shuttle/pirate)
-"ep" = (
-/obj/structure/window/reinforced{
- dir = 1;
- pixel_y = 1
- },
-/obj/structure/shuttle/engine/heater,
-/turf/open/floor/plating/airless,
-/area/shuttle/pirate)
-"er" = (
-/obj/structure/shuttle/engine/propulsion/right,
-/turf/open/floor/plating/airless,
-/area/shuttle/pirate)
-"et" = (
-/obj/structure/grille,
-/turf/open/floor/plating/airless,
-/area/shuttle/pirate)
-"eu" = (
-/obj/structure/girder,
-/obj/item/stack/rods{
- amount = 3
- },
-/turf/open/floor/plating/airless,
-/area/shuttle/pirate)
-"ew" = (
-/obj/structure/girder,
-/obj/item/stack/rods{
- amount = 5
- },
-/turf/open/floor/plating/airless,
-/area/shuttle/pirate)
-"ex" = (
-/obj/structure/window/reinforced,
-/obj/structure/frame/machine,
-/obj/item/wrench,
-/turf/open/floor/plating/airless,
-/area/shuttle/pirate)
-"ey" = (
-/obj/machinery/door/poddoor/shutters/preopen{
- id = "piratebridge"
- },
-/obj/structure/grille,
-/obj/structure/window/plastitanium/pirate,
-/turf/open/floor/plating,
-/area/shuttle/pirate)
-"ez" = (
-/obj/structure/window/reinforced,
-/obj/structure/frame/machine,
-/obj/item/stack/cable_coil/cut/red,
-/turf/open/floor/plating/airless,
-/area/shuttle/pirate)
-"eA" = (
-/obj/structure/window/reinforced{
- dir = 1;
- pixel_y = 1
- },
-/obj/structure/frame/computer{
- anchored = 1
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/pod/dark,
-/area/shuttle/pirate)
-"eE" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+/obj/effect/turf_decal/stripes/line{
dir = 6
},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
-/area/shuttle/pirate)
-"fW" = (
-/turf/closed/wall/r_wall/syndicate/pirate,
-/area/shuttle/pirate)
-"fY" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- dir = 1
- },
-/turf/open/floor/pod/dark,
-/area/shuttle/pirate)
-"gY" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/pod/dark,
-/area/shuttle/pirate)
-"km" = (
-/obj/machinery/atmospherics/components/unary/tank/air,
-/obj/effect/turf_decal/bot,
-/obj/machinery/firealarm{
- pixel_y = 24
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
-/area/shuttle/pirate)
-"mU" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/door/airlock/engineering{
- name = "Engineering"
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/pod/dark,
-/area/shuttle/pirate)
-"np" = (
-/obj/structure/reagent_dispensers/fueltank,
-/obj/effect/turf_decal/bot,
-/obj/machinery/airalarm/all_access{
- pixel_y = 24
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
-/area/shuttle/pirate)
-"vB" = (
-/obj/effect/turf_decal/stripes/line{
dir = 9
},
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/rack{
- dir = 8;
- layer = 2.9
- },
-/obj/item/storage/box/lethalshot,
-/obj/item/gun/ballistic/shotgun/automatic/combat{
- pixel_x = -2;
- pixel_y = 2
- },
-/turf/open/floor/pod/light,
+/turf/open/floor/mineral/plastitanium/red,
/area/shuttle/pirate)
-"wf" = (
-/obj/machinery/door/airlock{
- name = "Unisex Restrooms"
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/turf/open/floor/plasteel/showroomfloor,
-/area/shuttle/pirate)
-"wR" = (
-/obj/machinery/porta_turret/syndicate/energy/pirate{
- dir = 8;
- faction = list("pirate");
- icon_state = "standard_lethal"
- },
-/turf/closed/wall/r_wall/syndicate/pirate,
-/area/shuttle/pirate)
-"yi" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/obj/machinery/door/airlock/hatch{
- name = "Armory Access"
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/pod/dark,
-/area/shuttle/pirate)
-"zw" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/door/airlock{
- name = "Captain's Quarters"
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/wood,
-/area/shuttle/pirate)
-"Gk" = (
-/obj/effect/turf_decal/delivery,
-/obj/machinery/suit_storage_unit/pirate,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
-/area/shuttle/pirate)
-"JT" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 5
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/closet/crate,
-/obj/item/storage/bag/money/vault,
-/obj/item/stack/sheet/mineral/gold{
- amount = 3;
- pixel_x = -2;
- pixel_y = 2
- },
-/obj/item/stack/sheet/mineral/silver{
- amount = 8;
- pixel_x = 2;
- pixel_y = -1
- },
-/turf/open/floor/pod/light,
-/area/shuttle/pirate)
-"Oe" = (
-/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden,
+"HH" = (
/obj/effect/turf_decal/tile/bar,
/obj/effect/turf_decal/tile/bar{
dir = 1
},
-/turf/open/floor/plasteel,
-/area/shuttle/pirate)
-"OD" = (
-/obj/machinery/airalarm/all_access{
- pixel_y = 24
- },
-/obj/structure/sign/poster/contraband/random{
- pixel_x = 32
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral{
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/blood/old,
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 8
},
-/turf/open/floor/plasteel/dark,
-/area/shuttle/pirate)
-"OL" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
- dir = 1
- },
/turf/open/floor/plasteel,
/area/shuttle/pirate)
-"RY" = (
-/obj/effect/mob_spawn/human/pirate/captain{
- dir = 4
- },
-/obj/machinery/airalarm/all_access{
- pixel_y = 24
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/sign/poster/contraband/random{
- pixel_x = -32
- },
-/turf/open/floor/wood,
-/area/shuttle/pirate)
(1,1,1) = {"
af
af
af
-fW
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-wR
af
af
af
af
+af
+af
+af
+af
+af
+af
+ae
+aj
+aj
+mq
+af
+af
+af
"}
(2,1,1) = {"
af
-et
-eu
-ex
-eA
-aa
-ap
-aw
-ak
-bF
+af
+af
+af
+af
+af
+af
+aA
aj
aj
aj
-fW
+aj
+aj
+aj
+cF
+ck
+dk
+af
af
af
"}
(3,1,1) = {"
-aQ
-aj
-aj
-aj
-aj
-aj
-aj
-ax
-aq
-ar
-aj
-RY
-aA
-ep
-aH
-af
-"}
-(4,1,1) = {"
af
af
af
-af
-af
-af
-ey
-ay
-Oe
-OL
-zw
-dy
-br
-ep
-er
-af
-"}
-(5,1,1) = {"
-af
-af
-af
-af
-af
-af
-aj
-az
-bx
-bH
-aj
+ae
aj
aj
aj
aj
aR
+aY
+cj
+bH
+aj
+ce
+cM
+ck
+ck
+af
+af
+af
+"}
+(4,1,1) = {"
+af
+ab
+ac
+ag
+ai
+al
+as
+ol
+vT
+aZ
+bq
+bI
+aj
+cf
+cN
+cP
+ck
+dk
+af
+af
+"}
+(5,1,1) = {"
+aa
+aj
+aj
+aj
+aj
+am
+kI
+aC
+aB
+HH
+br
+bJ
+bV
+cg
+cv
+cF
+ck
+ck
+af
+af
"}
(6,1,1) = {"
af
af
af
-ey
-ey
+af
+ae
+aj
+aj
+aD
+aB
+ba
+bs
+yP
+aj
+ch
+cw
aj
aj
aj
-yi
aj
-aj
-Gk
-aS
-aF
-aI
-aJ
+af
"}
(7,1,1) = {"
af
af
-ey
-ey
-aC
-aW
+af
+af
+af
+af
+at
+aE
+aS
+bb
+bt
+bK
aj
-bg
-gY
-JT
-aj
-km
-aN
+cy
aj
aj
+cD
+cT
aj
+af
"}
(8,1,1) = {"
af
af
-ey
-ab
-ae
-bf
+af
+af
+af
+af
aj
-bl
-fY
-ai
-aU
-be
-aD
-aG
-db
-aH
+aj
+aj
+aj
+aj
+bL
+aj
+aj
+aj
+cV
+dl
+dv
+aj
+dp
"}
(9,1,1) = {"
af
af
-ey
-ac
-ag
-am
-au
-bm
-by
-bm
-mU
-aL
-bP
-bX
-db
-aK
+af
+af
+af
+ak
+aj
+bN
+aj
+bZ
+bu
+bM
+cn
+cC
+aj
+cW
+dm
+dw
+cF
+dC
"}
(10,1,1) = {"
af
af
-ey
-ad
-ah
-an
+af
+af
+ak
+ak
+aQ
+aG
aj
-bt
-gY
-bI
+cc
+bv
+bM
+co
+cE
aj
-bO
-bQ
-bk
-db
-er
+cX
+dn
+dx
+cF
+dD
"}
(11,1,1) = {"
af
af
-ey
-ey
-al
-aB
-aj
-ek
-bA
-vB
-aj
-np
-aO
-aj
-aj
+af
+af
+ak
+ay
+aV
+aH
aj
+ci
+bw
+cl
+cp
+cp
+cO
+cY
+do
+dy
+cF
+dE
"}
(12,1,1) = {"
af
af
af
-ey
-ey
+af
+ak
+aF
+bc
+aI
+aT
+bf
+bx
+cm
+cs
+cG
+cG
+dc
+dq
+dz
aj
aj
-aj
-yi
-aj
-aj
-Gk
-aS
-bZ
-bo
-ce
"}
(13,1,1) = {"
af
af
af
af
-af
-af
+ak
+aL
+bd
+aJ
aj
-as
-bB
-at
+bg
+by
+bP
+ca
+cH
aj
-aj
-aj
-aj
-aj
-aR
+dd
+dr
+dA
+cF
+dC
"}
(14,1,1) = {"
af
af
af
af
-af
-af
-ey
-eE
-bC
-bJ
-bM
-dU
-aV
-ep
-aH
-af
+ak
+ak
+be
+aK
+aj
+bh
+bz
+bQ
+cb
+cJ
+aj
+de
+ds
+dB
+cF
+dD
"}
(15,1,1) = {"
-aQ
-aj
-aj
-aj
-aj
-aj
-aj
-bu
-aj
-wf
-aj
-OD
-aV
-ep
-er
af
+af
+af
+af
+af
+ak
+aj
+bO
+aj
+bi
+bA
+aj
+cu
+cK
+aj
+aj
+dt
+cZ
+cF
+dE
"}
(16,1,1) = {"
af
-et
-ew
-ez
-eA
-ao
-av
-bv
-aj
-bK
-aj
-aj
-aj
-fW
af
af
+af
+af
+af
+aj
+aj
+aj
+bj
+bB
+aj
+aj
+aj
+aj
+cI
+cR
+da
+aj
+dp
"}
(17,1,1) = {"
af
af
af
-fW
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-df
af
af
af
+at
+aM
+aU
+bk
+bC
+bR
+aj
+cL
+cz
+aj
+cS
+db
+dg
+af
+"}
+(18,1,1) = {"
+af
+af
+af
+af
+ae
+aj
+aj
+aN
+bX
+bl
+bD
+bS
+cd
+cq
+cA
+aj
+aj
+aj
+aj
+af
+"}
+(19,1,1) = {"
+aa
+aj
+aj
+aj
+aj
+aq
+aj
+aO
+aW
+bm
+bE
+bF
+aj
+cr
+cB
+cF
+ck
+dk
+af
+af
+"}
+(20,1,1) = {"
+af
+ab
+ad
+ah
+ai
+ar
+az
+aP
+aP
+bn
+BD
+bT
+aj
+sE
+un
+cM
+ck
+ck
+af
+af
+"}
+(21,1,1) = {"
+af
+af
+af
+ae
+aj
+aj
+aj
+aj
+aX
+bo
+bG
+bU
+aj
+ct
+cP
+ck
+dk
+af
+af
+af
+"}
+(22,1,1) = {"
+af
+af
+af
+af
+af
+af
+af
+an
+aj
+aj
+aj
+aj
+aj
+aj
+cF
+ck
+ck
+af
+af
+af
+"}
+(23,1,1) = {"
+af
+af
+af
+af
+af
+af
+af
+af
+af
+af
+af
+af
+af
+ae
+aj
+aj
+pw
+af
+af
af
"}
diff --git a/code/__HELPERS/roundend.dm b/code/__HELPERS/roundend.dm
index 75ce77302b..2c13f30707 100644
--- a/code/__HELPERS/roundend.dm
+++ b/code/__HELPERS/roundend.dm
@@ -551,8 +551,7 @@
///How many players joined the round.
var/total_players = GLOB.joined_player_list.len
var/list/typecache_bank = typecacheof(list(/datum/bank_account/department, /datum/bank_account/remote))
- for(var/i in SSeconomy.generated_accounts)
- var/datum/bank_account/current_acc = SSeconomy.generated_accounts[i]
+ for(var/datum/bank_account/current_acc in SSeconomy.generated_accounts)
if(typecache_bank[current_acc.type])
continue
station_vault += current_acc.account_balance
diff --git a/code/_onclick/hud/radial.dm b/code/_onclick/hud/radial.dm
index 929e01c6d9..7d22b70cbc 100644
--- a/code/_onclick/hud/radial.dm
+++ b/code/_onclick/hud/radial.dm
@@ -13,7 +13,6 @@ GLOBAL_LIST_EMPTY(radial_menus)
icon_state = "radial_slice"
var/choice
var/next_page = FALSE
- var/tooltips = FALSE
/obj/screen/radial/slice/MouseEntered(location, control, params)
. = ..()
diff --git a/code/datums/components/radioactive.dm b/code/datums/components/radioactive.dm
index 4c418bb8dc..f41396ad67 100644
--- a/code/datums/components/radioactive.dm
+++ b/code/datums/components/radioactive.dm
@@ -52,8 +52,15 @@
return
strength -= strength / hl3_release_date
if(strength <= RAD_BACKGROUND_RADIATION)
- qdel(src)
+ addtimer(CALLBACK(src, .proc/check_dissipate), 5 SECONDS)
+ return PROCESS_KILL
+/datum/component/radioactive/proc/check_dissipate()
+ if(strength <= RAD_BACKGROUND_RADIATION)
+ qdel(src)
+ return
+ if(!(datum_flags & DF_ISPROCESSING)) // keep going
+ START_PROCESSING(SSradiation, src)
/datum/component/radioactive/proc/glow_loop(atom/movable/master)
var/filter = master.get_filter("rad_glow")
diff --git a/code/datums/components/storage/concrete/pockets.dm b/code/datums/components/storage/concrete/pockets.dm
index 20e1a0a4e2..1e3fff8a17 100644
--- a/code/datums/components/storage/concrete/pockets.dm
+++ b/code/datums/components/storage/concrete/pockets.dm
@@ -57,7 +57,7 @@
/obj/item/reagent_containers/hypospray/medipen, /obj/item/reagent_containers/dropper,
/obj/item/implanter, /obj/item/screwdriver, /obj/item/weldingtool/mini,
/obj/item/firing_pin, /obj/item/gun/ballistic/automatic/pistol, /obj/item/gun/ballistic/automatic/magrifle/pistol,
- /obj/item/toy/plush/snakeplushie, /obj/item/gun/energy/e_gun/mini
+ /obj/item/toy/plush/snakeplushie, /obj/item/gun/energy/e_gun/mini, /obj/item/gun/ballistic/derringer
))
/datum/component/storage/concrete/pockets/shoes/clown/Initialize()
diff --git a/code/datums/helper_datums/teleport.dm b/code/datums/helper_datums/teleport.dm
index 7855c4e87b..c1aed96d61 100644
--- a/code/datums/helper_datums/teleport.dm
+++ b/code/datums/helper_datums/teleport.dm
@@ -142,7 +142,8 @@
// Can most things breathe?
if(trace_gases)
continue
- if(A.get_moles(/datum/gas/oxygen) >= 16)
+ var/oxy_moles = A.get_moles(/datum/gas/oxygen)
+ if(oxy_moles < 16 || oxy_moles > 50)
continue
if(A.get_moles(/datum/gas/plasma))
continue
diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm
index fbda722e4f..aafa77b878 100644
--- a/code/game/atoms_movable.dm
+++ b/code/game/atoms_movable.dm
@@ -55,6 +55,9 @@
///Internal holder for emissive blocker object, do not use directly use blocks_emissive
var/atom/movable/emissive_blocker/em_block
+ /// Should we use tooltips, if the thing does not have the code implemented `get_tooltip_data()`, it will default to examine(src)
+ var/tooltips = FALSE
+
/atom/movable/Initialize(mapload)
. = ..()
diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm
index 048247c630..5621b47885 100755
--- a/code/game/machinery/computer/communications.dm
+++ b/code/game/machinery/computer/communications.dm
@@ -79,6 +79,7 @@
if (obj_flags & EMAGGED)
return
obj_flags |= EMAGGED
+ SSshuttle.shuttle_purchase_requirements_met |= "emagged"
if (authenticated)
authorize_access = get_all_accesses()
to_chat(user, "You scramble the communication routing circuits!")
diff --git a/code/game/objects/effects/effect_system/effects_foam.dm b/code/game/objects/effects/effect_system/effects_foam.dm
index 640675bea5..bb8cad4fbc 100644
--- a/code/game/objects/effects/effect_system/effects_foam.dm
+++ b/code/game/objects/effects/effect_system/effects_foam.dm
@@ -309,6 +309,10 @@
/obj/structure/foamedmetal/resin/Initialize()
. = ..()
+ neutralize_air()
+ addtimer(CALLBACK(src, .proc/neutralize_air), 5) // yeah this sucks, maybe when auxmos is out
+
+/obj/structure/foamedmetal/resin/proc/neutralize_air()
if(isopenturf(loc))
var/turf/open/O = loc
O.ClearWet()
diff --git a/code/game/objects/items/cards_ids.dm b/code/game/objects/items/cards_ids.dm
index 7d2b0ed832..df7d6467f0 100644
--- a/code/game/objects/items/cards_ids.dm
+++ b/code/game/objects/items/cards_ids.dm
@@ -553,6 +553,9 @@
/obj/item/card/id/syndicate/locked_banking
bank_support = ID_LOCKED_BANK_ACCOUNT
+/obj/item/card/id/pirate
+ access = list(ACCESS_SYNDICATE)
+
/obj/item/card/id/captains_spare
name = "captain's spare ID"
desc = "The spare ID of the High Lord himself."
diff --git a/code/game/objects/items/kitchen.dm b/code/game/objects/items/kitchen.dm
index 7f2fe6a01d..417fd96c85 100644
--- a/code/game/objects/items/kitchen.dm
+++ b/code/game/objects/items/kitchen.dm
@@ -248,6 +248,24 @@
/obj/item/kitchen/rollingpin/suicide_act(mob/living/carbon/user)
user.visible_message("[user] begins flattening [user.p_their()] head with \the [src]! It looks like [user.p_theyre()] trying to commit suicide!")
return BRUTELOSS
+
+/obj/item/kitchen/unrollingpin
+ name = "unrolling pin"
+ desc = "For when you accidentally flattened something."
+ icon_state = "unrolling_pin"
+ force = 8
+ throwforce = 5
+ throw_speed = 3
+ throw_range = 7
+ w_class = WEIGHT_CLASS_NORMAL
+ custom_materials = list(/datum/material/wood = MINERAL_MATERIAL_AMOUNT * 1.5)
+ attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "whacked")
+ custom_price = PRICE_ALMOST_CHEAP
+
+/obj/item/kitchen/unrollingpin/suicide_act(mob/living/carbon/user)
+ user.visible_message("[user] begins unflattening [user.p_their()] head with \the [src]! It looks like [user.p_theyre()] trying to commit suicide!")
+ return BRUTELOSS
+
/* Trays moved to /obj/item/storage/bag */
/obj/item/kitchen/knife/scimitar
diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm
index 3f84844743..ffcd15c39e 100644
--- a/code/game/objects/items/stacks/sheets/sheet_types.dm
+++ b/code/game/objects/items/stacks/sheets/sheet_types.dm
@@ -248,6 +248,7 @@ GLOBAL_LIST_INIT(wood_recipes, list ( \
null, \
new/datum/stack_recipe("rifle stock", /obj/item/weaponcrafting/stock, 10, time = 20), \
new/datum/stack_recipe("rolling pin", /obj/item/kitchen/rollingpin, 2, time = 30), \
+ new/datum/stack_recipe("unrolling pin", /obj/item/kitchen/unrollingpin, 2, time = 30), \
new/datum/stack_recipe("wooden bucket", /obj/item/reagent_containers/glass/bucket/wood, 2, time = 30), \
new/datum/stack_recipe("painting frame", /obj/item/wallframe/painting, 1, time = 10),\
new/datum/stack_recipe("wooden buckler", /obj/item/shield/riot/buckler, 20, time = 40), \
diff --git a/code/game/objects/items/storage/fancy.dm b/code/game/objects/items/storage/fancy.dm
index e73097bf18..f68084d63a 100644
--- a/code/game/objects/items/storage/fancy.dm
+++ b/code/game/objects/items/storage/fancy.dm
@@ -367,7 +367,7 @@
/obj/item/storage/fancy/cigarettes/derringer/AltClick(mob/living/carbon/user)
if(!istype(user) || !user.canUseTopic(src, BE_CLOSE, ismonkey(user)))
return
- var/obj/item/W = (locate(/obj/item/ammo_casing/a357) in contents) || (locate(/obj/item/clothing/mask/cigarette) in contents) || locate(/obj/item/ammo_casing/g4570) //Easy access smokes and bullets
+ var/obj/item/W = (locate(/obj/item/ammo_casing/a357) in contents) || (locate(/obj/item/clothing/mask/cigarette) in contents) ||(locate(/obj/item/gun/ballistic/derringer) in contents) || (locate(/obj/item/ammo_casing/c38) in contents) || locate(/obj/item/ammo_casing/g4570) in contents//Easy access smokes and bullets
if(W && contents.len > 0)
SEND_SIGNAL(src, COMSIG_TRY_STORAGE_TAKE, W, user)
user.put_in_hands(W)
@@ -382,6 +382,7 @@
new /obj/item/ammo_casing/a357(src)
new /obj/item/ammo_casing/a357(src)
new /obj/item/ammo_casing/a357(src)
+ new /obj/item/ammo_casing/a357(src)
new /obj/item/clothing/mask/cigarette/syndicate(src)
//For traitors with luck/class
@@ -404,6 +405,7 @@
new /obj/item/ammo_casing/g4570(src)
new /obj/item/ammo_casing/g4570(src)
new /obj/item/ammo_casing/g4570(src)
+ new /obj/item/ammo_casing/g4570(src)
new /obj/item/clothing/mask/cigarette/xeno(src)
//For Cargomen, looking for a good deal on arms, with no quarrels as to where they're from.
@@ -419,6 +421,7 @@
new /obj/item/ammo_casing/c38/lethal(src)
new /obj/item/ammo_casing/c38/lethal(src)
new /obj/item/ammo_casing/c38/lethal(src)
+ new /obj/item/ammo_casing/c38/lethal(src)
new /obj/item/clothing/mask/cigarette/shadyjims (src)
/////////////
//CIGAR BOX//
diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm
index 7e7bac9ff0..59eee83b35 100644
--- a/code/modules/admin/verbs/randomverbs.dm
+++ b/code/modules/admin/verbs/randomverbs.dm
@@ -571,6 +571,26 @@ Traitors and the like can also be revived with the previous role mostly intact.
message_admins("[key_name_admin(src)] has created a command report")
SSblackbox.record_feedback("tally", "admin_verb", 1, "Create Command Report") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+/client/proc/cmd_admin_make_priority_announcement()
+ set category = "Admin.Events"
+ set name = "Make Priority Announcement"
+
+ if(!check_rights(R_ADMIN))
+ return
+
+ var/input = input(usr, "Enter a priority announcement. Ensure it makes sense IC.", "What?", "") as message|null
+ if(!input)
+ return
+
+ var/title = input(src, "What should the title be?", "What?","") as text|null
+
+ var/special_name = input(src, "Who is making the announcement?", "Who?", "") as text|null
+ priority_announce(input, title, sender_override = special_name)
+
+ log_admin("[key_name(src)] has sent a priority announcement: [input]")
+ message_admins("[key_name_admin(src)] has made a priority announcement")
+ SSblackbox.record_feedback("tally", "admin_verb", 1, "Make Priority Announcement") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+
/client/proc/cmd_change_command_name()
set category = "Admin.Events"
set name = "Change Command Name"
diff --git a/code/modules/antagonists/clockcult/clock_structures/traps/brass_skewer.dm b/code/modules/antagonists/clockcult/clock_structures/traps/brass_skewer.dm
index f1ce13a90f..e8ae133ede 100644
--- a/code/modules/antagonists/clockcult/clock_structures/traps/brass_skewer.dm
+++ b/code/modules/antagonists/clockcult/clock_structures/traps/brass_skewer.dm
@@ -115,7 +115,7 @@
skewee.visible_message("[skewee] painfully slides back down [src].")
if(skewee.stat >= UNCONSCIOUS)
return //by ratvar, no more spamming my deadchat, holy fuck
- skewee.say("Oof, ouch owwie!!", forced = "fail brass skewer removal")
+ skewee.emote("pain")
return
skewee.visible_message("[skewee] comes free of [src] with a squelching pop!", \
"You come free of [src]!")
diff --git a/code/modules/antagonists/eldritch_cult/eldritch_items.dm b/code/modules/antagonists/eldritch_cult/eldritch_items.dm
index 0dd9cf6bea..a6380a81b2 100644
--- a/code/modules/antagonists/eldritch_cult/eldritch_items.dm
+++ b/code/modules/antagonists/eldritch_cult/eldritch_items.dm
@@ -62,13 +62,24 @@
/datum/action/innate/heretic_shatter/IsAvailable()
if(IS_HERETIC(holder) || IS_HERETIC_MONSTER(holder))
- return TRUE
+ return ..()
else
return FALSE
/datum/action/innate/heretic_shatter/Activate()
if(do_after(holder,10, target = holder))
- var/turf/safe_turf = find_safe_turf(zlevels = sword.z, extended_safety_checks = TRUE)
+ if(!sword || QDELETED(sword))
+ return
+ if(!IsAvailable()) //Never trust the user.
+ return
+ var/swordz = (get_turf(sword))?.z //SHOULD usually have a turf but if it doesn't better be prepared.
+ if(!swordz)
+ to_chat(holder, "[sword] flickers but remains in place, as do you...")
+ return
+ var/turf/safe_turf = find_safe_turf(zlevels = swordz, extended_safety_checks = TRUE)
+ if(!safe_turf)
+ to_chat(holder, "[sword] flickers but remains in place, as do you...")
+ return
do_teleport(holder,safe_turf,forceMove = TRUE,channel=TELEPORT_CHANNEL_MAGIC)
to_chat(holder,"You feel a gust of energy flow through your body... the Rusted Hills heard your call...")
qdel(sword)
diff --git a/code/modules/atmospherics/environmental/LINDA_system.dm b/code/modules/atmospherics/environmental/LINDA_system.dm
index 4f057ca9be..f714a94646 100644
--- a/code/modules/atmospherics/environmental/LINDA_system.dm
+++ b/code/modules/atmospherics/environmental/LINDA_system.dm
@@ -44,7 +44,7 @@
return FALSE
/turf/proc/ImmediateCalculateAdjacentTurfs()
- var/canpass = CANATMOSPASS(src, src)
+ var/canpass = CANATMOSPASS(src, src)
var/canvpass = CANVERTICALATMOSPASS(src, src)
for(var/direction in GLOB.cardinals_multiz)
var/turf/T = get_step_multiz(src, direction)
@@ -79,31 +79,27 @@
if (atmos_adjacent_turfs)
adjacent_turfs = atmos_adjacent_turfs.Copy()
else
- adjacent_turfs = list()
+ return list() // don't bother checking diagonals, diagonals are going to be cardinal checks anyways.
if (!alldir)
return adjacent_turfs
- var/turf/curloc = src
-
- for (var/direction in GLOB.diagonals_multiz)
- var/matchingDirections = 0
- var/turf/S = get_step_multiz(curloc, direction)
- if(!S)
+ var/turf/other
+ var/turf/mid
+ for (var/d in GLOB.diagonals)
+ other = get_step(src, d)
+ if(!other)
+ continue
+ // NS step
+ mid = get_step(src, NSCOMPONENT(d))
+ if((mid in adjacent_turfs) && (get_step(mid, EWCOMPONENT(d)) in adjacent_turfs))
+ adjacent_turfs += other
+ continue
+ // EW step
+ mid = get_step(src, EWCOMPONENT(d))
+ if((mid in adjacent_turfs) && (get_step(mid, NSCOMPONENT(d)) in adjacent_turfs))
+ adjacent_turfs += other
continue
-
- for (var/checkDirection in GLOB.cardinals_multiz)
- var/turf/checkTurf = get_step(S, checkDirection)
- if(!S.atmos_adjacent_turfs || !S.atmos_adjacent_turfs[checkTurf])
- continue
-
- if (adjacent_turfs[checkTurf])
- matchingDirections++
-
- if (matchingDirections >= 2)
- adjacent_turfs += S
- break
-
return adjacent_turfs
/atom/proc/air_update_turf(command = 0)
diff --git a/code/modules/cargo/packs/armory.dm b/code/modules/cargo/packs/armory.dm
index ed3f274f47..de3e657386 100644
--- a/code/modules/cargo/packs/armory.dm
+++ b/code/modules/cargo/packs/armory.dm
@@ -240,7 +240,6 @@
desc = "Hey kid.. c'mere. Boss says we need to offload these, to any buyer, no questions asked. You pay us, we give you three of these guns, no strings attached. Locks are to ensure they get to PAYING customers."
cost = 2000
contraband = TRUE
- can_private_buy = TRUE
contains = list(/obj/item/storage/fancy/cigarettes/derringer/smuggled,
/obj/item/storage/fancy/cigarettes/derringer/smuggled,
/obj/item/storage/fancy/cigarettes/derringer/smuggled,
diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm
index 864bf5335a..9cd16592ce 100644
--- a/code/modules/client/preferences_savefile.dm
+++ b/code/modules/client/preferences_savefile.dm
@@ -5,7 +5,7 @@
// You do not need to raise this if you are adding new values that have sane defaults.
// Only raise this value when changing the meaning/format/name/layout of an existing value
// where you would want the updater procs below to run
-#define SAVEFILE_VERSION_MAX 50
+#define SAVEFILE_VERSION_MAX 51
/*
SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Carn
@@ -295,6 +295,10 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
L -= ROLE_SYNDICATE
S["be_special"] << L
+ if(current_version < 51) //humans can have digi legs now, make sure they dont default to them or human players will murder me in my sleep
+ if(S["species"] == SPECIES_HUMAN)
+ features["legs"] = "Plantigrade"
+
/datum/preferences/proc/load_path(ckey,filename="preferences.sav")
if(!ckey)
return
diff --git a/code/modules/clothing/outfits/standard.dm b/code/modules/clothing/outfits/standard.dm
index afe74de6a0..8091ce331b 100644
--- a/code/modules/clothing/outfits/standard.dm
+++ b/code/modules/clothing/outfits/standard.dm
@@ -89,10 +89,8 @@
/datum/outfit/pirate/space
suit = /obj/item/clothing/suit/space/pirate
head = /obj/item/clothing/head/helmet/space/pirate/bandana
- mask = /obj/item/clothing/mask/breath
- suit_store = /obj/item/tank/internals/oxygen
ears = /obj/item/radio/headset/syndicate
- id = /obj/item/card/id
+ id = /obj/item/card/id/pirate
/datum/outfit/pirate/space/captain
head = /obj/item/clothing/head/helmet/space/pirate
diff --git a/code/modules/events/pirates.dm b/code/modules/events/pirates.dm
index 388a4fdac0..d284146ea3 100644
--- a/code/modules/events/pirates.dm
+++ b/code/modules/events/pirates.dm
@@ -206,6 +206,7 @@
icon_screen = "syndishuttle"
icon_keyboard = "syndie_key"
light_color = LIGHT_COLOR_RED
+ req_access = list(ACCESS_SYNDICATE)
possible_destinations = "pirateship_away;pirateship_home;pirateship_custom"
/obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/pirate
@@ -214,8 +215,8 @@
shuttleId = "pirateship"
lock_override = CAMERA_LOCK_STATION
shuttlePortId = "pirateship_custom"
- x_offset = 9
- y_offset = 0
+ x_offset = 11
+ y_offset = 1
see_hidden = FALSE
/obj/docking_port/mobile/pirate
@@ -224,11 +225,7 @@
rechargeTime = 3 MINUTES
/obj/machinery/suit_storage_unit/pirate
- suit_type = /obj/item/clothing/suit/space
- helmet_type = /obj/item/clothing/head/helmet/space
- mask_type = /obj/item/clothing/mask/breath
- storage_type = /obj/item/tank/jetpack/void
- // storage_type = /obj/item/tank/internals/oxygen
+ storage_type = /obj/item/tank/jetpack/carbondioxide
/obj/machinery/loot_locator
name = "Booty Locator"
diff --git a/code/modules/events/supernova.dm b/code/modules/events/supernova.dm
index 6fc2fb0c4c..ca64984cde 100644
--- a/code/modules/events/supernova.dm
+++ b/code/modules/events/supernova.dm
@@ -17,24 +17,29 @@
announceWhen = rand(4, 60)
supernova = new
SSsun.suns += supernova
- if(prob(20))
- power = rand(5,100) / 100
- else
- power = rand(5,5000) / 100
+ switch(rand(1,5))
+ if(1)
+ power = rand(5,100) / 100
+ if(2)
+ power = rand(5,500) / 100
+ if(3)
+ power = rand(5,1000) / 100
+ if(4, 5)
+ power = rand(5,5000) / 100
supernova.azimuth = rand(0, 359)
supernova.power_mod = 0
/datum/round_event/supernova/announce()
- var/message = "Our tachyon-doppler array has detected a supernova in your vicinity. Peak flux from the supernova estimated to be [round(power,0.1)] times current solar flux. [power > 1 ? "Short burts of radiation may be possible, so please prepare accordingly." : ""]"
+ var/message = "[station_name()]: Our tachyon-doppler array has detected a supernova in your vicinity. Peak flux from the supernova estimated to be [round(power,0.1)] times current solar flux; if the supernova is close to your sun in the sky, your solars may receive this as a power boost.[power > 1 ? " Short burts of radiation may be possible, so please prepare accordingly." : ""] We hope you enjoy the light."
if(prob(power * 25))
- priority_announce(message)
+ priority_announce(message, sender_override = "Nanotrasen Meteorology Division")
else
print_command_report(message)
/datum/round_event/supernova/start()
supernova.power_mod = 0.001 * power
- var/explosion_size = rand(1000000000, 999999999)
+ var/explosion_size = rand(1000000000, 10000000000)
var/turf/epicenter = get_turf_in_angle(supernova.azimuth, SSmapping.get_station_center(), round(world.maxx * 0.45))
for(var/array in GLOB.doppler_arrays)
var/obj/machinery/doppler_array/A = array
@@ -51,13 +56,15 @@
supernova.power_mod = min(supernova.power_mod*1.2, power)
if(activeFor > endWhen-10)
supernova.power_mod /= 4
- if(prob(round(supernova.power_mod)) && prob(5) && storm_count < 5 && !SSweather.get_weather_by_type(/datum/weather/rad_storm))
+ if(prob(round(supernova.power_mod*2)) && prob(3) && storm_count < 5 && !SSweather.get_weather_by_type(/datum/weather/rad_storm))
SSweather.run_weather(/datum/weather/rad_storm/supernova)
storm_count++
/datum/round_event/supernova/end()
SSsun.suns -= supernova
qdel(supernova)
+ priority_announce("The supernova's flux is now negligible. Radiation storms have ceased. Have a pleasant shift, [station_name()], and thank you for bearing with nature.",
+ sender_override = "Nanotrasen Meteorology Division")
/datum/weather/rad_storm/supernova
weather_duration_lower = 50
diff --git a/code/modules/food_and_drinks/food/snacks/dough.dm b/code/modules/food_and_drinks/food/snacks/dough.dm
index e071fb3df7..10b8c946fc 100644
--- a/code/modules/food_and_drinks/food/snacks/dough.dm
+++ b/code/modules/food_and_drinks/food/snacks/dough.dm
@@ -26,6 +26,17 @@
else
..()
+/obj/item/reagent_containers/food/snacks/flatdough/attackby(obj/item/I, mob/user, params)
+ if(istype(I, /obj/item/kitchen/unrollingpin))
+ if(isturf(loc))
+ new /obj/item/reagent_containers/food/snacks/dough(loc)
+ to_chat(user, "You unflatten [src].")
+ qdel(src)
+ else
+ to_chat(user, "You need to put [src] on a surface to undo the rolling!")
+ else
+ ..()
+
// sliceable into 3xdoughslices
/obj/item/reagent_containers/food/snacks/flatdough
@@ -98,6 +109,17 @@
else
..()
+/obj/item/reagent_containers/food/snacks/piedough/attackby(obj/item/I, mob/user, params)
+ if(istype(I, /obj/item/kitchen/unrollingpin))
+ if(isturf(loc))
+ new /obj/item/reagent_containers/food/snacks/cakebatter(loc)
+ to_chat(user, "You unflatten [src].")
+ qdel(src)
+ else
+ to_chat(user, "You need to put [src] on a surface to undo the rolling!")
+ else
+ ..()
+
/obj/item/reagent_containers/food/snacks/piedough
name = "pie dough"
desc = "Cook it to get a pie."
diff --git a/code/modules/library/soapstone.dm b/code/modules/library/soapstone.dm
index f17040a938..0d312c485a 100644
--- a/code/modules/library/soapstone.dm
+++ b/code/modules/library/soapstone.dm
@@ -152,7 +152,7 @@
var/newcolor = copytext_char(hash, 1, 7)
add_atom_colour("#[newcolor]", FIXED_COLOUR_PRIORITY)
light_color = "#[newcolor]"
- set_light(1)
+ set_light(0.3)
/obj/structure/chisel_message/proc/pack()
var/list/data = list()
diff --git a/code/modules/mapping/space_management/multiz_helpers.dm b/code/modules/mapping/space_management/multiz_helpers.dm
index ae05aee150..b949ac67e6 100644
--- a/code/modules/mapping/space_management/multiz_helpers.dm
+++ b/code/modules/mapping/space_management/multiz_helpers.dm
@@ -13,13 +13,15 @@
var/offset
while((offset = SSmapping.level_trait(other_z, ZTRAIT_DOWN)))
other_z += offset
+ if(other_z in .)
+ break // no infinite loops
. += other_z
other_z = center_z
while((offset = SSmapping.level_trait(other_z, ZTRAIT_UP)))
other_z += offset
+ if(other_z in .)
+ break // no infinite loops
. += other_z
- return .
-
/proc/get_dir_multiz(turf/us, turf/them)
us = get_turf(us)
@@ -46,4 +48,4 @@
/turf/proc/below()
return get_step_multiz(src, DOWN)
-
+
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index c2014cbe41..f636ae76ab 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -1083,6 +1083,17 @@
. = ..()
set_species(race)
+/mob/living/carbon/human/get_tooltip_data()
+ var/t_He = p_they(TRUE)
+ var/t_is = p_are()
+ . = list()
+ var/skipface = (wear_mask && (wear_mask.flags_inv & HIDEFACE)) || (head && (head.flags_inv & HIDEFACE))
+ if(skipface || get_visible_name() == "Unknown")
+ . += "You can't make out what species they are."
+ else
+ . += "[t_He] [t_is] a [dna.custom_species ? dna.custom_species : dna.species.name]"
+ SEND_SIGNAL(src, COMSIG_PARENT_EXAMINE, usr, .)
+
/mob/living/carbon/human/species/abductor
race = /datum/species/abductor
diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm
index 9f80b5a933..102f3df65d 100644
--- a/code/modules/mob/living/carbon/human/human_defines.dm
+++ b/code/modules/mob/living/carbon/human/human_defines.dm
@@ -77,6 +77,8 @@
var/last_fire_update
var/hardcore_survival_score = 0
+ tooltips = TRUE
+
/// Unarmed parry data for human
/datum/block_parry_data/unarmed/human
parry_respect_clickdelay = TRUE
diff --git a/code/modules/mob/living/carbon/human/species_types/humans.dm b/code/modules/mob/living/carbon/human/species_types/humans.dm
index e8e0ff1a78..d0f6c64550 100644
--- a/code/modules/mob/living/carbon/human/species_types/humans.dm
+++ b/code/modules/mob/living/carbon/human/species_types/humans.dm
@@ -4,7 +4,7 @@
default_color = "FFFFFF"
species_traits = list(EYECOLOR,HAIR,FACEHAIR,LIPS,MUTCOLORS_PARTSONLY,WINGCOLOR,HAS_FLESH,HAS_BONE)
- mutant_bodyparts = list("mcolor" = "FFFFFF", "mcolor2" = "FFFFFF","mcolor3" = "FFFFFF","tail_human" = "None", "ears" = "None", "taur" = "None", "deco_wings" = "None")
+ mutant_bodyparts = list("mcolor" = "FFFFFF", "mcolor2" = "FFFFFF","mcolor3" = "FFFFFF","tail_human" = "None", "ears" = "None", "taur" = "None", "deco_wings" = "None", "legs" = "Plantigrade")
use_skintones = USE_SKINTONES_GRAYSCALE_CUSTOM
skinned_type = /obj/item/stack/sheet/animalhide/human
disliked_food = GROSS | RAW
diff --git a/code/modules/mob/living/silicon/examine.dm b/code/modules/mob/living/silicon/examine.dm
index 7de281de5f..0840ea1191 100644
--- a/code/modules/mob/living/silicon/examine.dm
+++ b/code/modules/mob/living/silicon/examine.dm
@@ -1,5 +1,4 @@
/mob/living/silicon/examine(mob/user) //Displays a silicon's laws to ghosts
- . = ..()
if(laws && isobserver(user))
. += "[src] has the following laws:"
for(var/law in laws.get_law_list(include_zeroth = TRUE))
diff --git a/code/modules/mob/living/silicon/robot/examine.dm b/code/modules/mob/living/silicon/robot/examine.dm
index 6ac1d410eb..45a3d15635 100644
--- a/code/modules/mob/living/silicon/robot/examine.dm
+++ b/code/modules/mob/living/silicon/robot/examine.dm
@@ -48,6 +48,9 @@
. += "It doesn't seem to be responding."
if(DEAD)
. += "It looks like its system is corrupted and requires a reset."
+
+ SEND_SIGNAL(src, COMSIG_PARENT_EXAMINE, usr, .)
+
. += "*---------*"
. += ..()
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 38f93f9ffc..47f9a794cf 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -1326,3 +1326,18 @@
var/datum/computer_file/program/robotact/program = modularInterface.get_robotact()
if(program)
program.force_full_update()
+
+/mob/living/silicon/robot/get_tooltip_data()
+ var/t_He = p_they(TRUE)
+ var/t_is = p_are()
+ . = list()
+ var/borg_type = module ? module : "Default"
+//This isn't even used normally, but if that ever changes, just uncomment this
+/* var/obj/item/borg_chameleon/chameleon = locate() in src
+ if(!chameleon)
+ chameleon = locate() in src.module
+ if(chameleon?.active)
+ borg_type = "Engineering"
+*/
+ . += "[t_He] [t_is] a [borg_type] unit"
+ SEND_SIGNAL(src, COMSIG_PARENT_EXAMINE, usr, .)
diff --git a/code/modules/mob/living/silicon/robot/robot_defines.dm b/code/modules/mob/living/silicon/robot/robot_defines.dm
index f44552f1ab..fe22ec1236 100644
--- a/code/modules/mob/living/silicon/robot/robot_defines.dm
+++ b/code/modules/mob/living/silicon/robot/robot_defines.dm
@@ -125,3 +125,5 @@
var/sleeper_g
var/sleeper_r
var/sleeper_nv
+
+ tooltips = TRUE
diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm
index b2b27c7d70..8af55370bb 100644
--- a/code/modules/mob/living/silicon/silicon.dm
+++ b/code/modules/mob/living/silicon/silicon.dm
@@ -59,8 +59,8 @@
/mob/living/silicon/ComponentInitialize()
. = ..()
- AddElement(/datum/element/flavor_text, _name = "Silicon Flavor Text", _save_key = "silicon_flavor_text")
- AddElement(/datum/element/flavor_text, "", "Temporary Flavor Text", "This should be used only for things pertaining to the current round!")
+ AddElement(/datum/element/flavor_text, _name = "Silicon Flavor Text", _always_show = TRUE, _save_key = "silicon_flavor_text")
+ AddElement(/datum/element/flavor_text, "", "Temporary Flavor Text", "This should be used only for things pertaining to the current round!", _always_show = TRUE)
AddElement(/datum/element/flavor_text, _name = "OOC Notes", _addendum = "Put information on ERP/vore/lewd-related preferences here. THIS SHOULD NOT CONTAIN REGULAR FLAVORTEXT!!", _always_show = TRUE, _save_key = "ooc_notes", _examine_no_preview = TRUE)
/mob/living/silicon/med_hud_set_health()
diff --git a/code/modules/mob/living/simple_animal/hostile/syndicate.dm b/code/modules/mob/living/simple_animal/hostile/syndicate.dm
index 103868e1d3..df73516337 100644
--- a/code/modules/mob/living/simple_animal/hostile/syndicate.dm
+++ b/code/modules/mob/living/simple_animal/hostile/syndicate.dm
@@ -130,11 +130,11 @@
QDEL_NULL(sord)
return ..()
-/mob/living/simple_animal/hostile/syndicate/melee/bullet_act(obj/item/projectile/Proj)
- if(prob(25))
- return ..()
- visible_message("[src] blocks [Proj] with its shield!")
- return BULLET_ACT_BLOCK
+/mob/living/simple_animal/hostile/syndicate/melee/sword/bullet_act(obj/item/projectile/Proj)
+ if(prob(50))
+ visible_message("[src] blocks [Proj] with its shield!")
+ return BULLET_ACT_BLOCK
+ return ..()
/mob/living/simple_animal/hostile/syndicate/melee/sword/space
icon_state = "syndicate_space_sword"
diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm
index 92aa95bfb7..9cc289b06d 100644
--- a/code/modules/power/solar.dm
+++ b/code/modules/power/solar.dm
@@ -152,7 +152,7 @@
else
//dot product of sun and panel -- Lambert's Cosine Law
cur_pow = cos(azimuth_current - sun_azimuth) * sun.power_mod
- cur_pow = clamp(round(cur_pow, 0.01), 0, 1)
+ cur_pow = clamp(round(cur_pow, 0.01), 0, sun.power_mod)
total_flux += cur_pow
/obj/machinery/power/solar/process()
diff --git a/code/modules/projectiles/boxes_magazines/ammo_boxes.dm b/code/modules/projectiles/boxes_magazines/ammo_boxes.dm
index 70058801f8..1f1cc10459 100644
--- a/code/modules/projectiles/boxes_magazines/ammo_boxes.dm
+++ b/code/modules/projectiles/boxes_magazines/ammo_boxes.dm
@@ -60,6 +60,13 @@
desc = "Designed to quickly reload revolvers. These rounds are manufactured within extremely tight tolerances, making them easy to show off trickshots with."
ammo_type = /obj/item/ammo_casing/c38/match
+/obj/item/ammo_box/g4570
+ name = "ammo box (.45-70 GOVT)"
+ desc = "Brought to you at great expense,this box contains 10 more .45-70 GOVT bullets."
+ ammo_type = /obj/item/ammo_casing/g4570
+ icon_state = "45box"
+ max_ammo = 10
+
/obj/item/ammo_box/c9mm
name = "ammo box (9mm)"
icon_state = "9mmbox"
diff --git a/code/modules/projectiles/boxes_magazines/internal/derringer.dm b/code/modules/projectiles/boxes_magazines/internal/derringer.dm
index cc86549793..dad8386178 100644
--- a/code/modules/projectiles/boxes_magazines/internal/derringer.dm
+++ b/code/modules/projectiles/boxes_magazines/internal/derringer.dm
@@ -3,28 +3,17 @@
ammo_type = /obj/item/ammo_casing/c38
caliber = "38"
max_ammo = 2
- multiload = FALSE
-
-/obj/item/ammo_box/magazine/internal/derringer/ammo_count(countempties = 1)
- if (!countempties)
- var/boolets = 0
- for(var/obj/item/ammo_casing/bullet in stored_ammo)
- if(bullet.BB)
- boolets++
- return boolets
- else
- return ..()
/obj/item/ammo_box/magazine/internal/derringer/a357
name = "\improper derringer muzzle"
ammo_type = /obj/item/ammo_casing/a357
caliber = "357"
max_ammo = 2
- multiload = FALSE
+ multiload = 0
/obj/item/ammo_box/magazine/internal/derringer/g4570
name = "\improper derringer muzzle"
ammo_type = /obj/item/ammo_casing/g4570
caliber = "45-70g"
max_ammo = 2
- multiload = FALSE
+ multiload = 0
diff --git a/code/modules/projectiles/guns/ballistic/derringer.dm b/code/modules/projectiles/guns/ballistic/derringer.dm
index a88a11b416..47213f17df 100644
--- a/code/modules/projectiles/guns/ballistic/derringer.dm
+++ b/code/modules/projectiles/guns/ballistic/derringer.dm
@@ -3,16 +3,14 @@
desc = "A easily concealable derringer. Uses .38 ammo"
icon = 'icons/obj/guns/projectile.dmi'
icon_state = "derringer"
+ flags_1 = CONDUCT_1
mag_type = /obj/item/ammo_box/magazine/internal/derringer
+ fire_delay = 5
obj_flags = UNIQUE_RENAME
fire_sound = 'sound/weapons/revolvershot.ogg'
casing_ejector = FALSE
w_class = WEIGHT_CLASS_TINY
-/obj/item/gun/ballistic/derringer/Initialize()
- ..()
- transform *= 0.8 //Spriter too lazy to make icons smaller than default revolvers, local coder hacks in solution.
-
/obj/item/gun/ballistic/derringer/get_ammo(countchambered = FALSE, countempties = TRUE)
var/boolets = 0 //legacy var name maturity
if (chambered && countchambered)
@@ -27,7 +25,7 @@
return
var/num_loaded = magazine.attackby(A, user, params, 1)
if(num_loaded)
- to_chat(user, "You load [num_loaded] shell\s into \the [src].")
+ to_chat(user, "You load [num_loaded] bullet\s into \the [src].")
playsound(user, 'sound/weapons/bulletinsert.ogg', 60, 1)
A.update_icon()
update_icon()
diff --git a/code/modules/reagents/chemistry/machinery/pandemic.dm b/code/modules/reagents/chemistry/machinery/pandemic.dm
index d92f969b0a..d4d8ae47fe 100644
--- a/code/modules/reagents/chemistry/machinery/pandemic.dm
+++ b/code/modules/reagents/chemistry/machinery/pandemic.dm
@@ -210,7 +210,7 @@
to_chat(usr, "ERROR: Cannot replicate virus strain.")
return
A = A.Copy()
- var/list/data = list("viruses" = list(A))
+ var/list/data = list("donor"=null,"viruses"=list(A),"blood_DNA"="REPLICATED", "bloodcolor" = BLOOD_COLOR_SYNTHETIC, "blood_type"="SY","resistances"=null,"trace_chem"=null,"mind"=null,"ckey"=null,"gender"=null,"real_name"=null,"cloneable"=null,"factions"=null)
var/obj/item/reagent_containers/glass/bottle/B = new(drop_location())
B.name = "[A.name] culture bottle"
B.desc = "A small bottle. Contains [A.agent] culture in synthblood medium."
diff --git a/code/modules/reagents/reagent_containers.dm b/code/modules/reagents/reagent_containers.dm
index be631513bd..9b8ff7b262 100644
--- a/code/modules/reagents/reagent_containers.dm
+++ b/code/modules/reagents/reagent_containers.dm
@@ -26,7 +26,7 @@
create_reagents(volume, reagent_flags, reagent_value)
if(spawned_disease)
var/datum/disease/F = new spawned_disease()
- var/list/data = list("blood_DNA" = "UNKNOWN DNA", "blood_type" = "SY","viruses"= list(F))
+ var/list/data = list("donor"=null,"viruses"=list(F),"blood_DNA"="REPLICATED", "bloodcolor" = BLOOD_COLOR_SYNTHETIC, "blood_type"="SY","resistances"=null,"trace_chem"=null,"mind"=null,"ckey"=null,"gender"=null,"real_name"=null,"cloneable"=null,"factions"=null)
reagents.add_reagent(/datum/reagent/blood, disease_amount, data)
add_initial_reagents()
diff --git a/code/modules/reagents/reagent_containers/bottle.dm b/code/modules/reagents/reagent_containers/bottle.dm
index 5d68d00200..be8c7fac36 100644
--- a/code/modules/reagents/reagent_containers/bottle.dm
+++ b/code/modules/reagents/reagent_containers/bottle.dm
@@ -44,6 +44,26 @@
desc = "A small bottle. Contains epinephrine - used to stabilize patients."
list_reagents = list(/datum/reagent/medicine/epinephrine = 30)
+/obj/item/reagent_containers/glass/bottle/bicaridine
+ name = "bicaridine bottle"
+ desc = "A small bottle. Contains bicaridine - used to treat brute damage."
+ list_reagents = list(/datum/reagent/medicine/bicaridine = 30)
+
+/obj/item/reagent_containers/glass/bottle/kelotane
+ name = "kelotane bottle"
+ desc = "A small bottle. Contains kelotane - used to treat burn damage."
+ list_reagents = list(/datum/reagent/medicine/kelotane = 30)
+
+/obj/item/reagent_containers/glass/bottle/antitoxin
+ name = "anti-toxin bottle"
+ desc = "A small bottle. Contains anti-toxin - used to treat minor poisoning."
+ list_reagents = list(/datum/reagent/medicine/antitoxin = 30)
+
+/obj/item/reagent_containers/glass/bottle/dexalin
+ name = "dexalin bottle"
+ desc = "A small bottle. Contains dexalin - used to treat minor suffocation."
+ list_reagents = list(/datum/reagent/medicine/dexalin = 30)
+
/obj/item/reagent_containers/glass/bottle/toxin
name = "toxin bottle"
desc = "A small bottle of toxins. Do not drink, it is poisonous."
diff --git a/code/modules/spells/spell_types/shadow_walk.dm b/code/modules/spells/spell_types/shadow_walk.dm
index 1dd949caa0..8436de2119 100644
--- a/code/modules/spells/spell_types/shadow_walk.dm
+++ b/code/modules/spells/spell_types/shadow_walk.dm
@@ -56,9 +56,9 @@
/obj/effect/dummy/phased_mob/shadow/proc/check_light_level()
var/turf/T = get_turf(src)
var/light_amount = T.get_lumcount()
- if(light_amount > 0.2) // jaunt ends
+ if(light_amount > 0.4) // jaunt ends
end_jaunt(TRUE)
- else if (light_amount < 0.2 && (!QDELETED(jaunter))) //heal in the dark
+ else if (light_amount < 0.4 && (!QDELETED(jaunter))) //heal in the dark
jaunter.heal_overall_damage(1,1)
/obj/effect/dummy/phased_mob/shadow/proc/end_jaunt(forced = FALSE)
diff --git a/code/modules/tooltip/tooltip.dm b/code/modules/tooltip/tooltip.dm
index ab7dc91739..fd45ea37d9 100644
--- a/code/modules/tooltip/tooltip.dm
+++ b/code/modules/tooltip/tooltip.dm
@@ -51,7 +51,7 @@ Notes:
/datum/tooltip/proc/show(atom/movable/thing, params = null, title = null, content = null, theme = "default", special = "none")
if (!thing || !params || (!title && !content) || !owner || !isnum(world.icon_size))
- return 0
+ return FALSE
if (!init)
//Initialize some vars
init = 1
@@ -83,7 +83,7 @@ Notes:
if (queueHide)
hide()
- return 1
+ return TRUE
/datum/tooltip/proc/hide()
@@ -122,4 +122,33 @@ Notes:
if(user.client && user.client.tooltips)
user.client.tooltips.hide()
+/**
+ * # `get_tooltip_data()`
+ *
+ * If set, will return a list for the tooltip (that will also be put together in a `Join()`)
+ * However, if returning `null`, falls back to default behavior, which is `examine(src)`, and it will definitely include
+ * images since it is the default behavior
+ *
+ * Though no tooltips will be created for atoms that have `tooltips = FALSE`
+*/
+/atom/movable/proc/get_tooltip_data()
+ return
+/atom/movable/MouseEntered(location, control, params)
+ . = ..()
+ if(tooltips)
+ if(!QDELETED(src))
+ var/list/examine_list = examine(src)
+ var/get_tooltip_data = get_tooltip_data()
+ if(length(get_tooltip_data))
+ examine_list = get_tooltip_data
+ var/examine_data = examine_list.Join("
")
+ openToolTip(usr, src, params, title = name, content = examine_data)
+
+/atom/movable/MouseExited(location, control, params)
+ . = ..()
+ closeToolTip(usr)
+
+/client/MouseDown(object, location, control, params)
+ closeToolTip(usr)
+ . = ..()
diff --git a/code/modules/tooltip/tooltip.html b/code/modules/tooltip/tooltip.html
index 60bd358031..2743bc03d5 100644
--- a/code/modules/tooltip/tooltip.html
+++ b/code/modules/tooltip/tooltip.html
@@ -65,12 +65,12 @@
.hisgrace .wrap {border-color: #7C1414;}
.hisgrace .content {color: #15D512; border-color: #9D1414; background-color: #861414;}
-
+
/* TG: Themes */
/* ScreenUI */
.midnight .wrap {border-color: #2B2B33;}
.midnight .content {color: #6087A0; border-color: #2B2B33; background-color: #36363C;}
-
+
.plasmafire .wrap {border-color: #21213D;}
.plasmafire .content {color: #FFA800 ; border-color: #21213D; background-color:#1D1D36;}
@@ -85,7 +85,7 @@
.clockwork .wrap {border-color: #170800;}
.clockwork .content {color: #B18B25; border-color: #000000; background-color: #5F380E;}
-
+
diff --git a/code/modules/uplink/uplink_items/uplink_ammo.dm b/code/modules/uplink/uplink_items/uplink_ammo.dm
index 853f6111b2..2ab6c6f490 100644
--- a/code/modules/uplink/uplink_items/uplink_ammo.dm
+++ b/code/modules/uplink/uplink_items/uplink_ammo.dm
@@ -7,6 +7,13 @@
// Ammunition
+/datum/uplink_item/ammo/derringer
+ name = "Ammo Box - .45-70 GOVT"
+ desc = "Contains 10 additional .45-70 GOVT rounds. Caliber is exceedingly rare, and thus, comes at a premium."
+ item = /obj/item/ammo_box/g4570
+ cost = 5
+ include_modes = list(/datum/game_mode/nuclear)
+
/datum/uplink_item/ammo/pistol
name = "10mm Handgun Magazine"
desc = "An additional 8-round 10mm magazine; compatible with the Stechkin Pistol. These rounds \
diff --git a/code/modules/uplink/uplink_items/uplink_bundles.dm b/code/modules/uplink/uplink_items/uplink_bundles.dm
index 465f980804..9b17162532 100644
--- a/code/modules/uplink/uplink_items/uplink_bundles.dm
+++ b/code/modules/uplink/uplink_items/uplink_bundles.dm
@@ -135,7 +135,7 @@
but you never know. Contents are sorted to always be worth 50 TC."
item = /obj/structure/closet/crate
cost = 20
- player_minimum = 25
+ player_minimum = 20
exclude_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops, /datum/game_mode/traitor/internal_affairs)
cant_discount = TRUE
var/starting_crate_value = 50
@@ -145,7 +145,7 @@
desc = "A dusty SUPER-SIZED from the back of the Syndicate warehouse. Rumored to contain a valuable assortment of items, \
but you never know. Contents are sorted to always be worth 125 TC."
cost = 40
- player_minimum = 40
+ player_minimum = 30
starting_crate_value = 125
/datum/uplink_item/bundles_TC/surplus/purchase(mob/user, datum/component/uplink/U)
diff --git a/code/modules/uplink/uplink_items/uplink_stealth.dm b/code/modules/uplink/uplink_items/uplink_stealth.dm
index 673f2ab6ee..63d70b9141 100644
--- a/code/modules/uplink/uplink_items/uplink_stealth.dm
+++ b/code/modules/uplink/uplink_items/uplink_stealth.dm
@@ -49,7 +49,7 @@
name = "Compact Derringer"
desc = "An easily concealable handgun capable of firing .357 rounds. Comes in an inconspicuious packet of cigarettes with additional munitions."
item = /obj/item/storage/fancy/cigarettes/derringer
- cost = 8
+ cost = 6
surplus = 30
/datum/uplink_item/stealthy_weapons/derringerpack/purchase(mob/user, datum/component/uplink/U)
@@ -57,7 +57,7 @@
item = /obj/item/storage/fancy/cigarettes/derringer/gold
..()
-/datum/uplink_item/stalthy_weapons/derringerpack_nukie
+/datum/uplink_item/stealthy_weapons/derringerpack_nukie
name = "Antique Derringer"
desc = "An easy to conceal, yet extremely deadly handgun, capable of firing .45-70 Govt rounds. Comes in a unique pack of cigarettes with additional munitions."
item = /obj/item/storage/fancy/cigarettes/derringer/midworld
diff --git a/code/modules/vending/_vending.dm b/code/modules/vending/_vending.dm
index 5f39158413..b86ab6023a 100644
--- a/code/modules/vending/_vending.dm
+++ b/code/modules/vending/_vending.dm
@@ -55,7 +55,7 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
armor = list("melee" = 20, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 70)
circuit = /obj/item/circuitboard/machine/vendor
payment_department = ACCOUNT_SRV
- light_power = 0.5
+ light_power = 0.3
light_range = MINIMUM_USEFUL_LIGHT_RANGE
/// Is the machine active (No sales pitches if off)!
var/active = TRUE
diff --git a/code/modules/vending/dinnerware.dm b/code/modules/vending/dinnerware.dm
index b78af9c46b..c5b85ed61c 100644
--- a/code/modules/vending/dinnerware.dm
+++ b/code/modules/vending/dinnerware.dm
@@ -8,6 +8,7 @@
/obj/item/kitchen/fork = 6,
/obj/item/kitchen/knife = 6,
/obj/item/kitchen/rollingpin = 4,
+ /obj/item/kitchen/unrollingpin = 4,
/obj/item/reagent_containers/food/drinks/drinkingglass = 8,
/obj/item/clothing/suit/apron/chef = 2,
/obj/item/storage/box/cups = 2,
diff --git a/html/changelog.html b/html/changelog.html
index 1050db0faf..61681621e7 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -50,6 +50,74 @@
-->
+
11 May 2021
+
LetterN updated:
+
+ - fixes emagging console shuttle purchases
+ - syndie melee simplemobs has no more bullshit shield
+
+
bunny232 updated:
+
+ - Delta station xenobiology department has received enhanced scrubbing and ventilation capabilities similar to box and meta
+
+
+
09 May 2021
+
Putnam3145 updated:
+
+ - Priority announcement admeme verb
+
+
SandPoot updated:
+
+ - Fixed Cyborg examines adding an extra weird line.
+ - Everything can be set to have tooltips, and even coded to have neat tooltips.
+ - Makes it so humans and borgs already have tooltips.
+
+
TheObserver-sys updated:
+
+ - Fixes most of the weird handling bugs and improves cigarette case handling in general.
+ - The Gorlex Marauders have seen fit to allow you to purchase the .45-70 GOVT rare ammo, at a premium cost. Don't waste it.
+
+
WanderingFox95 updated:
+
+ - added the unrolling pin, an innovative solution to dough-based mishaps.
+ - added visuals for the unrolling pin
+
+
dzahlus updated:
+
+ - added new malf AI spawn and doomsday sound
+ - removed old malf AI spawn and doomsday sound
+
+
zeroisthebiggay updated:
+
+ - pirates now have a medbay and several other things qualifying as a buff
+ - pirates lost their toilet
+
+
+
08 May 2021
+
Arturlang updated:
+
+ - Synthblood bottles now have the proper color and probably won't poison you anymore
+
+
timothyteakettle updated:
+
+ - lets humans have digi legs (and avian legs)
+
+
+
05 May 2021
+
The0bserver, with a great amount of advice from TripleZeta/TetraZeta updated:
+
+ - Adds a new crate type, for use with any manner of cheeky breeki shenanigans, as well as with existing Russian contraband.
+
+
bunny232 updated:
+
+ - There's some new vents and scrubbers in the meta station xenobiology department. Welders and wrenches not included*
+
+
keronshb updated:
+
+ - Nightmare Shadow Jaunt threshold up to 0.4
+ - Vendor and Engraved message light down to 0.3
+
+
03 May 2021
TripleShades updated:
@@ -703,85 +771,6 @@
- uncapped TEG power, buffing high-temp TEGs
-
- 09 March 2021
- LetterN updated:
-
- - tg hardsync, mostly contains tgui
-
-
- 07 March 2021
- Hatterhat updated:
-
- - You can now reskin your improvised shotguns.
- - The spontaneous brain trauma event now announces to ghosts whoever got funnied upon.
- - Ports EikoBiko's cat tail sprite.
-
- Putnam3145 updated:
-
- - nitryl now consumes oxygen/nitrogen instead of generating them
- - Hyper-nob and nitryl are easier to make.
-
- dzahlus updated:
-
- - Added taser microbattery for MWS-01
- - tweaked MWS-01 beacondrop to have more batteries
- - rebalanced MWS-01 disabler battery to fire 10 shots
- - added unique sound to the MWS-01
- - fixed Modula Weapons System to "Modular Weapon System"
-
- timothyteakettle updated:
-
- - exiting a bluespace jar through any means, hardstuns you for 5 seconds
-
-
- 05 March 2021
- Putnam3145 updated:
-
- - Lowered ash storm volume
- - Minesweeper can no longer be made to lag the server on purpose
-
- keronshb updated:
-
- - Prevents heat from going through reinforced plasma glass.
-
-
- 04 March 2021
- LetterN updated:
-
-
- 03 March 2021
- MarinaGryphon updated:
-
- - The AOOC mute pref is now properly respected.
- - Muting adminhelp sounds no longer mutes AOOC.
-
- Putnam3145 updated:
-
- - pAIs now have a policy config
- - "Supermatter surge" event, which might cause problems if the supermatter is not sufficiently cooled (i.e. the setup is messed up in some way)
- - Fusion can no longer be done in open air.
- - Valentine's day event no longer gives everyone a valentine's antag.
-
- SandPoot updated:
-
- - Legions should now pass their type to the person they infect (if valid).
-
- dzahlus updated:
-
- - Added new subtype to lesser ash drake balanced around player control
- - rebalanced dragon transformation to a 1 minute cooldown as well as using the new subtype of megafauna
-
- qweq12yt updated:
-
- - fixed infectious zombies not being able to attack if host was pacifist
- - adds a way for species to have blacklisted quirks, the removal, and restoration of said quirks upon species changes
- - Now pacifists won't be able to use flamethrowers
- - Kinetic Accelerator now properly reloads a charge to it's chamber instead of nulling the variable forever
- - Now pacifists won't be able to use Kinetic Accelerators if a non-pacifist shoots it first
-