diff --git a/html/changelogs/LynxSolstice-Tajara-Smuggler-Modernization.yml b/html/changelogs/LynxSolstice-Tajara-Smuggler-Modernization.yml
new file mode 100644
index 00000000000..949116147f7
--- /dev/null
+++ b/html/changelogs/LynxSolstice-Tajara-Smuggler-Modernization.yml
@@ -0,0 +1,59 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+# bugfix
+# - (fixes bugs)
+# wip
+# - (work in progress)
+# qol
+# - (quality of life)
+# soundadd
+# - (adds a sound)
+# sounddel
+# - (removes a sound)
+# rscadd
+# - (adds a feature)
+# rscdel
+# - (removes a feature)
+# imageadd
+# - (adds an image or sprite)
+# imagedel
+# - (removes an image or sprite)
+# spellcheck
+# - (fixes spelling or grammar)
+# experiment
+# - (experimental change)
+# balance
+# - (balance changes)
+# code_imp
+# - (misc internal code change)
+# refactor
+# - (refactors code)
+# config
+# - (makes a change to the config files)
+# admin
+# - (makes changes to administrator tools)
+# server
+# - (miscellaneous changes to server)
+#################################
+
+# Your name.
+author: LynxSolstice
+
+# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made. See valid prefix list above.
+# INDENT WITH TWO SPACES. NOT TABS. SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit.
+# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
+changes:
+ - qol: "Brings the fuel tank of the Tajaran Smuggler vessel into the modern age."
+ - bugfix: "Fixes all the un-pixelshifted lights, and adds an airlock where someone forgot to add one again when pulling out the old deprecated airlocks."
diff --git a/maps/away/ships/tajara/taj_smuggler/tajaran_smuggler.dmm b/maps/away/ships/tajara/taj_smuggler/tajaran_smuggler.dmm
index d7da37488e3..01b98ba16a2 100644
--- a/maps/away/ships/tajara/taj_smuggler/tajaran_smuggler.dmm
+++ b/maps/away/ships/tajara/taj_smuggler/tajaran_smuggler.dmm
@@ -40,7 +40,9 @@
},
/area/tajaran_smuggler)
"aci" = (
-/obj/machinery/computer/ship/engines,
+/obj/machinery/atmospherics/binary/pump/high_power{
+ dir = 8
+ },
/turf/simulated/floor{
temperature = 278.15
},
@@ -79,17 +81,19 @@
/turf/simulated/floor/plating,
/area/shuttle/tajaran_smuggler)
"agg" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/light/small{
- dir = 8
+ dir = 8;
+ pixel_x = -12
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor{
temperature = 278.15
},
/area/tajaran_smuggler)
"ahU" = (
-/obj/machinery/atmospherics/pipe/simple/hidden,
-/obj/structure/extinguisher_cabinet/east,
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 8
+ },
/turf/simulated/floor{
temperature = 278.15
},
@@ -126,9 +130,7 @@
/turf/simulated/floor/tiled/dark/full,
/area/shuttle/tajaran_smuggler)
"atB" = (
-/obj/machinery/atmospherics/pipe/simple/hidden{
- dir = 9
- },
+/obj/machinery/atmospherics/pipe/manifold/hidden/black,
/turf/simulated/floor{
temperature = 278.15
},
@@ -339,12 +341,13 @@
/area/tajaran_smuggler/captain_quarters)
"bcf" = (
/obj/structure/bed/stool/bar/padded/red,
-/obj/machinery/light/small{
- dir = 8
- },
/obj/effect/floor_decal/spline/fancy/wood{
dir = 8
},
+/obj/machinery/light/small{
+ dir = 8;
+ pixel_x = -12
+ },
/turf/simulated/floor/wood{
temperature = 278.15
},
@@ -396,7 +399,8 @@
/area/shuttle/tajaran_smuggler_cargo)
"buK" = (
/obj/machinery/light/small{
- dir = 4
+ dir = 4;
+ pixel_x = 12
},
/turf/simulated/floor/tiled/dark{
temperature = 278.15
@@ -418,7 +422,9 @@
dir = 8;
id = "tajara_smuggler"
},
-/obj/machinery/light/small,
+/obj/machinery/light/small{
+ pixel_y = -23
+ },
/turf/simulated/floor{
temperature = 278.15
},
@@ -475,6 +481,14 @@
temperature = 278.15
},
/area/shuttle/tajaran_smuggler_cargo)
+"bIa" = (
+/obj/machinery/atmospherics/binary/pump/high_power{
+ dir = 4
+ },
+/turf/simulated/floor/plating{
+ temperature = 278.15
+ },
+/area/tajaran_smuggler/engine)
"bOZ" = (
/obj/structure/table/standard,
/obj/item/device/flashlight/lamp,
@@ -494,7 +508,8 @@
/area/tajaran_smuggler/bridge)
"bVS" = (
/obj/machinery/light/small{
- dir = 8
+ dir = 8;
+ pixel_x = -12
},
/turf/simulated/floor{
temperature = 278.15
@@ -540,10 +555,11 @@
/turf/template_noop,
/area/shuttle/tajaran_smuggler_cargo)
"cds" = (
+/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small{
- dir = 1
+ dir = 1;
+ pixel_y = 5
},
-/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor{
temperature = 278.15
},
@@ -633,15 +649,8 @@
},
/area/tajaran_smuggler)
"cQX" = (
-/obj/machinery/telecomms/allinone/ship,
-/obj/machinery/light/small{
- dir = 1
- },
-/turf/simulated/floor/tiled{
- name = "cooled floor";
- temperature = 278
- },
-/area/tajaran_smuggler/engine)
+/turf/simulated/wall/shuttle/raider,
+/area/space)
"cRY" = (
/obj/structure/cable/green{
d1 = 4;
@@ -682,7 +691,9 @@
/area/tajaran_smuggler/bridge)
"dyx" = (
/obj/effect/floor_decal/industrial/warning,
-/obj/machinery/light/small,
+/obj/machinery/light/small{
+ pixel_y = -23
+ },
/turf/simulated/floor{
temperature = 278.15
},
@@ -744,17 +755,6 @@
temperature = 278.15
},
/area/tajaran_smuggler/atmos)
-"dQy" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden{
- dir = 1
- },
-/obj/machinery/light/small{
- dir = 1
- },
-/turf/simulated/floor{
- temperature = 278.15
- },
-/area/tajaran_smuggler/engine)
"dQZ" = (
/obj/effect/floor_decal/industrial/warning{
dir = 8
@@ -765,12 +765,39 @@
},
/area/tajaran_smuggler/hangar)
"dTw" = (
-/obj/effect/map_effect/airlock/w_to_e/long/square,
-/turf/simulated/wall/shuttle/raider,
+/obj/machinery/door/airlock/external{
+ dir = 4
+ },
+/obj/machinery/access_button{
+ pixel_x = 12;
+ pixel_y = -28;
+ dir = 4
+ },
+/obj/effect/floor_decal/industrial/hatch/red,
+/obj/effect/floor_decal/industrial/warning/cee,
+/obj/effect/map_effect/marker_helper/airlock/exterior,
+/obj/effect/map_effect/marker/airlock/docking/tajaran_smuggler/dock/port,
+/obj/effect/shuttle_landmark/tajaran_smuggler/dock/port{
+ dir = 4;
+ landmark_tag = "nav_tajaran_smuggler_dock_port_south";
+ docking_controller = "airlock_tajaran_smuggler_dock_port_south";
+ name = "Dock, Port, South"
+ },
+/turf/simulated/floor/tiled/dark,
/area/tajaran_smuggler)
+"dWJ" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/black{
+ dir = 8
+ },
+/obj/machinery/meter,
+/turf/simulated/floor{
+ temperature = 278.15
+ },
+/area/tajaran_smuggler/engine)
"dZr" = (
/obj/machinery/light/small{
- dir = 1
+ dir = 1;
+ pixel_y = 5
},
/turf/simulated/floor/tiled/dark{
temperature = 278.15
@@ -868,7 +895,7 @@
},
/area/tajaran_smuggler/atmos)
"eEC" = (
-/obj/machinery/atmospherics/pipe/simple/hidden{
+/obj/machinery/atmospherics/pipe/simple/hidden/black{
dir = 5
},
/turf/simulated/floor{
@@ -917,9 +944,6 @@
},
/area/tajaran_smuggler)
"ePD" = (
-/obj/machinery/atmospherics/binary/pump/high_power{
- dir = 8
- },
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable/green{
d1 = 4;
@@ -993,17 +1017,29 @@
/area/shuttle/tajaran_smuggler_cargo)
"eVI" = (
/obj/machinery/light/small{
- dir = 1
+ dir = 1;
+ pixel_y = 5
},
/turf/simulated/floor{
temperature = 278.15
},
/area/tajaran_smuggler/atmos)
"eYk" = (
-/obj/machinery/light/small,
-/turf/simulated/floor{
- temperature = 278.15
+/obj/machinery/door/airlock/external{
+ dir = 4
},
+/obj/effect/floor_decal/industrial/hatch/red,
+/obj/effect/floor_decal/industrial/warning/cee{
+ dir = 1
+ },
+/obj/effect/map_effect/marker_helper/airlock/exterior,
+/obj/effect/map_effect/marker/airlock/docking/tajaran_smuggler/dock/port,
+/obj/machinery/access_button{
+ pixel_x = 12;
+ pixel_y = 28;
+ dir = 4
+ },
+/turf/simulated/floor/tiled/dark,
/area/tajaran_smuggler)
"eYX" = (
/obj/machinery/atmospherics/pipe/manifold/visible/red{
@@ -1015,29 +1051,34 @@
},
/area/tajaran_smuggler/atmos)
"fjf" = (
-/obj/machinery/atmospherics/binary/pump/high_power{
+/obj/machinery/embedded_controller/radio/airlock/docking_port{
+ dir = 2;
+ pixel_y = 28;
+ pixel_x = -6
+ },
+/obj/effect/floor_decal/industrial/outline_door/red{
dir = 4
},
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor{
- temperature = 278.15
+/obj/effect/floor_decal/industrial/outline_straight/red{
+ dir = 1
},
-/area/tajaran_smuggler/engine)
+/obj/effect/map_effect/marker/airlock/docking/tajaran_smuggler/dock/port,
+/turf/simulated/floor/plating,
+/area/tajaran_smuggler)
"fji" = (
-/obj/machinery/atmospherics/pipe/simple/hidden{
- dir = 8
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor{
+/obj/effect/map_effect/window_spawner/full/borosilicate/reinforced/firedoor,
+/obj/machinery/atmospherics/pipe/simple/hidden/black,
+/turf/simulated/floor/plating{
temperature = 278.15
},
/area/tajaran_smuggler/engine)
"fjy" = (
/obj/structure/largecrate/animal/adhomai/fatshouter,
+/obj/effect/floor_decal/industrial/outline/yellow,
/obj/machinery/light/small{
- dir = 8
+ dir = 8;
+ pixel_x = -12
},
-/obj/effect/floor_decal/industrial/outline/yellow,
/turf/simulated/floor{
temperature = 278.15
},
@@ -1118,14 +1159,15 @@
dir = 4;
pixel_x = -32
},
-/obj/machinery/light/small{
- dir = 1
- },
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 4;
icon_state = "map_scrubber_on"
},
/obj/machinery/firealarm/north,
+/obj/machinery/light/small{
+ dir = 1;
+ pixel_y = 5
+ },
/turf/simulated/floor/tiled/dark{
temperature = 278.15
},
@@ -1146,52 +1188,50 @@
},
/area/tajaran_smuggler)
"fOQ" = (
-/obj/machinery/light/small{
- dir = 4
- },
/obj/structure/cult/tome{
desc = "A black stone altar dedicated to Minharrzka, the goddess of the waters and patroness of sailors.";
icon_state = "churchaltar";
name = "altar"
},
+/obj/machinery/light/small{
+ dir = 4;
+ pixel_x = 12
+ },
/turf/simulated/floor{
temperature = 278.15
},
/area/tajaran_smuggler/engine)
"fQq" = (
-/obj/effect/landmark/entry_point/port{
- name = "port, airlock"
+/obj/machinery/atmospherics/portables_connector{
+ dir = 4
},
-/turf/simulated/floor{
+/obj/effect/floor_decal/industrial/hatch/yellow,
+/turf/simulated/floor/plating{
temperature = 278.15
},
-/area/tajaran_smuggler)
+/area/tajaran_smuggler/engine)
"fRI" = (
/obj/machinery/atmospherics/portables_connector/aux,
/obj/machinery/portable_atmospherics/canister/air/airlock,
/obj/effect/floor_decal/industrial/hatch/yellow,
/turf/simulated/floor/tiled/dark,
/area/shuttle/tajaran_smuggler)
-"fUw" = (
-/obj/machinery/atmospherics/pipe/simple/hidden{
- dir = 8
+"fVv" = (
+/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux,
+/obj/machinery/airlock_sensor{
+ dir = 2;
+ pixel_y = 28;
+ pixel_x = 6
},
-/obj/machinery/meter,
-/turf/simulated/floor{
- temperature = 278.15
+/obj/effect/floor_decal/industrial/outline_door/red{
+ dir = 8
},
-/area/tajaran_smuggler/engine)
-"fVv" = (
-/obj/machinery/door/airlock/hatch{
- name = "Telecomms";
+/obj/effect/floor_decal/industrial/outline_straight/red{
dir = 1
},
-/obj/structure/plasticflaps/airtight,
-/turf/simulated/floor/tiled{
- name = "cooled floor";
- temperature = 278
- },
-/area/tajaran_smuggler/engine)
+/obj/effect/map_effect/marker/airlock/docking/tajaran_smuggler/dock/port,
+/turf/simulated/floor/plating,
+/area/tajaran_smuggler)
"fXG" = (
/obj/machinery/atmospherics/portables_connector{
dir = 8
@@ -1202,7 +1242,8 @@
/area/tajaran_smuggler/atmos)
"fYt" = (
/obj/machinery/light/small{
- dir = 8
+ dir = 8;
+ pixel_x = -12
},
/obj/effect/floor_decal/corner/paleblue/diagonal,
/obj/structure/toilet{
@@ -1253,14 +1294,15 @@
/area/tajaran_smuggler/bridge)
"gfd" = (
/obj/structure/lattice/catwalk/indoor/grate,
-/obj/machinery/light/small{
- dir = 4
- },
/obj/structure/cable/green{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
+/obj/machinery/light/small{
+ dir = 4;
+ pixel_x = 12
+ },
/turf/simulated/floor{
temperature = 278.15
},
@@ -1370,6 +1412,18 @@
temperature = 278.15
},
/area/shuttle/tajaran_smuggler_cargo)
+"gVo" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/telecomms/allinone/ship,
+/obj/machinery/light/small{
+ dir = 1;
+ pixel_y = 5
+ },
+/turf/simulated/floor/tiled{
+ name = "cooled floor";
+ temperature = 278
+ },
+/area/tajaran_smuggler/engine)
"gXv" = (
/obj/machinery/shipsensors/weak,
/obj/structure/railing/mapped,
@@ -1390,19 +1444,14 @@
},
/area/shuttle/tajaran_smuggler_cargo)
"gXD" = (
-/obj/machinery/atmospherics/binary/pump/high_power{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable/green{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/turf/simulated/floor{
- temperature = 278.15
+/obj/machinery/atmospherics/pipe/manifold/hidden/aux,
+/obj/effect/floor_decal/industrial/outline_door/red{
+ dir = 8
},
-/area/tajaran_smuggler/engine)
+/obj/effect/floor_decal/industrial/outline_straight/red,
+/obj/effect/map_effect/marker/airlock/docking/tajaran_smuggler/dock/port,
+/turf/simulated/floor/plating,
+/area/tajaran_smuggler)
"hgE" = (
/obj/machinery/atmospherics/pipe/simple/hidden,
/obj/machinery/firealarm/east,
@@ -1410,6 +1459,22 @@
temperature = 278.15
},
/area/tajaran_smuggler/engine)
+"hhr" = (
+/obj/machinery/door/airlock/external{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/aux{
+ dir = 8
+ },
+/obj/effect/floor_decal/industrial/hatch/red,
+/obj/effect/floor_decal/industrial/warning/cee,
+/obj/effect/map_effect/marker_helper/airlock/interior,
+/obj/effect/map_effect/marker/airlock/docking/tajaran_smuggler/dock/port,
+/obj/machinery/atmospherics/pipe/simple/hidden{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/dark,
+/area/tajaran_smuggler)
"hiw" = (
/obj/effect/floor_decal/industrial/warning{
dir = 5
@@ -1429,7 +1494,9 @@
},
/area/tajaran_smuggler/captain_quarters)
"hpQ" = (
-/obj/machinery/light/small,
+/obj/machinery/light/small{
+ pixel_y = -23
+ },
/turf/simulated/floor{
temperature = 278.15
},
@@ -1522,10 +1589,11 @@
},
/area/tajaran_smuggler)
"hGt" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/light/small{
- dir = 8
+ dir = 8;
+ pixel_x = -12
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor{
temperature = 278.15
},
@@ -1560,6 +1628,18 @@
},
/turf/simulated/floor/airless,
/area/tajaran_smuggler/engine)
+"hOZ" = (
+/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{
+ dir = 8
+ },
+/obj/machinery/light/small/emergency,
+/obj/effect/floor_decal/industrial/outline_door/red{
+ dir = 4
+ },
+/obj/effect/floor_decal/industrial/outline_straight/red,
+/obj/effect/map_effect/marker/airlock/docking/tajaran_smuggler/dock/port,
+/turf/simulated/floor/plating,
+/area/tajaran_smuggler)
"hPd" = (
/obj/structure/table/wood,
/obj/item/device/flashlight/lamp,
@@ -1598,9 +1678,6 @@
/turf/simulated/floor/airless,
/area/shuttle/tajaran_smuggler)
"hVK" = (
-/obj/machinery/light/small{
- dir = 4
- },
/obj/structure/cable/green{
d1 = 1;
d2 = 8;
@@ -1611,6 +1688,10 @@
d2 = 2;
icon_state = "1-2"
},
+/obj/machinery/light/small{
+ dir = 4;
+ pixel_x = 12
+ },
/turf/simulated/floor{
temperature = 278.15
},
@@ -1649,21 +1730,22 @@
},
/area/tajaran_smuggler/atmos)
"iav" = (
-/obj/machinery/atmospherics/pipe/manifold4w/hidden,
/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/manifold/hidden/black,
/turf/simulated/floor{
temperature = 278.15
},
/area/tajaran_smuggler/engine)
"ifp" = (
-/obj/machinery/light/small{
- dir = 4
- },
/obj/structure/cable/green{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
+/obj/machinery/light/small{
+ dir = 4;
+ pixel_x = 12
+ },
/turf/simulated/floor{
temperature = 278.15
},
@@ -1701,17 +1783,16 @@
"ive" = (
/obj/structure/lattice/catwalk/indoor/grate,
/obj/machinery/light/small{
- dir = 8
+ dir = 8;
+ pixel_x = -12
},
/turf/simulated/floor{
temperature = 278.15
},
/area/shuttle/tajaran_smuggler_cargo)
"iwP" = (
-/obj/machinery/atmospherics/pipe/simple/hidden{
- dir = 8
- },
-/turf/simulated/floor{
+/obj/effect/map_effect/window_spawner/full/borosilicate/reinforced/firedoor,
+/turf/simulated/floor/plating{
temperature = 278.15
},
/area/tajaran_smuggler/engine)
@@ -1732,6 +1813,7 @@
/area/shuttle/tajaran_smuggler)
"iOh" = (
/obj/effect/decal/cleanable/blood/oil,
+/obj/structure/closet/emcloset,
/turf/simulated/floor{
temperature = 278.15
},
@@ -1764,8 +1846,16 @@
},
/area/tajaran_smuggler/atmos)
"iRD" = (
-/obj/machinery/atmospherics/pipe/simple/hidden,
-/turf/simulated/wall/shuttle/raider,
+/obj/machinery/atmospherics/pipe/simple/hidden/black{
+ dir = 8
+ },
+/obj/machinery/light/small{
+ dir = 1;
+ pixel_y = 5
+ },
+/turf/simulated/floor{
+ temperature = 278.15
+ },
/area/tajaran_smuggler/engine)
"iSa" = (
/obj/structure/cable/green{
@@ -1888,15 +1978,16 @@
/turf/simulated/wall/shuttle/raider,
/area/tajaran_smuggler/bridge)
"jEu" = (
-/obj/machinery/light/small{
- dir = 4
- },
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable/green{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
+/obj/machinery/light/small{
+ dir = 4;
+ pixel_x = 12
+ },
/turf/simulated/floor{
temperature = 278.15
},
@@ -1963,7 +2054,8 @@
/area/tajaran_smuggler/power)
"jVO" = (
/obj/machinery/light/small{
- dir = 8
+ dir = 8;
+ pixel_x = -12
},
/turf/simulated/floor{
temperature = 278.15
@@ -1995,11 +2087,21 @@
},
/area/tajaran_smuggler/hangar)
"kaR" = (
-/obj/machinery/atmospherics/pipe/manifold4w/hidden,
-/turf/simulated/floor{
- temperature = 278.15
+/obj/machinery/door/airlock/external{
+ dir = 4
},
-/area/tajaran_smuggler/engine)
+/obj/effect/floor_decal/industrial/hatch/red,
+/obj/effect/floor_decal/industrial/warning/cee{
+ dir = 1
+ },
+/obj/effect/map_effect/marker_helper/airlock/interior,
+/obj/effect/map_effect/marker/airlock/docking/tajaran_smuggler/dock/port,
+/obj/machinery/access_button{
+ pixel_x = -25;
+ pixel_y = 28
+ },
+/turf/simulated/floor/tiled/dark,
+/area/tajaran_smuggler)
"kbf" = (
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor{
@@ -2121,19 +2223,21 @@
},
/area/tajaran_smuggler/power)
"kFw" = (
-/obj/machinery/light/small{
- dir = 8
- },
/obj/effect/floor_decal/spline/fancy/wood{
dir = 8
},
+/obj/machinery/light/small{
+ dir = 8;
+ pixel_x = -12
+ },
/turf/simulated/floor/wood{
temperature = 278.15
},
/area/tajaran_smuggler)
"kIx" = (
/obj/machinery/light/small{
- dir = 4
+ dir = 4;
+ pixel_x = 12
},
/turf/simulated/floor{
temperature = 278.15
@@ -2235,6 +2339,16 @@
temperature = 278.15
},
/area/shuttle/tajaran_smuggler_cargo)
+"llj" = (
+/obj/machinery/atmospherics/unary/outlet_injector{
+ dir = 8
+ },
+/obj/effect/map_effect/marker/large_tank{
+ master_tag = "tajaran_smugglers_co2";
+ name = "tajaran_smugglers_co2"
+ },
+/turf/simulated/floor/reinforced/carbon_dioxide,
+/area/tajaran_smuggler/engine)
"lmO" = (
/obj/effect/floor_decal/corner/paleblue/diagonal,
/turf/simulated/floor/tiled/white{
@@ -2466,10 +2580,13 @@
/obj/effect/floor_decal/industrial/hatch/red,
/obj/effect/floor_decal/industrial/warning/cee,
/obj/effect/map_effect/marker_helper/airlock/exterior,
+/obj/effect/map_effect/marker/airlock/docking/tajaran_smuggler/dock/port,
/obj/effect/shuttle_landmark/tajaran_smuggler/dock/port{
- dir = 4
+ dir = 4;
+ landmark_tag = "nav_tajaran_smuggler_dock_port_north";
+ docking_controller = "airlock_tajaran_smuggler_dock_port_north";
+ name = "Dock, Port, North"
},
-/obj/effect/map_effect/marker/airlock/docking/tajaran_smuggler/dock/port,
/turf/simulated/floor/tiled/dark,
/area/adhomian_circus/hangar)
"mgd" = (
@@ -2608,10 +2725,11 @@
/obj/item/clothing/shoes/magboots,
/obj/item/clothing/suit/space/void/engineering,
/obj/item/clothing/head/helmet/space/void/engineering,
+/obj/item/device/gps/engineering,
/obj/machinery/light/small{
- dir = 1
+ dir = 1;
+ pixel_y = 5
},
-/obj/item/device/gps/engineering,
/turf/simulated/floor{
temperature = 278.15
},
@@ -2786,7 +2904,12 @@
/area/shuttle/tajaran_smuggler)
"nZg" = (
/obj/effect/landmark/entry_point/aft,
-/turf/simulated/wall/shuttle/raider,
+/obj/machinery/atmospherics/pipe/simple/hidden/black{
+ dir = 8
+ },
+/turf/simulated/floor{
+ temperature = 278.15
+ },
/area/tajaran_smuggler/engine)
"nZw" = (
/obj/effect/floor_decal/industrial/warning,
@@ -2808,7 +2931,7 @@
/area/tajaran_smuggler)
"obG" = (
/obj/machinery/door/airlock/hatch{
- name = "Dock";
+ name = "Telecomms";
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -2890,15 +3013,16 @@
/area/tajaran_smuggler/dorms)
"oKX" = (
/obj/structure/closet/cabinet,
-/obj/machinery/light/small{
- dir = 8
- },
/obj/item/clothing/under/tajaran,
/obj/item/clothing/under/tajaran/dpra,
/obj/item/clothing/under/tajaran/dpra/alt,
/obj/item/clothing/accessory/holster/hip,
/obj/item/clothing/accessory/storage/pouches/black,
/obj/random/spacecash,
+/obj/machinery/light/small{
+ dir = 8;
+ pixel_x = -12
+ },
/turf/simulated/floor/tiled/dark{
temperature = 278.15
},
@@ -2935,6 +3059,12 @@
temperature = 278.15
},
/area/tajaran_smuggler)
+"oXk" = (
+/obj/structure/extinguisher_cabinet/north,
+/turf/simulated/floor{
+ temperature = 278.15
+ },
+/area/tajaran_smuggler)
"pfE" = (
/obj/structure/foamedmetal,
/turf/simulated/floor{
@@ -2999,7 +3129,6 @@
d2 = 8;
icon_state = "1-8"
},
-/obj/machinery/light/small,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 9;
pixel_y = 0
@@ -3007,6 +3136,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 9
},
+/obj/machinery/light/small{
+ pixel_y = -23
+ },
/turf/simulated/floor{
temperature = 278.15
},
@@ -3040,6 +3172,16 @@
temperature = 278.15
},
/area/tajaran_smuggler/captain_quarters)
+"pVd" = (
+/obj/machinery/door/airlock/hatch{
+ name = "Telecomms";
+ dir = 4
+ },
+/obj/structure/plasticflaps/airtight,
+/turf/simulated/floor{
+ temperature = 278.15
+ },
+/area/tajaran_smuggler/engine)
"pVt" = (
/obj/structure/cable/green{
d1 = 1;
@@ -3099,10 +3241,10 @@
},
/area/tajaran_smuggler)
"qil" = (
-/obj/machinery/atmospherics/pipe/simple/hidden{
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/hidden/black{
dir = 9
},
-/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor{
temperature = 278.15
},
@@ -3227,11 +3369,29 @@
temperature = 278.15
},
/area/tajaran_smuggler/captain_quarters)
-"rfR" = (
-/obj/machinery/atmospherics/pipe/simple/hidden{
- dir = 8
+"reo" = (
+/obj/machinery/light/small{
+ dir = 4;
+ pixel_x = 12
},
-/obj/machinery/meter,
+/obj/structure/cable/green{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/turf/simulated/floor{
+ temperature = 278.15
+ },
+/area/tajaran_smuggler)
+"rfC" = (
+/obj/machinery/atmospherics/binary/pump/high_power{
+ dir = 4
+ },
+/turf/simulated/floor{
+ temperature = 278.15
+ },
+/area/tajaran_smuggler/engine)
+"rfR" = (
/obj/structure/cable/green{
d1 = 4;
d2 = 8;
@@ -3245,7 +3405,9 @@
},
/area/tajaran_smuggler/engine)
"rgA" = (
-/obj/machinery/portable_atmospherics/canister/carbon_dioxide,
+/obj/machinery/atmospherics/pipe/simple/hidden/black{
+ dir = 8
+ },
/turf/simulated/floor{
temperature = 278.15
},
@@ -3275,9 +3437,6 @@
/turf/simulated/wall/shuttle/raider,
/area/tajaran_smuggler)
"rtf" = (
-/obj/machinery/light/small{
- dir = 1
- },
/obj/effect/floor_decal/industrial/warning{
dir = 1
},
@@ -3286,6 +3445,10 @@
dir = 8;
id = "tajara_smuggler"
},
+/obj/machinery/light/small{
+ dir = 1;
+ pixel_y = 5
+ },
/turf/simulated/floor{
temperature = 278.15
},
@@ -3321,6 +3484,19 @@
temperature = 278.15
},
/area/tajaran_smuggler/hangar)
+"rFf" = (
+/obj/machinery/light/small{
+ dir = 1;
+ pixel_y = 5
+ },
+/obj/machinery/meter,
+/obj/machinery/atmospherics/pipe/simple/hidden/black{
+ dir = 8
+ },
+/turf/simulated/floor{
+ temperature = 278.15
+ },
+/area/tajaran_smuggler/engine)
"rLM" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5
@@ -3408,7 +3584,8 @@
dir = 1
},
/obj/machinery/light/small{
- dir = 1
+ dir = 1;
+ pixel_y = 5
},
/turf/simulated/floor{
temperature = 278.15
@@ -3432,12 +3609,10 @@
/turf/space/transit/north,
/area/space)
"sSs" = (
-/obj/machinery/atmospherics/pipe/simple/hidden{
- dir = 8
- },
-/obj/machinery/light/small{
+/obj/machinery/atmospherics/pipe/manifold/hidden/black{
dir = 1
},
+/obj/machinery/meter,
/turf/simulated/floor{
temperature = 278.15
},
@@ -3455,6 +3630,16 @@
temperature = 278.15
},
/area/tajaran_smuggler/hangar)
+"sZS" = (
+/obj/machinery/atmospherics/unary/vent_pump/siphon/atmos{
+ dir = 1
+ },
+/obj/effect/map_effect/marker/large_tank{
+ master_tag = "tajaran_smugglers_co2";
+ name = "tajaran_smugglers_co2"
+ },
+/turf/simulated/floor/reinforced/carbon_dioxide,
+/area/tajaran_smuggler/engine)
"taq" = (
/obj/structure/bed/stool/bar/padded/red,
/obj/effect/floor_decal/spline/fancy/wood{
@@ -3522,7 +3707,8 @@
/obj/item/reagent_containers/food/drinks/carton/fatshouters,
/obj/item/reagent_containers/food/drinks/carton/fatshouters,
/obj/machinery/light/small{
- dir = 1
+ dir = 1;
+ pixel_y = 5
},
/turf/simulated/floor/tiled/white{
temperature = 278.15
@@ -3547,10 +3733,11 @@
},
/area/tajaran_smuggler)
"ttH" = (
+/obj/effect/floor_decal/corner/grey/diagonal,
/obj/machinery/light/small{
- dir = 8
+ dir = 8;
+ pixel_x = -12
},
-/obj/effect/floor_decal/corner/grey/diagonal,
/turf/simulated/floor/tiled/white{
temperature = 278.15
},
@@ -3680,10 +3867,7 @@
},
/area/tajaran_smuggler/engine)
"uqg" = (
-/obj/machinery/light/small{
- dir = 8
- },
-/turf/simulated/floor{
+/turf/simulated/floor/plating{
temperature = 278.15
},
/area/tajaran_smuggler/engine)
@@ -3697,6 +3881,18 @@
temperature = 278.15
},
/area/tajaran_smuggler)
+"uzC" = (
+/obj/machinery/computer/general_air_control/large_tank_control/terminal{
+ dir = 1
+ },
+/obj/effect/map_effect/marker/large_tank{
+ master_tag = "tajaran_smugglers_co2";
+ name = "tajaran_smugglers_co2"
+ },
+/turf/simulated/floor/plating{
+ temperature = 278.15
+ },
+/area/tajaran_smuggler/engine)
"uzP" = (
/obj/effect/floor_decal/industrial/outline/grey,
/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
@@ -3715,11 +3911,12 @@
},
/area/shuttle/tajaran_smuggler_cargo)
"uHV" = (
-/obj/machinery/light/small{
- dir = 4
- },
/obj/vehicle/bike/monowheel,
/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/machinery/light/small{
+ dir = 4;
+ pixel_x = 12
+ },
/turf/simulated/floor{
temperature = 278.15
},
@@ -3811,7 +4008,6 @@
},
/area/tajaran_smuggler/bridge)
"vwF" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden,
/obj/structure/cable/green{
d1 = 4;
d2 = 8;
@@ -3883,12 +4079,12 @@
/turf/simulated/floor/plating,
/area/adhomian_circus/hangar)
"vMT" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 10
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 9
},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
/turf/simulated/floor{
temperature = 278.15
},
@@ -3994,23 +4190,21 @@
/turf/simulated/wall/shuttle/raider,
/area/shuttle/tajaran_smuggler)
"wnl" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/light/small{
- dir = 8
+ dir = 8;
+ pixel_x = -12
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor{
temperature = 278.15
},
/area/tajaran_smuggler/hangar)
"wqH" = (
-/obj/structure/closet/emcloset,
-/obj/machinery/atmospherics/unary/vent_pump/on{
- dir = 1
- },
-/turf/simulated/floor{
- temperature = 278.15
+/obj/machinery/atmospherics/pipe/simple/hidden/black{
+ dir = 8
},
-/area/tajaran_smuggler)
+/turf/simulated/wall/shuttle/raider,
+/area/tajaran_smuggler/engine)
"wrb" = (
/turf/simulated/wall/shuttle/raider,
/area/tajaran_smuggler)
@@ -4062,12 +4256,12 @@
/turf/simulated/wall/shuttle/raider,
/area/shuttle/tajaran_smuggler_cargo)
"xeO" = (
-/obj/machinery/atmospherics/portables_connector{
- },
-/obj/machinery/portable_atmospherics/canister/carbon_dioxide,
-/turf/simulated/floor{
- temperature = 278.15
+/obj/machinery/air_sensor,
+/obj/effect/map_effect/marker/large_tank{
+ master_tag = "tajaran_smugglers_co2";
+ name = "tajaran_smugglers_co2"
},
+/turf/simulated/floor/reinforced/carbon_dioxide,
/area/tajaran_smuggler/engine)
"xmZ" = (
/obj/structure/lattice,
@@ -4075,7 +4269,8 @@
/area/space)
"xoc" = (
/obj/machinery/light/small{
- dir = 8
+ dir = 8;
+ pixel_x = -12
},
/turf/simulated/floor/carpet/art{
temperature = 278.15
@@ -4100,15 +4295,13 @@
},
/area/tajaran_smuggler)
"xto" = (
-/obj/machinery/atmospherics/pipe/simple/hidden{
- dir = 5
- },
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable/green{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
+/obj/machinery/computer/ship/engines,
/turf/simulated/floor{
temperature = 278.15
},
@@ -4240,7 +4433,8 @@
"yjk" = (
/obj/structure/lattice/catwalk/indoor/grate,
/obj/machinery/light/small{
- dir = 4
+ dir = 4;
+ pixel_x = 12
},
/turf/simulated/floor{
temperature = 278.15
@@ -32852,12 +33046,12 @@ xRX
xRX
xRX
bxR
-iRD
+kJl
eEC
uqg
+fQq
kJl
uhO
-uhO
kJl
xRX
xRX
@@ -33109,12 +33303,12 @@ xRX
xRX
xRX
hOL
-iRD
+kJl
iav
-eEC
+uqg
+bIa
kJl
uhO
-uhO
kJl
kJl
xRX
@@ -33366,10 +33560,10 @@ xRX
xRX
xRX
bxR
-iRD
+kJl
atB
-fji
kJl
+wqH
kJl
kJl
kJl
@@ -33624,12 +33818,12 @@ xRX
xRX
kJl
kJl
+dWJ
+fji
+llj
kJl
-iwP
kJl
-cQX
-fVv
-mIz
+gVo
kJl
buM
shH
@@ -33880,13 +34074,13 @@ xRX
xRX
xRX
xRX
-xRX
-kJl
+cQX
+aci
iwP
+xeO
kJl
kJl
-kJl
-dCR
+pVd
kJl
mET
wCo
@@ -34137,11 +34331,11 @@ xRX
xRX
xRX
xRX
-xRX
-kJl
+cQX
+sSs
fji
+sZS
kJl
-xeO
xto
oUn
kJl
@@ -34394,13 +34588,13 @@ xRX
xRX
xRX
xRX
-xRX
+cQX
+iRD
+kJl
kJl
-sSs
kJl
-xeO
vwF
-rgA
+dCR
kJl
eVI
pPS
@@ -34651,13 +34845,13 @@ xRX
xRX
xRX
xRX
-xRX
-kJl
-iwP
-kJl
-aci
-gXD
+cQX
rgA
+uqg
+uzC
+kJl
+ePD
+dCR
kJl
ucT
exM
@@ -34908,9 +35102,9 @@ xRX
xRX
xRX
xRX
-xRX
-kJl
-iwP
+cQX
+rgA
+dCR
kJl
xdk
rfR
@@ -35165,9 +35359,9 @@ xRX
xRX
xRX
xRX
-xRX
-kJl
-fUw
+cQX
+rgA
+dCR
kJl
mLa
kgm
@@ -35422,9 +35616,9 @@ xRX
xRX
xRX
xRX
-xRX
-kJl
-ePD
+cQX
+rgA
+mIz
kJl
qcp
nsN
@@ -35679,9 +35873,9 @@ xRX
xRX
xRX
xRX
-xRX
+cQX
nZg
-dQy
+dCR
ttC
hgE
cCV
@@ -35695,7 +35889,7 @@ nrG
ifp
tEE
nrG
-ifp
+reo
nZw
jEu
mwu
@@ -35936,9 +36130,9 @@ xRX
xRX
xRX
xRX
-xRX
-kJl
-fjf
+cQX
+iRD
+mIz
kJl
kJl
kJl
@@ -36193,9 +36387,9 @@ xRX
xRX
xRX
xRX
-xRX
-kJl
-fUw
+cQX
+rgA
+dCR
kJl
qyO
dAf
@@ -36224,7 +36418,7 @@ jOg
bfg
agg
vMT
-wqH
+wrb
wrb
pfE
pfE
@@ -36450,9 +36644,9 @@ xRX
xRX
xRX
xRX
-xRX
-kJl
-iwP
+cQX
+rgA
+dCR
kJl
xKJ
erW
@@ -36479,12 +36673,12 @@ lOJ
kmF
jOg
iOh
-xTp
+lGQ
ahU
-jIP
wrb
pfE
pfE
+pfE
aMU
uaE
tWN
@@ -36707,9 +36901,9 @@ xRX
xRX
xRX
xRX
-xRX
-kJl
-iwP
+cQX
+rgA
+dCR
kJl
luH
jRk
@@ -36736,12 +36930,12 @@ ilo
rDk
jOg
lGQ
-xpN
-wrb
-wrb
+lGQ
+lGQ
wrb
pfE
pfE
+pfE
aMU
oew
oIi
@@ -36964,9 +37158,9 @@ xRX
xRX
xRX
xRX
-xRX
-kJl
-fji
+cQX
+iRD
+mIz
kJl
neJ
erW
@@ -36994,8 +37188,8 @@ mwV
jOg
lGQ
lGQ
-dTw
-pfE
+lGQ
+wrb
pfE
pfE
pfE
@@ -37221,9 +37415,9 @@ xRX
xRX
xRX
xRX
-xRX
-kJl
-sSs
+cQX
+rgA
+dCR
kJl
jcn
vGR
@@ -37251,11 +37445,11 @@ mwV
jOg
lGQ
lGQ
+lGQ
wrb
pfE
pfE
pfE
-pfE
aMU
aMU
aMU
@@ -37478,9 +37672,9 @@ xRX
xRX
xRX
xRX
-xRX
-kJl
-fji
+cQX
+rgA
+mIz
kJl
cds
izs
@@ -37506,12 +37700,12 @@ oie
ilo
dyx
jOg
-lGQ
-eYk
+oXk
+xTp
+jIP
wrb
pfE
pfE
-pfE
wrb
wrb
xRX
@@ -37735,9 +37929,9 @@ xRX
xRX
xRX
xRX
-xRX
-kJl
-iwP
+cQX
+rfC
+dCR
kJl
izs
izs
@@ -37763,8 +37957,8 @@ bci
ilo
mwV
jOg
-fQq
lGQ
+xpN
wrb
wrb
wrb
@@ -37993,8 +38187,8 @@ xRX
xRX
kJl
kJl
-kJl
-iwP
+rFf
+dCR
kJl
izs
kBu
@@ -38020,9 +38214,9 @@ ilo
ilo
mwV
jOg
-xRX
-xRX
-xRX
+lGQ
+xpN
+wrb
xRX
xRX
xRX
@@ -38249,9 +38443,9 @@ xRX
xRX
xRX
bxR
-iRD
-eEC
-iwP
+kJl
+atB
+dCR
kJl
izs
xHI
@@ -38277,9 +38471,9 @@ ilo
ilo
mwV
jOg
-xRX
-xRX
-xRX
+kaR
+hhr
+wrb
xRX
xRX
xRX
@@ -38506,9 +38700,9 @@ xRX
xRX
xRX
qrf
-iRD
-kaR
-qil
+kJl
+atB
+mIz
wrb
lyG
wbG
@@ -38534,9 +38728,9 @@ lXE
lXE
akP
jOg
-xRX
-xRX
-xRX
+fVv
+gXD
+wrb
xRX
xRX
xRX
@@ -38763,7 +38957,7 @@ xRX
xRX
xRX
bxR
-iRD
+kJl
qil
fOQ
wrb
@@ -38791,9 +38985,9 @@ rAo
rAo
jOg
jOg
-xRX
-xRX
-xRX
+fjf
+hOZ
+wrb
xRX
xRX
xRX
@@ -39046,11 +39240,11 @@ xRX
xRX
xRX
xRX
-xRX
-xRX
-xRX
-xRX
-xRX
+jOg
+jOg
+eYk
+dTw
+wrb
xRX
xRX
xRX