diff --git a/_maps/_mod_celadon/configs/inteq_executer.json b/_maps/_mod_celadon/configs/inteq_executer.json
index ccf4781aa3d9..b925a88cae56 100644
--- a/_maps/_mod_celadon/configs/inteq_executer.json
+++ b/_maps/_mod_celadon/configs/inteq_executer.json
@@ -1,6 +1,6 @@
{
"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
- "map_name": "Executer-Class laser experiment",
+ "map_name": "Executer-class Laser Experiment",
"faction": "/datum/faction/inteq",
"prefix": "IRMV",
"description": "Боевой фрегат класса Палач. Данный корабль обладает большим количеством лазерного вооружения из-за кооперации с Нанотрейзен при создании данного корабля.",
diff --git a/_maps/_mod_celadon/configs/solfed_lightning_bolt.json b/_maps/_mod_celadon/configs/solfed_lightning_bolt.json
index b1e9b4a65927..bf3383fb42b6 100644
--- a/_maps/_mod_celadon/configs/solfed_lightning_bolt.json
+++ b/_maps/_mod_celadon/configs/solfed_lightning_bolt.json
@@ -28,7 +28,7 @@
},
"Assault": {
"outfit": "/datum/outfit/job/solgov/bolt/security",
- "slots": 2
+ "slots": 1
},
"Stormtrooper": {
"outfit": "/datum/outfit/job/solgov/bolt/security",
diff --git a/_maps/_mod_celadon/outpost/elysium_ice.dmm b/_maps/_mod_celadon/outpost/elysium_ice.dmm
index b2174782a46d..6554a1ee7fec 100644
--- a/_maps/_mod_celadon/outpost/elysium_ice.dmm
+++ b/_maps/_mod_celadon/outpost/elysium_ice.dmm
@@ -4714,19 +4714,12 @@
/turf/open/floor/plasteel/telecomms_floor,
/area/outpost/crew/cryo)
"jA" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
/obj/structure/cable{
icon_state = "1-2"
},
/obj/structure/disposalpipe/junction/flip{
dir = 1
},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
dir = 4
},
@@ -4738,6 +4731,9 @@
},
/obj/effect/turf_decal/borderfloor/full,
/obj/machinery/light/floor,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{
+ dir = 4
+ },
/turf/open/floor/plasteel/patterned/cargo_one{
light_color = "#1B1D2E";
light_range = 2
diff --git a/_maps/_mod_celadon/outpost/nanotrasen_asteroid.dmm b/_maps/_mod_celadon/outpost/nanotrasen_asteroid.dmm
index cca6b5e2a121..93e905328ca7 100644
--- a/_maps/_mod_celadon/outpost/nanotrasen_asteroid.dmm
+++ b/_maps/_mod_celadon/outpost/nanotrasen_asteroid.dmm
@@ -525,12 +525,6 @@
},
/turf/open/floor/carpet,
/area/outpost/crew/library)
-"cb" = (
-/obj/effect/decal/fakelattice{
- icon_state = "lattice-12"
- },
-/turf/open/space/basic,
-/area/outpost/external)
"cc" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/turf_decal/industrial/warning{
@@ -905,9 +899,7 @@
/turf/open/floor/plasteel/dark,
/area/outpost/security)
"dx" = (
-/obj/effect/decal/fakelattice{
- icon_state = "lattice-38"
- },
+/obj/structure/lattice/clockwork,
/turf/open/space/basic,
/area/outpost/external)
"dA" = (
@@ -2026,12 +2018,6 @@
},
/turf/open/floor/plasteel/sepia,
/area/outpost/crew/canteen)
-"hH" = (
-/obj/effect/decal/fakelattice{
- icon_state = "lattice-3"
- },
-/turf/open/space/basic,
-/area/outpost/external)
"hI" = (
/obj/machinery/computer/atmos_alert{
dir = 1
@@ -14373,12 +14359,6 @@
/obj/machinery/light/directional/east,
/turf/open/floor/plasteel,
/area/outpost/operations)
-"YE" = (
-/obj/effect/decal/fakelattice{
- icon_state = "lattice-11"
- },
-/turf/open/space/basic,
-/area/outpost/external)
"YF" = (
/obj/structure/table/wood,
/obj/item/reagent_containers/food/drinks/coffee{
@@ -27329,7 +27309,7 @@ Zp
sN
vV
vV
-cb
+dx
Ft
OP
wH
@@ -27516,8 +27496,8 @@ Zp
HY
Ft
dx
-YE
-hH
+dx
+dx
DD
kc
sn
@@ -27703,8 +27683,8 @@ Zp
HY
HY
Ft
-hH
-hH
+dx
+dx
nP
wB
vf
diff --git a/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_gecko.dmm b/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_gecko.dmm
index 6865b0294aea..e9ef96ed3098 100644
--- a/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_gecko.dmm
+++ b/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_gecko.dmm
@@ -1,27 +1,37 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"ah" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 8
+/obj/structure/cable{
+ icon_state = "6-8"
},
/obj/structure/cable{
- icon_state = "1-2"
+ icon_state = "4-6"
},
/obj/structure/cable{
icon_state = "1-4"
},
-/obj/structure/catwalk/over/plated_catwalk,
-/obj/machinery/atmospherics/components/unary/portables_connector{
- dir = 8
+/obj/structure/cable{
+ icon_state = "1-8"
},
-/obj/machinery/portable_atmospherics/canister/oxygen,
/turf/open/floor/plating,
/area/ship/engineering/engine)
"an" = (
+/obj/machinery/door/airlock/external/glass{
+ name = "External Hull Access"
+ },
+/obj/effect/turf_decal/industrial/warning/fulltile,
/turf/open/floor/plating/airless,
-/area/ship/external)
+/area/ship/storage{
+ name = "Storage And Science Bay"
+ })
+"ao" = (
+/obj/structure/cable{
+ icon_state = "5-9"
+ },
+/obj/structure/cable{
+ icon_state = "4-9"
+ },
+/turf/open/floor/plasteel/patterned/cargo_one,
+/area/ship/medical/surgery)
"aq" = (
/obj/effect/turf_decal/siding/yellow{
dir = 6
@@ -42,13 +52,13 @@
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/ship/maintenance/port)
"aD" = (
-/obj/machinery/door/poddoor{
+/obj/structure/window/reinforced/fulltile/shuttle,
+/obj/machinery/door/poddoor/shutters{
id = "gecko_shuttle";
dir = 4
},
-/obj/structure/window/reinforced/fulltile/shuttle,
/turf/open/floor/plating,
-/area/ship/maintenance/central)
+/area/ship/engineering/communications)
"aK" = (
/obj/structure/cable{
icon_state = "1-4"
@@ -56,15 +66,21 @@
/obj/structure/cable{
icon_state = "2-4"
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/effect/turf_decal/trimline/transparent/white/filled/warning{
dir = 4
},
-/obj/structure/catwalk/over/plated_catwalk,
/turf/open/floor/plating,
/area/ship/engineering/engine)
"aM" = (
+/obj/structure/cable{
+ icon_state = "5-6"
+ },
+/obj/structure/cable{
+ icon_state = "1-6"
+ },
+/obj/structure/cable{
+ icon_state = "4-9"
+ },
/turf/open/floor/plasteel/patterned,
/area/ship/medical/surgery)
"aS" = (
@@ -79,7 +95,7 @@
dir = 1
},
/turf/open/floor/plasteel/tech,
-/area/ship/maintenance/central)
+/area/ship/engineering/communications)
"bb" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 8
@@ -96,26 +112,18 @@
},
/obj/structure/catwalk/over/plated_catwalk,
/turf/open/floor/plating,
-/area/ship/hallway/aft)
+/area/ship/hallway/central)
"bk" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/turf/open/floor/plasteel/patterned,
-/area/ship/storage)
+/area/ship/storage{
+ name = "Storage And Science Bay"
+ })
"bo" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/structure/catwalk/over/plated_catwalk,
-/obj/structure/cable{
- icon_state = "1-8"
- },
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
dir = 1
},
+/obj/structure/catwalk/over/plated_catwalk,
/turf/open/floor/plating,
/area/ship/hallway/central)
"bs" = (
@@ -123,13 +131,10 @@
dir = 1
},
/obj/effect/decal/cleanable/dirt,
-/obj/structure/closet/crate/freezer,
-/obj/structure/cable{
- icon_state = "4-8"
- },
/obj/structure/cable{
- icon_state = "1-4"
+ icon_state = "4-10"
},
+/obj/structure/closet/crate/freezer,
/turf/open/floor/plasteel/patterned,
/area/ship/medical/surgery)
"bw" = (
@@ -141,11 +146,8 @@
dir = 1
},
/turf/open/floor/plasteel,
-/area/ship/hallway/fore)
+/area/ship/hallway/central)
"bB" = (
-/obj/machinery/door/poddoor/shutters{
- id = "gecko_starboard"
- },
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable,
/obj/machinery/power/shieldwallgen/atmos/roundstart{
@@ -153,24 +155,25 @@
id = "gecko_starboard_field"
},
/obj/effect/turf_decal/industrial/warning/fulltile,
+/obj/machinery/door/poddoor{
+ id = "gecko_starboard"
+ },
/turf/open/floor/plasteel/tech/grid,
/area/ship/cargo/starboard)
"bH" = (
/turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ship/storage)
+/area/ship/storage{
+ name = "Storage And Science Bay"
+ })
"bK" = (
/obj/item/tank/jetpack/carbondioxide,
-/obj/machinery/suit_storage_unit/inherit,
/obj/item/clothing/suit/space/hardsuit/mining,
-/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer4,
-/obj/effect/turf_decal/techfloor{
- dir = 8
- },
-/obj/effect/turf_decal/trimline/transparent/white/filled/warning{
- dir = 4
- },
-/turf/open/floor/plasteel/dark,
-/area/ship/hallway/central)
+/obj/machinery/suit_storage_unit/inherit,
+/obj/machinery/atmospherics/pipe/layer_manifold,
+/turf/open/floor/plasteel/patterned,
+/area/ship/storage{
+ name = "Storage And Science Bay"
+ })
"bL" = (
/obj/structure/table/reinforced,
/obj/structure/sign/poster/retro/random{
@@ -183,55 +186,43 @@
pixel_x = -8;
pixel_y = 5
},
-/obj/item/spacecash/bundle/c1000,
-/obj/item/spacecash/bundle/c1000,
-/obj/item/spacecash/bundle/c1000,
-/obj/item/spacecash/bundle/c1000,
-/obj/item/spacecash/bundle/c100,
/turf/open/floor/plasteel/telecomms_floor,
/area/ship/bridge)
"bQ" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/cable{
- icon_state = "0-2"
- },
-/obj/machinery/power/apc/auto_name/directional/south{
- dir = 1;
- pixel_y = 33
+/obj/machinery/light_switch{
+ pixel_y = 23;
+ pixel_x = -12
},
/turf/open/floor/plasteel/patterned,
-/area/ship/storage)
+/area/ship/storage{
+ name = "Storage And Science Bay"
+ })
"bU" = (
/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/firealarm/directional/west,
-/obj/structure/closet/crate{
- name = "emergency space suit crate"
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/item/reagent_containers/food/snacks/canned/beans,
+/obj/item/reagent_containers/food/snacks/canned/beans,
+/obj/item/reagent_containers/food/snacks/canned/beans,
+/obj/item/reagent_containers/food/snacks/canned/beans,
+/obj/structure/closet/crate,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+ dir = 2
},
-/obj/item/tank/internals/oxygen/red,
-/obj/item/tank/internals/oxygen/red,
-/obj/item/tank/internals/oxygen/red,
-/obj/item/clothing/head/helmet/space/eva,
-/obj/item/clothing/mask/breath,
-/obj/item/clothing/suit/space/eva,
-/obj/item/clothing/head/helmet/space/eva,
-/obj/item/clothing/mask/breath,
-/obj/item/clothing/mask/breath,
-/obj/item/clothing/suit/space/eva,
-/obj/item/clothing/head/helmet/space/eva,
-/obj/item/clothing/suit/space/eva,
/turf/open/floor/plasteel/patterned,
-/area/ship/storage)
+/area/ship/storage{
+ name = "Storage And Science Bay"
+ })
"bV" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/ship/maintenance/starboard)
"ch" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 8
},
@@ -249,9 +240,6 @@
},
/area/ship/maintenance/starboard)
"cv" = (
-/obj/structure/disposalpipe/trunk{
- dir = 4
- },
/obj/machinery/igniter/incinerator_atmos,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
@@ -273,7 +261,7 @@
},
/obj/machinery/door/poddoor{
dir = 4;
- id = "gecko_thrusters"
+ id = "gecko_starboard_thrusters"
},
/turf/open/floor/plating,
/area/ship/maintenance/starboard)
@@ -289,27 +277,24 @@
pixel_y = -8
},
/turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ship/crew/dorm/dormfive)
+/area/ship/crew/dorm/captain)
"cG" = (
/obj/effect/turf_decal/industrial/warning{
dir = 1
},
/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/structure/cable{
- icon_state = "1-4"
+ icon_state = "8-9"
},
-/obj/item/storage/belt/medical,
-/obj/item/storage/backpack/messenger/med,
-/obj/item/storage/backpack/medic,
-/obj/item/storage/firstaid/medical,
-/obj/structure/closet/secure_closet/medical1,
-/obj/item/clothing/accessory/armband/medblue,
-/obj/item/clothing/head/beret/med,
+/obj/item/clothing/under/plasmaman/medical/skirt,
/obj/item/clothing/suit/hooded/wintercoat/medical,
/obj/item/clothing/under/plasmaman/medical,
-/obj/item/clothing/under/plasmaman/medical/skirt,
+/obj/item/clothing/head/beret/med,
+/obj/item/clothing/accessory/armband/medblue,
+/obj/item/storage/firstaid/medical,
+/obj/item/storage/backpack/medic,
+/obj/item/storage/backpack/messenger/med,
+/obj/structure/closet/secure_closet/medical1,
+/obj/item/storage/belt/medical,
/turf/open/floor/plasteel/patterned,
/area/ship/medical/surgery)
"cK" = (
@@ -326,8 +311,6 @@
/obj/effect/turf_decal/techfloor{
dir = 6
},
-/obj/structure/cable,
-/obj/machinery/power/apc/auto_name/directional/south,
/turf/open/floor/plasteel/tech/grid,
/area/ship/crew)
"cX" = (
@@ -342,6 +325,8 @@
/obj/machinery/door/firedoor/border_only{
dir = 1
},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/turf/open/floor/plasteel/tech/techmaint,
/area/ship/cargo/starboard)
"dd" = (
@@ -355,91 +340,75 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 4
},
-/obj/structure/cable{
- icon_state = "1-8"
- },
/turf/open/floor/plasteel/tech,
/area/ship/bridge)
"df" = (
/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable{
+ icon_state = "2-5"
+ },
/turf/open/floor/plasteel/patterned,
/area/ship/medical/surgery)
"dk" = (
/turf/open/floor/plating,
/area/ship/maintenance/starboard)
"dl" = (
-/obj/structure/closet/secure_closet{
- icon_state = "cap";
- name = "\proper captain's locker";
- req_access_txt = "20";
- anchored = 1
- },
-/obj/item/clothing/head/caphat/nt,
/obj/item/stock_parts/cell/gun,
/obj/item/gun/energy/laser,
/obj/item/clothing/shoes/laceup,
-/obj/item/clothing/head/caphat/parade,
/obj/item/clothing/glasses/sunglasses,
-/obj/item/clothing/suit/armor/vest/capcarapace,
/obj/item/megaphone/command,
/obj/item/binoculars,
/obj/item/kitchen/knife/combat,
-/obj/item/clothing/suit/armor/vest/capcarapace,
-/obj/item/clothing/head/caphat/parade,
-/obj/item/clothing/head/nanotrasen/captain/peaked,
-/obj/item/clothing/under/nanotrasen/captain,
-/obj/item/clothing/under/nanotrasen/captain/skirt,
-/obj/item/clothing/suit/armor/nanotrasen/captain,
/obj/machinery/newscaster/directional/north,
+/obj/item/clothing/under/nanotrasen/captain/skirt,
+/obj/item/clothing/under/nanotrasen/captain,
+/obj/structure/closet/secure_closet{
+ icon_state = "cap";
+ name = "\proper captain's locker";
+ req_access_txt = "20"
+ },
/turf/open/floor/plasteel/tech,
-/area/ship/crew/dorm/dormfive)
+/area/ship/crew/dorm/captain)
"dp" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/reagent_dispensers/fueltank,
/turf/open/floor/plating,
/area/ship/maintenance/starboard)
"dq" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/power/apc/auto_name/directional/north,
/obj/structure/cable{
- icon_state = "4-8"
+ icon_state = "4-6"
+ },
+/obj/structure/cable{
+ icon_state = "0-2"
},
-/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plating,
-/area/ship/maintenance/port)
+/area/ship/engineering/engine)
"du" = (
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/ship/crew/toilet)
"dV" = (
-/obj/structure/sign/poster/official/nanotrasen_logo,
+/obj/structure/sign/nanotrasen,
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/ship/maintenance/port)
"dX" = (
-/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2,
-/obj/structure/catwalk/over/plated_catwalk,
-/obj/structure/cable{
- icon_state = "1-8"
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
/obj/structure/cable{
- icon_state = "2-8"
+ icon_state = "2-4"
},
/turf/open/floor/plating,
-/area/ship/hallway/fore)
+/area/ship/engineering/engine)
"dZ" = (
/obj/machinery/atmospherics/pipe/simple/dark{
dir = 4
},
-/obj/structure/catwalk/over/plated_catwalk,
/obj/machinery/light/floor,
/turf/open/floor/plating,
/area/ship/engineering/engine)
"ef" = (
-/obj/machinery/light/directional/south,
-/obj/structure/grille,
/obj/structure/cable{
- icon_state = "0-8"
+ icon_state = "0-9"
},
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -450,30 +419,27 @@
/obj/effect/turf_decal/borderfloor,
/obj/structure/extinguisher_cabinet/directional/west,
/turf/open/floor/plasteel,
-/area/ship/hallway/aft)
+/area/ship/hallway/central)
"el" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
- },
-/obj/structure/bodycontainer/morgue,
-/turf/open/floor/plasteel/patterned/cargo_one,
-/area/ship/medical/surgery)
+/obj/structure/railing,
+/turf/open/floor/plasteel/dark,
+/area/ship/engineering/engine)
"et" = (
-/obj/effect/turf_decal/siding/white{
- dir = 4
+/obj/effect/turf_decal/industrial/warning/fulltile,
+/obj/machinery/door/firedoor/border_only{
+ dir = 1
},
-/obj/effect/turf_decal/siding/white{
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
dir = 8
},
-/obj/structure/cable{
- icon_state = "2-4"
+/obj/machinery/door/airlock/external/glass{
+ name = "Interior Hull Access"
},
-/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer4,
-/turf/open/floor/plasteel/patterned/grid,
-/area/ship/hallway/central)
+/turf/open/floor/plasteel/patterned,
+/area/ship/storage{
+ name = "Storage And Science Bay"
+ })
"eu" = (
/obj/structure/cable{
icon_state = "2-8"
@@ -493,21 +459,17 @@
/obj/structure/cable/yellow{
icon_state = "2-8"
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 8
- },
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 8
},
-/obj/effect/turf_decal/siding/yellow{
- dir = 1
- },
-/obj/effect/turf_decal/siding/yellow,
-/obj/structure/catwalk/over/plated_catwalk,
/obj/machinery/light/floor,
-/obj/structure/railing{
+/obj/effect/turf_decal/siding/yellow/end{
dir = 8
},
+/obj/structure/railing{
+ dir = 9
+ },
+/obj/structure/railing,
/turf/open/floor/plasteel/tech/techmaint,
/area/ship/engineering/engine)
"eA" = (
@@ -518,16 +480,13 @@
pixel_x = 2
},
/turf/open/floor/plasteel/tech,
-/area/ship/maintenance/central)
+/area/ship/engineering/communications)
"eC" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/components/binary/pump{
- dir = 8
+/obj/machinery/computer/atmos_control/tank/nitrogen_tank{
+ dir = 1;
+ sensors = list("gecko_n2_sensor"="Nitrogen Tank")
},
-/obj/structure/catwalk/over/plated_catwalk,
/turf/open/floor/plating,
/area/ship/engineering/engine)
"eD" = (
@@ -556,17 +515,17 @@
/turf/open/floor/engine/hull,
/area/ship/external)
"eQ" = (
-/obj/item/radio/intercom/directional/south,
-/obj/structure/catwalk/over/plated_catwalk,
-/obj/machinery/atmospherics/components/unary/portables_connector/layer2{
- dir = 1
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
+ dir = 10
},
-/obj/machinery/portable_atmospherics/canister/air,
/turf/open/floor/plating,
/area/ship/engineering/engine)
"fb" = (
/obj/machinery/light/directional/south,
/obj/item/banner/medical,
+/obj/structure/cable{
+ icon_state = "5-9"
+ },
/turf/open/floor/plasteel/patterned,
/area/ship/medical/surgery)
"fh" = (
@@ -598,12 +557,12 @@
/obj/structure/extinguisher_cabinet/directional/west,
/obj/machinery/newscaster/directional/north,
/turf/open/floor/plasteel,
-/area/ship/hallway/aft)
+/area/ship/hallway/central)
"fv" = (
/obj/machinery/computer/crew,
/obj/machinery/newscaster/directional/north,
/turf/open/floor/plasteel/tech,
-/area/ship/maintenance/central)
+/area/ship/engineering/communications)
"fD" = (
/obj/effect/turf_decal/industrial/warning{
dir = 1
@@ -612,15 +571,24 @@
/obj/structure/cable{
icon_state = "1-2"
},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/turf/open/floor/plasteel/patterned,
/area/ship/cargo/starboard)
"fK" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/power/apc/auto_name/directional/east,
/obj/structure/cable{
- icon_state = "1-2"
+ icon_state = "5-6"
+ },
+/obj/structure/cable{
+ icon_state = "0-10"
+ },
+/obj/structure/cable{
+ icon_state = "5-9"
},
-/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plasteel/stairs,
-/area/ship/maintenance/port)
+/area/ship/maintenance/starboard)
"fP" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
dir = 4
@@ -629,7 +597,6 @@
dir = 1
},
/obj/effect/turf_decal/borderfloor,
-/obj/machinery/airalarm/directional/south,
/turf/open/floor/plasteel,
/area/ship/hallway/central)
"fS" = (
@@ -641,7 +608,7 @@
dir = 8
},
/turf/open/floor/plasteel/tech,
-/area/ship/maintenance/central)
+/area/ship/engineering/communications)
"fZ" = (
/obj/effect/turf_decal/siding/yellow/corner,
/obj/effect/turf_decal/siding/yellow/corner{
@@ -651,7 +618,7 @@
dir = 1
},
/turf/open/floor/plasteel/tech,
-/area/ship/maintenance/central)
+/area/ship/engineering/communications)
"ga" = (
/obj/structure/bed,
/obj/item/bedsheet/dorms,
@@ -662,15 +629,17 @@
/turf/open/floor/plasteel/grimy,
/area/ship/crew)
"ge" = (
-/obj/structure/sign/poster/official/nanotrasen_logo,
-/turf/closed/wall/mineral/titanium/nodiagonal,
+/obj/structure/sign/nanotrasen,
+/turf/closed/wall/mineral/titanium,
/area/ship/bridge)
"gg" = (
-/obj/machinery/atmospherics/pipe/simple/purple/hidden{
- dir = 9
- },
-/obj/structure/catwalk/over/plated_catwalk,
-/turf/open/floor/plating,
+/obj/structure/window/reinforced{
+ dir = 1
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/oxygen_output{
+ dir = 1
+ },
+/turf/open/floor/engine/o2,
/area/ship/engineering/engine)
"gh" = (
/obj/effect/spawner/lootdrop/salvage_50,
@@ -680,31 +649,23 @@
/turf/open/floor/plasteel/patterned/cargo_one,
/area/ship/cargo/starboard)
"gw" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 8
},
+/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 4
},
-/obj/structure/grille,
-/obj/effect/spawner/structure/window/reinforced,
-/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/ship/bridge)
"gB" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 8
+/obj/structure/cable{
+ icon_state = "4-10"
},
-/obj/machinery/atmospherics/components/binary/pump{
- dir = 8
+/obj/machinery/light/floor,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 9
},
-/obj/structure/catwalk/over/plated_catwalk,
/turf/open/floor/plating,
/area/ship/engineering/engine)
"gE" = (
@@ -712,7 +673,7 @@
/obj/structure/curtain/cloth,
/obj/item/bedsheet/ce,
/turf/open/floor/plasteel/tech,
-/area/ship/maintenance/central)
+/area/ship/engineering/communications)
"gF" = (
/obj/effect/turf_decal/industrial/warning,
/obj/effect/decal/cleanable/dirt,
@@ -729,20 +690,12 @@
/turf/open/floor/plasteel/patterned,
/area/ship/cargo/starboard)
"gN" = (
-/obj/item/tank/jetpack/carbondioxide,
-/obj/machinery/suit_storage_unit/inherit,
-/obj/item/clothing/suit/space/hardsuit/engine,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
- dir = 6
- },
-/obj/effect/turf_decal/techfloor{
- dir = 8
- },
-/obj/effect/turf_decal/trimline/transparent/white/filled/warning{
- dir = 4
- },
-/turf/open/floor/plasteel/dark,
-/area/ship/hallway/central)
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/ship/storage{
+ name = "Storage And Science Bay"
+ })
"gQ" = (
/obj/item/radio/intercom/directional/west,
/obj/machinery/light_switch{
@@ -751,11 +704,16 @@
pixel_y = -25
},
/turf/open/floor/plasteel/tech,
-/area/ship/maintenance/central)
+/area/ship/engineering/communications)
"gS" = (
-/obj/structure/sign/poster/official/nanotrasen_logo,
-/turf/closed/wall/mineral/titanium,
-/area/ship/bridge)
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 10
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 10
+ },
+/turf/open/floor/plasteel/patterned/cargo_one,
+/area/ship/medical/surgery)
"hb" = (
/obj/effect/turf_decal/industrial/fire{
dir = 8
@@ -763,13 +721,9 @@
/obj/machinery/atmospherics/components/binary/pump{
dir = 8
},
-/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/turf/open/floor/plating,
/area/ship/engineering/engine)
-"hn" = (
-/obj/effect/decal/fakelattice,
-/turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ship/engineering/engine)
"hs" = (
/obj/machinery/door/airlock/command{
name = "Communications";
@@ -783,21 +737,29 @@
dir = 1
},
/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/maintenance/central)
+/area/ship/engineering/communications)
"hu" = (
/turf/template_noop,
/area/template_noop)
"hL" = (
-/obj/structure/cable{
- icon_state = "2-8"
- },
-/obj/machinery/light/small/directional/north,
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/obj/structure/cable{
+ icon_state = "6-8"
+ },
+/obj/structure/cable{
+ icon_state = "4-10"
+ },
+/obj/structure/cable{
+ icon_state = "0-10"
+ },
/turf/open/floor/plating,
-/area/ship/maintenance/port)
+/area/ship/medical/surgery)
"hT" = (
-/obj/effect/decal/fakelattice,
/obj/machinery/power/smes/engineering,
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
@@ -812,7 +774,6 @@
/obj/machinery/atmospherics/pipe/simple/dark{
dir = 9
},
-/obj/structure/catwalk/over/plated_catwalk,
/turf/open/floor/plating,
/area/ship/engineering/engine)
"if" = (
@@ -824,38 +785,25 @@
/turf/open/floor/plasteel/grimy,
/area/ship/crew)
"ih" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
- dir = 10
- },
-/obj/effect/turf_decal/techfloor{
- dir = 4
- },
-/obj/effect/turf_decal/trimline/transparent/white/filled/warning{
- dir = 8
- },
-/obj/machinery/power/apc/auto_name/directional/south{
- dir = 4;
- pixel_y = 0;
- pixel_x = 26
- },
-/obj/machinery/power/terminal{
- dir = 4
- },
-/obj/structure/cable{
- icon_state = "0-8"
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 9
},
-/turf/open/floor/plasteel/dark,
-/area/ship/hallway/central)
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/ship/storage{
+ name = "Storage And Science Bay"
+ })
"in" = (
-/obj/structure/catwalk/over/plated_catwalk,
/obj/machinery/light/small/directional/north,
/obj/structure/cable{
icon_state = "2-4"
},
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
/turf/open/floor/plating,
/area/ship/engineering/engine)
"is" = (
-/obj/structure/grille,
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/ship/bridge)
@@ -875,7 +823,6 @@
/turf/open/floor/engine/airless,
/area/ship/engineering/engine)
"iJ" = (
-/obj/effect/spawner/lootdrop/salvage_50,
/obj/structure/ore_box,
/turf/open/floor/plasteel/patterned,
/area/ship/cargo/starboard)
@@ -884,6 +831,7 @@
icon_state = "4-8"
},
/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/spawner/lootdrop/grille_or_trash,
/turf/open/floor/plating,
/area/ship/maintenance/starboard)
"iQ" = (
@@ -897,10 +845,19 @@
/turf/open/floor/plasteel/tech,
/area/ship/bridge)
"iT" = (
-/obj/effect/spawner/lootdrop/grille_or_trash,
/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/structure/cable{
+ icon_state = "8-10"
+ },
+/obj/structure/cable{
+ icon_state = "4-10"
+ },
+/obj/structure/cable{
+ icon_state = "0-6"
+ },
/turf/open/floor/plating,
-/area/ship/maintenance/port)
+/area/ship/crew/toilet)
"jc" = (
/obj/structure/table/reinforced,
/obj/effect/spawner/lootdrop/ration,
@@ -922,9 +879,6 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 9
},
-/obj/structure/cable{
- icon_state = "1-8"
- },
/turf/open/floor/plasteel/patterned/grid,
/area/ship/crew)
"jn" = (
@@ -942,7 +896,7 @@
},
/obj/machinery/door/poddoor{
dir = 4;
- id = "gecko_thrusters"
+ id = "gecko_port_thrusters"
},
/turf/open/floor/plating,
/area/ship/maintenance/port)
@@ -953,23 +907,26 @@
},
/obj/effect/turf_decal/borderfloor,
/turf/open/floor/plasteel,
-/area/ship/hallway/fore)
+/area/ship/hallway/central)
"jx" = (
/obj/effect/turf_decal/industrial/warning{
dir = 1
},
/obj/effect/decal/cleanable/dirt,
-/obj/structure/table/glass,
/obj/structure/cable{
- icon_state = "4-8"
+ icon_state = "8-9"
},
/obj/structure/cable{
- icon_state = "1-4"
+ icon_state = "1-8"
+ },
+/obj/structure/cable{
+ icon_state = "1-10"
},
+/obj/item/storage/backpack/duffelbag/med/surgery,
/obj/item/defibrillator/compact/loaded{
pixel_y = 10
},
-/obj/item/storage/backpack/duffelbag/med/surgery,
+/obj/structure/table/glass,
/turf/open/floor/plasteel/patterned,
/area/ship/medical/surgery)
"jC" = (
@@ -982,24 +939,39 @@
},
/obj/machinery/vending/boozeomat/all_access,
/turf/open/floor/plasteel/tech,
-/area/ship/crew/dorm/dormfive)
+/area/ship/crew/dorm/captain)
+"jJ" = (
+/obj/machinery/air_sensor/atmos/oxygen_tank{
+ id_tag = "gecko_o2_sensor";
+ pixel_x = -1;
+ pixel_y = 4
+ },
+/obj/structure/window/reinforced{
+ dir = 4
+ },
+/obj/structure/window/reinforced,
+/turf/open/floor/engine/o2,
+/area/ship/engineering/engine)
"jK" = (
-/obj/effect/turf_decal/industrial/hatch/yellow,
-/obj/machinery/atmospherics/components/unary/portables_connector{
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/toxin_input{
dir = 4
},
-/obj/machinery/portable_atmospherics/canister/toxins,
-/turf/open/floor/plating,
+/obj/structure/window/reinforced{
+ dir = 4
+ },
+/obj/structure/window/reinforced{
+ dir = 8
+ },
+/turf/open/floor/engine/plasma,
/area/ship/engineering/engine)
"jO" = (
-/obj/structure/window/reinforced/fulltile/shuttle,
-/obj/structure/grille,
/obj/structure/cable{
- icon_state = "0-2"
+ icon_state = "0-6"
},
-/obj/machinery/door/poddoor{
+/obj/machinery/door/poddoor/shutters{
id = "gecko_shuttle"
},
+/obj/structure/window/reinforced/fulltile/shuttle,
/turf/open/floor/plating,
/area/ship/medical/surgery)
"ko" = (
@@ -1018,28 +990,31 @@
/area/ship/medical/surgery)
"kq" = (
/turf/closed/wall/mineral/titanium,
-/area/ship/cargo/starboard)
+/area/ship/maintenance/starboard)
"ks" = (
-/obj/machinery/atmospherics/pipe/manifold/purple{
+/obj/machinery/atmospherics/components/unary/portables_connector/layer4,
+/obj/machinery/atmospherics/pipe/simple/green/hidden/layer4{
dir = 4
},
-/obj/structure/catwalk/over/plated_catwalk,
-/obj/machinery/light/floor,
/turf/open/floor/plating,
/area/ship/engineering/engine)
"kM" = (
/obj/effect/turf_decal/borderfloor,
-/obj/machinery/holopad/emergency/command,
+/obj/structure/chair/comfy/shuttle{
+ dir = 1
+ },
/turf/open/floor/plasteel/dark,
/area/ship/bridge)
"kS" = (
/obj/machinery/rnd/production/protolathe/department/engineering,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plasteel/patterned,
-/area/ship/storage)
+/area/ship/storage{
+ name = "Storage And Science Bay"
+ })
"kZ" = (
/turf/open/floor/plasteel/tech,
-/area/ship/maintenance/central)
+/area/ship/engineering/communications)
"lb" = (
/obj/structure/bed,
/obj/item/bedsheet/dorms,
@@ -1052,19 +1027,9 @@
/turf/open/floor/plasteel/patterned/cargo_one,
/area/ship/cargo/starboard)
"lS" = (
-/obj/structure/sign/poster/official/nanotrasen_logo,
-/turf/closed/wall/mineral/titanium/nodiagonal,
+/obj/structure/sign/nanotrasen,
+/turf/closed/wall/mineral/titanium,
/area/ship/medical/surgery)
-"lW" = (
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
- dir = 8
- },
-/obj/structure/catwalk/over/plated_catwalk,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 6
- },
-/turf/open/floor/plating,
-/area/ship/engineering/engine)
"lY" = (
/obj/docking_port/stationary{
dwidth = 10;
@@ -1078,12 +1043,8 @@
icon_state = "2-8"
},
/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/cyan{
- dir = 5
+ icon_state = "1-5"
},
-/obj/structure/catwalk/over/plated_catwalk,
/turf/open/floor/plating,
/area/ship/engineering/engine)
"mb" = (
@@ -1095,7 +1056,6 @@
/obj/effect/turf_decal/trimline/transparent/white/filled/warning{
dir = 4
},
-/obj/machinery/computer/helm/viewscreen/directional/south,
/obj/structure/table/reinforced,
/obj/item/storage/toolbox/mechanical{
pixel_y = -5
@@ -1117,33 +1077,20 @@
/turf/open/floor/plastic,
/area/ship/crew/toilet)
"mL" = (
-/obj/structure/closet/emcloset,
-/obj/item/tank/internals/plasmaman/full,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/sign/warning/gasmask{
- pixel_x = 32
- },
-/obj/effect/turf_decal/techfloor{
- dir = 4
- },
-/obj/effect/turf_decal/trimline/transparent/white/filled/warning{
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 8
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
- dir = 10
- },
-/turf/open/floor/plasteel/dark,
-/area/ship/hallway/central)
+/turf/open/floor/plasteel/patterned,
+/area/ship/storage{
+ name = "Storage And Science Bay"
+ })
"mM" = (
-/obj/machinery/power/apc/auto_name/directional/north,
-/obj/structure/cable{
- icon_state = "0-8"
- },
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/light_switch{
pixel_x = 11;
pixel_y = 23
},
+/obj/effect/spawner/lootdrop/grille_or_trash,
/turf/open/floor/plating,
/area/ship/maintenance/starboard)
"mN" = (
@@ -1154,28 +1101,23 @@
/obj/effect/turf_decal/borderfloor,
/obj/machinery/light/directional/south,
/turf/open/floor/plasteel,
-/area/ship/hallway/aft)
+/area/ship/hallway/central)
"mS" = (
/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/atmospherics/components/unary/tank/air{
- dir = 4
- },
/turf/open/floor/plating,
/area/ship/engineering/engine)
"mX" = (
-/obj/structure/catwalk/over/plated_catwalk,
/obj/structure/cable{
icon_state = "1-8"
},
-/turf/open/floor/plating,
-/area/ship/engineering/engine)
-"nc" = (
/obj/structure/cable{
- icon_state = "1-2"
+ icon_state = "4-8"
},
-/obj/structure/cable{
- icon_state = "1-2"
+/turf/open/floor/plasteel/stairs/left{
+ dir = 8
},
+/area/ship/engineering/engine)
+"nc" = (
/obj/machinery/door/airlock/command{
dir = 1;
req_access_txt = "20"
@@ -1190,15 +1132,29 @@
},
/obj/effect/turf_decal/industrial/warning/fulltile,
/turf/open/floor/plasteel/tech,
-/area/ship/crew/dorm/dormfive)
+/area/ship/crew/dorm/captain)
"nq" = (
-/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/machinery/atmospherics/components/unary/portables_connector/layer4{
+/obj/effect/turf_decal/techfloor{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/transparent/white/filled/warning{
dir = 8
},
-/obj/machinery/portable_atmospherics/canister/air,
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/hallway/central)
+/obj/machinery/light/small/directional/east,
+/obj/machinery/advanced_airlock_controller{
+ pixel_x = 0;
+ pixel_y = 26
+ },
+/obj/structure/sign/warning/gasmask{
+ pixel_x = 32
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+ dir = 10
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/storage{
+ name = "Storage And Science Bay"
+ })
"nH" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 8
@@ -1210,7 +1166,7 @@
dir = 9
},
/turf/open/floor/plasteel/tech,
-/area/ship/crew/dorm/dormfive)
+/area/ship/crew/dorm/captain)
"oi" = (
/obj/machinery/light/directional/west,
/obj/effect/turf_decal/industrial/warning{
@@ -1218,7 +1174,10 @@
},
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable{
- icon_state = "1-4"
+ icon_state = "4-6"
+ },
+/obj/structure/cable{
+ icon_state = "5-6"
},
/obj/machinery/vending/medical,
/turf/open/floor/plasteel/patterned,
@@ -1226,72 +1185,37 @@
"oj" = (
/turf/closed/wall/mineral/titanium,
/area/ship/engineering/engine)
-"ok" = (
-/obj/machinery/atmospherics/components/binary/pump{
- dir = 4
- },
-/obj/machinery/button/door{
- id = "gecko_thrusters";
- name = "Thruster Blast Door Control";
- pixel_x = -6;
- pixel_y = 24;
- sync_doors = 0
- },
-/turf/open/floor/plating,
-/area/ship/engineering/engine)
-"on" = (
-/obj/effect/decal/fakelattice,
-/obj/machinery/button/ignition{
- dir = 4;
- pixel_x = 10;
- pixel_y = 6
- },
-/obj/machinery/button/ignition{
- dir = 4;
- pixel_x = 10;
- pixel_y = 6;
- id = "atmos_incinerator_igniter"
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
- },
-/turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ship/engineering/engine)
"ov" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/turf_decal/borderfloor,
/turf/open/floor/plasteel,
-/area/ship/hallway/aft)
+/area/ship/hallway/central)
"oy" = (
-/obj/effect/turf_decal/industrial/warning{
+/obj/effect/turf_decal/siding/white{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/white{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{
dir = 1
},
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
- dir = 6
- },
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/hallway/central)
+/turf/open/floor/plasteel/patterned/grid,
+/area/ship/storage{
+ name = "Storage And Science Bay"
+ })
"oJ" = (
/turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ship/crew/dorm/dormfive)
+/area/ship/crew/dorm/captain)
"oM" = (
-/obj/machinery/light_switch{
- dir = 1;
- pixel_x = 5;
- pixel_y = -25
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+ dir = 4
},
-/obj/item/reagent_containers/food/snacks/canned/beans,
-/obj/item/reagent_containers/food/snacks/canned/beans,
-/obj/item/reagent_containers/food/snacks/canned/beans,
-/obj/item/reagent_containers/food/snacks/canned/beans,
-/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/ration,
-/obj/effect/spawner/lootdrop/ration,
-/obj/effect/spawner/lootdrop/ration,
-/obj/effect/spawner/lootdrop/ration,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
/turf/open/floor/plasteel/patterned,
-/area/ship/storage)
+/area/ship/storage{
+ name = "Storage And Science Bay"
+ })
"oR" = (
/obj/effect/turf_decal/industrial/warning{
dir = 1
@@ -1306,23 +1230,14 @@
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 8
},
-/obj/effect/turf_decal/siding/yellow{
- dir = 1
- },
-/obj/effect/turf_decal/siding/yellow,
-/obj/structure/catwalk/over/plated_catwalk,
-/obj/structure/catwalk/over/plated_catwalk,
-/turf/open/floor/plasteel/tech/techmaint,
+/turf/open/floor/plating,
/area/ship/engineering/engine)
"oW" = (
/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/components/unary/passive_vent{
+/obj/machinery/atmospherics/components/unary/outlet_injector/on{
dir = 4
},
/turf/open/floor/engine/hull/reinforced,
@@ -1332,7 +1247,9 @@
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/airalarm/directional/south,
/turf/open/floor/plasteel/patterned,
-/area/ship/storage)
+/area/ship/storage{
+ name = "Storage And Science Bay"
+ })
"pe" = (
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/ship/medical/surgery)
@@ -1352,12 +1269,11 @@
/area/ship/crew/toilet)
"pu" = (
/obj/machinery/vending/coffee,
-/obj/machinery/airalarm/directional/west,
/obj/effect/turf_decal/borderfloor{
dir = 1
},
/turf/open/floor/plasteel,
-/area/ship/hallway/fore)
+/area/ship/hallway/central)
"pD" = (
/obj/effect/turf_decal/industrial/fire{
dir = 8
@@ -1366,7 +1282,6 @@
/obj/machinery/atmospherics/pipe/simple/dark{
dir = 4
},
-/obj/structure/catwalk/over/plated_catwalk,
/turf/open/floor/plating,
/area/ship/engineering/engine)
"pK" = (
@@ -1377,9 +1292,6 @@
/obj/effect/turf_decal/siding/white{
dir = 1
},
-/obj/structure/cable{
- icon_state = "4-8"
- },
/turf/open/floor/plasteel/patterned/grid,
/area/ship/crew)
"pO" = (
@@ -1396,15 +1308,13 @@
/turf/open/floor/plasteel/tech,
/area/ship/bridge)
"pQ" = (
-/obj/machinery/atmospherics/components/trinary/mixer/flipped,
-/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/atmospherics/pipe/manifold/cyan/hidden{
+ dir = 8
+ },
/turf/open/floor/plating,
/area/ship/engineering/engine)
"pW" = (
-/obj/machinery/atmospherics/components/unary/portables_connector/layer2,
-/obj/machinery/portable_atmospherics/canister/air{
- anchored = 1
- },
+/obj/machinery/atmospherics/pipe/layer_manifold,
/turf/open/floor/plating,
/area/ship/engineering/engine)
"pX" = (
@@ -1414,57 +1324,40 @@
/obj/machinery/light/small/directional/west,
/obj/machinery/vending/cigarette/beach,
/turf/open/floor/plasteel/tech,
-/area/ship/crew/dorm/dormfive)
+/area/ship/crew/dorm/captain)
"qb" = (
/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4,
/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2,
/obj/structure/catwalk/over/plated_catwalk,
-/obj/structure/cable{
- icon_state = "4-8"
- },
/turf/open/floor/plating,
-/area/ship/hallway/fore)
-"qc" = (
-/obj/effect/turf_decal/industrial/warning/fulltile,
-/turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ship/storage)
+/area/ship/hallway/central)
"qn" = (
/obj/structure/curtain/bounty,
/obj/structure/bed,
/obj/item/bedsheet/captain,
/obj/machinery/light/directional/north,
/turf/open/floor/plasteel/tech,
-/area/ship/crew/dorm/dormfive)
+/area/ship/crew/dorm/captain)
"qp" = (
-/obj/machinery/door/airlock/maintenance_hatch,
-/obj/structure/cable{
- icon_state = "1-2"
- },
/obj/effect/turf_decal/industrial/warning/fulltile,
/obj/machinery/door/firedoor/border_only,
/obj/machinery/door/firedoor/border_only{
dir = 1
},
+/obj/structure/cable{
+ icon_state = "2-5"
+ },
+/obj/machinery/door/airlock/maintenance_hatch,
/turf/open/floor/plating,
/area/ship/maintenance/port)
"qu" = (
-/obj/structure/grille,
/obj/structure/window/reinforced/fulltile/shuttle,
-/obj/machinery/door/poddoor{
+/obj/machinery/door/poddoor/shutters{
id = "gecko_shuttle"
},
/turf/open/floor/plating,
/area/ship/crew)
"qv" = (
-/obj/structure/cable{
- icon_state = "2-8"
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/structure/cable{
- icon_state = "1-8"
- },
/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4,
/obj/machinery/light/floor,
/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
@@ -1473,28 +1366,30 @@
/turf/open/floor/plasteel/tech,
/area/ship/bridge)
"qB" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/trimline/transparent/white/filled/warning,
/obj/structure/cable{
- icon_state = "2-4"
+ icon_state = "1-4"
},
/obj/structure/cable{
- icon_state = "2-8"
+ icon_state = "1-5"
},
/obj/structure/cable{
- icon_state = "1-2"
+ icon_state = "8-9"
},
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/turf_decal/trimline/transparent/white/filled/warning,
/turf/open/floor/plating,
/area/ship/maintenance/port)
"qL" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
dir = 1
},
/turf/open/floor/plasteel/patterned,
/area/ship/medical/surgery)
"qO" = (
/turf/closed/wall/mineral/titanium,
-/area/ship/hallway/central)
+/area/ship/storage{
+ name = "Storage And Science Bay"
+ })
"rd" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 8
@@ -1502,16 +1397,13 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 4
},
-/obj/structure/cable{
- icon_state = "4-8"
- },
/obj/effect/turf_decal/siding/white,
/obj/effect/turf_decal/siding/white{
dir = 1
},
/obj/structure/catwalk/over/plated_catwalk,
/turf/open/floor/plating,
-/area/ship/hallway/fore)
+/area/ship/hallway/central)
"re" = (
/turf/open/floor/plasteel/tech,
/area/ship/bridge)
@@ -1529,6 +1421,19 @@
/obj/effect/turf_decal/industrial/fire{
dir = 8
},
+/obj/effect/spawner/lootdrop/maintenance,
+/obj/machinery/button/door{
+ id = "gecko_starboard_thrusters";
+ name = "Thruster Blast Door Control";
+ pixel_x = 0;
+ pixel_y = -22;
+ sync_doors = 0;
+ dir = 1
+ },
+/obj/machinery/light/small/directional/south{
+ pixel_x = 11;
+ pixel_y = -28
+ },
/turf/open/floor/plating,
/area/ship/maintenance/starboard)
"ro" = (
@@ -1539,14 +1444,21 @@
/turf/open/floor/plasteel/grimy,
/area/ship/crew)
"rC" = (
-/obj/structure/sign/poster/official/nanotrasen_logo,
+/obj/structure/sign/nanotrasen,
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/ship/engineering/engine)
"rD" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/obj/structure/cable{
+ icon_state = "8-10"
+ },
/turf/open/floor/plating,
-/area/ship/maintenance/port)
+/area/ship/crew/dorm/captain)
"rF" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/effect/turf_decal/siding/white{
@@ -1558,41 +1470,47 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 1
},
-/obj/structure/cable{
- icon_state = "1-2"
- },
/turf/open/floor/plasteel/patterned/grid,
-/area/ship/hallway/fore)
+/area/ship/hallway/central)
"rU" = (
-/obj/effect/turf_decal/industrial/warning/fulltile,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/door/airlock/external/glass{
- name = "External Hull Access"
+/obj/effect/turf_decal/industrial/warning{
+ dir = 1
},
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/hallway/central)
+/turf/open/floor/plasteel/patterned/grid,
+/area/ship/storage{
+ name = "Storage And Science Bay"
+ })
"sg" = (
/turf/open/floor/plasteel/patterned/cargo_one,
/area/ship/medical/surgery)
"ss" = (
-/obj/structure/catwalk/over/plated_catwalk,
-/obj/machinery/button/door{
- dir = 1;
- id = "gecko_thrusters";
- name = "Thruster Blast Door Control";
- pixel_x = -6;
- pixel_y = -24;
- sync_doors = 0
+/obj/effect/turf_decal/atmos/oxygen,
+/obj/structure/window/reinforced,
+/obj/structure/window/reinforced{
+ dir = 1
},
-/turf/open/floor/plating,
+/turf/open/floor/engine/o2,
/area/ship/engineering/engine)
"st" = (
/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/structure/catwalk/over/plated_catwalk,
/obj/machinery/atmospherics/components/binary/pump/layer4{
dir = 8;
name = "waste to enviroment"
},
+/obj/machinery/button/ignition{
+ dir = 4;
+ pixel_x = -22;
+ pixel_y = 6;
+ id = "atmos_incinerator_igniter"
+ },
+/obj/machinery/button/door{
+ dir = 4;
+ id = "gecko_engine_vent";
+ name = "Combustion Chamber Blast Door Control";
+ pixel_x = -23;
+ pixel_y = -7;
+ sync_doors = 0
+ },
/turf/open/floor/plating,
/area/ship/engineering/engine)
"sL" = (
@@ -1605,7 +1523,7 @@
/area/ship/engineering/engine)
"sS" = (
/obj/effect/decal/cleanable/dirt,
-/obj/structure/sign/poster/official/nanotrasen_logo,
+/obj/structure/sign/nanotrasen,
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/ship/maintenance/port)
"sY" = (
@@ -1613,21 +1531,17 @@
/obj/item/clothing/suit/space/hardsuit/engine/elite,
/obj/machinery/suit_storage_unit/inherit,
/turf/open/floor/plasteel/tech,
-/area/ship/maintenance/central)
+/area/ship/engineering/communications)
"td" = (
-/obj/machinery/airalarm/directional/west{
- dir = 4;
- pixel_x = -30
- },
+/obj/structure/sign/nanotrasen,
/turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ship/engineering/engine)
+/area/ship/crew/dorm/captain)
"te" = (
-/obj/machinery/door/poddoor{
- dir = 4;
- id = "gecko_bridge"
- },
-/obj/structure/window/reinforced/fulltile/shuttle,
/obj/structure/window/reinforced/fulltile/shuttle,
+/obj/machinery/door/poddoor/shutters{
+ id = "gecko_bridge";
+ dir = 4
+ },
/turf/open/floor/plating,
/area/ship/bridge)
"tB" = (
@@ -1638,8 +1552,7 @@
/obj/machinery/atmospherics/pipe/simple/dark{
dir = 4
},
-/obj/structure/catwalk/over/plated_catwalk,
-/obj/machinery/portable_atmospherics/canister,
+/obj/machinery/portable_atmospherics/canister/toxins,
/turf/open/floor/plating,
/area/ship/engineering/engine)
"tN" = (
@@ -1655,30 +1568,27 @@
/area/ship/cargo/starboard)
"tV" = (
/obj/structure/cable{
- icon_state = "0-4"
+ icon_state = "0-8"
},
-/obj/machinery/power/apc/auto_name/directional/south,
-/turf/open/floor/plasteel/tech,
-/area/ship/maintenance/central)
+/obj/machinery/door/poddoor/shutters{
+ id = "gecko_shuttle"
+ },
+/obj/structure/window/reinforced/fulltile/shuttle,
+/turf/open/floor/plating,
+/area/ship/medical/surgery)
"ud" = (
/obj/effect/turf_decal/industrial/warning/fulltile,
/obj/machinery/door/firedoor/border_only,
/obj/machinery/door/firedoor/border_only{
dir = 1
},
-/obj/structure/cable{
- icon_state = "1-2"
- },
/obj/machinery/door/airlock/command{
name = "Bridge";
req_access_txt = "56"
},
/turf/open/floor/plasteel/tech,
-/area/ship/maintenance/central)
+/area/ship/engineering/communications)
"ue" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
dir = 8
},
@@ -1692,7 +1602,7 @@
dir = 1
},
/turf/open/floor/plasteel/patterned/grid,
-/area/ship/hallway/fore)
+/area/ship/hallway/central)
"ui" = (
/obj/machinery/power/terminal{
dir = 8
@@ -1727,27 +1637,24 @@
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/turf/open/floor/plasteel/patterned/grid,
-/area/ship/hallway/fore)
+/area/ship/hallway/central)
"uP" = (
/obj/structure/cable{
icon_state = "1-8"
},
-/obj/machinery/light/small/directional/south,
/obj/effect/spawner/lootdrop/maintenance,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plating,
/area/ship/maintenance/starboard)
"vi" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable{
+ icon_state = "2-10"
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 8
+/obj/machinery/atmospherics/components/trinary/mixer/airmix/flipped/inverse{
+ dir = 8;
+ target_pressure = 101
},
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/manifold4w/cyan,
-/obj/structure/catwalk/over/plated_catwalk,
-/obj/machinery/light/floor,
/turf/open/floor/plating,
/area/ship/engineering/engine)
"vl" = (
@@ -1760,18 +1667,29 @@
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/turf/open/floor/plasteel/tech,
-/area/ship/maintenance/central)
+/area/ship/engineering/communications)
"vo" = (
-/obj/structure/sign/warning,
-/turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ship/hallway/central)
+/obj/effect/turf_decal/techfloor{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/transparent/white/filled/warning{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+ dir = 6
+ },
+/obj/structure/tank_dispenser/oxygen,
+/turf/open/floor/plasteel/dark,
+/area/ship/storage{
+ name = "Storage And Science Bay"
+ })
"vv" = (
/obj/effect/turf_decal/industrial/fire{
dir = 8
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/components/unary/passive_vent/layer4{
+/obj/machinery/atmospherics/components/unary/outlet_injector/on/layer4{
dir = 4
},
/turf/open/floor/engine/hull/reinforced,
@@ -1797,11 +1715,11 @@
},
/obj/machinery/airalarm/directional/east,
/turf/open/floor/plasteel,
-/area/ship/hallway/aft)
+/area/ship/hallway/central)
"vJ" = (
/obj/machinery/firealarm/directional/south,
/turf/open/floor/plasteel/tech,
-/area/ship/maintenance/central)
+/area/ship/engineering/communications)
"vL" = (
/obj/effect/decal/cleanable/glass,
/turf/open/floor/plasteel/patterned,
@@ -1812,39 +1730,40 @@
},
/turf/open/floor/engine/hull,
/area/ship/external)
-"vX" = (
-/obj/effect/turf_decal/industrial/hatch/yellow,
-/turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ship/crew/dorm/dormfive)
"wh" = (
-/obj/structure/sign/poster/official/nanotrasen_logo,
+/obj/structure/sign/nanotrasen,
/turf/closed/wall/mineral/titanium,
/area/ship/engineering/engine)
-"ws" = (
+"wj" = (
/obj/structure/cable{
- icon_state = "1-2"
+ d2 = 2;
+ icon_state = "0-2";
+ pixel_y = 1
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/structure/catwalk/over/plated_catwalk,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/door/poddoor/shutters{
+ id = "gecko_shuttle"
+ },
+/obj/structure/window/reinforced/fulltile/shuttle,
+/turf/open/floor/plating,
+/area/ship/medical/surgery)
+"ws" = (
+/obj/machinery/computer/atmos_control/tank/oxygen_tank{
+ dir = 1;
+ sensors = list("gecko_o2_sensor"="Oxygen Tank")
+ },
+/obj/machinery/light/directional/south,
/turf/open/floor/plating,
/area/ship/engineering/engine)
"wv" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/structure/catwalk/over/plated_catwalk,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 8
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 4
},
-/obj/structure/displaycase/trophy{
- contents = "/obj/item/reagent_containers/food/snacks/pizzaslice/arnold"
- },
-/turf/open/floor/plasteel,
-/area/ship/hallway/fore)
+/obj/structure/catwalk/over/plated_catwalk,
+/turf/open/floor/plating,
+/area/ship/hallway/central)
"wy" = (
/obj/structure/cable{
icon_state = "0-4"
@@ -1858,52 +1777,56 @@
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/ship/maintenance/starboard)
"wD" = (
-/obj/machinery/atmospherics/components/unary/tank/toxins{
+/obj/structure/window/reinforced{
dir = 4
},
-/obj/effect/turf_decal/industrial/hatch/yellow,
-/turf/open/floor/plating,
+/obj/machinery/air_sensor/atmos/toxin_tank{
+ id_tag = "gecko_tox_sensor";
+ pixel_x = 3;
+ pixel_y = 8
+ },
+/obj/effect/turf_decal/atmos/plasma,
+/obj/structure/window/reinforced{
+ dir = 8
+ },
+/obj/structure/window/reinforced,
+/turf/open/floor/engine/plasma,
/area/ship/engineering/engine)
"wR" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 10
+ dir = 5
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 9
+ dir = 6
},
/turf/open/floor/plasteel/patterned/cargo_one,
/area/ship/medical/surgery)
"wV" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/structure/catwalk/over/plated_catwalk,
-/turf/open/floor/plating,
-/area/ship/engineering/engine)
-"wW" = (
-/obj/structure/catwalk/over/plated_catwalk,
-/obj/machinery/atmospherics/components/binary/pump/layer2,
+/obj/structure/rack,
+/obj/effect/spawner/lootdrop/salvage,
+/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plating,
/area/ship/engineering/engine)
"wY" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+/obj/structure/railing,
+/turf/open/floor/plasteel/stairs/right{
dir = 8
},
-/obj/structure/catwalk/over/plated_catwalk,
-/obj/machinery/light/floor,
-/turf/open/floor/plating,
/area/ship/engineering/engine)
"xd" = (
-/obj/effect/spawner/lootdrop/maintenance,
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/cobweb/cobweb2,
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/obj/structure/cable{
+ icon_state = "2-10"
+ },
/turf/open/floor/plating,
-/area/ship/maintenance/port)
+/area/ship/engineering/communications)
"xh" = (
/obj/structure/cable{
icon_state = "0-4"
@@ -1921,12 +1844,13 @@
/obj/effect/turf_decal/industrial/fire{
dir = 8
},
-/obj/structure/catwalk/over/plated_catwalk,
/obj/machinery/light/floor,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 6
+ },
/turf/open/floor/plating,
/area/ship/engineering/engine)
"xm" = (
-/obj/structure/grille,
/obj/structure/cable{
icon_state = "0-8"
},
@@ -1934,57 +1858,53 @@
/turf/open/floor/plating,
/area/ship/engineering/engine)
"xJ" = (
-/obj/structure/grille,
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/ship/medical/surgery)
"yc" = (
-/obj/machinery/atmospherics/pipe/simple/dark{
- dir = 10
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
+ dir = 8
},
-/obj/structure/catwalk/over/plated_catwalk,
/turf/open/floor/plating,
/area/ship/engineering/engine)
"yd" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
+/obj/effect/gibspawner/human,
/obj/structure/cable{
- icon_state = "2-8"
- },
-/obj/effect/turf_decal/siding/white,
-/obj/effect/turf_decal/siding/white{
- dir = 1
+ icon_state = "2-5"
},
-/obj/structure/catwalk/over/plated_catwalk,
-/turf/open/floor/plating,
-/area/ship/hallway/fore)
+/turf/open/floor/plasteel/patterned/cargo_one,
+/area/ship/medical/surgery)
"ye" = (
/obj/effect/turf_decal/siding/wideplating{
dir = 4
},
-/obj/structure/cable{
- icon_state = "2-4"
- },
/turf/open/floor/plasteel/tech/grid,
/area/ship/crew)
"yj" = (
/turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ship/maintenance/central)
+/area/ship/engineering/communications)
"yp" = (
/obj/machinery/atmospherics/pipe/simple/dark{
dir = 10
},
-/obj/structure/catwalk/over/plated_catwalk,
-/obj/structure/catwalk/over/plated_catwalk,
/turf/open/floor/plating,
/area/ship/engineering/engine)
+"ys" = (
+/obj/structure/window/reinforced{
+ icon_state = "rwindow";
+ dir = 4
+ },
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/nitrogen_input{
+ dir = 1;
+ piping_layer = 4;
+ pixel_x = 5;
+ pixel_y = 0
+ },
+/obj/structure/window/reinforced{
+ dir = 1
+ },
+/turf/open/floor/engine/n2,
+/area/ship/engineering/engine)
"yw" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
dir = 4
@@ -1996,9 +1916,6 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 4
},
-/obj/structure/cable{
- icon_state = "4-8"
- },
/turf/open/floor/plasteel/patterned/grid,
/area/ship/crew)
"yG" = (
@@ -2028,57 +1945,32 @@
/obj/effect/decal/cleanable/greenglow,
/turf/open/floor/plasteel/patterned,
/area/ship/cargo/starboard)
-"yX" = (
-/obj/machinery/button/shieldwallgen{
- id = "gecko_starboard_field";
- pixel_x = -6;
- pixel_y = -8
- },
-/obj/machinery/button/door{
- id = "gecko_starboard";
- name = "External Shutter Control";
- pixel_x = 4;
- pixel_y = -6;
- sync_doors = 0
- },
-/turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ship/cargo/starboard)
"zc" = (
/obj/structure/cable/yellow{
icon_state = "1-4"
},
/obj/effect/turf_decal/siding/yellow,
-/obj/structure/railing{
- dir = 10
- },
-/obj/machinery/computer/atmos_control/incinerator{
- dir = 4;
- sensors = list("gecko_burn_sensor"="Combustion Chamber")
- },
-/obj/effect/turf_decal/siding/yellow{
- dir = 10
+/obj/structure/railing,
+/turf/open/floor/plasteel/stairs{
+ dir = 8
},
-/turf/open/floor/plasteel/tech/techmaint,
/area/ship/engineering/engine)
"ze" = (
/obj/machinery/light/directional/east,
/obj/effect/turf_decal/industrial/warning{
dir = 1
},
-/obj/machinery/computer/operating,
-/obj/structure/cable{
- icon_state = "2-8"
- },
/obj/structure/cable{
- icon_state = "1-8"
+ icon_state = "9-10"
},
+/obj/machinery/computer/operating,
/turf/open/floor/plasteel/patterned,
/area/ship/medical/surgery)
"zl" = (
-/obj/machinery/atmospherics/pipe/manifold/purple{
- dir = 1
+/obj/machinery/atmospherics/pipe/simple/purple/hidden{
+ dir = 9
},
-/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/light/floor,
/turf/open/floor/plating,
/area/ship/engineering/engine)
"zn" = (
@@ -2087,7 +1979,7 @@
},
/obj/machinery/light/directional/north,
/turf/open/floor/plasteel/tech,
-/area/ship/maintenance/central)
+/area/ship/engineering/communications)
"zv" = (
/obj/effect/turf_decal/box/corners{
dir = 8
@@ -2098,16 +1990,16 @@
"zE" = (
/obj/item/pet_carrier,
/turf/open/floor/plasteel/tech,
-/area/ship/crew/dorm/dormfive)
+/area/ship/crew/dorm/captain)
"zM" = (
/obj/effect/turf_decal/trimline/transparent/white/filled/warning{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 9
- },
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 10
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 5
},
/turf/open/floor/plasteel,
/area/ship/cargo/starboard)
@@ -2130,23 +2022,11 @@
/obj/item/lightreplacer,
/turf/open/floor/plastic,
/area/ship/crew/toilet)
-"zZ" = (
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
- dir = 6
- },
-/obj/structure/catwalk/over/plated_catwalk,
-/turf/open/floor/plating,
-/area/ship/engineering/engine)
"As" = (
-/obj/machinery/door/poddoor{
- dir = 4;
- id = "gecko_thrusters"
- },
/obj/machinery/atmospherics/pipe/simple/dark{
dir = 4
},
-/obj/effect/spawner/structure/window/plasma/reinforced,
-/turf/open/floor/plating,
+/turf/closed/wall/mineral/titanium/nodiagonal,
/area/ship/engineering/engine)
"Au" = (
/obj/machinery/door/airlock/command{
@@ -2154,12 +2034,11 @@
req_access_txt = "56"
},
/turf/open/floor/plasteel/tech,
-/area/ship/maintenance/central)
+/area/ship/engineering/communications)
"AA" = (
/obj/effect/turf_decal/industrial/hatch/yellow,
/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/catwalk/over/plated_catwalk,
-/obj/machinery/portable_atmospherics/canister,
+/obj/machinery/portable_atmospherics/canister/air,
/turf/open/floor/plating,
/area/ship/engineering/engine)
"AB" = (
@@ -2185,12 +2064,17 @@
/obj/structure/cable{
icon_state = "2-4"
},
+/obj/structure/cable{
+ icon_state = "1-5"
+ },
/turf/open/floor/plasteel/patterned,
/area/ship/medical/surgery)
"AI" = (
-/obj/structure/catwalk/over/plated_catwalk,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 5
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/layer_manifold{
+ dir = 4
},
/turf/open/floor/plating,
/area/ship/engineering/engine)
@@ -2200,13 +2084,19 @@
},
/obj/effect/decal/cleanable/glass,
/obj/effect/decal/cleanable/greenglow,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 9
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 9
+ },
/turf/open/floor/plasteel/patterned/cargo_one,
/area/ship/cargo/starboard)
"AN" = (
-/obj/item/radio/intercom/directional/south,
/obj/effect/turf_decal/industrial/outline/yellow,
/obj/effect/spawner/lootdrop/salvage_50,
/obj/structure/table/reinforced,
+/obj/machinery/computer/helm/viewscreen/directional/south,
/turf/open/floor/plasteel,
/area/ship/cargo/starboard)
"AW" = (
@@ -2218,31 +2108,51 @@
/turf/open/floor/plasteel/dark,
/area/ship/bridge)
"Ba" = (
-/obj/structure/cable{
- icon_state = "1-2"
+/obj/structure/railing{
+ dir = 10
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 5
+/obj/effect/turf_decal/trimline/opaque/yellow/line{
+ dir = 10
},
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
- dir = 8
+/obj/machinery/computer/monitor{
+ dir = 1
},
-/obj/structure/catwalk/over/plated_catwalk,
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
-/turf/open/floor/plating,
+/obj/structure/cable{
+ icon_state = "0-1"
+ },
+/turf/open/floor/plasteel/dark,
/area/ship/engineering/engine)
"Bi" = (
+/obj/item/clothing/suit/space/eva,
+/obj/item/clothing/head/helmet/space/eva,
+/obj/item/clothing/suit/space/eva,
+/obj/item/clothing/mask/breath,
+/obj/item/clothing/mask/breath,
+/obj/item/clothing/head/helmet/space/eva,
+/obj/item/clothing/suit/space/eva,
+/obj/item/clothing/mask/breath,
+/obj/item/clothing/head/helmet/space/eva,
+/obj/item/tank/internals/oxygen/red,
+/obj/item/tank/internals/oxygen/red,
+/obj/item/tank/internals/oxygen/red,
+/obj/structure/closet/crate{
+ name = "emergency space suit crate"
+ },
+/obj/machinery/firealarm/directional/north,
/turf/open/floor/plasteel/patterned,
-/area/ship/storage)
+/area/ship/storage{
+ name = "Storage And Science Bay"
+ })
"BB" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+/obj/machinery/atmospherics/pipe/simple{
dir = 8
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
+/obj/effect/spawner/structure/window/plasma/reinforced,
+/obj/structure/cable{
+ icon_state = "0-8"
},
-/turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ship/medical/surgery)
+/turf/open/floor/engine,
+/area/ship/engineering/engine)
"BF" = (
/obj/machinery/cryopod{
dir = 4
@@ -2254,7 +2164,6 @@
/turf/open/floor/plasteel/tech/grid,
/area/ship/crew)
"BM" = (
-/obj/machinery/airalarm/directional/north,
/obj/effect/turf_decal/trimline/transparent/white/filled/warning{
dir = 4
},
@@ -2272,6 +2181,7 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
/obj/item/storage/bag/ore,
/obj/item/clothing/under/rank/cargo/miner,
+/obj/machinery/airalarm/directional/north,
/turf/open/floor/plasteel,
/area/ship/cargo/starboard)
"BP" = (
@@ -2280,30 +2190,27 @@
/turf/open/floor/plasteel/patterned,
/area/ship/cargo/starboard)
"BU" = (
-/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer4,
-/obj/effect/turf_decal/techfloor{
- dir = 4
- },
-/obj/effect/turf_decal/trimline/transparent/white/filled/warning{
- dir = 8
- },
-/obj/machinery/advanced_airlock_controller{
- pixel_x = 32;
- interior_pressure = 101
- },
-/turf/open/floor/plasteel/dark,
-/area/ship/hallway/central)
+/obj/machinery/suit_storage_unit/inherit,
+/obj/item/clothing/suit/space/hardsuit/engine,
+/obj/item/tank/jetpack/carbondioxide,
+/turf/open/floor/plasteel/patterned,
+/area/ship/storage{
+ name = "Storage And Science Bay"
+ })
"BV" = (
/obj/effect/turf_decal/industrial/warning{
dir = 1
},
-/obj/machinery/iv_drip,
/obj/structure/cable{
- icon_state = "4-8"
+ icon_state = "4-10"
},
/obj/structure/cable{
- icon_state = "1-4"
+ icon_state = "8-10"
+ },
+/obj/structure/cable{
+ icon_state = "8-9"
},
+/obj/machinery/iv_drip,
/turf/open/floor/plasteel/patterned,
/area/ship/medical/surgery)
"Cc" = (
@@ -2321,12 +2228,6 @@
/turf/open/floor/engine/hull/reinforced,
/area/ship/external)
"Ch" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/structure/cable{
- icon_state = "1-2"
- },
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 9
},
@@ -2334,12 +2235,14 @@
dir = 1
},
/turf/open/floor/plasteel/tech,
-/area/ship/crew/dorm/dormfive)
+/area/ship/crew/dorm/captain)
"Cj" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 8
+ },
/turf/open/floor/plating,
/area/ship/engineering/engine)
"Cn" = (
@@ -2353,12 +2256,9 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 8
},
-/obj/structure/cable{
- icon_state = "4-8"
- },
/obj/machinery/door/firedoor,
/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/hallway/fore)
+/area/ship/hallway/central)
"Ct" = (
/obj/effect/turf_decal/siding/white{
dir = 4
@@ -2373,7 +2273,7 @@
icon_state = "1-2"
},
/turf/open/floor/plasteel/patterned/grid,
-/area/ship/hallway/aft)
+/area/ship/hallway/central)
"Cv" = (
/obj/effect/turf_decal/siding/white,
/obj/effect/turf_decal/siding/white{
@@ -2382,9 +2282,6 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 4
},
-/obj/structure/cable{
- icon_state = "4-8"
- },
/turf/open/floor/plasteel/patterned/grid,
/area/ship/crew)
"CE" = (
@@ -2397,10 +2294,10 @@
/turf/open/floor/plasteel/telecomms_floor,
/area/ship/bridge)
"CF" = (
-/obj/structure/disposalpipe/segment{
- dir = 8
- },
/obj/effect/spawner/structure/window/plasma/reinforced,
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
/turf/open/floor/engine,
/area/ship/engineering/engine)
"CI" = (
@@ -2411,9 +2308,6 @@
/turf/open/floor/plasteel/telecomms_floor,
/area/ship/bridge)
"CQ" = (
-/obj/structure/cable{
- icon_state = "1-4"
- },
/obj/structure/cable{
icon_state = "1-8"
},
@@ -2431,16 +2325,14 @@
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
- },
-/obj/structure/catwalk/over/plated_catwalk,
/obj/structure/cable{
icon_state = "2-8"
},
+/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4,
+/obj/structure/catwalk/over/plated_catwalk,
/turf/open/floor/plating,
-/area/ship/hallway/aft)
+/area/ship/hallway/central)
"CU" = (
/turf/closed/wall/mineral/titanium,
/area/ship/maintenance/port)
@@ -2456,18 +2348,28 @@
/turf/open/floor/plasteel,
/area/ship/hallway/central)
"Dp" = (
-/obj/structure/grille,
-/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 8
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/white,
+/obj/effect/turf_decal/siding/white{
+ dir = 1
+ },
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/structure/catwalk/over/plated_catwalk,
/turf/open/floor/plating,
-/area/ship/cargo/starboard)
+/area/ship/hallway/central)
"Du" = (
/obj/item/radio/intercom/wideband/directional/west,
/turf/open/floor/plasteel/tech,
-/area/ship/maintenance/central)
+/area/ship/engineering/communications)
"DQ" = (
-/obj/machinery/door/poddoor/shutters{
- id = "gecko_starboard"
- },
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable,
@@ -2476,13 +2378,12 @@
id = "gecko_starboard_field"
},
/obj/effect/turf_decal/industrial/warning/fulltile,
+/obj/machinery/door/poddoor{
+ id = "gecko_starboard"
+ },
/turf/open/floor/plasteel/tech/grid,
/area/ship/cargo/starboard)
"DT" = (
-/obj/machinery/power/apc/auto_name/directional/east,
-/obj/structure/cable{
- icon_state = "0-8"
- },
/obj/structure/cable{
icon_state = "2-8"
},
@@ -2500,19 +2401,16 @@
/turf/open/floor/plasteel/tech/techmaint,
/area/ship/engineering/engine)
"Ed" = (
-/obj/machinery/door/airlock/external/glass{
- name = "External Hull Access"
- },
/obj/effect/turf_decal/industrial/warning/fulltile,
-/obj/machinery/door/firedoor/border_only,
-/obj/machinery/door/firedoor/border_only{
- dir = 1
- },
-/obj/structure/cable{
- icon_state = "1-2"
+/obj/machinery/door/airlock/maintenance{
+ name = "Storage Bay";
+ req_access_txt = "10"
},
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/hallway/central)
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/turf/open/floor/plasteel/patterned,
+/area/ship/storage{
+ name = "Storage And Science Bay"
+ })
"Ek" = (
/obj/effect/turf_decal/industrial/warning{
dir = 1
@@ -2520,20 +2418,23 @@
/turf/open/floor/plasteel/patterned,
/area/ship/cargo/starboard)
"En" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/open/floor/plating,
-/area/ship/maintenance/starboard)
+/obj/structure/sign/warning,
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/ship/storage{
+ name = "Storage And Science Bay"
+ })
"Ew" = (
/obj/effect/turf_decal/borderfloor,
/obj/machinery/status_display/shuttle{
pixel_y = -32
},
-/obj/structure/chair/comfy/shuttle{
- dir = 1
- },
/obj/machinery/light/directional/south,
+/obj/structure/table/reinforced,
+/obj/item/spacecash/bundle/c100,
+/obj/item/spacecash/bundle/c1000,
+/obj/item/spacecash/bundle/c1000,
+/obj/item/spacecash/bundle/c1000,
+/obj/item/spacecash/bundle/c1000,
/turf/open/floor/plasteel/dark,
/area/ship/bridge)
"EA" = (
@@ -2566,7 +2467,7 @@
},
/obj/structure/catwalk/over/plated_catwalk,
/turf/open/floor/plating,
-/area/ship/hallway/aft)
+/area/ship/hallway/central)
"EK" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/patterned,
@@ -2587,6 +2488,7 @@
/obj/effect/turf_decal/siding/blue{
dir = 1
},
+/obj/machinery/holopad/emergency/command,
/turf/open/floor/plasteel/tech,
/area/ship/bridge)
"Fu" = (
@@ -2598,15 +2500,15 @@
/turf/open/floor/engine/hull/reinforced,
/area/ship/external)
"FC" = (
-/obj/machinery/light_switch{
- pixel_x = 5;
- pixel_y = -12
+/obj/machinery/power/ship_gravity,
+/obj/structure/cable{
+ icon_state = "0-4"
},
-/turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ship/bridge)
+/turf/open/floor/plating,
+/area/ship/engineering/engine)
"FO" = (
/obj/structure/cable{
- icon_state = "1-2"
+ icon_state = "2-10"
},
/turf/open/floor/plasteel/patterned/cargo_one,
/area/ship/medical/surgery)
@@ -2615,7 +2517,6 @@
dir = 8
},
/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/catwalk/over/plated_catwalk,
/turf/open/floor/plating,
/area/ship/engineering/engine)
"Gd" = (
@@ -2624,12 +2525,8 @@
name = "Bob"
},
/turf/open/floor/plasteel/tech,
-/area/ship/crew/dorm/dormfive)
+/area/ship/crew/dorm/captain)
"Gm" = (
-/obj/item/clothing/suit/armor/curator,
-/obj/item/clothing/suit/armor/curator,
-/obj/item/clothing/suit/armor/curator,
-/obj/item/clothing/suit/armor/curator,
/obj/item/clothing/gloves/fingerless,
/obj/item/clothing/gloves/fingerless,
/obj/item/clothing/gloves/fingerless,
@@ -2647,19 +2544,23 @@
/obj/item/clothing/suit/jacket/letterman_nanotrasen,
/obj/item/clothing/suit/jacket/letterman_nanotrasen,
/obj/structure/closet,
+/obj/item/clothing/under/nanotrasen/affairs,
+/obj/item/clothing/under/nanotrasen/affairs,
+/obj/item/clothing/under/nanotrasen/affairs,
+/obj/item/clothing/under/nanotrasen/affairs,
/turf/open/floor/plasteel/grimy,
/area/ship/crew)
"Gt" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/cable{
- icon_state = "2-4"
+/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/nitrogen_output{
+ dir = 1;
+ piping_layer = 4;
+ pixel_x = 5;
+ pixel_y = 0
},
-/obj/machinery/atmospherics/components/unary/tank/oxygen{
- dir = 8
+/obj/structure/window/reinforced{
+ dir = 1
},
-/obj/structure/catwalk/over/plated_catwalk,
-/obj/effect/turf_decal/industrial/hatch/yellow,
-/turf/open/floor/plating,
+/turf/open/floor/engine/n2,
/area/ship/engineering/engine)
"Gu" = (
/obj/machinery/computer/rdconsole{
@@ -2669,43 +2570,38 @@
/turf/open/floor/plasteel/telecomms_floor,
/area/ship/bridge)
"GB" = (
-/obj/structure/cable/yellow{
- icon_state = "4-8"
- },
-/obj/structure/catwalk/over/plated_catwalk,
-/obj/machinery/power/ship_gravity,
-/obj/structure/cable/yellow{
- icon_state = "0-4"
- },
-/turf/open/floor/plating,
-/area/ship/engineering/engine)
+/obj/structure/sign/nanotrasen,
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/ship/maintenance/starboard)
"GE" = (
/obj/effect/turf_decal/industrial/warning,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/turf/open/floor/plasteel/patterned,
/area/ship/medical/surgery)
"GM" = (
-/obj/effect/turf_decal/industrial/hatch/yellow,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/decal/cleanable/cobweb,
/obj/machinery/light/small/directional/north,
-/obj/machinery/atmospherics/components/unary/tank/toxins{
+/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/toxin_output{
dir = 4
},
-/turf/open/floor/plating,
+/obj/structure/window/reinforced{
+ dir = 4
+ },
+/obj/structure/window/reinforced{
+ dir = 8
+ },
+/obj/structure/window/reinforced{
+ dir = 1
+ },
+/turf/open/floor/engine/plasma,
/area/ship/engineering/engine)
"GN" = (
-/obj/structure/cable{
- icon_state = "1-8"
- },
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 1
},
/turf/open/floor/plasteel/tech,
-/area/ship/crew/dorm/dormfive)
+/area/ship/crew/dorm/captain)
"GQ" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
dir = 8
},
@@ -2721,11 +2617,6 @@
/obj/effect/turf_decal/techfloor{
dir = 5
},
-/obj/structure/closet/wall/directional/north,
-/obj/item/radio,
-/obj/item/radio,
-/obj/item/radio,
-/obj/item/radio,
/turf/open/floor/plasteel/tech/grid,
/area/ship/crew)
"GT" = (
@@ -2740,7 +2631,7 @@
pixel_x = -5
},
/turf/open/floor/plasteel/tech,
-/area/ship/crew/dorm/dormfive)
+/area/ship/crew/dorm/captain)
"GX" = (
/obj/machinery/door/airlock/command{
dir = 4;
@@ -2748,9 +2639,6 @@
req_access_txt = "56"
},
/obj/effect/turf_decal/industrial/warning/fulltile,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 4
- },
/obj/machinery/door/firedoor/border_only{
dir = 8
},
@@ -2777,10 +2665,11 @@
/turf/open/floor/plasteel/tech/techmaint,
/area/ship/cargo/starboard)
"Ha" = (
-/obj/machinery/light/small/directional/east,
-/obj/machinery/rnd/production/circuit_imprinter,
+/obj/machinery/rnd/production/circuit_imprinter/department/engi,
/turf/open/floor/plasteel/patterned,
-/area/ship/storage)
+/area/ship/storage{
+ name = "Storage And Science Bay"
+ })
"Hc" = (
/obj/machinery/door/airlock{
name = "Crew Quarters"
@@ -2794,40 +2683,30 @@
/obj/machinery/door/firedoor/border_only{
dir = 1
},
-/obj/structure/cable{
- icon_state = "1-2"
- },
/obj/effect/decal/cleanable/oil/slippery,
/turf/open/floor/plasteel/tech/techmaint,
/area/ship/crew)
"Hg" = (
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
- dir = 5
+/obj/machinery/atmospherics/components/binary/pump{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/green/hidden/layer4{
+ dir = 4
},
-/obj/structure/catwalk/over/plated_catwalk,
/turf/open/floor/plating,
/area/ship/engineering/engine)
-"Hx" = (
-/obj/effect/turf_decal/box/corners{
- dir = 8
- },
-/turf/open/floor/plasteel/patterned/cargo_one,
-/area/ship/cargo/starboard)
"HK" = (
/obj/machinery/light/directional/north,
/obj/effect/turf_decal/borderfloor{
dir = 1
},
/turf/open/floor/plasteel,
-/area/ship/hallway/aft)
+/area/ship/hallway/central)
"HT" = (
/obj/machinery/light/small/directional/north,
/obj/structure/cable{
icon_state = "2-8"
},
-/obj/structure/cable{
- icon_state = "4-8"
- },
/obj/effect/turf_decal/trimline/transparent/white/filled/warning,
/turf/open/floor/plating,
/area/ship/maintenance/starboard)
@@ -2848,33 +2727,33 @@
/obj/structure/cable{
icon_state = "1-4"
},
-/obj/structure/catwalk/over/plated_catwalk,
+/obj/structure/cable{
+ icon_state = "1-5"
+ },
+/obj/machinery/computer/atmos_control/tank/toxin_tank{
+ sensors = list("gecko_tox_sensor"="Plasma Tank");
+ dir = 1
+ },
/turf/open/floor/plating,
/area/ship/engineering/engine)
"Ij" = (
-/obj/structure/catwalk/over/plated_catwalk,
-/turf/open/floor/plating,
-/area/ship/engineering/engine)
-"Im" = (
-/obj/machinery/button/door{
- dir = 8;
- id = "gecko_engine_vent";
- name = "Combustion Chamber Blast Door Control";
- pixel_x = 24;
- pixel_y = 6;
- sync_doors = 0
+/obj/machinery/power/terminal{
+ dir = 8
+ },
+/obj/effect/turf_decal/industrial/fire{
+ dir = 8
+ },
+/obj/structure/cable{
+ icon_state = "0-4"
},
-/obj/structure/railing,
-/obj/structure/catwalk/over/plated_catwalk,
/turf/open/floor/plating,
-/area/ship/engineering/engine)
+/area/ship/maintenance/port)
"In" = (
/obj/structure/cable{
icon_state = "1-4"
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/spawner/lootdrop/grille_or_trash,
/turf/open/floor/plating,
/area/ship/maintenance/starboard)
"Is" = (
@@ -2882,29 +2761,66 @@
dir = 1
},
/turf/open/floor/plasteel,
-/area/ship/hallway/aft)
+/area/ship/hallway/central)
"Iu" = (
-/obj/effect/turf_decal/industrial/hatch/yellow,
-/obj/structure/catwalk/over/plated_catwalk,
-/turf/open/floor/plating,
+/obj/structure/window/reinforced{
+ icon_state = "rwindow";
+ dir = 4
+ },
+/obj/structure/window/reinforced,
+/obj/structure/window/reinforced{
+ dir = 8
+ },
+/obj/effect/turf_decal/atmos/nitrogen,
+/obj/machinery/air_sensor/atmos/nitrogen_tank{
+ id_tag = "gecko_n2_sensor";
+ pixel_x = 5;
+ pixel_y = 9
+ },
+/turf/open/floor/engine/n2,
/area/ship/engineering/engine)
"Iv" = (
-/obj/effect/spawner/structure/window/plasma/reinforced,
-/obj/machinery/door/poddoor{
- dir = 4;
- id = "gecko_thrusters"
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/button/door{
+ id = "gecko_starboard";
+ name = "External Shutter Control";
+ pixel_x = 4;
+ pixel_y = 24;
+ sync_doors = 0
},
-/turf/open/floor/plating,
-/area/ship/engineering/engine)
+/obj/machinery/button/shieldwallgen{
+ id = "gecko_starboard_field";
+ pixel_x = -5;
+ pixel_y = 22
+ },
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo/starboard)
"Iy" = (
/turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ship/hallway/aft)
+/area/ship/hallway/central)
"Iz" = (
/obj/machinery/atmospherics/components/unary/portables_connector{
dir = 8
},
+/obj/machinery/atmospherics/pipe/simple/green/hidden/layer4{
+ dir = 6
+ },
/turf/open/floor/plating,
/area/ship/engineering/engine)
+"II" = (
+/obj/structure/window/reinforced{
+ dir = 1
+ },
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/oxygen_input{
+ dir = 1
+ },
+/obj/structure/window/reinforced{
+ icon_state = "rwindow";
+ dir = 4
+ },
+/obj/structure/window/reinforced,
+/turf/open/floor/engine/o2,
+/area/ship/engineering/engine)
"IK" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 8
@@ -2912,37 +2828,42 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 8
},
-/obj/structure/cable{
- icon_state = "4-8"
- },
/obj/effect/turf_decal/siding/white,
/obj/effect/turf_decal/siding/white{
dir = 1
},
/obj/structure/catwalk/over/plated_catwalk,
/turf/open/floor/plating,
-/area/ship/hallway/aft)
+/area/ship/hallway/central)
"Jc" = (
-/obj/structure/cable{
- icon_state = "1-8"
- },
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/turf_decal/trimline/transparent/white/filled/warning{
dir = 1
},
-/obj/machinery/light/small/directional/south,
+/obj/machinery/light/small/directional/south{
+ pixel_y = -28
+ },
+/obj/structure/cable{
+ icon_state = "8-10"
+ },
+/obj/structure/cable{
+ icon_state = "4-10"
+ },
/turf/open/floor/plating,
/area/ship/maintenance/port)
"Jj" = (
+/obj/effect/turf_decal/industrial/warning,
/obj/effect/turf_decal/siding/white{
- dir = 4
+ dir = 8
},
/obj/effect/turf_decal/siding/white{
- dir = 8
+ dir = 4
},
-/obj/machinery/atmospherics/components/binary/pump/layer4,
+/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer4,
/turf/open/floor/plasteel/patterned/grid,
-/area/ship/hallway/central)
+/area/ship/storage{
+ name = "Storage And Science Bay"
+ })
"Jk" = (
/obj/effect/turf_decal/industrial/outline/yellow,
/obj/effect/decal/cleanable/dirt,
@@ -2974,23 +2895,14 @@
dir = 4
},
/turf/open/floor/plasteel/patterned/grid,
-/area/ship/hallway/fore)
+/area/ship/hallway/central)
"Jz" = (
/obj/effect/turf_decal/borderfloor,
/obj/structure/extinguisher_cabinet/directional/south,
/turf/open/floor/plasteel,
-/area/ship/hallway/fore)
+/area/ship/hallway/central)
"JV" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/structure/catwalk/over/plated_catwalk,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 6
- },
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
- dir = 1
- },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/turf/open/floor/plating,
/area/ship/engineering/engine)
"Ki" = (
@@ -3019,42 +2931,36 @@
/turf/open/floor/plasteel,
/area/ship/hallway/central)
"KH" = (
-/turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ship/hallway/fore)
-"KM" = (
-/obj/machinery/atmospherics/components/binary/pump{
- dir = 8
+/obj/structure/cable{
+ icon_state = "0-10"
},
-/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/door/poddoor/shutters{
+ id = "gecko_shuttle"
+ },
+/obj/structure/window/reinforced/fulltile/shuttle,
+/turf/open/floor/plating,
+/area/ship/medical/surgery)
+"KM" = (
/turf/open/floor/plating,
/area/ship/engineering/engine)
"KQ" = (
-/obj/effect/turf_decal/industrial/fire{
- dir = 8
- },
-/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/atmospherics/components/binary/pump{
dir = 4
},
-/obj/structure/catwalk/over/plated_catwalk,
/turf/open/floor/plating,
/area/ship/engineering/engine)
"KS" = (
-/obj/effect/turf_decal/siding/white{
- dir = 4
- },
-/obj/effect/turf_decal/siding/white{
- dir = 8
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 5
},
-/obj/effect/turf_decal/industrial/warning,
-/obj/structure/cable{
- icon_state = "1-2"
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 10
},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4,
-/turf/open/floor/plasteel/patterned/grid,
-/area/ship/hallway/central)
+/turf/open/floor/plasteel/patterned,
+/area/ship/storage{
+ name = "Storage And Science Bay"
+ })
"KU" = (
-/obj/structure/catwalk/over/plated_catwalk,
/obj/structure/closet{
anchored = 1;
icon_door = "eng_tool";
@@ -3068,16 +2974,13 @@
pixel_y = 5
},
/obj/effect/turf_decal/industrial/outline/yellow,
-/turf/open/floor/plating,
+/turf/open/floor/plasteel/dark,
/area/ship/engineering/engine)
"KX" = (
-/obj/structure/sign/poster/official/nanotrasen_logo,
+/obj/structure/sign/nanotrasen,
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/ship/crew/toilet)
"Lq" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 6
},
@@ -3095,27 +2998,31 @@
},
/area/ship/engineering/engine)
"Lw" = (
-/obj/machinery/light/directional/west,
/obj/effect/turf_decal/industrial/warning,
/obj/structure/cable{
icon_state = "2-4"
},
+/obj/machinery/light/directional/west,
/turf/open/floor/plasteel/patterned,
/area/ship/cargo/starboard)
-"LH" = (
+"LA" = (
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/structure/catwalk/over/plated_catwalk,
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
- dir = 4
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
+ dir = 8
},
/turf/open/floor/plating,
/area/ship/engineering/engine)
-"LK" = (
-/obj/machinery/cryopod{
- dir = 4
+"LH" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plating,
+/area/ship/engineering/engine)
+"LK" = (
+/obj/machinery/cryopod{
+ dir = 4
},
/obj/effect/turf_decal/techfloor{
dir = 10
@@ -3124,41 +3031,52 @@
/area/ship/crew)
"LL" = (
/obj/effect/decal/cleanable/dirt,
-/obj/structure/sign/poster/official/nanotrasen_logo,
+/obj/structure/sign/nanotrasen,
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/ship/maintenance/starboard)
"LY" = (
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/effect/spawner/lootdrop/grille_or_trash,
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/sign/warning/electricshock{
pixel_y = 32
},
+/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plating,
/area/ship/maintenance/starboard)
"LZ" = (
-/obj/effect/turf_decal/borderfloor,
-/turf/open/floor/plasteel,
-/area/ship/hallway/fore)
+/obj/structure/cable{
+ icon_state = "4-6"
+ },
+/obj/structure/cable{
+ icon_state = "0-6"
+ },
+/obj/machinery/door/poddoor/shutters{
+ id = "gecko_shuttle"
+ },
+/obj/structure/window/reinforced/fulltile/shuttle,
+/turf/open/floor/plating,
+/area/ship/medical/surgery)
"Mc" = (
/obj/machinery/firealarm/directional/north,
/turf/open/floor/plasteel/tech,
/area/ship/bridge)
"Mf" = (
-/obj/item/tank/jetpack/carbondioxide,
-/obj/machinery/suit_storage_unit/inherit,
-/obj/item/clothing/suit/space/hardsuit/engine,
-/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/techfloor{
dir = 8
},
/obj/effect/turf_decal/trimline/transparent/white/filled/warning{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
+/obj/item/tank/internals/plasmaman/full,
+/obj/item/tank/internals/plasmaman/full,
+/obj/structure/closet/emcloset,
/turf/open/floor/plasteel/dark,
-/area/ship/hallway/central)
+/area/ship/storage{
+ name = "Storage And Science Bay"
+ })
"Ml" = (
/obj/effect/turf_decal/industrial/fire{
dir = 8
@@ -3166,26 +3084,18 @@
/obj/machinery/atmospherics/components/binary/pump{
dir = 4
},
-/obj/structure/catwalk/over/plated_catwalk,
/turf/open/floor/plating,
/area/ship/engineering/engine)
"Mn" = (
/obj/machinery/light_switch{
dir = 4;
- pixel_x = -25;
+ pixel_x = -22;
pixel_y = -5
},
/obj/effect/turf_decal/borderfloor{
dir = 1
},
-/obj/structure/cable{
- icon_state = "0-2"
- },
-/obj/machinery/power/apc/auto_name/directional/south{
- dir = 8;
- pixel_y = 0;
- pixel_x = -30
- },
+/obj/structure/table/reinforced,
/turf/open/floor/plasteel/dark,
/area/ship/bridge)
"Mw" = (
@@ -3199,49 +3109,41 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 8
},
-/obj/structure/cable{
- icon_state = "4-8"
- },
/obj/machinery/door/firedoor,
/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/hallway/aft)
+/area/ship/hallway/central)
"Nq" = (
/obj/machinery/firealarm/directional/north,
/obj/effect/turf_decal/borderfloor{
dir = 1
},
/turf/open/floor/plasteel,
-/area/ship/hallway/fore)
+/area/ship/hallway/central)
"Nu" = (
/obj/machinery/firealarm/directional/east,
/obj/effect/turf_decal/borderfloor,
+/obj/machinery/light_switch{
+ dir = 8;
+ pixel_x = 20;
+ pixel_y = 11
+ },
/turf/open/floor/plasteel,
-/area/ship/hallway/aft)
+/area/ship/hallway/central)
"Nz" = (
/obj/effect/turf_decal/industrial/warning{
dir = 1
},
/obj/structure/table/optable,
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/structure/cable{
- icon_state = "1-4"
- },
/turf/open/floor/plasteel/patterned,
/area/ship/medical/surgery)
"NC" = (
-/obj/machinery/door/poddoor/shutters{
- id = "gecko_starboard"
- },
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/industrial/warning/fulltile,
+/obj/machinery/door/poddoor{
+ id = "gecko_starboard"
+ },
/turf/open/floor/plasteel/tech/grid,
/area/ship/cargo/starboard)
-"NJ" = (
-/obj/structure/sign/poster/official/nanotrasen_logo,
-/turf/closed/wall/mineral/titanium,
-/area/ship/maintenance/starboard)
"NP" = (
/obj/item/radio/intercom/directional/north,
/obj/structure/table/reinforced,
@@ -3250,9 +3152,8 @@
"Oe" = (
/obj/machinery/light/directional/north,
/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/structure/catwalk/over/plated_catwalk,
/obj/machinery/vending/tool,
-/turf/open/floor/plating,
+/turf/open/floor/plasteel/dark,
/area/ship/engineering/engine)
"Ov" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
@@ -3263,7 +3164,7 @@
dir = 1
},
/turf/open/floor/plasteel/tech,
-/area/ship/maintenance/central)
+/area/ship/engineering/communications)
"Ow" = (
/obj/effect/turf_decal/industrial/warning,
/obj/effect/decal/cleanable/dirt,
@@ -3287,8 +3188,6 @@
/turf/open/floor/engine/hull/reinforced,
/area/ship/external)
"Pc" = (
-/obj/structure/grille,
-/obj/structure/grille,
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/ship/cargo/starboard)
@@ -3300,7 +3199,7 @@
pixel_y = 32
},
/turf/open/floor/plasteel/tech,
-/area/ship/maintenance/central)
+/area/ship/engineering/communications)
"Pg" = (
/obj/machinery/mineral/ore_redemption{
input_dir = 2;
@@ -3333,14 +3232,27 @@
},
/obj/machinery/door/poddoor{
dir = 4;
- id = "gecko_thrusters"
+ id = "gecko_starboard_thrusters"
},
/turf/open/floor/plating,
/area/ship/maintenance/starboard)
"Pn" = (
-/obj/structure/catwalk/over/plated_catwalk,
/obj/item/radio/intercom/directional/north,
-/turf/open/floor/plating,
+/obj/structure/table/reinforced{
+ color = "#c1b6a5"
+ },
+/obj/machinery/jukebox/boombox{
+ pixel_y = 5
+ },
+/obj/item/book/manual/wiki/engineering{
+ pixel_x = -3;
+ pixel_y = -8
+ },
+/obj/item/newspaper{
+ pixel_x = 6;
+ pixel_y = -3
+ },
+/turf/open/floor/plasteel/dark,
/area/ship/engineering/engine)
"Pr" = (
/obj/structure/sign/warning/fire,
@@ -3354,18 +3266,17 @@
/obj/structure/table/glass,
/obj/item/lighter/clockwork,
/turf/open/floor/plasteel/tech,
-/area/ship/maintenance/central)
+/area/ship/engineering/communications)
"PF" = (
-/obj/structure/sign/poster/official/nanotrasen_logo,
+/obj/structure/sign/nanotrasen,
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/ship/cargo/starboard)
"PG" = (
/obj/structure/table/glass,
/obj/item/storage/fancy/cigarettes/cigars/havana,
/turf/open/floor/plasteel/tech,
-/area/ship/crew/dorm/dormfive)
+/area/ship/crew/dorm/captain)
"PQ" = (
-/obj/structure/tank_dispenser/oxygen,
/obj/structure/sign/warning/vacuum/external{
pixel_x = 32
},
@@ -3375,9 +3286,11 @@
/obj/effect/turf_decal/trimline/transparent/white/filled/warning{
dir = 8
},
-/obj/machinery/light/directional/east,
+/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer4,
/turf/open/floor/plasteel/dark,
-/area/ship/hallway/central)
+/area/ship/storage{
+ name = "Storage And Science Bay"
+ })
"PV" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -3395,6 +3308,8 @@
/obj/machinery/door/airlock/medical/glass{
req_access_txt = "5"
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/turf/open/floor/plasteel/tech/techmaint,
/area/ship/medical/surgery)
"Qp" = (
@@ -3416,7 +3331,6 @@
/obj/effect/turf_decal/box/corners{
dir = 4
},
-/obj/effect/spawner/lootdrop/salvage_50,
/obj/structure/rack,
/turf/open/floor/plasteel/patterned/cargo_one,
/area/ship/cargo/starboard)
@@ -3432,17 +3346,14 @@
dir = 6
},
/turf/open/floor/plasteel/tech,
-/area/ship/maintenance/central)
+/area/ship/engineering/communications)
"QA" = (
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/effect/turf_decal/trimline/transparent/white/filled/warning{
dir = 4
},
-/obj/structure/catwalk/over/plated_catwalk,
/turf/open/floor/plating,
/area/ship/engineering/engine)
"QC" = (
@@ -3457,42 +3368,20 @@
/obj/structure/cable{
icon_state = "1-2"
},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/turf/open/floor/plasteel/patterned/grid,
-/area/ship/hallway/aft)
+/area/ship/hallway/central)
"QD" = (
/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/simple/dark{
- dir = 1
- },
-/obj/structure/catwalk/over/plated_catwalk,
-/obj/structure/catwalk/over/plated_catwalk,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
- },
+/obj/machinery/atmospherics/components/trinary/mixer/flipped,
/turf/open/floor/plating,
/area/ship/engineering/engine)
"QY" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 8
- },
-/obj/structure/grille,
-/obj/structure/cable{
- icon_state = "0-8"
- },
-/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/space_heater,
/turf/open/floor/plating,
-/area/ship/engineering/engine)
+/area/ship/maintenance/starboard)
"QZ" = (
-/obj/machinery/door/airlock/maintenance{
- name = "Storage Bay";
- req_access_txt = "10"
- },
-/obj/structure/cable{
- icon_state = "1-2"
- },
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/effect/turf_decal/industrial/warning/fulltile,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
@@ -3502,10 +3391,19 @@
/obj/machinery/door/firedoor/border_only{
dir = 1
},
+/obj/machinery/door/airlock/maintenance{
+ name = "Storage Bay";
+ req_access_txt = "10"
+ },
/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/storage)
+/area/ship/storage{
+ name = "Storage And Science Bay"
+ })
"Rc" = (
/obj/machinery/light/directional/north,
+/obj/machinery/firealarm/directional/north{
+ pixel_y = 29
+ },
/obj/item/banner/cargo,
/turf/open/floor/plasteel/patterned,
/area/ship/cargo/starboard)
@@ -3522,15 +3420,19 @@
/obj/effect/turf_decal/industrial/warning{
dir = 4
},
-/obj/structure/catwalk/over/plated_catwalk,
/turf/open/floor/plasteel/tech/techmaint,
/area/ship/engineering/engine)
"Rk" = (
-/obj/structure/catwalk/over/plated_catwalk,
/obj/machinery/status_display/shuttle{
pixel_y = 32
},
-/turf/open/floor/plating,
+/obj/effect/turf_decal/trimline/opaque/yellow/warning{
+ dir = 8
+ },
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/turf/open/floor/plasteel/dark,
/area/ship/engineering/engine)
"Ru" = (
/obj/machinery/light/small/directional/south,
@@ -3547,7 +3449,7 @@
/obj/item/paper_bin,
/obj/item/pen/fourcolor,
/turf/open/floor/plasteel/tech,
-/area/ship/maintenance/central)
+/area/ship/engineering/communications)
"RN" = (
/obj/effect/turf_decal/borderfloor{
dir = 1
@@ -3559,7 +3461,7 @@
/area/ship/bridge)
"RS" = (
/turf/open/floor/plasteel/tech,
-/area/ship/crew/dorm/dormfive)
+/area/ship/crew/dorm/captain)
"Sa" = (
/obj/machinery/light/directional/east,
/obj/effect/turf_decal/industrial/warning,
@@ -3575,7 +3477,7 @@
},
/obj/effect/turf_decal/borderfloor,
/turf/open/floor/plasteel,
-/area/ship/hallway/fore)
+/area/ship/hallway/central)
"Sj" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
dir = 8
@@ -3584,7 +3486,7 @@
dir = 1
},
/turf/open/floor/plasteel,
-/area/ship/hallway/aft)
+/area/ship/hallway/central)
"Sl" = (
/obj/structure/cable/yellow{
icon_state = "0-8"
@@ -3594,12 +3496,10 @@
},
/obj/effect/turf_decal/siding/yellow,
/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/airalarm/directional/south,
/turf/open/floor/plasteel/tech/techmaint,
/area/ship/engineering/engine)
"Sv" = (
-/obj/structure/disposalpipe/segment{
- dir = 9
- },
/obj/machinery/power/generator{
dir = 4
},
@@ -3619,20 +3519,28 @@
/turf/open/floor/plastic,
/area/ship/crew/toilet)
"Sx" = (
-/obj/machinery/space_heater,
/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plating,
-/area/ship/maintenance/port)
-"Sy" = (
+/obj/machinery/power/apc/auto_name/directional/south,
/obj/structure/cable{
- icon_state = "4-8"
+ icon_state = "8-9"
},
-/obj/effect/spawner/lootdrop/grille_or_trash,
+/obj/structure/cable,
+/obj/item/flashlight/glowstick/orange,
+/turf/open/floor/plating,
+/area/ship/bridge)
+"Sy" = (
/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/spawner/lootdrop/grille_or_trash,
/turf/open/floor/plating,
/area/ship/maintenance/starboard)
"SE" = (
/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/structure/cable{
+ icon_state = "2-10"
+ },
/turf/open/floor/plasteel/patterned/cargo_one,
/area/ship/medical/surgery)
"SK" = (
@@ -3648,15 +3556,13 @@
/turf/open/floor/plasteel/dark,
/area/ship/bridge)
"SQ" = (
-/obj/effect/turf_decal/industrial/fire{
- dir = 8
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/components/binary/pump{
- dir = 4
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
},
-/obj/structure/catwalk/over/plated_catwalk,
-/turf/open/floor/plating,
+/obj/effect/turf_decal/siding/yellow,
+/obj/structure/railing,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/turf/open/floor/plasteel/tech/techmaint,
/area/ship/engineering/engine)
"SV" = (
/obj/structure/chair/comfy/shuttle{
@@ -3667,7 +3573,7 @@
dir = 1
},
/turf/open/floor/plasteel,
-/area/ship/hallway/fore)
+/area/ship/hallway/central)
"Ta" = (
/obj/effect/turf_decal/siding/yellow{
dir = 4
@@ -3675,16 +3581,12 @@
/obj/effect/turf_decal/siding/yellow{
dir = 8
},
-/obj/structure/cable{
- icon_state = "2-8"
- },
/turf/open/floor/plasteel/tech,
-/area/ship/maintenance/central)
+/area/ship/engineering/communications)
"Tb" = (
/obj/effect/turf_decal/industrial/fire{
dir = 8
},
-/obj/structure/catwalk/over/plated_catwalk,
/turf/open/floor/plating,
/area/ship/engineering/engine)
"Tc" = (
@@ -3698,13 +3600,12 @@
/obj/machinery/power/terminal{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 8
- },
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 8
},
-/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 6
+ },
/turf/open/floor/plasteel/tech/techmaint,
/area/ship/engineering/engine)
"Tg" = (
@@ -3712,8 +3613,21 @@
/turf/open/floor/plasteel/patterned/cargo_one,
/area/ship/medical/surgery)
"Th" = (
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/structure/cable{
+ icon_state = "8-9"
+ },
+/obj/structure/cable{
+ icon_state = "4-9"
+ },
+/obj/structure/cable{
+ icon_state = "0-9"
+ },
+/obj/structure/cable{
+ icon_state = "6-8"
+ },
/turf/open/floor/plating,
-/area/ship/maintenance/port)
+/area/ship/crew)
"Tl" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 9
@@ -3726,45 +3640,47 @@
},
/obj/effect/turf_decal/industrial/warning,
/turf/open/floor/plasteel/patterned/grid,
-/area/ship/hallway/aft)
+/area/ship/hallway/central)
"Tq" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/engine/hull/reinforced,
/area/ship/external)
"Ts" = (
-/turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ship/hallway/central)
-"TA" = (
-/obj/effect/turf_decal/siding/white{
- dir = 4
- },
-/obj/effect/turf_decal/siding/white{
+/obj/machinery/light/directional/south,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 8
},
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+/turf/open/floor/plasteel/patterned,
+/area/ship/storage{
+ name = "Storage And Science Bay"
+ })
+"TA" = (
+/obj/effect/turf_decal/industrial/warning{
dir = 1
},
-/turf/open/floor/plasteel/patterned/grid,
-/area/ship/hallway/central)
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/plasteel/patterned,
+/area/ship/storage{
+ name = "Storage And Science Bay"
+ })
"TK" = (
-/obj/structure/sign/poster/official/nanotrasen_logo,
+/obj/structure/sign/nanotrasen,
/turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ship/storage)
+/area/ship/storage{
+ name = "Storage And Science Bay"
+ })
"Ug" = (
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/ship/engineering/engine)
"Uj" = (
-/obj/structure/sign/poster/official/nanotrasen_logo,
-/turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ship/maintenance/central)
+/obj/structure/sign/nanotrasen,
+/turf/closed/wall/mineral/titanium,
+/area/ship/engineering/communications)
"Ux" = (
-/obj/structure/sign/poster/official/nanotrasen_logo,
-/turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ship/crew/dorm/dormfive)
+/obj/structure/sign/nanotrasen,
+/turf/closed/wall/mineral/titanium,
+/area/ship/crew/dorm/captain)
"UB" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/effect/turf_decal/siding/white{
@@ -3776,9 +3692,6 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 1
},
-/obj/structure/cable{
- icon_state = "1-2"
- },
/turf/open/floor/plasteel/patterned/grid,
/area/ship/crew)
"UD" = (
@@ -3788,54 +3701,50 @@
/turf/open/floor/plasteel/patterned/cargo_one,
/area/ship/cargo/starboard)
"UI" = (
-/obj/machinery/door/poddoor/shutters{
- id = "gecko_starboard"
- },
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/industrial/warning/fulltile,
+/obj/machinery/door/poddoor{
+ id = "gecko_starboard"
+ },
/turf/open/floor/plasteel/tech/grid,
/area/ship/cargo/starboard)
"UP" = (
/obj/machinery/atmospherics/pipe/simple/dark{
dir = 1
},
-/obj/structure/catwalk/over/plated_catwalk,
/turf/open/floor/plating,
/area/ship/engineering/engine)
"UR" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 8
+/obj/structure/cable{
+ icon_state = "5-6"
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
+/obj/structure/cable{
+ icon_state = "6-8"
},
+/turf/open/floor/plasteel/patterned/cargo_one,
+/area/ship/medical/surgery)
+"UV" = (
+/obj/effect/decal/cleanable/cobweb,
+/obj/machinery/power/apc/auto_name/directional/north,
/obj/structure/cable{
- icon_state = "4-8"
+ icon_state = "4-6"
},
-/obj/effect/turf_decal/siding/white,
-/obj/effect/turf_decal/siding/white{
- dir = 1
+/obj/structure/cable{
+ icon_state = "0-6"
},
-/obj/structure/catwalk/over/plated_catwalk,
-/turf/open/floor/plating,
-/area/ship/hallway/central)
-"UV" = (
/obj/structure/cable{
- icon_state = "2-4"
+ icon_state = "5-6"
},
-/obj/effect/spawner/lootdrop/grille_or_trash,
-/obj/effect/decal/cleanable/cobweb,
/turf/open/floor/plating,
-/area/ship/maintenance/port)
+/area/ship/cargo/starboard)
"Vl" = (
-/obj/structure/sign/poster/official/nanotrasen_logo,
-/turf/closed/wall/mineral/titanium,
-/area/ship/maintenance/port)
-"Vm" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 6
+/obj/structure/cable{
+ icon_state = "4-8"
},
+/turf/open/floor/plating,
+/area/ship/engineering/engine)
+"Vm" = (
/obj/effect/turf_decal/siding/white{
dir = 4
},
@@ -3845,18 +3754,16 @@
/obj/effect/turf_decal/industrial/warning{
dir = 1
},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/turf/open/floor/plasteel/patterned/grid,
-/area/ship/hallway/aft)
+/area/ship/hallway/central)
"Vq" = (
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/ship/cargo/starboard)
"Vr" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 8
- },
/turf/open/floor/plasteel,
/area/ship/cargo/starboard)
"Vz" = (
@@ -3885,9 +3792,6 @@
/area/ship/bridge)
"VC" = (
/obj/machinery/power/apc/auto_name/directional/south,
-/obj/structure/cable{
- icon_state = "0-8"
- },
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/light_switch{
@@ -3895,30 +3799,39 @@
dir = 1;
pixel_y = -16
},
+/obj/structure/cable{
+ icon_state = "8-10"
+ },
+/obj/structure/cable{
+ icon_state = "0-10"
+ },
+/obj/structure/cable{
+ icon_state = "9-10"
+ },
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/obj/structure/cable{
+ icon_state = "5-9"
+ },
/turf/open/floor/plating,
/area/ship/maintenance/port)
"VK" = (
/obj/effect/turf_decal/industrial/hatch/yellow,
/obj/machinery/light/small/directional/south,
-/obj/structure/catwalk/over/plated_catwalk,
-/obj/machinery/portable_atmospherics/canister,
+/obj/machinery/portable_atmospherics/canister/oxygen,
/turf/open/floor/plating,
/area/ship/engineering/engine)
"VN" = (
-/obj/machinery/power/apc/auto_name/directional/south{
- dir = 8;
- pixel_y = 0;
- pixel_x = -30
- },
/obj/structure/cable{
- icon_state = "0-4"
+ icon_state = "8-9"
},
-/turf/open/floor/plasteel/tech,
-/area/ship/crew/dorm/dormfive)
+/turf/open/floor/plasteel/patterned/cargo_one,
+/area/ship/medical/surgery)
"VO" = (
/obj/machinery/airalarm/directional/south,
/turf/open/floor/plasteel/tech,
-/area/ship/maintenance/central)
+/area/ship/engineering/communications)
"VT" = (
/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/incinerator_input{
dir = 4
@@ -3929,33 +3842,48 @@
/turf/open/floor/engine/airless,
/area/ship/engineering/engine)
"VU" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 8
},
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
dir = 1
},
-/obj/structure/catwalk/over/plated_catwalk,
/obj/structure/cable{
icon_state = "1-8"
},
+/obj/structure/catwalk/over/plated_catwalk,
/turf/open/floor/plating,
-/area/ship/hallway/aft)
+/area/ship/hallway/central)
"Wb" = (
/obj/structure/chair/comfy/shuttle,
/obj/machinery/computer/helm/viewscreen/directional/north{
pixel_y = 18
},
/turf/open/floor/plasteel/tech,
-/area/ship/maintenance/central)
+/area/ship/engineering/communications)
"Wo" = (
/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/spawner/lootdrop/grille_or_trash,
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/structure/cable{
+ icon_state = "6-8"
+ },
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/obj/structure/cable{
+ icon_state = "4-10"
+ },
/turf/open/floor/plating,
-/area/ship/maintenance/port)
+/area/ship/storage{
+ name = "Storage And Science Bay"
+ })
+"WB" = (
+/obj/machinery/atmospherics/components/unary/portables_connector,
+/obj/machinery/atmospherics/pipe/simple/green/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/ship/engineering/engine)
"WF" = (
/obj/structure/closet/secure_closet{
anchored = 1;
@@ -3977,19 +3905,22 @@
/obj/machinery/light/directional/north,
/obj/item/storage/belt/utility/chief/full,
/obj/item/storage/photo_album/CE,
+/obj/item/circuitboard/machine/circuit_imprinter,
/turf/open/floor/plasteel/tech,
-/area/ship/maintenance/central)
+/area/ship/engineering/communications)
"WJ" = (
-/obj/machinery/power/apc/auto_name/directional/west,
-/obj/structure/cable,
/obj/effect/decal/cleanable/dirt/dust,
/obj/item/kirbyplants/random,
/obj/effect/turf_decal/borderfloor,
+/obj/machinery/light_switch{
+ dir = 4;
+ pixel_x = -20;
+ pixel_y = 11
+ },
/turf/open/floor/plasteel,
-/area/ship/hallway/fore)
+/area/ship/hallway/central)
"WN" = (
/obj/machinery/atmospherics/components/binary/circulator,
-/obj/structure/disposalpipe/segment,
/turf/open/floor/engine,
/area/ship/engineering/engine)
"WR" = (
@@ -4001,7 +3932,7 @@
dir = 1
},
/turf/open/floor/plasteel,
-/area/ship/hallway/fore)
+/area/ship/hallway/central)
"WS" = (
/obj/machinery/rnd/server,
/obj/machinery/airalarm/directional/south,
@@ -4010,10 +3941,6 @@
/area/ship/bridge)
"WT" = (
/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable{
- icon_state = "0-8"
- },
-/obj/machinery/power/apc/auto_name/directional/south,
/obj/machinery/light_switch{
dir = 1;
pixel_x = 11;
@@ -4037,24 +3964,19 @@
/area/ship/bridge)
"Xh" = (
/obj/structure/railing,
-/obj/structure/catwalk/over/plated_catwalk,
/turf/open/floor/plating,
/area/ship/engineering/engine)
"Xr" = (
+/obj/item/clothing/suit/space/hardsuit/mining,
/obj/item/tank/jetpack/carbondioxide,
/obj/machinery/suit_storage_unit/inherit,
-/obj/item/clothing/suit/space/hardsuit/mining,
-/obj/effect/turf_decal/techfloor{
- dir = 8
- },
-/obj/effect/turf_decal/trimline/transparent/white/filled/warning{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 5
},
-/turf/open/floor/plasteel/dark,
-/area/ship/hallway/central)
+/turf/open/floor/plasteel/patterned,
+/area/ship/storage{
+ name = "Storage And Science Bay"
+ })
"Xs" = (
/obj/effect/turf_decal/industrial/warning{
dir = 1
@@ -4064,13 +3986,13 @@
/turf/open/floor/engine/hull,
/area/ship/external)
"Xv" = (
-/obj/machinery/door/poddoor{
+/obj/structure/window/reinforced/fulltile/shuttle,
+/obj/machinery/door/poddoor/shutters{
id = "gecko_shuttle";
dir = 4
},
-/obj/structure/window/reinforced/fulltile/shuttle,
/turf/open/floor/plating,
-/area/ship/crew/dorm/dormfive)
+/area/ship/crew/dorm/captain)
"XA" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -4082,13 +4004,6 @@
/turf/open/floor/plasteel/tech/techmaint,
/area/ship/engineering/engine)
"XN" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 8
- },
-/obj/structure/catwalk/over/plated_catwalk,
/obj/structure/closet/secure_closet{
anchored = 1;
icon_state = "eng_secure";
@@ -4104,13 +4019,18 @@
/obj/item/clothing/gloves/color/yellow,
/obj/item/storage/belt/utility/full/engi,
/obj/effect/turf_decal/industrial/outline/yellow,
-/turf/open/floor/plating,
+/obj/structure/sign/warning/incident{
+ pixel_y = 0;
+ pixel_x = 32
+ },
+/turf/open/floor/plasteel/dark,
/area/ship/engineering/engine)
"XS" = (
-/obj/structure/catwalk/over/plated_catwalk,
-/obj/structure/catwalk/over/plated_catwalk,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
+ dir = 9
+ },
+/obj/machinery/atmospherics/pipe/simple/purple/hidden{
+ dir = 6
},
/turf/open/floor/plating,
/area/ship/engineering/engine)
@@ -4121,14 +4041,8 @@
/obj/effect/turf_decal/siding/white{
dir = 8
},
-/obj/effect/turf_decal/industrial/warning{
- dir = 1
- },
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 6
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+ dir = 8
},
/turf/open/floor/plasteel/patterned/grid,
/area/ship/hallway/central)
@@ -4165,50 +4079,53 @@
/turf/open/floor/plasteel/patterned,
/area/ship/medical/surgery)
"YC" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+ dir = 2
+ },
/turf/open/floor/plasteel/patterned/cargo_one,
/area/ship/medical/surgery)
"YG" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/effect/spawner/lootdrop/maintenance,
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/sign/warning/electricshock{
pixel_y = -32
},
-/turf/open/floor/plating,
-/area/ship/maintenance/port)
-"YQ" = (
+/obj/machinery/power/apc/auto_name/directional/south,
/obj/structure/cable{
- icon_state = "1-2"
+ icon_state = "5-9"
},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/turf/open/floor/plasteel/patterned,
-/area/ship/storage)
-"YR" = (
-/obj/machinery/door/poddoor{
- id = "gecko_bridge";
- dir = 4
+/obj/structure/cable{
+ icon_state = "1-6"
},
-/obj/structure/window/reinforced/fulltile/shuttle,
-/turf/open/floor/plating,
-/area/ship/bridge)
-"Zb" = (
/obj/structure/cable{
- icon_state = "4-8"
+ icon_state = "0-4"
},
/obj/structure/cable{
- icon_state = "1-4"
+ icon_state = "8-9"
+ },
+/turf/open/floor/plating,
+/area/ship/hallway/central)
+"YQ" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 10
},
-/obj/machinery/atmospherics/components/unary/tank/oxygen{
- dir = 8
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 10
},
-/obj/structure/catwalk/over/plated_catwalk,
-/obj/effect/turf_decal/industrial/hatch/yellow,
-/turf/open/floor/plating,
+/turf/open/floor/plasteel/patterned,
+/area/ship/storage{
+ name = "Storage And Science Bay"
+ })
+"YR" = (
+/turf/open/floor/plasteel/dark,
/area/ship/engineering/engine)
+"Zb" = (
+/obj/item/clothing/suit/space/hardsuit/engine,
+/obj/item/tank/jetpack/carbondioxide,
+/obj/machinery/suit_storage_unit/inherit,
+/turf/open/floor/plasteel/patterned,
+/area/ship/storage{
+ name = "Storage And Science Bay"
+ })
"Ze" = (
/obj/machinery/door/airlock/maintenance_hatch,
/obj/structure/cable{
@@ -4222,13 +4139,18 @@
/turf/open/floor/plating,
/area/ship/maintenance/starboard)
"Zl" = (
-/obj/machinery/door/poddoor{
- dir = 4;
- id = "gecko_bridge"
+/obj/effect/turf_decal/box/corners{
+ dir = 1
},
-/obj/structure/window/reinforced/fulltile/shuttle,
-/turf/open/floor/plating,
-/area/ship/bridge)
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 8
+ },
+/turf/open/floor/plasteel/patterned/cargo_one,
+/area/ship/cargo/starboard)
"Zn" = (
/obj/machinery/power/smes/shuttle/precharged{
dir = 4
@@ -4244,7 +4166,7 @@
},
/obj/machinery/door/poddoor{
dir = 4;
- id = "gecko_thrusters"
+ id = "gecko_port_thrusters"
},
/turf/open/floor/plating,
/area/ship/maintenance/port)
@@ -4252,12 +4174,23 @@
/obj/machinery/power/terminal{
dir = 8
},
-/obj/structure/cable{
- icon_state = "0-4"
- },
/obj/effect/turf_decal/industrial/fire{
dir = 8
},
+/obj/machinery/light/small/directional/north{
+ pixel_x = 11;
+ pixel_y = 28
+ },
+/obj/structure/cable{
+ icon_state = "0-6"
+ },
+/obj/machinery/button/door{
+ id = "gecko_port_thrusters";
+ name = "Thruster Blast Door Control";
+ pixel_x = 0;
+ pixel_y = 23;
+ sync_doors = 0
+ },
/turf/open/floor/plating,
/area/ship/maintenance/port)
"Zu" = (
@@ -4267,30 +4200,32 @@
"Zv" = (
/obj/effect/turf_decal/borderfloor,
/turf/open/floor/plasteel,
-/area/ship/hallway/aft)
+/area/ship/hallway/central)
"ZB" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+/obj/effect/turf_decal/trimline/opaque/yellow/warning{
dir = 8
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/structure/railing/corner{
dir = 8
},
-/obj/structure/catwalk/over/plated_catwalk,
-/turf/open/floor/plating,
+/obj/machinery/light/floor,
+/turf/open/floor/plasteel/dark,
/area/ship/engineering/engine)
"ZM" = (
-/obj/machinery/power/apc/auto_name/directional/north,
-/obj/structure/cable{
- icon_state = "0-8"
- },
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/spawner/lootdrop/grille_or_trash,
/turf/open/floor/plating,
-/area/ship/cargo/starboard)
+/area/ship/maintenance/starboard)
"ZS" = (
-/obj/structure/disposalpipe/trunk,
-/obj/machinery/disposal/bin,
-/obj/effect/turf_decal/industrial/hatch/yellow,
+/obj/machinery/computer/atmos_control/incinerator{
+ dir = 4;
+ sensors = list("gecko_burn_sensor"="Combustion Chamber")
+ },
+/obj/effect/turf_decal/industrial/outline/yellow,
/turf/open/floor/plating,
/area/ship/engineering/engine)
"ZX" = (
@@ -4301,7 +4236,6 @@
/turf/open/floor/plasteel/tech/grid,
/area/ship/crew)
"ZY" = (
-/obj/machinery/firealarm/directional/north,
/obj/item/banner/cargo,
/obj/machinery/light_switch{
pixel_x = 11;
@@ -4366,7 +4300,7 @@ hu
hu
hu
hu
-Ug
+oj
Ug
As
Ug
@@ -4376,9 +4310,9 @@ cv
VT
nH
Ug
-Iv
Ug
Ug
+oj
hu
hu
hu
@@ -4391,19 +4325,19 @@ hu
hu
hu
wh
-oj
+Ug
AA
tH
VK
-hn
+Ug
cK
CF
-cK
-on
+BB
+nH
GM
jK
wD
-oj
+Ug
oj
hu
hu
@@ -4426,8 +4360,8 @@ Sv
uz
st
KQ
-SQ
-KQ
+Iz
+Gt
Iu
Ug
hu
@@ -4441,18 +4375,18 @@ hu
hu
hu
Ug
-ok
-Ij
+KM
+KM
dZ
-Ij
-Ij
+KM
+KM
Ml
xl
hb
XS
zl
ks
-gg
+ys
ss
Ug
hu
@@ -4466,19 +4400,19 @@ wy
xh
Ki
Ug
-Iz
-Ij
-yc
+KM
+FC
+yp
UP
UP
hX
-GB
+Cj
yp
QD
pQ
Hg
-Ij
-Ij
+gg
+jJ
Ug
bV
xh
@@ -4491,19 +4425,19 @@ Zn
jn
tB
Ug
-pW
-wW
-AI
-Ij
-Ij
-Ij
+KM
+Vl
+KM
+KM
+KM
+KM
Cj
-Ij
-XS
-Ij
-lW
-wW
-eQ
+KM
+KM
+yc
+WB
+II
+Ug
Ug
wB
Pk
@@ -4513,20 +4447,20 @@ wB
(9,1,1) = {"
tB
Zo
-Zo
+Ij
tB
tB
tB
in
-JV
-ws
-wV
+LH
+LH
+LH
aK
oT
QA
LH
-wV
-Ba
+LA
+AI
Ig
wB
wB
@@ -4544,13 +4478,13 @@ UV
qp
mX
wY
-Ij
+wV
Xh
Lr
ez
zc
-Ij
-zZ
+KM
+eQ
vi
lZ
Ze
@@ -4569,13 +4503,13 @@ Jc
tB
Rk
ZB
-Ij
+Ba
Xh
XA
Tf
-PV
-Ij
-KM
+SQ
+JV
+pW
gB
eC
wB
@@ -4593,21 +4527,21 @@ tB
Th
tB
Pn
-ZB
-Ij
-Im
+YR
+el
+Xh
eu
hT
PV
-Ij
-Gt
+KM
+dX
ah
-Zb
+ws
wB
-En
+dk
wB
mM
-dk
+QY
wB
"}
(13,1,1) = {"
@@ -4626,7 +4560,7 @@ hT
Sl
Ug
xm
-QY
+xm
ef
wB
Sy
@@ -4636,20 +4570,20 @@ dp
wB
"}
(14,1,1) = {"
-Vl
+dV
tB
tB
CU
rD
pe
pe
-BB
+pe
pe
Ug
DT
Rh
aq
-td
+Ug
Jk
Vr
AN
@@ -4658,7 +4592,7 @@ ZM
kq
wB
wB
-NJ
+GB
"}
(15,1,1) = {"
hu
@@ -4668,7 +4602,7 @@ dV
pe
pe
SK
-el
+SK
fj
Ug
Ug
@@ -4680,7 +4614,7 @@ zM
ms
Vq
Vq
-PF
+GB
hu
hu
hu
@@ -4699,9 +4633,9 @@ pe
fn
EE
ej
-yX
-EK
-Cc
+Vq
+Iv
+Zl
zv
Lw
DQ
@@ -4715,10 +4649,10 @@ hu
hu
hu
hu
-jO
+KH
cG
-sg
-sg
+ao
+gS
GE
Qc
Vm
@@ -4742,12 +4676,12 @@ hu
hu
jO
bs
-sg
+UR
Tg
cE
tN
Sj
-bb
+Dp
ov
uv
ZY
@@ -4790,10 +4724,10 @@ hu
hu
hu
hu
-jO
+wj
jx
sg
-sg
+VN
fb
pe
HK
@@ -4802,7 +4736,7 @@ mN
Vq
Rc
Cc
-Hx
+zv
eE
UI
Xs
@@ -4815,9 +4749,9 @@ hu
hu
hu
hu
-jO
+LZ
Nz
-Tg
+yd
SE
AG
ko
@@ -4840,9 +4774,9 @@ hu
hu
hu
hu
-jO
+tV
ze
-FO
+sg
FO
WT
pe
@@ -4876,8 +4810,8 @@ Mw
Iy
Vq
Pc
-Dp
-Dp
+Pc
+Pc
Vq
Vq
PF
@@ -4888,16 +4822,16 @@ hu
(24,1,1) = {"
hu
hu
-Ts
-Ts
+qO
+En
vo
Mf
gN
bK
Xr
-Ts
+bH
Da
-UR
+IK
fP
jC
BF
@@ -4939,15 +4873,15 @@ hu
hu
hu
qO
-Ts
+bH
nq
PQ
ih
BU
mL
-Ts
+bH
Ia
-UR
+IK
KA
jC
Gm
@@ -4964,16 +4898,16 @@ hu
hu
hu
hu
+qO
+bH
+bH
+bH
+Zb
Ts
-Ts
-Ts
-Ts
-Ts
-Ts
-Ts
-KH
+bH
+Iy
Cn
-KH
+Iy
jC
Pi
Cv
@@ -4991,13 +4925,13 @@ hu
hu
hu
hu
-qc
+bH
Bi
bU
oM
bH
pu
-yd
+IK
WJ
jC
if
@@ -5022,7 +4956,7 @@ bk
YQ
QZ
ue
-dX
+qb
rF
Hc
UB
@@ -5048,7 +4982,7 @@ oZ
bH
bw
rd
-LZ
+Zv
jC
Ko
jc
@@ -5178,7 +5112,7 @@ oJ
oJ
oJ
oJ
-Ux
+td
hu
hu
hu
@@ -5194,14 +5128,14 @@ hu
yj
zn
Ov
-tV
+kZ
yj
Mc
ch
re
-vX
+oJ
jG
-VN
+RS
pX
oJ
hu
@@ -5345,7 +5279,7 @@ hu
hu
hu
hu
-FC
+rh
RN
EQ
Ew
@@ -5445,10 +5379,10 @@ hu
hu
hu
hu
-gS
-YR
+ge
+te
+te
te
-Zl
ge
hu
hu
diff --git a/code/__DEFINES/inventory.dm b/code/__DEFINES/inventory.dm
index c2deda7d1ba3..376f0edc651b 100644
--- a/code/__DEFINES/inventory.dm
+++ b/code/__DEFINES/inventory.dm
@@ -84,9 +84,7 @@
#define SNOUTED_VARIATION (1<<4) //Ex of naming: a state called "nameof_thing" can be named "nameof_thing_snouted"
#define VOX_VARIATION (1<<5)
#define KEPORI_VARIATION (1<<6)
-// [CELADON-ADD] - TAJARA
-#define TAJARA_VARIATION (1<<7)
-// [/CELADON-ADD]
+
#define NOT_DIGITIGRADE 0
#define FULL_DIGITIGRADE 1
diff --git a/code/__DEFINES/overmap.dm b/code/__DEFINES/overmap.dm
index e692a95e02b9..7a7151a75c2a 100644
--- a/code/__DEFINES/overmap.dm
+++ b/code/__DEFINES/overmap.dm
@@ -64,7 +64,11 @@
DYNAMIC_WORLD_GAS_GIANT,\
DYNAMIC_WORLD_PLASMA_GIANT,\
DYNAMIC_WORLD_OLD_TOWN,\
- DYNAMIC_WORLD_EARTH_SAND)
+ DYNAMIC_WORLD_EARTH_SAND,\
+ DYNAMIC_WORLD_ICE_NIGHT,\
+ DYNAMIC_WORLD_JUNGLE_NIGHT,\
+ DYNAMIC_WORLD_ROCKPLANET_NIGHT,\
+ DYNAMIC_WORLD_BEACHPLANET_NIGHT)
// [/CELADON-EDIT] - CELADON_CONFIGS_MAPS
//Possible ship states
diff --git a/code/__DEFINES/~mod_celadon/map.dm b/code/__DEFINES/~mod_celadon/map.dm
index c681f72f4f47..8eab91d41557 100644
--- a/code/__DEFINES/~mod_celadon/map.dm
+++ b/code/__DEFINES/~mod_celadon/map.dm
@@ -3,3 +3,8 @@
#define RUINTYPE_PLASMA "Plasma"
#define RUINTYPE_EARTH_SAND "EarthSand"
+
+#define DYNAMIC_WORLD_ICE_NIGHT "ice night"
+#define DYNAMIC_WORLD_JUNGLE_NIGHT "jungle night"
+#define DYNAMIC_WORLD_ROCKPLANET_NIGHT "rockplanet night"
+#define DYNAMIC_WORLD_BEACHPLANET_NIGHT "beachplanet night"
diff --git a/code/__HELPERS/text.dm b/code/__HELPERS/text.dm
index a96a735a769c..a7dd47029cad 100644
--- a/code/__HELPERS/text.dm
+++ b/code/__HELPERS/text.dm
@@ -148,6 +148,18 @@
number_of_alphanumeric++
last_char_group = CHARS_DETECTED
+ // [CELADON-ADD] Добавляем возможность создания имён персонажей на кирилице.
+ //А .. Я
+ if(1040 to 1071)
+ number_of_alphanumeric++
+ last_char_group = CHARS_DETECTED
+
+ //а .. я
+ if(1072 to 1103)
+ number_of_alphanumeric++
+ last_char_group = CHARS_DETECTED
+ // [/CELADON-ADD]
+
//0 .. 9
if(48 to 57)
number_of_alphanumeric++
diff --git a/code/modules/admin/player_panel.dm b/code/modules/admin/player_panel.dm
index cf834c9f9c5d..31ff7972bac1 100644
--- a/code/modules/admin/player_panel.dm
+++ b/code/modules/admin/player_panel.dm
@@ -2,7 +2,7 @@
if(!check_rights())
return
log_admin("[key_name(usr)] checked the player panel.")
- var/dat = "Player Panel"
+ var/dat = "Player Panel"
//javascript, the part that does most of the work~
dat += {"
diff --git a/code/modules/clothing/head/_head.dm b/code/modules/clothing/head/_head.dm
index f274e3264c5f..aa1114e6b182 100644
--- a/code/modules/clothing/head/_head.dm
+++ b/code/modules/clothing/head/_head.dm
@@ -11,10 +11,7 @@
var/can_toggle = null
greyscale_icon_state = "hat"
greyscale_colors = list(list(16,26))
- // [CELADON-EDIT] - TAJARA
- // supports_variations = VOX_VARIATION // CELADON-EDIT - ORIGINAL
- supports_variations = VOX_VARIATION | TAJARA_VARIATION
- // [/CELADON-EDIT]
+ supports_variations = VOX_VARIATION
///Special throw_impact for hats to frisbee hats at people to place them on their heads/attempt to de-hat them.
/obj/item/clothing/head/throw_impact(atom/hit_atom, datum/thrownthing/thrownthing)
diff --git a/code/modules/clothing/masks/_masks.dm b/code/modules/clothing/masks/_masks.dm
index cbc7fd1bced6..a4c1d5d509fa 100644
--- a/code/modules/clothing/masks/_masks.dm
+++ b/code/modules/clothing/masks/_masks.dm
@@ -10,10 +10,7 @@
var/modifies_speech = FALSE
var/mask_adjusted = 0
var/adjusted_flags = null
- // [CELADON-EDIT] - TAJARA
- // supports_variations = VOX_VARIATION | KEPORI_VARIATION // CELADON-EDIT - ORIGINAL
- supports_variations = VOX_VARIATION | KEPORI_VARIATION | TAJARA_VARIATION
- // [/CELADON-EDIT]
+ supports_variations = VOX_VARIATION | KEPORI_VARIATION
/obj/item/clothing/mask/attack_self(mob/user)
if((clothing_flags & VOICEBOX_TOGGLABLE))
diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm
index 0942f05c2921..f9d651c7bdd7 100644
--- a/code/modules/clothing/spacesuits/hardsuit.dm
+++ b/code/modules/clothing/spacesuits/hardsuit.dm
@@ -209,10 +209,7 @@
item_state = "eng_hardsuit"
siemens_coefficient = 0
armor = list("melee" = 30, "bullet" = 5, "laser" = 10, "energy" = 20, "bomb" = 10, "bio" = 100, "rad" = 75, "fire" = 100, "acid" = 75)
- // [CELADON-EDIT] - TAJARA
- // supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION // CELADON-EDIT - ORIGINAL
- supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION | TAJARA_VARIATION
- // [/CELADON-EDIT]
+ supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/engine
resistance_flags = FIRE_PROOF
@@ -290,10 +287,7 @@
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/mining
heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
custom_price = 2000
- // [CELADON-EDIT] - TAJARA
- // supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION // CELADON-EDIT - ORIGINAL
- supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION | TAJARA_VARIATION
- // [/CELADON-EDIT]
+ supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION
/obj/item/clothing/suit/space/hardsuit/mining/Initialize()
. = ..()
@@ -393,10 +387,16 @@
linkedsuit.name = initial(linkedsuit.name)
linkedsuit.desc = initial(linkedsuit.desc)
linkedsuit.clothing_flags |= STOPSPRESSUREDAMAGE
+ // [CELADON - ADD] - BALANCE
+ linkedsuit.slowdown = 0.7
+ // [CELADON - ADD]
linkedsuit.cold_protection |= CHEST | GROIN | LEGS | FEET | ARMS | HANDS
else
linkedsuit.name += " (combat)"
linkedsuit.desc = linkedsuit.alt_desc
+ // [CELADON - ADD] - BALANCE
+ linkedsuit.slowdown = linkedsuit.combat_slowdown
+ // [CELADON - ADD]
linkedsuit.clothing_flags &= ~STOPSPRESSUREDAMAGE
linkedsuit.cold_protection &= ~(CHEST | GROIN | LEGS | FEET | ARMS | HANDS)
if(linkedsuit.lightweight)
@@ -420,12 +420,12 @@
allowed = list(/obj/item/gun, /obj/item/ammo_box,/obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/melee/transforming/energy/sword/saber, /obj/item/restraints/handcuffs, /obj/item/tank/internals)
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/syndi
jetpack = /obj/item/tank/jetpack/suit
- // [CELADON-EDIT] - TAJARA
- // supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION // CELADON-EDIT - ORIGINAL
- supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION | TAJARA_VARIATION
- // [/CELADON-EDIT]
- slowdown = 0.5
- var/combat_slowdown = 0 //slowdown when in combat mode
+ supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION
+ // [CELADON - EDIT] - BALANCE
+ // slowdown = 0.5 // [CELADON - EDIT] - ORIGINAL
+ // var/combat_slowdown = 0 //slowdown when in combat mode // [CELADON - EDIT] - ORIGINAL
+ var/combat_slowdown = 0.2
+ // [CELADON - EDIT]
var/lightweight = 0 //used for flags when toggling
//Ramzi Syndie suit
@@ -449,11 +449,11 @@
lightweight = 1
jetpack = null
armor = list("melee" = 35, "bullet" = 25, "laser" = 20,"energy" = 40, "bomb" = 10, "bio" = 100, "rad" = 50, "fire" = 75, "acid" = 75)
- slowdown = 0.7
+ // [CELADON - REMOVE] - BALANCE
+ // slowdown = 0.7 // [CELADON - REMOVE] - ORIGINAL
+ // [CELADON - REMOVE]
jetpack = null
- // [CELADON-ADD] - TAJARA
supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION
- // [/CELADON-ADD]
//Elite Syndie suit
/obj/item/clothing/head/helmet/space/hardsuit/syndi/elite
@@ -486,10 +486,7 @@
heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
resistance_flags = FIRE_PROOF | ACID_PROOF
- // [CELADON-EDIT] - TAJARA
- // supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION // CELADON-EDIT - ORIGINAL
- supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION | TAJARA_VARIATION
- // [/CELADON-EDIT]
+ supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION
/obj/item/clothing/suit/space/hardsuit/syndi/elite/debug
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/syndi/elite/debug
@@ -503,10 +500,7 @@
hardsuit_type = "cybersun"
armor = list("melee" = 25, "bullet" = 25, "laser" = 50, "energy" = 50, "bomb" = 25, "bio" = 100, "rad" = 60, "fire" = 60, "acid" = 60)
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/syndi/cybersun
- // [CELADON-EDIT] - TAJARA
- // supports_variations = VOX_VARIATION // CELADON-EDIT - ORIGINAL
- supports_variations = VOX_VARIATION | TAJARA_VARIATION
- // [/CELADON-EDIT]
+ supports_variations = VOX_VARIATION
/obj/item/clothing/head/helmet/space/hardsuit/syndi/cybersun
name = "neutron-star combat hardsuit helmet"
@@ -525,10 +519,7 @@
hardsuit_type = "cyberparamed"
armor = list("melee" = 25, "bullet" = 25, "laser" = 35, "energy" = 40, "bomb" = 10, "bio" = 100, "rad" = 65, "fire" = 75, "acid" = 40)
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/syndi/cybersun/paramed
- // [CELADON-EDIT] - TAJARA
- // supports_variations = VOX_VARIATION // CELADON-EDIT - ORIGINAL
- supports_variations = VOX_VARIATION | TAJARA_VARIATION
- // [/CELADON-EDIT]
+ supports_variations = VOX_VARIATION
jetpack = null
/obj/item/clothing/head/helmet/space/hardsuit/syndi/cybersun/paramed
@@ -547,10 +538,7 @@
icon_state = "hardsuit1-pointman"
hardsuit_type = "pointman"
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/syndi/inteq
- // [CELADON-EDIT] - TAJARA
- // supports_variations = VOX_VARIATION // CELADON-EDIT - ORIGINAL
- supports_variations = VOX_VARIATION | TAJARA_VARIATION
- // [/CELADON-EDIT]
+ supports_variations = VOX_VARIATION
/obj/item/clothing/head/helmet/space/hardsuit/syndi/inteq
@@ -606,10 +594,7 @@
armor = list("melee" = 30, "bullet" = 5, "laser" = 10, "energy" = 20, "bomb" = 10, "bio" = 100, "rad" = 60, "fire" = 60, "acid" = 75)
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/medical
slowdown = 0.5
- // [CELADON-EDIT] - TAJARA
- // supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION // CELADON-EDIT - ORIGINAL
- supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION | TAJARA_VARIATION
- // [/CELADON-EDIT]
+ supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION
/obj/item/clothing/head/helmet/space/hardsuit/medical/cmo
name = "chief medical officer's hardsuit helmet"
@@ -672,10 +657,7 @@
/obj/item/aicard)
armor = list("melee" = 30, "bullet" = 5, "laser" = 10, "energy" = 20, "bomb" = 100, "bio" = 100, "rad" = 60, "fire" = 60, "acid" = 80)
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/rd
- // [CELADON-EDIT] - TAJARA
- // supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION // CELADON-EDIT - ORIGINAL
- supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION | TAJARA_VARIATION
- // [/CELADON-EDIT]
+ supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION
//Security hardsuit
/obj/item/clothing/head/helmet/space/hardsuit/security
@@ -695,10 +677,7 @@
armor = list("melee" = 35, "bullet" = 15, "laser" = 30, "energy" = 40, "bomb" = 10, "bio" = 100, "rad" = 50, "fire" = 75, "acid" = 75)
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/security
slowdown = 0.5
- // [CELADON-EDIT] - TAJARA
- // supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION // CELADON-EDIT - ORIGINAL
- supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION | TAJARA_VARIATION
- // [/CELADON-EDIT]
+ supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION
/obj/item/clothing/suit/space/hardsuit/security/Initialize()
. = ..()
@@ -720,10 +699,7 @@
armor = list("melee" = 45, "bullet" = 25, "laser" = 30, "energy" = 40, "bomb" = 25, "bio" = 100, "rad" = 50, "fire" = 95, "acid" = 95)
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/security/hos
jetpack = /obj/item/tank/jetpack/suit
- // [CELADON-EDIT] - TAJARA
- // supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION // CELADON-EDIT - ORIGINAL
- supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION | TAJARA_VARIATION
- // [/CELADON-EDIT]
+ supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION
//SWAT MKII
/obj/item/clothing/head/helmet/space/hardsuit/swat
@@ -1063,10 +1039,7 @@
item_state = "independent_sec_helm"
hardsuit_type = "independent-sec"
armor = list("melee" = 35, "bullet" = 25, "laser" = 20,"energy" = 40, "bomb" = 10, "bio" = 100, "rad" = 50, "fire" = 75, "acid" = 75)
- // [CELADON-EDIT] - TAJARA
- // supports_variations = VOX_VARIATION | SNOUTED_VARIATION // CELADON-EDIT - ORIGINAL
- supports_variations = VOX_VARIATION | SNOUTED_VARIATION | TAJARA_VARIATION
- // [/CELADON-EDIT]
+ supports_variations = VOX_VARIATION | SNOUTED_VARIATION
/obj/item/clothing/suit/space/hardsuit/security/independent
icon_state = "hardsuit-independent-sec"
@@ -1077,10 +1050,7 @@
hardsuit_type = "independent-sec"
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/security/independent
armor = list("melee" = 35, "bullet" = 25, "laser" = 20, "energy" = 40, "bomb" = 10, "bio" = 100, "rad" = 50, "fire" = 75, "acid" = 75)
- // [CELADON-EDIT] - TAJARA
- // supports_variations = VOX_VARIATION | DIGITIGRADE_VARIATION // CELADON-EDIT - ORIGINAL
- supports_variations = VOX_VARIATION | DIGITIGRADE_VARIATION | TAJARA_VARIATION
- // [/CELADON-EDIT]
+ supports_variations = VOX_VARIATION | DIGITIGRADE_VARIATION
//Mining
/obj/item/clothing/head/helmet/space/hardsuit/mining/independent
@@ -1225,10 +1195,7 @@
item_state = "hardsuit-inteq"
hardsuit_type = "inteq"
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/security/independent/inteq
- // [CELADON-EDIT] - TAJARA
- // supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION // CELADON-EDIT - ORIGINAL
- supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION | TAJARA_VARIATION
- // [/CELADON-EDIT]
+ supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION
/obj/item/clothing/head/helmet/space/hardsuit/solgov
name = "\improper SolGov hardsuit helmet"
@@ -1247,10 +1214,7 @@
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/solgov
allowed = list(/obj/item/gun, /obj/item/ammo_box,/obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/melee/transforming/energy/sword/saber, /obj/item/restraints/handcuffs, /obj/item/tank/internals)
slowdown = 0.5
- // [CELADON-EDIT] - TAJARA
- // supports_variations = DIGITIGRADE_VARIATION // CELADON-EDIT - ORIGINAL
- supports_variations = DIGITIGRADE_VARIATION | TAJARA_VARIATION
- // [/CELADON-EDIT]
+ supports_variations = DIGITIGRADE_VARIATION
/obj/item/clothing/head/helmet/space/hardsuit/quixote
name = "\improper Quixote mobility hardsuit helmet"
diff --git a/code/modules/clothing/suits/_suits.dm b/code/modules/clothing/suits/_suits.dm
index 339f62a555d6..30d3c3c3c9ba 100644
--- a/code/modules/clothing/suits/_suits.dm
+++ b/code/modules/clothing/suits/_suits.dm
@@ -15,10 +15,7 @@
pocket_storage_component_path = /datum/component/storage/concrete/pockets/exo //WS Edit - Exowear Pockets
greyscale_colors = list(list(13, 16), list(10, 18), list(13, 21))
greyscale_icon_state = "coat"
- // [CELADON-EDIT] - TAJARA
- // supports_variations = VOX_VARIATION // CELADON-EDIT - ORIGINAL
- supports_variations = VOX_VARIATION | TAJARA_VARIATION
- // [/CELADON-EDIT]
+ supports_variations = VOX_VARIATION
mob_overlay_icon = 'icons/mob/clothing/suit.dmi'
/obj/item/clothing/suit/worn_overlays(isinhands = FALSE)
diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm
index 13b9c1de58ed..e6593ef6dc4d 100644
--- a/code/modules/mob/living/carbon/human/update_icons.dm
+++ b/code/modules/mob/living/carbon/human/update_icons.dm
@@ -524,8 +524,13 @@ There are several things that need to be remembered:
handled_by_bodytype = TRUE
// [CELADON-ADD] - TAJARA
- if((I.supports_variations & TAJARA_VARIATION) && (dna.species.bodytype & BODYTYPE_TAJARA))
- icon_file = TAJARA_HEAD_PATH
+ else if(BODYTYPE_TAJARA)
+ if(icon_exists(SARATHI_SNOUTED_HELM_PATH, RESOLVE_ICON_STATE(I)))
+ icon_file = SARATHI_SNOUTED_HELM_PATH
+ if(I.snout_override_icon)
+ icon_file = I.snout_override_icon
+ else
+ handled_by_bodytype = TRUE
// [/CELADON-ADD]
if(!(icon_exists(icon_file, RESOLVE_ICON_STATE(I))))
@@ -637,8 +642,11 @@ There are several things that need to be remembered:
handled_by_bodytype = TRUE
// [CELADON-ADD] - TAJARA
- else if((dna.species.bodytype & BODYTYPE_TAJARA) && (I.supports_variations & TAJARA_VARIATION))
- icon_file = TAJARA_SUIT_PATH
+ else if(BODYTYPE_TAJARA)
+ if(icon_exists(TAJARA_SUIT_PATH, RESOLVE_ICON_STATE(I)))
+ icon_file = TAJARA_SUIT_PATH
+ else
+ handled_by_bodytype = TRUE
// [/CELADON-ADD]
if(!(icon_exists(icon_file, RESOLVE_ICON_STATE(I))))
@@ -735,8 +743,13 @@ There are several things that need to be remembered:
handled_by_bodytype = TRUE
// [CELADON-ADD] - TAJARA
- if((dna.species.bodytype & BODYTYPE_TAJARA) && (I.supports_variations & TAJARA_VARIATION))
- icon_file = TAJARA_MASK_PATH
+ else if(BODYTYPE_TAJARA)
+ if(icon_exists(SARATHI_SNOUTED_MASK_PATH, RESOLVE_ICON_STATE(I)))
+ icon_file = SARATHI_SNOUTED_MASK_PATH
+ if(I.snout_override_icon)
+ icon_file = I.snout_override_icon
+ else
+ handled_by_bodytype = TRUE
// [/CELADON-ADD]
diff --git a/mod_celadon/balance/README.md b/mod_celadon/balance/README.md
index 97fb62a81551..09b030b447cc 100644
--- a/mod_celadon/balance/README.md
+++ b/mod_celadon/balance/README.md
@@ -76,6 +76,10 @@ EDIT:
ADD:
`code/modules/vending/_vending.dm` : Добавлена вероятность поломки автомата при уничтожение его с вероятностью в 30% что ничего не выпадет с него
+
+Хардсьюты:
+EDIT: `code/modules/clothing/spacesuits/hardsuit.dm`
+REMOVE: `code/modules/clothing/spacesuits/hardsuit.dm`