diff --git a/.github/MC_tab.md b/.github/MC_tab.md
new file mode 100644
index 000000000000..01ad1e6aa174
--- /dev/null
+++ b/.github/MC_tab.md
@@ -0,0 +1,36 @@
+The MC tab hold information on how the game is performing. Here's a crash course on what the most important of those numbers mean.
+
+If you already know what these numbers mean and you want to see them update faster than the default refresh rate of once every 2 seconds, you can enable the admin pref to make the MC tab refresh every 4 deciseconds. Please don't do this unless you actually need that information at a faster refresh rate since updating every subsystems information is expensive.
+
+# Main Entries:
+
+ * CPU: What percentage of a tick the game is using before starting the next tick. If this is above 100 it means we are over budget.
+
+ * TickCount: How many ticks should have elapsed since the start of the game if no ticks were ever delayed from starting.
+
+ * TickDrift: How many ticks since the game started that have been delayed. Essentially this is how many ticks the game is running behind. If this is increasing then the game is currently not able to keep up with demand.
+
+ * Internal Tick Usage: You might have heard of this referred to as "maptick". It's how much of the tick that an internal byond function called SendMaps() has taken recently. The higher this is the less time our code has to run. SendMaps() deals with sending players updates of their view of the game world so it has to run every tick but it's expensive so ideally this is optimized as much as possible. You can see a more detailed breakdown of the cost of SendMaps by looking at the profiler in the debug tab -> "Send Maps Profile".
+
+# Master Controller Entry:
+
+ * TickRate: How many Byond ticks go between each master controller iteration. By default this is 1 meaning the MC runs once every byond tick. But certain configurations can increase this slightly.
+
+ * Iteration: How many times the MC has ran since starting.
+
+ * TickLimit: This SHOULD be what percentage of the tick the MC can use when it starts a run, however currently it just represents how much of the tick the MC can use by the time that SSstatpanels fires. Someone should fix that.
+
+# Subsystem Entries:
+
+Subsystems will typically have a base stat entry of the form:
+[ ] Name 12ms|28%(2%)|3
+
+The brackets hold a letter if the subsystem is in a state other than idle.
+
+The first numbered entry is the cost of the subsystem, which is a running average of how many milliseconds the subsystem takes to complete a full run. This is increased every time the subsystem resumes an uncompleted run or starts a new run and decays when runs take less time. If this balloons to huge values then it means that the amount of work the subsystem needs to complete in a run is far greater than the amount of time it actually has to execute in whenever it is its turn to fire.
+
+The second numbered entry is like cost, but in percentage of an ideal tick this subsystem takes to complete a run. They both represent the same data.
+
+The third entry (2%) is how much time this subsystem spent executing beyond the time it was allocated by the MC. This is bad, it means that this subsystem doesn't yield when it's taking too much time and makes the job of the MC harder. The MC will attempt to account for this but it is better for all subsystems to be able to correctly yield when their turn is done.
+
+The fourth entry represents how many times this subsystem fires before it completes a run.
diff --git a/2024-02-11 19 b/2024-02-11 19
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/_maps/RandomRuins/BeachRuins/beach_colony.dmm b/_maps/RandomRuins/BeachRuins/beach_colony.dmm
index 95f9f4baa89c..05a810e004ad 100644
--- a/_maps/RandomRuins/BeachRuins/beach_colony.dmm
+++ b/_maps/RandomRuins/BeachRuins/beach_colony.dmm
@@ -383,7 +383,7 @@
},
/area/overmap_encounter/planetoid/beachplanet/explored)
"NG" = (
-/obj/item/gun/ballistic/automatic/pistol/m1911/no_mag{
+/obj/item/gun/ballistic/automatic/pistol/candor/no_mag{
pixel_x = 13
},
/obj/item/toy/plush/carpplushie{
diff --git a/_maps/RandomRuins/BeachRuins/beach_crashed_engineer.dmm b/_maps/RandomRuins/BeachRuins/beach_crashed_engineer.dmm
index 4e47f54d4970..998e43b9085a 100644
--- a/_maps/RandomRuins/BeachRuins/beach_crashed_engineer.dmm
+++ b/_maps/RandomRuins/BeachRuins/beach_crashed_engineer.dmm
@@ -230,7 +230,7 @@
/turf/open/floor/plating,
/area/ruin/unpowered)
"kH" = (
-/obj/item/book/manual/wiki/engineering_construction,
+/obj/item/book/manual/wiki/construction,
/turf/open/floor/plating/beach/sand{
light_range = 2
},
@@ -453,7 +453,7 @@
/turf/open/floor/plasteel/tech,
/area/ruin/unpowered)
"sB" = (
-/obj/item/book/manual/wiki/engineering_guide,
+/obj/item/book/manual/wiki/engineering,
/turf/open/floor/plating/beach/sand{
light_range = 2
},
@@ -858,7 +858,7 @@
/area/overmap_encounter/planetoid/beachplanet/explored)
"Kl" = (
/obj/effect/radiation,
-/obj/item/book/manual/wiki/engineering_singulo_tesla,
+/obj/item/book/manual/wiki/engineering,
/turf/open/water/beach/deep,
/area/overmap_encounter/planetoid/beachplanet/explored)
"Ko" = (
diff --git a/_maps/RandomRuins/BeachRuins/beach_crashed_starwalker.dmm b/_maps/RandomRuins/BeachRuins/beach_crashed_starwalker.dmm
index 87df4d5dc092..346458a87daf 100644
--- a/_maps/RandomRuins/BeachRuins/beach_crashed_starwalker.dmm
+++ b/_maps/RandomRuins/BeachRuins/beach_crashed_starwalker.dmm
@@ -3374,7 +3374,7 @@
/obj/structure/cable/orange{
icon_state = "2-10"
},
-/obj/item/gun/ballistic/shotgun/lethal,
+/obj/item/gun/ballistic/shotgun/brimstone,
/obj/structure/spacevine,
/turf/open/floor/mineral/plastitanium,
/area/ruin/beach/starwalker)
diff --git a/_maps/RandomRuins/BeachRuins/beach_fishing_hut.dmm b/_maps/RandomRuins/BeachRuins/beach_fishing_hut.dmm
index 588fe99b9792..3b801c086ff3 100644
--- a/_maps/RandomRuins/BeachRuins/beach_fishing_hut.dmm
+++ b/_maps/RandomRuins/BeachRuins/beach_fishing_hut.dmm
@@ -297,7 +297,7 @@
"mD" = (
/obj/structure/table/wood,
/obj/machinery/light/small/directional/north,
-/obj/item/gun/ballistic/shotgun/winchester,
+/obj/item/gun/ballistic/shotgun/flamingarrow,
/turf/open/floor/wood,
/area/ruin/beach)
"mE" = (
diff --git a/_maps/RandomRuins/BeachRuins/beach_ocean_town.dmm b/_maps/RandomRuins/BeachRuins/beach_ocean_town.dmm
index c65fe197ed88..583c196e3dc3 100644
--- a/_maps/RandomRuins/BeachRuins/beach_ocean_town.dmm
+++ b/_maps/RandomRuins/BeachRuins/beach_ocean_town.dmm
@@ -3308,7 +3308,7 @@
/area/overmap_encounter/planetoid/beachplanet/explored)
"MY" = (
/obj/structure/table,
-/obj/item/book/manual/wiki/barman_recipes,
+/obj/item/book/manual/wiki/drinks,
/turf/open/floor/wood{
light_range = 2
},
@@ -3321,7 +3321,7 @@
/area/overmap_encounter/planetoid/beachplanet/explored)
"Ni" = (
/obj/structure/table/wood,
-/obj/item/book/manual/wiki/medical_cloning,
+/obj/item/book/manual/wiki/medicine,
/obj/machinery/light/small/directional/west,
/turf/open/floor/wood,
/area/ruin/beach/oceantown)
diff --git a/_maps/RandomRuins/IceRuins/icemoon_hydroponics_lab.dmm b/_maps/RandomRuins/IceRuins/icemoon_hydroponics_lab.dmm
index 96126bfbaf4e..67613238e83d 100644
--- a/_maps/RandomRuins/IceRuins/icemoon_hydroponics_lab.dmm
+++ b/_maps/RandomRuins/IceRuins/icemoon_hydroponics_lab.dmm
@@ -870,7 +870,7 @@
/turf/open/floor/plasteel/tech,
/area/ruin/powered/hydroponicslab)
"oo" = (
-/obj/item/gun/ballistic/automatic/pistol/m1911/no_mag{
+/obj/item/gun/ballistic/automatic/pistol/candor/no_mag{
pixel_x = 2;
pixel_y = -3
},
@@ -1794,7 +1794,7 @@
/area/ruin/powered/hydroponicslab)
"Mz" = (
/obj/effect/decal/cleanable/blood,
-/obj/item/gun/ballistic/automatic/pistol/m1911/no_mag,
+/obj/item/gun/ballistic/automatic/pistol/candor/no_mag,
/obj/effect/turf_decal/techfloor{
dir = 4
},
diff --git a/_maps/RandomRuins/IceRuins/icemoon_surface_engioutpost.dmm b/_maps/RandomRuins/IceRuins/icemoon_surface_engioutpost.dmm
index 4e44e6fb41e0..b514b1c40f9c 100644
--- a/_maps/RandomRuins/IceRuins/icemoon_surface_engioutpost.dmm
+++ b/_maps/RandomRuins/IceRuins/icemoon_surface_engioutpost.dmm
@@ -617,7 +617,7 @@
/obj/effect/turf_decal/industrial/warning{
dir = 8
},
-/obj/item/book/manual/wiki/engineering_singulo_tesla,
+/obj/item/book/manual/wiki/engineering,
/turf/open/floor/plasteel/icemoon,
/area/ruin)
"bE" = (
@@ -828,7 +828,7 @@
/turf/open/floor/plasteel/icemoon,
/area/ruin)
"cc" = (
-/obj/item/book/manual/wiki/atmospherics,
+/obj/item/book/manual/wiki/engineering,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 4
},
diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_hermit.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_hermit.dmm
index 06f364c61fea..3f105e83ef81 100644
--- a/_maps/RandomRuins/IceRuins/icemoon_underground_hermit.dmm
+++ b/_maps/RandomRuins/IceRuins/icemoon_underground_hermit.dmm
@@ -56,7 +56,7 @@
/turf/open/floor/wood,
/area/ruin/powered)
"sC" = (
-/obj/item/gun/ballistic/rifle/boltaction,
+/obj/item/gun/ballistic/rifle/illestren,
/obj/structure/table/wood,
/obj/item/flashlight/lantern,
/turf/open/floor/wood,
diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_oldstation.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_oldstation.dmm
index b63742662227..162934ae538b 100644
--- a/_maps/RandomRuins/IceRuins/icemoon_underground_oldstation.dmm
+++ b/_maps/RandomRuins/IceRuins/icemoon_underground_oldstation.dmm
@@ -1416,7 +1416,6 @@
"ex" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/table,
-/obj/item/book/manual/wiki/security_space_law,
/obj/effect/turf_decal/corner/opaque/red{
dir = 1
},
diff --git a/_maps/RandomRuins/JungleRuins/jungle_abandoned_library.dmm b/_maps/RandomRuins/JungleRuins/jungle_abandoned_library.dmm
index 71b31e40d1fd..007b969e0985 100644
--- a/_maps/RandomRuins/JungleRuins/jungle_abandoned_library.dmm
+++ b/_maps/RandomRuins/JungleRuins/jungle_abandoned_library.dmm
@@ -597,7 +597,7 @@
/obj/effect/turf_decal/siding/wood{
dir = 4
},
-/obj/item/book/manual/wiki/medical_cloning{
+/obj/item/book/manual/wiki/medicine{
pixel_x = 14
},
/obj/structure/fluff/paper/stack{
@@ -1305,7 +1305,7 @@
/obj/effect/turf_decal/siding/wood{
dir = 4
},
-/obj/item/book/manual/wiki/engineering_guide{
+/obj/item/book/manual/wiki/engineering{
pixel_x = -6;
pixel_y = 9
},
@@ -1581,7 +1581,7 @@
/obj/effect/turf_decal/siding/wood{
dir = 4
},
-/obj/item/book/manual/wiki/plumbing{
+/obj/item/book/manual/wiki/piloting{
pixel_y = 7;
pixel_x = 5
},
@@ -2058,7 +2058,7 @@
/obj/effect/turf_decal/siding/wood{
dir = 4
},
-/obj/item/book/manual/wiki/telescience{
+/obj/item/book/manual/wiki/surgery{
pixel_y = 11;
pixel_x = -4
},
@@ -2760,7 +2760,7 @@
/obj/effect/turf_decal/siding/wood{
dir = 4
},
-/obj/item/book/manual/wiki/robotics_cyborgs{
+/obj/item/book/manual/wiki/robotics{
pixel_x = -5;
pixel_y = 4
},
@@ -2929,7 +2929,7 @@
/turf/open/floor/wood,
/area/ruin/jungle)
"SN" = (
-/obj/item/book/manual/wiki/research_and_development{
+/obj/item/book/manual/wiki/command{
pixel_y = 5;
pixel_x = -5
},
@@ -2980,7 +2980,7 @@
/turf/closed/mineral/random/jungle,
/area/ruin/jungle)
"TE" = (
-/obj/structure/bookcase/manuals/research_and_development,
+/obj/structure/bookcase/manuals/chemistry,
/turf/open/floor/wood,
/area/ruin/jungle)
"TH" = (
@@ -3254,7 +3254,7 @@
/obj/effect/turf_decal/siding/wood{
dir = 4
},
-/obj/item/book/manual/wiki/infections{
+/obj/item/book/manual/wiki/piloting{
pixel_x = 2;
pixel_y = 10
},
diff --git a/_maps/RandomRuins/JungleRuins/jungle_bombed_starport.dmm b/_maps/RandomRuins/JungleRuins/jungle_bombed_starport.dmm
index c8cd0dfd8964..7f5b18cd2014 100644
--- a/_maps/RandomRuins/JungleRuins/jungle_bombed_starport.dmm
+++ b/_maps/RandomRuins/JungleRuins/jungle_bombed_starport.dmm
@@ -544,7 +544,7 @@
/area/overmap_encounter/planetoid/jungle/explored)
"dZ" = (
/obj/structure/table/wood,
-/obj/item/book/manual/wiki/engineering_guide,
+/obj/item/book/manual/wiki/engineering,
/obj/machinery/light/small/broken/directional/west,
/turf/open/floor/wood,
/area/ruin/jungle/starport)
@@ -1939,7 +1939,7 @@
/area/overmap_encounter/planetoid/jungle/explored)
"nI" = (
/obj/structure/table/wood,
-/obj/item/book/manual/wiki/toxins,
+/obj/item/book/manual/wiki/chemistry,
/obj/machinery/light/small/broken/directional/east,
/turf/open/floor/wood{
icon_state = "wood-broken3"
@@ -4117,10 +4117,10 @@
/area/overmap_encounter/planetoid/jungle/explored)
"Co" = (
/obj/structure/closet,
-/obj/item/clothing/under/syndicate/aclfgrunt,
-/obj/item/clothing/under/syndicate/aclfgrunt,
-/obj/item/clothing/under/syndicate/aclfgrunt,
-/obj/item/clothing/under/syndicate/aclfgrunt,
+/obj/item/clothing/under/syndicate/ngr,
+/obj/item/clothing/under/syndicate/ngr,
+/obj/item/clothing/under/syndicate/ngr,
+/obj/item/clothing/under/syndicate/ngr,
/turf/open/floor/plating{
icon_state = "platingdmg2"
},
@@ -5382,7 +5382,7 @@
},
/area/overmap_encounter/planetoid/jungle/explored)
"Kx" = (
-/obj/item/clothing/under/syndicate/aclfgrunt,
+/obj/item/clothing/under/syndicate/ngr,
/turf/open/floor/plating{
icon_state = "platingdmg3"
},
@@ -5611,8 +5611,8 @@
/area/overmap_encounter/planetoid/jungle/explored)
"LM" = (
/obj/structure/closet,
-/obj/item/clothing/suit/gorlex,
-/obj/item/clothing/under/syndicate/officer,
+/obj/item/clothing/suit/armor/vest/capcarapace/ngr_captain,
+/obj/item/clothing/under/syndicate/ngr/officer,
/obj/item/gun/ballistic/automatic/pistol,
/obj/item/ammo_box/magazine/m10mm,
/obj/item/ammo_box/magazine/m10mm,
@@ -7295,8 +7295,8 @@
"XC" = (
/obj/effect/decal/remains/human,
/obj/effect/decal/cleanable/vomit/old,
-/obj/item/clothing/under/syndicate/officer,
-/obj/item/clothing/suit/gorlex,
+/obj/item/clothing/under/syndicate/ngr/officer,
+/obj/item/clothing/suit/armor/vest/capcarapace/ngr_captain,
/obj/item/clothing/shoes/combat,
/turf/open/floor/mineral/plastitanium,
/area/ruin/jungle/starport/tower)
diff --git a/_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm b/_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm
index afa21c752a75..4242fcba0327 100644
--- a/_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm
+++ b/_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm
@@ -1379,7 +1379,7 @@
/obj/item/gun/ballistic/shotgun/automatic/combat{
pixel_y = 5
},
-/obj/item/gun/ballistic/revolver/nagant{
+/obj/item/gun/ballistic/revolver/ashhand{
pixel_y = -1
},
/turf/open/floor/plasteel/tech,
@@ -1760,13 +1760,12 @@
pixel_x = -3;
pixel_y = -5
},
-/obj/item/ammo_box/n762_clip,
-/obj/item/ammo_box/n762,
+/obj/item/ammo_casing/a4570,
/obj/item/ammo_box/magazine/aks74u,
/obj/item/ammo_box/magazine/aks74u,
/obj/item/ammo_box/magazine/aks74u,
-/obj/item/ammo_box/n762,
-/obj/item/ammo_box/n762_clip,
+/obj/item/ammo_box/magazine/illestren_a850r,
+/obj/item/ammo_box/magazine/illestren_a850r,
/turf/open/floor/plasteel/tech,
/area/ruin/jungle/cavecrew/security)
"vr" = (
@@ -2332,14 +2331,10 @@
dir = 1
},
/obj/effect/turf_decal/siding/wood/corner,
-/obj/item/book/manual/wiki/engineering_guide{
+/obj/item/book/manual/wiki/engineering{
pixel_x = 5;
pixel_y = -7
},
-/obj/item/book/manual/wiki/grenades{
- pixel_x = -3;
- pixel_y = 1
- },
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/wrapping,
/turf/open/floor/wood,
@@ -2818,11 +2813,11 @@
dir = 1
},
/obj/effect/turf_decal/siding/wood,
-/obj/item/book/manual/wiki/engineering_hacking{
+/obj/item/book/manual/wiki/hacking{
pixel_x = -8;
pixel_y = 6
},
-/obj/item/book/manual/wiki/cooking_to_serve_man{
+/obj/item/book/manual/wiki/cooking{
pixel_x = 5;
pixel_y = -6
},
@@ -3782,7 +3777,7 @@
color = "#66b266";
dir = 4
},
-/obj/item/book/manual/wiki/experimentor{
+/obj/item/book/manual/wiki/surgery{
pixel_x = 10;
pixel_y = -5
},
diff --git a/_maps/RandomRuins/JungleRuins/jungle_medtech_outbreak.dmm b/_maps/RandomRuins/JungleRuins/jungle_medtech_outbreak.dmm
index 7aa1aa7bfd2c..720ed17fc830 100644
--- a/_maps/RandomRuins/JungleRuins/jungle_medtech_outbreak.dmm
+++ b/_maps/RandomRuins/JungleRuins/jungle_medtech_outbreak.dmm
@@ -745,7 +745,7 @@
/obj/effect/mob_spawn/human/corpse/assistant{
outfit = /datum/outfit/job/chemist
},
-/obj/item/gun/ballistic/automatic/pistol/m1911/no_mag{
+/obj/item/gun/ballistic/automatic/pistol/candor/no_mag{
pixel_y = -13
},
/turf/open/floor/plating/dirt/jungle/wasteland/lit,
diff --git a/_maps/RandomRuins/JungleRuins/jungle_paradise.dmm b/_maps/RandomRuins/JungleRuins/jungle_paradise.dmm
index cc5902f26a82..5aff7b4501b5 100644
--- a/_maps/RandomRuins/JungleRuins/jungle_paradise.dmm
+++ b/_maps/RandomRuins/JungleRuins/jungle_paradise.dmm
@@ -5802,7 +5802,7 @@
/area/overmap_encounter/planetoid/cave/explored)
"Lv" = (
/obj/structure/table/reinforced,
-/obj/item/book/manual/wiki/tcomms{
+/obj/item/book/manual/wiki/construction{
pixel_x = -7;
pixel_y = 4
},
@@ -6376,10 +6376,6 @@
/obj/item/radio/intercom/directional/south{
name = "Station Intercom (General)"
},
-/obj/item/book/manual/wiki/security_space_law{
- pixel_x = -4;
- pixel_y = 4
- },
/turf/open/floor/mineral/plastitanium/red/brig,
/area/overmap_encounter/planetoid/cave/explored)
"OC" = (
diff --git a/_maps/RandomRuins/JungleRuins/jungle_pirate.dmm b/_maps/RandomRuins/JungleRuins/jungle_pirate.dmm
index 55bb54c7012d..83f17d9f7026 100644
--- a/_maps/RandomRuins/JungleRuins/jungle_pirate.dmm
+++ b/_maps/RandomRuins/JungleRuins/jungle_pirate.dmm
@@ -265,7 +265,7 @@
/turf/open/floor/wood,
/area/ruin/unpowered)
"LD" = (
-/obj/item/ammo_box/n762,
+/obj/item/ammo_box/c45_speedloader,
/obj/structure/table/wood/poker,
/turf/open/floor/wood,
/area/ruin/unpowered)
@@ -313,9 +313,9 @@
/area/ruin/unpowered)
"Sk" = (
/obj/structure/safe,
-/obj/item/gun/ballistic/shotgun/lethal,
-/obj/item/gun/ballistic/shotgun/lethal,
-/obj/item/gun/ballistic/shotgun/lethal,
+/obj/item/gun/ballistic/shotgun/brimstone,
+/obj/item/gun/ballistic/shotgun/brimstone,
+/obj/item/gun/ballistic/shotgun/brimstone,
/obj/item/gun/grenadelauncher,
/turf/open/floor/wood,
/area/ruin/unpowered)
diff --git a/_maps/RandomRuins/JungleRuins/jungle_surface_bombmakers_cabin.dmm b/_maps/RandomRuins/JungleRuins/jungle_surface_bombmakers_cabin.dmm
index 1952fa3e16c8..ca1c8dc0794f 100644
--- a/_maps/RandomRuins/JungleRuins/jungle_surface_bombmakers_cabin.dmm
+++ b/_maps/RandomRuins/JungleRuins/jungle_surface_bombmakers_cabin.dmm
@@ -219,11 +219,6 @@
/area/overmap_encounter/planetoid/jungle/explored)
"wK" = (
/obj/structure/table/wood,
-/obj/item/book/manual/wiki/grenades{
- desc = "Some kind of manual about making hellish grenades and explosives. Completely unreadable, but you feel as though you've gained a level in explosives.";
- name = "Pete's Lesson";
- pixel_y = 3
- },
/turf/open/floor/wood{
icon_state = "wood-broken5"
},
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_codelab.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_codelab.dmm
index 1bbc1b76a834..1ff358a4dd8b 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_surface_codelab.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_codelab.dmm
@@ -545,7 +545,7 @@
/turf/open/floor/plasteel/white,
/area/ruin/unpowered/codelab/storage)
"gz" = (
-/obj/structure/bookcase/manuals/research_and_development,
+/obj/structure/bookcase/manuals/chemistry,
/turf/open/floor/plasteel/white,
/area/ruin/unpowered/codelab/reception)
"gC" = (
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_fuckedupandevilclub.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_fuckedupandevilclub.dmm
index 98488b286f8d..2cffcb4d76bd 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_surface_fuckedupandevilclub.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_fuckedupandevilclub.dmm
@@ -562,7 +562,7 @@
/obj/structure/table/reinforced,
/obj/item/ammo_casing/shotgun/incendiary,
/obj/item/ammo_casing/shotgun/dragonsbreath,
-/obj/item/gun/ballistic/shotgun/lethal,
+/obj/item/gun/ballistic/shotgun/brimstone,
/turf/open/floor/plasteel/cult,
/area/ruin/unpowered)
"OF" = (
diff --git a/_maps/RandomRuins/RockRuins/rockplanet_budgetcuts.dmm b/_maps/RandomRuins/RockRuins/rockplanet_budgetcuts.dmm
index 9cf2b5a40bae..d78e01dbae06 100644
--- a/_maps/RandomRuins/RockRuins/rockplanet_budgetcuts.dmm
+++ b/_maps/RandomRuins/RockRuins/rockplanet_budgetcuts.dmm
@@ -1608,10 +1608,6 @@
/area/ruin/powered)
"AY" = (
/obj/structure/table/wood,
-/obj/item/book/manual/wiki/security_space_law{
- pixel_x = 12;
- pixel_y = 2
- },
/obj/item/flashlight/lamp{
pixel_y = 4
},
@@ -2130,7 +2126,7 @@
pixel_x = 5;
pixel_y = -9
},
-/obj/item/gun/ballistic/automatic/pistol/m1911/no_mag,
+/obj/item/gun/ballistic/automatic/pistol/candor/no_mag,
/obj/machinery/door/firedoor,
/turf/open/floor/plasteel,
/area/ruin/powered)
diff --git a/_maps/RandomRuins/RockRuins/rockplanet_house.dmm b/_maps/RandomRuins/RockRuins/rockplanet_house.dmm
index 275e2b7b1c17..e06f8a456840 100644
--- a/_maps/RandomRuins/RockRuins/rockplanet_house.dmm
+++ b/_maps/RandomRuins/RockRuins/rockplanet_house.dmm
@@ -11,7 +11,7 @@
/area/ruin/unpowered)
"h" = (
/obj/structure/table/wood,
-/obj/item/gun/ballistic/automatic/pistol/m1911,
+/obj/item/gun/ballistic/automatic/pistol/candor,
/obj/item/ammo_box/magazine/m45,
/obj/effect/gibspawner/human/bodypartless,
/obj/item/ammo_box/magazine/m45,
diff --git a/_maps/RandomRuins/RockRuins/rockplanet_miningexpedition.dmm b/_maps/RandomRuins/RockRuins/rockplanet_miningexpedition.dmm
index e4f0f716266c..f617a687b16c 100644
--- a/_maps/RandomRuins/RockRuins/rockplanet_miningexpedition.dmm
+++ b/_maps/RandomRuins/RockRuins/rockplanet_miningexpedition.dmm
@@ -41,6 +41,12 @@
/obj/structure/sign/poster/contraband/tools,
/turf/closed/wall/r_wall/rust,
/area/ruin/unpowered)
+"js" = (
+/obj/item/chair,
+/obj/effect/decal/cleanable/blood,
+/obj/item/gun/ballistic/automatic/pistol/candor,
+/turf/open/floor/plasteel/grimy,
+/area/ruin/unpowered)
"lg" = (
/obj/structure/table,
/obj/machinery/microwave,
@@ -162,6 +168,12 @@
/obj/machinery/vending/mining_equipment,
/turf/open/floor/plasteel/mono,
/area/ruin/unpowered)
+"Cy" = (
+/obj/effect/decal/cleanable/blood,
+/obj/effect/mob_spawn/human/miner,
+/obj/item/pickaxe,
+/turf/open/floor/plating/asteroid/rockplanet/lit,
+/area/overmap_encounter/planetoid/rockplanet/explored)
"CL" = (
/obj/structure/sign/poster/random,
/turf/closed/wall/r_wall/rust,
@@ -262,12 +274,6 @@
},
/turf/open/floor/plasteel/rockvault,
/area/ruin/unpowered)
-"Qo" = (
-/obj/effect/decal/cleanable/blood,
-/obj/effect/mob_spawn/human/miner,
-/obj/item/pickaxe,
-/turf/open/floor/plating/asteroid/rockplanet/lit,
-/area/overmap_encounter/planetoid/rockplanet/explored)
"Qr" = (
/obj/effect/turf_decal/rechargefloor,
/obj/structure/mecha_wreckage/ripley,
@@ -293,12 +299,6 @@
/obj/machinery/light/broken/directional/east,
/turf/open/floor/plasteel/grimy,
/area/ruin/unpowered)
-"TI" = (
-/obj/item/chair,
-/obj/effect/decal/cleanable/blood,
-/obj/item/gun/ballistic/automatic/pistol/m1911,
-/turf/open/floor/plasteel/grimy,
-/area/ruin/unpowered)
"Uu" = (
/obj/machinery/light/broken/directional/north,
/obj/effect/decal/cleanable/oil,
@@ -448,7 +448,7 @@ tN
(5,1,1) = {"
yZ
yZ
-Qo
+Cy
yZ
Vw
YN
@@ -523,7 +523,7 @@ yZ
tN
yZ
Vw
-TI
+js
Wz
Vw
yZ
diff --git a/_maps/RandomRuins/RockRuins/rockplanet_nomadcrash.dmm b/_maps/RandomRuins/RockRuins/rockplanet_nomadcrash.dmm
index 5fee55e35c6d..35c9612a7998 100644
--- a/_maps/RandomRuins/RockRuins/rockplanet_nomadcrash.dmm
+++ b/_maps/RandomRuins/RockRuins/rockplanet_nomadcrash.dmm
@@ -1128,7 +1128,7 @@
/obj/item/ammo_box/magazine/m45{
pixel_x = 7
},
-/obj/item/gun/ballistic/automatic/pistol/m1911/no_mag,
+/obj/item/gun/ballistic/automatic/pistol/candor/no_mag,
/turf/open/floor/plating/ashplanet/rocky,
/area/ruin/rockplanet/nanotrasen)
"HG" = (
diff --git a/_maps/RandomRuins/RockRuins/rockplanet_saloon.dmm b/_maps/RandomRuins/RockRuins/rockplanet_saloon.dmm
index a7af51d9a489..3b597c46f4e4 100644
--- a/_maps/RandomRuins/RockRuins/rockplanet_saloon.dmm
+++ b/_maps/RandomRuins/RockRuins/rockplanet_saloon.dmm
@@ -291,7 +291,7 @@
/area/overmap_encounter/planetoid/rockplanet/explored)
"hj" = (
/obj/structure/table/wood,
-/obj/item/book/manual/wiki/barman_recipes{
+/obj/item/book/manual/wiki/drinks{
pixel_x = -2;
pixel_y = 12
},
@@ -477,7 +477,7 @@
pixel_x = 4;
pixel_y = 6
},
-/obj/item/gun/ballistic/shotgun/riot{
+/obj/item/gun/ballistic/shotgun/hellfire{
pixel_x = -10;
pixel_y = 2
},
diff --git a/_maps/RandomRuins/SandRuins/whitesands_surface_camp_combination.dmm b/_maps/RandomRuins/SandRuins/whitesands_surface_camp_combination.dmm
index aaea1e5ca79d..379e35a7d2f9 100644
--- a/_maps/RandomRuins/SandRuins/whitesands_surface_camp_combination.dmm
+++ b/_maps/RandomRuins/SandRuins/whitesands_surface_camp_combination.dmm
@@ -744,7 +744,7 @@
/area/ruin)
"Df" = (
/obj/structure/table,
-/obj/item/gun/ballistic/rifle/boltaction/polymer,
+/obj/item/gun/ballistic/rifle/polymer,
/turf/open/floor/concrete,
/area/ruin)
"Di" = (
@@ -882,7 +882,7 @@
"Hn" = (
/obj/structure/closet/secure_closet/hydroponics,
/obj/item/circuitboard/machine/plantgenes,
-/obj/item/gun/ballistic/rifle/boltaction/polymer,
+/obj/item/gun/ballistic/rifle/polymer,
/turf/open/floor/wood,
/area/ruin)
"HP" = (
@@ -923,7 +923,7 @@
/area/overmap_encounter/planetoid/sand/explored)
"Ig" = (
/obj/structure/table,
-/obj/item/gun/ballistic/automatic/pistol/m1911,
+/obj/item/gun/ballistic/automatic/pistol/candor,
/turf/open/floor/concrete,
/area/ruin)
"Io" = (
diff --git a/_maps/RandomRuins/SandRuins/whitesands_surface_camp_saloon.dmm b/_maps/RandomRuins/SandRuins/whitesands_surface_camp_saloon.dmm
index 6b6f03797383..673b21cf90ae 100644
--- a/_maps/RandomRuins/SandRuins/whitesands_surface_camp_saloon.dmm
+++ b/_maps/RandomRuins/SandRuins/whitesands_surface_camp_saloon.dmm
@@ -1342,7 +1342,7 @@
/area/ruin/whitesands/saloon)
"Oc" = (
/obj/structure/closet/cabinet,
-/obj/item/gun/ballistic/shotgun/riot,
+/obj/item/gun/ballistic/shotgun/hellfire,
/obj/item/storage/box/rubbershot{
pixel_x = -5;
pixel_y = 5
diff --git a/_maps/RandomRuins/SandRuins/whitesands_surface_pubbyslopcrash.dmm b/_maps/RandomRuins/SandRuins/whitesands_surface_pubbyslopcrash.dmm
index 1cd150e9b8dc..244eef61fa03 100644
--- a/_maps/RandomRuins/SandRuins/whitesands_surface_pubbyslopcrash.dmm
+++ b/_maps/RandomRuins/SandRuins/whitesands_surface_pubbyslopcrash.dmm
@@ -1,156 +1,137 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
-"as" = (
-/obj/machinery/light/directional/north,
-/obj/structure/table/reinforced,
-/obj/machinery/reagentgrinder{
- pixel_x = 6;
- pixel_y = 14
+"ab" = (
+/obj/effect/decal/fakelattice{
+ icon_state = "lattice-141"
},
-/obj/item/reagent_containers/food/snacks/meat/slab/xeno,
-/turf/open/floor/plastic,
-/area/ruin/whitesands/pubbycrash)
+/turf/open/floor/plating/asteroid/whitesands/dried,
+/area/overmap_encounter/planetoid/cave/explored)
+"as" = (
+/obj/machinery/door/airlock/public/glass,
+/turf/open/floor/plasteel,
+/area/ruin/whitesands/pubbycrash/split)
"aR" = (
-/obj/structure/sign/number/one,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/item/stack/ore/salvage/scrapmetal,
-/turf/open/floor/engine,
-/area/ruin/whitesands/pubbycrash)
-"ba" = (
-/obj/machinery/door/airlock/external/glass,
-/obj/effect/turf_decal/industrial/warning{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/layer_manifold,
-/turf/open/floor/plasteel/dark,
-/area/ruin/whitesands/pubbycrash)
-"by" = (
-/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/cable{
- icon_state = "1-2"
+ icon_state = "2-8"
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/pod,
-/area/ruin/whitesands/pubbycrash)
-"bS" = (
-/obj/item/t_scanner/adv_mining_scanner/lesser,
-/obj/item/kinetic_crusher,
-/obj/structure/rack,
-/obj/item/pickaxe/mini,
-/obj/item/pickaxe/mini,
-/obj/effect/turf_decal/siding/brown,
-/obj/item/gun/energy/kinetic_accelerator,
-/obj/machinery/firealarm/directional/south,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel/tech/techmaint,
+/obj/structure/reagent_dispensers/watertank,
+/turf/open/floor/plasteel/tech,
+/area/ruin/whitesands/pubbycrash/engine_room)
+"ba" = (
+/obj/structure/salvageable/computer,
+/obj/item/stack/ore/salvage/scrapgold,
+/turf/open/floor/plasteel/tech,
/area/ruin/whitesands/pubbycrash)
-"bW" = (
+"by" = (
/obj/effect/turf_decal/box,
-/obj/structure/table/reinforced,
-/obj/item/storage/toolbox/mechanical{
- pixel_x = 2;
- pixel_y = -2
- },
-/obj/item/storage/toolbox/mechanical{
- pixel_x = -3;
- pixel_y = 1
- },
-/obj/item/storage/toolbox/electrical{
- pixel_x = 2;
- pixel_y = 3
- },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/railing{
dir = 1
},
/obj/effect/turf_decal/industrial/warning{
dir = 1
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 6
+ },
+/obj/structure/salvageable/computer,
/turf/open/floor/plasteel,
/area/ruin/whitesands/pubbycrash)
+"bS" = (
+/obj/structure/girder/displaced,
+/turf/open/floor/plating/asteroid/whitesands/dried,
+/area/overmap_encounter/planetoid/cave/explored)
+"bW" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/obj/machinery/light/directional/east,
+/obj/effect/gibspawner,
+/obj/item/stack/ore/salvage/scrapmetal/five,
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ruin/whitesands/pubbycrash/engine_room)
"bZ" = (
/turf/open/floor/plating/asteroid/whitesands,
-/area/overmap_encounter/planetoid/sand)
+/area/overmap_encounter/planetoid/sand/explored)
+"ch" = (
+/turf/closed/wall/mineral/titanium,
+/area/ruin/whitesands/pubbycrash/engine_room)
"ck" = (
-/obj/effect/turf_decal/industrial/warning{
- dir = 8
- },
-/obj/effect/turf_decal/industrial/warning{
+/obj/effect/turf_decal/industrial/warning,
+/obj/machinery/button/door{
+ id = "pubbywspodsw";
+ name = "Pod Door Control";
+ pixel_x = -25;
dir = 4
},
-/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/turf/open/floor/plasteel/dark,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/engine,
/area/ruin/whitesands/pubbycrash)
"co" = (
/obj/structure/cable{
icon_state = "4-8"
},
/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/cable{
- icon_state = "1-4"
- },
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel/patterned/grid,
/area/ruin/whitesands/pubbycrash)
"cp" = (
-/obj/effect/turf_decal/spline/fancy/opaque/black,
-/obj/structure/cable{
- icon_state = "0-4"
- },
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel/dark,
-/area/ruin/whitesands/pubbycrash)
+/obj/structure/table,
+/obj/machinery/cell_charger,
+/obj/effect/turf_decal/industrial/warning,
+/turf/open/floor/plasteel/tech,
+/area/ruin/whitesands/pubbycrash/engine_room)
"ct" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/airalarm/directional/south,
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
- dir = 8
+/obj/structure/bed/dogbed{
+ anchored = 1;
+ name = "citrus's bed"
},
-/obj/effect/decal/cleanable/vomit/old,
-/turf/open/floor/plasteel/grimy,
+/obj/effect/turf_decal/spline/fancy/opaque/black{
+ dir = 9
+ },
+/obj/machinery/light/directional/east,
+/turf/open/floor/pod,
/area/ruin/whitesands/pubbycrash)
"cx" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
- dir = 8
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 9
+/obj/structure/cable{
+ icon_state = "4-8"
},
-/obj/item/stack/ore/salvage/scrapmetal,
-/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
+/obj/machinery/firealarm/directional/south,
/turf/open/floor/plasteel/dark,
/area/ruin/whitesands/pubbycrash)
"cN" = (
-/turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ruin/whitesands/pubbycrash)
-"di" = (
-/obj/structure/sink{
- dir = 8;
- pixel_x = 12
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/ash{
+ pixel_x = 6;
+ pixel_y = 8
+ },
+/obj/effect/decal/cleanable/ash{
+ pixel_x = -2;
+ pixel_y = 3
+ },
+/obj/effect/decal/cleanable/ash{
+ pixel_x = -6;
+ pixel_y = 8
+ },
+/turf/open/floor/plating{
+ icon_state = "panelscorched";
+ initial_gas_mix = "ws_atmos"
},
+/area/ruin/whitesands/pubbycrash/split)
+"di" = (
+/obj/effect/turf_decal/box,
+/obj/structure/table/reinforced,
/obj/structure/railing,
-/obj/machinery/airalarm/directional/east,
-/obj/item/stack/sheet/cotton/cloth,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plastic,
+/obj/effect/turf_decal/industrial/warning,
+/turf/open/floor/plasteel,
/area/ruin/whitesands/pubbycrash)
"dm" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/atmospherics/components/binary/pump{
- dir = 8;
- name = "engine fuel pump"
- },
-/obj/effect/spawner/lootdrop/maintenance/two,
-/turf/open/floor/plasteel/tech,
-/area/ruin/whitesands/pubbycrash)
-"dW" = (
-/obj/item/stack/cable_coil/cut/red,
-/obj/item/stack/ore/salvage/scrapgold,
-/turf/open/floor/plating,
-/area/ruin/whitesands/pubbycrash)
-"ek" = (
/obj/effect/turf_decal/industrial/stand_clear,
/obj/effect/turf_decal/industrial/warning,
/obj/machinery/button/door{
@@ -164,434 +145,475 @@
/obj/structure/salvageable/server,
/turf/open/floor/engine,
/area/ruin/whitesands/pubbycrash)
-"eq" = (
-/obj/structure/sign/number/one,
-/obj/effect/decal/cleanable/vomit/old,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/engine,
-/area/ruin/whitesands/pubbycrash)
-"ff" = (
-/obj/structure/railing{
- dir = 4
+"dW" = (
+/obj/structure/cable/yellow{
+ icon_state = "2-4"
},
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/cable{
+/obj/structure/cable/yellow{
icon_state = "1-2"
},
-/obj/machinery/airalarm/directional/west,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel/stairs{
- dir = 1
- },
-/area/ruin/whitesands/pubbycrash)
-"fk" = (
-/obj/structure/table/reinforced,
-/obj/item/storage/fancy/donut_box{
- pixel_y = 2
- },
+/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/turf_decal/industrial/warning{
- dir = 8
- },
-/obj/structure/sign/poster/official/random{
- pixel_y = -32
+ dir = 4
},
-/obj/structure/railing{
+/obj/effect/turf_decal/number/nine{
dir = 4
},
-/obj/machinery/firealarm/directional/east,
-/turf/open/floor/plasteel/dark,
-/area/ruin/whitesands/pubbycrash)
-"fA" = (
-/obj/machinery/light/directional/east,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 9
+/obj/item/stock_parts/cell/hyper,
+/turf/open/floor/plasteel/tech,
+/area/ruin/whitesands/pubbycrash/engine_room)
+"ek" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 8
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 9
},
-/obj/structure/sign/poster/official/random{
- pixel_x = 32
- },
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/item/stack/ore/salvage/scrapmetal,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/dark,
/area/ruin/whitesands/pubbycrash)
-"fO" = (
-/obj/machinery/power/terminal{
+"eq" = (
+/obj/structure/railing{
dir = 8
},
-/obj/structure/cable{
- icon_state = "0-4"
+/obj/item/kirbyplants/random,
+/obj/structure/railing{
+ dir = 4
},
-/obj/effect/spawner/lootdrop/maintenance/two,
-/turf/open/floor/plasteel/tech,
-/area/ruin/whitesands/pubbycrash)
-"fR" = (
-/obj/effect/turf_decal/spline/fancy/opaque/black{
- dir = 1
+/obj/machinery/light/directional/south,
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 1
},
-/obj/machinery/firealarm/directional/west,
-/obj/item/stack/ore/salvage/scraptitanium,
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
+/area/ruin/whitesands/pubbycrash/split)
+"ff" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/stack/ore/salvage/scraptitanium,
+/turf/open/floor/engine,
/area/ruin/whitesands/pubbycrash)
-"fX" = (
-/obj/effect/turf_decal/box/corners{
- dir = 4
+"fk" = (
+/obj/structure/closet/wall/blue{
+ dir = 1;
+ name = "Captain's locker";
+ pixel_y = -28
},
-/obj/item/stack/ore/salvage/scrapmetal/five,
+/obj/item/clothing/suit/space/hardsuit/mining/heavy,
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/engine,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/ash/large,
+/turf/open/floor/plating{
+ icon_state = "panelscorched";
+ initial_gas_mix = "ws_atmos"
+ },
+/area/ruin/whitesands/pubbycrash/split)
+"fr" = (
+/obj/machinery/door/airlock/external/glass,
+/obj/effect/turf_decal/industrial/warning{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/layer_manifold,
+/turf/open/floor/plasteel/dark,
/area/ruin/whitesands/pubbycrash)
-"gg" = (
-/obj/structure/reagent_dispensers/servingdish,
+"fA" = (
+/obj/effect/turf_decal/box,
/obj/structure/table/reinforced,
-/obj/item/kitchen/spoon/plastic{
+/obj/structure/railing{
+ dir = 1
+ },
+/obj/effect/turf_decal/industrial/warning{
+ dir = 1
+ },
+/obj/effect/spawner/lootdrop/maintenance/five,
+/obj/effect/spawner/lootdrop/maintenance/five,
+/turf/open/floor/plasteel,
+/area/ruin/whitesands/pubbycrash)
+"fO" = (
+/obj/item/stack/ore/salvage/scrapmetal/five{
+ pixel_y = -9;
pixel_x = 6
},
-/obj/item/kitchen/spoon/plastic{
- pixel_x = -1
+/turf/open/floor/plating/asteroid/whitesands/lit,
+/area/overmap_encounter/planetoid/sand/explored)
+"fR" = (
+/obj/structure/cable/yellow{
+ icon_state = "0-8"
},
-/obj/item/kitchen/spoon/plastic{
- pixel_x = 13
+/obj/effect/turf_decal/industrial/outline/yellow,
+/obj/machinery/power/port_gen/pacman,
+/turf/open/floor/plasteel/tech,
+/area/ruin/whitesands/pubbycrash/engine_room)
+"fX" = (
+/obj/structure/cable{
+ icon_state = "1-8"
},
-/turf/open/floor/plastic,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 9
+ },
+/obj/effect/decal/cleanable/glass,
+/obj/effect/turf_decal/industrial/warning{
+ dir = 9
+ },
+/obj/structure/salvageable/machine,
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ruin/whitesands/pubbycrash/engine_room)
+"ge" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/ash{
+ pixel_x = 2;
+ pixel_y = -2
+ },
+/obj/effect/decal/cleanable/ash{
+ pixel_y = -3;
+ pixel_x = -6
+ },
+/obj/item/gun/energy/laser/hitscanpistol,
+/turf/open/floor/plating{
+ icon_state = "panelscorched";
+ initial_gas_mix = "ws_atmos"
+ },
+/area/ruin/whitesands/pubbycrash/split)
+"gg" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
+/obj/effect/decal/cleanable/vomit/old,
+/obj/effect/decal/cleanable/vomit/old,
+/obj/item/stack/ore/salvage/scrapmetal,
+/obj/effect/mob_spawn/human/corpse/nanotrasenassaultsoldier,
+/obj/effect/gibspawner,
+/turf/open/floor/plasteel/tech,
/area/ruin/whitesands/pubbycrash)
"gs" = (
/obj/effect/decal/fakelattice{
icon_state = "lattice-8"
},
/turf/open/floor/plating/asteroid/whitesands/lit,
-/area/overmap_encounter/planetoid/sand)
+/area/overmap_encounter/planetoid/sand/explored)
"gu" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/obj/structure/cable{
- icon_state = "4-8"
+ icon_state = "2-4"
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 4
+/obj/structure/cable{
+ icon_state = "1-2"
},
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel/patterned/grid,
-/area/ruin/whitesands/pubbycrash)
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 5
+ },
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ruin/whitesands/pubbycrash/engine_room)
"gx" = (
/obj/effect/decal/fakelattice{
icon_state = "lattice-5"
},
/turf/open/floor/plating/asteroid/whitesands/lit,
-/area/overmap_encounter/planetoid/sand)
+/area/overmap_encounter/planetoid/sand/explored)
"gy" = (
-/obj/effect/turf_decal/box,
-/obj/structure/table/reinforced,
-/obj/structure/railing,
-/obj/effect/turf_decal/industrial/warning,
-/turf/open/floor/plasteel,
-/area/ruin/whitesands/pubbycrash)
+/obj/machinery/power/apc/auto_name/directional/east{
+ start_charge = 0
+ },
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ruin/whitesands/pubbycrash/engine_room)
"gG" = (
+/obj/structure/cable/yellow{
+ icon_state = "2-4"
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/structure/cable{
- icon_state = "4-8"
+/obj/structure/chair{
+ dir = 1
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+/obj/effect/turf_decal/industrial/warning{
dir = 4
},
-/obj/machinery/door/airlock/engineering{
+/obj/effect/turf_decal/number/seven{
dir = 4
},
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel/dark,
-/area/ruin/whitesands/pubbycrash)
+/turf/open/floor/plasteel/tech,
+/area/ruin/whitesands/pubbycrash/engine_room)
"gL" = (
-/obj/effect/turf_decal/box/corners{
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/obj/effect/turf_decal/industrial/outline/orange,
+/obj/machinery/portable_atmospherics/canister/toxins,
+/obj/machinery/atmospherics/components/unary/portables_connector/visible,
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ruin/whitesands/pubbycrash/engine_room)
+"hh" = (
+/turf/closed/mineral/random/whitesands,
+/area/ruin/whitesands/pubbycrash)
+"ho" = (
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
dir = 4
},
+/obj/structure/railing/corner,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/light/small/directional/south,
+/obj/effect/decal/cleanable/garbage,
+/turf/open/floor/plasteel/tech,
+/area/ruin/whitesands/pubbycrash/engine_room)
+"hz" = (
+/obj/effect/turf_decal/industrial/warning{
+ dir = 10
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
+/obj/structure/salvageable/safe_server,
+/turf/open/floor/plasteel/dark,
+/area/ruin/whitesands/pubbycrash)
+"ih" = (
+/obj/effect/turf_decal/spline/fancy/opaque/black,
+/obj/item/stack/ore/salvage/scraptitanium,
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/lootdrop/maintenance,
-/turf/open/floor/engine,
+/turf/open/floor/plasteel/dark,
/area/ruin/whitesands/pubbycrash)
-"hh" = (
-/obj/machinery/door/airlock/external/glass,
+"iw" = (
+/obj/structure/table/reinforced,
+/obj/item/paper_bin,
+/obj/item/pen,
+/obj/effect/decal/cleanable/cobweb/cobweb2,
+/obj/structure/noticeboard{
+ pixel_y = 31
+ },
/obj/effect/turf_decal/industrial/warning{
dir = 8
},
-/obj/effect/turf_decal/industrial/warning{
+/obj/structure/railing{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/turf/open/floor/plasteel/dark,
/area/ruin/whitesands/pubbycrash)
-"ho" = (
+"iW" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/components/binary/pump{
+ dir = 8;
+ name = "engine fuel pump"
+ },
+/obj/effect/spawner/lootdrop/maintenance/two,
+/turf/open/floor/plasteel/tech,
+/area/ruin/whitesands/pubbycrash/engine_room)
+"jt" = (
/obj/structure/cable{
- icon_state = "1-2"
+ icon_state = "0-4"
},
-/obj/machinery/atmospherics/pipe/manifold/orange/hidden{
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
dir = 4
},
-/obj/effect/decal/cleanable/oil,
-/obj/effect/decal/cleanable/vomit/old,
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ruin/whitesands/pubbycrash)
-"hz" = (
-/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/spline/fancy/opaque/black{
+ dir = 6
+ },
+/obj/structure/salvageable/server,
+/turf/open/floor/plasteel/tech,
+/area/ruin/whitesands/pubbycrash/engine_room)
+"jA" = (
+/obj/machinery/firealarm/directional/west,
+/obj/effect/decal/fakelattice{
+ icon_state = "lattice-2"
+ },
+/turf/open/floor/plating/asteroid/whitesands/dried,
+/area/overmap_encounter/planetoid/cave/explored)
+"jF" = (
/obj/structure/railing/corner{
dir = 8
},
-/obj/structure/railing/corner,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/effect/decal/cleanable/vomit/old,
-/turf/open/floor/plasteel/tech,
-/area/ruin/whitesands/pubbycrash)
-"hA" = (
-/obj/structure/closet/wall/red{
- dir = 4;
- name = "Pilots locker";
- pixel_x = -29;
- welded = 1
+/obj/structure/railing{
+ dir = 4
},
-/obj/item/clothing/under/suit/black,
-/obj/item/clothing/under/suit/black,
-/obj/item/clothing/suit/jacket,
-/obj/item/clothing/suit/jacket,
-/obj/item/clothing/head/beret/black,
-/obj/item/clothing/head/beret/black,
/obj/structure/cable{
- icon_state = "1-2"
+ icon_state = "1-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 9
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 1
},
-/obj/item/clothing/under/rank/security/officer/nt,
-/obj/item/clothing/under/rank/security/officer/nt,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel,
-/area/ruin/whitesands/pubbycrash)
-"iw" = (
-/obj/machinery/door/firedoor/border_only{
- dir = 1
- },
-/obj/effect/spawner/structure/window/shuttle,
-/obj/machinery/door/poddoor{
- id = "whiteship_windows"
- },
-/turf/open/floor/plating,
-/area/ruin/whitesands/pubbycrash)
-"iW" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable{
- icon_state = "1-8"
- },
-/obj/structure/catwalk,
-/obj/machinery/atmospherics/pipe/simple/orange/hidden{
- dir = 4
- },
-/turf/open/floor/plating,
-/area/ruin/whitesands/pubbycrash)
-"jt" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/spawner/lootdrop/maintenance/two,
-/turf/open/floor/engine,
-/area/ruin/whitesands/pubbycrash)
-"jA" = (
-/obj/item/trash/cheesie{
- pixel_x = 5;
- pixel_y = 6
- },
-/obj/structure/table/reinforced{
- color = "#c1b6a5"
- },
-/turf/open/floor/plasteel/grimy,
-/area/ruin/whitesands/pubbycrash)
-"jF" = (
-/obj/item/stack/ore/salvage/scraptitanium,
-/turf/open/floor/plating,
-/area/ruin/whitesands/pubbycrash)
+/area/ruin/whitesands/pubbycrash/split)
"jG" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/turf_decal/ntspaceworks_small/left{
- dir = 4
- },
-/mob/living/simple_animal/hostile/asteroid/whitesands/survivor{
- dir = 4;
- faction = list("saloon")
- },
-/turf/open/floor/plasteel/tech,
-/area/ruin/whitesands/pubbycrash)
+/obj/machinery/atmospherics/components/unary/outlet_injector/on/layer4,
+/turf/open/floor/engine/hull,
+/area/ruin/whitesands/pubbycrash/engine_room)
"kp" = (
/obj/structure/girder/displaced,
/turf/open/floor/plating/asteroid/whitesands/lit,
-/area/overmap_encounter/planetoid/sand)
+/area/overmap_encounter/planetoid/sand/explored)
"kA" = (
-/obj/item/reagent_containers/food/drinks/britcup{
- pixel_x = 9;
- pixel_y = -3
- },
-/obj/item/trash/pistachios{
- pixel_y = 5
- },
-/obj/structure/table/reinforced{
- color = "#c1b6a5"
+/obj/structure/railing/corner,
+/obj/effect/decal/fakelattice{
+ icon_state = "lattice-23"
},
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel/grimy,
-/area/ruin/whitesands/pubbycrash)
+/turf/open/floor/plating/asteroid/whitesands/dried,
+/area/overmap_encounter/planetoid/cave/explored)
"kM" = (
-/obj/structure/table/reinforced,
-/obj/machinery/power/apc/auto_name/directional/north{
- start_charge = 0
- },
+/obj/machinery/holopad,
+/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/cable{
- icon_state = "0-2"
- },
-/obj/item/flashlight/lamp{
- pixel_x = -6;
- pixel_y = 8
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/railing{
- dir = 8
+ icon_state = "2-8"
},
-/obj/item/photo{
- pixel_y = -12
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 10
},
-/obj/item/toy/figure/captain{
- pixel_x = 7;
- pixel_y = 12
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 6
},
-/obj/machinery/airalarm/directional/west,
-/obj/item/stack/ore/salvage/scrapmetal,
-/turf/open/floor/plasteel/tech,
+/turf/open/floor/plasteel/grimy,
/area/ruin/whitesands/pubbycrash)
"kP" = (
-/obj/machinery/atmospherics/pipe/simple/orange/hidden{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/cable/yellow,
-/obj/effect/spawner/lootdrop/maintenance/two,
-/turf/open/floor/plasteel/tech,
-/area/ruin/whitesands/pubbycrash)
+/obj/item/stack/cable_coil/cut/red,
+/obj/item/stack/ore/salvage/scrapgold,
+/obj/item/stack/ore/salvage/scrapgold,
+/obj/item/stack/ore/salvage/scrapmetal/five,
+/turf/open/floor/plating,
+/area/ruin/whitesands/pubbycrash/engine_room)
"kU" = (
/obj/structure/cable{
- icon_state = "1-8"
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 4
+ icon_state = "4-8"
},
-/turf/open/floor/plasteel/stairs{
- dir = 8
+/obj/structure/cable{
+ icon_state = "1-4"
},
+/obj/machinery/light/directional/south,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/dark,
/area/ruin/whitesands/pubbycrash)
"ln" = (
-/obj/structure/cable/yellow{
- icon_state = "0-8"
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/closet/emcloset/wall{
+ dir = 1;
+ pixel_y = -28
},
-/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/structure/salvageable/machine,
-/turf/open/floor/plasteel/tech,
-/area/ruin/whitesands/pubbycrash)
+/obj/effect/spawner/lootdrop/maintenance/two,
+/turf/open/floor/plasteel/tech/grid,
+/area/ruin/whitesands/pubbycrash/engine_room)
"ly" = (
-/obj/machinery/door/airlock/hatch,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel/showroomfloor,
-/area/ruin/whitesands/pubbycrash)
-"lA" = (
-/obj/structure/table/reinforced,
-/obj/item/laser_pointer,
-/obj/item/radio/off{
- pixel_x = 6;
- pixel_y = 14
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/spline/fancy/opaque/black{
+ dir = 1
},
+/obj/effect/gibspawner,
/turf/open/floor/plasteel/dark,
/area/ruin/whitesands/pubbycrash)
-"lB" = (
+"lA" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
/obj/structure/cable{
icon_state = "4-8"
},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
+/turf/open/floor/plasteel/dark,
+/area/ruin/whitesands/pubbycrash)
+"lB" = (
/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/railing{
- dir = 8
+/obj/machinery/atmospherics/components/binary/pump{
+ dir = 8;
+ name = "engine fuel pump"
},
-/obj/structure/catwalk,
-/obj/machinery/atmospherics/pipe/simple/orange/hidden{
- dir = 4
+/obj/machinery/light/small/directional/north,
+/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/item/stack/sheet/mineral/wood/fifty,
+/obj/structure/closet/crate,
+/turf/open/floor/plasteel/tech,
+/area/ruin/whitesands/pubbycrash/engine_room)
+"lI" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/ash,
+/turf/open/floor/plating{
+ icon_state = "panelscorched";
+ initial_gas_mix = "ws_atmos"
},
-/turf/open/floor/plating,
-/area/ruin/whitesands/pubbycrash)
+/area/ruin/whitesands/pubbycrash/split)
"lK" = (
-/obj/effect/turf_decal/box,
-/obj/structure/railing,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/industrial/warning,
-/obj/structure/salvageable/autolathe,
-/turf/open/floor/plasteel,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/spline/fancy/opaque/black,
+/turf/open/floor/plasteel/dark,
/area/ruin/whitesands/pubbycrash)
"lR" = (
/obj/effect/decal/fakelattice{
icon_state = "lattice-46"
},
/turf/open/floor/plating/asteroid/whitesands/lit,
-/area/overmap_encounter/planetoid/sand)
+/area/overmap_encounter/planetoid/sand/explored)
"mp" = (
-/obj/effect/decal/fakelattice{
- icon_state = "lattice-3"
+/obj/effect/turf_decal/box/corners{
+ dir = 4
},
-/turf/open/floor/plating/asteroid/whitesands/lit,
-/area/overmap_encounter/planetoid/sand)
+/obj/item/stack/ore/salvage/scrapmetal/five,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/engine,
+/area/ruin/whitesands/pubbycrash)
"mH" = (
-/turf/open/floor/plating,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light/directional/east,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 10
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 10
+ },
+/turf/open/floor/plasteel/dark,
/area/ruin/whitesands/pubbycrash)
"mU" = (
+/obj/structure/railing,
/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/ash{
- pixel_x = 2;
- pixel_y = -2
+/obj/effect/decal/cleanable/vomit/old,
+/obj/effect/mob_spawn/human/corpse/damaged/whitesands/survivor,
+/turf/open/floor/plastic,
+/area/ruin/whitesands/pubbycrash/split)
+"mW" = (
+/obj/item/stack/ore/salvage/scrapmetal/five{
+ pixel_y = -12;
+ pixel_x = 5
},
-/obj/effect/decal/cleanable/ash{
- pixel_y = -3;
- pixel_x = -6
+/obj/effect/decal/fakelattice{
+ icon_state = "lattice-4"
},
-/obj/item/gun/energy/laser/hitscanpistol,
+/turf/open/floor/plating/asteroid/whitesands/lit,
+/area/overmap_encounter/planetoid/sand/explored)
+"no" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/ash/large,
/turf/open/floor/plating{
icon_state = "panelscorched";
initial_gas_mix = "ws_atmos"
},
-/area/ruin/whitesands/pubbycrash)
-"mW" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
- },
-/obj/effect/turf_decal/industrial/hatch/yellow,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/obj/machinery/door/airlock/external{
- dir = 4
- },
-/turf/open/floor/plasteel/tech/grid,
-/area/ruin/whitesands/pubbycrash)
+/area/ruin/whitesands/pubbycrash/split)
"nq" = (
/obj/effect/decal/fakelattice{
icon_state = "lattice-55"
},
/turf/open/floor/plating/asteroid/whitesands/lit,
-/area/overmap_encounter/planetoid/sand)
+/area/overmap_encounter/planetoid/sand/explored)
"nG" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
@@ -599,128 +621,113 @@
icon_state = "4-8"
},
/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
-/obj/machinery/firealarm/directional/south,
+/obj/effect/decal/cleanable/wrapping,
+/obj/effect/decal/cleanable/plastic,
/turf/open/floor/plasteel/dark,
/area/ruin/whitesands/pubbycrash)
"nP" = (
-/obj/structure/railing{
- dir = 8
- },
-/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/effect/turf_decal/industrial/warning{
- dir = 8
- },
-/obj/machinery/suit_storage_unit/open,
-/turf/open/floor/plasteel/dark,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/spawner/lootdrop/maintenance/two,
+/turf/open/floor/engine,
/area/ruin/whitesands/pubbycrash)
"nQ" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
- dir = 1
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
},
-/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/patterned/grid,
/area/ruin/whitesands/pubbycrash)
-"oo" = (
+"oj" = (
/obj/effect/decal/cleanable/dirt,
-/obj/structure/closet/emcloset/wall{
+/obj/effect/decal/cleanable/ash{
+ pixel_x = 2;
+ pixel_y = -2
+ },
+/obj/effect/decal/cleanable/ash{
+ pixel_y = -2;
+ pixel_x = 5
+ },
+/turf/open/floor/plating{
+ icon_state = "panelscorched";
+ initial_gas_mix = "ws_atmos"
+ },
+/area/ruin/whitesands/pubbycrash/split)
+"oo" = (
+/obj/structure/closet/wall/white{
dir = 1;
- pixel_y = -28
+ name = "Medicine storage";
+ pixel_y = -30
},
-/obj/effect/spawner/lootdrop/maintenance/two,
-/turf/open/floor/plasteel/tech/grid,
+/obj/item/storage/firstaid/ancient{
+ pixel_x = 6;
+ pixel_y = -5
+ },
+/obj/item/storage/firstaid/medical,
+/obj/structure/sign/poster/official/random{
+ pixel_x = 32
+ },
+/turf/open/floor/pod,
/area/ruin/whitesands/pubbycrash)
"oq" = (
+/obj/effect/turf_decal/box/corners{
+ dir = 1
+ },
+/obj/item/stack/ore/salvage/scrapmetal,
/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/engine,
/area/ruin/whitesands/pubbycrash)
"oO" = (
-/obj/effect/decal/fakelattice,
-/turf/open/floor/plating/asteroid/whitesands/lit,
-/area/overmap_encounter/planetoid/sand)
-"oS" = (
-/obj/structure/cable{
- icon_state = "4-8"
+/obj/structure/table/reinforced,
+/obj/item/laser_pointer,
+/obj/item/radio/off{
+ pixel_x = 6;
+ pixel_y = 14
},
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel/tech,
+/turf/open/floor/plasteel/dark,
/area/ruin/whitesands/pubbycrash)
+"oS" = (
+/obj/effect/decal/fakelattice{
+ icon_state = "lattice-55"
+ },
+/turf/open/floor/plating/asteroid/whitesands/dried,
+/area/overmap_encounter/planetoid/cave/explored)
"pe" = (
-/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden,
-/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 9
- },
-/obj/structure/railing{
dir = 8
},
-/obj/structure/catwalk,
-/obj/effect/turf_decal/spline/fancy/opaque/black{
- dir = 8
- },
-/obj/item/stock_parts/cell/hyper{
- pixel_x = 5;
- pixel_y = 4
- },
-/obj/item/stack/ore/salvage/scrapmetal/five{
- pixel_x = -9
- },
-/turf/open/floor/plating,
-/area/ruin/whitesands/pubbycrash)
-"pu" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 4
- },
+/obj/effect/turf_decal/industrial/hatch/yellow,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/effect/turf_decal/industrial/warning{
- dir = 8
- },
-/obj/effect/turf_decal/ntspaceworks_small/right{
+/obj/machinery/door/airlock/external{
dir = 4
},
-/obj/effect/decal/cleanable/vomit/old,
-/obj/effect/mob_spawn/human/corpse/nanotrasensoldier,
-/obj/item/storage/box/stockparts/basic{
- pixel_x = -3;
- pixel_y = 4
+/turf/open/floor/plasteel/tech/grid,
+/area/ruin/whitesands/pubbycrash/engine_room)
+"pu" = (
+/obj/effect/decal/fakelattice{
+ icon_state = "lattice-139"
},
-/turf/open/floor/plasteel/tech,
-/area/ruin/whitesands/pubbycrash)
+/turf/open/floor/plating/asteroid/whitesands/dried,
+/area/overmap_encounter/planetoid/cave/explored)
"pE" = (
+/obj/effect/decal/cleanable/dirt,
/obj/structure/railing/corner{
dir = 8
},
-/obj/structure/railing{
- dir = 4
- },
-/obj/structure/cable{
- icon_state = "1-8"
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 9
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 1
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
+/obj/structure/railing/corner,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/effect/decal/cleanable/vomit/old,
+/turf/open/floor/plasteel/tech,
/area/ruin/whitesands/pubbycrash)
"pG" = (
-/obj/machinery/firealarm/directional/west,
-/turf/closed/mineral/random/whitesands,
-/area/overmap_encounter/planetoid/cave/explored)
-"pR" = (
/obj/effect/turf_decal/industrial/stand_clear,
/obj/effect/turf_decal/industrial/warning{
dir = 1
@@ -730,73 +737,75 @@
/obj/structure/salvageable/server,
/turf/open/floor/engine,
/area/ruin/whitesands/pubbycrash)
-"pT" = (
-/obj/effect/turf_decal/box,
-/obj/structure/table/reinforced,
-/obj/structure/railing{
- dir = 1
+"pR" = (
+/obj/machinery/door/airlock/external/glass,
+/obj/effect/turf_decal/industrial/warning{
+ dir = 8
},
/obj/effect/turf_decal/industrial/warning{
- dir = 1
+ dir = 4
},
-/obj/effect/spawner/lootdrop/maintenance/five,
-/obj/effect/spawner/lootdrop/maintenance/five,
-/turf/open/floor/plasteel,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/plasteel/dark,
/area/ruin/whitesands/pubbycrash)
-"qz" = (
-/obj/structure/window/reinforced{
+"pT" = (
+/obj/effect/turf_decal/industrial/caution,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/railing/corner{
dir = 8
},
-/obj/machinery/door/window/northleft{
- dir = 4;
- name = "Engine Access"
- },
-/obj/structure/cable{
- icon_state = "0-8"
+/obj/structure/catwalk,
+/obj/machinery/button/door{
+ id = "whiteshipubbyEngines";
+ name = "Engine Lockdown Control";
+ pixel_x = -25;
+ dir = 4
},
-/obj/structure/frame/machine,
-/obj/item/stack/cable_coil/cut/red,
-/obj/item/circuitboard/machine/shuttle/smes,
+/obj/structure/salvageable/circuit_imprinter,
/turf/open/floor/plating,
-/area/ruin/whitesands/pubbycrash)
+/area/ruin/whitesands/pubbycrash/engine_room)
+"qz" = (
+/obj/structure/railing/corner{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ruin/whitesands/pubbycrash/engine_room)
"qN" = (
/obj/effect/decal/fakelattice{
icon_state = "lattice-74"
},
/turf/open/floor/plating/asteroid/whitesands/lit,
-/area/overmap_encounter/planetoid/sand)
+/area/overmap_encounter/planetoid/sand/explored)
"re" = (
-/obj/machinery/shower{
- dir = 1
+/obj/machinery/power/terminal{
+ dir = 8
},
-/obj/structure/railing/corner{
- dir = 1
+/obj/structure/cable{
+ icon_state = "0-4"
},
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ruin/whitesands/pubbycrash)
+/obj/effect/spawner/lootdrop/maintenance/two,
+/turf/open/floor/plasteel/tech,
+/area/ruin/whitesands/pubbycrash/engine_room)
"rT" = (
+/obj/effect/turf_decal/industrial/outline/yellow,
+/obj/effect/turf_decal/siding/brown,
/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/ash/large,
-/turf/open/floor/plating{
- icon_state = "panelscorched";
- initial_gas_mix = "ws_atmos"
- },
-/area/ruin/whitesands/pubbycrash)
+/obj/machinery/suit_storage_unit/open,
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ruin/whitesands/pubbycrash/split)
"rW" = (
-/obj/structure/cable{
- icon_state = "2-8"
- },
-/obj/structure/reagent_dispensers/watertank,
-/turf/open/floor/plasteel/tech,
-/area/ruin/whitesands/pubbycrash)
+/obj/item/stack/cable_coil/cut/red,
+/obj/item/stack/ore/salvage/scrapgold,
+/turf/open/floor/plating,
+/area/ruin/whitesands/pubbycrash/engine_room)
"rZ" = (
-/obj/structure/chair/office/light{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/turf/open/floor/plasteel/grimy,
+/obj/machinery/door/airlock/hatch,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/showroomfloor,
/area/ruin/whitesands/pubbycrash)
"sd" = (
/obj/effect/decal/fakelattice{
@@ -809,100 +818,77 @@
},
/obj/effect/decal/cleanable/vomit,
/turf/open/floor/plating/asteroid/whitesands/lit,
-/area/overmap_encounter/planetoid/sand)
+/area/overmap_encounter/planetoid/sand/explored)
"so" = (
-/obj/effect/turf_decal/industrial/caution,
-/obj/structure/railing/corner{
- dir = 8
- },
-/obj/structure/railing/corner{
- dir = 1
- },
-/obj/structure/catwalk,
-/obj/structure/sign/poster/retro/nanotrasen_logo_70s{
- pixel_x = -32
- },
-/obj/effect/spawner/lootdrop/maintenance/two,
-/turf/open/floor/plating,
-/area/ruin/whitesands/pubbycrash)
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/ruin/whitesands/pubbycrash/engine_room)
"ss" = (
-/obj/machinery/light/directional/west,
+/obj/machinery/door/airlock/glass,
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/structure/table/reinforced,
-/obj/item/paper_bin{
- pixel_x = -4
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/plasteel/dark,
+/area/ruin/whitesands/pubbycrash)
+"sA" = (
+/obj/effect/decal/fakelattice{
+ icon_state = "lattice-2"
},
-/obj/item/folder/blue{
- pixel_x = 3;
- pixel_y = 2
- },
-/obj/item/folder/white,
-/obj/item/pen,
-/obj/structure/railing{
- dir = 8
- },
-/obj/item/stamp/captain{
- pixel_x = -6;
- pixel_y = 8
- },
-/obj/item/spacecash/bundle/c1000{
- pixel_x = 2;
- pixel_y = -14
- },
-/obj/item/spacecash/bundle/c1000{
- pixel_x = 2;
- pixel_y = -14
- },
-/obj/item/spacecash/bundle/c1000{
- pixel_x = 4;
- pixel_y = -16
- },
-/turf/open/floor/plasteel/tech,
-/area/ruin/whitesands/pubbycrash)
-"sA" = (
-/obj/structure/sign/nanotrasen,
-/turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ruin/whitesands/pubbycrash)
+/turf/open/floor/plating/asteroid/whitesands/dried,
+/area/overmap_encounter/planetoid/cave/explored)
"sC" = (
/obj/structure/cable{
icon_state = "4-8"
},
+/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/cable{
icon_state = "1-4"
},
-/obj/machinery/light/directional/south,
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
-/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/dark,
/area/ruin/whitesands/pubbycrash)
"sD" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/ash,
-/obj/effect/decal/cleanable/ash{
- pixel_y = -3;
- pixel_x = -6
+/obj/structure/railing/corner{
+ dir = 4
},
-/turf/open/floor/plating{
- icon_state = "panelscorched";
- initial_gas_mix = "ws_atmos"
+/obj/effect/turf_decal/siding/brown{
+ dir = 1
},
-/area/ruin/whitesands/pubbycrash)
-"sV" = (
-/obj/machinery/atmospherics/pipe/simple/orange/hidden{
- dir = 4
+/obj/structure/closet/wall{
+ icon_door = "orange_wall";
+ name = "Mining equipment";
+ pixel_y = 28
},
+/obj/item/clothing/glasses/meson,
+/obj/item/clothing/glasses/meson,
+/obj/item/storage/bag/ore,
+/obj/item/storage/bag/ore,
+/obj/item/clothing/suit/hazardvest,
+/obj/item/clothing/suit/hazardvest,
/obj/structure/cable{
- icon_state = "1-4"
+ icon_state = "0-4"
},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
- dir = 4
+/obj/effect/decal/cleanable/cobweb,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/power/apc/auto_name/directional/west{
+ start_charge = 0
},
-/obj/structure/railing,
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ruin/whitesands/pubbycrash/split)
+"sV" = (
+/obj/structure/frame/machine,
+/obj/item/circuitboard/machine/shuttle/engine/plasma,
+/obj/item/stack/cable_coil/cut/red,
+/turf/open/floor/plating,
+/area/ruin/whitesands/pubbycrash/engine_room)
+"tB" = (
+/obj/structure/sign/number/one,
/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel/tech,
+/obj/item/stack/ore/salvage/scrapmetal,
+/turf/open/floor/engine,
/area/ruin/whitesands/pubbycrash)
"uh" = (
/obj/effect/decal/cleanable/dirt,
@@ -912,329 +898,320 @@
},
/area/ruin/whitesands/pubbycrash)
"ul" = (
-/mob/living/simple_animal/hostile/asteroid/whitesands/ranged,
-/turf/open/floor/plating/asteroid/whitesands/lit,
-/area/overmap_encounter/planetoid/sand)
+/turf/open/floor/plating,
+/area/ruin/whitesands/pubbycrash)
"up" = (
-/obj/effect/turf_decal/box/corners{
- dir = 1
+/obj/structure/cable{
+ icon_state = "4-8"
},
-/obj/item/stack/ore/salvage/scrapmetal,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/engine,
-/area/ruin/whitesands/pubbycrash)
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/railing{
+ dir = 8
+ },
+/obj/structure/catwalk,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/ruin/whitesands/pubbycrash/engine_room)
"uB" = (
+/obj/effect/turf_decal/siding/brown,
+/obj/effect/turf_decal/spline/fancy/opaque/black{
+ dir = 5
+ },
+/obj/effect/turf_decal/industrial/outline/yellow,
/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/ash,
-/obj/effect/decal/cleanable/ash{
- pixel_x = -6;
- pixel_y = 8
+/obj/machinery/suit_storage_unit/open,
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ruin/whitesands/pubbycrash/split)
+"vc" = (
+/obj/machinery/portable_atmospherics/canister/air,
+/obj/structure/sign/poster/official/random{
+ pixel_y = -32
},
-/turf/open/floor/plating{
- icon_state = "panelscorched";
- initial_gas_mix = "ws_atmos"
+/obj/effect/turf_decal/industrial/warning{
+ dir = 10
},
-/area/ruin/whitesands/pubbycrash)
-"vc" = (
-/obj/effect/turf_decal/box/corners,
-/obj/effect/decal/cleanable/dirt,
-/obj/item/stack/ore/salvage/scraptitanium,
-/turf/open/floor/engine,
-/area/ruin/whitesands/pubbycrash)
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ruin/whitesands/pubbycrash/engine_room)
"vw" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/turf_decal/spline/fancy/opaque/black{
- dir = 1
+/obj/effect/turf_decal/box/corners{
+ dir = 4
},
-/obj/effect/gibspawner,
-/turf/open/floor/plasteel/dark,
-/area/ruin/whitesands/pubbycrash)
-"vL" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on,
/obj/effect/decal/cleanable/dirt,
-/obj/item/stack/ore/salvage/scraptitanium,
+/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/engine,
/area/ruin/whitesands/pubbycrash)
-"vO" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/ash{
- pixel_x = 6;
- pixel_y = 8
+"vL" = (
+/obj/effect/spawner/structure/window/shuttle,
+/obj/machinery/door/poddoor{
+ dir = 4;
+ id = "whiteship_windows"
},
-/obj/effect/decal/cleanable/ash{
- pixel_x = -2;
- pixel_y = 3
+/turf/open/floor/plating,
+/area/ruin/whitesands/pubbycrash/engine_room)
+"vO" = (
+/obj/structure/railing{
+ dir = 1
},
-/obj/effect/decal/cleanable/ash{
- pixel_x = -6;
- pixel_y = 8
+/obj/effect/turf_decal/siding/brown{
+ dir = 1
},
-/turf/open/floor/plating{
- icon_state = "panelscorched";
- initial_gas_mix = "ws_atmos"
+/obj/structure/cable{
+ icon_state = "4-8"
},
-/area/ruin/whitesands/pubbycrash)
-"vX" = (
-/obj/item/radio/intercom/directional/west,
-/obj/structure/chair/office/light{
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
dir = 4
},
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
-/turf/open/floor/plasteel/grimy,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ruin/whitesands/pubbycrash/split)
+"vX" = (
+/turf/closed/wall/mineral/titanium/nodiagonal,
/area/ruin/whitesands/pubbycrash)
"wn" = (
-/obj/effect/turf_decal/siding/brown,
-/obj/effect/turf_decal/spline/fancy/opaque/black{
- dir = 5
+/obj/machinery/light/directional/east,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 9
},
-/obj/effect/turf_decal/industrial/outline/yellow,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 9
+ },
+/obj/structure/sign/poster/official/random{
+ pixel_x = 32
+ },
+/obj/effect/spawner/lootdrop/maintenance/two,
/obj/effect/decal/cleanable/dirt,
-/obj/machinery/suit_storage_unit/open,
-/turf/open/floor/plasteel/tech/techmaint,
+/turf/open/floor/plasteel/dark,
/area/ruin/whitesands/pubbycrash)
"wL" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
- dir = 1
- },
/obj/effect/decal/cleanable/dirt,
-/obj/structure/closet/wall/red{
- dir = 8;
- name = "Firearm Locker";
- pixel_x = 29;
- welded = 1
- },
/obj/effect/turf_decal/spline/fancy/opaque/black{
dir = 1
},
-/obj/item/gun/ballistic/automatic/pistol/commander,
-/obj/item/gun/ballistic/automatic/pistol/commander,
-/obj/item/ammo_box/magazine/co9mm,
-/obj/item/ammo_box/magazine/co9mm,
-/obj/item/ammo_box/magazine/co9mm,
-/obj/item/ammo_box/magazine/co9mm,
+/obj/effect/decal/cleanable/vomit/old,
/turf/open/floor/plasteel/dark,
/area/ruin/whitesands/pubbycrash)
"wV" = (
-/obj/structure/railing{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 5
+/obj/machinery/door/firedoor/border_only{
+ dir = 1
},
-/obj/structure/catwalk,
-/obj/effect/turf_decal/spline/fancy/opaque/black{
- dir = 8
+/obj/effect/spawner/structure/window/shuttle,
+/obj/machinery/door/poddoor{
+ id = "whiteship_windows"
},
/turf/open/floor/plating,
/area/ruin/whitesands/pubbycrash)
"xa" = (
-/obj/structure/cable{
- icon_state = "1-8"
- },
/obj/machinery/atmospherics/pipe/simple/orange/hidden{
- dir = 9
- },
-/obj/effect/decal/cleanable/glass,
-/obj/effect/turf_decal/industrial/warning{
- dir = 9
+ dir = 4
},
-/obj/structure/salvageable/machine,
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ruin/whitesands/pubbycrash)
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/gibspawner,
+/turf/open/floor/plasteel/tech,
+/area/ruin/whitesands/pubbycrash/engine_room)
"xc" = (
/mob/living/simple_animal/hostile/asteroid/whitesands/survivor{
dir = 4
},
/turf/open/floor/plating/asteroid/whitesands/lit,
-/area/overmap_encounter/planetoid/sand)
+/area/overmap_encounter/planetoid/sand/explored)
"xy" = (
-/obj/structure/cable{
- icon_state = "4-8"
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
},
/obj/structure/cable{
- icon_state = "2-4"
+ icon_state = "4-8"
},
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+/obj/machinery/door/airlock/grunge{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/door/firedoor/border_only{
dir = 4
},
-/turf/open/floor/plasteel/dark,
-/area/ruin/whitesands/pubbycrash)
-"xA" = (
-/obj/effect/turf_decal/industrial/warning/corner{
+/obj/machinery/door/firedoor/border_only{
dir = 8
},
-/obj/structure/salvageable/computer,
-/turf/open/floor/plasteel/tech,
+/turf/open/floor/plasteel/dark,
/area/ruin/whitesands/pubbycrash)
-"yj" = (
+"xz" = (
+/obj/effect/turf_decal/box,
/obj/structure/table/reinforced,
-/obj/item/paper_bin,
-/obj/item/pen,
-/obj/effect/decal/cleanable/cobweb/cobweb2,
-/obj/structure/noticeboard{
- pixel_y = 31
+/obj/item/storage/toolbox/mechanical{
+ pixel_x = 2;
+ pixel_y = -2
},
-/obj/effect/turf_decal/industrial/warning{
- dir = 8
+/obj/item/storage/toolbox/mechanical{
+ pixel_x = -3;
+ pixel_y = 1
+ },
+/obj/item/storage/toolbox/electrical{
+ pixel_x = 2;
+ pixel_y = 3
},
/obj/structure/railing{
- dir = 4
+ dir = 1
},
-/turf/open/floor/plasteel/dark,
+/obj/effect/turf_decal/industrial/warning{
+ dir = 1
+ },
+/turf/open/floor/plasteel,
/area/ruin/whitesands/pubbycrash)
+"xA" = (
+/turf/open/floor/plating{
+ icon_state = "panelscorched";
+ initial_gas_mix = "ws_atmos"
+ },
+/area/ruin/whitesands/pubbycrash)
+"xH" = (
+/obj/structure/table,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/industrial/warning/corner,
+/obj/effect/spawner/lootdrop/maintenance/two,
+/turf/open/floor/plasteel/tech,
+/area/ruin/whitesands/pubbycrash/engine_room)
+"xX" = (
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/ruin/whitesands/pubbycrash/engine_room)
+"yj" = (
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+ dir = 4
+ },
+/obj/structure/railing,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/tech,
+/area/ruin/whitesands/pubbycrash/engine_room)
"ym" = (
-/obj/effect/gibspawner,
-/turf/open/floor/plating/asteroid/whitesands/lit,
-/area/overmap_encounter/planetoid/sand)
+/obj/item/stack/ore/salvage/scraptitanium,
+/turf/open/floor/plating/asteroid/whitesands/dried,
+/area/overmap_encounter/planetoid/cave/explored)
"yt" = (
/obj/effect/decal/fakelattice{
icon_state = "lattice-141"
},
/turf/open/floor/plating/asteroid/whitesands/lit,
-/area/overmap_encounter/planetoid/sand)
+/area/overmap_encounter/planetoid/sand/explored)
"yx" = (
-/obj/structure/railing/corner,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 1
- },
-/mob/living/simple_animal/hostile/asteroid/whitesands/survivor{
- dir = 4;
- faction = list("adobe");
- desc = " A wild-eyed figure, wearing tattered mining equipment and boasting a malformed body, twisted by the heavy metals and high background radiation of the sandworlds. Their helmet also seems to be filled with vomit"
- },
-/obj/effect/decal/cleanable/vomit,
-/turf/open/floor/plasteel,
-/area/ruin/whitesands/pubbycrash)
+/obj/effect/decal/fakelattice,
+/turf/open/floor/plating/asteroid/whitesands/dried,
+/area/overmap_encounter/planetoid/cave/explored)
"yK" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/machinery/door/airlock/grunge{
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 4
},
/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/door/firedoor/border_only{
- dir = 4
- },
-/obj/machinery/door/firedoor/border_only{
- dir = 8
- },
-/turf/open/floor/plasteel/dark,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/patterned/grid,
/area/ruin/whitesands/pubbycrash)
"yU" = (
-/obj/machinery/atmospherics/pipe/simple/orange/hidden{
- dir = 4
+/obj/effect/decal/fakelattice{
+ icon_state = "lattice-46"
},
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/gibspawner,
-/turf/open/floor/plasteel/tech,
-/area/ruin/whitesands/pubbycrash)
+/turf/open/floor/plating/asteroid/whitesands/dried,
+/area/overmap_encounter/planetoid/cave/explored)
"zi" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/light/directional/east,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 10
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 10
- },
-/turf/open/floor/plasteel/dark,
+/obj/effect/turf_decal/box,
+/obj/structure/table/reinforced,
+/obj/item/storage/belt/utility,
+/obj/item/storage/belt/utility,
+/obj/item/multitool,
+/obj/structure/railing,
+/obj/effect/turf_decal/industrial/warning,
+/turf/open/floor/plasteel,
/area/ruin/whitesands/pubbycrash)
"zP" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/orange/hidden,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
- dir = 8
- },
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ruin/whitesands/pubbycrash)
-"zX" = (
-/obj/structure/railing/corner{
- dir = 1
+/obj/effect/decal/cleanable/oil{
+ icon_state = "floor6"
},
/obj/effect/turf_decal/industrial/warning/corner{
dir = 1
},
-/obj/structure/table/reinforced,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 6
- },
-/obj/structure/reagent_dispensers/servingdish,
-/obj/item/kitchen/spoon/plastic{
- pixel_x = -1
+/obj/effect/turf_decal/ntspaceworks_small{
+ dir = 4
},
-/obj/item/kitchen/spoon/plastic{
- pixel_x = 13
+/turf/open/floor/plasteel/tech,
+/area/ruin/whitesands/pubbycrash/engine_room)
+"zX" = (
+/obj/effect/turf_decal/industrial/warning{
+ dir = 1
},
-/obj/item/kitchen/spoon/plastic{
- pixel_x = 6
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/light/directional/west,
+/mob/living/simple_animal/hostile/asteroid/whitesands/survivor{
+ dir = 1;
+ faction = list("saloon")
},
/turf/open/floor/plasteel/dark,
/area/ruin/whitesands/pubbycrash)
+"Ai" = (
+/obj/structure/sign/nanotrasen,
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/ruin/whitesands/pubbycrash/engine_room)
"Ak" = (
-/obj/structure/closet/crate/bin,
+/obj/item/reagent_containers/food/drinks/britcup{
+ pixel_x = 9;
+ pixel_y = -3
+ },
/obj/item/trash/pistachios{
pixel_y = 5
},
-/obj/item/trash/energybar,
-/obj/item/trash/cheesie,
-/obj/item/trash/can/food,
-/obj/item/trash/sosjerky{
- pixel_x = 5
+/obj/structure/table/reinforced{
+ color = "#c1b6a5"
},
-/obj/machinery/atmospherics/components/unary/vent_pump/on,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel/dark,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/grimy,
/area/ruin/whitesands/pubbycrash)
-"AH" = (
+"AA" = (
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/ruin/whitesands/pubbycrash/split)
+"AD" = (
/obj/structure/cable{
- icon_state = "4-8"
+ icon_state = "1-8"
},
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/decal/cleanable/oil{
- icon_state = "floor6"
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/plasteel/stairs{
+ dir = 8
},
-/turf/open/floor/plasteel/tech,
/area/ruin/whitesands/pubbycrash)
+"AH" = (
+/obj/structure/frame/machine,
+/obj/item/stack/cable_coil/cut/red,
+/obj/item/stack/ore/salvage/scrapgold,
+/obj/item/stack/ore/salvage/scrapgold,
+/turf/open/floor/plating,
+/area/ruin/whitesands/pubbycrash/engine_room)
"AJ" = (
-/turf/closed/wall/mineral/titanium,
-/area/ruin/whitesands/pubbycrash)
+/turf/open/floor/plating/asteroid/whitesands/dried,
+/area/overmap_encounter/planetoid/cave/explored)
"AO" = (
-/obj/machinery/light/directional/west,
-/obj/effect/turf_decal/industrial/warning,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel/dark,
-/area/ruin/whitesands/pubbycrash)
-"Bd" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel/dark,
/area/ruin/whitesands/pubbycrash)
-"Bz" = (
+"Bd" = (
/obj/effect/turf_decal/box/corners{
dir = 8
},
@@ -1242,21 +1219,7 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/engine,
/area/ruin/whitesands/pubbycrash)
-"BD" = (
-/obj/effect/turf_decal/industrial/warning,
-/obj/machinery/atmospherics/components/unary/vent_pump/on,
-/obj/structure/salvageable/machine,
-/turf/open/floor/plasteel/dark,
-/area/ruin/whitesands/pubbycrash)
-"BH" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/spline/fancy/opaque/black{
- dir = 1
- },
-/obj/effect/decal/cleanable/vomit/old,
-/turf/open/floor/plasteel/dark,
-/area/ruin/whitesands/pubbycrash)
-"Cg" = (
+"Bi" = (
/obj/structure/table/reinforced,
/obj/item/storage/toolbox/mechanical{
pixel_x = -2;
@@ -1274,220 +1237,270 @@
},
/turf/open/floor/plasteel/dark,
/area/ruin/whitesands/pubbycrash)
-"Cs" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+"Bw" = (
+/turf/closed/mineral/random/whitesands,
+/area/ruin/whitesands/pubbycrash/engine_room)
+"Bz" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
dir = 4
},
+/obj/effect/decal/cleanable/dirt,
/obj/structure/cable{
- icon_state = "2-4"
+ icon_state = "1-8"
},
-/obj/structure/cable{
- icon_state = "1-2"
+/obj/structure/catwalk,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/orange/hidden,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+/turf/open/floor/plating,
+/area/ruin/whitesands/pubbycrash/engine_room)
+"BD" = (
+/obj/effect/decal/fakelattice{
+ icon_state = "lattice-9"
+ },
+/turf/open/floor/plating/asteroid/whitesands/dried,
+/area/overmap_encounter/planetoid/cave/explored)
+"BH" = (
+/obj/structure/railing{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 5
},
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ruin/whitesands/pubbycrash)
-"Ct" = (
-/obj/effect/decal/cleanable/dirt,
+/obj/structure/catwalk,
/obj/effect/turf_decal/spline/fancy/opaque/black{
- dir = 1
+ dir = 8
},
-/mob/living/simple_animal/hostile/asteroid/whitesands/survivor{
- faction = list("saloon")
+/turf/open/floor/plating,
+/area/ruin/whitesands/pubbycrash/engine_room)
+"Cg" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/door/airlock/highsecurity,
/turf/open/floor/plasteel/dark,
/area/ruin/whitesands/pubbycrash)
-"Cw" = (
-/obj/item/stack/ore/salvage/scraptitanium,
-/turf/open/floor/plating/asteroid/whitesands/lit,
-/area/overmap_encounter/planetoid/sand)
-"Dg" = (
+"Cs" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/effect/turf_decal/industrial/warning{
+ dir = 8
+ },
+/obj/effect/turf_decal/ntspaceworks_small/right{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/vomit/old,
+/obj/effect/mob_spawn/human/corpse/nanotrasensoldier,
+/obj/item/storage/box/stockparts/basic{
+ pixel_x = -3;
+ pixel_y = 4
+ },
+/turf/open/floor/plasteel/tech,
+/area/ruin/whitesands/pubbycrash/engine_room)
+"Ct" = (
/obj/structure/cable{
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/orange/hidden,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 10
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 8
},
-/obj/machinery/airalarm/directional/east,
/turf/open/floor/plasteel/tech/techmaint,
-/area/ruin/whitesands/pubbycrash)
-"Di" = (
-/obj/structure/railing/corner,
-/turf/closed/mineral/random/whitesands,
-/area/overmap_encounter/planetoid/cave/explored)
-"Dn" = (
-/obj/structure/railing,
-/obj/structure/salvageable/computer{
+/area/ruin/whitesands/pubbycrash/engine_room)
+"Cw" = (
+/obj/item/stack/ore/salvage/scraptitanium,
+/turf/open/floor/plating/asteroid/whitesands/lit,
+/area/overmap_encounter/planetoid/sand/explored)
+"Dg" = (
+/obj/effect/turf_decal/industrial/warning/corner{
dir = 8
},
-/obj/item/stack/ore/salvage/scrapgold,
+/obj/structure/salvageable/computer,
/turf/open/floor/plasteel/tech,
+/area/ruin/whitesands/pubbycrash/engine_room)
+"Di" = (
+/obj/structure/sign/number/one,
+/obj/effect/decal/cleanable/vomit/old,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/engine,
+/area/ruin/whitesands/pubbycrash)
+"Dn" = (
+/obj/effect/turf_decal/industrial/warning,
+/obj/machinery/atmospherics/components/unary/vent_pump/on,
+/obj/structure/salvageable/machine,
+/turf/open/floor/plasteel/dark,
/area/ruin/whitesands/pubbycrash)
"Dx" = (
-/obj/effect/spawner/structure/window/shuttle,
-/obj/machinery/door/poddoor{
- id = "whiteship_windows"
+/obj/effect/decal/fakelattice{
+ icon_state = "lattice-141"
},
-/turf/open/floor/plating,
-/area/ruin/whitesands/pubbycrash)
+/turf/open/floor/plating/asteroid/whitesands,
+/area/overmap_encounter/planetoid/cave/explored)
"DB" = (
-/obj/structure/table/reinforced,
/obj/effect/decal/cleanable/dirt,
-/obj/structure/salvageable/machine,
-/turf/open/floor/plastic,
-/area/ruin/whitesands/pubbycrash)
-"DQ" = (
-/obj/effect/turf_decal/spline/fancy/opaque/black,
-/obj/item/stack/ore/salvage/scraptitanium,
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel/dark,
-/area/ruin/whitesands/pubbycrash)
-"DY" = (
-/obj/structure/cable{
- icon_state = "0-4"
+/obj/effect/decal/cleanable/ash,
+/obj/effect/decal/cleanable/ash{
+ pixel_x = -6;
+ pixel_y = 8
},
+/turf/open/floor/plating{
+ icon_state = "panelscorched";
+ initial_gas_mix = "ws_atmos"
+ },
+/area/ruin/whitesands/pubbycrash/split)
+"DQ" = (
/obj/structure/cable{
- icon_state = "0-2"
+ icon_state = "1-2"
},
-/obj/machinery/atmospherics/pipe/simple/orange/hidden{
- dir = 4
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 10
},
-/obj/effect/turf_decal/spline/fancy/opaque/black{
- dir = 6
+/obj/machinery/airalarm/directional/east,
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ruin/whitesands/pubbycrash/engine_room)
+"DY" = (
+/obj/structure/window/reinforced{
+ dir = 8
},
-/obj/structure/salvageable/machine,
-/turf/open/floor/plasteel/tech,
-/area/ruin/whitesands/pubbycrash)
+/obj/machinery/door/window/northleft{
+ dir = 4;
+ name = "Engine Access"
+ },
+/obj/structure/frame/machine,
+/obj/item/circuitboard/machine/shuttle/heater,
+/obj/item/stack/cable_coil/cut/red,
+/turf/open/floor/plating,
+/area/ruin/whitesands/pubbycrash/engine_room)
"Ea" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- dir = 1
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
},
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
/turf/open/floor/plasteel/patterned/grid,
/area/ruin/whitesands/pubbycrash)
"Eb" = (
-/obj/structure/frame/machine,
-/obj/item/circuitboard/machine/shuttle/engine/plasma,
-/obj/item/stack/cable_coil/cut/red,
-/turf/open/floor/plating,
+/obj/item/trash/cheesie{
+ pixel_x = 5;
+ pixel_y = 6
+ },
+/obj/structure/table/reinforced{
+ color = "#c1b6a5"
+ },
+/turf/open/floor/plasteel/grimy,
/area/ruin/whitesands/pubbycrash)
"Eh" = (
-/obj/machinery/door/airlock/public/glass,
-/turf/open/floor/plasteel,
-/area/ruin/whitesands/pubbycrash)
-"Em" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/ash{
pixel_x = 3;
pixel_y = -3
},
-/obj/item/lighter/enigma,
+/obj/item/lighter,
/turf/open/floor/plating{
icon_state = "panelscorched";
initial_gas_mix = "ws_atmos"
},
-/area/ruin/whitesands/pubbycrash)
-"Et" = (
-/obj/effect/decal/cleanable/oil{
- icon_state = "floor6"
+/area/overmap_encounter/planetoid/sand/explored)
+"Em" = (
+/obj/machinery/light/directional/north,
+/obj/structure/table/reinforced,
+/obj/machinery/reagentgrinder{
+ pixel_x = 6;
+ pixel_y = 14
},
-/obj/effect/turf_decal/industrial/warning/corner{
- dir = 1
+/obj/item/reagent_containers/food/snacks/meat/slab/xeno,
+/turf/open/floor/plastic,
+/area/ruin/whitesands/pubbycrash/split)
+"Et" = (
+/obj/item/stack/ore/salvage/scraptitanium{
+ pixel_x = -3;
+ pixel_y = -10
},
-/obj/effect/turf_decal/ntspaceworks_small{
- dir = 4
+/obj/effect/decal/fakelattice{
+ icon_state = "lattice-21"
},
-/turf/open/floor/plasteel/tech,
-/area/ruin/whitesands/pubbycrash)
+/turf/open/floor/plating/asteroid/whitesands/dried,
+/area/overmap_encounter/planetoid/cave/explored)
"Ew" = (
-/obj/machinery/portable_atmospherics/canister/air,
-/obj/structure/sign/poster/official/random{
- pixel_y = -32
- },
-/obj/effect/turf_decal/industrial/warning{
- dir = 10
+/obj/structure/cable{
+ icon_state = "4-8"
},
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ruin/whitesands/pubbycrash)
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/tech,
+/area/ruin/whitesands/pubbycrash/engine_room)
"EG" = (
/obj/machinery/door/airlock/hatch{
welded = 1
},
/turf/template_noop,
-/area/ruin/whitesands/pubbycrash)
+/area/ruin/whitesands/pubbycrash/split)
"ET" = (
-/obj/effect/turf_decal/industrial/warning{
- dir = 1
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
},
/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/light/directional/west,
-/mob/living/simple_animal/hostile/asteroid/whitesands/survivor{
- dir = 1;
- faction = list("saloon")
+/obj/effect/turf_decal/industrial/warning/corner{
+ dir = 4
},
-/turf/open/floor/plasteel/dark,
-/area/ruin/whitesands/pubbycrash)
-"Fc" = (
-/obj/structure/window/reinforced{
- dir = 8
+/obj/machinery/light/directional/east,
+/obj/effect/turf_decal/number/four{
+ dir = 4
},
-/obj/machinery/door/window/northleft{
- dir = 4;
- name = "Engine Access"
+/turf/open/floor/plasteel/tech,
+/area/ruin/whitesands/pubbycrash/engine_room)
+"Fc" = (
+/obj/item/stack/ore/salvage/scraptitanium{
+ pixel_x = 8
},
-/obj/structure/frame/machine,
-/obj/item/circuitboard/machine/shuttle/heater,
-/obj/item/stack/cable_coil/cut/red,
-/turf/open/floor/plating,
-/area/ruin/whitesands/pubbycrash)
+/turf/open/floor/plating/asteroid/whitesands/lit,
+/area/overmap_encounter/planetoid/sand/explored)
"Fn" = (
-/obj/structure/railing,
-/obj/structure/railing{
- dir = 1
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+/obj/structure/chair/office/light{
dir = 4
},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/plasteel/grimy,
+/area/ruin/whitesands/pubbycrash)
+"Fo" = (
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel/stairs{
- dir = 4
+/obj/effect/decal/cleanable/ash,
+/obj/effect/decal/cleanable/ash{
+ pixel_y = -3;
+ pixel_x = -6
},
-/area/ruin/whitesands/pubbycrash)
-"Fq" = (
/turf/open/floor/plating{
- icon_state = "platingdmg1";
+ icon_state = "panelscorched";
initial_gas_mix = "ws_atmos"
},
-/area/ruin/whitesands/pubbycrash)
-"FP" = (
-/obj/effect/turf_decal/box,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/structure/railing{
- dir = 1
- },
-/obj/effect/turf_decal/industrial/warning{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 6
- },
-/obj/structure/salvageable/machine,
-/turf/open/floor/plasteel,
-/area/ruin/whitesands/pubbycrash)
-"FY" = (
+/area/ruin/whitesands/pubbycrash/split)
+"Fq" = (
/obj/structure/railing/corner{
dir = 8
},
@@ -1501,158 +1514,179 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 5
},
-/obj/structure/salvageable/machine,
+/obj/structure/salvageable/server,
+/turf/open/floor/plasteel/dark,
+/area/ruin/whitesands/pubbycrash)
+"FP" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/structure/table/reinforced,
+/obj/machinery/recharger,
+/obj/structure/railing{
+ dir = 10;
+ layer = 4.1
+ },
+/obj/effect/turf_decal/spline/fancy/opaque/black,
+/obj/item/stack/ore/salvage/scrapgold,
+/turf/open/floor/plasteel/tech,
+/area/ruin/whitesands/pubbycrash)
+"FY" = (
+/obj/machinery/light/directional/west,
+/obj/effect/turf_decal/industrial/warning,
+/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/dark,
/area/ruin/whitesands/pubbycrash)
"Ga" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
/turf/open/floor/plasteel/dark,
/area/ruin/whitesands/pubbycrash)
"Gi" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
/obj/structure/cable{
icon_state = "4-8"
},
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 4
},
-/obj/machinery/door/airlock/highsecurity,
/turf/open/floor/plasteel/dark,
/area/ruin/whitesands/pubbycrash)
"Gl" = (
/turf/template_noop,
/area/template_noop)
-"GA" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/turf/closed/wall/mineral/titanium/nodiagonal,
+"Gp" = (
+/obj/effect/turf_decal/spline/fancy/opaque/black,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/effect/decal/cleanable/vomit/old,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/mob_spawn/human/corpse/nanotrasensoldier,
+/turf/open/floor/plasteel/dark,
/area/ruin/whitesands/pubbycrash)
-"GF" = (
-/obj/structure/window/reinforced{
+"GA" = (
+/obj/structure/railing,
+/obj/structure/salvageable/computer{
dir = 8
},
-/obj/machinery/door/window/northright{
- dir = 4;
- name = "Engine Access"
- },
-/obj/structure/frame/machine,
-/obj/item/circuitboard/machine/shuttle/heater,
-/obj/item/stack/cable_coil/cut/red,
-/obj/item/stack/ore/salvage/scrapplasma/five,
-/turf/open/floor/plating,
+/obj/item/stack/ore/salvage/scrapgold,
+/turf/open/floor/plasteel/tech,
/area/ruin/whitesands/pubbycrash)
-"GK" = (
-/obj/structure/closet/wall/blue{
- dir = 1;
- name = "Captain's locker";
- pixel_y = -28
- },
-/obj/item/clothing/suit/space/hardsuit/mining/heavy,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
+"GF" = (
+/obj/machinery/newscaster/directional/west,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/ash/large,
/turf/open/floor/plating{
icon_state = "panelscorched";
initial_gas_mix = "ws_atmos"
},
-/area/ruin/whitesands/pubbycrash)
+/area/ruin/whitesands/pubbycrash/split)
+"GK" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plastic,
+/area/ruin/whitesands/pubbycrash/split)
"Ha" = (
-/obj/structure/table,
-/obj/machinery/cell_charger,
-/obj/effect/turf_decal/industrial/warning,
-/turf/open/floor/plasteel/tech,
-/area/ruin/whitesands/pubbycrash)
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/ruin/whitesands/pubbycrash/engine_room)
"Hb" = (
-/obj/structure/cable/yellow{
- icon_state = "0-8"
- },
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
+ dir = 8
},
-/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/structure/salvageable/machine,
-/turf/open/floor/plasteel/tech,
-/area/ruin/whitesands/pubbycrash)
-"Ho" = (
-/obj/structure/cable{
- icon_state = "1-2"
+/obj/machinery/atmospherics/components/binary/dp_vent_pump{
+ dir = 8
},
-/obj/machinery/atmospherics/pipe/simple/orange/hidden,
-/obj/machinery/light/directional/east,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
/obj/effect/gibspawner,
-/obj/item/stack/ore/salvage/scrapmetal/five,
-/turf/open/floor/plasteel/tech/techmaint,
+/turf/open/floor/plasteel/tech/grid,
+/area/ruin/whitesands/pubbycrash/engine_room)
+"Ho" = (
+/obj/effect/turf_decal/box/corners,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/stack/ore/salvage/scraptitanium,
+/turf/open/floor/engine,
/area/ruin/whitesands/pubbycrash)
"Hq" = (
-/obj/item/stack/cable_coil/cut/red,
-/obj/item/stack/ore/salvage/scrapgold,
-/obj/item/stack/ore/salvage/scrapgold,
-/obj/item/stack/ore/salvage/scrapmetal/five,
-/turf/open/floor/plating,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/chair/office/light{
+ dir = 8
+ },
+/turf/open/floor/plasteel/grimy,
/area/ruin/whitesands/pubbycrash)
"HQ" = (
-/obj/machinery/atmospherics/pipe/simple/orange/hidden{
- dir = 4
+/obj/item/stack/ore/salvage/scrapmetal/five{
+ pixel_y = -12;
+ pixel_x = 4
},
-/obj/structure/railing/corner,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/light/small/directional/south,
-/obj/effect/decal/cleanable/garbage,
-/turf/open/floor/plasteel/tech,
-/area/ruin/whitesands/pubbycrash)
+/turf/open/floor/plating/asteroid/whitesands/dried,
+/area/overmap_encounter/planetoid/cave/explored)
"If" = (
-/turf/open/floor/plating{
- icon_state = "panelscorched";
- initial_gas_mix = "ws_atmos"
+/obj/structure/railing{
+ dir = 8
},
-/area/ruin/whitesands/pubbycrash)
-"Ig" = (
+/obj/effect/turf_decal/industrial/outline/yellow,
/obj/effect/turf_decal/industrial/warning{
- dir = 10
+ dir = 8
},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
-/obj/structure/salvageable/machine,
+/obj/machinery/suit_storage_unit/open,
/turf/open/floor/plasteel/dark,
/area/ruin/whitesands/pubbycrash)
-"Ik" = (
+"Ig" = (
+/obj/structure/sink{
+ dir = 8;
+ pixel_x = 12
+ },
+/obj/structure/railing,
+/obj/machinery/airalarm/directional/east,
+/obj/item/stack/sheet/cotton/cloth,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plastic,
+/area/ruin/whitesands/pubbycrash/split)
+"Ik" = (
+/obj/structure/table/reinforced,
+/obj/item/storage/fancy/donut_box{
+ pixel_y = 2
+ },
+/obj/effect/turf_decal/industrial/warning{
+ dir = 8
+ },
+/obj/structure/sign/poster/official/random{
+ pixel_y = -32
+ },
+/obj/structure/railing{
+ dir = 4
+ },
+/obj/machinery/firealarm/directional/east,
+/turf/open/floor/plasteel/dark,
/area/ruin/whitesands/pubbycrash)
"In" = (
-/obj/structure/railing,
-/turf/closed/mineral/random/whitesands,
-/area/overmap_encounter/planetoid/cave/explored)
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plating,
+/area/ruin/whitesands/pubbycrash)
"IC" = (
/obj/item/stack/ore/salvage/scrapmetal/five,
/turf/open/floor/plating/asteroid/whitesands/lit,
-/area/overmap_encounter/planetoid/sand)
+/area/overmap_encounter/planetoid/sand/explored)
"IQ" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/turf_decal/spline/fancy/opaque/black,
-/turf/open/floor/plasteel/dark,
-/area/ruin/whitesands/pubbycrash)
-"Ji" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ruin/whitesands/pubbycrash)
-"Jz" = (
-/obj/item/stack/ore/salvage/scrapmetal/five,
-/obj/item/stack/ore/salvage/scraptitanium,
-/turf/open/floor/plating/asteroid/whitesands/lit,
-/area/overmap_encounter/planetoid/sand)
-"JI" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/turf_decal/spline/fancy/opaque/black,
@@ -1661,7 +1695,20 @@
},
/turf/open/floor/plasteel/dark,
/area/ruin/whitesands/pubbycrash)
-"Kt" = (
+"IR" = (
+/obj/machinery/camera/autoname{
+ dir = 1
+ },
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 5
+ },
+/obj/structure/extinguisher_cabinet/directional/west,
+/turf/open/floor/plasteel/grimy,
+/area/ruin/whitesands/pubbycrash)
+"IU" = (
/obj/machinery/door/airlock/external/glass,
/obj/effect/turf_decal/industrial/warning{
dir = 8
@@ -1673,454 +1720,524 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel/dark,
/area/ruin/whitesands/pubbycrash)
-"Ky" = (
-/obj/machinery/door/airlock/external{
- dir = 4
- },
-/obj/effect/turf_decal/industrial/hatch/yellow,
-/obj/machinery/atmospherics/pipe/layer_manifold{
- dir = 4
+"Ji" = (
+/obj/effect/decal/cleanable/generic,
+/obj/structure/chair/office/light{
+ dir = 8
},
-/turf/open/floor/plasteel/tech/grid,
-/area/ruin/whitesands/pubbycrash)
-"KB" = (
-/obj/structure/salvageable/computer,
-/obj/item/stack/ore/salvage/scrapgold,
-/turf/open/floor/plasteel/tech,
+/turf/open/floor/plasteel/grimy,
/area/ruin/whitesands/pubbycrash)
-"KI" = (
+"Jz" = (
+/obj/item/stack/ore/salvage/scrapmetal/five,
+/obj/item/stack/ore/salvage/scraptitanium,
+/turf/open/floor/plating/asteroid/whitesands/lit,
+/area/overmap_encounter/planetoid/sand/explored)
+"JI" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/decal/cleanable/plasma,
-/obj/effect/turf_decal/spline/fancy/opaque/black,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel/dark,
-/area/ruin/whitesands/pubbycrash)
-"KO" = (
-/obj/machinery/power/apc/auto_name/directional/east{
- start_charge = 10
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+ dir = 8
},
-/obj/structure/cable,
-/obj/structure/cable{
- icon_state = "0-2"
+/obj/structure/railing{
+ dir = 8
},
-/obj/machinery/atmospherics/pipe/simple/orange/hidden,
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ruin/whitesands/pubbycrash)
-"KS" = (
-/obj/effect/turf_decal/box,
-/obj/structure/table/reinforced,
-/obj/item/storage/belt/utility,
-/obj/item/storage/belt/utility,
-/obj/item/multitool,
-/obj/structure/railing,
-/obj/effect/turf_decal/industrial/warning,
-/turf/open/floor/plasteel,
+/obj/structure/catwalk,
+/obj/effect/turf_decal/spline/fancy/opaque/black{
+ dir = 8
+ },
+/obj/structure/salvageable/protolathe,
+/turf/open/floor/plating,
+/area/ruin/whitesands/pubbycrash/engine_room)
+"Kt" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/spline/fancy/opaque/black{
+ dir = 1
+ },
+/mob/living/simple_animal/hostile/asteroid/whitesands/survivor{
+ faction = list("saloon")
+ },
+/turf/open/floor/plasteel/dark,
/area/ruin/whitesands/pubbycrash)
-"KT" = (
+"Ky" = (
+/turf/closed/wall/mineral/titanium,
+/area/ruin/whitesands/pubbycrash/split)
+"KB" = (
/obj/effect/decal/cleanable/dirt,
-/obj/structure/chair/office/light{
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 8
},
+/obj/effect/decal/cleanable/vomit/old,
/turf/open/floor/plasteel/grimy,
/area/ruin/whitesands/pubbycrash)
-"Lj" = (
-/obj/machinery/door/airlock/glass,
-/obj/structure/cable{
- icon_state = "1-2"
+"KI" = (
+/obj/effect/turf_decal/industrial/warning{
+ dir = 8
+ },
+/obj/effect/turf_decal/industrial/warning{
+ dir = 4
},
+/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel/dark,
/area/ruin/whitesands/pubbycrash)
-"Lm" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+"KO" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/ntspaceworks_small/left{
dir = 4
},
-/obj/structure/cable{
- icon_state = "4-8"
+/mob/living/simple_animal/hostile/asteroid/whitesands/survivor{
+ dir = 4;
+ faction = list("saloon")
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 4
+/turf/open/floor/plasteel/tech,
+/area/ruin/whitesands/pubbycrash/engine_room)
+"KS" = (
+/obj/effect/turf_decal/industrial/caution,
+/obj/structure/railing/corner{
+ dir = 8
},
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable{
- icon_state = "1-4"
+/obj/structure/railing/corner{
+ dir = 1
},
-/turf/open/floor/plasteel/patterned/grid,
-/area/ruin/whitesands/pubbycrash)
-"Ls" = (
-/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/effect/turf_decal/siding/brown,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/suit_storage_unit/open,
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ruin/whitesands/pubbycrash)
-"LM" = (
-/turf/closed/mineral/random/whitesands,
-/area/ruin/whitesands/pubbycrash)
-"LU" = (
-/obj/structure/cable/yellow{
- icon_state = "2-4"
+/obj/structure/catwalk,
+/obj/structure/sign/poster/retro/nanotrasen_logo_70s{
+ pixel_x = -32
},
-/obj/structure/cable/yellow{
- icon_state = "1-2"
+/obj/effect/spawner/lootdrop/maintenance/two,
+/turf/open/floor/plating,
+/area/ruin/whitesands/pubbycrash/engine_room)
+"KT" = (
+/obj/structure/railing,
+/obj/effect/decal/fakelattice{
+ icon_state = "lattice-12"
},
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/turf_decal/industrial/warning{
- dir = 4
+/turf/open/floor/plating/asteroid/whitesands/dried,
+/area/overmap_encounter/planetoid/cave/explored)
+"Li" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 1
},
-/obj/effect/turf_decal/number/nine{
- dir = 4
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/closet/wall/red{
+ dir = 8;
+ name = "Firearm Locker";
+ pixel_x = 29;
+ welded = 1
},
-/obj/item/stock_parts/cell/hyper,
-/turf/open/floor/plasteel/tech,
-/area/ruin/whitesands/pubbycrash)
-"LW" = (
-/obj/effect/spawner/structure/window/shuttle,
-/obj/machinery/door/poddoor{
- dir = 4;
- id = "whiteship_windows"
+/obj/effect/turf_decal/spline/fancy/opaque/black{
+ dir = 1
},
-/turf/open/floor/plating,
+/obj/item/gun/ballistic/automatic/pistol/commander,
+/obj/item/gun/ballistic/automatic/pistol/commander,
+/obj/item/ammo_box/magazine/co9mm,
+/obj/item/ammo_box/magazine/co9mm,
+/obj/item/ammo_box/magazine/co9mm,
+/obj/item/ammo_box/magazine/co9mm,
+/turf/open/floor/plasteel/dark,
/area/ruin/whitesands/pubbycrash)
-"Mi" = (
-/obj/structure/sign/number/two,
+"Lj" = (
/obj/effect/decal/cleanable/dirt/dust,
-/obj/item/stack/ore/salvage/scraptitanium,
-/obj/effect/gibspawner,
-/turf/open/floor/engine,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/pod,
/area/ruin/whitesands/pubbycrash)
-"Ml" = (
-/obj/structure/window/reinforced{
+"Lm" = (
+/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 9
+ },
+/obj/structure/railing{
dir = 8
},
-/obj/machinery/door/window/northright{
- dir = 4;
- name = "Engine Access"
+/obj/structure/catwalk,
+/obj/effect/turf_decal/spline/fancy/opaque/black{
+ dir = 8
+ },
+/obj/item/stock_parts/cell/hyper{
+ pixel_x = 5;
+ pixel_y = 4
+ },
+/obj/item/stack/ore/salvage/scrapmetal/five{
+ pixel_x = -9
},
-/obj/structure/frame/machine,
-/obj/item/stack/cable_coil/cut/red,
-/obj/item/circuitboard/machine/shuttle/smes,
/turf/open/floor/plating,
+/area/ruin/whitesands/pubbycrash/engine_room)
+"Ls" = (
+/turf/open/floor/plating{
+ icon_state = "platingdmg1";
+ initial_gas_mix = "ws_atmos"
+ },
/area/ruin/whitesands/pubbycrash)
-"Mr" = (
+"LM" = (
+/obj/item/stack/ore/salvage/scrapmetal/five,
+/obj/item/stack/ore/salvage/scraptitanium,
+/obj/effect/decal/fakelattice{
+ icon_state = "lattice-4"
+ },
+/turf/open/floor/plating/asteroid/whitesands/dried,
+/area/overmap_encounter/planetoid/cave/explored)
+"LU" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/salvageable/computer{
dir = 8
},
/turf/open/floor/plasteel/tech,
/area/ruin/whitesands/pubbycrash)
-"NI" = (
-/obj/machinery/holopad,
-/obj/effect/decal/cleanable/dirt/dust,
+"LW" = (
/obj/structure/cable{
- icon_state = "2-8"
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 10
+ icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 6
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/oil{
+ icon_state = "floor6"
},
-/turf/open/floor/plasteel/grimy,
-/area/ruin/whitesands/pubbycrash)
-"Og" = (
+/turf/open/floor/plasteel/tech,
+/area/ruin/whitesands/pubbycrash/engine_room)
+"Mi" = (
/obj/structure/cable{
- icon_state = "1-2"
+ icon_state = "1-8"
},
-/obj/structure/table/reinforced,
-/obj/machinery/recharger,
/obj/structure/railing{
- dir = 10;
- layer = 4.1
+ dir = 1
},
-/obj/effect/turf_decal/spline/fancy/opaque/black,
-/obj/item/stack/ore/salvage/scrapgold,
-/turf/open/floor/plasteel/tech,
-/area/ruin/whitesands/pubbycrash)
-"Oz" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/ash{
- pixel_x = 2;
- pixel_y = -2
+/turf/open/floor/plasteel/stairs{
+ dir = 4
},
-/obj/effect/decal/cleanable/ash{
- pixel_y = -2;
- pixel_x = 5
+/area/ruin/whitesands/pubbycrash/engine_room)
+"Ml" = (
+/obj/structure/sign/poster/official/random{
+ pixel_x = 32
},
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/ash/large,
/turf/open/floor/plating{
icon_state = "panelscorched";
initial_gas_mix = "ws_atmos"
},
-/area/ruin/whitesands/pubbycrash)
-"Pr" = (
-/obj/structure/table,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/turf_decal/industrial/warning/corner,
-/obj/effect/spawner/lootdrop/maintenance/two,
-/turf/open/floor/plasteel/tech,
-/area/ruin/whitesands/pubbycrash)
-"Pu" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/turf/open/floor/plating,
-/area/ruin/whitesands/pubbycrash)
-"PA" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
+/area/ruin/whitesands/pubbycrash/split)
+"Mr" = (
+/obj/structure/closet/crate/bin,
+/obj/item/trash/pistachios{
+ pixel_y = 5
},
-/obj/structure/cable{
- icon_state = "4-8"
+/obj/item/trash/energybar,
+/obj/item/trash/cheesie,
+/obj/item/trash/can/food,
+/obj/item/trash/sosjerky{
+ pixel_x = 5
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+/obj/machinery/atmospherics/components/unary/vent_pump/on,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/dark,
+/area/ruin/whitesands/pubbycrash)
+"NI" = (
+/obj/structure/railing{
dir = 4
},
/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel/patterned/grid,
-/area/ruin/whitesands/pubbycrash)
-"PI" = (
/obj/structure/cable{
- icon_state = "1-8"
- },
-/obj/structure/railing{
- dir = 1
+ icon_state = "1-2"
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel/stairs{
- dir = 4
- },
-/area/ruin/whitesands/pubbycrash)
-"PK" = (
-/obj/effect/gibspawner,
-/turf/open/floor/plating,
-/area/ruin/whitesands/pubbycrash)
-"PY" = (
-/obj/effect/decal/cleanable/generic,
-/obj/structure/chair/office/light{
- dir = 8
+ dir = 1
},
-/turf/open/floor/plasteel/grimy,
/area/ruin/whitesands/pubbycrash)
-"PZ" = (
+"Og" = (
/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/atmospherics/components/binary/pump{
- dir = 8;
- name = "engine fuel pump"
+/obj/structure/cable{
+ icon_state = "1-2"
},
-/obj/machinery/light/small/directional/north,
-/obj/effect/spawner/lootdrop/maintenance/two,
-/obj/item/stack/sheet/mineral/wood/fifty,
-/obj/structure/closet/crate,
-/turf/open/floor/plasteel/tech,
-/area/ruin/whitesands/pubbycrash)
-"Qb" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
-/obj/effect/decal/cleanable/vomit/old,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/effect/decal/cleanable/vomit/old,
-/obj/item/stack/ore/salvage/scrapmetal,
-/obj/effect/mob_spawn/human/corpse/nanotrasenassaultsoldier,
-/obj/effect/gibspawner,
-/turf/open/floor/plasteel/tech,
-/area/ruin/whitesands/pubbycrash)
-"Qo" = (
-/obj/effect/decal/fakelattice{
- icon_state = "lattice-9"
- },
-/turf/open/floor/plating/asteroid/whitesands/lit,
-/area/overmap_encounter/planetoid/sand)
-"Qu" = (
-/obj/machinery/atmospherics/pipe/simple/orange/hidden{
- dir = 4
+/mob/living/simple_animal/hostile/asteroid/whitesands/survivor{
+ dir = 1;
+ faction = list("saloon")
},
+/obj/effect/mob_spawn/human/corpse/nanotrasensoldier,
+/turf/open/floor/plasteel/dark,
+/area/ruin/whitesands/pubbycrash)
+"Oz" = (
+/obj/structure/table/reinforced,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/salvageable/machine,
+/turf/open/floor/plastic,
+/area/ruin/whitesands/pubbycrash/split)
+"ON" = (
+/obj/structure/railing/corner,
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 4
+ icon_state = "1-2"
},
-/obj/structure/railing,
-/obj/structure/railing{
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 1
},
-/turf/open/floor/plasteel/stairs{
- dir = 4
+/mob/living/simple_animal/hostile/asteroid/whitesands/survivor{
+ dir = 4;
+ faction = list("adobe");
+ desc = " A wild-eyed figure, wearing tattered mining equipment and boasting a malformed body, twisted by the heavy metals and high background radiation of the sandworlds. Their helmet also seems to be filled with vomit"
},
-/area/ruin/whitesands/pubbycrash)
-"Qw" = (
-/obj/structure/cable/yellow{
- icon_state = "2-4"
+/obj/effect/decal/cleanable/vomit,
+/turf/open/floor/plasteel,
+/area/ruin/whitesands/pubbycrash/split)
+"Pr" = (
+/obj/structure/closet/wall/red{
+ dir = 4;
+ name = "Pilots locker";
+ pixel_x = -29;
+ welded = 1
},
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 4
+/obj/item/clothing/under/suit/black,
+/obj/item/clothing/under/suit/black,
+/obj/item/clothing/suit/jacket,
+/obj/item/clothing/suit/jacket,
+/obj/item/clothing/head/beret/black,
+/obj/item/clothing/head/beret/black,
+/obj/structure/cable{
+ icon_state = "1-2"
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 1
+ },
+/obj/item/clothing/under/rank/security/officer/nt,
+/obj/item/clothing/under/rank/security/officer/nt,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel,
+/area/ruin/whitesands/pubbycrash/split)
+"Pu" = (
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
dir = 4
},
-/obj/structure/chair{
- dir = 1
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/cable/yellow,
+/obj/effect/spawner/lootdrop/maintenance/two,
+/turf/open/floor/plasteel/tech,
+/area/ruin/whitesands/pubbycrash/engine_room)
+"PA" = (
+/obj/structure/cable/yellow{
+ icon_state = "0-8"
},
-/obj/effect/turf_decal/industrial/warning{
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 4
},
-/obj/effect/turf_decal/number/seven{
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
+/obj/effect/turf_decal/industrial/outline/yellow,
/turf/open/floor/plasteel/tech,
-/area/ruin/whitesands/pubbycrash)
-"QD" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
-/turf/open/floor/plasteel/patterned/grid,
-/area/ruin/whitesands/pubbycrash)
-"QI" = (
-/obj/machinery/power/terminal{
+/area/ruin/whitesands/pubbycrash/engine_room)
+"PI" = (
+/obj/structure/window/reinforced{
dir = 8
},
-/obj/structure/cable{
- icon_state = "0-4"
+/obj/machinery/door/window/northright{
+ dir = 4;
+ name = "Engine Access"
},
-/obj/machinery/portable_atmospherics/canister/toxins,
-/turf/open/floor/plasteel/tech,
+/obj/structure/frame/machine,
+/obj/item/stack/cable_coil/cut/red,
+/obj/item/circuitboard/machine/shuttle/smes,
+/turf/open/floor/plating,
+/area/ruin/whitesands/pubbycrash/engine_room)
+"PK" = (
+/obj/effect/turf_decal/box,
+/obj/structure/railing,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/industrial/warning,
+/obj/structure/salvageable/autolathe,
+/turf/open/floor/plasteel,
/area/ruin/whitesands/pubbycrash)
-"QR" = (
-/obj/structure/extinguisher_cabinet/directional/north,
-/obj/machinery/camera/autoname{
- dir = 1
- },
-/obj/structure/cable{
- icon_state = "0-4"
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 5
- },
-/turf/open/floor/plasteel/grimy,
+"PY" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/plasteel/dark,
/area/ruin/whitesands/pubbycrash)
-"RC" = (
-/obj/structure/railing{
- dir = 8
+"PZ" = (
+/obj/effect/decal/fakelattice{
+ icon_state = "lattice-21"
},
-/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/effect/turf_decal/industrial/warning{
+/turf/open/floor/plating/asteroid/whitesands/dried,
+/area/overmap_encounter/planetoid/cave/explored)
+"Qb" = (
+/obj/effect/gibspawner,
+/turf/open/floor/plating/asteroid/whitesands/dried,
+/area/overmap_encounter/planetoid/cave/explored)
+"Qo" = (
+/mob/living/simple_animal/hostile/asteroid/whitesands/ranged,
+/turf/open/floor/plating/asteroid/whitesands/dried,
+/area/overmap_encounter/planetoid/cave/explored)
+"Qu" = (
+/obj/structure/window/reinforced{
dir = 8
},
-/obj/machinery/airalarm/directional/north,
-/obj/machinery/suit_storage_unit/open,
-/turf/open/floor/plasteel/dark,
-/area/ruin/whitesands/pubbycrash)
-"RL" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+/obj/machinery/door/window/northright{
+ dir = 4;
+ name = "Engine Access"
+ },
+/obj/structure/frame/machine,
+/obj/item/circuitboard/machine/shuttle/heater,
+/obj/item/stack/cable_coil/cut/red,
+/obj/item/stack/ore/salvage/scrapplasma/five,
+/turf/open/floor/plating,
+/area/ruin/whitesands/pubbycrash/engine_room)
+"Qw" = (
+/obj/machinery/door/airlock/external{
+ dir = 4
+ },
+/obj/effect/turf_decal/industrial/hatch/yellow,
+/obj/machinery/atmospherics/pipe/layer_manifold{
dir = 4
},
+/turf/open/floor/plasteel/tech/grid,
+/area/ruin/whitesands/pubbycrash/engine_room)
+"QD" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/obj/structure/cable{
icon_state = "4-8"
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/door/airlock/engineering{
+ dir = 4
+ },
/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/decal/cleanable/wrapping,
-/obj/effect/decal/cleanable/plastic,
/turf/open/floor/plasteel/dark,
-/area/ruin/whitesands/pubbycrash)
-"RT" = (
-/turf/closed/mineral/random/whitesands,
+/area/ruin/whitesands/pubbycrash/engine_room)
+"QI" = (
+/obj/item/stack/ore/salvage/scraptitanium{
+ pixel_y = 8;
+ pixel_x = 6
+ },
+/turf/open/floor/plating/asteroid/whitesands/dried,
/area/overmap_encounter/planetoid/cave/explored)
-"Sy" = (
+"QR" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/obj/effect/turf_decal/industrial/outline/grey,
+/obj/machinery/atmospherics/components/unary/portables_connector/visible,
+/obj/machinery/portable_atmospherics/canister/air,
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ruin/whitesands/pubbycrash/engine_room)
+"RC" = (
/obj/effect/spawner/lootdrop/maintenance/two,
/obj/item/stack/ore/salvage/scraptitanium,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/engine,
/area/ruin/whitesands/pubbycrash)
-"SO" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
- },
-/obj/machinery/atmospherics/components/binary/dp_vent_pump{
- dir = 8
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/gibspawner,
-/turf/open/floor/plasteel/tech/grid,
-/area/ruin/whitesands/pubbycrash)
-"SU" = (
+"RL" = (
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/structure/reagent_dispensers/fueltank,
/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel/tech,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden,
+/turf/open/floor/plasteel/patterned/grid,
/area/ruin/whitesands/pubbycrash)
-"Tg" = (
-/obj/structure/railing,
+"RT" = (
+/turf/closed/mineral/random/whitesands,
+/area/overmap_encounter/planetoid/cave/explored)
+"Sy" = (
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 4
+ },
/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/vomit/old,
-/obj/effect/mob_spawn/human/corpse/damaged/whitesands/survivor,
-/turf/open/floor/plastic,
-/area/ruin/whitesands/pubbycrash)
-"TB" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+/obj/structure/railing,
+/obj/structure/railing{
+ dir = 1
+ },
+/turf/open/floor/plasteel/stairs{
dir = 4
},
+/area/ruin/whitesands/pubbycrash/engine_room)
+"SO" = (
+/obj/effect/spawner/structure/window/shuttle,
+/obj/machinery/door/poddoor{
+ id = "whiteship_windows"
+ },
+/turf/open/floor/plating,
+/area/ruin/whitesands/pubbycrash/engine_room)
+"SU" = (
+/obj/effect/decal/fakelattice{
+ icon_state = "lattice-4"
+ },
+/turf/open/floor/plating/asteroid/whitesands/dried,
+/area/overmap_encounter/planetoid/cave/explored)
+"Tg" = (
+/obj/structure/window/reinforced{
+ dir = 8
+ },
+/obj/machinery/door/window/northleft{
+ dir = 4;
+ name = "Engine Access"
+ },
/obj/structure/cable{
- icon_state = "4-8"
+ icon_state = "0-8"
+ },
+/obj/structure/frame/machine,
+/obj/item/stack/cable_coil/cut/red,
+/obj/item/circuitboard/machine/shuttle/smes,
+/turf/open/floor/plating,
+/area/ruin/whitesands/pubbycrash/engine_room)
+"TB" = (
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+ dir = 1
},
-/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/cable{
- icon_state = "0-4"
+ icon_state = "4-8"
},
-/turf/open/floor/plasteel/dark,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/patterned/grid,
/area/ruin/whitesands/pubbycrash)
"TF" = (
-/obj/structure/sign/poster/official/random{
- pixel_x = 32
+/obj/structure/railing,
+/obj/structure/railing{
+ dir = 1
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
},
/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/ash/large,
-/turf/open/floor/plating{
- icon_state = "panelscorched";
- initial_gas_mix = "ws_atmos"
+/turf/open/floor/plasteel/stairs{
+ dir = 4
},
-/area/ruin/whitesands/pubbycrash)
+/area/ruin/whitesands/pubbycrash/split)
"Uo" = (
/obj/effect/turf_decal/spline/fancy/opaque/black,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/decal/cleanable/vomit/old,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/mob_spawn/human/corpse/nanotrasensoldier,
-/turf/open/floor/plasteel/dark,
-/area/ruin/whitesands/pubbycrash)
-"Us" = (
-/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/decal/cleanable/vomit/old,
-/mob/living/simple_animal/hostile/asteroid/whitesands/survivor{
- dir = 1;
- faction = list("saloon")
+ icon_state = "0-4"
},
-/obj/effect/mob_spawn/human/corpse/nanotrasensoldier,
+/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plasteel/dark,
/area/ruin/whitesands/pubbycrash)
-"Uy" = (
+"Us" = (
/obj/machinery/door/airlock/hatch{
welded = 1
},
@@ -2135,217 +2252,258 @@
/obj/machinery/door/firedoor/border_only,
/turf/open/floor/pod,
/area/ruin/whitesands/pubbycrash)
+"Uy" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/effect/decal/cleanable/plasma,
+/obj/effect/turf_decal/spline/fancy/opaque/black,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/dark,
+/area/ruin/whitesands/pubbycrash)
"Vj" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/on/layer4,
-/turf/open/floor/engine/hull,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/spline/fancy/opaque/black{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/plasteel/dark,
/area/ruin/whitesands/pubbycrash)
"Vt" = (
/turf/open/floor/plating/asteroid/whitesands/lit,
-/area/overmap_encounter/planetoid/sand)
+/area/overmap_encounter/planetoid/sand/explored)
"VG" = (
/obj/structure/sign/number/two,
-/obj/item/stack/ore/salvage/scrapmetal,
-/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/item/stack/ore/salvage/scraptitanium,
+/obj/effect/gibspawner,
/turf/open/floor/engine,
/area/ruin/whitesands/pubbycrash)
"VK" = (
/obj/structure/cable{
- icon_state = "2-8"
+ icon_state = "4-8"
},
-/obj/effect/turf_decal/industrial/outline/orange,
-/obj/machinery/portable_atmospherics/canister/toxins,
-/obj/machinery/atmospherics/components/unary/portables_connector/visible,
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ruin/whitesands/pubbycrash)
+/obj/structure/reagent_dispensers/fueltank,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/tech,
+/area/ruin/whitesands/pubbycrash/engine_room)
"VP" = (
/obj/effect/decal/fakelattice{
icon_state = "lattice-2"
},
/turf/open/floor/plating/asteroid/whitesands/lit,
-/area/overmap_encounter/planetoid/sand)
-"Wg" = (
-/obj/structure/frame/machine,
-/obj/item/stack/cable_coil/cut/red,
-/obj/item/stack/ore/salvage/scrapgold,
-/obj/item/stack/ore/salvage/scrapgold,
-/turf/open/floor/plating,
-/area/ruin/whitesands/pubbycrash)
-"Wo" = (
-/obj/structure/bed/dogbed{
- anchored = 1;
- name = "citrus's bed"
+/area/overmap_encounter/planetoid/sand/explored)
+"VZ" = (
+/obj/machinery/door/firedoor/border_only{
+ dir = 1
},
-/obj/effect/turf_decal/spline/fancy/opaque/black{
- dir = 9
+/obj/effect/spawner/structure/window/shuttle,
+/obj/machinery/door/poddoor{
+ id = "whiteship_windows"
},
-/obj/machinery/light/directional/east,
-/turf/open/floor/pod,
-/area/ruin/whitesands/pubbycrash)
-"WD" = (
-/obj/effect/turf_decal/industrial/stand_clear,
-/obj/effect/turf_decal/industrial/warning,
-/obj/effect/spawner/lootdrop/maintenance,
+/turf/open/floor/plating,
+/area/ruin/whitesands/pubbycrash/split)
+"Wg" = (
+/obj/structure/sign/number/two,
+/obj/item/stack/ore/salvage/scrapmetal,
/obj/effect/decal/cleanable/dirt,
+/obj/effect/spawner/lootdrop/maintenance/two,
/turf/open/floor/engine,
/area/ruin/whitesands/pubbycrash)
-"Xm" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/ash,
-/turf/open/floor/plating{
- icon_state = "panelscorched";
- initial_gas_mix = "ws_atmos"
- },
-/area/ruin/whitesands/pubbycrash)
-"Xn" = (
-/obj/effect/turf_decal/industrial/caution,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/railing/corner{
+"Wo" = (
+/obj/structure/railing{
dir = 8
},
-/obj/structure/catwalk,
-/obj/machinery/button/door{
- id = "whiteshipubbyEngines";
- name = "Engine Lockdown Control";
- pixel_x = -25;
- dir = 4
+/obj/effect/turf_decal/industrial/outline/yellow,
+/obj/effect/turf_decal/industrial/warning{
+ dir = 8
},
-/obj/structure/salvageable/destructive_analyzer,
+/obj/machinery/airalarm/directional/north,
+/obj/machinery/suit_storage_unit/open,
+/turf/open/floor/plasteel/dark,
+/area/ruin/whitesands/pubbycrash)
+"WD" = (
+/obj/item/stack/ore/salvage/scraptitanium,
/turf/open/floor/plating,
/area/ruin/whitesands/pubbycrash)
-"XA" = (
-/obj/structure/railing{
- dir = 8
- },
-/obj/item/kirbyplants/random,
-/obj/structure/railing{
+"Xi" = (
+/obj/item/radio/intercom/directional/west,
+/obj/structure/chair/office/light{
dir = 4
},
-/obj/machinery/light/directional/south,
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
- dir = 1
- },
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
+/turf/open/floor/plasteel/grimy,
+/area/ruin/whitesands/pubbycrash)
+"Xm" = (
+/obj/item/t_scanner/adv_mining_scanner/lesser,
+/obj/item/kinetic_crusher,
+/obj/structure/rack,
+/obj/item/pickaxe/mini,
+/obj/item/pickaxe/mini,
+/obj/effect/turf_decal/siding/brown,
+/obj/item/gun/energy/kinetic_accelerator,
+/obj/machinery/firealarm/directional/south,
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ruin/whitesands/pubbycrash/split)
+"Xn" = (
+/obj/structure/sign/nanotrasen,
+/turf/closed/wall/mineral/titanium/nodiagonal,
/area/ruin/whitesands/pubbycrash)
+"XA" = (
+/obj/item/stack/ore/salvage/scrapmetal/five,
+/turf/open/floor/plating/asteroid/whitesands/dried,
+/area/overmap_encounter/planetoid/cave/explored)
"XK" = (
-/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/turf_decal/spline/fancy/opaque/black{
dir = 1
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/firealarm/directional/west,
+/obj/item/stack/ore/salvage/scraptitanium,
+/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/dark,
/area/ruin/whitesands/pubbycrash)
"Yt" = (
-/obj/machinery/newscaster/directional/west,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/ash/large,
-/turf/open/floor/plating{
- icon_state = "panelscorched";
- initial_gas_mix = "ws_atmos"
+/obj/structure/reagent_dispensers/servingdish,
+/obj/structure/table/reinforced,
+/obj/item/kitchen/spoon/plastic{
+ pixel_x = 6
},
-/area/ruin/whitesands/pubbycrash)
+/obj/item/kitchen/spoon/plastic{
+ pixel_x = -1
+ },
+/obj/item/kitchen/spoon/plastic{
+ pixel_x = 13
+ },
+/turf/open/floor/plastic,
+/area/ruin/whitesands/pubbycrash/split)
"Yu" = (
-/obj/structure/cable/yellow{
- icon_state = "1-2"
+/obj/structure/girder,
+/turf/open/floor/plating,
+/area/ruin/whitesands/pubbycrash/engine_room)
+"YC" = (
+/obj/structure/railing/corner{
+ dir = 1
},
-/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/turf_decal/industrial/warning/corner{
- dir = 4
+ dir = 1
},
-/obj/machinery/light/directional/east,
-/obj/effect/turf_decal/number/four{
- dir = 4
+/obj/structure/table/reinforced,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 8
},
-/turf/open/floor/plasteel/tech,
-/area/ruin/whitesands/pubbycrash)
-"YC" = (
-/obj/structure/closet/wall/white{
- dir = 1;
- name = "Medicine storage";
- pixel_y = -30
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 6
},
-/obj/item/storage/firstaid/ancient{
- pixel_x = 6;
- pixel_y = -5
+/obj/structure/reagent_dispensers/servingdish,
+/obj/item/kitchen/spoon/plastic{
+ pixel_x = -1
},
-/obj/item/storage/firstaid/medical,
-/obj/structure/sign/poster/official/random{
- pixel_x = 32
+/obj/item/kitchen/spoon/plastic{
+ pixel_x = 13
},
-/turf/open/floor/pod,
+/obj/item/kitchen/spoon/plastic{
+ pixel_x = 6
+ },
+/turf/open/floor/plasteel/dark,
/area/ruin/whitesands/pubbycrash)
"YL" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/power/terminal{
+ dir = 8
+ },
/obj/structure/cable{
- icon_state = "2-4"
+ icon_state = "0-4"
},
-/obj/effect/turf_decal/industrial/outline/grey,
-/obj/machinery/atmospherics/components/unary/portables_connector/visible,
-/obj/machinery/portable_atmospherics/canister/air,
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ruin/whitesands/pubbycrash)
+/obj/machinery/portable_atmospherics/canister/toxins,
+/turf/open/floor/plasteel/tech,
+/area/ruin/whitesands/pubbycrash/engine_room)
"Zg" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
- dir = 8
+/turf/open/floor/engine/hull,
+/area/overmap_encounter/planetoid/cave/explored)
+"Zj" = (
+/obj/effect/decal/fakelattice{
+ icon_state = "lattice-3"
+ },
+/turf/open/floor/plating/asteroid/whitesands/dried,
+/area/overmap_encounter/planetoid/cave/explored)
+"Zk" = (
+/obj/effect/gibspawner,
+/turf/open/floor/plating,
+/area/ruin/whitesands/pubbycrash)
+"Zp" = (
+/obj/structure/table/reinforced,
+/obj/machinery/power/apc/auto_name/directional/north{
+ start_charge = 0
+ },
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/obj/item/flashlight/lamp{
+ pixel_x = -6;
+ pixel_y = 8
},
+/obj/effect/decal/cleanable/dirt,
/obj/structure/railing{
dir = 8
},
-/obj/structure/catwalk,
-/obj/effect/turf_decal/spline/fancy/opaque/black{
- dir = 8
+/obj/item/photo{
+ pixel_y = -12
},
-/obj/structure/salvageable/protolathe,
-/turf/open/floor/plating,
-/area/ruin/whitesands/pubbycrash)
-"Zj" = (
-/turf/open/floor/engine/hull,
-/area/ruin/whitesands/pubbycrash)
-"Zk" = (
-/obj/structure/railing/corner{
- dir = 4
+/obj/item/toy/figure/captain{
+ pixel_x = 7;
+ pixel_y = 12
},
-/obj/effect/turf_decal/siding/brown{
- dir = 1
+/obj/item/stack/ore/salvage/scrapmetal,
+/turf/open/floor/plasteel/tech,
+/area/ruin/whitesands/pubbycrash)
+"Zu" = (
+/obj/machinery/light/directional/west,
+/obj/structure/cable{
+ icon_state = "1-2"
},
-/obj/structure/closet/wall{
- icon_door = "orange_wall";
- name = "Mining equipment";
- pixel_y = 28
+/obj/structure/table/reinforced,
+/obj/item/paper_bin{
+ pixel_x = -4
},
-/obj/item/clothing/glasses/meson,
-/obj/item/clothing/glasses/meson,
-/obj/item/storage/bag/ore,
-/obj/item/storage/bag/ore,
-/obj/item/clothing/suit/hazardvest,
-/obj/item/clothing/suit/hazardvest,
-/obj/structure/cable{
- icon_state = "0-4"
+/obj/item/folder/blue{
+ pixel_x = 3;
+ pixel_y = 2
},
-/obj/effect/decal/cleanable/cobweb,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ruin/whitesands/pubbycrash)
-"Zp" = (
+/obj/item/folder/white,
+/obj/item/pen,
/obj/structure/railing{
- dir = 1
+ dir = 8
},
-/obj/effect/turf_decal/siding/brown{
- dir = 1
+/obj/item/stamp/captain{
+ pixel_x = -6;
+ pixel_y = 8
+ },
+/obj/item/spacecash/bundle/c1000{
+ pixel_x = 2;
+ pixel_y = -14
+ },
+/obj/item/spacecash/bundle/c1000{
+ pixel_x = 2;
+ pixel_y = -14
+ },
+/obj/item/spacecash/bundle/c1000{
+ pixel_x = 4;
+ pixel_y = -16
},
+/turf/open/floor/plasteel/tech,
+/area/ruin/whitesands/pubbycrash)
+"Zx" = (
/obj/structure/cable{
- icon_state = "4-8"
+ icon_state = "1-2"
},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+/obj/machinery/atmospherics/pipe/manifold/orange/hidden{
dir = 4
},
-/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/oil,
+/obj/effect/decal/cleanable/vomit/old,
/turf/open/floor/plasteel/tech/techmaint,
-/area/ruin/whitesands/pubbycrash)
+/area/ruin/whitesands/pubbycrash/engine_room)
(1,1,1) = {"
Gl
@@ -2354,15 +2512,15 @@ Gl
Gl
Gl
Gl
-RT
-RT
-RT
-RT
-RT
-RT
-RT
-RT
-RT
+Gl
+Gl
+Gl
+Gl
+Gl
+Gl
+Gl
+Gl
+Gl
Gl
Gl
Gl
@@ -2378,22 +2536,22 @@ Gl
Gl
Gl
RT
-RT
-RT
-RT
-RT
-RT
-RT
-RT
-RT
-RT
-RT
-RT
-RT
-RT
-RT
-RT
-RT
+Gl
+Gl
+Gl
+Gl
+Gl
+Gl
+Gl
+Gl
+Gl
+Gl
+Gl
+Gl
+Gl
+Gl
+Gl
+Gl
Gl
Gl
Gl
@@ -2403,25 +2561,25 @@ Gl
"}
(3,1,1) = {"
Gl
+Gl
RT
RT
-RT
-RT
-RT
-RT
-RT
-RT
-RT
-RT
-RT
-RT
-RT
-RT
-RT
-RT
-RT
-RT
-RT
+Vt
+Vt
+Vt
+Gl
+Gl
+Gl
+Vt
+Vt
+Gl
+Vt
+Vt
+Gl
+Gl
+Gl
+Gl
+Gl
Gl
Gl
Gl
@@ -2433,24 +2591,24 @@ Gl
RT
RT
RT
-RT
-cN
-dW
-Eb
-LM
-cN
-Ky
-cN
-cN
-Hq
-Wg
-cN
-RT
-RT
-RT
-RT
-RT
Vt
+Vt
+Vt
+Vt
+Vt
+Vt
+Vt
+Vt
+Vt
+Vt
+Vt
+Vt
+Vt
+RT
+Gl
+Gl
+Gl
+Gl
Gl
Gl
Gl
@@ -2459,135 +2617,135 @@ Gl
Gl
RT
RT
-RT
-RT
-cN
-qz
-GF
-cN
-cN
-SO
-oo
-cN
+Vt
+Vt
+Vt
+Vt
+Vt
+Vt
+Vt
+Vt
+Vt
+Vt
Fc
-Ml
-cN
-RT
-RT
-RT
-RT
-RT
Vt
Vt
+Vt
+RT
+RT
+Gl
+Gl
Gl
Gl
-"}
-(6,1,1) = {"
Gl
Gl
+"}
+(6,1,1) = {"
RT
RT
RT
-cN
+Vt
+Vt
+Vt
QI
-dm
-cN
-cN
+AJ
+AJ
+bS
mW
-cN
-Ji
+Vt
+sA
PZ
fO
-cN
-RT
+SU
+Vt
RT
RT
RT
-Vt
-Vt
-Vt
Gl
Gl
-"}
-(7,1,1) = {"
Gl
Gl
+Gl
+"}
+(7,1,1) = {"
RT
RT
RT
-cN
+RT
+AJ
+AJ
SU
HQ
-cN
-xA
+sA
+oS
pu
Et
-jG
+AJ
yU
oS
Dx
+AJ
RT
RT
RT
-RT
-Vt
-Vt
-Vt
Gl
Gl
-"}
-(8,1,1) = {"
Gl
Gl
+Gl
+"}
+(8,1,1) = {"
RT
RT
RT
-cN
+RT
+AJ
+xX
rW
sV
-cN
-Pr
+Bw
+xX
Qw
-LU
+xX
Yu
kP
AH
-Dx
+xX
+AJ
RT
RT
RT
RT
Vt
-Vt
-Vt
-Vt
+Gl
+Gl
Gl
"}
(9,1,1) = {"
Gl
-Gl
RT
RT
RT
-cN
-cN
+RT
+xX
+Tg
Qu
-cN
-Ha
+xX
+xX
Hb
ln
-cN
+xX
DY
PI
-cN
-RT
+xX
+AJ
+AJ
RT
RT
RT
Vt
Vt
-Vt
-Vt
+Gl
Gl
"}
(10,1,1) = {"
@@ -2595,27 +2753,27 @@ Gl
RT
RT
RT
-Vj
-GA
+RT
+xX
YL
iW
-Xn
-Zg
+xX
+xX
pe
-wV
+xX
so
lB
re
-cN
-Zj
+xX
+RT
+AJ
RT
RT
Vt
Vt
Vt
-Vt
-Vt
-Vt
+Gl
+Gl
"}
(11,1,1) = {"
RT
@@ -2623,71 +2781,72 @@ RT
RT
RT
AJ
-cN
+xX
VK
ho
-Ho
+xX
Dg
Cs
zP
KO
xa
Ew
-cN
+SO
+RT
AJ
RT
RT
Vt
Vt
Vt
-Vt
-Vt
-Vt
+Gl
+Gl
"}
(12,1,1) = {"
RT
RT
RT
-RT
-sA
-cN
-LW
-LW
-cN
-cN
+AJ
+AJ
+xX
+aR
+yj
+xX
+xH
gG
-cN
-cN
-LW
+dW
+ET
+Pu
LW
-cN
-sA
+SO
+AJ
+AJ
RT
RT
Vt
Vt
Vt
Vt
-Vt
-Vt
+Gl
"}
(13,1,1) = {"
+Gl
RT
RT
RT
-RT
-RT
-RT
-aR
+AJ
+xX
+xX
Sy
-ET
+xX
cp
PA
fR
-AO
+xX
jt
Mi
-ek
+xX
+AJ
RT
RT
RT
@@ -2695,27 +2854,26 @@ Vt
Vt
Vt
Vt
-Vt
-Vt
+Gl
"}
(14,1,1) = {"
+Gl
RT
RT
RT
-RT
-RT
-RT
-RT
+jG
+Ha
+QR
Bz
pT
JI
Lm
BH
-KS
-up
-RT
-RT
-RT
+KS
+up
+qz
+xX
+Zg
RT
RT
Vt
@@ -2726,14 +2884,14 @@ Vt
Vt
"}
(15,1,1) = {"
-Gl
-RT
-RT
RT
RT
RT
+AJ
+ch
+xX
gL
-vc
+Zx
bW
DQ
gu
@@ -2741,52 +2899,52 @@ Ct
gy
fX
vc
+xX
+ch
RT
RT
-RT
-RT
-bZ
Vt
Vt
Vt
Vt
-Gl
+Vt
+Vt
"}
(16,1,1) = {"
-Gl
-Gl
RT
RT
RT
-pR
-eq
+AJ
+Ai
+xX
vL
-FP
-KI
+vL
+xX
+xX
QD
-vw
-lK
-RT
-VG
-WD
-RT
-RT
-RT
-bZ
+xX
+xX
+vL
+vL
+xX
+Ai
+AJ
+AJ
+Vt
+Vt
Vt
Vt
Vt
Vt
-Gl
"}
(17,1,1) = {"
-Gl
-Gl
RT
RT
+AJ
+AJ
sA
-cN
-cN
+Zj
+tB
RC
zX
Uo
@@ -2794,26 +2952,26 @@ nQ
XK
FY
nP
-cN
-cN
-sA
+VG
+dm
+AJ
+AJ
RT
RT
-bZ
Vt
Vt
Vt
Vt
-Gl
+Vt
"}
(18,1,1) = {"
-Gl
-Gl
RT
RT
RT
-ck
-Kt
+AJ
+AJ
+RT
+RT
Bd
fA
IQ
@@ -2823,49 +2981,49 @@ zi
oq
hh
ck
-ba
-Cw
+AJ
+RT
+RT
+RT
Vt
Vt
Vt
Vt
Vt
-Gl
-Gl
"}
(19,1,1) = {"
-Gl
-Gl
RT
RT
RT
-cN
-cN
-cN
-cN
-cN
+RT
+AJ
+RT
+vw
+Ho
+xz
+ih
yK
-cN
-cN
-cN
-cN
-cN
-cN
-Vt
-Cw
+Kt
+di
+mp
+Ho
+hh
+AJ
+AJ
+RT
+AJ
Vt
Vt
Vt
Vt
Gl
-Gl
"}
(20,1,1) = {"
-Gl
-Gl
RT
RT
RT
+RT
+AJ
pG
Di
ff
@@ -2874,35 +3032,143 @@ Uy
co
ly
PK
-jF
-mH
+hh
+Wg
+hh
+RT
+AJ
+Vt
+bZ
Vt
-IC
Vt
Vt
-Cw
-VP
-gx
Vt
-Gl
Gl
"}
(21,1,1) = {"
Gl
-Gl
-RT
RT
RT
RT
-In
+Xn
+vX
+vX
Wo
YC
-cN
+Gp
RL
-cN
+Vj
Fq
If
+vX
+vX
+Xn
+RT
+Vt
+bZ
+Vt
+Vt
+Vt
+Vt
+Gl
+"}
+(22,1,1) = {"
+Gl
+RT
+RT
+RT
+AJ
+KI
+IU
+AO
+wn
+lK
+TB
+Li
+mH
+PY
+pR
+KI
+fr
+Cw
+Vt
+Vt
+Vt
+Vt
+Vt
+Gl
+Gl
+"}
+(23,1,1) = {"
+Gl
+RT
+RT
+RT
+AJ
+vX
+vX
+vX
+vX
+vX
+xy
+vX
+vX
+vX
+vX
+vX
+vX
+Vt
+Cw
+Vt
+Vt
+Vt
+Vt
+Gl
+Gl
+"}
+(24,1,1) = {"
+RT
+RT
+RT
+RT
+AJ
+jA
+kA
+NI
+Lj
+Us
+sC
+rZ
+Zk
+WD
+ul
+AJ
+IC
+Vt
+Vt
+Cw
+VP
+gx
Vt
+Gl
+Gl
+"}
+(25,1,1) = {"
+RT
+RT
+RT
+RT
+RT
+AJ
+KT
+ct
+oo
+vX
+nG
+vX
+Ls
+xA
+AJ
Vt
kp
Cw
@@ -2914,224 +3180,223 @@ RT
Gl
Gl
"}
-(22,1,1) = {"
+(26,1,1) = {"
Gl
RT
RT
RT
-cN
-cN
-cN
-cN
-cN
-cN
-TB
-cN
-mH
-IC
+vX
+vX
+vX
+vX
+vX
+vX
+Ga
+vX
+ul
+XA
RT
Vt
Vt
Vt
-cN
-cN
-cN
-cN
+AA
+AA
+AA
+AA
RT
Gl
Gl
"}
-(23,1,1) = {"
+(27,1,1) = {"
Gl
RT
RT
RT
-iw
+wV
+Xi
+Fn
+IR
vX
-rZ
-QR
-cN
-Ak
-xy
-Pu
-Cw
-Vt
+Mr
+Gi
+In
+ym
+AJ
RT
VP
gx
xc
-cN
-Zk
-Ls
-cN
+AA
+sD
+rT
+AA
RT
RT
Gl
"}
-(24,1,1) = {"
-Gl
+(28,1,1) = {"
Gl
RT
RT
-iw
-jA
-kA
-NI
-Lj
-Us
-sC
-cN
-Vt
+RT
+wV
+Eb
+Ak
+kM
+ss
+Og
+kU
+vX
+AJ
RT
RT
IC
lR
nq
-cN
-Zp
-bS
-cN
+AA
+vO
+Xm
+AA
RT
RT
Gl
"}
-(25,1,1) = {"
-Gl
+(29,1,1) = {"
Gl
RT
RT
-iw
-PY
-KT
-ct
-cN
-Ig
-nG
-cN
-Vt
+RT
+wV
+Ji
+Hq
+KB
+vX
+hz
+cx
+vX
+AJ
RT
Vt
Vt
-cN
-cN
-cN
-Fn
-wn
-cN
+AA
+AA
+AA
+TF
+uB
+AA
RT
RT
Gl
"}
-(26,1,1) = {"
-Gl
+(30,1,1) = {"
Gl
RT
RT
-cN
-yj
-Cg
-fk
-cN
-BD
-Ga
-cN
-ul
-Cw
+RT
+vX
+iw
+Bi
+Ik
+vX
+Dn
+lA
+vX
+Qo
+ym
Cw
sd
-Eh
-hA
-yx
-pE
-XA
-cN
+as
+Pr
+ON
+jF
+eq
+AA
RT
RT
RT
"}
-(27,1,1) = {"
-Gl
+(31,1,1) = {"
Gl
RT
RT
-cN
-cN
-cN
-cN
-cN
-cN
-Gi
-cN
-Jz
+RT
+vX
+vX
+vX
+vX
+vX
+vX
+Cg
+vX
+LM
kp
Vt
Vt
-cN
-gg
-Tg
-sD
-rT
-iw
+AA
+Yt
+mU
+Fo
+no
+VZ
RT
RT
RT
"}
-(28,1,1) = {"
-Gl
+(32,1,1) = {"
Gl
RT
RT
RT
RT
-cN
-kM
-ss
-Og
-kU
-If
-yt
+RT
+vX
+Zp
+Zu
+FP
+AD
+xA
+ab
Vt
IC
Vt
+AA
+Em
+GK
cN
-as
-Ik
-vO
-Xm
-iw
+lI
+VZ
RT
RT
RT
"}
-(29,1,1) = {"
-Gl
+(33,1,1) = {"
Gl
Gl
RT
RT
RT
-cN
-KB
-Qb
-hz
-cx
+RT
+vX
+ba
+gg
+pE
+ek
uh
-oO
-mp
+yx
+Zj
gx
Vt
-cN
+AA
+Oz
+Ig
+Ml
DB
-di
-TF
-uB
-iw
+VZ
RT
RT
RT
"}
-(30,1,1) = {"
-Gl
+(34,1,1) = {"
Gl
Gl
RT
@@ -3139,27 +3404,26 @@ RT
RT
RT
RT
-Mr
-Dn
-lA
-If
-Qo
-ym
+RT
+LU
+GA
+oO
+xA
+BD
+Qb
gs
Cw
-cN
-cN
-cN
-cN
-cN
-cN
+AA
+AA
+AA
+AA
+AA
+AA
RT
RT
RT
"}
-(31,1,1) = {"
-Gl
-Gl
+(35,1,1) = {"
Gl
RT
RT
@@ -3169,23 +3433,24 @@ RT
RT
RT
RT
-cN
-IC
+RT
+RT
+vX
+XA
Vt
Vt
Vt
-cN
-Yt
-mU
-cN
-cN
-AJ
+AA
+GF
+ge
+AA
+AA
+Ky
RT
RT
Gl
"}
-(32,1,1) = {"
-Gl
+(36,1,1) = {"
Gl
RT
RT
@@ -3197,21 +3462,22 @@ RT
RT
RT
RT
+RT
Vt
Cw
VP
nq
EG
-Em
-GK
-cN
-AJ
+Eh
+fk
+AA
+Ky
RT
RT
RT
Gl
"}
-(33,1,1) = {"
+(37,1,1) = {"
Gl
Gl
RT
@@ -3228,17 +3494,17 @@ kp
IC
Vt
qN
-cN
-Oz
-cN
-AJ
+AA
+oj
+AA
+Ky
RT
RT
RT
RT
Gl
"}
-(34,1,1) = {"
+(38,1,1) = {"
Gl
Gl
Gl
@@ -3265,7 +3531,7 @@ Gl
Gl
Gl
"}
-(35,1,1) = {"
+(39,1,1) = {"
Gl
Gl
Gl
@@ -3292,7 +3558,7 @@ Gl
Gl
Gl
"}
-(36,1,1) = {"
+(40,1,1) = {"
Gl
Gl
Gl
diff --git a/_maps/RandomRuins/SpaceRuins/astraeus.dmm b/_maps/RandomRuins/SpaceRuins/astraeus.dmm
index bafc48460b64..adf957299b7a 100644
--- a/_maps/RandomRuins/SpaceRuins/astraeus.dmm
+++ b/_maps/RandomRuins/SpaceRuins/astraeus.dmm
@@ -937,7 +937,7 @@
name = "paper - Munitions Inventory";
pixel_x = 7
},
-/obj/item/book/manual/wiki/engineering_hacking{
+/obj/item/book/manual/wiki/hacking{
pixel_x = -6
},
/turf/open/floor/plasteel/airless,
diff --git a/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm b/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm
index 58799b7c71ca..a4f6006bf88b 100644
--- a/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm
+++ b/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm
@@ -522,7 +522,7 @@
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/derelictoutpost/powerstorage)
"bI" = (
-/obj/item/gun/ballistic/automatic/pistol/m1911{
+/obj/item/gun/ballistic/automatic/pistol/candor{
spawnwithmagazine = 0
},
/turf/open/floor/plasteel,
@@ -1333,7 +1333,7 @@
desc = "A thick gelatinous surface covers the floor. Someone get the golashes.";
name = "gelatinous floor"
},
-/obj/item/gun/ballistic/automatic/pistol/m1911{
+/obj/item/gun/ballistic/automatic/pistol/candor{
spawnwithmagazine = 0
},
/obj/item/ammo_box/magazine/m45,
@@ -1493,7 +1493,7 @@
/turf/open/floor/plating,
/area/ruin/space/has_grav/derelictoutpost)
"dJ" = (
-/obj/item/gun/ballistic/automatic/pistol/m1911{
+/obj/item/gun/ballistic/automatic/pistol/candor{
spawnwithmagazine = 0
},
/obj/structure/alien/weeds{
diff --git a/_maps/RandomRuins/SpaceRuins/clericden.dmm b/_maps/RandomRuins/SpaceRuins/clericden.dmm
index b70a3ada2857..e163b6f46cea 100644
--- a/_maps/RandomRuins/SpaceRuins/clericden.dmm
+++ b/_maps/RandomRuins/SpaceRuins/clericden.dmm
@@ -578,7 +578,7 @@
/turf/open/floor/plasteel/dark/airless,
/area/ruin/unpowered/no_grav)
"Cb" = (
-/obj/item/book/manual/wiki/barman_recipes,
+/obj/item/book/manual/wiki/drinks,
/obj/structure/fluff/paper/stack{
dir = 5
},
@@ -650,7 +650,7 @@
/turf/open/floor/carpet/airless,
/area/ruin/unpowered/no_grav)
"Fz" = (
-/obj/item/book/manual/wiki/engineering_construction,
+/obj/item/book/manual/wiki/construction,
/obj/structure/fluff/paper/stack{
dir = 9
},
diff --git a/_maps/RandomRuins/SpaceRuins/dangerous_research.dmm b/_maps/RandomRuins/SpaceRuins/dangerous_research.dmm
index f477717d9b81..28695ad57a80 100644
--- a/_maps/RandomRuins/SpaceRuins/dangerous_research.dmm
+++ b/_maps/RandomRuins/SpaceRuins/dangerous_research.dmm
@@ -192,7 +192,7 @@
"gC" = (
/obj/structure/table,
/obj/effect/turf_decal/corner/opaque/green/border,
-/obj/item/book/manual/wiki/infections,
+/obj/item/book/manual/wiki/chemistry,
/turf/open/floor/plasteel/white,
/area/ruin/space/has_grav)
"gH" = (
diff --git a/_maps/RandomRuins/SpaceRuins/fueldepot.dmm b/_maps/RandomRuins/SpaceRuins/fueldepot.dmm
index 478e36ffe5bb..abe9e9f4562c 100644
--- a/_maps/RandomRuins/SpaceRuins/fueldepot.dmm
+++ b/_maps/RandomRuins/SpaceRuins/fueldepot.dmm
@@ -224,7 +224,7 @@
dir = 8
},
/obj/effect/decal/cleanable/dirt/dust,
-/obj/item/gun/ballistic/shotgun/lethal,
+/obj/item/gun/ballistic/shotgun/brimstone,
/turf/open/floor/mineral/plastitanium,
/area/ruin/unpowered)
"hL" = (
diff --git a/_maps/RandomRuins/SpaceRuins/lab4071.dmm b/_maps/RandomRuins/SpaceRuins/lab4071.dmm
index b69f076fa2f6..86829ac573bd 100644
--- a/_maps/RandomRuins/SpaceRuins/lab4071.dmm
+++ b/_maps/RandomRuins/SpaceRuins/lab4071.dmm
@@ -3369,7 +3369,7 @@
pixel_y = -2
},
/obj/item/ammo_box/magazine/m45,
-/obj/item/gun/ballistic/automatic/pistol/m1911{
+/obj/item/gun/ballistic/automatic/pistol/candor{
pixel_x = -3;
pixel_y = 5
},
diff --git a/_maps/RandomRuins/SpaceRuins/oldcodeops.dmm b/_maps/RandomRuins/SpaceRuins/oldcodeops.dmm
deleted file mode 100644
index 3f8adfb07e98..000000000000
--- a/_maps/RandomRuins/SpaceRuins/oldcodeops.dmm
+++ /dev/null
@@ -1,732 +0,0 @@
-//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
-"ah" = (
-/obj/item/aicard,
-/obj/structure/table/greyscale,
-/turf/open/floor/oldshuttle,
-/area/ruin/powered)
-"bN" = (
-/obj/item/crowbar/large{
- desc = "It's a big crowbar. It doesn't fit in your pockets, because it's big. It feels oddly heavy..";
- force = 20;
- name = "heavy crowbar"
- },
-/turf/open/floor/oldshuttle,
-/area/ruin/powered)
-"bP" = (
-/turf/closed/wall,
-/area/template_noop)
-"cP" = (
-/obj/machinery/door/window{
- base_state = "right";
- dir = 8;
- icon_state = "right"
- },
-/turf/open/floor/oldshuttle,
-/area/ruin/powered)
-"fg" = (
-/obj/structure/chair/old{
- dir = 4
- },
-/turf/open/floor/oldshuttle,
-/area/ruin/powered)
-"fl" = (
-/obj/machinery/door/window{
- dir = 4
- },
-/turf/open/floor/oldshuttle,
-/area/ruin/powered)
-"fx" = (
-/obj/item/clothing/mask/gas/syndicate,
-/obj/item/clothing/shoes/sneakers/black,
-/obj/item/storage/backpack,
-/obj/item/clothing/under/color/black,
-/obj/item/gun/ballistic/automatic/pistol/deagle,
-/obj/structure/closet{
- icon_state = "oldcloset";
- name = "strange closet"
- },
-/obj/item/ammo_box/magazine/m50,
-/obj/item/clothing/suit/space/hardsuit/syndi/elite,
-/turf/open/floor/oldshuttle,
-/area/ruin/powered)
-"fO" = (
-/obj/item/gun/energy/laser/retro,
-/obj/item/gun/energy/laser/retro,
-/obj/structure/closet{
- icon_state = "oldcloset";
- name = "strange closet"
- },
-/turf/open/floor/oldshuttle,
-/area/ruin/powered)
-"gj" = (
-/obj/item/extinguisher,
-/turf/open/floor/oldshuttle,
-/area/ruin/powered)
-"gM" = (
-/obj/item/storage/toolbox/mechanical/old/clean{
- icon_state = "toolbox_red_old"
- },
-/obj/structure/rack,
-/turf/open/floor/oldshuttle,
-/area/ruin/powered)
-"iO" = (
-/obj/machinery/computer/operating{
- dir = 4
- },
-/turf/open/floor/oldshuttle,
-/area/ruin/powered)
-"iW" = (
-/turf/open/floor/oldshuttle,
-/area/ruin/powered)
-"jz" = (
-/turf/closed/indestructible/oldshuttle/corner{
- dir = 4
- },
-/area/ruin/powered)
-"md" = (
-/obj/item/weldingtool,
-/turf/open/floor/oldshuttle,
-/area/ruin/powered)
-"mW" = (
-/obj/effect/spawner/structure/window,
-/turf/open/floor/plating,
-/area/ruin/powered)
-"na" = (
-/obj/item/crowbar,
-/obj/item/stack/cable_coil,
-/obj/item/assembly/prox_sensor,
-/obj/structure/table/greyscale,
-/turf/open/floor/oldshuttle,
-/area/ruin/powered)
-"oP" = (
-/obj/item/storage/firstaid/ancient,
-/obj/structure/table/greyscale,
-/turf/open/floor/oldshuttle,
-/area/ruin/powered)
-"oX" = (
-/obj/structure/table/optable,
-/turf/open/floor/oldshuttle,
-/area/ruin/powered)
-"pM" = (
-/mob/living/simple_animal/hostile/syndicate/melee/sword/space/oldcode,
-/turf/open/floor/oldshuttle,
-/area/ruin/powered)
-"qg" = (
-/obj/item/stack/medical/ointment,
-/obj/structure/table/greyscale,
-/turf/open/floor/oldshuttle,
-/area/ruin/powered)
-"qy" = (
-/obj/structure/closet/crate/internals,
-/turf/open/floor/oldshuttle,
-/area/ruin/powered)
-"qQ" = (
-/obj/structure/table/greyscale,
-/turf/open/floor/oldshuttle,
-/area/ruin/powered)
-"rj" = (
-/obj/item/wrench,
-/obj/item/clothing/gloves/color/yellow,
-/obj/item/assembly/infra,
-/obj/item/assembly/infra,
-/obj/structure/table/greyscale,
-/turf/open/floor/oldshuttle,
-/area/ruin/powered)
-"rQ" = (
-/obj/structure/lattice,
-/turf/template_noop,
-/area/template_noop)
-"tZ" = (
-/turf/closed/indestructible/oldshuttle/corner,
-/area/ruin/powered)
-"uA" = (
-/obj/structure/closet/crate/medical,
-/turf/open/floor/oldshuttle,
-/area/ruin/powered)
-"uL" = (
-/obj/item/clothing/head/welding,
-/obj/structure/table/greyscale,
-/turf/open/floor/oldshuttle,
-/area/ruin/powered)
-"vk" = (
-/turf/template_noop,
-/area/template_noop)
-"wf" = (
-/turf/open/floor/plating/airless,
-/area/template_noop)
-"wH" = (
-/obj/machinery/microwave,
-/obj/structure/table/greyscale,
-/turf/open/floor/oldshuttle,
-/area/ruin/powered)
-"xO" = (
-/obj/structure/table/greyscale,
-/obj/item/storage/backpack/duffelbag/sec/surgery,
-/turf/open/floor/oldshuttle,
-/area/ruin/powered)
-"xT" = (
-/obj/item/stack/medical/bruise_pack,
-/obj/structure/table/greyscale,
-/turf/open/floor/oldshuttle,
-/area/ruin/powered)
-"yL" = (
-/obj/machinery/door/airlock/external,
-/turf/open/floor/oldshuttle,
-/area/ruin/powered)
-"zH" = (
-/mob/living/simple_animal/hostile/syndicate/ranged/space/oldcode,
-/turf/open/floor/oldshuttle,
-/area/ruin/powered)
-"Bf" = (
-/obj/structure/shuttle/engine/propulsion,
-/turf/open/space,
-/area/ruin/powered)
-"Cn" = (
-/obj/machinery/door/window{
- base_state = "right";
- dir = 4;
- icon_state = "right"
- },
-/turf/open/floor/oldshuttle,
-/area/ruin/powered)
-"Dy" = (
-/obj/item/pinpointer/nuke/syndicate,
-/obj/structure/table/greyscale,
-/turf/open/floor/oldshuttle,
-/area/ruin/powered)
-"FQ" = (
-/obj/structure/fans/tiny,
-/turf/open/floor/oldshuttle,
-/area/ruin/powered)
-"Ge" = (
-/obj/machinery/door/window,
-/turf/open/floor/oldshuttle,
-/area/ruin/powered)
-"Jh" = (
-/turf/closed/indestructible/oldshuttle/corner{
- dir = 8
- },
-/area/ruin/powered)
-"JB" = (
-/turf/open/floor/circuit,
-/area/ruin/powered)
-"KA" = (
-/obj/structure/table/greyscale,
-/obj/item/grenade/c4,
-/obj/item/grenade/c4,
-/turf/open/floor/oldshuttle,
-/area/ruin/powered)
-"KT" = (
-/obj/item/paper{
- default_raw_text = "Nuclear Explosives 101:\n\tHello and thank you for choosing the Syndicate for your nuclear information needs.\nToday's crash course will deal with the operation of a Fusion Class Nanotrasen made Nuclear Device.\nFirst and foremost, DO NOT TOUCH ANYTHING UNTIL THE BOMB IS IN PLACE.\nPressing any button on the compacted bomb will cause it to extend and bolt itself into place.\nIf this is done to unbolt it one must compeltely log in which at this time may not be possible.\nTo make the device functional:\n1. Place bomb in designated detonation zone\n2. Extend and anchor bomb (attack with hand).\n3. Insert Nuclear Auth. Disk into slot.\n4. Type numeric code into keypad ([]).\n\tNote: If you make a mistake press R to reset the device.\n5. Press the E button to log onto the device\nYou now have activated the device. To deactivate the buttons at anytime for example when\nyou've already prepped the bomb for detonation remove the auth disk OR press the R ont he keypad.\nNow the bomb CAN ONLY be detonated using the timer. A manual det. is not an option.\n\tNote: Nanotrasen is a pain in the neck.\nToggle off the SAFETY.\n\tNote: You wouldn't believe how many Syndicate Operatives with doctorates have forgotten this step\nSo use the - - and + + to set a det time between 5 seconds and 10 minutes.\nThen press the timer toggle button to start the countdown.\nNow remove the auth. disk so that the buttons deactivate.\n\tNote: THE BOMB IS STILL SET AND WILL DETONATE\nNow before you remvoe the disk if you need to mvoe the bomb you can:\nToggle off the anchor, move it, and re-anchor.\n\nGood luck. Remember the order:\nDisk, Code, Safety, Timer, Disk, RUN\nGood luck.\nIntelligence Analysts believe that they are hiding the disk in the control room emergency room"
- },
-/obj/structure/table/greyscale,
-/turf/open/floor/oldshuttle,
-/area/ruin/powered)
-"Mb" = (
-/obj/structure/shuttle/engine/heater,
-/turf/open/floor/plating{
- icon_state = "plating"
- },
-/area/ruin/powered)
-"MY" = (
-/obj/structure/chair/old{
- dir = 8
- },
-/turf/open/floor/oldshuttle,
-/area/ruin/powered)
-"NL" = (
-/obj/machinery/recharger,
-/obj/structure/table/greyscale,
-/turf/open/floor/oldshuttle,
-/area/ruin/powered)
-"NT" = (
-/obj/machinery/vending/cigarette,
-/turf/open/floor/oldshuttle,
-/area/ruin/powered)
-"OZ" = (
-/obj/item/storage/box/donkpockets,
-/obj/structure/table/greyscale,
-/turf/open/floor/oldshuttle,
-/area/ruin/powered)
-"Sn" = (
-/turf/closed/indestructible/oldshuttle/corner{
- dir = 1
- },
-/area/ruin/powered)
-"Sp" = (
-/obj/structure/sign/warning/securearea{
- desc = "A warning sign which reads 'EXTERNAL AIRLOCK'";
- name = "EXTERNAL AIRLOCK"
- },
-/turf/closed/indestructible/oldshuttle,
-/area/ruin/powered)
-"Sw" = (
-/obj/structure/rack,
-/obj/item/disk/nuclear/fake/obvious,
-/turf/open/floor/oldshuttle,
-/area/ruin/powered)
-"SP" = (
-/obj/machinery/sleeper/syndie{
- dir = 8
- },
-/turf/open/floor/oldshuttle,
-/area/ruin/powered)
-"SS" = (
-/obj/structure/rack,
-/obj/item/clothing/suit/space/syndicate,
-/obj/item/clothing/head/helmet/space/syndicate,
-/obj/item/tank/jetpack/oxygen,
-/turf/open/floor/oldshuttle,
-/area/ruin/powered)
-"Td" = (
-/turf/closed/indestructible/oldshuttle,
-/area/ruin/powered)
-"Ua" = (
-/obj/item/flashlight/lamp,
-/obj/structure/table/greyscale,
-/turf/open/floor/oldshuttle,
-/area/ruin/powered)
-"UO" = (
-/obj/machinery/door/window{
- dir = 8
- },
-/turf/open/floor/oldshuttle,
-/area/ruin/powered)
-"Vp" = (
-/obj/item/assembly/signaler,
-/obj/structure/table/greyscale,
-/turf/open/floor/oldshuttle,
-/area/ruin/powered)
-"VQ" = (
-/obj/structure/chair/old{
- dir = 1
- },
-/mob/living/simple_animal/hostile/syndicate/ranged/space/oldcode,
-/turf/open/floor/oldshuttle,
-/area/ruin/powered)
-"Wm" = (
-/obj/item/assembly/prox_sensor,
-/obj/structure/table/greyscale,
-/turf/open/floor/oldshuttle,
-/area/ruin/powered)
-"WP" = (
-/obj/structure/table/greyscale,
-/obj/item/bombcore,
-/turf/open/floor/oldshuttle,
-/area/ruin/powered)
-"XT" = (
-/obj/machinery/cell_charger,
-/obj/item/assembly/signaler,
-/obj/structure/table/greyscale,
-/turf/open/floor/oldshuttle,
-/area/ruin/powered)
-
-(1,1,1) = {"
-vk
-vk
-vk
-vk
-vk
-vk
-vk
-vk
-vk
-vk
-vk
-vk
-vk
-Jh
-Td
-Td
-Td
-Td
-Td
-Td
-Td
-jz
-"}
-(2,1,1) = {"
-vk
-vk
-vk
-vk
-vk
-vk
-vk
-Jh
-Td
-Td
-Td
-Td
-Td
-Td
-SP
-iW
-SP
-iW
-SP
-uA
-Mb
-Bf
-"}
-(3,1,1) = {"
-vk
-vk
-vk
-vk
-vk
-vk
-vk
-Td
-SS
-SS
-SS
-SS
-SS
-Td
-iO
-iW
-iO
-iW
-iO
-oX
-Mb
-Bf
-"}
-(4,1,1) = {"
-vk
-vk
-vk
-vk
-vk
-vk
-vk
-Td
-zH
-iW
-iW
-iW
-iW
-Td
-iW
-iW
-iW
-iW
-pM
-iW
-Mb
-Bf
-"}
-(5,1,1) = {"
-Jh
-Td
-Td
-Td
-jz
-vk
-vk
-Td
-iW
-fg
-fg
-iW
-iW
-Td
-xT
-iW
-iW
-oP
-Jh
-Td
-Td
-Sn
-"}
-(6,1,1) = {"
-Td
-wH
-OZ
-Dy
-Td
-jz
-Jh
-Td
-fO
-qQ
-ah
-iW
-iW
-Td
-qg
-iW
-iW
-xO
-Td
-vk
-vk
-vk
-"}
-(7,1,1) = {"
-Td
-iW
-iW
-iW
-Td
-Td
-Td
-Td
-Td
-Td
-Td
-fl
-Cn
-Td
-Td
-fl
-Cn
-Td
-Td
-Td
-jz
-vk
-"}
-(8,1,1) = {"
-Td
-Ua
-iW
-iW
-Td
-qQ
-fg
-fg
-fg
-fg
-iW
-iW
-iW
-iW
-iW
-iW
-iW
-md
-mW
-Mb
-Bf
-vk
-"}
-(9,1,1) = {"
-Td
-KT
-VQ
-iW
-Ge
-iW
-zH
-iW
-iW
-iW
-iW
-iW
-iW
-iW
-iW
-pM
-iW
-Ge
-JB
-Mb
-Bf
-vk
-"}
-(10,1,1) = {"
-Td
-NL
-iW
-iW
-Td
-qQ
-MY
-MY
-MY
-MY
-iW
-iW
-iW
-iW
-iW
-iW
-iW
-bN
-mW
-Mb
-Bf
-vk
-"}
-(11,1,1) = {"
-Td
-iW
-iW
-iW
-Td
-Td
-Td
-Td
-Td
-Td
-Td
-yL
-mW
-Td
-Td
-cP
-UO
-Td
-Td
-Td
-Sn
-vk
-"}
-(12,1,1) = {"
-Td
-NT
-iW
-fx
-Td
-Sn
-vk
-vk
-tZ
-Sp
-qQ
-iW
-iW
-Td
-XT
-iW
-iW
-gM
-Td
-vk
-vk
-vk
-"}
-(13,1,1) = {"
-tZ
-Td
-Td
-Td
-Sn
-vk
-vk
-vk
-vk
-FQ
-iW
-iW
-iW
-Td
-Vp
-iW
-iW
-gM
-tZ
-Td
-Td
-jz
-"}
-(14,1,1) = {"
-vk
-vk
-vk
-vk
-vk
-vk
-vk
-vk
-vk
-Sp
-iW
-iW
-Sw
-Td
-rj
-iW
-iW
-iW
-iW
-gj
-Mb
-Bf
-"}
-(15,1,1) = {"
-vk
-vk
-vk
-vk
-vk
-rQ
-bP
-vk
-vk
-tZ
-Td
-Td
-Td
-Td
-Wm
-iW
-iW
-iW
-iW
-zH
-Mb
-Bf
-"}
-(16,1,1) = {"
-vk
-vk
-vk
-vk
-rQ
-rQ
-vk
-vk
-vk
-vk
-vk
-vk
-tZ
-Td
-na
-qy
-KA
-uL
-qQ
-WP
-Mb
-Bf
-"}
-(17,1,1) = {"
-vk
-vk
-vk
-vk
-vk
-wf
-rQ
-vk
-vk
-vk
-vk
-vk
-vk
-tZ
-Td
-Td
-Td
-Td
-Td
-Td
-Td
-Sn
-"}
diff --git a/_maps/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/RandomRuins/SpaceRuins/oldstation.dmm
index 1b9136861194..635321fa9d4b 100644
--- a/_maps/RandomRuins/SpaceRuins/oldstation.dmm
+++ b/_maps/RandomRuins/SpaceRuins/oldstation.dmm
@@ -1507,7 +1507,6 @@
"ex" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/table,
-/obj/item/book/manual/wiki/security_space_law,
/obj/effect/turf_decal/corner/opaque/red{
dir = 1
},
diff --git a/_maps/RandomRuins/SpaceRuins/singularity_lab.dmm b/_maps/RandomRuins/SpaceRuins/singularity_lab.dmm
index 486cbbce85fd..3175796cd159 100644
--- a/_maps/RandomRuins/SpaceRuins/singularity_lab.dmm
+++ b/_maps/RandomRuins/SpaceRuins/singularity_lab.dmm
@@ -7011,7 +7011,7 @@
"Cb" = (
/obj/structure/table,
/obj/structure/spacevine,
-/obj/item/book/manual/wiki/engineering_guide,
+/obj/item/book/manual/wiki/engineering,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
dir = 6
},
@@ -11252,7 +11252,7 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
-/obj/item/book/manual/wiki/engineering_singulo_tesla,
+/obj/item/book/manual/wiki/engineering,
/turf/open/space/basic,
/area/space/nearstation)
"Rp" = (
diff --git a/_maps/RandomRuins/SpaceRuins/spacemall.dmm b/_maps/RandomRuins/SpaceRuins/spacemall.dmm
index 276292022795..c2efbe90506d 100644
--- a/_maps/RandomRuins/SpaceRuins/spacemall.dmm
+++ b/_maps/RandomRuins/SpaceRuins/spacemall.dmm
@@ -1085,7 +1085,7 @@
/area/ruin/space/has_grav/spacemall/dorms)
"eb" = (
/obj/structure/table/reinforced,
-/obj/item/book/manual/wiki/engineering_hacking,
+/obj/item/book/manual/wiki/hacking,
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/spacemall/shop)
"ed" = (
diff --git a/_maps/RandomRuins/WasteRuins/wasteplanet_lab.dmm b/_maps/RandomRuins/WasteRuins/wasteplanet_lab.dmm
index 617cde29db7b..c1ba42b3c415 100644
--- a/_maps/RandomRuins/WasteRuins/wasteplanet_lab.dmm
+++ b/_maps/RandomRuins/WasteRuins/wasteplanet_lab.dmm
@@ -99,7 +99,7 @@
/area/ruin/powered)
"fq" = (
/obj/structure/table,
-/obj/item/ammo_box/n762,
+/obj/item/ammo_box/c45_speedloader,
/turf/open/floor/plasteel/mono/white,
/area/ruin/powered)
"fJ" = (
@@ -165,12 +165,6 @@
"hl" = (
/turf/open/floor/plasteel/mono/dark,
/area/ruin/powered)
-"hL" = (
-/obj/structure/displaycase/noalert{
- start_showpiece_type = /obj/item/ammo_box/magazine/sniper_rounds
- },
-/turf/open/floor/plasteel,
-/area/ruin/powered)
"ih" = (
/obj/structure/table/wood/reinforced,
/obj/item/stack/sheet/mineral/uranium/five,
@@ -207,12 +201,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel,
/area/ruin/powered)
-"iE" = (
-/obj/structure/displaycase/noalert{
- start_showpiece_type = /obj/item/ammo_box/magazine/mm712x82
- },
-/turf/open/floor/plasteel,
-/area/ruin/powered)
"jn" = (
/obj/effect/turf_decal/industrial/warning{
dir = 1
@@ -313,12 +301,6 @@
/obj/item/modular_computer/laptop/preset,
/turf/open/floor/plasteel/dark,
/area/ruin/powered)
-"os" = (
-/obj/structure/displaycase/noalert{
- start_showpiece_type = /obj/item/ammo_box/magazine/smgm45
- },
-/turf/open/floor/plasteel,
-/area/ruin/powered)
"ov" = (
/obj/effect/turf_decal/corner/transparent/neutral/diagonal,
/obj/machinery/autolathe/hacked,
@@ -496,9 +478,7 @@
/turf/open/floor/plasteel/white,
/area/ruin/powered)
"wf" = (
-/obj/structure/displaycase/noalert{
- start_showpiece_type = /obj/item/ammo_box/magazine/co9mm
- },
+/obj/item/kirbyplants/random,
/turf/open/floor/plasteel,
/area/ruin/powered)
"wp" = (
@@ -626,9 +606,7 @@
/area/ruin/powered)
"BK" = (
/obj/effect/decal/cleanable/dirt,
-/obj/structure/displaycase/noalert{
- start_showpiece_type = /obj/item/ammo_box/magazine/mm712x82
- },
+/obj/item/kirbyplants/random,
/turf/open/floor/plasteel,
/area/ruin/powered)
"Cl" = (
@@ -866,9 +844,7 @@
/turf/open/floor/plasteel,
/area/ruin/powered)
"Ta" = (
-/obj/structure/displaycase/noalert{
- start_showpiece_type = /obj/item/ammo_box/magazine/ebr
- },
+/obj/item/kirbyplants/random,
/turf/open/floor/plating/rust,
/area/ruin/powered)
"Tb" = (
@@ -1179,7 +1155,7 @@ Rw
Rw
Rw
Ta
-iE
+wf
wf
GR
tD
@@ -1529,9 +1505,9 @@ Rw
Rw
Rw
Rw
-os
+wf
BK
-hL
+wf
GR
tD
tD
diff --git a/_maps/configs/inteq_valor.json b/_maps/configs/inteq_valor.json
new file mode 100644
index 000000000000..92162ac1a5da
--- /dev/null
+++ b/_maps/configs/inteq_valor.json
@@ -0,0 +1,40 @@
+{
+ "$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
+ "map_name": "Valor-Class Field Care Cruiser",
+ "prefix": "IRMV",
+ "description": "The Valor is the dedicated medical vessel of the Inteq fleet, suitable for treatment both for Inteq combat casualties, or paid treatment of outsiders. It's equipped with high-end medical equipment and a small ambulance for patient transport for this purpose.",
+ "tags": ["Medical", "Subshuttle"],
+ "namelists": [
+ "MYTHOLOGICAL",
+ "NATURAL",
+ "INTEQ"
+ ],
+ "map_short_name": "Valor-class",
+ "map_path": "_maps/shuttles/inteq/inteq_valor.dmm",
+ "limit": 1,
+ "job_slots": {
+ "Vanguard": {
+ "outfit": "/datum/outfit/job/inteq/captain",
+ "officer": true,
+ "slots": 1
+ },
+ "Honorable Corpsman": {
+ "outfit": "/datum/outfit/job/inteq/cmo/empty",
+ "officer": true,
+ "slots": 1
+ },
+ "Corpsman": {
+ "outfit": "/datum/outfit/job/inteq/paramedic/empty",
+ "slots": 3
+ },
+ "Enforcer": {
+ "outfit": "/datum/outfit/job/inteq/security/empty",
+ "slots": 2
+ },
+ "Recruit": {
+ "outfit": "/datum/outfit/job/inteq/assistant",
+ "slots": 2
+ }
+ },
+ "enabled": true
+}
diff --git a/_maps/configs/minutemen_asclepius.json b/_maps/configs/minutemen_asclepius.json
index 3877d1e24549..9498534f1700 100644
--- a/_maps/configs/minutemen_asclepius.json
+++ b/_maps/configs/minutemen_asclepius.json
@@ -46,5 +46,5 @@
"slots": 1
}
},
- "enabled": true
+ "enabled": false
}
diff --git a/_maps/configs/minutemen_cepheus.json b/_maps/configs/minutemen_cepheus.json
index e9b51f1b3a02..5de05fef0ceb 100644
--- a/_maps/configs/minutemen_cepheus.json
+++ b/_maps/configs/minutemen_cepheus.json
@@ -40,5 +40,5 @@
"slots": 3
}
},
- "enabled": true
+ "enabled": false
}
diff --git a/_maps/configs/minutemen_corvus.json b/_maps/configs/minutemen_corvus.json
deleted file mode 100644
index 0e424099b8cc..000000000000
--- a/_maps/configs/minutemen_corvus.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
- "$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
- "map_name": "Corvus-class Response Vessel",
- "prefix": "CMSV",
- "description": "A lightly equipped patrol vessel used by the Minutemen for extended operations in the Frontier. In many systems, a lone Corvus is the only sign of Minutemen presence, an image that is not helped by their widespread usage. The Corvus was originally a light personal vessel retrofitted for combat usage by the Colonial Militia, which was later adopted as their official remote infantry patrol ship as a symbol of colonial ingenuity and grit. First designated the Wallaby-class, until the crew of a now-legendary Wallaby-class known as the CMSV Corvus single handedly destroyed a Frontiersmen capital ship in 392.",
- "tags": [
- "Combat",
- "Riot"
- ],
- "namelists": [
- "COLONIAL MINUTEMEN",
- "MYTHOLOGICAL"
- ],
- "map_short_name": "Corvus-class",
- "map_path": "_maps/shuttles/minutemen/minutemen_corvus.dmm",
- "limit": 2,
- "job_slots": {
- "Captain": {
- "outfit": "/datum/outfit/job/minutemen/captain",
- "officer": true,
- "slots": 1
- },
- "Mechanic": {
- "outfit": "/datum/outfit/job/minutemen/engineer",
- "slots": 1
- },
- "Minuteman": {
- "outfit": "/datum/outfit/job/minutemen/security",
- "slots": 2
- },
- "Cadet": {
- "outfit": "/datum/outfit/job/minutemen/assistant",
- "slots": 2
- }
- },
- "enabled": true
-}
diff --git a/_maps/configs/minutemen_vela.json b/_maps/configs/minutemen_vela.json
index e7ea8ba86df4..01a494fa6eb6 100644
--- a/_maps/configs/minutemen_vela.json
+++ b/_maps/configs/minutemen_vela.json
@@ -53,5 +53,5 @@
"slots": 1
}
},
- "enabled": true
+ "enabled": false
}
diff --git a/_maps/configs/srm_glaive.json b/_maps/configs/srm_elder.json
similarity index 60%
rename from _maps/configs/srm_glaive.json
rename to _maps/configs/srm_elder.json
index 1c4cb6f91f86..82e104096b00 100644
--- a/_maps/configs/srm_glaive.json
+++ b/_maps/configs/srm_elder.json
@@ -1,20 +1,20 @@
{
"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
- "map_name": "SRM Glaive-class Hunter Vessel",
+ "map_name": "Elder-class Montagnes' Vessel",
"prefix": "SRSV",
"namelists": [
"SAINT-ROUMAIN",
"BEASTS"
],
- "map_short_name": "Glaive-class",
- "map_path": "_maps/shuttles/roumain/srm_glaive.dmm",
- "description": "A standard issue vessel to the highest ranks of the Saint-Roumain Militia. While “standard”, this class of vessel is unique to the Montagne that owns it. Each ship is designed around a central garden consisting of plants, soil, and a tree from the owning Montagnes’ home planet. As a highly religious ascetic order, the SRM supplies each Glaive with supplies to farm, raise animals, and perform medicine in more “natural” ways, using herbs and plants grown in house. Alongside this, the ship has a decent amount of mining equipment, and supplies required to begin the manufacturing of SRM-pattern firearms as is standard for Hunter’s Pride. The ship is captained by a Montagne, who oversees a team of Hunters, and Shadows apprenticing them.",
+ "map_short_name": "Elder-class",
+ "map_path": "_maps/shuttles/roumain/srm_elder.dmm",
+ "description": "A standard issue vessel to the highest ranks of the Saint-Roumain Militia. While “standard”, this class of vessel is unique to the Montagne that owns it. Each ship is designed around a central garden consisting of plants, soil, and a tree from the owning Montagnes’ home planet. As a highly religious ascetic order, the SRM supplies each Elder with supplies to farm, raise animals, and perform medicine in more “natural” ways, using herbs and plants grown in house. The ship is captained by a Montagne, who oversees a team of Hunters, and Shadows apprenticing them.",
"tags": [
- "Mining",
+ "Botany",
"Combat",
"Specialist"
],
- "map_id": "srm_glaive",
+ "map_id": "srm_elder",
"limit": 1,
"job_slots": {
"Hunter Montagne": {
diff --git a/_maps/configs/syndicate_aegis.json b/_maps/configs/syndicate_aegis.json
index 6863c4e11279..5946a8e78343 100644
--- a/_maps/configs/syndicate_aegis.json
+++ b/_maps/configs/syndicate_aegis.json
@@ -18,7 +18,7 @@
],
"job_slots": {
"Captain": {
- "outfit": "/datum/outfit/job/syndicate/captain",
+ "outfit": "/datum/outfit/job/syndicate/captain/suns",
"officer": true,
"slots": 1
},
@@ -34,7 +34,7 @@
},
"Mechanic": {
- "outfit": "/datum/outfit/job/syndicate/engineer",
+ "outfit": "/datum/outfit/job/syndicate/engineer/suns",
"slots": 1
},
diff --git a/_maps/configs/syndicate_luxembourg.json b/_maps/configs/syndicate_luxembourg.json
deleted file mode 100644
index 1433f2da547a..000000000000
--- a/_maps/configs/syndicate_luxembourg.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
- "$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
- "prefix": "SSV",
- "namelists": [
- "DONK",
- "MERCANTILE",
- "SPACE"
- ],
- "map_name": "Luxembourg-class Delivery Vessel",
- "description": "A dual-purpose delivery vessel and mobile storefront, Luxembourgs make up a substantial portion of Donk! Co.’s fleet on the Frontier, where the ever-opportunistic corporation has begun to fill the gaps left behind by the collapse of Nanotrasen’s logistics network. Donk! Co. managers have a great degree of autonomy, and so any given Luxembourg will often bear substantial modifications to the sales floor and on-board cafe, the better to entice new customers in an unstable yet lucrative region of space.",
- "tags": [
- "Robotics",
- "Cargo"
- ],
- "map_short_name": "Luxembourg-class",
- "map_path": "_maps/shuttles/syndicate/syndicate_luxembourg.dmm",
- "limit": 1,
- "starting_funds": 6000,
- "job_slots": {
- "Manager": {
- "outfit": "/datum/outfit/job/syndicate/quartermaster/donk",
- "slots": 1
- },
- "Customer Service Representative": {
- "outfit": "/datum/outfit/job/syndicate/cargo_tech/donk",
- "slots": 5
- },
- "Food and Beverage Specialist": {
- "outfit": "/datum/outfit/job/syndicate/bartender",
- "slots": 1
- },
- "GEC Contracted Engineer": {
- "outfit": "/datum/outfit/job/syndicate/engineer/gec",
- "slots": 1
- }
- },
- "enabled": true
-}
diff --git a/_maps/configs/syndicate_twinkleshine.json b/_maps/configs/syndicate_twinkleshine.json
index e5765b1691dd..ef84cca126f5 100644
--- a/_maps/configs/syndicate_twinkleshine.json
+++ b/_maps/configs/syndicate_twinkleshine.json
@@ -17,7 +17,7 @@
"map_short_name": "Twinkleshine-class",
"map_path": "_maps/shuttles/syndicate/syndicate_twinkleshine.dmm",
"job_slots": {
- "Captain": {
+ "Flotilla Admiral": {
"outfit": "/datum/outfit/job/syndicate/captain/twink",
"officer": true,
"slots": 1
@@ -27,6 +27,11 @@
"officer": true,
"slots": 1
},
+ "Redshield Officer": {
+ "outfit": "/datum/outfit/job/syndicate/hos/suns/twink",
+ "officer": true,
+ "slots": 1
+ },
"Medic": {
"outfit": "/datum/outfit/job/syndicate/paramedic/twink",
"slots": 2
diff --git a/_maps/map_catalogue.txt b/_maps/map_catalogue.txt
index 3d86570f326c..284e944454f4 100644
--- a/_maps/map_catalogue.txt
+++ b/_maps/map_catalogue.txt
@@ -337,8 +337,8 @@ Find the key for using this catalogue in "map_catalogue_key.txt"
Tags = "No Combat", "Minor Loot", "Inhospitable"
File Name = "_maps\RandomRuins\Ruins\whitesands_surface_pubbyslopcrash.dmm"
- Size = (x = 35)(y = 25)(z = 1)
- Tags = "Minor Combat Challange", "Medium Loot", "Shelter"
+ Size = (x = 40)(y = 25)(z = 1)
+ Tags = "Minor Combat Challenge", "Medium Loot", "Shelter"
diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm
index 0eccbd8fc0d0..bd415e97bae8 100644
--- a/_maps/map_files/generic/CentCom.dmm
+++ b/_maps/map_files/generic/CentCom.dmm
@@ -1516,7 +1516,6 @@
/area/centcom/ferry)
"arZ" = (
/obj/structure/table/reinforced,
-/obj/item/book/manual/wiki/security_space_law,
/obj/item/taperecorder,
/turf/open/floor/plasteel/grimy,
/area/centcom/ferry)
@@ -2209,7 +2208,6 @@
/turf/open/floor/wood,
/area/wizard_station)
"axw" = (
-/obj/machinery/vending/magivend,
/turf/open/floor/engine/cult,
/area/wizard_station)
"axx" = (
@@ -4458,7 +4456,7 @@
"aOO" = (
/obj/item/reagent_containers/food/condiment/enzyme,
/obj/item/reagent_containers/food/drinks/shaker,
-/obj/item/book/manual/wiki/barman_recipes,
+/obj/item/book/manual/wiki/drinks,
/obj/structure/closet/crate,
/turf/open/floor/plasteel,
/area/centcom/holding)
@@ -6238,7 +6236,6 @@
"bbL" = (
/obj/structure/table/wood,
/obj/item/folder/red,
-/obj/item/book/manual/wiki/security_space_law,
/obj/item/restraints/handcuffs,
/obj/item/assembly/flash/handheld,
/obj/effect/turf_decal/corner/transparent/neutral{
@@ -6600,7 +6597,6 @@
/area/centcom)
"bRK" = (
/obj/structure/table/reinforced,
-/obj/item/book/manual/wiki/security_space_law,
/obj/item/taperecorder,
/obj/effect/turf_decal/corner/transparent/neutral{
dir = 1
@@ -8375,7 +8371,6 @@
/turf/open/floor/plasteel/dark,
/area/centcom/supply)
"fsQ" = (
-/obj/item/book/manual/wiki/security_space_law,
/obj/item/taperecorder,
/obj/structure/table/wood,
/obj/effect/turf_decal/corner/transparent/neutral{
@@ -9236,7 +9231,7 @@
"hra" = (
/obj/structure/table/reinforced,
/obj/item/storage/lockbox/loyalty,
-/obj/item/gun/ballistic/automatic/assault/ar,
+/obj/item/gun/energy/e_gun/hades,
/obj/machinery/light/directional/north,
/obj/effect/turf_decal/industrial/warning,
/turf/open/floor/plasteel,
@@ -9299,7 +9294,6 @@
"hzR" = (
/obj/structure/table/wood,
/obj/item/folder/red,
-/obj/item/book/manual/wiki/security_space_law,
/obj/item/restraints/handcuffs,
/obj/item/assembly/flash/handheld,
/obj/effect/turf_decal/corner/transparent/neutral{
@@ -10564,7 +10558,6 @@
/area/centcom/evac)
"kel" = (
/obj/structure/table/reinforced,
-/obj/item/book/manual/wiki/security_space_law,
/obj/item/taperecorder,
/obj/effect/turf_decal/corner/transparent/neutral{
dir = 1
@@ -11270,7 +11263,6 @@
"lDl" = (
/obj/structure/table/wood,
/obj/item/folder/red,
-/obj/item/book/manual/wiki/security_space_law,
/obj/item/restraints/handcuffs,
/obj/item/assembly/flash/handheld,
/obj/machinery/airalarm/directional/south,
@@ -13392,7 +13384,7 @@
/area/centcom/holding)
"pDx" = (
/obj/structure/table/wood,
-/obj/item/book/manual/wiki/barman_recipes,
+/obj/item/book/manual/wiki/drinks,
/obj/item/reagent_containers/food/drinks/shaker,
/obj/item/reagent_containers/glass/rag,
/obj/machinery/newscaster/directional/north{
@@ -13823,7 +13815,6 @@
/area/centcom/control)
"qHN" = (
/obj/structure/table/reinforced,
-/obj/item/book/manual/wiki/security_space_law,
/obj/item/taperecorder,
/obj/effect/turf_decal/corner/transparent/neutral{
dir = 1
@@ -14675,7 +14666,6 @@
/turf/open/floor/plasteel,
/area/centcom/control)
"sow" = (
-/obj/item/book/manual/wiki/security_space_law,
/obj/structure/table/wood,
/obj/effect/turf_decal/corner/transparent/neutral{
dir = 1
diff --git a/_maps/outpost/nanotrasen_asteroid.dmm b/_maps/outpost/nanotrasen_asteroid.dmm
index d5ccb5e0af68..99eee11d1b60 100644
--- a/_maps/outpost/nanotrasen_asteroid.dmm
+++ b/_maps/outpost/nanotrasen_asteroid.dmm
@@ -7054,10 +7054,6 @@
pixel_y = 4;
pixel_x = 5
},
-/obj/item/book/manual/wiki/security_space_law{
- pixel_x = -6;
- pixel_y = -10
- },
/turf/open/floor/plasteel/dark,
/area/outpost/security)
"yI" = (
@@ -14782,10 +14778,6 @@
/area/outpost/crew/dorm)
"ZD" = (
/obj/structure/table/reinforced,
-/obj/item/book/manual/wiki/security_space_law{
- pixel_x = 4;
- pixel_y = 2
- },
/obj/machinery/door/window/brigdoor/southright{
req_access_txt = "101"
},
diff --git a/_maps/outpost/nanotrasen_ice.dmm b/_maps/outpost/nanotrasen_ice.dmm
index 04b8040a6275..19ac0333527e 100644
--- a/_maps/outpost/nanotrasen_ice.dmm
+++ b/_maps/outpost/nanotrasen_ice.dmm
@@ -1250,10 +1250,6 @@
pixel_x = -5;
pixel_y = 3
},
-/obj/item/book/manual/wiki/security_space_law{
- pixel_x = 13;
- pixel_y = 1
- },
/turf/open/floor/plasteel/telecomms_floor,
/area/outpost/security)
"jl" = (
@@ -7835,10 +7831,6 @@
/obj/effect/decal/cleanable/dirt,
/obj/structure/table/reinforced,
/obj/machinery/recharger,
-/obj/item/book/manual/wiki/security_space_law{
- pixel_y = 17;
- pixel_x = 3
- },
/obj/machinery/light/directional/west,
/turf/open/floor/plasteel/telecomms_floor,
/area/outpost/security/checkpoint)
diff --git a/_maps/ship_config_schema.json b/_maps/ship_config_schema.json
index 6d3fd5f67a0e..852e422343fb 100644
--- a/_maps/ship_config_schema.json
+++ b/_maps/ship_config_schema.json
@@ -34,6 +34,11 @@
"description": "The prefix of the ship class, appended to randomly generated names when they're first purchased.",
"maxLength": 5
},
+ "faction_name": {
+ "title": "Faction Name",
+ "type": [ "null", "string" ],
+ "description": "A custom faction name for the ship class. If exluded or left blank, the ship will use the default faction name for the faction that matches the ship's prefix."
+ },
"namelists": {
"title": "Namelists",
"type": "array",
diff --git a/_maps/shuttles/independent/independent_beluga.dmm b/_maps/shuttles/independent/independent_beluga.dmm
index a46e4b0270e9..ef0e3a0ade97 100644
--- a/_maps/shuttles/independent/independent_beluga.dmm
+++ b/_maps/shuttles/independent/independent_beluga.dmm
@@ -3342,7 +3342,6 @@
dir = 1
},
/obj/machinery/light/small/directional/west,
-/obj/item/clothing/gloves/combat/maid/inteq,
/obj/item/clothing/under/suit/charcoal,
/obj/item/clothing/glasses/monocle,
/obj/item/clothing/shoes/laceup{
@@ -3454,10 +3453,6 @@
pixel_y = -3;
pixel_x = -9
},
-/obj/item/storage/box/maid{
- pixel_x = -9;
- pixel_y = 8
- },
/turf/open/floor/carpet/nanoweave/beige,
/area/ship/crew/dorm)
"Hc" = (
diff --git a/_maps/shuttles/independent/independent_dwayne.dmm b/_maps/shuttles/independent/independent_dwayne.dmm
index e5ff88f9fc28..c1a9eab8c37f 100644
--- a/_maps/shuttles/independent/independent_dwayne.dmm
+++ b/_maps/shuttles/independent/independent_dwayne.dmm
@@ -2102,9 +2102,9 @@
dir = 4
},
/obj/structure/guncase/shotgun,
-/obj/item/gun/ballistic/shotgun/winchester,
-/obj/item/gun/ballistic/shotgun/winchester,
-/obj/item/gun/ballistic/shotgun/winchester,
+/obj/item/gun/ballistic/shotgun/flamingarrow,
+/obj/item/gun/ballistic/shotgun/flamingarrow,
+/obj/item/gun/ballistic/shotgun/flamingarrow,
/turf/open/floor/plasteel,
/area/ship/cargo)
"WE" = (
diff --git a/_maps/shuttles/independent/independent_halftrack.dmm b/_maps/shuttles/independent/independent_halftrack.dmm
index 50988838c657..46e6989a124f 100644
--- a/_maps/shuttles/independent/independent_halftrack.dmm
+++ b/_maps/shuttles/independent/independent_halftrack.dmm
@@ -949,10 +949,10 @@
dir = 8
},
/obj/structure/rack,
-/obj/item/gun/ballistic/shotgun/riot,
-/obj/item/gun/ballistic/shotgun/riot,
-/obj/item/gun/ballistic/shotgun/riot,
-/obj/item/gun/ballistic/shotgun/riot,
+/obj/item/gun/ballistic/shotgun/hellfire,
+/obj/item/gun/ballistic/shotgun/hellfire,
+/obj/item/gun/ballistic/shotgun/hellfire,
+/obj/item/gun/ballistic/shotgun/hellfire,
/turf/open/floor/plasteel/dark,
/area/ship/security/armory)
"vT" = (
diff --git a/_maps/shuttles/independent/independent_mudskipper.dmm b/_maps/shuttles/independent/independent_mudskipper.dmm
index e3ff8985e3d1..5ac1bcdd0e65 100644
--- a/_maps/shuttles/independent/independent_mudskipper.dmm
+++ b/_maps/shuttles/independent/independent_mudskipper.dmm
@@ -154,9 +154,6 @@
/obj/structure/table/reinforced{
color = "#c1b6a5"
},
-/obj/item/analyzer{
- pixel_y = 3
- },
/obj/machinery/button/door{
dir = 8;
pixel_x = 22;
@@ -164,6 +161,7 @@
id = "mudskipper_engine";
name = "Engine Shutters"
},
+/obj/machinery/cell_charger,
/turf/open/floor/plasteel/tech/grid,
/area/ship/engineering/engine)
"dN" = (
@@ -348,19 +346,8 @@
/obj/item/reagent_containers/pill/patch/styptic,
/obj/item/reagent_containers/pill/patch/silver_sulf,
/obj/item/circular_saw,
-/obj/item/gps/mining{
- gpstag = "SCAV1"
- },
-/obj/item/gps/mining{
- gpstag = "SCAV2"
- },
-/obj/item/gps/mining{
- gpstag = "SCAV3"
- },
-/obj/item/gps/mining{
- gpstag = "SCAV4"
- },
/obj/item/multitool,
+/obj/item/stack/marker_beacon/thirty,
/turf/open/floor/plasteel/tech,
/area/ship/cargo)
"gT" = (
@@ -641,8 +628,12 @@
/obj/item/clothing/glasses/sunglasses,
/obj/item/clothing/head/caphat,
/obj/item/megaphone/command,
-/obj/item/kitchen/knife/combat/survival,
-/obj/item/flashlight/seclite,
+/obj/item/gun/energy/laser,
+/obj/item/gun/energy/laser,
+/obj/item/gun/energy/laser/e10,
+/obj/item/gun/energy/laser/e10,
+/obj/item/stock_parts/cell/gun,
+/obj/item/stock_parts/cell/gun,
/turf/open/floor/plasteel/dark,
/area/ship/bridge)
"ot" = (
@@ -1651,6 +1642,10 @@
color = "#c1b6a5"
},
/obj/item/paper_bin,
+/obj/item/analyzer{
+ pixel_y = 3;
+ pixel_x = 13
+ },
/obj/item/pen,
/obj/structure/cable{
icon_state = "1-10"
@@ -2354,16 +2349,22 @@
/obj/effect/turf_decal/box,
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/rack,
-/obj/item/stock_parts/cell/gun,
-/obj/item/gun/energy/laser{
- pixel_y = 5
+/obj/item/gps/mining{
+ gpstag = "SCAV1"
+ },
+/obj/item/gps/mining{
+ gpstag = "SCAV1"
+ },
+/obj/item/gps/mining{
+ gpstag = "SCAV1"
+ },
+/obj/item/gps/mining{
+ gpstag = "SCAV1"
},
-/obj/item/stock_parts/cell/gun,
-/obj/item/gun/energy/laser,
-/obj/item/flashlight/seclite,
/obj/item/kitchen/knife/combat/survival,
-/obj/item/flashlight/seclite,
/obj/item/kitchen/knife/combat/survival,
+/obj/item/flashlight/seclite,
+/obj/item/flashlight/seclite,
/turf/open/floor/plasteel/tech,
/area/ship/cargo)
"Yd" = (
diff --git a/_maps/shuttles/independent/independent_nemo.dmm b/_maps/shuttles/independent/independent_nemo.dmm
index f693cbcbdc27..1ffde7c6d45b 100644
--- a/_maps/shuttles/independent/independent_nemo.dmm
+++ b/_maps/shuttles/independent/independent_nemo.dmm
@@ -2178,7 +2178,7 @@
},
/obj/item/firing_pin,
/obj/item/kitchen/knife/hunting,
-/obj/item/gun/ballistic/shotgun/contender,
+/obj/item/gun/ballistic/shotgun/doublebarrel/beacon,
/obj/item/ammo_box/a4570,
/obj/item/ammo_box/a4570,
/turf/open/floor/carpet/black,
@@ -2241,7 +2241,7 @@
/turf/open/floor/plating,
/area/ship/crew/dorm)
"GX" = (
-/obj/item/book/manual/wiki/tcomms,
+/obj/item/book/manual/wiki/engineering,
/obj/effect/turf_decal/number/five{
dir = 8
},
@@ -3248,7 +3248,7 @@
/turf/open/floor/carpet/black,
/area/ship/crew/dorm)
"VK" = (
-/obj/structure/bookcase/manuals/research_and_development,
+/obj/structure/bookcase/manuals/chemistry,
/obj/effect/turf_decal/siding/wood{
dir = 8
},
diff --git a/_maps/shuttles/independent/independent_rigger.dmm b/_maps/shuttles/independent/independent_rigger.dmm
index 3c3235362343..a6312b7de614 100644
--- a/_maps/shuttles/independent/independent_rigger.dmm
+++ b/_maps/shuttles/independent/independent_rigger.dmm
@@ -1005,8 +1005,8 @@
pixel_y = 28;
req_access_txt = "1"
},
-/obj/item/gun/ballistic/shotgun/winchester,
-/obj/item/gun/ballistic/automatic/pistol/m1911,
+/obj/item/gun/ballistic/shotgun/flamingarrow,
+/obj/item/gun/ballistic/automatic/pistol/candor,
/turf/open/floor/plasteel/dark,
/area/ship/security)
"mJ" = (
@@ -3770,7 +3770,7 @@
/obj/item/clothing/suit/armor/vest/capcarapace/duster,
/obj/item/clothing/glasses/sunglasses,
/obj/item/clothing/head/caphat/cowboy,
-/obj/item/gun/ballistic/automatic/pistol/m1911,
+/obj/item/gun/ballistic/automatic/pistol/candor,
/obj/structure/closet/secure_closet/wall{
dir = 8;
icon_state = "solgov_wall";
diff --git a/_maps/shuttles/independent/independent_rube_goldberg.dmm b/_maps/shuttles/independent/independent_rube_goldberg.dmm
index b8960b78342d..1f4b57035031 100644
--- a/_maps/shuttles/independent/independent_rube_goldberg.dmm
+++ b/_maps/shuttles/independent/independent_rube_goldberg.dmm
@@ -1311,7 +1311,7 @@
/obj/item/rcd_ammo,
/obj/item/rcd_ammo,
/obj/item/clothing/gloves/color/yellow,
-/obj/item/gun/ballistic/shotgun/winchester,
+/obj/item/gun/ballistic/shotgun/flamingarrow,
/obj/item/ammo_box/c38_box,
/obj/item/storage/fancy/cigarettes/cigars/cohiba,
/obj/effect/turf_decal/corner/opaque/yellow/border{
diff --git a/_maps/shuttles/independent/independent_tranquility.dmm b/_maps/shuttles/independent/independent_tranquility.dmm
index 4a8f4e5ed30b..fd1a368ebc50 100644
--- a/_maps/shuttles/independent/independent_tranquility.dmm
+++ b/_maps/shuttles/independent/independent_tranquility.dmm
@@ -1775,18 +1775,6 @@
},
/turf/open/floor/carpet/nanoweave/beige,
/area/ship/hallway/port)
-"nO" = (
-/obj/structure/chair/sofa/corner{
- dir = 8
- },
-/obj/effect/turf_decal/siding/wood{
- dir = 6
- },
-/obj/structure/sign/poster/rilena/random{
- pixel_x = 32
- },
-/turf/open/floor/wood/walnut,
-/area/ship/crew)
"nX" = (
/obj/structure/frame/machine,
/obj/item/stack/cable_coil/random/five,
@@ -2671,6 +2659,35 @@
/obj/structure/reagent_dispensers/watertank,
/turf/open/floor/plasteel/tech/techmaint,
/area/ship/engineering/engine)
+"vU" = (
+/obj/structure/table,
+/obj/item/ammo_box/magazine/m45/rubber{
+ pixel_x = 7;
+ pixel_y = -2
+ },
+/obj/effect/turf_decal/borderfloorblack{
+ dir = 6
+ },
+/obj/effect/turf_decal/borderfloorblack{
+ dir = 5
+ },
+/obj/item/gun/ballistic/automatic/pistol/candor/no_mag{
+ pixel_x = -2;
+ pixel_y = 9
+ },
+/obj/item/reagent_containers/glass/rag{
+ pixel_x = -6;
+ pixel_y = 1
+ },
+/obj/machinery/power/apc/auto_name/directional/east,
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/obj/structure/sign/poster/contraband/lusty_xenomorph{
+ pixel_y = 32
+ },
+/turf/open/floor/plasteel/tech,
+/area/ship/security/armory)
"vV" = (
/obj/structure/table,
/obj/effect/turf_decal/siding/wood{
@@ -3832,6 +3849,18 @@
},
/turf/open/floor/plasteel/tech,
/area/ship/crew/crewfour)
+"Fk" = (
+/obj/structure/chair/sofa/corner{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/wood{
+ dir = 6
+ },
+/obj/structure/sign/poster/rilena/random{
+ pixel_x = 32
+ },
+/turf/open/floor/wood/walnut,
+/area/ship/crew)
"Fl" = (
/obj/structure/table,
/obj/item/defibrillator/loaded,
@@ -4801,7 +4830,7 @@
pixel_x = -6;
pixel_y = 26
},
-/obj/item/book/manual/wiki/tcomms{
+/obj/item/book/manual/wiki/engineering{
pixel_x = -8;
pixel_y = -1
},
@@ -5478,35 +5507,6 @@
},
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/ship/engineering/engine)
-"Rk" = (
-/obj/structure/table,
-/obj/item/ammo_box/magazine/m45/rubber{
- pixel_x = 7;
- pixel_y = -2
- },
-/obj/effect/turf_decal/borderfloorblack{
- dir = 6
- },
-/obj/effect/turf_decal/borderfloorblack{
- dir = 5
- },
-/obj/item/gun/ballistic/automatic/pistol/m1911/no_mag{
- pixel_x = -2;
- pixel_y = 9
- },
-/obj/item/reagent_containers/glass/rag{
- pixel_x = -6;
- pixel_y = 1
- },
-/obj/machinery/power/apc/auto_name/directional/east,
-/obj/structure/cable{
- icon_state = "0-8"
- },
-/obj/structure/sign/poster/contraband/lusty_xenomorph{
- pixel_y = 32
- },
-/turf/open/floor/plasteel/tech,
-/area/ship/security/armory)
"Rm" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 4
@@ -6906,7 +6906,7 @@ KI
HP
PH
gk
-nO
+Fk
Ef
wz
xo
@@ -7658,7 +7658,7 @@ qa
qa
qa
PS
-Rk
+vU
fZ
qq
xI
diff --git a/_maps/shuttles/inteq/inteq_colossus.dmm b/_maps/shuttles/inteq/inteq_colossus.dmm
index bf86ed599f7f..1ebfe3d028af 100644
--- a/_maps/shuttles/inteq/inteq_colossus.dmm
+++ b/_maps/shuttles/inteq/inteq_colossus.dmm
@@ -2652,6 +2652,7 @@
},
/obj/item/storage/belt/security/webbing/inteq,
/obj/item/storage/belt/military/assault,
+/obj/item/clothing/head/inteq_peaked,
/turf/open/floor/carpet/orange,
/area/ship/bridge)
"Dq" = (
diff --git a/_maps/shuttles/inteq/inteq_talos.dmm b/_maps/shuttles/inteq/inteq_talos.dmm
index dfc829d40320..24e272c4d2b5 100644
--- a/_maps/shuttles/inteq/inteq_talos.dmm
+++ b/_maps/shuttles/inteq/inteq_talos.dmm
@@ -4700,8 +4700,6 @@
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt/dust,
/obj/item/book/manual/srmlore,
-/obj/item/book/manual/wiki/detective,
-/obj/item/book/manual/wiki/security_space_law,
/obj/structure/bookcase,
/obj/item/book/random,
/obj/item/book/random,
@@ -6289,7 +6287,7 @@
id = "talos_engine_shutter"
},
/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
-/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/turf/open/floor/plating,
/area/ship/engineering/engine)
"Pm" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
@@ -7589,6 +7587,7 @@
},
/obj/item/storage/belt/security/webbing/inteq/alt,
/obj/item/storage/belt/security/webbing/inteq,
+/obj/item/clothing/head/inteq_peaked,
/turf/open/floor/plasteel/dark,
/area/ship/bridge)
"YC" = (
diff --git a/_maps/shuttles/inteq/inteq_valor.dmm b/_maps/shuttles/inteq/inteq_valor.dmm
new file mode 100644
index 000000000000..aebe46afb678
--- /dev/null
+++ b/_maps/shuttles/inteq/inteq_valor.dmm
@@ -0,0 +1,6663 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"aa" = (
+/obj/effect/turf_decal/corner/opaque/yellow{
+ dir = 1
+ },
+/obj/effect/turf_decal/corner/opaque/brown{
+ dir = 4
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/dorm)
+"ah" = (
+/obj/effect/turf_decal/corner/opaque/brown{
+ dir = 4
+ },
+/obj/effect/turf_decal/corner/opaque/yellow{
+ dir = 1
+ },
+/obj/structure/chair,
+/obj/machinery/firealarm/directional/north,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"ap" = (
+/obj/effect/turf_decal/siding/thinplating/dark/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/thinplating/dark/corner{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/thinplating/dark/corner{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/opaque/brown/line,
+/turf/open/floor/plasteel/dark,
+/area/ship/medical)
+"ar" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/power/apc/auto_name/directional/south,
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/cable{
+ icon_state = "1-9"
+ },
+/turf/open/floor/plating,
+/area/ship/maintenance/port)
+"as" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
+"aC" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/turf/open/floor/carpet/black,
+/area/ship/crew/dorm)
+"aU" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2,
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/cargo)
+"aW" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/firedoor/border_only{
+ dir = 1
+ },
+/obj/machinery/door/airlock/grunge{
+ name = "Medbay"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/effect/turf_decal/borderfloorblack{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/thinplating/dark/corner{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/thinplating/dark/corner,
+/turf/open/floor/plasteel/dark,
+/area/ship/medical)
+"bh" = (
+/obj/structure/railing{
+ dir = 6
+ },
+/obj/effect/turf_decal/borderfloor{
+ dir = 6
+ },
+/obj/effect/turf_decal/box/corners,
+/obj/structure/rack,
+/obj/effect/spawner/lootdrop/maintenance/five,
+/turf/open/floor/plasteel/patterned/cargo_one,
+/area/ship/cargo)
+"bv" = (
+/obj/effect/turf_decal/box/white/corners,
+/obj/effect/turf_decal/box/white/corners{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/thinplating,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
+/obj/structure/closet/secure_closet{
+ icon_state = "med_secure";
+ name = "corpsman's locker";
+ req_access = list(5)
+ },
+/obj/item/clothing/under/syndicate/inteq/corpsman,
+/obj/item/clothing/under/syndicate/inteq/skirt/corpsman,
+/obj/item/clothing/suit/armor/inteq/corpsman,
+/obj/item/clothing/head/soft/inteq/corpsman,
+/obj/item/storage/backpack/messenger/med,
+/obj/item/storage/backpack/medic,
+/obj/item/pinpointer/crew,
+/obj/item/storage/belt/medical/webbing,
+/obj/item/storage/firstaid/regular,
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/crew/office)
+"bx" = (
+/obj/effect/turf_decal/borderfloor{
+ dir = 4
+ },
+/obj/structure/closet/firecloset/wall{
+ pixel_y = 28
+ },
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
+"bB" = (
+/turf/closed/wall/mineral/plastitanium,
+/area/ship/medical)
+"bF" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/light/directional/east,
+/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/tech/grid,
+/area/ship/cargo)
+"bI" = (
+/obj/effect/turf_decal/borderfloorwhite,
+/obj/machinery/light/directional/south,
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
+"bJ" = (
+/obj/effect/turf_decal/siding/thinplating/dark,
+/obj/effect/turf_decal/trimline/opaque/brown/line,
+/obj/machinery/light/directional/south,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/medical)
+"bN" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/power/apc/auto_name/directional/east,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/cargo)
+"bR" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/firedoor/border_only{
+ dir = 1
+ },
+/obj/machinery/door/airlock/grunge{
+ name = "Medbay"
+ },
+/obj/effect/turf_decal/borderfloorblack{
+ dir = 1
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/hallway/central)
+"bS" = (
+/obj/machinery/suit_storage_unit/inherit,
+/obj/item/clothing/suit/space/hardsuit/security/independent/inteq,
+/turf/open/floor/carpet/orange,
+/area/ship/bridge)
+"cj" = (
+/obj/effect/turf_decal/corner/opaque/yellow{
+ dir = 1
+ },
+/obj/effect/turf_decal/corner/opaque/brown{
+ dir = 8
+ },
+/obj/machinery/light/directional/west,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/structure/sink/kitchen{
+ dir = 4;
+ pixel_x = -12
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"ct" = (
+/obj/structure/railing{
+ dir = 5;
+ layer = 2.9
+ },
+/obj/structure/closet/crate{
+ name = "training equipment crate"
+ },
+/obj/item/gun/energy/laser/practice{
+ pixel_x = -5;
+ pixel_y = 10
+ },
+/obj/item/gun/energy/laser/practice{
+ pixel_y = 5
+ },
+/obj/item/gun/energy/laser/practice{
+ pixel_x = 5
+ },
+/obj/item/clothing/ears/earmuffs,
+/obj/item/clothing/ears/earmuffs,
+/obj/item/clothing/ears/earmuffs,
+/obj/effect/turf_decal/box/corners{
+ dir = 4
+ },
+/obj/effect/turf_decal/borderfloor{
+ dir = 5
+ },
+/turf/open/floor/plasteel/patterned/cargo_one,
+/area/ship/cargo)
+"cu" = (
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/maintenance/port)
+"cE" = (
+/obj/effect/turf_decal/borderfloor{
+ dir = 8
+ },
+/obj/structure/extinguisher_cabinet/directional/south,
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
+"cI" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/light/directional/north,
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/cargo)
+"cW" = (
+/obj/effect/turf_decal/spline/fancy/opaque/black{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/opaque/brown/filled/warning{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/thinplating/dark{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/opaque/brown/line,
+/turf/open/floor/plasteel/dark,
+/area/ship/medical)
+"cZ" = (
+/obj/effect/turf_decal/corner/opaque/brown{
+ dir = 4
+ },
+/obj/effect/turf_decal/corner/opaque/yellow,
+/obj/structure/sign/poster/official/fruit_bowl{
+ pixel_x = 32
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"de" = (
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/obj/effect/turf_decal/industrial/traffic/corner{
+ dir = 1
+ },
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
+"dk" = (
+/obj/effect/turf_decal/corner/opaque/brown{
+ dir = 8
+ },
+/obj/effect/turf_decal/corner/opaque/yellow,
+/obj/machinery/airalarm/directional/south,
+/obj/structure/table,
+/obj/machinery/microwave,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"dl" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+ dir = 1
+ },
+/turf/open/floor/plasteel/tech,
+/area/ship/medical)
+"dp" = (
+/obj/effect/turf_decal/corner/opaque/brown{
+ dir = 8
+ },
+/obj/effect/turf_decal/corner/opaque/yellow{
+ dir = 1
+ },
+/obj/effect/turf_decal/corner/opaque/yellow,
+/obj/machinery/airalarm/directional/south,
+/obj/structure/closet/crate/bin,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 5
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/dorm)
+"du" = (
+/obj/machinery/door/airlock/public{
+ dir = 4;
+ name = "Dormitories"
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/door/firedoor/border_only{
+ dir = 8
+ },
+/obj/machinery/door/firedoor/border_only{
+ dir = 4
+ },
+/obj/effect/turf_decal/borderfloorblack{
+ dir = 8
+ },
+/turf/open/floor/carpet/black,
+/area/ship/crew/dorm)
+"dA" = (
+/obj/effect/turf_decal/siding/thinplating/dark{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/opaque/brown/line{
+ dir = 1
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/medical)
+"dG" = (
+/obj/effect/turf_decal/industrial/traffic/corner{
+ dir = 4
+ },
+/obj/structure/marker_beacon,
+/turf/open/floor/engine/hull/reinforced,
+/area/ship/external/dark)
+"dI" = (
+/obj/machinery/door/airlock/grunge{
+ dir = 8;
+ name = "Custodian Closet"
+ },
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ship/crew/canteen)
+"dM" = (
+/obj/effect/turf_decal/corner/opaque/brown{
+ dir = 8
+ },
+/obj/effect/turf_decal/corner/opaque/yellow{
+ dir = 1
+ },
+/obj/effect/turf_decal/corner/opaque/brown{
+ dir = 4
+ },
+/obj/item/kirbyplants/random,
+/obj/machinery/airalarm/directional/north,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"dN" = (
+/obj/effect/turf_decal/siding/thinplating/dark,
+/obj/effect/turf_decal/siding/thinplating/dark{
+ dir = 1
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/door/firedoor/border_only{
+ dir = 8
+ },
+/obj/machinery/door/firedoor/border_only{
+ dir = 4
+ },
+/obj/machinery/door/airlock/grunge{
+ dir = 4;
+ name = "Surgery"
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/medical)
+"dO" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/plasteel/stairs/right{
+ dir = 8
+ },
+/area/ship/cargo)
+"dQ" = (
+/obj/effect/turf_decal/box/corners{
+ dir = 1
+ },
+/turf/open/floor/plasteel/patterned/cargo_one,
+/area/ship/cargo)
+"ec" = (
+/obj/structure/closet/crate/internals,
+/obj/item/tank/internals/oxygen,
+/obj/item/tank/internals/oxygen,
+/obj/item/tank/internals/oxygen,
+/obj/item/tank/internals/oxygen,
+/obj/item/tank/internals/oxygen,
+/obj/item/tank/internals/plasmaman/full,
+/obj/item/tank/internals/plasmaman/full,
+/obj/item/clothing/head/helmet/space/inteq,
+/obj/item/clothing/head/helmet/space/inteq,
+/obj/item/clothing/suit/space/inteq,
+/obj/item/clothing/suit/space/inteq,
+/turf/open/floor/plasteel/patterned/cargo_one,
+/area/ship/cargo)
+"ei" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plating,
+/area/ship/maintenance/starboard)
+"ej" = (
+/obj/effect/turf_decal/borderfloorblack{
+ dir = 4
+ },
+/obj/effect/turf_decal/spline/fancy/opaque/black/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/spline/fancy/opaque/black/corner{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 10
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 9
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"em" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/door/firedoor/border_only{
+ dir = 8
+ },
+/obj/machinery/door/firedoor/border_only{
+ dir = 4
+ },
+/obj/machinery/door/airlock/command{
+ name = "Bridge";
+ dir = 8;
+ req_access = list(19)
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"ew" = (
+/obj/effect/turf_decal/corner/opaque/yellow{
+ dir = 1
+ },
+/obj/effect/turf_decal/corner/opaque/brown{
+ dir = 4
+ },
+/obj/structure/table,
+/obj/structure/closet/secure_closet/wall{
+ icon_state = "sec_wall";
+ name = "equipment locker";
+ pixel_y = 28;
+ req_access = list(1)
+ },
+/obj/item/storage/box/zipties,
+/obj/item/reagent_containers/spray/pepper,
+/obj/item/megaphone/sec,
+/obj/item/clothing/suit/armor/vest/alt,
+/obj/item/clothing/suit/armor/vest/alt,
+/obj/item/kitchen/knife/combat/survival,
+/obj/item/kitchen/knife/combat/survival,
+/turf/open/floor/plasteel/dark,
+/area/ship/security)
+"ey" = (
+/turf/closed/wall/mineral/plastitanium,
+/area/ship/maintenance/starboard)
+"eM" = (
+/obj/structure/chair/comfy/shuttle{
+ dir = 4;
+ name = "Helm"
+ },
+/obj/effect/turf_decal/corner/opaque/yellow,
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"eN" = (
+/obj/structure/bed,
+/obj/structure/curtain,
+/obj/item/bedsheet/medical,
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
+"eU" = (
+/obj/structure/table,
+/obj/item/storage/backpack/duffelbag/med/surgery{
+ pixel_x = -2;
+ pixel_y = 7
+ },
+/obj/item/reagent_containers/medigel/sterilizine{
+ pixel_x = 8;
+ pixel_y = 3
+ },
+/obj/effect/turf_decal/borderfloorwhite,
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
+"eV" = (
+/obj/structure/closet/firecloset/wall{
+ dir = 1;
+ pixel_y = -28
+ },
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/turf/open/floor/plating,
+/area/ship/maintenance/port)
+"eZ" = (
+/obj/item/reagent_containers/food/drinks/coffee{
+ pixel_x = -2;
+ pixel_y = 9
+ },
+/obj/structure/table/wood,
+/turf/open/floor/carpet/black,
+/area/ship/crew/dorm)
+"fa" = (
+/obj/machinery/cryopod{
+ dir = 1
+ },
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/crew/cryo)
+"fe" = (
+/obj/structure/closet/crate{
+ name = "food crate"
+ },
+/obj/item/reagent_containers/food/drinks/waterbottle/large,
+/obj/item/reagent_containers/food/drinks/waterbottle/large,
+/obj/item/reagent_containers/food/drinks/waterbottle/large,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/item/storage/ration/crayons,
+/turf/open/floor/plasteel/patterned/cargo_one,
+/area/ship/cargo)
+"fj" = (
+/obj/effect/turf_decal/siding/thinplating/dark{
+ dir = 1
+ },
+/obj/structure/closet/secure_closet/medical2,
+/obj/machinery/airalarm/directional/north,
+/turf/open/floor/plasteel/dark,
+/area/ship/medical)
+"fE" = (
+/obj/effect/turf_decal/siding/thinplating{
+ dir = 9
+ },
+/obj/effect/turf_decal/trimline/opaque/yellow/line{
+ dir = 9
+ },
+/obj/machinery/vending/cigarette,
+/obj/machinery/light/directional/west,
+/turf/open/floor/plasteel/patterned/grid,
+/area/ship/hallway/central)
+"fG" = (
+/obj/effect/turf_decal/box/corners,
+/obj/effect/turf_decal/box/corners{
+ dir = 4
+ },
+/turf/open/floor/plasteel/patterned/cargo_one,
+/area/ship/cargo)
+"fK" = (
+/obj/machinery/computer/crew{
+ dir = 8
+ },
+/obj/effect/turf_decal/corner/opaque/yellow,
+/obj/effect/turf_decal/corner/opaque/brown{
+ dir = 4
+ },
+/obj/effect/turf_decal/corner/opaque/brown{
+ dir = 8
+ },
+/turf/open/floor/plasteel/telecomms_floor,
+/area/ship/bridge)
+"fN" = (
+/obj/machinery/suit_storage_unit/inherit,
+/obj/item/clothing/suit/space/inteq,
+/obj/item/clothing/head/helmet/space/inteq,
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/cargo)
+"fO" = (
+/obj/structure/closet/secure_closet{
+ icon_state = "med_secure";
+ name = "corpsman's locker";
+ req_access = list(5)
+ },
+/obj/item/clothing/under/syndicate/inteq/corpsman,
+/obj/item/clothing/under/syndicate/inteq/skirt/corpsman,
+/obj/item/clothing/suit/armor/inteq/corpsman,
+/obj/item/clothing/head/soft/inteq/corpsman,
+/obj/effect/turf_decal/siding/thinplating,
+/obj/item/storage/backpack/messenger/med,
+/obj/item/storage/backpack/medic,
+/obj/item/pinpointer/crew,
+/obj/item/storage/belt/medical/webbing,
+/obj/item/storage/firstaid/regular,
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/crew/office)
+"fQ" = (
+/obj/structure/bed/dogbed{
+ name = "Picket's bed";
+ anchored = 1;
+ desc = "A comfy-looking dog bed. Despite the name, the owner is a cat."
+ },
+/mob/living/simple_animal/pet/cat{
+ dir = 4;
+ name = "Picket";
+ desc = "Guardian of the bridge and the Honorable Corpsman's bedsheets."
+ },
+/obj/structure/extinguisher_cabinet/directional/south,
+/turf/open/floor/carpet/blue,
+/area/ship/bridge)
+"gb" = (
+/obj/effect/turf_decal/siding/thinplating{
+ dir = 10
+ },
+/turf/open/floor/plasteel/patterned/grid,
+/area/ship/hallway/port)
+"gh" = (
+/obj/effect/turf_decal/siding/thinplating{
+ dir = 1
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 8
+ },
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/turf/open/floor/plasteel/patterned/grid,
+/area/ship/hallway/port)
+"gi" = (
+/obj/effect/turf_decal/industrial/traffic/corner,
+/obj/structure/marker_beacon,
+/turf/open/floor/engine/hull/reinforced,
+/area/ship/external/dark)
+"gl" = (
+/obj/machinery/stasis,
+/obj/effect/turf_decal/box/white,
+/obj/machinery/light/directional/east,
+/turf/open/floor/plasteel/mono/white,
+/area/ship/medical)
+"gm" = (
+/obj/machinery/power/smes/shuttle/precharged{
+ dir = 4
+ },
+/obj/structure/window/reinforced{
+ dir = 8
+ },
+/obj/machinery/door/window/eastright{
+ name = "Engine Access"
+ },
+/obj/structure/cable/yellow{
+ icon_state = "0-8"
+ },
+/turf/open/floor/plating,
+/area/ship/maintenance/port)
+"gn" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/dorm)
+"gp" = (
+/obj/effect/turf_decal/siding/thinplating/dark,
+/obj/effect/turf_decal/siding/thinplating/dark/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/opaque/brown/warning{
+ dir = 10
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 5
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/medical)
+"gq" = (
+/obj/structure/table,
+/obj/machinery/cell_charger,
+/obj/machinery/light/small/directional/east,
+/obj/machinery/light_switch{
+ dir = 8;
+ pixel_x = 20
+ },
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/cargo)
+"gt" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/effect/landmark/observer_start,
+/obj/machinery/holopad/emergency/security,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"gU" = (
+/obj/effect/turf_decal/siding/thinplating/dark/corner,
+/obj/effect/turf_decal/siding/thinplating/dark/corner{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/opaque/brown/warning,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
+/turf/open/floor/plasteel/dark,
+/area/ship/medical)
+"gZ" = (
+/obj/machinery/door/airlock/external{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/ship/medical)
+"hj" = (
+/obj/effect/turf_decal/siding/thinplating/corner,
+/obj/effect/turf_decal/siding/thinplating/corner{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/opaque/yellow/warning,
+/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/central)
+"hl" = (
+/obj/effect/turf_decal/siding/thinplating,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/plasteel/patterned/grid,
+/area/ship/hallway/port)
+"hm" = (
+/obj/effect/turf_decal/industrial/loading{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
+"ht" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/firedoor/border_only{
+ dir = 1
+ },
+/obj/machinery/door/airlock/grunge{
+ name = "Central Hallway"
+ },
+/obj/effect/turf_decal/borderfloorblack{
+ dir = 1
+ },
+/turf/open/floor/plasteel/patterned/grid,
+/area/ship/hallway/central)
+"hw" = (
+/obj/structure/table,
+/obj/item/paicard{
+ pixel_x = 5;
+ pixel_y = 2
+ },
+/obj/item/paicard{
+ pixel_x = -5;
+ pixel_y = 3
+ },
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/structure/railing{
+ dir = 4
+ },
+/obj/machinery/power/apc/auto_name/directional/south,
+/obj/structure/cable,
+/obj/machinery/light_switch{
+ dir = 4;
+ pixel_x = -20
+ },
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/crew/cryo)
+"hN" = (
+/obj/effect/turf_decal/siding/thinplating{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/opaque/yellow/line{
+ dir = 4
+ },
+/obj/structure/closet/crate/bin,
+/obj/structure/extinguisher_cabinet/directional/east,
+/obj/item/trash/can,
+/obj/item/trash/candy,
+/obj/item/trash/chips,
+/turf/open/floor/plasteel/patterned/grid,
+/area/ship/hallway/central)
+"hS" = (
+/turf/open/floor/carpet/black,
+/area/ship/crew/dorm)
+"hW" = (
+/obj/structure/sink{
+ dir = 8;
+ pixel_x = 12
+ },
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
+"id" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/door/firedoor/border_only{
+ dir = 1
+ },
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/airlock/grunge{
+ name = "Central Hallway"
+ },
+/obj/effect/turf_decal/borderfloorblack,
+/turf/open/floor/plasteel/patterned/grid,
+/area/ship/hallway/central)
+"ie" = (
+/obj/effect/turf_decal/siding/thinplating{
+ dir = 6
+ },
+/obj/effect/turf_decal/trimline/opaque/yellow/line{
+ dir = 6
+ },
+/obj/structure/chair/sofa/left{
+ dir = 8
+ },
+/obj/structure/closet/firecloset/wall{
+ dir = 1;
+ pixel_y = -28
+ },
+/turf/open/floor/plasteel/patterned/grid,
+/area/ship/hallway/central)
+"ix" = (
+/obj/effect/turf_decal/corner/opaque/yellow{
+ dir = 9
+ },
+/obj/effect/turf_decal/corner/opaque/yellow{
+ dir = 6
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/patterned/grid,
+/area/ship/hallway/central)
+"iI" = (
+/obj/effect/turf_decal/industrial/traffic{
+ dir = 8
+ },
+/obj/effect/turf_decal/industrial/traffic/corner,
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
+"iN" = (
+/obj/effect/turf_decal/siding/thinplating{
+ dir = 5
+ },
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
+/turf/open/floor/plasteel/patterned/grid,
+/area/ship/hallway/port)
+"iQ" = (
+/obj/effect/turf_decal/corner/opaque/yellow{
+ dir = 1
+ },
+/obj/effect/turf_decal/corner/opaque/brown{
+ dir = 8
+ },
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/obj/machinery/light_switch{
+ dir = 4;
+ pixel_x = -20
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"jj" = (
+/obj/effect/turf_decal/box/corners{
+ dir = 8
+ },
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/turf/open/floor/plasteel/patterned/cargo_one,
+/area/ship/cargo)
+"jk" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/firedoor/border_only{
+ dir = 1
+ },
+/obj/machinery/door/airlock/grunge{
+ name = "Crew Quarters"
+ },
+/obj/effect/turf_decal/borderfloorblack,
+/turf/open/floor/plasteel/dark,
+/area/ship/hallway/central)
+"jp" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+ dir = 8
+ },
+/turf/open/floor/plasteel/patterned/grid,
+/area/ship/hallway/central)
+"jw" = (
+/obj/effect/turf_decal/siding/thinplating/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/thinplating/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/opaque/yellow/warning{
+ dir = 1
+ },
+/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/central)
+"jG" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/industrial/traffic{
+ dir = 8
+ },
+/obj/effect/turf_decal/industrial/stand_clear{
+ dir = 4
+ },
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
+"jL" = (
+/obj/structure/grille,
+/obj/structure/window/plasma/reinforced/plastitanium,
+/obj/machinery/door/poddoor/shutters{
+ dir = 4;
+ id = "valor_external"
+ },
+/turf/open/floor/plating,
+/area/ship/medical)
+"jN" = (
+/obj/structure/chair/office/light,
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/turf/open/floor/plasteel/patterned,
+/area/ship/crew/office)
+"jQ" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/light/directional/east,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/cargo)
+"jR" = (
+/obj/effect/turf_decal/industrial/warning,
+/obj/effect/turf_decal/industrial/warning{
+ dir = 1
+ },
+/obj/machinery/computer/cryopod/directional/east,
+/obj/effect/turf_decal/steeldecal/steel_decals_central7{
+ dir = 4
+ },
+/turf/open/floor/plasteel/tech,
+/area/ship/crew/cryo)
+"jS" = (
+/turf/closed/wall/mineral/plastitanium,
+/area/ship/bridge)
+"jT" = (
+/obj/structure/sign/poster/contraband/cardinal_port_starboard{
+ pixel_y = 32
+ },
+/obj/effect/turf_decal/techfloor{
+ dir = 8
+ },
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/central)
+"jU" = (
+/obj/effect/turf_decal/siding/thinplating{
+ dir = 10
+ },
+/obj/effect/turf_decal/trimline/opaque/yellow/line{
+ dir = 10
+ },
+/obj/structure/chair/comfy/black{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/patterned/grid,
+/area/ship/hallway/central)
+"ka" = (
+/turf/closed/wall/mineral/plastitanium,
+/area/ship/crew/canteen)
+"ko" = (
+/obj/effect/turf_decal/siding/thinplating/dark/corner,
+/obj/effect/turf_decal/siding/thinplating/dark/corner{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/door/airlock/maintenance_hatch{
+ dir = 4;
+ name = "Starboard Engines"
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/maintenance/starboard)
+"kv" = (
+/obj/structure/bed,
+/obj/item/bedsheet/cmo{
+ name = "honorable corpsman's bedsheet";
+ desc = "It's a sterilized blanket that has a cross emblem. There's some cat fur on it, likely from Picket."
+ },
+/obj/structure/curtain/cloth,
+/obj/machinery/light/directional/west,
+/turf/open/floor/carpet/blue,
+/area/ship/bridge)
+"ky" = (
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/light/small/directional/east,
+/turf/open/floor/plating,
+/area/ship/hallway/port)
+"kG" = (
+/obj/effect/turf_decal/techfloor{
+ dir = 8
+ },
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/central)
+"kH" = (
+/obj/structure/cable{
+ icon_state = "4-9"
+ },
+/obj/effect/turf_decal/industrial/traffic/corner{
+ dir = 8
+ },
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
+"kK" = (
+/obj/effect/turf_decal/corner/opaque/yellow{
+ dir = 1
+ },
+/obj/effect/turf_decal/corner/opaque/brown{
+ dir = 4
+ },
+/obj/structure/reagent_dispensers/peppertank{
+ pixel_y = 28
+ },
+/obj/structure/rack,
+/obj/item/storage/belt/security/webbing/inteq{
+ pixel_x = 6;
+ pixel_y = 8
+ },
+/obj/item/storage/belt/security/webbing/inteq{
+ pixel_x = 8;
+ pixel_y = 4
+ },
+/obj/item/clothing/head/helmet/inteq{
+ pixel_x = -9;
+ pixel_y = 6
+ },
+/obj/item/clothing/head/helmet/inteq{
+ pixel_x = -7
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/security)
+"kL" = (
+/obj/machinery/light/directional/south,
+/obj/structure/rack,
+/turf/open/floor/plasteel/patterned/cargo_one,
+/area/ship/cargo)
+"kW" = (
+/obj/effect/turf_decal/techfloor{
+ dir = 4
+ },
+/obj/structure/closet/crate/bin,
+/obj/item/trash/chips,
+/obj/item/trash/energybar,
+/obj/item/trash/cheesie,
+/obj/item/trash/pistachios,
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/central)
+"lc" = (
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/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/plating,
+/area/ship/hallway/central)
+"ln" = (
+/obj/structure/dresser,
+/obj/structure/noticeboard{
+ pixel_y = 28
+ },
+/obj/machinery/light/directional/west,
+/turf/open/floor/carpet/black,
+/area/ship/crew/dorm)
+"lv" = (
+/obj/effect/turf_decal/techfloor,
+/obj/effect/turf_decal/siding/thinplating/dark{
+ dir = 1
+ },
+/obj/structure/table,
+/obj/machinery/door/window/northleft,
+/obj/item/reagent_containers/glass/bottle/formaldehyde{
+ pixel_x = -9;
+ pixel_y = 7
+ },
+/obj/item/reagent_containers/glass/bottle/charcoal{
+ pixel_y = 6
+ },
+/obj/item/reagent_containers/glass/bottle/morphine{
+ pixel_x = 9;
+ pixel_y = 7
+ },
+/obj/item/reagent_containers/glass/bottle/epinephrine{
+ pixel_x = -5
+ },
+/obj/item/reagent_containers/glass/bottle/mannitol{
+ pixel_x = 6
+ },
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/medical)
+"lD" = (
+/obj/structure/sign/warning/nosmoking/burnt{
+ pixel_y = -32
+ },
+/obj/item/cigbutt/cigarbutt{
+ pixel_x = -7;
+ pixel_y = 3
+ },
+/obj/machinery/telecomms/relay/preset/mining{
+ autolinkers = list("relay","hub");
+ freq_listening = list(1347);
+ id = "IRMG Relay";
+ name = "IRMG Relay";
+ network = "irmg_commnet"
+ },
+/turf/open/floor/plating,
+/area/ship/maintenance/starboard)
+"lE" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/patterned/grid,
+/area/ship/hallway/central)
+"lI" = (
+/obj/effect/turf_decal/corner/opaque/yellow{
+ dir = 1
+ },
+/obj/effect/turf_decal/corner/opaque/brown{
+ dir = 8
+ },
+/obj/effect/turf_decal/corner/opaque/yellow,
+/obj/machinery/power/apc/auto_name/directional/south,
+/obj/structure/closet/crate/bin,
+/obj/structure/cable,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"lN" = (
+/obj/structure/table,
+/obj/machinery/computer/med_data/laptop{
+ dir = 1;
+ pixel_y = 8
+ },
+/obj/machinery/door/window/southleft,
+/obj/structure/window/reinforced{
+ dir = 8
+ },
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/firedoor/border_only{
+ dir = 1
+ },
+/turf/open/floor/plasteel/patterned,
+/area/ship/crew/office)
+"lW" = (
+/obj/effect/turf_decal/borderfloorblack{
+ dir = 4
+ },
+/obj/effect/turf_decal/spline/fancy/opaque/black/corner{
+ dir = 1
+ },
+/obj/structure/table/reinforced,
+/obj/item/paper_bin{
+ pixel_x = 6
+ },
+/obj/item/pen{
+ pixel_x = 6
+ },
+/obj/effect/turf_decal/spline/fancy/opaque/black{
+ dir = 8
+ },
+/obj/item/reagent_containers/food/drinks/bottle/cognac{
+ pixel_x = -6;
+ pixel_y = 13
+ },
+/obj/item/gps{
+ pixel_x = -10
+ },
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/item/spacecash/bundle/mediumrand{
+ pixel_x = 6;
+ pixel_y = 8
+ },
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"ma" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/dorm)
+"md" = (
+/obj/machinery/atmospherics/pipe/layer_manifold{
+ dir = 4
+ },
+/turf/open/floor/plasteel/tech,
+/area/ship/medical)
+"mj" = (
+/obj/structure/table/reinforced,
+/obj/item/reagent_containers/food/drinks/mug/coco{
+ pixel_x = 13;
+ pixel_y = 5
+ },
+/obj/machinery/computer/med_data/laptop{
+ dir = 1;
+ pixel_y = 4
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"ml" = (
+/obj/machinery/door/poddoor{
+ dir = 4;
+ id = "valor_cargo"
+ },
+/obj/machinery/power/shieldwallgen/atmos{
+ dir = 1;
+ id = "valor_holo";
+ anchored = 1
+ },
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/turf/open/floor/plating,
+/area/ship/cargo)
+"mp" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 6
+ },
+/turf/open/floor/plasteel/tech,
+/area/ship/medical)
+"mt" = (
+/obj/machinery/autolathe,
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/cargo)
+"mw" = (
+/obj/effect/turf_decal/trimline/opaque/brown/warning{
+ dir = 4
+ },
+/obj/effect/turf_decal/borderfloorwhite{
+ dir = 8
+ },
+/turf/open/floor/plasteel/tech,
+/area/ship/medical)
+"mx" = (
+/obj/effect/turf_decal/siding/thinplating/dark,
+/obj/effect/turf_decal/siding/thinplating/dark/corner{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/opaque/brown/line,
+/turf/open/floor/plasteel/dark,
+/area/ship/medical)
+"mz" = (
+/obj/structure/table/reinforced,
+/obj/item/radio/intercom/table{
+ pixel_x = -2;
+ pixel_y = -2
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"mB" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/dorm)
+"mG" = (
+/obj/structure/closet/secure_closet{
+ icon_state = "med_secure";
+ name = "corpsman's locker";
+ req_access = list(5)
+ },
+/obj/item/clothing/under/syndicate/inteq/corpsman,
+/obj/item/clothing/under/syndicate/inteq/skirt/corpsman,
+/obj/item/clothing/suit/armor/inteq/corpsman,
+/obj/item/clothing/head/soft/inteq/corpsman,
+/obj/effect/turf_decal/box/white/corners{
+ dir = 1
+ },
+/obj/effect/turf_decal/box/white/corners{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/thinplating{
+ dir = 10
+ },
+/obj/item/storage/backpack/messenger/med,
+/obj/item/storage/backpack/medic,
+/obj/item/pinpointer/crew,
+/obj/item/storage/belt/medical/webbing,
+/obj/item/storage/firstaid/regular,
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/crew/office)
+"mH" = (
+/obj/machinery/power/apc/auto_name/directional/east,
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/turf/open/floor/carpet/black,
+/area/ship/crew/dorm)
+"mI" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/dorm)
+"mZ" = (
+/obj/effect/turf_decal/siding/thinplating{
+ dir = 5
+ },
+/obj/effect/turf_decal/trimline/opaque/yellow/line{
+ dir = 5
+ },
+/obj/machinery/vending/snack/random,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/patterned/grid,
+/area/ship/hallway/central)
+"nc" = (
+/obj/effect/turf_decal/industrial/traffic{
+ dir = 4
+ },
+/turf/open/floor/engine/hull/reinforced,
+/area/ship/external/dark)
+"nd" = (
+/obj/machinery/power/smes/shuttle/precharged{
+ dir = 4
+ },
+/obj/structure/window/reinforced{
+ dir = 8
+ },
+/obj/machinery/door/window/eastright{
+ name = "Engine Access"
+ },
+/obj/structure/cable/yellow{
+ icon_state = "0-8"
+ },
+/turf/open/floor/plating,
+/area/ship/maintenance/starboard)
+"ni" = (
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ship/crew/canteen)
+"nk" = (
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/bridge)
+"ns" = (
+/obj/effect/turf_decal/siding/thinplating/dark{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/thinplating/dark,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/medical)
+"nx" = (
+/obj/structure/railing{
+ dir = 6
+ },
+/obj/item/target{
+ pixel_y = 10;
+ pixel_x = -9
+ },
+/obj/item/target/alien{
+ pixel_x = 4;
+ pixel_y = 3
+ },
+/obj/item/target{
+ pixel_x = -8;
+ pixel_y = 2
+ },
+/obj/effect/turf_decal/box/corners,
+/obj/effect/turf_decal/borderfloor{
+ dir = 4
+ },
+/obj/structure/rack,
+/turf/open/floor/plasteel/patterned/cargo_one,
+/area/ship/cargo)
+"nz" = (
+/obj/machinery/door/firedoor/border_only{
+ dir = 8
+ },
+/obj/machinery/door/firedoor/border_only{
+ dir = 4
+ },
+/obj/machinery/door/airlock/public/glass{
+ dir = 8;
+ name = "Cargo Bay"
+ },
+/turf/open/floor/plasteel,
+/area/ship/hallway/central)
+"nB" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"nK" = (
+/obj/effect/turf_decal/trimline/opaque/blue/warning,
+/obj/effect/turf_decal/borderfloorwhite{
+ dir = 1
+ },
+/obj/machinery/door/airlock/medical/glass{
+ name = "Surgical Bay #2"
+ },
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
+"nU" = (
+/obj/effect/turf_decal/corner/opaque/yellow{
+ dir = 1
+ },
+/obj/effect/turf_decal/corner/opaque/brown{
+ dir = 4
+ },
+/obj/effect/turf_decal/corner/opaque/yellow,
+/obj/structure/closet/crate/trashcart/laundry,
+/obj/structure/extinguisher_cabinet/directional/north,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/dorm)
+"nX" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/cargo)
+"nZ" = (
+/turf/open/floor/plasteel/patterned/brushed,
+/area/ship/crew/canteen)
+"og" = (
+/obj/effect/turf_decal/box/corners{
+ dir = 1
+ },
+/obj/structure/weightmachine/stacklifter,
+/turf/open/floor/plasteel/patterned/cargo_one,
+/area/ship/cargo)
+"om" = (
+/obj/structure/table,
+/obj/item/flashlight/lamp/green,
+/turf/open/floor/carpet/black,
+/area/ship/crew/dorm)
+"oy" = (
+/obj/effect/turf_decal/trimline/opaque/brown/warning{
+ dir = 6
+ },
+/obj/effect/turf_decal/siding/thinplating/dark/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/thinplating/dark,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/medical)
+"oz" = (
+/obj/structure/railing{
+ dir = 4;
+ layer = 2.9
+ },
+/obj/effect/turf_decal/borderfloor/corner{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "6-8"
+ },
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
+"oC" = (
+/obj/machinery/suit_storage_unit/inherit,
+/obj/item/clothing/suit/space/inteq,
+/obj/item/clothing/head/helmet/space/inteq,
+/obj/effect/turf_decal/techfloor{
+ dir = 1
+ },
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/medical)
+"oL" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/steeldecal/steel_decals_central7,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"oO" = (
+/turf/closed/wall/mineral/plastitanium,
+/area/ship/crew/office)
+"pa" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/door/firedoor/border_only{
+ dir = 8
+ },
+/obj/machinery/door/firedoor/border_only{
+ dir = 4
+ },
+/obj/machinery/door/airlock/public/glass{
+ dir = 8;
+ name = "Canteen"
+ },
+/turf/open/floor/plasteel/patterned/grid,
+/area/ship/crew/canteen)
+"pd" = (
+/obj/effect/turf_decal/spline/fancy/opaque/black{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/thinplating/dark/end{
+ dir = 1
+ },
+/obj/structure/sign/warning/nosmoking/circle{
+ pixel_y = 32
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/medical)
+"pj" = (
+/obj/effect/turf_decal/corner/opaque/yellow{
+ dir = 6
+ },
+/obj/effect/turf_decal/corner/opaque/yellow{
+ dir = 9
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/turf/open/floor/plasteel/patterned/grid,
+/area/ship/hallway/central)
+"pt" = (
+/obj/effect/turf_decal/siding/thinplating/dark,
+/obj/effect/turf_decal/siding/thinplating/dark/corner{
+ dir = 1
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/opaque/brown/line,
+/turf/open/floor/plasteel/dark,
+/area/ship/medical)
+"pz" = (
+/obj/effect/turf_decal/corner/opaque/yellow{
+ dir = 6
+ },
+/obj/effect/turf_decal/corner/opaque/yellow{
+ dir = 1
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/patterned/grid,
+/area/ship/hallway/central)
+"pA" = (
+/obj/structure/closet/wall{
+ pixel_y = 28
+ },
+/obj/item/radio,
+/obj/item/radio,
+/obj/item/radio,
+/obj/item/radio,
+/obj/item/radio,
+/obj/item/radio,
+/obj/item/radio,
+/obj/item/radio,
+/obj/item/radio,
+/obj/item/radio,
+/obj/item/radio,
+/obj/item/radio,
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/structure/railing{
+ dir = 4
+ },
+/obj/machinery/airalarm/directional/west,
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/crew/cryo)
+"pC" = (
+/obj/structure/table/optable,
+/obj/machinery/defibrillator_mount/loaded{
+ pixel_x = -28
+ },
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
+"pL" = (
+/obj/machinery/power/terminal{
+ dir = 8
+ },
+/obj/machinery/light/directional/north,
+/obj/effect/turf_decal/corner_techfloor_gray{
+ dir = 8
+ },
+/obj/structure/cable{
+ icon_state = "0-6"
+ },
+/turf/open/floor/plating,
+/area/ship/maintenance/port)
+"pO" = (
+/obj/effect/turf_decal/trimline/opaque/yellow/filled/warning{
+ dir = 8
+ },
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"pU" = (
+/obj/structure/closet/firecloset/wall{
+ pixel_y = 28
+ },
+/obj/machinery/atmospherics/components/binary/pump/on/layer2{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/obj/structure/cable{
+ icon_state = "4-10"
+ },
+/turf/open/floor/plating,
+/area/ship/maintenance/starboard)
+"qe" = (
+/obj/effect/turf_decal/industrial/traffic,
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
+"qk" = (
+/obj/machinery/light/small/directional/west,
+/obj/effect/turf_decal/techfloor{
+ dir = 4
+ },
+/obj/structure/closet/emcloset,
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/central)
+"qt" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
+"qA" = (
+/obj/structure/closet/crate/trashcart,
+/obj/item/trash/can/food/beans,
+/obj/item/trash/can,
+/obj/item/trash/boritos,
+/turf/open/floor/plasteel/patterned/cargo_one,
+/area/ship/cargo)
+"qG" = (
+/obj/effect/turf_decal/industrial/traffic{
+ dir = 8
+ },
+/obj/machinery/button/door{
+ id = "valor_cargo";
+ name = "Cargo Bay Door Control";
+ pixel_x = -5;
+ pixel_y = 25
+ },
+/obj/machinery/button/shieldwallgen{
+ id = "valor_holo";
+ pixel_x = 5;
+ pixel_y = 23
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
+"qL" = (
+/turf/closed/wall/mineral/plastitanium,
+/area/ship/hallway/port)
+"qQ" = (
+/obj/machinery/shower,
+/obj/item/soap,
+/obj/structure/curtain/bounty,
+/obj/effect/turf_decal/steeldecal/steel_decals10,
+/turf/open/floor/plasteel/patterned/brushed,
+/area/ship/crew/canteen)
+"qR" = (
+/obj/structure/grille,
+/obj/structure/window/plasma/reinforced/plastitanium,
+/turf/open/floor/plating,
+/area/ship/medical)
+"qW" = (
+/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/plasteel/tech,
+/area/ship/medical)
+"qX" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 9
+ },
+/obj/machinery/firealarm/directional/east,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 9
+ },
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/cargo)
+"qZ" = (
+/obj/effect/turf_decal/corner/opaque/yellow,
+/obj/effect/turf_decal/corner/opaque/brown{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 9
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/firealarm/directional/south,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/dorm)
+"rc" = (
+/obj/structure/grille,
+/obj/structure/window/plasma/reinforced/plastitanium,
+/obj/machinery/door/poddoor/shutters{
+ id = "valor_external"
+ },
+/turf/open/floor/plating,
+/area/ship/crew/dorm)
+"rL" = (
+/turf/open/floor/plasteel/patterned/cargo_one,
+/area/ship/cargo)
+"rO" = (
+/obj/effect/turf_decal/siding/thinplating/dark,
+/obj/effect/turf_decal/trimline/opaque/brown/line,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/medical)
+"rX" = (
+/obj/structure/sign/poster/contraband/inteq_gec{
+ pixel_y = 32
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plating,
+/area/ship/maintenance/port)
+"rY" = (
+/obj/effect/turf_decal/corner/opaque/yellow,
+/obj/effect/turf_decal/corner/opaque/brown{
+ dir = 4
+ },
+/obj/effect/turf_decal/corner/opaque/brown{
+ dir = 8
+ },
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 10
+ },
+/obj/machinery/airalarm/directional/east,
+/turf/open/floor/plasteel/dark,
+/area/ship/security)
+"sc" = (
+/obj/structure/rack,
+/obj/machinery/firealarm/directional/east,
+/obj/item/radio/intercom/directional/south,
+/obj/item/defibrillator/loaded{
+ pixel_x = 3;
+ pixel_y = 10
+ },
+/obj/item/defibrillator/loaded{
+ pixel_x = -2;
+ pixel_y = 2
+ },
+/turf/open/floor/plasteel/mono/white,
+/area/ship/medical)
+"se" = (
+/obj/effect/turf_decal/siding/thinplating{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/opaque/yellow/line{
+ dir = 4
+ },
+/obj/item/kirbyplants/random,
+/obj/machinery/power/apc/auto_name/directional/east,
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/turf/open/floor/plasteel/patterned/grid,
+/area/ship/hallway/central)
+"si" = (
+/obj/effect/turf_decal/trimline/opaque/blue/warning,
+/obj/effect/turf_decal/borderfloorwhite{
+ dir = 1
+ },
+/obj/machinery/door/airlock/medical/glass{
+ name = "Surgical Bay #1"
+ },
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
+"ss" = (
+/obj/effect/turf_decal/borderfloor{
+ dir = 4
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
+"su" = (
+/obj/effect/turf_decal/siding/thinplating/dark{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/opaque/brown/line{
+ dir = 1
+ },
+/obj/structure/chair,
+/obj/machinery/airalarm/directional/north,
+/turf/open/floor/plasteel/dark,
+/area/ship/medical)
+"sy" = (
+/obj/effect/turf_decal/corner/opaque/yellow{
+ dir = 1
+ },
+/obj/effect/turf_decal/corner/opaque/brown{
+ dir = 4
+ },
+/obj/effect/turf_decal/corner/opaque/brown{
+ dir = 8
+ },
+/obj/item/gun/ballistic/automatic/pistol/commander/inteq/no_mag{
+ pixel_x = -4;
+ pixel_y = 8
+ },
+/obj/item/gun/ballistic/automatic/pistol/commander/inteq/no_mag{
+ pixel_y = 4
+ },
+/obj/item/gun/ballistic/automatic/pistol/commander/inteq/no_mag{
+ pixel_x = 4
+ },
+/obj/structure/closet/secure_closet/wall{
+ icon_state = "sec_wall";
+ name = "weapons lockup";
+ pixel_y = 28;
+ req_access = list(1)
+ },
+/obj/structure/table,
+/obj/item/ammo_box/magazine/co9mm/rubber,
+/obj/item/ammo_box/magazine/co9mm/rubber,
+/obj/item/ammo_box/magazine/co9mm/rubber,
+/obj/item/ammo_box/magazine/co9mm,
+/obj/item/ammo_box/magazine/co9mm,
+/obj/item/ammo_box/magazine/co9mm,
+/obj/machinery/recharger,
+/turf/open/floor/plasteel/dark,
+/area/ship/security)
+"sz" = (
+/obj/effect/turf_decal/siding/thinplating/dark{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/thinplating/dark/corner{
+ dir = 8
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/opaque/brown/line{
+ dir = 1
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/medical)
+"sJ" = (
+/obj/effect/turf_decal/siding/thinplating{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/opaque/yellow/line{
+ dir = 8
+ },
+/obj/structure/table,
+/obj/item/cigbutt,
+/obj/item/cigbutt{
+ pixel_y = 12
+ },
+/obj/effect/decal/cleanable/ash,
+/obj/item/cigbutt{
+ pixel_x = -9;
+ pixel_y = 10
+ },
+/obj/machinery/firealarm/directional/west,
+/turf/open/floor/plasteel/patterned/grid,
+/area/ship/hallway/central)
+"sM" = (
+/obj/effect/turf_decal/corner/opaque/yellow{
+ dir = 1
+ },
+/obj/effect/turf_decal/corner/opaque/brown{
+ dir = 4
+ },
+/obj/effect/turf_decal/corner/opaque/yellow,
+/obj/machinery/modular_computer/console/preset/command,
+/obj/machinery/light/directional/east,
+/turf/open/floor/plasteel/telecomms_floor,
+/area/ship/bridge)
+"sZ" = (
+/obj/structure/weightmachine/weightlifter,
+/obj/machinery/light/directional/north,
+/turf/open/floor/plasteel/patterned/cargo_one,
+/area/ship/cargo)
+"te" = (
+/obj/structure/railing{
+ dir = 1;
+ layer = 2.9
+ },
+/obj/effect/turf_decal/borderfloor{
+ dir = 1
+ },
+/obj/structure/rack,
+/obj/item/target/clown{
+ pixel_x = 9;
+ pixel_y = 5
+ },
+/obj/item/target/syndicate{
+ pixel_x = -8;
+ pixel_y = 3
+ },
+/obj/item/target/syndicate{
+ pixel_y = 5
+ },
+/turf/open/floor/plasteel/patterned/cargo_one,
+/area/ship/cargo)
+"tj" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/light_switch{
+ pixel_y = 20
+ },
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/cargo)
+"tk" = (
+/obj/structure/reagent_dispensers/watertank,
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ship/crew/canteen)
+"ty" = (
+/obj/effect/turf_decal/trimline/opaque/yellow/filled/warning{
+ dir = 8
+ },
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+ dir = 4
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/dorm)
+"tz" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/crew/cryo)
+"tH" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/cargo)
+"tS" = (
+/obj/effect/turf_decal/siding/thinplating,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+ dir = 1
+ },
+/turf/open/floor/plasteel/patterned/grid,
+/area/ship/hallway/port)
+"tZ" = (
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/crew/office)
+"ua" = (
+/obj/effect/turf_decal/siding/thinplating/corner,
+/obj/effect/turf_decal/siding/thinplating/corner{
+ dir = 8
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/patterned/grid,
+/area/ship/hallway/port)
+"un" = (
+/obj/structure/table,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"uo" = (
+/obj/effect/turf_decal/siding/thinplating/corner,
+/obj/effect/turf_decal/siding/thinplating/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/opaque/yellow/warning{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/turf/open/floor/plasteel/patterned/grid,
+/area/ship/hallway/central)
+"ux" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/cargo)
+"uA" = (
+/obj/effect/turf_decal/trimline/opaque/yellow/filled/warning{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/dorm)
+"uB" = (
+/obj/effect/turf_decal/siding/thinplating{
+ dir = 1
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/noticeboard{
+ pixel_y = 28
+ },
+/turf/open/floor/plasteel/patterned/grid,
+/area/ship/hallway/port)
+"uS" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
+"vh" = (
+/obj/machinery/suit_storage_unit/inherit,
+/obj/item/clothing/suit/space/inteq,
+/obj/item/clothing/head/helmet/space/inteq,
+/obj/machinery/light/small/directional/west,
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/cargo)
+"vi" = (
+/obj/effect/turf_decal/trimline/opaque/yellow/filled/warning{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"vn" = (
+/obj/machinery/stasis{
+ dir = 1
+ },
+/obj/effect/turf_decal/box/white,
+/obj/machinery/light/directional/west,
+/turf/open/floor/plasteel/mono/white,
+/area/ship/medical)
+"vx" = (
+/obj/effect/turf_decal/siding/thinplating/dark/end,
+/obj/machinery/airalarm/directional/south,
+/obj/structure/closet/wall/white{
+ dir = 8;
+ pixel_x = 28
+ },
+/obj/item/clothing/under/rank/medical/gown,
+/obj/item/clothing/under/rank/medical/gown,
+/obj/item/clothing/under/rank/medical/gown,
+/obj/item/clothing/shoes/sandal/slippers,
+/obj/item/clothing/shoes/sandal/slippers,
+/obj/item/clothing/shoes/sandal/slippers,
+/turf/open/floor/plasteel/dark,
+/area/ship/medical)
+"vy" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/light/floor,
+/obj/effect/turf_decal/industrial/traffic{
+ dir = 1
+ },
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
+"vI" = (
+/obj/effect/turf_decal/siding/thinplating/dark{
+ dir = 1
+ },
+/obj/machinery/smartfridge/bloodbank/preloaded{
+ pixel_y = 32;
+ density = 0
+ },
+/obj/structure/table,
+/obj/machinery/cell_charger,
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/medical)
+"vK" = (
+/obj/machinery/cryopod{
+ dir = 1
+ },
+/obj/machinery/light/directional/south,
+/obj/effect/turf_decal/siding/white/corner{
+ dir = 1
+ },
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/crew/cryo)
+"vX" = (
+/obj/structure/grille,
+/obj/structure/window/plasma/reinforced/plastitanium,
+/obj/machinery/door/poddoor/shutters{
+ id = "valor_external"
+ },
+/turf/open/floor/plating,
+/area/ship/hallway/port)
+"wa" = (
+/obj/machinery/light/small/directional/north,
+/turf/open/floor/plasteel/patterned/brushed,
+/area/ship/crew/canteen)
+"wc" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/cable{
+ icon_state = "2-6"
+ },
+/turf/open/floor/plating,
+/area/ship/maintenance/port)
+"wj" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/patterned/grid,
+/area/ship/hallway/central)
+"wt" = (
+/obj/effect/turf_decal/spline/fancy/opaque/black{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/opaque/brown/filled/warning{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/thinplating/dark{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/opaque/brown/line,
+/turf/open/floor/plasteel/dark,
+/area/ship/medical)
+"wA" = (
+/obj/effect/turf_decal/corner/opaque/yellow{
+ dir = 1
+ },
+/obj/effect/turf_decal/corner/opaque/brown{
+ dir = 8
+ },
+/obj/machinery/light/directional/west,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"wD" = (
+/obj/machinery/cryopod,
+/obj/machinery/light/directional/north,
+/obj/effect/turf_decal/siding/white/corner{
+ dir = 8
+ },
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/crew/cryo)
+"wI" = (
+/obj/effect/turf_decal/trimline/opaque/brown/warning{
+ dir = 8
+ },
+/obj/effect/turf_decal/borderfloorwhite{
+ dir = 4
+ },
+/turf/open/floor/plasteel/tech,
+/area/ship/medical)
+"wL" = (
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 10
+ },
+/obj/machinery/airalarm/directional/east,
+/turf/open/floor/plasteel/patterned,
+/area/ship/crew/office)
+"wS" = (
+/obj/machinery/power/terminal{
+ dir = 8
+ },
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/obj/effect/turf_decal/corner_techfloor_gray/diagonal,
+/turf/open/floor/plating,
+/area/ship/maintenance/port)
+"wV" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"xb" = (
+/obj/effect/turf_decal/corner/opaque/brown{
+ dir = 4
+ },
+/obj/effect/turf_decal/corner/opaque/yellow,
+/obj/machinery/light/directional/east,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"xg" = (
+/obj/machinery/light/directional/south,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
+"xj" = (
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/cargo)
+"xl" = (
+/obj/effect/turf_decal/siding/thinplating{
+ dir = 6
+ },
+/obj/structure/extinguisher_cabinet/directional/east,
+/obj/machinery/light_switch{
+ dir = 1;
+ pixel_y = -20
+ },
+/turf/open/floor/plasteel/patterned/grid,
+/area/ship/hallway/port)
+"xp" = (
+/obj/effect/turf_decal/spline/fancy/opaque/black{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/opaque/brown/filled/warning{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/thinplating/dark{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/opaque/brown/arrow_ccw,
+/turf/open/floor/plasteel/dark,
+/area/ship/medical)
+"xs" = (
+/obj/machinery/iv_drip,
+/obj/machinery/light/directional/south,
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
+"xy" = (
+/obj/structure/sink{
+ dir = 8;
+ pixel_x = 12
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 9
+ },
+/turf/open/floor/plasteel/tech,
+/area/ship/medical)
+"xz" = (
+/obj/effect/turf_decal/industrial/traffic{
+ dir = 8
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/effect/turf_decal/industrial/traffic/corner{
+ dir = 4
+ },
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
+"xH" = (
+/obj/effect/turf_decal/siding/thinplating{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/opaque/yellow/line{
+ dir = 8
+ },
+/obj/structure/chair{
+ dir = 4
+ },
+/obj/machinery/airalarm/directional/west,
+/turf/open/floor/plasteel/patterned/grid,
+/area/ship/hallway/central)
+"xI" = (
+/obj/effect/turf_decal/siding/thinplating/dark{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/thinplating/dark/corner{
+ dir = 1
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/opaque/brown/line,
+/turf/open/floor/plasteel/dark,
+/area/ship/medical)
+"xJ" = (
+/obj/machinery/iv_drip,
+/obj/machinery/light/directional/north,
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
+"xU" = (
+/obj/docking_port/mobile{
+ can_move_docking_ports = 1;
+ name = "valor docking port";
+ port_direction = 8;
+ preferred_direction = 4;
+ dir = 2
+ },
+/turf/closed/wall/mineral/plastitanium,
+/area/ship/maintenance/port)
+"yb" = (
+/obj/effect/turf_decal/corner/opaque/brown{
+ dir = 8
+ },
+/obj/effect/turf_decal/corner/opaque/yellow,
+/obj/structure/closet/secure_closet/freezer{
+ anchored = 1;
+ locked = 0;
+ name = "fridge"
+ },
+/obj/item/storage/cans/sixbeer,
+/obj/effect/turf_decal/steeldecal/steel_decals_central4{
+ dir = 1
+ },
+/obj/item/reagent_containers/food/snacks/hotdog,
+/obj/effect/spawner/lootdrop/donkpockets,
+/obj/effect/spawner/lootdrop/donkpockets,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"yu" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+ dir = 1
+ },
+/turf/open/floor/carpet/black,
+/area/ship/crew/dorm)
+"yy" = (
+/obj/structure/railing{
+ dir = 5;
+ layer = 2.9
+ },
+/obj/effect/turf_decal/borderfloor{
+ dir = 4
+ },
+/obj/effect/turf_decal/box/corners{
+ dir = 4
+ },
+/obj/structure/rack,
+/obj/item/stack/sheet/glass/fifty,
+/obj/item/stack/sheet/metal/fifty,
+/turf/open/floor/plasteel/patterned/cargo_one,
+/area/ship/cargo)
+"yK" = (
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/turf/open/floor/plating,
+/area/ship/medical)
+"yN" = (
+/obj/structure/chair/office/dark,
+/obj/effect/turf_decal/corner/opaque/brown{
+ dir = 8
+ },
+/obj/effect/turf_decal/corner/opaque/yellow,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/security)
+"yT" = (
+/obj/structure/table,
+/obj/structure/window/reinforced{
+ dir = 8
+ },
+/obj/machinery/computer/secure_data/laptop{
+ dir = 1;
+ pixel_y = 8
+ },
+/obj/machinery/door/window/brigdoor/southleft,
+/obj/machinery/door/firedoor/border_only{
+ dir = 1
+ },
+/obj/machinery/door/firedoor/border_only,
+/turf/open/floor/plasteel/dark,
+/area/ship/security)
+"ze" = (
+/obj/item/clothing/mask/gas/sechailer/inteq,
+/obj/item/clothing/gloves/tackler/combat/insulated,
+/obj/item/clothing/shoes/combat,
+/obj/item/storage/backpack/messenger/inteq,
+/obj/item/megaphone/command,
+/obj/item/clothing/under/syndicate/inteq/skirt,
+/obj/item/clothing/under/syndicate/inteq,
+/obj/item/clothing/suit/armor/hos/inteq,
+/obj/item/clothing/head/beret/sec/hos/inteq,
+/obj/structure/closet/secure_closet/wall{
+ dir = 4;
+ icon_door = "solgov_wall";
+ icon_state = "solgov_wall";
+ name = "vanguard's locker";
+ pixel_x = -28;
+ req_access = list(58)
+ },
+/obj/item/storage/lockbox/medal/sec,
+/obj/item/clothing/glasses/hud/security/sunglasses/inteq,
+/obj/item/clothing/head/inteq_peaked,
+/turf/open/floor/carpet/orange,
+/area/ship/bridge)
+"zh" = (
+/turf/closed/wall/mineral/plastitanium,
+/area/ship/maintenance/port)
+"zi" = (
+/obj/machinery/computer/helm{
+ dir = 8
+ },
+/obj/effect/turf_decal/corner/opaque/yellow,
+/obj/effect/turf_decal/corner/opaque/brown{
+ dir = 4
+ },
+/obj/effect/turf_decal/corner/opaque/yellow{
+ dir = 1
+ },
+/obj/machinery/light_switch{
+ pixel_y = 20
+ },
+/turf/open/floor/plasteel/telecomms_floor,
+/area/ship/bridge)
+"zr" = (
+/obj/effect/turf_decal/borderfloorblack{
+ dir = 4
+ },
+/obj/structure/table/reinforced,
+/obj/effect/turf_decal/spline/fancy/opaque/black{
+ dir = 8
+ },
+/obj/machinery/airalarm/directional/south,
+/obj/machinery/fax{
+ pixel_y = 3
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"zs" = (
+/obj/effect/turf_decal/siding/thinplating,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/power/apc/auto_name/directional/south,
+/obj/structure/cable,
+/turf/open/floor/plasteel/patterned/grid,
+/area/ship/hallway/port)
+"zA" = (
+/obj/effect/turf_decal/siding/thinplating/dark{
+ dir = 5
+ },
+/obj/structure/closet/crate/bin,
+/obj/structure/sign/poster/official/get_your_legs{
+ pixel_y = 32
+ },
+/obj/machinery/light_switch{
+ dir = 8;
+ pixel_x = 20
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/medical)
+"zD" = (
+/obj/machinery/computer/operating{
+ dir = 4
+ },
+/obj/effect/turf_decal/borderfloorwhite,
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
+"zE" = (
+/obj/effect/turf_decal/siding/thinplating/dark{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/thinplating/dark,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/door/firedoor/border_only{
+ dir = 4
+ },
+/obj/machinery/door/firedoor/border_only{
+ dir = 8
+ },
+/obj/machinery/door/airlock/grunge{
+ dir = 4;
+ name = "Sick Bay"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/medical)
+"zG" = (
+/obj/effect/turf_decal/siding/thinplating{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/opaque/yellow/line{
+ dir = 8
+ },
+/obj/structure/chair/comfy/black{
+ dir = 4
+ },
+/obj/machinery/computer/helm/viewscreen/directional/west,
+/turf/open/floor/plasteel/patterned/grid,
+/area/ship/hallway/central)
+"zI" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/firedoor/border_only{
+ dir = 1
+ },
+/obj/machinery/door/airlock/grunge{
+ name = "Cargo Bay"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/effect/turf_decal/borderfloorblack,
+/turf/open/floor/plasteel/patterned,
+/area/ship/medical)
+"zK" = (
+/obj/machinery/door/firedoor/border_only{
+ dir = 1
+ },
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/airlock/public/glass{
+ name = "Supply Storage"
+ },
+/obj/effect/turf_decal/corner_techfloor_grid{
+ dir = 5
+ },
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
+"zL" = (
+/obj/structure/chair{
+ dir = 1
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"zO" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/patterned/grid,
+/area/ship/hallway/central)
+"zS" = (
+/obj/structure/table,
+/obj/effect/turf_decal/siding/thinplating/dark{
+ dir = 9
+ },
+/obj/item/storage/box/masks{
+ pixel_x = -7;
+ pixel_y = 10
+ },
+/obj/item/storage/box/gloves{
+ pixel_x = 8;
+ pixel_y = 10
+ },
+/obj/structure/sign/poster/official/walk{
+ pixel_y = 32
+ },
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/medical)
+"zT" = (
+/obj/structure/railing,
+/obj/effect/turf_decal/borderfloor/corner,
+/obj/structure/reagent_dispensers/fueltank,
+/turf/open/floor/plasteel/patterned/cargo_one,
+/area/ship/cargo)
+"Ab" = (
+/obj/structure/chair/comfy/shuttle{
+ dir = 4;
+ name = "Helm"
+ },
+/obj/effect/turf_decal/corner/opaque/brown{
+ dir = 4
+ },
+/obj/effect/turf_decal/steeldecal/steel_decals3,
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"Af" = (
+/obj/machinery/power/smes/shuttle/precharged{
+ dir = 4
+ },
+/obj/structure/window/reinforced{
+ dir = 8
+ },
+/obj/machinery/door/window/eastleft{
+ name = "Engine Access"
+ },
+/obj/structure/cable/yellow{
+ icon_state = "0-8"
+ },
+/turf/open/floor/plating,
+/area/ship/maintenance/starboard)
+"Am" = (
+/turf/open/floor/carpet/orange,
+/area/ship/bridge)
+"An" = (
+/obj/effect/turf_decal/siding/thinplating{
+ dir = 1
+ },
+/obj/effect/turf_decal/steeldecal/steel_decals_central7,
+/obj/machinery/airalarm/directional/north,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 8
+ },
+/turf/open/floor/plasteel/patterned/grid,
+/area/ship/hallway/port)
+"Av" = (
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"AD" = (
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/maintenance/starboard)
+"AE" = (
+/obj/structure/table,
+/obj/item/storage/backpack/duffelbag/med/surgery{
+ pixel_x = -2;
+ pixel_y = 7
+ },
+/obj/item/reagent_containers/medigel/sterilizine{
+ pixel_x = 8;
+ pixel_y = 3
+ },
+/obj/machinery/airalarm/directional/east,
+/obj/effect/turf_decal/borderfloorwhite,
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
+"AG" = (
+/obj/structure/bed,
+/obj/item/bedsheet/hos{
+ name = "vanguard's bedsheet"
+ },
+/obj/structure/curtain/bounty,
+/obj/machinery/light/directional/west,
+/turf/open/floor/carpet/orange,
+/area/ship/bridge)
+"AH" = (
+/obj/effect/turf_decal/siding/thinplating/corner,
+/obj/effect/turf_decal/siding/thinplating/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/opaque/yellow/warning{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/plasteel/patterned/grid,
+/area/ship/hallway/central)
+"AM" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/turf/open/floor/plasteel/stairs/left{
+ dir = 8
+ },
+/area/ship/cargo)
+"AO" = (
+/obj/structure/rack,
+/obj/item/reagent_containers/glass/bucket,
+/obj/item/mop,
+/obj/effect/turf_decal/corner/opaque/yellow/border{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/cobweb/cobweb2,
+/obj/structure/sign/poster/contraband/ss13{
+ pixel_y = 32
+ },
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ship/crew/canteen)
+"AP" = (
+/obj/effect/turf_decal/siding/thinplating,
+/obj/machinery/firealarm/directional/south,
+/turf/open/floor/plasteel/patterned/grid,
+/area/ship/hallway/port)
+"AV" = (
+/obj/effect/turf_decal/spline/fancy/opaque/black{
+ dir = 4
+ },
+/obj/structure/table,
+/obj/structure/bedsheetbin,
+/obj/effect/turf_decal/siding/thinplating/dark/end{
+ dir = 1
+ },
+/obj/structure/sign/poster/official/work_for_a_future{
+ desc = "A poster encouraging you to work for your future.";
+ pixel_y = 32
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/medical)
+"Bc" = (
+/obj/structure/bed,
+/obj/item/bedsheet/brown,
+/obj/structure/curtain/bounty,
+/obj/machinery/light/directional/west,
+/turf/open/floor/carpet/black,
+/area/ship/crew/dorm)
+"Bh" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"BC" = (
+/obj/structure/filingcabinet/double,
+/obj/structure/sign/poster/official/help_others{
+ pixel_y = 32
+ },
+/turf/open/floor/plasteel/patterned,
+/area/ship/crew/office)
+"BL" = (
+/obj/effect/turf_decal/corner/opaque/brown{
+ dir = 8
+ },
+/obj/effect/turf_decal/corner/opaque/yellow,
+/obj/effect/turf_decal/corner/opaque/yellow{
+ dir = 1
+ },
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/obj/machinery/light_switch{
+ dir = 1;
+ pixel_y = -20
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/security)
+"BV" = (
+/obj/structure/grille,
+/obj/structure/window/plasma/reinforced/plastitanium,
+/obj/machinery/door/poddoor/shutters{
+ dir = 4;
+ id = "valor_external"
+ },
+/obj/structure/closet/crate/bin,
+/turf/open/floor/plating,
+/area/ship/hallway/central)
+"Cb" = (
+/obj/effect/turf_decal/industrial/traffic{
+ dir = 8
+ },
+/obj/effect/turf_decal/industrial/traffic{
+ dir = 4
+ },
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
+"Cc" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
+"Ch" = (
+/obj/structure/punching_bag,
+/turf/open/floor/plasteel/patterned/cargo_one,
+/area/ship/cargo)
+"Cr" = (
+/obj/effect/turf_decal/corner/opaque/yellow{
+ dir = 1
+ },
+/obj/effect/turf_decal/corner/opaque/brown{
+ dir = 8
+ },
+/obj/machinery/photocopier,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"Ct" = (
+/obj/structure/catwalk/over,
+/turf/open/floor/plating/airless,
+/area/ship/external/dark)
+"CC" = (
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/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/plating,
+/area/ship/hallway/port)
+"CF" = (
+/obj/structure/table/optable,
+/obj/machinery/defibrillator_mount/loaded{
+ pixel_x = 28
+ },
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
+"CH" = (
+/obj/effect/turf_decal/trimline/opaque/yellow/filled/warning,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+ dir = 1
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/dorm)
+"CT" = (
+/obj/machinery/door/airlock/security/glass{
+ name = "Security Office";
+ req_access = list(1)
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/door/firedoor/border_only{
+ dir = 1
+ },
+/obj/machinery/door/firedoor/border_only,
+/obj/effect/turf_decal/corner/opaque/yellow{
+ dir = 1
+ },
+/obj/effect/turf_decal/corner/opaque/brown{
+ dir = 4
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/security)
+"CV" = (
+/obj/effect/turf_decal/borderfloorblack{
+ dir = 4
+ },
+/obj/effect/turf_decal/spline/fancy/opaque/black/corner{
+ dir = 8
+ },
+/obj/effect/turf_decal/spline/fancy/opaque/black{
+ dir = 8
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+ dir = 1
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"Dj" = (
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/ship/maintenance/starboard)
+"Dl" = (
+/obj/machinery/power/terminal,
+/obj/structure/cable/yellow,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/corner_techfloor_gray/diagonal,
+/turf/open/floor/plating,
+/area/ship/maintenance/port)
+"Dm" = (
+/obj/effect/turf_decal/industrial/warning{
+ dir = 1
+ },
+/obj/effect/turf_decal/industrial/warning,
+/obj/effect/turf_decal/siding/white{
+ dir = 8
+ },
+/turf/open/floor/plasteel/tech,
+/area/ship/crew/cryo)
+"Dw" = (
+/obj/structure/cable/yellow,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/airalarm/directional/east,
+/obj/machinery/power/port_gen/pacman/super,
+/obj/item/stack/sheet/mineral/uranium/twenty,
+/turf/open/floor/plating,
+/area/ship/maintenance/starboard)
+"Dx" = (
+/obj/effect/turf_decal/siding/thinplating/dark/end,
+/obj/structure/rack,
+/obj/item/storage/firstaid/brute{
+ pixel_x = 5;
+ pixel_y = 4
+ },
+/obj/item/storage/firstaid/o2{
+ pixel_x = -6;
+ pixel_y = -2
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/medical)
+"DA" = (
+/obj/effect/turf_decal/siding/thinplating{
+ dir = 1
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/siding/thinplating/corner{
+ dir = 8
+ },
+/turf/open/floor/plasteel/patterned/grid,
+/area/ship/hallway/port)
+"DD" = (
+/obj/machinery/holopad/emergency/command,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"DG" = (
+/obj/structure/sink{
+ dir = 4;
+ pixel_x = -12
+ },
+/obj/structure/sign/poster/official/cleanliness{
+ pixel_x = -32
+ },
+/turf/open/floor/plasteel/mono/white,
+/area/ship/medical)
+"DL" = (
+/obj/machinery/door/airlock/external{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/plasteel/tech,
+/area/ship/medical)
+"DR" = (
+/obj/machinery/door/airlock/hatch{
+ name = "Cargo Bay"
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/firedoor/border_only{
+ dir = 1
+ },
+/obj/effect/turf_decal/borderfloorblack{
+ dir = 1
+ },
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/hallway/port)
+"DT" = (
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/hallway/central)
+"DU" = (
+/obj/structure/grille,
+/obj/structure/window/plasma/reinforced/plastitanium,
+/obj/machinery/door/poddoor/shutters{
+ dir = 4;
+ id = "valor_external"
+ },
+/turf/open/floor/plating,
+/area/ship/hallway/port)
+"Ea" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/effect/turf_decal/industrial/traffic{
+ dir = 8
+ },
+/obj/effect/turf_decal/industrial/stand_clear{
+ dir = 4
+ },
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
+"Ed" = (
+/obj/effect/turf_decal/corner/opaque/yellow{
+ dir = 9
+ },
+/obj/effect/turf_decal/corner/opaque/yellow{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/patterned/grid,
+/area/ship/hallway/central)
+"Ei" = (
+/obj/effect/turf_decal/corner/opaque/yellow,
+/obj/effect/turf_decal/corner/opaque/brown{
+ dir = 8
+ },
+/obj/effect/turf_decal/corner/opaque/brown{
+ dir = 4
+ },
+/obj/machinery/washing_machine,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/dorm)
+"El" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"EA" = (
+/obj/effect/turf_decal/corner/opaque/brown{
+ dir = 4
+ },
+/obj/effect/turf_decal/corner/opaque/yellow,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 9
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"EE" = (
+/obj/effect/turf_decal/trimline/opaque/brown/line{
+ dir = 5
+ },
+/obj/effect/turf_decal/siding/thinplating/dark{
+ dir = 5
+ },
+/obj/structure/chair,
+/obj/structure/extinguisher_cabinet/directional/north,
+/obj/machinery/light_switch{
+ dir = 8;
+ pixel_x = 20
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/medical)
+"EJ" = (
+/obj/effect/turf_decal/siding/thinplating/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/thinplating/corner{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/opaque/yellow/warning{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/turf/open/floor/plasteel/patterned/grid,
+/area/ship/hallway/central)
+"EK" = (
+/obj/effect/turf_decal/corner/opaque/brown{
+ dir = 8
+ },
+/obj/effect/turf_decal/corner/opaque/yellow{
+ dir = 1
+ },
+/obj/machinery/light/directional/west,
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 6
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/dorm)
+"EL" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"EM" = (
+/obj/structure/bed,
+/obj/structure/curtain,
+/obj/machinery/light/directional/north,
+/obj/item/bedsheet/medical,
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
+"ET" = (
+/obj/structure/chair{
+ dir = 1
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"EY" = (
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/crew/cryo)
+"Fa" = (
+/obj/effect/turf_decal/box/corners{
+ dir = 8
+ },
+/turf/open/floor/plasteel/patterned/cargo_one,
+/area/ship/cargo)
+"Ff" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/light_switch{
+ dir = 8;
+ pixel_x = 20
+ },
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/cargo)
+"Fs" = (
+/obj/effect/turf_decal/trimline/opaque/brown/filled/warning,
+/obj/effect/turf_decal/siding/thinplating/dark,
+/obj/effect/turf_decal/trimline/opaque/brown/line{
+ dir = 1
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/medical)
+"Ft" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
+"FF" = (
+/obj/structure/bed,
+/obj/item/bedsheet/brown,
+/obj/structure/curtain/bounty,
+/obj/structure/sign/poster/contraband/masked_men{
+ pixel_y = -32
+ },
+/obj/machinery/firealarm/directional/east,
+/turf/open/floor/carpet/black,
+/area/ship/crew/dorm)
+"FH" = (
+/obj/structure/chair{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"FI" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/light/floor,
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
+"FJ" = (
+/obj/structure/table,
+/obj/item/folder/red{
+ pixel_x = 5;
+ pixel_y = 5
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/item/paper_bin{
+ pixel_x = -15;
+ pixel_y = 3
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"FY" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/stairs,
+/area/ship/cargo)
+"FZ" = (
+/obj/effect/turf_decal/siding/thinplating{
+ dir = 1
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 6
+ },
+/turf/open/floor/plasteel/patterned/grid,
+/area/ship/hallway/port)
+"Gd" = (
+/obj/effect/turf_decal/trimline/opaque/yellow/filled/warning{
+ dir = 4
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"Gm" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel/patterned,
+/area/ship/crew/office)
+"Go" = (
+/obj/effect/turf_decal/corner/opaque/brown{
+ dir = 8
+ },
+/obj/effect/turf_decal/corner/opaque/yellow,
+/obj/machinery/light/directional/south,
+/obj/structure/table,
+/obj/item/storage/fancy/donut_box,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"GA" = (
+/obj/structure/sign/poster/contraband/inteq_nt{
+ pixel_x = -32
+ },
+/obj/machinery/atmospherics/components/unary/tank/air{
+ dir = 4;
+ piping_layer = 2
+ },
+/obj/machinery/light/directional/north,
+/turf/open/floor/plating,
+/area/ship/maintenance/starboard)
+"GF" = (
+/obj/structure/closet/cardboard,
+/obj/item/clothing/gloves/boxing/yellow,
+/obj/item/clothing/gloves/boxing/yellow,
+/obj/item/clothing/gloves/boxing/green,
+/obj/item/clothing/gloves/boxing/green,
+/obj/item/clothing/gloves/boxing/blue,
+/obj/item/clothing/gloves/boxing/blue,
+/obj/item/clothing/gloves/boxing,
+/obj/item/clothing/gloves/boxing,
+/turf/open/floor/plasteel/patterned/cargo_one,
+/area/ship/cargo)
+"GR" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/patterned/grid,
+/area/ship/hallway/central)
+"Hg" = (
+/obj/effect/turf_decal/siding/thinplating{
+ dir = 1
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+ dir = 1
+ },
+/turf/open/floor/plasteel/patterned/grid,
+/area/ship/hallway/port)
+"Hi" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/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/tech/grid,
+/area/ship/cargo)
+"Hw" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/firedoor/border_only{
+ dir = 1
+ },
+/obj/machinery/door/airlock/public/glass{
+ name = "EVA Storage"
+ },
+/obj/effect/turf_decal/corner_techfloor_grid{
+ dir = 10
+ },
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
+"HA" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/obj/structure/cable{
+ icon_state = "1-10"
+ },
+/turf/open/floor/plating,
+/area/ship/maintenance/starboard)
+"HB" = (
+/obj/effect/turf_decal/techfloor,
+/obj/effect/turf_decal/siding/thinplating/dark{
+ dir = 1
+ },
+/obj/structure/table,
+/obj/machinery/door/window/northright,
+/obj/structure/sign/poster/official/moth/epi{
+ pixel_y = -32
+ },
+/obj/item/storage/firstaid/radiation{
+ pixel_x = -6;
+ pixel_y = 5
+ },
+/obj/item/storage/firstaid/toxin{
+ pixel_x = 6;
+ pixel_y = 1
+ },
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/medical)
+"HC" = (
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/hallway/port)
+"HE" = (
+/obj/structure/grille,
+/obj/structure/window/plasma/reinforced/plastitanium,
+/obj/machinery/door/poddoor/shutters{
+ dir = 4;
+ id = "valor_bridge";
+ name = "Bridge Shutters"
+ },
+/turf/open/floor/plating,
+/area/ship/bridge)
+"HK" = (
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/crew/canteen)
+"HL" = (
+/obj/structure/reagent_dispensers/beerkeg,
+/turf/open/floor/plasteel/patterned/cargo_one,
+/area/ship/cargo)
+"HN" = (
+/obj/machinery/cryopod,
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/crew/cryo)
+"HQ" = (
+/obj/structure/sink{
+ dir = 1;
+ pixel_y = -7
+ },
+/obj/structure/mirror{
+ pixel_y = -24
+ },
+/turf/open/floor/plasteel/patterned/brushed,
+/area/ship/crew/canteen)
+"HT" = (
+/obj/effect/turf_decal/borderfloorblack{
+ dir = 4
+ },
+/obj/effect/turf_decal/spline/fancy/opaque/black/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/spline/fancy/opaque/black{
+ dir = 8
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"Ie" = (
+/obj/effect/turf_decal/corner/opaque/yellow{
+ dir = 1
+ },
+/obj/effect/turf_decal/corner/opaque/brown{
+ dir = 4
+ },
+/obj/effect/turf_decal/corner/opaque/brown{
+ dir = 8
+ },
+/obj/structure/table,
+/obj/structure/bedsheetbin/empty,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/dorm)
+"Ik" = (
+/obj/effect/turf_decal/siding/thinplating{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/opaque/yellow/line{
+ dir = 4
+ },
+/obj/machinery/vending/coffee,
+/turf/open/floor/plasteel/patterned/grid,
+/area/ship/hallway/central)
+"Io" = (
+/obj/machinery/rnd/server,
+/obj/machinery/light/small/directional/east,
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/cargo)
+"IA" = (
+/obj/effect/turf_decal/spline/fancy/opaque/black{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/opaque/brown/filled/warning{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/thinplating/dark{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/opaque/brown/arrow_ccw,
+/turf/open/floor/plasteel/dark,
+/area/ship/medical)
+"IB" = (
+/obj/effect/turf_decal/trimline/opaque/brown/filled/warning,
+/obj/effect/turf_decal/siding/thinplating/dark,
+/obj/effect/turf_decal/trimline/opaque/brown/arrow_ccw{
+ dir = 1
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/medical)
+"IL" = (
+/obj/effect/turf_decal/borderfloor{
+ dir = 4
+ },
+/obj/machinery/light_switch{
+ dir = 1;
+ pixel_y = -20
+ },
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
+"IM" = (
+/obj/effect/turf_decal/corner/opaque/brown{
+ dir = 4
+ },
+/obj/effect/turf_decal/corner/opaque/yellow{
+ dir = 1
+ },
+/obj/structure/sign/poster/contraband/inteq{
+ pixel_y = 32
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"IN" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"IQ" = (
+/obj/structure/table,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/item/storage/bag/tray{
+ pixel_y = 5;
+ pixel_x = -1
+ },
+/obj/item/reagent_containers/food/drinks/soda_cans/cola{
+ pixel_x = 6;
+ pixel_y = 8
+ },
+/obj/item/reagent_containers/food/snacks/burger/plain{
+ pixel_y = 3;
+ pixel_x = -4
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"Jd" = (
+/obj/effect/turf_decal/borderfloor{
+ dir = 1
+ },
+/obj/structure/railing{
+ dir = 1;
+ layer = 2.9
+ },
+/obj/structure/closet/crate{
+ name = "sandbags crate"
+ },
+/obj/item/storage/box/emptysandbags{
+ pixel_x = -5;
+ pixel_y = 5
+ },
+/obj/item/storage/box/emptysandbags,
+/obj/item/storage/box/emptysandbags{
+ pixel_x = 5;
+ pixel_y = -5
+ },
+/turf/open/floor/plasteel/patterned/cargo_one,
+/area/ship/cargo)
+"Jh" = (
+/obj/effect/turf_decal/corner/opaque/brown{
+ dir = 4
+ },
+/obj/effect/turf_decal/corner/opaque/yellow{
+ dir = 1
+ },
+/obj/machinery/light/directional/north,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"Jn" = (
+/obj/machinery/power/apc/auto_name/directional/south,
+/obj/structure/cable,
+/turf/open/floor/plasteel/tech,
+/area/ship/medical)
+"Jt" = (
+/obj/effect/turf_decal/corner/opaque/brown{
+ dir = 4
+ },
+/obj/effect/turf_decal/corner/opaque/yellow,
+/obj/structure/sign/poster/official/moth{
+ pixel_x = 32
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"Jz" = (
+/obj/structure/table,
+/obj/item/phone{
+ pixel_x = -14
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/jukebox/boombox{
+ pixel_y = 2;
+ pixel_x = 3
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"JC" = (
+/obj/machinery/door/poddoor{
+ dir = 4;
+ id = "valor_cargo"
+ },
+/turf/open/floor/plating,
+/area/ship/cargo)
+"JJ" = (
+/obj/structure/ore_box,
+/turf/open/floor/plasteel/patterned/cargo_one,
+/area/ship/cargo)
+"JS" = (
+/obj/structure/railing{
+ dir = 9;
+ layer = 2.9
+ },
+/obj/effect/turf_decal/borderfloor{
+ dir = 1
+ },
+/obj/effect/turf_decal/box/corners{
+ dir = 1
+ },
+/obj/structure/rack,
+/obj/effect/spawner/lootdrop/maintenance/two,
+/turf/open/floor/plasteel/patterned/cargo_one,
+/area/ship/cargo)
+"Kh" = (
+/turf/open/floor/carpet/blue,
+/area/ship/bridge)
+"Ki" = (
+/obj/effect/turf_decal/corner_techfloor_gray{
+ dir = 6
+ },
+/obj/effect/turf_decal/borderfloor{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/door/firedoor/border_only{
+ dir = 4
+ },
+/obj/machinery/door/firedoor/border_only{
+ dir = 8
+ },
+/obj/machinery/door/airlock/public/glass{
+ dir = 8;
+ name = "Cryogenics"
+ },
+/turf/open/floor/plasteel/tech,
+/area/ship/crew/cryo)
+"Km" = (
+/obj/effect/turf_decal/corner/opaque/brown{
+ dir = 8
+ },
+/obj/effect/turf_decal/corner/opaque/yellow,
+/obj/structure/reagent_dispensers/water_cooler,
+/obj/structure/sign/poster/contraband/eat{
+ pixel_y = -32
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"Kn" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
+"Ko" = (
+/obj/machinery/computer/cargo/express{
+ dir = 1
+ },
+/obj/effect/turf_decal/corner/opaque/brown{
+ dir = 4
+ },
+/obj/effect/turf_decal/corner/opaque/yellow,
+/obj/effect/turf_decal/corner/opaque/brown{
+ dir = 8
+ },
+/obj/machinery/light/directional/east,
+/obj/machinery/firealarm/directional/south,
+/turf/open/floor/plasteel/telecomms_floor,
+/area/ship/bridge)
+"Kp" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
+"Kz" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/effect/turf_decal/industrial/traffic{
+ dir = 1
+ },
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
+"KB" = (
+/obj/effect/turf_decal/corner/opaque/yellow{
+ dir = 6
+ },
+/obj/effect/turf_decal/corner/opaque/yellow{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/patterned/grid,
+/area/ship/hallway/central)
+"KC" = (
+/obj/structure/table,
+/obj/item/folder{
+ pixel_y = 4;
+ pixel_x = -3
+ },
+/obj/item/folder/blue{
+ pixel_x = 2
+ },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"KD" = (
+/obj/machinery/iv_drip,
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
+"KH" = (
+/obj/structure/table,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"KU" = (
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 6
+ },
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 6
+ },
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
+"KV" = (
+/obj/effect/turf_decal/corner/opaque/brown{
+ dir = 4
+ },
+/obj/effect/turf_decal/corner/opaque/yellow{
+ dir = 1
+ },
+/obj/structure/extinguisher_cabinet/directional/north,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"KW" = (
+/obj/effect/turf_decal/siding/thinplating{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/opaque/yellow/line{
+ dir = 8
+ },
+/obj/item/kirbyplants/random,
+/obj/machinery/light/directional/west,
+/turf/open/floor/plasteel/patterned/grid,
+/area/ship/hallway/central)
+"KY" = (
+/obj/effect/turf_decal/spline/fancy/opaque/black{
+ dir = 1
+ },
+/obj/effect/turf_decal/spline/fancy/opaque/black,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"Lb" = (
+/obj/effect/turf_decal/siding/thinplating{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/opaque/yellow/line{
+ dir = 1
+ },
+/obj/structure/sign/poster/contraband/hacking_guide{
+ pixel_y = 32
+ },
+/turf/open/floor/plasteel/patterned/grid,
+/area/ship/hallway/central)
+"Ls" = (
+/obj/effect/turf_decal/techfloor{
+ dir = 4
+ },
+/obj/structure/closet/crate/bin,
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/central)
+"LH" = (
+/obj/machinery/light/floor,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/effect/turf_decal/industrial/traffic{
+ dir = 1
+ },
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
+"LI" = (
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/medical)
+"LJ" = (
+/obj/machinery/computer/operating{
+ dir = 8
+ },
+/obj/machinery/airalarm/directional/east,
+/obj/effect/turf_decal/borderfloorwhite,
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
+"LL" = (
+/obj/structure/rack,
+/obj/item/pickaxe/emergency,
+/obj/item/pickaxe/emergency,
+/obj/item/pickaxe/emergency,
+/obj/machinery/airalarm/directional/east,
+/obj/machinery/light_switch{
+ dir = 1;
+ pixel_y = -20
+ },
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/cargo)
+"LR" = (
+/obj/effect/turf_decal/corner/opaque/brown{
+ dir = 8
+ },
+/obj/effect/turf_decal/corner/opaque/yellow,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+ dir = 4
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/security)
+"Md" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/turf/open/floor/plasteel/stairs{
+ dir = 8
+ },
+/area/ship/cargo)
+"Mn" = (
+/obj/effect/turf_decal/industrial/traffic{
+ dir = 8
+ },
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
+"Mq" = (
+/obj/structure/table,
+/turf/open/floor/carpet/black,
+/area/ship/crew/dorm)
+"Mt" = (
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/turf/open/floor/carpet/black,
+/area/ship/crew/dorm)
+"Mw" = (
+/obj/effect/turf_decal/industrial/warning{
+ dir = 10
+ },
+/obj/machinery/atmospherics/components/unary/outlet_injector/on{
+ dir = 1;
+ piping_layer = 4
+ },
+/turf/open/floor/plating/airless,
+/area/ship/external/dark)
+"ME" = (
+/obj/machinery/door/airlock/medical/glass{
+ name = "Medical Office"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/door/firedoor/border_only{
+ dir = 1
+ },
+/obj/machinery/door/firedoor/border_only,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel/patterned,
+/area/ship/crew/office)
+"MK" = (
+/obj/machinery/power/shuttle/engine/electric{
+ dir = 4
+ },
+/obj/structure/cable/yellow{
+ icon_state = "0-4"
+ },
+/turf/open/floor/plating/airless,
+/area/ship/external/dark)
+"MR" = (
+/obj/machinery/suit_storage_unit/inherit,
+/obj/item/clothing/suit/space/inteq,
+/obj/item/clothing/head/helmet/space/inteq,
+/obj/structure/sign/poster/official/safety_internals{
+ pixel_y = 32
+ },
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/cargo)
+"MS" = (
+/obj/structure/table,
+/obj/item/paper_bin,
+/obj/item/pen,
+/obj/structure/window/reinforced,
+/obj/structure/window/reinforced{
+ dir = 4
+ },
+/obj/machinery/door/firedoor/border_only{
+ dir = 1
+ },
+/obj/machinery/door/firedoor/border_only,
+/obj/item/flashlight/lamp{
+ pixel_y = 10;
+ pixel_x = -13
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/security)
+"Nh" = (
+/turf/closed/wall/mineral/plastitanium,
+/area/ship/cargo)
+"Nn" = (
+/obj/structure/table/reinforced,
+/obj/effect/decal/cleanable/cobweb,
+/obj/effect/turf_decal/corner/opaque/yellow/border{
+ dir = 1
+ },
+/obj/item/reagent_containers/spray/cleaner{
+ pixel_x = 6;
+ pixel_y = 8
+ },
+/obj/item/reagent_containers/spray/cleaner{
+ pixel_x = 8;
+ pixel_y = 2
+ },
+/obj/item/soap{
+ pixel_x = -6
+ },
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ship/crew/canteen)
+"Nu" = (
+/obj/structure/closet/secure_closet/wall{
+ dir = 4;
+ pixel_x = -28;
+ req_access = list(19);
+ name = "honorable corpsman's locker"
+ },
+/obj/item/clothing/shoes/combat,
+/obj/item/megaphone/command,
+/obj/item/clothing/under/syndicate/inteq/corpsman,
+/obj/item/clothing/under/syndicate/inteq/skirt/corpsman,
+/obj/item/clothing/suit/armor/hos/inteq,
+/obj/item/clothing/suit/hooded/wintercoat/security/inteq/alt,
+/obj/item/storage/backpack/messenger/med,
+/obj/item/clothing/head/beret/sec/brig_phys{
+ icon_state = "beret_med";
+ name = "honorable corpsman beret";
+ desc = "A beret made out of white reinforced fabric with a lue cross emblazoned on it. Smells faintly of blood and gauze."
+ },
+/obj/item/clothing/glasses/hud/health/sunglasses,
+/obj/item/storage/box/hypospray/CMO,
+/obj/item/clothing/gloves/color/latex/nitrile,
+/turf/open/floor/carpet/blue,
+/area/ship/bridge)
+"NA" = (
+/obj/effect/turf_decal/trimline/opaque/brown/filled/warning,
+/obj/effect/turf_decal/siding/thinplating/dark,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 5
+ },
+/obj/effect/turf_decal/trimline/opaque/brown/line{
+ dir = 1
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/medical)
+"ND" = (
+/obj/effect/turf_decal/steeldecal/steel_decals_central6,
+/obj/effect/turf_decal/spline/fancy/opaque/black{
+ dir = 1
+ },
+/obj/effect/turf_decal/spline/fancy/opaque/black,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"NE" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/door/firedoor/border_only{
+ dir = 8
+ },
+/obj/machinery/door/firedoor/border_only{
+ dir = 4
+ },
+/obj/machinery/door/airlock/public/glass{
+ dir = 8;
+ name = "Cargo Bay"
+ },
+/turf/open/floor/plasteel,
+/area/ship/hallway/central)
+"NG" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel/stairs/medium{
+ dir = 8
+ },
+/area/ship/cargo)
+"NI" = (
+/obj/effect/turf_decal/siding/thinplating/dark{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/thinplating/dark/corner,
+/obj/machinery/firealarm/directional/west,
+/obj/effect/turf_decal/trimline/opaque/brown/line{
+ dir = 1
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/medical)
+"NM" = (
+/obj/structure/grille,
+/obj/structure/window/plasma/reinforced/plastitanium,
+/obj/machinery/door/poddoor/shutters{
+ id = "valor_external"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/plating,
+/area/ship/hallway/port)
+"NT" = (
+/obj/structure/table,
+/obj/item/storage/toolbox/electrical{
+ pixel_x = -2;
+ pixel_y = 8
+ },
+/obj/item/storage/toolbox/mechanical{
+ pixel_x = 4;
+ pixel_y = 3
+ },
+/obj/machinery/light/directional/south,
+/obj/structure/sign/poster/contraband/tools{
+ pixel_x = -32
+ },
+/obj/effect/turf_decal/corner_techfloor_gray/full,
+/turf/open/floor/plating,
+/area/ship/maintenance/port)
+"NZ" = (
+/obj/effect/turf_decal/siding/thinplating/dark,
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
+/obj/effect/turf_decal/trimline/opaque/brown/line,
+/turf/open/floor/plasteel/dark,
+/area/ship/medical)
+"Od" = (
+/obj/effect/turf_decal/siding/thinplating{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/opaque/yellow/line{
+ dir = 4
+ },
+/obj/structure/chair/sofa/right{
+ dir = 8
+ },
+/obj/structure/closet/emcloset/wall{
+ dir = 8;
+ pixel_x = 28
+ },
+/turf/open/floor/plasteel/patterned/grid,
+/area/ship/hallway/central)
+"Oh" = (
+/obj/structure/table/reinforced,
+/obj/item/paper_bin{
+ pixel_y = 6
+ },
+/obj/item/pen{
+ pixel_y = 6
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"Oj" = (
+/obj/effect/turf_decal/borderfloor{
+ dir = 8
+ },
+/obj/structure/closet/emcloset/wall{
+ pixel_y = 28
+ },
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
+"Ok" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
+"OC" = (
+/obj/structure/bed,
+/obj/structure/curtain,
+/obj/machinery/light/directional/south,
+/obj/item/bedsheet/medical,
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
+"OD" = (
+/obj/effect/turf_decal/corner/opaque/brown{
+ dir = 4
+ },
+/obj/effect/turf_decal/corner/opaque/yellow,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 10
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"OE" = (
+/obj/structure/table/reinforced,
+/obj/item/radio/intercom/wideband/table{
+ dir = 4;
+ pixel_x = 4;
+ pixel_y = 8
+ },
+/obj/effect/turf_decal/corner/opaque/yellow,
+/obj/effect/turf_decal/corner/opaque/brown{
+ dir = 4
+ },
+/obj/machinery/button/door{
+ pixel_x = -9;
+ dir = 8;
+ pixel_y = 8;
+ name = "Bridge Shutters";
+ id = "valor_bridge"
+ },
+/obj/machinery/button/door{
+ pixel_x = -9;
+ dir = 8;
+ pixel_y = -4;
+ id = "valor_external";
+ name = "External Shutters"
+ },
+/obj/item/radio/intercom/table{
+ dir = 4;
+ pixel_x = 4;
+ pixel_y = -6
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"OK" = (
+/obj/machinery/iv_drip/saline,
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/cargo)
+"OM" = (
+/turf/open/floor/pod,
+/area/ship/cargo)
+"OR" = (
+/obj/structure/tank_dispenser/oxygen,
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/cargo)
+"OT" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/airalarm/directional/north,
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/cargo)
+"OV" = (
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/light/small/directional/east,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/turf/open/floor/plating,
+/area/ship/medical)
+"Pb" = (
+/obj/machinery/power/terminal{
+ dir = 8
+ },
+/obj/effect/turf_decal/corner_techfloor_gray{
+ dir = 6
+ },
+/obj/structure/cable{
+ icon_state = "0-5"
+ },
+/turf/open/floor/plating,
+/area/ship/maintenance/port)
+"Pe" = (
+/obj/effect/turf_decal/trimline/opaque/brown/warning,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/thinplating/dark/corner,
+/obj/effect/turf_decal/siding/thinplating/dark/corner{
+ dir = 8
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/medical)
+"Pg" = (
+/obj/structure/sink{
+ dir = 4;
+ pixel_x = -12
+ },
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
+"Pk" = (
+/obj/effect/turf_decal/corner/opaque/brown{
+ dir = 4
+ },
+/obj/effect/turf_decal/corner/opaque/yellow,
+/obj/machinery/washing_machine,
+/obj/machinery/light_switch{
+ dir = 8;
+ pixel_x = 20
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/dorm)
+"PJ" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/light_switch{
+ dir = 1;
+ pixel_y = -20
+ },
+/turf/open/floor/plasteel/patterned,
+/area/ship/crew/office)
+"PL" = (
+/obj/effect/turf_decal/siding/thinplating/dark{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/opaque/brown/line{
+ dir = 1
+ },
+/obj/machinery/light/directional/north,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
+/turf/open/floor/plasteel/dark,
+/area/ship/medical)
+"PU" = (
+/turf/closed/wall/mineral/plastitanium,
+/area/ship/crew/cryo)
+"Qc" = (
+/obj/effect/turf_decal/siding/thinplating{
+ dir = 1
+ },
+/obj/structure/noticeboard{
+ pixel_y = 28
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 8
+ },
+/turf/open/floor/plasteel/patterned/grid,
+/area/ship/hallway/port)
+"Qd" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 5
+ },
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/cargo)
+"Qk" = (
+/obj/structure/table,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/spawner/lootdrop/donut,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"Qn" = (
+/obj/effect/turf_decal/siding/thinplating/dark,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/opaque/brown/line,
+/turf/open/floor/plasteel/dark,
+/area/ship/medical)
+"Qo" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+ dir = 4
+ },
+/obj/item/radio/intercom/directional/south,
+/turf/open/floor/plasteel/patterned,
+/area/ship/crew/office)
+"Qw" = (
+/obj/effect/turf_decal/siding/thinplating{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/opaque/yellow/line{
+ dir = 8
+ },
+/obj/structure/table,
+/obj/machinery/light_switch{
+ dir = 4;
+ pixel_x = -20;
+ pixel_y = 5
+ },
+/turf/open/floor/plasteel/patterned/grid,
+/area/ship/hallway/central)
+"QE" = (
+/obj/structure/extinguisher_cabinet/directional/north,
+/obj/structure/sign/warning/vacuum{
+ pixel_x = 32
+ },
+/turf/open/floor/plasteel/tech,
+/area/ship/medical)
+"QG" = (
+/obj/effect/turf_decal/siding/thinplating/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/thinplating/corner{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/opaque/yellow/warning{
+ dir = 8
+ },
+/turf/open/floor/plasteel/patterned/grid,
+/area/ship/hallway/central)
+"QO" = (
+/obj/effect/turf_decal/corner/opaque/yellow{
+ dir = 1
+ },
+/obj/effect/turf_decal/corner/opaque/brown{
+ dir = 8
+ },
+/obj/machinery/airalarm/directional/west,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"QQ" = (
+/obj/machinery/light/small/directional/south,
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ship/crew/canteen)
+"Rc" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 10
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 10
+ },
+/obj/structure/extinguisher_cabinet/directional/east,
+/obj/structure/sign/warning/incident{
+ pixel_y = 32
+ },
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/cargo)
+"Re" = (
+/obj/structure/closet/crate/freezer,
+/obj/machinery/iv_drip,
+/obj/item/reagent_containers/blood/universal,
+/obj/item/reagent_containers/blood/universal,
+/obj/item/reagent_containers/blood/universal,
+/obj/machinery/light/small/directional/west,
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/cargo)
+"Rh" = (
+/turf/closed/wall/mineral/plastitanium,
+/area/ship/security)
+"Rj" = (
+/obj/structure/toilet/secret{
+ secret_type = "/obj/item/toy/plush/moth";
+ dir = 8
+ },
+/turf/open/floor/plasteel/patterned/brushed,
+/area/ship/crew/canteen)
+"Rz" = (
+/obj/effect/turf_decal/box/corners{
+ dir = 8
+ },
+/obj/effect/turf_decal/box/corners{
+ dir = 1
+ },
+/obj/item/chair/plastic,
+/obj/item/chair/plastic{
+ pixel_y = 3;
+ pixel_x = -3
+ },
+/obj/item/chair/plastic{
+ pixel_y = 6;
+ pixel_x = 2
+ },
+/obj/item/chair/plastic{
+ pixel_y = 8;
+ pixel_x = -3
+ },
+/obj/structure/rack,
+/turf/open/floor/plasteel/patterned/cargo_one,
+/area/ship/cargo)
+"RA" = (
+/obj/item/storage/backpack/messenger/inteq,
+/obj/item/storage/backpack/messenger/inteq,
+/obj/item/storage/backpack/messenger/inteq,
+/obj/item/clothing/head/beret/sec/inteq,
+/obj/item/clothing/head/beret/sec/inteq,
+/obj/item/clothing/head/beret/sec/inteq,
+/obj/item/clothing/head/soft/inteq,
+/obj/item/clothing/head/soft/inteq,
+/obj/item/clothing/head/soft/inteq,
+/obj/structure/closet/wall{
+ pixel_y = 28
+ },
+/obj/machinery/airalarm/directional/east,
+/turf/open/floor/carpet/black,
+/area/ship/crew/dorm)
+"RF" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+ dir = 1
+ },
+/turf/open/floor/plasteel/tech,
+/area/ship/medical)
+"RI" = (
+/obj/structure/rack,
+/turf/open/floor/plasteel/patterned/cargo_one,
+/area/ship/cargo)
+"Sd" = (
+/obj/effect/turf_decal/siding/thinplating,
+/obj/machinery/light/directional/south,
+/turf/open/floor/plasteel/patterned/grid,
+/area/ship/hallway/port)
+"Sf" = (
+/obj/effect/turf_decal/trimline/opaque/yellow/filled/warning{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/thinplating/end{
+ dir = 8
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel/patterned/grid,
+/area/ship/hallway/port)
+"Sh" = (
+/obj/effect/turf_decal/borderfloor{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
+"Sl" = (
+/obj/structure/table/wood,
+/obj/item/paper_bin,
+/obj/item/pen,
+/turf/open/floor/carpet/black,
+/area/ship/crew/dorm)
+"Sq" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+ dir = 8
+ },
+/turf/open/floor/plasteel/patterned/grid,
+/area/ship/hallway/central)
+"Sv" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 10
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/turf/open/floor/carpet/black,
+/area/ship/crew/dorm)
+"SX" = (
+/obj/machinery/power/terminal{
+ dir = 1
+ },
+/obj/structure/cable/yellow{
+ icon_state = "0-2"
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plating,
+/area/ship/maintenance/starboard)
+"Td" = (
+/turf/template_noop,
+/area/template_noop)
+"Tu" = (
+/obj/structure/table,
+/obj/item/reagent_containers/food/drinks/coffee{
+ pixel_x = -7;
+ pixel_y = 6
+ },
+/obj/item/reagent_containers/food/drinks/coffee{
+ pixel_x = 6;
+ pixel_y = 3
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 5
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"Tw" = (
+/turf/closed/wall/mineral/plastitanium,
+/area/ship/hallway/central)
+"TC" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 10
+ },
+/turf/open/floor/carpet/black,
+/area/ship/crew/dorm)
+"TL" = (
+/obj/effect/turf_decal/trimline/opaque/yellow/filled/warning{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 5
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"TS" = (
+/obj/effect/turf_decal/corner/opaque/brown{
+ dir = 8
+ },
+/obj/effect/turf_decal/corner/opaque/yellow,
+/obj/structure/table,
+/obj/item/storage/box/cups{
+ pixel_y = 7;
+ pixel_x = -3
+ },
+/obj/machinery/light/directional/south,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"TW" = (
+/obj/structure/bed,
+/obj/item/bedsheet/brown,
+/obj/structure/curtain/bounty,
+/turf/open/floor/carpet/black,
+/area/ship/crew/dorm)
+"Uf" = (
+/obj/machinery/power/terminal{
+ dir = 8
+ },
+/obj/machinery/light/directional/south,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/cable{
+ icon_state = "0-5"
+ },
+/turf/open/floor/plating,
+/area/ship/maintenance/starboard)
+"Ug" = (
+/obj/machinery/door/poddoor{
+ dir = 4;
+ id = "valor_cargo"
+ },
+/obj/machinery/power/shieldwallgen/atmos{
+ id = "valor_holo";
+ anchored = 1
+ },
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/turf/open/floor/plating,
+/area/ship/cargo)
+"Ui" = (
+/obj/effect/turf_decal/siding/thinplating/dark/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/thinplating/dark/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/opaque/brown/warning{
+ dir = 1
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/turf/open/floor/plasteel/dark,
+/area/ship/medical)
+"Uj" = (
+/obj/effect/turf_decal/siding/thinplating/dark,
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/opaque/brown/line,
+/turf/open/floor/plasteel/dark,
+/area/ship/medical)
+"Um" = (
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/crew/dorm)
+"Us" = (
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+ dir = 1
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"Uv" = (
+/obj/docking_port/stationary{
+ height = 15;
+ width = 15;
+ name = "valor dock";
+ dwidth = 15;
+ dir = 8
+ },
+/turf/template_noop,
+/area/template_noop)
+"Uz" = (
+/obj/machinery/power/smes/engineering{
+ charge = 1e+006
+ },
+/obj/effect/turf_decal/borderfloorblack/full,
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/light_switch{
+ dir = 8;
+ pixel_x = 20
+ },
+/turf/open/floor/plating,
+/area/ship/maintenance/starboard)
+"UC" = (
+/obj/structure/chair{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"UN" = (
+/obj/effect/turf_decal/siding/thinplating,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+ dir = 1
+ },
+/obj/machinery/light/directional/south,
+/turf/open/floor/plasteel/patterned/grid,
+/area/ship/hallway/port)
+"UO" = (
+/obj/effect/landmark/subship{
+ subship_template = /datum/map_template/shuttle/subshuttles/haste
+ },
+/turf/open/floor/pod,
+/area/ship/cargo)
+"UQ" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
+"Ve" = (
+/turf/open/floor/plasteel/tech,
+/area/ship/medical)
+"Vp" = (
+/obj/effect/turf_decal/corner/opaque/yellow{
+ dir = 1
+ },
+/obj/effect/turf_decal/corner/opaque/brown{
+ dir = 4
+ },
+/obj/effect/turf_decal/corner/opaque/yellow,
+/obj/structure/rack,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
+/obj/item/ammo_box/c9mm/rubbershot{
+ pixel_x = 5;
+ pixel_y = 10
+ },
+/obj/item/ammo_box/c9mm{
+ pixel_x = -2;
+ pixel_y = 2
+ },
+/obj/machinery/light/small/directional/north,
+/obj/structure/sign/poster/official/safety_report{
+ pixel_x = 32
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/security)
+"Vy" = (
+/obj/effect/turf_decal/techfloor{
+ dir = 4
+ },
+/obj/structure/closet/firecloset,
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/central)
+"VB" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 6
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"VD" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 8
+ },
+/obj/machinery/door/firedoor/border_only{
+ dir = 4
+ },
+/obj/machinery/door/firedoor/border_only{
+ dir = 8
+ },
+/obj/machinery/door/airlock/grunge{
+ dir = 4;
+ name = "Port Hallway"
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/dorm)
+"VT" = (
+/obj/structure/closet/emcloset/empty{
+ anchored = 1;
+ can_be_unanchored = 1;
+ name = "oxygen closet"
+ },
+/obj/item/tank/internals/oxygen,
+/obj/item/tank/internals/oxygen,
+/obj/item/tank/internals/oxygen,
+/obj/item/tank/internals/oxygen,
+/obj/item/tank/internals/oxygen,
+/obj/item/tank/internals/plasmaman/full,
+/obj/item/tank/internals/plasmaman/full,
+/obj/effect/turf_decal/techfloor,
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/medical)
+"VY" = (
+/obj/machinery/power/terminal{
+ dir = 8
+ },
+/obj/effect/turf_decal/corner_techfloor_gray{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "0-5"
+ },
+/turf/open/floor/plating,
+/area/ship/maintenance/starboard)
+"Wb" = (
+/obj/effect/turf_decal/corner/opaque/yellow{
+ dir = 9
+ },
+/obj/effect/turf_decal/corner/opaque/yellow,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+ dir = 4
+ },
+/turf/open/floor/plasteel/patterned/grid,
+/area/ship/hallway/central)
+"Wd" = (
+/obj/structure/table,
+/obj/item/paper_bin,
+/obj/item/folder/white{
+ pixel_x = -15;
+ pixel_y = -1
+ },
+/obj/item/pen,
+/obj/structure/window/reinforced,
+/obj/structure/window/reinforced{
+ dir = 4
+ },
+/obj/item/toy/figure/paramedic{
+ pixel_x = -13;
+ pixel_y = 14;
+ name = "Corpsman action figure"
+ },
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/firedoor/border_only{
+ dir = 1
+ },
+/turf/open/floor/plasteel/patterned,
+/area/ship/crew/office)
+"Wp" = (
+/obj/machinery/door/airlock/hatch{
+ name = "Port Hallway"
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/firedoor/border_only{
+ dir = 1
+ },
+/obj/effect/turf_decal/borderfloorblack,
+/turf/open/floor/plasteel/patterned/grid,
+/area/ship/hallway/port)
+"Wv" = (
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/cable{
+ icon_state = "2-9"
+ },
+/obj/structure/cable{
+ icon_state = "2-10"
+ },
+/turf/open/floor/plating,
+/area/ship/maintenance/port)
+"WC" = (
+/obj/structure/grille,
+/obj/structure/window/plasma/reinforced/plastitanium,
+/obj/machinery/door/poddoor/shutters{
+ id = "valor_external"
+ },
+/turf/open/floor/plating,
+/area/ship/medical)
+"WO" = (
+/obj/effect/turf_decal/siding/thinplating/dark{
+ dir = 9
+ },
+/obj/effect/turf_decal/trimline/opaque/brown/line{
+ dir = 9
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
+/obj/machinery/firealarm/directional/west,
+/turf/open/floor/plasteel/dark,
+/area/ship/medical)
+"WQ" = (
+/obj/structure/cable/yellow{
+ icon_state = "0-2"
+ },
+/obj/machinery/airalarm/directional/east,
+/obj/machinery/power/port_gen/pacman/super,
+/obj/item/stack/sheet/mineral/uranium/twenty,
+/turf/open/floor/plating,
+/area/ship/maintenance/port)
+"WX" = (
+/obj/effect/turf_decal/siding/thinplating,
+/obj/effect/turf_decal/trimline/opaque/yellow/line,
+/turf/open/floor/plasteel/patterned/grid,
+/area/ship/hallway/central)
+"Xf" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
+"Xg" = (
+/obj/effect/turf_decal/siding/thinplating/dark{
+ dir = 1
+ },
+/obj/machinery/vending/medical/syndicate_access{
+ name = "\improper InteqMed Plus"
+ },
+/obj/machinery/light/directional/north,
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/medical)
+"Xi" = (
+/obj/structure/chair{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"Xn" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+ dir = 1
+ },
+/turf/open/floor/carpet/black,
+/area/ship/crew/dorm)
+"Xq" = (
+/obj/machinery/light_switch{
+ dir = 4;
+ pixel_x = -20;
+ pixel_y = 5
+ },
+/turf/open/floor/carpet/black,
+/area/ship/crew/dorm)
+"Xu" = (
+/obj/machinery/suit_storage_unit/inherit,
+/obj/item/clothing/suit/space/inteq,
+/obj/item/clothing/head/helmet/space/inteq,
+/obj/effect/turf_decal/techfloor{
+ dir = 1
+ },
+/obj/machinery/light/small/directional/north,
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/medical)
+"Xw" = (
+/obj/effect/turf_decal/trimline/opaque/brown/filled/warning,
+/obj/effect/turf_decal/siding/thinplating/dark,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 5
+ },
+/obj/effect/turf_decal/trimline/opaque/brown/arrow_ccw{
+ dir = 1
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/medical)
+"Xx" = (
+/obj/structure/closet/secure_closet/medical1,
+/obj/machinery/light/small/directional/north,
+/turf/open/floor/plasteel/patterned,
+/area/ship/crew/office)
+"XD" = (
+/obj/effect/turf_decal/siding/thinplating/dark/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/thinplating/dark/corner{
+ dir = 4
+ },
+/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/dark,
+/area/ship/medical)
+"XR" = (
+/obj/effect/turf_decal/siding/thinplating/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/thinplating/corner{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
+/turf/open/floor/plasteel/patterned/grid,
+/area/ship/hallway/port)
+"XT" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/door/firedoor/border_only{
+ dir = 4
+ },
+/obj/machinery/door/firedoor/border_only{
+ dir = 8
+ },
+/obj/machinery/door/airlock/public/glass{
+ dir = 8;
+ name = "Canteen"
+ },
+/turf/open/floor/plasteel/patterned/grid,
+/area/ship/crew/canteen)
+"XU" = (
+/obj/effect/turf_decal/borderfloor{
+ dir = 8
+ },
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
+"Yd" = (
+/obj/effect/turf_decal/siding/thinplating{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/opaque/yellow/line{
+ dir = 4
+ },
+/obj/machinery/vending/cola/random,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/light/directional/east,
+/turf/open/floor/plasteel/patterned/grid,
+/area/ship/hallway/central)
+"Ye" = (
+/obj/effect/turf_decal/siding/thinplating/dark,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/opaque/brown/line,
+/turf/open/floor/plasteel/dark,
+/area/ship/medical)
+"Yi" = (
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
+"Yn" = (
+/obj/machinery/door/airlock/grunge{
+ dir = 8;
+ name = "Restroom"
+ },
+/turf/open/floor/plasteel/patterned/brushed,
+/area/ship/crew/canteen)
+"Yt" = (
+/obj/effect/turf_decal/borderfloor{
+ dir = 4
+ },
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
+"Yu" = (
+/obj/effect/turf_decal/techfloor,
+/obj/structure/closet/firecloset,
+/obj/machinery/advanced_airlock_controller{
+ pixel_x = 28
+ },
+/obj/structure/sign/poster/official/safety_internals{
+ pixel_y = -32
+ },
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/medical)
+"Yx" = (
+/obj/machinery/rnd/production/techfab/department/medical,
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/cargo)
+"YF" = (
+/obj/machinery/power/terminal{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/corner_techfloor_gray/diagonal,
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/turf/open/floor/plating,
+/area/ship/maintenance/starboard)
+"YL" = (
+/obj/structure/grille,
+/obj/structure/window/plasma/reinforced/plastitanium,
+/obj/machinery/door/poddoor/shutters{
+ dir = 4;
+ id = "valor_external"
+ },
+/turf/open/floor/plating,
+/area/ship/hallway/central)
+"YM" = (
+/obj/effect/turf_decal/corner/opaque/yellow{
+ dir = 1
+ },
+/obj/effect/turf_decal/corner/opaque/brown{
+ dir = 4
+ },
+/obj/structure/table,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/dorm)
+"YR" = (
+/obj/item/clothing/under/syndicate/inteq,
+/obj/item/clothing/under/syndicate/inteq,
+/obj/item/clothing/under/syndicate/inteq,
+/obj/item/clothing/under/syndicate/inteq/skirt,
+/obj/item/clothing/under/syndicate/inteq/skirt,
+/obj/item/clothing/under/syndicate/inteq/skirt,
+/obj/item/clothing/shoes/sneakers/black,
+/obj/item/clothing/shoes/sneakers/black,
+/obj/item/clothing/shoes/sneakers/black,
+/obj/item/clothing/shoes/combat,
+/obj/item/clothing/shoes/combat,
+/obj/item/clothing/shoes/combat,
+/obj/structure/closet/wall{
+ pixel_y = 28
+ },
+/turf/open/floor/carpet/black,
+/area/ship/crew/dorm)
+"YZ" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/door/airlock/maintenance_hatch{
+ dir = 4;
+ name = "Port Engines"
+ },
+/turf/open/floor/plating,
+/area/ship/maintenance/port)
+"Zd" = (
+/obj/machinery/power/smes/shuttle/precharged{
+ dir = 4
+ },
+/obj/structure/window/reinforced{
+ dir = 8
+ },
+/obj/machinery/door/window/eastleft{
+ name = "Engine Access"
+ },
+/obj/structure/cable/yellow{
+ icon_state = "0-8"
+ },
+/turf/open/floor/plating,
+/area/ship/maintenance/port)
+"Zf" = (
+/obj/structure/railing{
+ dir = 4;
+ layer = 2.9
+ },
+/obj/effect/turf_decal/borderfloor{
+ dir = 4
+ },
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
+"Zr" = (
+/obj/structure/rack,
+/obj/item/roller,
+/obj/item/roller{
+ pixel_y = 8;
+ pixel_x = -1
+ },
+/obj/item/roller{
+ pixel_y = 16;
+ pixel_x = 1
+ },
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/cargo)
+"Zu" = (
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/security)
+"ZF" = (
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
+"ZG" = (
+/obj/machinery/power/smes/engineering{
+ charge = 1e+006
+ },
+/obj/effect/turf_decal/borderfloorblack/full,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/obj/machinery/light_switch{
+ dir = 8;
+ pixel_x = 20
+ },
+/turf/open/floor/plating,
+/area/ship/maintenance/port)
+"ZZ" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/turf/open/floor/carpet/black,
+/area/ship/crew/dorm)
+
+(1,1,1) = {"
+xU
+MK
+MK
+MK
+zh
+Td
+Td
+Td
+Td
+Td
+Td
+Td
+Td
+Td
+Td
+Uv
+Td
+Td
+Td
+Td
+Td
+Td
+Td
+Td
+Td
+Td
+ey
+MK
+MK
+MK
+ey
+"}
+(2,1,1) = {"
+cu
+Zd
+gm
+Zd
+cu
+zh
+Td
+Td
+Td
+Td
+Td
+gi
+nc
+nc
+nc
+nc
+nc
+nc
+nc
+dG
+Td
+Td
+Td
+Td
+Td
+ey
+AD
+Af
+nd
+Af
+AD
+"}
+(3,1,1) = {"
+cu
+pL
+wS
+Pb
+NT
+cu
+Td
+Td
+Td
+Td
+Td
+Nh
+Ug
+JC
+JC
+JC
+JC
+JC
+ml
+Nh
+Td
+Td
+Td
+Td
+Td
+AD
+GA
+VY
+YF
+Uf
+AD
+"}
+(4,1,1) = {"
+cu
+rX
+Wv
+wc
+eV
+cu
+Td
+Td
+Td
+Td
+Nh
+xj
+qG
+iI
+Cb
+Cb
+Cb
+Cb
+xz
+xj
+Nh
+Td
+Td
+Td
+Td
+AD
+pU
+ei
+HA
+lD
+AD
+"}
+(5,1,1) = {"
+cu
+WQ
+Dl
+ZG
+ar
+cu
+Td
+Td
+Td
+Td
+xj
+og
+FI
+qe
+OM
+OM
+OM
+UO
+LH
+Rz
+xj
+Td
+Td
+Td
+Td
+AD
+Dj
+Uz
+SX
+Dw
+AD
+"}
+(6,1,1) = {"
+cu
+cu
+cu
+cu
+YZ
+cu
+Td
+Td
+Td
+Td
+xj
+rL
+uS
+qe
+OM
+OM
+OM
+OM
+Kz
+RI
+xj
+Td
+Td
+Td
+Td
+AD
+ko
+AD
+AD
+AD
+AD
+"}
+(7,1,1) = {"
+Zu
+sy
+BL
+Zu
+Sf
+HC
+qL
+Td
+Td
+Td
+xj
+sZ
+uS
+qe
+OM
+OM
+OM
+OM
+Kz
+kL
+xj
+Td
+Td
+Td
+bB
+LI
+ns
+qR
+pC
+zD
+LI
+"}
+(8,1,1) = {"
+Zu
+ew
+yN
+yT
+DA
+gb
+vX
+Td
+Td
+Td
+xj
+GF
+uS
+qe
+OM
+OM
+OM
+OM
+Kz
+rL
+xj
+Td
+Td
+Td
+WC
+WO
+gp
+qR
+Yi
+bI
+LI
+"}
+(9,1,1) = {"
+Zu
+kK
+LR
+MS
+FZ
+hl
+NM
+Mw
+Td
+Td
+xj
+Ch
+FI
+qe
+OM
+OM
+OM
+OM
+vy
+fG
+xj
+Td
+Td
+Td
+WC
+dA
+Pe
+si
+hW
+AE
+LI
+"}
+(10,1,1) = {"
+Zu
+Vp
+rY
+CT
+XR
+UN
+HC
+DU
+DU
+DU
+HC
+Zf
+oz
+qe
+OM
+OM
+OM
+OM
+Kz
+ZF
+LI
+jL
+jL
+jL
+LI
+PL
+bJ
+LI
+LI
+LI
+LI
+"}
+(11,1,1) = {"
+Zu
+Rh
+Rh
+Zu
+uB
+ua
+Wp
+CC
+ky
+CC
+DR
+Qd
+FY
+kH
+Mn
+Ea
+jG
+Mn
+de
+KU
+zI
+yK
+OV
+yK
+aW
+Ui
+gU
+nK
+Pg
+eU
+LI
+"}
+(12,1,1) = {"
+tZ
+BC
+jN
+lN
+gh
+zs
+HC
+HC
+HC
+HC
+HC
+OT
+JS
+jj
+qt
+Kp
+Kn
+dQ
+Fa
+Ft
+LI
+LI
+LI
+LI
+LI
+su
+rO
+qR
+Yi
+bI
+LI
+"}
+(13,1,1) = {"
+tZ
+Xx
+Gm
+Wd
+Hg
+tS
+HC
+MR
+vh
+fN
+xj
+tj
+te
+fe
+Ok
+Xf
+as
+HL
+ec
+xg
+xj
+Zr
+Re
+OK
+LI
+EE
+oy
+qR
+CF
+LJ
+LI
+"}
+(14,1,1) = {"
+tZ
+mG
+Qo
+tZ
+An
+Sd
+HC
+Oj
+XU
+XU
+xj
+cI
+Jd
+qA
+UQ
+hm
+Cc
+JJ
+zT
+Md
+xj
+XU
+XU
+cE
+LI
+LI
+dN
+LI
+LI
+LI
+LI
+"}
+(15,1,1) = {"
+tZ
+fO
+PJ
+tZ
+Qc
+AP
+HC
+bx
+ss
+Sh
+Hw
+ux
+ct
+nx
+AM
+NG
+dO
+yy
+bh
+nX
+zK
+Yt
+Yt
+IL
+LI
+zS
+pt
+vn
+DG
+lv
+LI
+"}
+(16,1,1) = {"
+tZ
+bv
+wL
+ME
+iN
+xl
+HC
+OR
+gq
+LL
+Nh
+Rc
+bF
+Hi
+aU
+bN
+tH
+Ff
+jQ
+qX
+xj
+Yx
+Io
+mt
+LI
+vI
+Ye
+mw
+mw
+HB
+LI
+"}
+(17,1,1) = {"
+oO
+tZ
+tZ
+tZ
+VD
+Um
+DT
+DT
+DT
+DT
+DT
+DT
+DT
+DT
+NE
+DT
+nz
+DT
+Tw
+Tw
+DT
+DT
+DT
+DT
+DT
+Xg
+Uj
+dl
+Jn
+LI
+bB
+"}
+(18,1,1) = {"
+Td
+Um
+Ie
+EK
+ty
+dp
+DT
+Vy
+qk
+Ls
+DT
+fE
+sJ
+xH
+EJ
+KW
+QG
+zG
+Qw
+jU
+DT
+kW
+qk
+Vy
+DT
+fj
+Qn
+RF
+Ve
+WC
+Td
+"}
+(19,1,1) = {"
+Td
+rc
+YM
+mB
+ma
+CH
+jk
+lc
+lc
+lc
+ht
+jw
+GR
+jp
+Wb
+pj
+pz
+Sq
+GR
+hj
+id
+lc
+lc
+lc
+bR
+XD
+NZ
+wI
+wI
+WC
+Td
+"}
+(20,1,1) = {"
+Td
+rc
+aa
+mI
+gn
+qZ
+DT
+kG
+kG
+kG
+Tw
+Lb
+lE
+wj
+KB
+ix
+Ed
+zO
+lE
+WX
+DT
+jT
+kG
+kG
+DT
+zA
+mx
+gl
+sc
+LI
+Td
+"}
+(21,1,1) = {"
+Td
+Um
+nU
+uA
+Pk
+Ei
+DT
+YL
+YL
+BV
+DT
+mZ
+Yd
+hN
+AH
+se
+uo
+Ik
+Od
+ie
+DT
+YL
+YL
+YL
+DT
+LI
+zE
+LI
+LI
+LI
+Td
+"}
+(22,1,1) = {"
+Td
+Um
+Um
+du
+Um
+Um
+Um
+Td
+Td
+Td
+HK
+HK
+ka
+ka
+XT
+HK
+pa
+HK
+HK
+HK
+HK
+Td
+Td
+Td
+LI
+AV
+ap
+NI
+Dx
+LI
+Td
+"}
+(23,1,1) = {"
+Td
+Um
+ln
+aC
+Xq
+Bc
+Um
+Td
+Td
+Td
+HK
+dM
+Cr
+wA
+vi
+iQ
+pO
+cj
+QO
+lI
+HK
+Td
+Td
+Td
+LI
+xJ
+xp
+IB
+xs
+LI
+Td
+"}
+(24,1,1) = {"
+Td
+rc
+eZ
+Sv
+yu
+om
+rc
+Ct
+Td
+Td
+HK
+Jh
+Av
+VB
+KC
+zL
+Us
+Tu
+ET
+Go
+HK
+Td
+Td
+Ct
+WC
+eN
+cW
+Fs
+eN
+WC
+Td
+"}
+(25,1,1) = {"
+Td
+rc
+Sl
+ZZ
+hS
+TW
+rc
+Ct
+Ct
+Td
+HK
+IM
+Oh
+Bh
+FJ
+zL
+EL
+Qk
+Xi
+dk
+HK
+Td
+Ct
+Ct
+WC
+KD
+wt
+NA
+KD
+WC
+Td
+"}
+(26,1,1) = {"
+Td
+Um
+YR
+TC
+Xn
+Mq
+rc
+Ct
+Ct
+Ct
+HK
+ah
+mj
+IN
+nB
+gt
+oL
+IN
+wV
+yb
+HK
+Ct
+Ct
+Ct
+LI
+EM
+IA
+Xw
+OC
+LI
+Td
+"}
+(27,1,1) = {"
+Td
+Um
+RA
+mH
+Mt
+FF
+Um
+Td
+Ct
+Ct
+HK
+KV
+mz
+IN
+KH
+FH
+El
+un
+Xi
+Km
+HK
+Ct
+Ct
+Td
+LI
+pd
+xI
+sz
+vx
+LI
+Td
+"}
+(28,1,1) = {"
+Td
+PU
+EY
+EY
+Ki
+EY
+EY
+Td
+Td
+Ct
+HK
+Jh
+Av
+Av
+Jz
+UC
+EL
+IQ
+ET
+TS
+HK
+Ct
+Td
+Td
+LI
+QE
+mp
+xy
+LI
+bB
+Td
+"}
+(29,1,1) = {"
+Td
+Td
+EY
+pA
+tz
+hw
+EY
+Td
+Td
+Td
+HK
+Gd
+cZ
+xb
+OD
+TL
+EA
+xb
+Jt
+Gd
+HK
+Td
+Td
+Td
+LI
+LI
+DL
+LI
+LI
+Td
+Td
+"}
+(30,1,1) = {"
+Td
+Td
+EY
+wD
+Dm
+vK
+EY
+Td
+Td
+ka
+HK
+dI
+nk
+nk
+nk
+em
+nk
+nk
+nk
+Yn
+HK
+HK
+Td
+Td
+LI
+Xu
+qW
+VT
+LI
+Td
+Td
+"}
+(31,1,1) = {"
+Td
+Td
+EY
+HN
+jR
+fa
+EY
+Td
+Td
+HK
+Nn
+ni
+nk
+AG
+ze
+ND
+Nu
+kv
+nk
+nZ
+HQ
+HK
+Td
+Td
+LI
+oC
+md
+Yu
+LI
+Td
+Td
+"}
+(32,1,1) = {"
+Td
+Td
+PU
+EY
+EY
+EY
+PU
+Td
+Td
+HK
+AO
+QQ
+nk
+bS
+Am
+KY
+Kh
+fQ
+nk
+wa
+Rj
+HK
+Td
+Td
+bB
+LI
+gZ
+LI
+bB
+Td
+Td
+"}
+(33,1,1) = {"
+Td
+Td
+Td
+Td
+Td
+Td
+Td
+Td
+Td
+ka
+HK
+tk
+nk
+lW
+HT
+ej
+CV
+zr
+nk
+qQ
+HK
+ka
+Td
+Td
+Td
+Td
+Td
+Td
+Td
+Td
+Td
+"}
+(34,1,1) = {"
+Td
+Td
+Td
+Td
+Td
+Td
+Td
+Td
+Td
+Td
+ka
+HK
+nk
+sM
+Ab
+DD
+eM
+Ko
+nk
+HK
+ka
+Td
+Td
+Td
+Td
+Td
+Td
+Td
+Td
+Td
+Td
+"}
+(35,1,1) = {"
+Td
+Td
+Td
+Td
+Td
+Td
+Td
+Td
+Td
+Td
+Td
+Td
+jS
+nk
+zi
+OE
+fK
+nk
+jS
+Td
+Td
+Td
+Td
+Td
+Td
+Td
+Td
+Td
+Td
+Td
+Td
+"}
+(36,1,1) = {"
+Td
+Td
+Td
+Td
+Td
+Td
+Td
+Td
+Td
+Td
+Td
+Td
+Td
+nk
+HE
+HE
+HE
+nk
+Td
+Td
+Td
+Td
+Td
+Td
+Td
+Td
+Td
+Td
+Td
+Td
+Td
+"}
diff --git a/_maps/shuttles/inteq/inteq_vaquero.dmm b/_maps/shuttles/inteq/inteq_vaquero.dmm
index e2232f1a4661..e65b103e6ebe 100644
--- a/_maps/shuttles/inteq/inteq_vaquero.dmm
+++ b/_maps/shuttles/inteq/inteq_vaquero.dmm
@@ -936,6 +936,7 @@
/obj/effect/turf_decal/corner/opaque/yellow{
dir = 1
},
+/obj/item/clothing/head/inteq_peaked,
/turf/open/floor/plasteel/dark,
/area/ship/bridge)
"mE" = (
diff --git a/_maps/shuttles/minutemen/minutemen_asclepius.dmm b/_maps/shuttles/minutemen/minutemen_asclepius.dmm
index b2d763063f39..a4dcffa117dc 100644
--- a/_maps/shuttles/minutemen/minutemen_asclepius.dmm
+++ b/_maps/shuttles/minutemen/minutemen_asclepius.dmm
@@ -3752,7 +3752,7 @@
pixel_x = 1;
pixel_y = 1
},
-/obj/item/book/manual/wiki/engineering_guide{
+/obj/item/book/manual/wiki/engineering{
pixel_x = 5;
pixel_y = 2
},
@@ -4064,7 +4064,7 @@
/obj/item/clothing/head/helmet/bulletproof/minutemen,
/obj/item/clothing/glasses/hud/security/sunglasses/eyepatch,
/obj/item/storage/belt/security,
-/obj/item/gun/ballistic/automatic/pistol/m1911,
+/obj/item/gun/ballistic/automatic/pistol/candor,
/obj/item/ammo_box/magazine/m45/rubber,
/obj/item/ammo_box/magazine/m45/rubber{
pixel_x = 3
@@ -4436,13 +4436,13 @@
/obj/item/clothing/gloves/color/latex/nitrile,
/obj/item/healthanalyzer/advanced,
/obj/item/clothing/neck/cloak/cmo,
-/obj/item/gun/ballistic/revolver/nagant,
-/obj/item/ammo_box/n762_clip,
-/obj/item/ammo_box/n762_clip,
+/obj/item/gun/ballistic/revolver/shadow,
+/obj/item/ammo_box/c45_speedloader,
+/obj/item/ammo_box/c45_speedloader,
/obj/item/clothing/suit/armor/vest/capcarapace/minutemen,
/obj/item/reagent_containers/hypospray/CMO,
-/obj/item/ammo_box/n762,
-/obj/item/ammo_box/n762,
+/obj/item/ammo_box/c45_speedloader,
+/obj/item/ammo_box/c45_speedloader,
/turf/open/floor/carpet/royalblue,
/area/ship/bridge)
"NY" = (
diff --git a/_maps/shuttles/minutemen/minutemen_cepheus.dmm b/_maps/shuttles/minutemen/minutemen_cepheus.dmm
index 0a77ee2ca4ed..2faae373ecaf 100644
--- a/_maps/shuttles/minutemen/minutemen_cepheus.dmm
+++ b/_maps/shuttles/minutemen/minutemen_cepheus.dmm
@@ -189,7 +189,7 @@
pixel_x = -4;
pixel_y = 1
},
-/obj/item/book/manual/wiki/engineering_singulo_tesla{
+/obj/item/book/manual/wiki/engineering{
pixel_x = 5;
pixel_y = 14
},
@@ -431,8 +431,8 @@
/obj/item/clothing/glasses/hud/security/sunglasses/eyepatch,
/obj/item/clothing/shoes/cowboy/white,
/obj/item/storage/belt/sabre,
-/obj/item/gun/ballistic/revolver/nagant,
-/obj/item/ammo_box/n762_clip,
+/obj/item/gun/ballistic/revolver/shadow,
+/obj/item/ammo_box/c45_speedloader,
/obj/item/clothing/suit/armor/vest/capcarapace/minutemen,
/turf/open/floor/plasteel/telecomms_floor,
/area/ship/bridge)
@@ -1911,21 +1911,21 @@
dir = 4;
layer = 4.1
},
-/obj/item/gun/ballistic/automatic/pistol/m1911{
+/obj/item/gun/ballistic/automatic/pistol/candor{
pixel_y = 3
},
-/obj/item/gun/ballistic/automatic/pistol/m1911{
+/obj/item/gun/ballistic/automatic/pistol/candor{
pixel_y = 3
},
/obj/machinery/light/directional/west,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
-/obj/item/gun/ballistic/automatic/pistol/m1911{
+/obj/item/gun/ballistic/automatic/pistol/candor{
pixel_y = 3
},
/obj/structure/sign/poster/contraband/twelve_gauge{
pixel_y = 32
},
-/obj/item/gun/ballistic/shotgun/riot,
+/obj/item/gun/ballistic/shotgun/hellfire,
/turf/open/floor/plasteel/tech,
/area/ship/security)
"tX" = (
@@ -3036,10 +3036,6 @@
/area/ship/engineering/atmospherics)
"FC" = (
/obj/structure/table,
-/obj/item/book/manual/wiki/security_space_law{
- pixel_x = 9;
- pixel_y = 4
- },
/obj/item/flashlight/lamp{
pixel_x = -7;
pixel_y = 1
@@ -4332,7 +4328,7 @@
/obj/effect/turf_decal/steeldecal/steel_decals_central2{
pixel_y = 2
},
-/obj/item/book/manual/wiki/robotics_cyborgs{
+/obj/item/book/manual/wiki/robotics{
pixel_x = -3;
pixel_y = 3
},
diff --git a/_maps/shuttles/minutemen/minutemen_corvus.dmm b/_maps/shuttles/minutemen/minutemen_corvus.dmm
deleted file mode 100644
index 36e4581f8dcd..000000000000
--- a/_maps/shuttles/minutemen/minutemen_corvus.dmm
+++ /dev/null
@@ -1,3217 +0,0 @@
-//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
-"bf" = (
-/obj/effect/turf_decal/techfloor/orange{
- dir = 4
- },
-/obj/effect/turf_decal/techfloor/hole{
- dir = 4
- },
-/obj/structure/closet/wall{
- dir = 8;
- icon_door = "yellow_wall";
- name = "engineering closet";
- pixel_x = 28
- },
-/obj/item/clothing/under/rank/security/officer/minutemen,
-/obj/item/clothing/accessory/armband/engine,
-/obj/item/clothing/suit/hazardvest,
-/obj/item/clothing/head/hardhat/dblue,
-/obj/item/radio/headset/headset_eng,
-/obj/item/clothing/gloves/color/yellow,
-/obj/item/storage/backpack/industrial,
-/obj/item/clothing/shoes/workboots,
-/obj/effect/turf_decal/techfloor/hole/right{
- dir = 4
- },
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/structure/cable{
- icon_state = "2-8"
- },
-/obj/item/clothing/head/beret/eng/hazard,
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/engineering)
-"bA" = (
-/turf/template_noop,
-/area/template_noop)
-"bQ" = (
-/obj/effect/turf_decal/siding/thinplating/dark,
-/obj/effect/turf_decal/siding/thinplating/dark{
- dir = 1
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
- dir = 1
- },
-/obj/machinery/light/small/directional/south,
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/open/floor/plasteel/patterned,
-/area/ship/security)
-"cq" = (
-/obj/effect/turf_decal/techfloor{
- dir = 10
- },
-/obj/effect/turf_decal/industrial/hatch/yellow,
-/obj/machinery/light/small/directional/south,
-/obj/machinery/atmospherics/components/unary/tank/toxins{
- dir = 1
- },
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/engineering)
-"cx" = (
-/obj/structure/rack,
-/obj/effect/turf_decal/corner/opaque/red/border{
- dir = 5
- },
-/obj/structure/window/reinforced{
- dir = 4
- },
-/obj/structure/extinguisher_cabinet/directional/north,
-/obj/item/gun/ballistic/automatic/pistol/m1911{
- pixel_x = 2;
- pixel_y = 5
- },
-/obj/item/gun/ballistic/automatic/pistol/m1911,
-/obj/item/flamethrower/full/tank,
-/obj/item/gun/ballistic/automatic/smg/cm5,
-/turf/open/floor/plasteel/dark,
-/area/ship/security)
-"cC" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 6
- },
-/turf/open/floor/wood,
-/area/ship/bridge)
-"cR" = (
-/turf/closed/wall/mineral/plastitanium/nodiagonal,
-/area/ship/bridge)
-"dq" = (
-/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
-/turf/open/floor/plating,
-/area/ship/security)
-"dB" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/obj/machinery/light_switch{
- dir = 1;
- pixel_x = -10;
- pixel_y = -22
- },
-/obj/machinery/vending/wallmed{
- pixel_y = -28
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/open/floor/plastic,
-/area/ship/hallway/central)
-"dI" = (
-/obj/effect/turf_decal/techfloor{
- dir = 9
- },
-/obj/machinery/button/door{
- dir = 4;
- id = "minutecop_windows";
- name = "Window blastdoors";
- pixel_x = -22;
- pixel_y = -10
- },
-/obj/machinery/button/door{
- dir = 4;
- id = "minutecop_bridge";
- name = "Bridge shutters";
- pixel_x = -22;
- pixel_y = 2
- },
-/turf/open/floor/plasteel/tech,
-/area/ship/bridge)
-"dJ" = (
-/obj/effect/turf_decal/number/six{
- dir = 1
- },
-/turf/closed/wall/mineral/plastitanium/nodiagonal,
-/area/ship/hallway/central)
-"dU" = (
-/obj/effect/turf_decal/techfloor/orange,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/decal/cleanable/oil{
- pixel_y = 11
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
- dir = 1
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/engineering)
-"ej" = (
-/obj/effect/turf_decal/techfloor/orange,
-/obj/structure/railing{
- dir = 2;
- layer = 4.1
- },
-/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-8"
- },
-/obj/structure/cable{
- icon_state = "1-8"
- },
-/obj/machinery/atmospherics/pipe/simple/orange/visible{
- dir = 4
- },
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/engineering)
-"em" = (
-/obj/effect/turf_decal/steeldecal/steel_decals10{
- dir = 8
- },
-/obj/effect/turf_decal/steeldecal/steel_decals10{
- dir = 1
- },
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/obj/structure/cable{
- icon_state = "2-8"
- },
-/turf/open/floor/plasteel/dark,
-/area/ship/bridge)
-"eE" = (
-/obj/structure/table,
-/obj/machinery/computer/secure_data/laptop{
- pixel_x = 6;
- pixel_y = 4
- },
-/obj/item/paper_bin{
- pixel_x = -9;
- pixel_y = 4
- },
-/obj/item/pen{
- pixel_x = -10;
- pixel_y = 4
- },
-/obj/effect/turf_decal/techfloor{
- dir = 9
- },
-/obj/item/radio/intercom/directional/north,
-/turf/open/floor/plasteel/tech,
-/area/ship/security)
-"eF" = (
-/obj/effect/turf_decal/number/zero{
- dir = 2
- },
-/turf/closed/wall/mineral/plastitanium/nodiagonal,
-/area/ship/hallway/central)
-"eS" = (
-/turf/closed/wall/mineral/plastitanium,
-/area/ship/crew)
-"eZ" = (
-/obj/effect/turf_decal/siding/thinplating/dark,
-/obj/machinery/mineral/ore_redemption{
- dir = 1;
- output_dir = 1
- },
-/obj/machinery/light/small/directional/south,
-/turf/open/floor/plasteel/patterned,
-/area/ship/cargo)
-"fr" = (
-/obj/effect/turf_decal/techfloor/corner,
-/obj/effect/decal/cleanable/robot_debris,
-/obj/effect/turf_decal/number/three,
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/engineering)
-"fy" = (
-/obj/effect/turf_decal/techfloor{
- dir = 8
- },
-/obj/structure/rack,
-/obj/item/storage/toolbox/electrical,
-/obj/item/storage/belt/utility/full/engi,
-/obj/item/clothing/glasses/welding{
- pixel_y = 5
- },
-/obj/item/multitool{
- pixel_x = 9
- },
-/obj/effect/turf_decal/kfp_small/left,
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/engineering)
-"fR" = (
-/obj/machinery/advanced_airlock_controller{
- pixel_x = -25
- },
-/obj/machinery/light/directional/south,
-/turf/open/floor/plasteel/patterned/grid,
-/area/ship/hallway/central)
-"fX" = (
-/obj/effect/turf_decal/techfloor{
- dir = 6
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 10
- },
-/obj/machinery/power/apc/auto_name/directional/east,
-/obj/structure/cable{
- icon_state = "0-2"
- },
-/obj/machinery/light_switch{
- pixel_x = 19;
- dir = 8;
- pixel_y = 11
- },
-/turf/open/floor/plasteel/tech,
-/area/ship/security)
-"gj" = (
-/obj/effect/turf_decal/siding/white/corner{
- dir = 8
- },
-/obj/effect/turf_decal/siding/white/corner{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/obj/structure/cable{
- icon_state = "2-8"
- },
-/turf/open/floor/plasteel,
-/area/ship/hallway/central)
-"gH" = (
-/obj/structure/bookcase/random,
-/obj/effect/turf_decal/siding/wood{
- dir = 9
- },
-/turf/open/floor/wood,
-/area/ship/bridge)
-"gP" = (
-/obj/effect/turf_decal/techfloor/orange{
- dir = 10
- },
-/obj/structure/closet/crate/internals,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/item/tank/internals/emergency_oxygen/engi{
- pixel_x = -4;
- pixel_y = -4
- },
-/obj/item/tank/internals/emergency_oxygen/engi{
- pixel_x = 1;
- pixel_y = -4
- },
-/obj/item/clothing/suit/space/eva,
-/obj/item/clothing/suit/space/eva,
-/obj/item/clothing/head/helmet/space/eva,
-/obj/item/clothing/head/helmet/space/eva,
-/obj/machinery/atmospherics/pipe/manifold/orange/visible,
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/engineering)
-"gS" = (
-/obj/structure/tank_dispenser,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/decal/cleanable/greenglow,
-/obj/machinery/atmospherics/pipe/simple/orange/visible,
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/engineering)
-"hc" = (
-/obj/structure/sign/minutemen,
-/turf/closed/wall/mineral/plastitanium,
-/area/ship/cargo)
-"hk" = (
-/obj/machinery/door/poddoor{
- id = "minutecop_bridge";
- dir = 4
- },
-/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
-/turf/open/floor/plating,
-/area/ship/bridge)
-"hp" = (
-/obj/machinery/power/smes/shuttle/precharged{
- dir = 4
- },
-/obj/structure/cable{
- icon_state = "0-8"
- },
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/machinery/door/window/eastleft,
-/obj/machinery/door/poddoor{
- dir = 4;
- id = "minutemen_corvus_engines";
- name = "Thruster Blast Door"
- },
-/turf/open/floor/plating,
-/area/ship/engineering)
-"hK" = (
-/obj/structure/chair/greyscale{
- dir = 8
- },
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
-/turf/open/floor/plastic,
-/area/ship/hallway/central)
-"hY" = (
-/obj/structure/window/reinforced,
-/obj/structure/rack,
-/obj/effect/turf_decal/corner/opaque/red/border{
- dir = 6
- },
-/obj/structure/window/reinforced{
- dir = 4
- },
-/obj/item/melee/baton/loaded,
-/obj/item/melee/baton/loaded{
- pixel_x = 3;
- pixel_y = -2
- },
-/obj/item/gun/energy/disabler{
- pixel_y = 2
- },
-/obj/item/reagent_containers/spray/pepper{
- pixel_x = 3;
- pixel_y = -4
- },
-/obj/item/reagent_containers/spray/pepper{
- pixel_x = 8;
- pixel_y = -4
- },
-/turf/open/floor/plasteel/dark,
-/area/ship/security)
-"is" = (
-/obj/machinery/cryopod{
- dir = 8
- },
-/obj/machinery/computer/cryopod/directional/east,
-/obj/effect/turf_decal/industrial/warning/cee{
- dir = 8
- },
-/obj/machinery/firealarm/directional/south,
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/crew)
-"iJ" = (
-/obj/effect/turf_decal/techfloor/orange{
- dir = 8
- },
-/obj/machinery/power/terminal{
- dir = 8
- },
-/obj/effect/turf_decal/steeldecal/steel_decals7,
-/obj/effect/turf_decal/steeldecal/steel_decals7{
- dir = 8
- },
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/cable{
- icon_state = "0-4"
- },
-/obj/machinery/atmospherics/pipe/simple/orange/visible,
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/engineering)
-"iL" = (
-/obj/effect/turf_decal/siding/thinplating/dark{
- dir = 1
- },
-/obj/effect/turf_decal/siding/thinplating/dark,
-/obj/machinery/door/airlock/hatch{
- dir = 4;
- name = "Security"
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/door/firedoor/border_only{
- dir = 4
- },
-/obj/machinery/door/firedoor/border_only{
- dir = 8
- },
-/turf/open/floor/plasteel/patterned,
-/area/ship/security)
-"iV" = (
-/obj/effect/turf_decal/siding/thinplating/dark{
- dir = 8
- },
-/obj/effect/turf_decal/industrial/stand_clear,
-/obj/item/reagent_containers/food/drinks/waterbottle/large{
- pixel_x = -7;
- pixel_y = -2
- },
-/obj/item/reagent_containers/food/drinks/waterbottle/large{
- pixel_x = 8;
- pixel_y = -2
- },
-/obj/item/reagent_containers/food/drinks/waterbottle/large{
- pixel_y = 4
- },
-/obj/structure/closet/cardboard,
-/obj/item/reagent_containers/food/drinks/waterbottle/large{
- pixel_x = 3;
- pixel_y = 3
- },
-/obj/item/reagent_containers/food/drinks/waterbottle/large{
- pixel_x = 4;
- pixel_y = -2
- },
-/obj/machinery/light/small/directional/west,
-/obj/structure/cable{
- icon_state = "1-6"
- },
-/turf/open/floor/plasteel/patterned,
-/area/ship/cargo)
-"jk" = (
-/obj/effect/turf_decal/borderfloor{
- dir = 1
- },
-/obj/effect/turf_decal/corner/opaque/green{
- dir = 10
- },
-/obj/machinery/door/airlock/wood{
- name = "Dormitories"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 1
- },
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/machinery/door/firedoor/border_only{
- dir = 1
- },
-/obj/machinery/door/firedoor/border_only,
-/turf/open/floor/plasteel,
-/area/ship/hallway/central)
-"jE" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 1
- },
-/turf/open/floor/plasteel/stairs,
-/area/ship/engineering)
-"jF" = (
-/obj/machinery/door/window/northleft{
- dir = 2
- },
-/obj/effect/turf_decal/techfloor{
- dir = 1
- },
-/obj/effect/turf_decal/box,
-/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/item/tank/jetpack/carbondioxide,
-/obj/item/clothing/suit/space/hardsuit/swat,
-/obj/machinery/suit_storage_unit/inherit/industrial,
-/obj/structure/railing{
- dir = 8
- },
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/hallway/central)
-"ka" = (
-/obj/effect/turf_decal/number/one{
- dir = 1
- },
-/turf/closed/wall/mineral/plastitanium/nodiagonal,
-/area/ship/hallway/central)
-"kE" = (
-/obj/effect/turf_decal/steeldecal/steel_decals3{
- dir = 10
- },
-/obj/effect/turf_decal/steeldecal/steel_decals3{
- dir = 1
- },
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/decal/cleanable/oil/streak,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 6
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
- dir = 4
- },
-/obj/structure/cable/yellow{
- icon_state = "1-2"
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/engineering)
-"kJ" = (
-/obj/effect/turf_decal/techfloor{
- dir = 4
- },
-/obj/machinery/computer/warrant{
- dir = 8
- },
-/obj/structure/extinguisher_cabinet/directional/north,
-/turf/open/floor/plasteel/dark,
-/area/ship/bridge)
-"kR" = (
-/obj/machinery/vending/tool,
-/obj/effect/turf_decal/industrial/warning,
-/obj/machinery/light/small/directional/north,
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/engineering)
-"lE" = (
-/obj/effect/turf_decal/siding/white{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
- dir = 8
- },
-/obj/structure/cable{
- icon_state = "1-10"
- },
-/turf/open/floor/plasteel,
-/area/ship/hallway/central)
-"lM" = (
-/obj/effect/turf_decal/siding/white{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 1
- },
-/obj/structure/cable{
- icon_state = "2-4"
- },
-/turf/open/floor/plasteel,
-/area/ship/hallway/central)
-"lX" = (
-/obj/effect/turf_decal/siding/wood/corner,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 10
- },
-/turf/open/floor/wood,
-/area/ship/crew)
-"mo" = (
-/obj/effect/turf_decal/techfloor/orange{
- dir = 8
- },
-/obj/machinery/power/terminal{
- dir = 8
- },
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/cable{
- icon_state = "0-4"
- },
-/obj/machinery/atmospherics/pipe/simple/orange/visible,
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/engineering)
-"mz" = (
-/obj/structure/sign/warning/docking,
-/turf/closed/wall/mineral/plastitanium/nodiagonal,
-/area/ship/hallway/central)
-"mF" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/open/floor/plastic,
-/area/ship/hallway/central)
-"mV" = (
-/obj/structure/chair/sofa/left,
-/obj/item/toy/plush/lizardplushie{
- pixel_x = 4
- },
-/obj/structure/cable{
- icon_state = "2-8"
- },
-/obj/machinery/newscaster/directional/north,
-/turf/open/floor/carpet/nanoweave,
-/area/ship/hallway/central)
-"nI" = (
-/obj/structure/bed,
-/obj/item/bedsheet/grey,
-/obj/effect/turf_decal/corner/opaque/grey/diagonal,
-/obj/structure/window/reinforced{
- dir = 4
- },
-/turf/open/floor/plasteel/dark,
-/area/ship/cargo)
-"nW" = (
-/obj/effect/turf_decal/siding/white/corner,
-/obj/effect/turf_decal/siding/white/corner{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/turf/open/floor/plasteel,
-/area/ship/hallway/central)
-"of" = (
-/obj/machinery/door/poddoor{
- id = "minutecop_windows"
- },
-/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
-/turf/open/floor/plating,
-/area/ship/hallway/central)
-"oj" = (
-/obj/effect/turf_decal/siding/thinplating/dark/corner,
-/obj/effect/turf_decal/siding/thinplating/dark/corner{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 5
- },
-/obj/structure/cable{
- icon_state = "2-4"
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/open/floor/plasteel/patterned,
-/area/ship/cargo)
-"oN" = (
-/obj/machinery/door/airlock/grunge{
- dir = 4;
- name = "Bathroom"
- },
-/obj/machinery/door/firedoor/border_only{
- dir = 4
- },
-/obj/machinery/door/firedoor/border_only{
- dir = 8
- },
-/turf/open/floor/plasteel/showroomfloor,
-/area/ship/hallway/central)
-"oQ" = (
-/obj/machinery/power/smes/engineering,
-/obj/effect/turf_decal/industrial/warning,
-/obj/structure/cable{
- icon_state = "0-6"
- },
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/engineering)
-"oR" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 1
- },
-/obj/structure/bookcase/random,
-/obj/structure/sign/minutemen{
- pixel_y = 32
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/open/floor/wood,
-/area/ship/crew)
-"py" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/obj/machinery/light/directional/south,
-/obj/structure/sign/poster/minutemen/gold{
- pixel_y = -32
- },
-/turf/open/floor/carpet/nanoweave,
-/area/ship/hallway/central)
-"pN" = (
-/obj/structure/chair/greyscale{
- dir = 4
- },
-/obj/machinery/newscaster/directional/west,
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plastic,
-/area/ship/hallway/central)
-"pW" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 6
- },
-/obj/structure/table/wood,
-/obj/item/paper_bin{
- pixel_x = 7;
- pixel_y = 4
- },
-/obj/item/clipboard{
- pixel_x = 9;
- pixel_y = 3
- },
-/obj/item/pen{
- pixel_x = 6;
- pixel_y = 4
- },
-/obj/item/radio/intercom/directional/east,
-/obj/machinery/light_switch{
- dir = 8;
- pixel_x = 22;
- pixel_y = 8
- },
-/obj/machinery/light/directional/south,
-/turf/open/floor/wood,
-/area/ship/crew)
-"qb" = (
-/obj/effect/turf_decal/techfloor/orange{
- dir = 6
- },
-/obj/structure/railing{
- dir = 2;
- layer = 4.1
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/engineering)
-"qL" = (
-/obj/machinery/door/poddoor{
- id = "minutecop_bridge";
- dir = 8
- },
-/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
-/turf/open/floor/plating,
-/area/ship/bridge)
-"qN" = (
-/obj/structure/toilet{
- pixel_y = 13
- },
-/obj/structure/window/reinforced/tinted/frosted{
- dir = 8;
- pixel_x = -4
- },
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/decal/cleanable/generic,
-/obj/effect/decal/cleanable/vomit/old{
- pixel_x = 5
- },
-/obj/effect/spawner/lootdrop/glowstick,
-/obj/effect/decal/cleanable/cobweb/cobweb2,
-/turf/open/floor/plasteel/showroomfloor,
-/area/ship/hallway/central)
-"qU" = (
-/obj/effect/turf_decal/techfloor/orange{
- dir = 1
- },
-/obj/effect/turf_decal/techfloor/hole{
- dir = 1
- },
-/obj/effect/decal/cleanable/wrapping,
-/obj/machinery/light/directional/north,
-/obj/machinery/jukebox,
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/engineering)
-"qW" = (
-/obj/effect/turf_decal/siding/white/corner,
-/obj/effect/turf_decal/siding/white/corner{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 10
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 10
- },
-/turf/open/floor/plasteel,
-/area/ship/hallway/central)
-"rb" = (
-/obj/effect/turf_decal/techfloor{
- dir = 6
- },
-/obj/effect/turf_decal/industrial/hatch/yellow,
-/obj/machinery/atmospherics/components/unary/tank/air{
- dir = 1;
- piping_layer = 2
- },
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/engineering)
-"rh" = (
-/obj/structure/chair/sofa/right,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/effect/landmark/observer_start,
-/obj/machinery/light_switch{
- pixel_y = 23
- },
-/turf/open/floor/carpet/nanoweave,
-/area/ship/hallway/central)
-"rk" = (
-/obj/machinery/door/poddoor{
- id = "minutecop_windows"
- },
-/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
-/turf/open/floor/plating,
-/area/ship/bridge)
-"rt" = (
-/obj/effect/turf_decal/techfloor,
-/obj/item/kirbyplants/random,
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
- dir = 1
- },
-/turf/open/floor/plasteel/tech,
-/area/ship/security)
-"rx" = (
-/obj/effect/turf_decal/steeldecal/steel_decals1,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/atmospherics/components/binary/pump/on/layer2{
- dir = 1
- },
-/obj/effect/turf_decal/number/zero,
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/engineering)
-"rL" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 10
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 10
- },
-/obj/structure/sign/warning/vacuum/external{
- pixel_x = 30
- },
-/obj/effect/turf_decal/industrial/warning{
- dir = 10
- },
-/obj/item/clothing/suit/space/engineer,
-/obj/item/clothing/head/helmet/space/light/engineer,
-/obj/machinery/suit_storage_unit/inherit,
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/hallway/central)
-"rO" = (
-/obj/effect/turf_decal/siding/white{
- dir = 8
- },
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/structure/extinguisher_cabinet/directional/west,
-/turf/open/floor/plasteel,
-/area/ship/hallway/central)
-"sc" = (
-/obj/effect/turf_decal/borderfloorblack,
-/obj/machinery/door/airlock/hatch{
- name = "Captains Cabin"
- },
-/turf/open/floor/plasteel/tech,
-/area/ship/bridge)
-"sy" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 1
- },
-/obj/structure/table/wood,
-/obj/item/flashlight/lamp{
- pixel_x = -5;
- pixel_y = 10
- },
-/obj/item/modular_computer/laptop/preset/civilian{
- pixel_x = 12;
- pixel_y = 3
- },
-/obj/item/reagent_containers/food/drinks/mug{
- pixel_x = -6
- },
-/obj/machinery/firealarm/directional/north,
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/light_switch{
- pixel_x = -12;
- pixel_y = 23
- },
-/turf/open/floor/wood,
-/area/ship/crew)
-"sL" = (
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/machinery/atmospherics/components/unary/shuttle/heater{
- dir = 4
- },
-/obj/machinery/door/poddoor{
- dir = 4;
- id = "minutemen_corvus_engines";
- name = "Thruster Blast Door"
- },
-/obj/structure/window/plasma/reinforced/spawner/east,
-/turf/open/floor/plating,
-/area/ship/engineering)
-"sN" = (
-/obj/effect/turf_decal/siding/thinplating/dark,
-/obj/effect/turf_decal/siding/thinplating/dark{
- dir = 1
- },
-/obj/item/detective_scanner,
-/obj/item/holosign_creator/security{
- pixel_x = 6;
- pixel_y = 4
- },
-/obj/item/holosign_creator/security{
- pixel_x = 2
- },
-/obj/item/key/security,
-/obj/structure/closet/secure_closet/wall{
- dir = 1;
- icon_door = "red_wall";
- icon_state = "generic_wall";
- name = "Utility locker";
- pixel_y = -28;
- req_access_txt = "1"
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 9
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 9
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/open/floor/plasteel/patterned,
-/area/ship/security)
-"sW" = (
-/obj/structure/table/reinforced{
- color = "#c1b6a5"
- },
-/obj/effect/turf_decal/techfloor{
- dir = 9
- },
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/high,
-/obj/item/stock_parts/cell/high,
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/engineering)
-"tc" = (
-/obj/structure/closet/crate/bin,
-/obj/item/trash/candy,
-/obj/item/trash/plate,
-/obj/item/trash/sosjerky{
- pixel_x = -3;
- pixel_y = -3
- },
-/obj/item/trash/cheesie{
- pixel_x = 4;
- pixel_y = -4
- },
-/obj/effect/decal/cleanable/shreds{
- pixel_x = 10;
- pixel_y = -7
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/structure/noticeboard{
- pixel_y = 30
- },
-/turf/open/floor/carpet/nanoweave,
-/area/ship/hallway/central)
-"tp" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/cable/yellow{
- icon_state = "1-2"
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/holopad/emergency/engineering,
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/engineering)
-"tt" = (
-/turf/closed/wall/mineral/plastitanium,
-/area/ship/security)
-"tD" = (
-/obj/machinery/airalarm/directional/west,
-/obj/machinery/computer/cargo/express,
-/obj/structure/sign/poster/minutemen/lanchester{
- pixel_y = 32
- },
-/turf/open/floor/plasteel/dark,
-/area/ship/bridge)
-"tQ" = (
-/obj/structure/railing{
- dir = 2;
- layer = 4.1
- },
-/obj/effect/turf_decal/techfloor{
- dir = 4
- },
-/obj/machinery/computer/security/hos{
- dir = 8
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
- dir = 8
- },
-/turf/open/floor/plasteel/dark,
-/area/ship/bridge)
-"uF" = (
-/obj/structure/sign/minutemen,
-/turf/closed/wall/mineral/plastitanium/nodiagonal,
-/area/ship/security)
-"uK" = (
-/obj/structure/table/reinforced,
-/obj/machinery/microwave{
- pixel_y = 5
- },
-/turf/open/floor/plastic,
-/area/ship/hallway/central)
-"vo" = (
-/obj/docking_port/stationary{
- dwidth = 4;
- width = 15;
- height = 15;
- dir = 2
- },
-/turf/template_noop,
-/area/template_noop)
-"vN" = (
-/obj/effect/turf_decal/siding/thinplating/dark,
-/obj/effect/turf_decal/siding/thinplating/dark{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/door/firedoor/border_only{
- dir = 4
- },
-/obj/machinery/door/firedoor/border_only{
- dir = 8
- },
-/obj/machinery/door/airlock/hatch{
- dir = 4;
- name = "Cargo Bay"
- },
-/turf/open/floor/plasteel/patterned,
-/area/ship/security)
-"wa" = (
-/obj/structure/chair/greyscale{
- dir = 8
- },
-/turf/open/floor/plastic,
-/area/ship/hallway/central)
-"wu" = (
-/obj/effect/turf_decal/borderfloorblack{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/door/firedoor/border_only{
- dir = 4
- },
-/obj/machinery/door/firedoor/border_only{
- dir = 8
- },
-/obj/machinery/door/airlock/highsecurity{
- name = "Bridge"
- },
-/turf/open/floor/plasteel/dark,
-/area/ship/bridge)
-"wx" = (
-/obj/effect/turf_decal/techfloor/orange,
-/obj/structure/railing/corner,
-/obj/effect/decal/cleanable/dirt/dust,
-/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-8"
- },
-/obj/machinery/atmospherics/pipe/simple/orange/visible{
- dir = 4
- },
-/obj/structure/extinguisher_cabinet/directional/south,
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/engineering)
-"xL" = (
-/obj/effect/turf_decal/siding/thinplating/dark,
-/obj/effect/turf_decal/siding/thinplating/dark{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 4
- },
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
- dir = 1
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/open/floor/plasteel/patterned,
-/area/ship/security)
-"yu" = (
-/obj/effect/turf_decal/siding/thinplating/dark{
- dir = 10
- },
-/obj/structure/rack,
-/obj/item/storage/bag/ore,
-/obj/item/mining_scanner,
-/obj/item/pickaxe/drill,
-/obj/item/pickaxe/rusted,
-/obj/item/radio/intercom/directional/south,
-/obj/machinery/button/flasher{
- dir = 1;
- id = "minuteman_cell1";
- pixel_x = -8;
- pixel_y = -20
- },
-/turf/open/floor/plasteel/patterned,
-/area/ship/cargo)
-"yE" = (
-/obj/effect/turf_decal/siding/white{
- dir = 6
- },
-/obj/item/kirbyplants/random,
-/turf/open/floor/plasteel,
-/area/ship/hallway/central)
-"yI" = (
-/turf/closed/wall/mineral/plastitanium/nodiagonal,
-/area/ship/security)
-"zu" = (
-/obj/machinery/door/poddoor{
- id = "minutecop_bridge"
- },
-/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
-/turf/open/floor/plating,
-/area/ship/bridge)
-"zv" = (
-/obj/item/clothing/under/rank/command/minutemen,
-/obj/item/clothing/head/cowboy/sec/minutemen,
-/obj/item/clothing/suit/toggle/lawyer/minutemen,
-/obj/item/clothing/shoes/combat,
-/obj/item/clothing/glasses/sunglasses,
-/obj/item/clothing/glasses/hud/security/sunglasses/eyepatch,
-/obj/effect/turf_decal/siding/wood{
- dir = 5
- },
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/closet/secure_closet{
- icon_state = "cap";
- name = "\proper captain's locker";
- req_access_txt = "20"
- },
-/obj/item/radio/headset/minutemen/alt/captain,
-/obj/item/gun/ballistic/revolver/detective,
-/obj/item/ammo_box/c38/match,
-/obj/item/ammo_box/c38/match,
-/turf/open/floor/wood,
-/area/ship/bridge)
-"zA" = (
-/obj/structure/table/reinforced,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/item/storage/pill_bottle/dice{
- pixel_x = -5;
- pixel_y = 1
- },
-/obj/item/toy/cards/deck{
- pixel_x = -3
- },
-/obj/item/trash/chips{
- pixel_x = 7;
- pixel_y = 6
- },
-/turf/open/floor/plastic,
-/area/ship/hallway/central)
-"Ab" = (
-/obj/effect/turf_decal/siding/white{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 1
- },
-/turf/open/floor/plasteel,
-/area/ship/hallway/central)
-"At" = (
-/obj/effect/turf_decal/siding/white{
- dir = 8
- },
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/turf/open/floor/plasteel,
-/area/ship/hallway/central)
-"Az" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 6
- },
-/obj/item/kirbyplants/random,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
- dir = 1
- },
-/turf/open/floor/wood,
-/area/ship/crew)
-"Bg" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/docking_port/mobile{
- can_move_docking_ports = 1;
- dir = 2;
- launch_status = 0;
- port_direction = 8;
- preferred_direction = 4
- },
-/obj/machinery/door/poddoor{
- id = "minutecop_cargohatch";
- name = "Cargo Bay Blast Door"
- },
-/turf/open/floor/plasteel/patterned/ridged,
-/area/ship/cargo)
-"Bk" = (
-/turf/closed/wall/mineral/plastitanium,
-/area/ship/cargo)
-"Bl" = (
-/obj/structure/chair/greyscale{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/item/radio/intercom/directional/west,
-/turf/open/floor/plastic,
-/area/ship/hallway/central)
-"Bu" = (
-/obj/effect/turf_decal/siding/white{
- dir = 8
- },
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
- dir = 1
- },
-/obj/structure/cable{
- icon_state = "5-8"
- },
-/obj/structure/cable{
- icon_state = "1-5"
- },
-/turf/open/floor/plasteel,
-/area/ship/hallway/central)
-"BA" = (
-/obj/machinery/door/poddoor{
- id = "minutecop_windows"
- },
-/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
-/turf/open/floor/plating,
-/area/ship/crew)
-"BE" = (
-/obj/effect/turf_decal/techfloor{
- dir = 5
- },
-/obj/machinery/firealarm/directional/north,
-/obj/machinery/rnd/production/techfab/department/security,
-/obj/structure/sign/poster/minutemen/enlist{
- pixel_x = 32
- },
-/turf/open/floor/plasteel/tech,
-/area/ship/security)
-"BN" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 8
- },
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 5
- },
-/turf/open/floor/wood,
-/area/ship/crew)
-"Ci" = (
-/obj/structure/reagent_dispensers/fueltank,
-/obj/effect/turf_decal/techfloor/orange{
- dir = 1
- },
-/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/structure/sign/warning/nosmoking{
- pixel_y = 32
- },
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/engineering)
-"Cm" = (
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/structure/window/reinforced,
-/obj/structure/closet/secure_closet{
- icon_state = "sec";
- name = "equipment locker";
- req_access_txt = "1"
- },
-/obj/item/storage/belt/military/minutemen,
-/obj/item/storage/belt/military/minutemen,
-/obj/item/storage/belt/military/minutemen,
-/obj/item/clothing/gloves/combat,
-/obj/item/clothing/gloves/combat,
-/obj/item/clothing/gloves/combat,
-/obj/item/clothing/mask/gas/sechailer/minutemen,
-/obj/item/clothing/mask/gas/sechailer/minutemen,
-/obj/item/clothing/mask/gas/sechailer/minutemen,
-/obj/item/clothing/mask/gas/sechailer/minutemen,
-/obj/effect/turf_decal/corner/opaque/red/border{
- dir = 10
- },
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/item/clothing/glasses/hud/security/sunglasses,
-/obj/item/clothing/glasses/hud/security/sunglasses,
-/obj/item/clothing/glasses/hud/security/sunglasses,
-/obj/item/clothing/suit/armor/riot/minutemen,
-/obj/item/clothing/head/helmet/riot/minutemen,
-/obj/item/clothing/head/helmet/bulletproof/minutemen,
-/obj/item/clothing/head/helmet/bulletproof/minutemen,
-/turf/open/floor/plasteel/dark,
-/area/ship/security)
-"Co" = (
-/obj/effect/turf_decal/techfloor/orange{
- dir = 1
- },
-/obj/structure/rack,
-/obj/item/rack_parts{
- pixel_x = 5;
- pixel_y = 1
- },
-/obj/item/rack_parts{
- pixel_y = -2
- },
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/item/wrench/old,
-/obj/machinery/power/apc/auto_name/directional/north,
-/obj/structure/cable{
- icon_state = "0-2"
- },
-/obj/item/circuitboard/computer/rdconsole,
-/obj/item/circuitboard/machine/rdserver{
- pixel_x = 6;
- pixel_y = -4
- },
-/obj/machinery/light_switch{
- pixel_x = -12;
- pixel_y = 23
- },
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/engineering)
-"Cr" = (
-/obj/effect/turf_decal/siding/white{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 5
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 5
- },
-/obj/machinery/light/directional/west,
-/turf/open/floor/plasteel,
-/area/ship/hallway/central)
-"Cs" = (
-/obj/structure/bed,
-/obj/item/bedsheet/dorms,
-/obj/structure/curtain/cloth/grey,
-/obj/machinery/airalarm/directional/west,
-/turf/open/floor/carpet/royalblue,
-/area/ship/crew)
-"Ds" = (
-/obj/effect/turf_decal/techfloor,
-/mob/living/simple_animal/bot/secbot/beepsky/jr,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/turf/open/floor/plasteel/tech,
-/area/ship/security)
-"DJ" = (
-/obj/effect/turf_decal/siding/white{
- dir = 8
- },
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/turf/open/floor/plasteel,
-/area/ship/hallway/central)
-"DS" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
- dir = 1
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/structure/cable{
- icon_state = "2-4"
- },
-/turf/open/floor/plastic,
-/area/ship/hallway/central)
-"DY" = (
-/obj/structure/closet/secure_closet/freezer/fridge,
-/obj/item/reagent_containers/food/snacks/icecreamsandwich{
- pixel_x = 5;
- pixel_y = 4
- },
-/obj/item/reagent_containers/food/snacks/icecreamsandwich{
- pixel_x = 7;
- pixel_y = -5
- },
-/obj/item/reagent_containers/food/snacks/icecreamsandwich,
-/obj/item/reagent_containers/food/snacks/hotdog{
- pixel_x = 3;
- pixel_y = -3
- },
-/obj/item/reagent_containers/food/snacks/hotdog,
-/obj/item/storage/cans/sixbeer,
-/obj/effect/spawner/lootdrop/ration,
-/obj/effect/spawner/lootdrop/ration,
-/turf/open/floor/plastic,
-/area/ship/hallway/central)
-"Eo" = (
-/obj/structure/reagent_dispensers/watertank,
-/obj/effect/turf_decal/techfloor/orange{
- dir = 5
- },
-/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/machinery/light_switch{
- dir = 8;
- pixel_x = 22;
- pixel_y = 8
- },
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/engineering)
-"Es" = (
-/obj/effect/turf_decal/siding/white{
- dir = 10
- },
-/turf/open/floor/plasteel,
-/area/ship/hallway/central)
-"Ew" = (
-/obj/machinery/computer/crew/syndie{
- dir = 1
- },
-/obj/effect/turf_decal/techfloor{
- dir = 10
- },
-/obj/item/radio/intercom/directional/south,
-/obj/item/radio/intercom/wideband/directional/west,
-/obj/machinery/firealarm/directional/south,
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel/tech,
-/area/ship/bridge)
-"EO" = (
-/turf/closed/wall/mineral/plastitanium,
-/area/ship/bridge)
-"ER" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/power/shieldwallgen/atmos{
- anchored = 1;
- dir = 4;
- id = "corvus_cargo";
- locked = 1
- },
-/obj/machinery/door/poddoor{
- id = "minutecop_cargohatch";
- name = "Cargo Bay Blast Door"
- },
-/obj/structure/cable{
- icon_state = "0-2"
- },
-/turf/open/floor/plasteel/patterned/ridged,
-/area/ship/cargo)
-"EW" = (
-/obj/machinery/porta_turret/ship/ballistic{
- dir = 9
- },
-/turf/closed/wall/mineral/plastitanium,
-/area/ship/engineering)
-"Fa" = (
-/obj/effect/turf_decal/techfloor{
- dir = 5
- },
-/obj/machinery/pipedispenser,
-/obj/effect/turf_decal/industrial/hatch/yellow,
-/obj/machinery/airalarm/directional/east,
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/engineering)
-"Fu" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/obj/machinery/firealarm/directional/south,
-/obj/structure/cable{
- icon_state = "1-4"
- },
-/turf/open/floor/carpet/nanoweave,
-/area/ship/hallway/central)
-"Fy" = (
-/obj/structure/table/wood,
-/obj/effect/turf_decal/siding/wood{
- dir = 10
- },
-/obj/item/flashlight/lamp/green{
- pixel_x = 6;
- pixel_y = 7
- },
-/obj/item/radio/intercom/directional/west,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/light/directional/south,
-/obj/item/areaeditor/shuttle,
-/obj/item/radio{
- desc = "An old handheld radio. You could use it, if you really wanted to.";
- icon_state = "radio";
- name = "old radio";
- pixel_x = 2;
- pixel_y = 3
- },
-/obj/item/paicard{
- pixel_x = -7;
- pixel_y = 4
- },
-/turf/open/floor/wood,
-/area/ship/bridge)
-"Fz" = (
-/obj/structure/closet/secure_closet/wall{
- dir = 1;
- icon_door = "red_wall";
- icon_state = "generic_wall";
- name = "equipment locker";
- pixel_y = -28;
- req_access_txt = "1"
- },
-/obj/item/radio/headset/headset_sec/alt,
-/obj/item/radio/headset/headset_sec/alt,
-/obj/item/radio/headset/headset_sec/alt,
-/obj/item/kitchen/knife/combat/survival,
-/obj/item/kitchen/knife/combat/survival,
-/obj/item/kitchen/knife/combat/survival,
-/obj/item/flashlight/seclite,
-/obj/item/flashlight/seclite,
-/obj/item/flashlight/seclite,
-/obj/item/clothing/shoes/combat,
-/obj/item/clothing/shoes/combat,
-/obj/item/clothing/shoes/combat,
-/obj/item/clothing/under/rank/security/officer/minutemen,
-/obj/item/clothing/under/rank/security/officer/minutemen,
-/obj/item/clothing/under/rank/security/officer/minutemen,
-/obj/effect/turf_decal/siding/thinplating/dark{
- dir = 1
- },
-/obj/effect/turf_decal/siding/thinplating/dark,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 5
- },
-/obj/structure/cable{
- icon_state = "1-4"
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/open/floor/plasteel/patterned,
-/area/ship/security)
-"FW" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/on/layer4{
- dir = 1
- },
-/turf/open/floor/engine/hull,
-/area/ship/external)
-"Gd" = (
-/obj/effect/turf_decal/siding/thinplating/dark{
- dir = 8
- },
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
-/turf/open/floor/plasteel/patterned,
-/area/ship/cargo)
-"Gf" = (
-/turf/closed/wall/mineral/plastitanium/nodiagonal,
-/area/ship/hallway/central)
-"Gh" = (
-/turf/closed/wall/mineral/plastitanium,
-/area/ship/engineering)
-"Gm" = (
-/obj/machinery/door/poddoor{
- dir = 4;
- id = "minutecop_bridge"
- },
-/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
-/turf/open/floor/plating,
-/area/ship/bridge)
-"Gr" = (
-/obj/machinery/autolathe,
-/obj/item/stack/sheet/glass/fifty{
- pixel_x = 6
- },
-/obj/item/stack/sheet/metal/fifty,
-/obj/item/stack/sheet/plasteel/twenty{
- pixel_x = -3;
- pixel_y = 6
- },
-/obj/effect/turf_decal/industrial/warning{
- color = "#808080";
- dir = 1
- },
-/obj/effect/decal/cleanable/glass{
- pixel_x = -11;
- pixel_y = 2
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 1
- },
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/engineering)
-"Gu" = (
-/obj/machinery/porta_turret/ship/ballistic{
- dir = 5
- },
-/turf/closed/wall/mineral/plastitanium,
-/area/ship/bridge)
-"Gv" = (
-/obj/effect/turf_decal/techfloor/orange{
- dir = 1
- },
-/obj/structure/closet/crate/engineering,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/item/toy/plush/beeplushie,
-/obj/item/rcl,
-/obj/item/reagent_containers/food/snacks/chips{
- pixel_x = 6;
- pixel_y = -1
- },
-/obj/item/trash/sosjerky{
- pixel_y = 4
- },
-/obj/item/radio/intercom/directional/north,
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/engineering)
-"GF" = (
-/obj/machinery/computer/helm{
- dir = 8
- },
-/obj/effect/turf_decal/techfloor{
- dir = 6
- },
-/turf/open/floor/plasteel/tech,
-/area/ship/bridge)
-"GI" = (
-/obj/effect/turf_decal/siding/white{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 9
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 9
- },
-/turf/open/floor/plasteel,
-/area/ship/hallway/central)
-"GK" = (
-/obj/effect/turf_decal/industrial/warning{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/obj/machinery/power/apc/auto_name/directional/south,
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/structure/cable{
- icon_state = "0-8"
- },
-/obj/machinery/door/firedoor/border_only{
- dir = 8
- },
-/obj/machinery/door/firedoor/border_only{
- dir = 4
- },
-/turf/open/floor/plastic,
-/area/ship/hallway/central)
-"Ha" = (
-/obj/effect/decal/cleanable/food/flour,
-/turf/open/floor/plastic,
-/area/ship/hallway/central)
-"Hw" = (
-/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/turf/open/floor/plasteel/patterned/grid,
-/area/ship/hallway/central)
-"HJ" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/structure/closet/wall{
- dir = 1;
- icon_door = null;
- name = "radio locker";
- pixel_y = -28
- },
-/obj/item/radio,
-/obj/item/radio,
-/obj/item/radio,
-/obj/item/radio,
-/turf/open/floor/plastic,
-/area/ship/hallway/central)
-"Ip" = (
-/obj/effect/turf_decal/steeldecal/steel_decals_central4{
- dir = 1
- },
-/turf/open/floor/plasteel/patterned,
-/area/ship/cargo)
-"IF" = (
-/obj/structure/chair/office/light{
- dir = 1;
- pixel_y = 3
- },
-/obj/effect/turf_decal/siding/wood,
-/turf/open/floor/wood,
-/area/ship/crew)
-"IX" = (
-/turf/closed/wall/mineral/plastitanium/nodiagonal,
-/area/ship/engineering)
-"Jh" = (
-/obj/machinery/door/poddoor{
- id = "minutecop_windows"
- },
-/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 1
- },
-/turf/open/floor/plating,
-/area/ship/engineering)
-"Jo" = (
-/obj/item/clothing/shoes/sneakers/black,
-/obj/item/clothing/shoes/sneakers/black,
-/obj/item/clothing/shoes/sneakers/black,
-/obj/item/clothing/shoes/sneakers/black,
-/obj/item/clothing/shoes/sneakers/black,
-/obj/item/clothing/under/rank/security/officer/minutemen,
-/obj/item/clothing/under/rank/security/officer/minutemen,
-/obj/item/clothing/under/rank/security/officer/minutemen,
-/obj/item/clothing/under/rank/security/officer/minutemen,
-/obj/item/clothing/under/rank/security/officer/minutemen,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/turf_decal/siding/wood{
- dir = 10
- },
-/obj/structure/closet/wall{
- dir = 1;
- name = "uniform closet";
- pixel_y = -30
- },
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
- dir = 1
- },
-/obj/machinery/newscaster/directional/west,
-/obj/item/storage/backpack/security/cmm,
-/obj/item/storage/backpack/security/cmm,
-/obj/item/storage/backpack/security/cmm,
-/obj/item/storage/backpack/security/cmm,
-/obj/item/storage/backpack/security/cmm,
-/obj/item/storage/backpack/security/cmm,
-/turf/open/floor/wood,
-/area/ship/crew)
-"Ju" = (
-/obj/effect/turf_decal/siding/thinplating/dark{
- dir = 4
- },
-/obj/effect/turf_decal/industrial/stand_clear,
-/obj/machinery/button/door{
- dir = 8;
- id = "minutecop_cargohatch";
- name = "Cargo hatch";
- pixel_x = 23;
- pixel_y = 10
- },
-/obj/machinery/button/shieldwallgen{
- dir = 8;
- id = "corvus_cargo";
- pixel_x = 21
- },
-/obj/structure/cable{
- icon_state = "1-10"
- },
-/turf/open/floor/plasteel/patterned,
-/area/ship/cargo)
-"JE" = (
-/obj/effect/turf_decal/steeldecal/steel_decals10{
- dir = 9
- },
-/obj/effect/turf_decal/steeldecal/steel_decals10{
- dir = 10
- },
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
-/turf/open/floor/plasteel/dark,
-/area/ship/bridge)
-"Kz" = (
-/obj/structure/window/reinforced{
- dir = 4
- },
-/obj/structure/bed,
-/obj/item/bedsheet/grey,
-/obj/effect/turf_decal/corner/opaque/grey/diagonal,
-/obj/machinery/flasher{
- id = "minuteman_cell1";
- pixel_x = -25
- },
-/turf/open/floor/plasteel/dark,
-/area/ship/cargo)
-"Lj" = (
-/obj/effect/turf_decal/siding/thinplating/dark{
- dir = 4
- },
-/obj/structure/closet/crate/medical,
-/obj/item/storage/firstaid/medical,
-/obj/item/roller,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
-/obj/item/storage/pill_bottle/iron,
-/obj/item/storage/pill_bottle/charcoal,
-/obj/structure/extinguisher_cabinet/directional/east,
-/obj/machinery/light_switch{
- pixel_x = 19;
- dir = 8;
- pixel_y = 11
- },
-/turf/open/floor/plasteel/patterned,
-/area/ship/cargo)
-"Lq" = (
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/machinery/atmospherics/components/unary/shuttle/heater{
- dir = 4
- },
-/obj/structure/window/plasma/reinforced/spawner/east,
-/obj/machinery/door/poddoor{
- dir = 4;
- id = "minutemen_corvus_engines";
- name = "Thruster Blast Door"
- },
-/turf/open/floor/plating,
-/area/ship/engineering)
-"LE" = (
-/obj/structure/table/reinforced,
-/obj/machinery/computer/secure_data/laptop{
- pixel_x = -3;
- pixel_y = 2
- },
-/obj/machinery/recharger{
- pixel_x = 12
- },
-/obj/effect/turf_decal/techfloor{
- dir = 9
- },
-/turf/open/floor/plasteel/tech,
-/area/ship/bridge)
-"Mh" = (
-/obj/structure/bed,
-/obj/item/bedsheet/dorms,
-/obj/structure/curtain/cloth/grey,
-/obj/structure/extinguisher_cabinet/directional/north,
-/turf/open/floor/carpet/royalblue,
-/area/ship/crew)
-"Mt" = (
-/obj/structure/table,
-/obj/machinery/recharger{
- pixel_x = 8;
- pixel_y = 3
- },
-/obj/item/storage/box/handcuffs{
- pixel_x = -5;
- pixel_y = 3
- },
-/obj/structure/reagent_dispensers/peppertank{
- pixel_x = 31
- },
-/obj/effect/turf_decal/siding/thinplating/dark{
- dir = 6
- },
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/power/apc/auto_name/directional/south,
-/obj/structure/cable,
-/obj/item/gps{
- gpstag = null;
- pixel_x = -9;
- pixel_y = 7
- },
-/obj/machinery/light_switch{
- dir = 1;
- pixel_x = -12;
- pixel_y = -22
- },
-/turf/open/floor/plasteel/patterned,
-/area/ship/cargo)
-"Mu" = (
-/obj/machinery/door/poddoor{
- id = "minutecop_windows"
- },
-/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
-/turf/open/floor/plating,
-/area/ship/engineering)
-"MA" = (
-/obj/structure/sink{
- dir = 8;
- pixel_x = 13;
- pixel_y = 2
- },
-/obj/structure/mirror{
- pixel_x = 27
- },
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/decal/cleanable/garbage,
-/obj/effect/decal/cleanable/wrapping,
-/obj/machinery/light/small/directional/south,
-/turf/open/floor/plasteel/showroomfloor,
-/area/ship/hallway/central)
-"MT" = (
-/obj/structure/table/reinforced,
-/obj/machinery/computer/security/telescreen/entertainment{
- pixel_y = 28
- },
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/item/newspaper{
- pixel_x = 5;
- pixel_y = 6
- },
-/obj/item/reagent_containers/food/drinks/britcup{
- pixel_x = -6
- },
-/obj/item/spacecash/bundle/c1000{
- pixel_x = 3;
- pixel_y = -4
- },
-/turf/open/floor/plastic,
-/area/ship/hallway/central)
-"Nr" = (
-/obj/structure/railing{
- dir = 2;
- layer = 4.1
- },
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
- },
-/obj/structure/chair/comfy/shuttle{
- dir = 4;
- name = "Helm"
- },
-/turf/open/floor/plasteel/dark,
-/area/ship/bridge)
-"NE" = (
-/obj/effect/turf_decal/techfloor/orange,
-/obj/effect/turf_decal/techfloor/hole/right,
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 8
- },
-/obj/structure/cable{
- icon_state = "1-4"
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/orange/visible{
- dir = 4
- },
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/engineering)
-"NL" = (
-/obj/effect/turf_decal/techfloor{
- dir = 10
- },
-/obj/structure/chair/office{
- dir = 4;
- name = "tactical swivel chair"
- },
-/obj/machinery/newscaster/directional/west,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 6
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 6
- },
-/turf/open/floor/plasteel/tech,
-/area/ship/security)
-"NY" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
- dir = 2
- },
-/obj/machinery/light/directional/south,
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/open/floor/plastic,
-/area/ship/hallway/central)
-"Ok" = (
-/obj/structure/bed,
-/obj/item/bedsheet/blue,
-/obj/structure/curtain/bounty,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/sign/poster/minutemen/bard{
- pixel_y = 32
- },
-/turf/open/floor/carpet/royalblue,
-/area/ship/bridge)
-"Ov" = (
-/obj/machinery/door/window/northright{
- dir = 2
- },
-/obj/effect/turf_decal/techfloor{
- dir = 1
- },
-/obj/effect/turf_decal/box,
-/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/item/tank/jetpack/carbondioxide,
-/obj/machinery/suit_storage_unit/inherit/industrial,
-/obj/item/clothing/suit/space/hardsuit/security/independent/minutemen,
-/obj/structure/railing{
- dir = 4
- },
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/hallway/central)
-"PA" = (
-/obj/effect/turf_decal/siding/thinplating/dark{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 5
- },
-/turf/open/floor/plasteel/patterned,
-/area/ship/cargo)
-"PE" = (
-/obj/machinery/power/port_gen/pacman,
-/obj/effect/turf_decal/industrial/warning{
- color = "#808080";
- dir = 1
- },
-/obj/effect/turf_decal/industrial/hatch/yellow,
-/obj/structure/cable/yellow,
-/obj/item/stack/sheet/mineral/plasma/five{
- pixel_x = -4
- },
-/obj/item/stack/sheet/mineral/plasma/five{
- pixel_y = -7
- },
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/engineering)
-"Qj" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 9
- },
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 1
- },
-/obj/structure/cable{
- icon_state = "1-4"
- },
-/turf/open/floor/wood,
-/area/ship/crew)
-"QY" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/power/shieldwallgen/atmos{
- anchored = 1;
- dir = 8;
- id = "corvus_cargo";
- locked = 1
- },
-/obj/machinery/door/poddoor{
- id = "minutecop_cargohatch";
- name = "Cargo Bay Blast Door"
- },
-/obj/structure/cable{
- icon_state = "0-2"
- },
-/turf/open/floor/plasteel/patterned/ridged,
-/area/ship/cargo)
-"Ri" = (
-/obj/machinery/power/smes/shuttle/precharged{
- dir = 4
- },
-/obj/structure/cable{
- icon_state = "0-8"
- },
-/obj/machinery/door/window/eastright{
- name = "Engine Access"
- },
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/machinery/door/poddoor{
- dir = 4;
- id = "minutemen_corvus_engines";
- name = "Thruster Blast Door"
- },
-/turf/open/floor/plating,
-/area/ship/engineering)
-"Rj" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
-/turf/open/floor/plastic,
-/area/ship/hallway/central)
-"RU" = (
-/obj/effect/turf_decal/techfloor/orange,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 5
- },
-/obj/structure/cable/yellow{
- icon_state = "1-2"
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/orange/visible{
- dir = 4
- },
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/engineering)
-"Sd" = (
-/obj/structure/sign/minutemen,
-/turf/closed/wall/mineral/plastitanium/nodiagonal,
-/area/ship/bridge)
-"Sn" = (
-/turf/closed/wall/mineral/plastitanium/nodiagonal,
-/area/ship/crew)
-"SH" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/turf/open/floor/plasteel/patterned/grid,
-/area/ship/hallway/central)
-"ST" = (
-/obj/effect/turf_decal/techfloor{
- dir = 6
- },
-/obj/structure/rack,
-/obj/item/storage/toolbox/mechanical,
-/obj/item/geiger_counter{
- pixel_x = 4;
- pixel_y = 4
- },
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/engineering)
-"Tk" = (
-/obj/effect/turf_decal/techfloor/orange,
-/obj/structure/railing{
- dir = 2;
- layer = 4.1
- },
-/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-8"
- },
-/obj/machinery/atmospherics/pipe/simple/orange/visible{
- dir = 10
- },
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/engineering)
-"To" = (
-/obj/machinery/power/shuttle/engine/electric{
- dir = 4
- },
-/obj/structure/cable{
- icon_state = "0-4"
- },
-/turf/open/floor/plating,
-/area/ship/engineering)
-"TS" = (
-/obj/structure/closet/wall/red{
- name = "Ammo locker";
- pixel_y = 28
- },
-/obj/item/ammo_box/magazine/m45{
- pixel_x = 9
- },
-/obj/item/ammo_box/magazine/m45{
- pixel_x = 6
- },
-/obj/item/ammo_box/magazine/m45{
- pixel_x = 5
- },
-/obj/item/ammo_box/magazine/m45/rubber,
-/obj/item/ammo_box/magazine/m45/rubber,
-/obj/item/ammo_box/magazine/m45/rubber,
-/obj/effect/turf_decal/corner/opaque/red/border{
- dir = 1
- },
-/obj/item/ammo_box/magazine/m45/rubber,
-/obj/item/ammo_box/magazine/smgm9mm{
- pixel_x = 2;
- pixel_y = 1
- },
-/obj/item/ammo_box/magazine/smgm9mm/rubber{
- pixel_x = -5;
- pixel_y = -2
- },
-/obj/item/ammo_box/magazine/smgm9mm,
-/turf/open/floor/plasteel/dark,
-/area/ship/security)
-"Ua" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/cable{
- icon_state = "2-5"
- },
-/obj/structure/cable{
- icon_state = "2-9"
- },
-/turf/open/floor/plasteel/patterned,
-/area/ship/cargo)
-"Um" = (
-/obj/effect/turf_decal/siding/thinplating/dark,
-/obj/effect/turf_decal/siding/thinplating/dark{
- dir = 1
- },
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 5
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/open/floor/plasteel/patterned,
-/area/ship/security)
-"Uq" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 4
- },
-/obj/structure/cable{
- icon_state = "1-4"
- },
-/turf/open/floor/plasteel/patterned,
-/area/ship/cargo)
-"Uy" = (
-/turf/closed/wall/mineral/plastitanium/nodiagonal,
-/area/ship/cargo)
-"UP" = (
-/obj/machinery/atmospherics/pipe/layer_manifold,
-/obj/effect/turf_decal/industrial/hatch/yellow,
-/obj/machinery/door/airlock/external/glass,
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 1
- },
-/turf/open/floor/plasteel/patterned/grid,
-/area/ship/hallway/central)
-"Vi" = (
-/obj/effect/turf_decal/techfloor/orange/corner{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
- dir = 8
- },
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/structure/cable{
- icon_state = "2-8"
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 10
- },
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/engineering)
-"VR" = (
-/obj/machinery/shower{
- pixel_y = 13
- },
-/obj/structure/curtain/bounty,
-/obj/structure/spider/cocoon,
-/obj/structure/spider/stickyweb,
-/obj/structure/spider/stickyweb,
-/turf/open/floor/plating,
-/area/ship/hallway/central)
-"Wl" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 5
- },
-/obj/structure/table/wood,
-/obj/item/storage/fancy/cigarettes/cigars/havana{
- pixel_x = 4;
- pixel_y = 9
- },
-/obj/item/storage/fancy/cigarettes/cigars/havana{
- pixel_x = 4;
- pixel_y = 13
- },
-/obj/item/lighter{
- pixel_x = 10
- },
-/obj/item/newspaper{
- pixel_x = 7;
- pixel_y = -8
- },
-/obj/machinery/power/apc/auto_name/directional/east,
-/obj/machinery/computer/helm/viewscreen/directional/north{
- pixel_y = 28
- },
-/obj/structure/cable{
- icon_state = "0-8"
- },
-/turf/open/floor/wood,
-/area/ship/crew)
-"WT" = (
-/obj/effect/turf_decal/borderfloorblack{
- dir = 4
- },
-/obj/effect/turf_decal/corner/opaque/orange{
- dir = 9
- },
-/obj/machinery/door/airlock/maintenance_hatch{
- dir = 4;
- name = "Engineering"
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/door/firedoor/border_only{
- dir = 4
- },
-/obj/machinery/door/firedoor/border_only{
- dir = 8
- },
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/engineering)
-"WW" = (
-/obj/machinery/door/window/brigdoor/southright,
-/obj/effect/turf_decal/corner/opaque/red/border,
-/turf/open/floor/plasteel/dark,
-/area/ship/security)
-"WY" = (
-/obj/effect/turf_decal/techfloor/orange{
- dir = 9
- },
-/obj/effect/turf_decal/steeldecal/steel_decals2,
-/obj/item/wirecutters{
- pixel_x = 6;
- pixel_y = -8
- },
-/obj/machinery/firealarm/directional/north{
- pixel_x = 4
- },
-/obj/machinery/atmospherics/pipe/simple/orange/visible{
- dir = 10
- },
-/obj/item/kirbyplants/random,
-/obj/machinery/button/door{
- id = "minutemen_corvus_engines";
- name = "Engine Blast Doors";
- pixel_x = -10;
- pixel_y = 24
- },
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/engineering)
-"Xr" = (
-/obj/effect/turf_decal/techfloor/corner{
- dir = 1
- },
-/obj/effect/turf_decal/techfloor/corner,
-/obj/effect/turf_decal/steeldecal/steel_decals1,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/chair/comfy/shuttle{
- dir = 4;
- name = "Helm"
- },
-/turf/open/floor/plasteel/tech,
-/area/ship/bridge)
-"XM" = (
-/obj/machinery/power/apc/auto_name/directional/west,
-/obj/structure/cable{
- icon_state = "0-1"
- },
-/obj/machinery/light_switch{
- dir = 4;
- pixel_x = -19;
- pixel_y = 12
- },
-/turf/open/floor/plasteel/stairs{
- dir = 1;
- icon = 'icons/obj/stairs.dmi'
- },
-/area/ship/bridge)
-"XO" = (
-/obj/effect/turf_decal/industrial/warning{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/firealarm/directional/north,
-/obj/machinery/door/firedoor/border_only{
- dir = 8
- },
-/obj/machinery/door/firedoor/border_only{
- dir = 4
- },
-/turf/open/floor/plastic,
-/area/ship/hallway/central)
-"XR" = (
-/obj/effect/turf_decal/industrial/hatch/yellow,
-/obj/machinery/door/airlock/external/glass{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 4
- },
-/turf/open/floor/plasteel/patterned/grid,
-/area/ship/hallway/central)
-"XU" = (
-/obj/structure/closet/firecloset/wall{
- dir = 8;
- pixel_x = 28
- },
-/obj/effect/turf_decal/techfloor/orange{
- dir = 5
- },
-/obj/item/trash/raisins{
- pixel_x = -6;
- pixel_y = 6
- },
-/obj/structure/cable{
- icon_state = "2-9"
- },
-/obj/structure/cable{
- icon_state = "2-8"
- },
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/engineering)
-"Yh" = (
-/obj/structure/railing{
- dir = 2;
- layer = 4.1
- },
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 9
- },
-/turf/open/floor/plasteel/dark,
-/area/ship/bridge)
-"Yn" = (
-/obj/machinery/light/directional/north,
-/obj/machinery/holopad/emergency/command,
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel/dark,
-/area/ship/bridge)
-"Yq" = (
-/obj/item/trash/popcorn{
- pixel_x = -4;
- pixel_y = 11
- },
-/obj/machinery/atmospherics/components/binary/pump{
- dir = 1;
- name = "engine fuel pump"
- },
-/obj/effect/turf_decal/number/five,
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/engineering)
-"YE" = (
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/structure/closet/secure_closet{
- icon_door = "tac";
- icon_state = "tac";
- name = "boarding tools locker";
- req_access_txt = "3"
- },
-/obj/item/storage/backpack/duffelbag/syndie/x4{
- icon_state = "duffel-sec";
- name = "breaching charges duffel bag"
- },
-/obj/item/door_seal,
-/obj/item/door_seal,
-/obj/effect/turf_decal/corner/opaque/red/border{
- dir = 9
- },
-/obj/machinery/light/directional/north,
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel/dark,
-/area/ship/security)
-"YG" = (
-/obj/effect/turf_decal/techfloor/orange{
- dir = 1
- },
-/obj/effect/turf_decal/industrial/caution,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/cable/yellow{
- icon_state = "0-2"
- },
-/obj/machinery/power/terminal{
- dir = 1
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/engineering)
-"YL" = (
-/obj/machinery/door/window/brigdoor/southright{
- dir = 4;
- req_access_txt = "1"
- },
-/obj/effect/turf_decal/industrial/warning{
- color = "#808080";
- dir = 2
- },
-/obj/effect/turf_decal/corner/opaque/grey/diagonal,
-/obj/effect/turf_decal/industrial/warning{
- color = "#808080";
- dir = 1
- },
-/obj/machinery/computer/helm/viewscreen/directional/west,
-/turf/open/floor/plasteel/dark,
-/area/ship/cargo)
-"YM" = (
-/obj/structure/table/reinforced,
-/obj/item/paper_bin{
- pixel_x = -8;
- pixel_y = 4
- },
-/obj/item/pen/fountain/captain{
- pixel_x = -6;
- pixel_y = 5
- },
-/obj/item/folder/blue{
- pixel_x = 6;
- pixel_y = 6
- },
-/obj/item/stamp/captain{
- pixel_x = -8;
- pixel_y = 12
- },
-/obj/item/stamp/head_of_personnel{
- pixel_x = -10;
- pixel_y = 10
- },
-/obj/item/newspaper,
-/obj/effect/turf_decal/techfloor{
- dir = 5
- },
-/obj/item/desk_flag{
- pixel_x = 10
- },
-/turf/open/floor/plasteel/tech,
-/area/ship/bridge)
-"YO" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/obj/item/radio/intercom/directional/south,
-/turf/open/floor/carpet/nanoweave,
-/area/ship/hallway/central)
-"YT" = (
-/obj/machinery/porta_turret/ship/ballistic{
- dir = 10
- },
-/turf/closed/wall/mineral/plastitanium,
-/area/ship/engineering)
-"Zh" = (
-/obj/structure/table/reinforced,
-/obj/effect/turf_decal/techfloor{
- dir = 6
- },
-/obj/machinery/fax,
-/turf/open/floor/plasteel/tech,
-/area/ship/bridge)
-"Zt" = (
-/obj/machinery/power/shuttle/engine/fueled/plasma{
- dir = 4
- },
-/turf/open/floor/plating,
-/area/ship/engineering)
-"Zx" = (
-/obj/item/reagent_containers/spray/cleaner{
- pixel_x = -8;
- pixel_y = -4
- },
-/obj/item/reagent_containers/glass/bucket,
-/obj/structure/closet/wall{
- dir = 1;
- name = "Janitorial supplies";
- pixel_y = -28
- },
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/item/holosign_creator/janibarrier{
- pixel_x = 5;
- pixel_y = -7
- },
-/obj/item/soap/deluxe,
-/obj/item/mop,
-/obj/item/storage/bag/trash,
-/turf/open/floor/plasteel/showroomfloor,
-/area/ship/hallway/central)
-"ZG" = (
-/obj/effect/turf_decal/techfloor,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 10
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/turf/open/floor/plasteel/tech,
-/area/ship/security)
-
-(1,1,1) = {"
-bA
-bA
-bA
-bA
-IX
-Zt
-To
-To
-Zt
-IX
-bA
-bA
-bA
-bA
-"}
-(2,1,1) = {"
-bA
-bA
-bA
-bA
-IX
-sL
-hp
-Ri
-Lq
-IX
-bA
-bA
-bA
-bA
-"}
-(3,1,1) = {"
-bA
-bA
-bA
-EW
-IX
-WY
-iJ
-mo
-gP
-IX
-YT
-bA
-bA
-bA
-"}
-(4,1,1) = {"
-bA
-bA
-bA
-IX
-oQ
-YG
-tp
-kE
-RU
-PE
-IX
-bA
-bA
-bA
-"}
-(5,1,1) = {"
-bA
-bA
-bA
-IX
-kR
-XU
-bf
-Vi
-NE
-Gr
-Jh
-FW
-bA
-bA
-"}
-(6,1,1) = {"
-bA
-bA
-Bk
-Uy
-Uy
-Uy
-IX
-qU
-wx
-IX
-IX
-Gh
-bA
-bA
-"}
-(7,1,1) = {"
-bA
-hc
-Uy
-Kz
-YL
-nI
-IX
-Co
-ej
-sW
-fy
-IX
-Gh
-bA
-"}
-(8,1,1) = {"
-bA
-ER
-iV
-Gd
-PA
-yu
-IX
-Gv
-Tk
-gS
-Yq
-cq
-IX
-bA
-"}
-(9,1,1) = {"
-bA
-Bg
-Ip
-Ua
-Uq
-eZ
-IX
-Ci
-dU
-jE
-rx
-rb
-Mu
-bA
-"}
-(10,1,1) = {"
-bA
-QY
-Ju
-Lj
-oj
-Mt
-IX
-Eo
-qb
-Fa
-fr
-ST
-Mu
-bA
-"}
-(11,1,1) = {"
-bA
-uF
-yI
-yI
-vN
-yI
-IX
-IX
-WT
-IX
-IX
-IX
-IX
-bA
-"}
-(12,1,1) = {"
-yI
-yI
-eE
-NL
-sN
-yI
-pN
-Bl
-HJ
-Gf
-Cs
-Mh
-Sn
-Sn
-"}
-(13,1,1) = {"
-yI
-YE
-Cm
-Ds
-bQ
-yI
-MT
-zA
-DS
-jk
-Qj
-BN
-Jo
-Sn
-"}
-(14,1,1) = {"
-yI
-TS
-WW
-ZG
-Um
-dq
-wa
-hK
-mF
-Gf
-oR
-lX
-Az
-BA
-"}
-(15,1,1) = {"
-yI
-cx
-hY
-rt
-xL
-dq
-DY
-Ha
-dB
-Gf
-sy
-IF
-is
-Sn
-"}
-(16,1,1) = {"
-tt
-yI
-BE
-fX
-Fz
-yI
-uK
-Rj
-NY
-Gf
-Wl
-pW
-Sn
-eS
-"}
-(17,1,1) = {"
-bA
-tt
-yI
-yI
-iL
-yI
-Gf
-XO
-GK
-Gf
-Sn
-Sn
-eS
-bA
-"}
-(18,1,1) = {"
-bA
-bA
-Gf
-jF
-gj
-rO
-At
-DJ
-Bu
-Cr
-Es
-of
-bA
-bA
-"}
-(19,1,1) = {"
-bA
-bA
-dJ
-Ov
-qW
-Ab
-lM
-lE
-GI
-nW
-yE
-of
-bA
-bA
-"}
-(20,1,1) = {"
-bA
-bA
-ka
-Gf
-oN
-Gf
-tc
-YO
-Gf
-XR
-Gf
-Gf
-bA
-bA
-"}
-(21,1,1) = {"
-bA
-bA
-eF
-VR
-Zx
-Gf
-rh
-py
-Gf
-SH
-fR
-mz
-bA
-bA
-"}
-(22,1,1) = {"
-bA
-bA
-ka
-qN
-MA
-Gf
-mV
-Fu
-Gf
-rL
-Hw
-UP
-vo
-bA
-"}
-(23,1,1) = {"
-bA
-bA
-cR
-cR
-cR
-cR
-cR
-wu
-cR
-cR
-cR
-Sd
-bA
-bA
-"}
-(24,1,1) = {"
-bA
-bA
-rk
-gH
-Fy
-cR
-tD
-em
-XM
-dI
-Ew
-cR
-bA
-bA
-"}
-(25,1,1) = {"
-bA
-bA
-rk
-zv
-cC
-sc
-JE
-Yh
-LE
-Xr
-Zh
-zu
-bA
-bA
-"}
-(26,1,1) = {"
-bA
-bA
-Gu
-cR
-Ok
-cR
-Yn
-Nr
-YM
-GF
-zu
-hk
-bA
-bA
-"}
-(27,1,1) = {"
-bA
-bA
-bA
-EO
-cR
-cR
-kJ
-tQ
-zu
-Gm
-hk
-bA
-bA
-bA
-"}
-(28,1,1) = {"
-bA
-bA
-bA
-bA
-bA
-Gu
-Gm
-Gm
-qL
-bA
-bA
-bA
-bA
-bA
-"}
diff --git a/_maps/shuttles/minutemen/minutemen_vela.dmm b/_maps/shuttles/minutemen/minutemen_vela.dmm
index ab5b6c7e8a1f..2f39a367d761 100644
--- a/_maps/shuttles/minutemen/minutemen_vela.dmm
+++ b/_maps/shuttles/minutemen/minutemen_vela.dmm
@@ -562,7 +562,7 @@
/obj/item/clothing/suit/toggle/lawyer/minutemen,
/obj/item/clothing/shoes/combat,
/obj/item/clothing/glasses/sunglasses,
-/obj/item/gun/ballistic/automatic/pistol/m1911,
+/obj/item/gun/ballistic/automatic/pistol/candor,
/obj/item/clothing/head/cowboy/sec/minutemen,
/obj/item/radio/headset/minutemen/alt/captain,
/obj/item/storage/backpack,
@@ -5893,10 +5893,6 @@
},
/obj/structure/table,
/obj/machinery/firealarm/directional/south,
-/obj/item/book/manual/wiki/security_space_law{
- pixel_x = 9;
- pixel_y = 4
- },
/obj/item/flashlight/lamp{
pixel_x = -7;
pixel_y = 4
@@ -8315,8 +8311,8 @@
/area/ship/crew/office)
"Th" = (
/obj/structure/guncase,
-/obj/item/gun/ballistic/automatic/pistol/m1911/no_mag,
-/obj/item/gun/ballistic/automatic/pistol/m1911/no_mag,
+/obj/item/gun/ballistic/automatic/pistol/candor/no_mag,
+/obj/item/gun/ballistic/automatic/pistol/candor/no_mag,
/obj/item/gun/ballistic/automatic/smg/cm5{
spawnwithmagazine = 0
},
@@ -9115,7 +9111,7 @@
/area/ship/hallway/fore)
"XC" = (
/obj/structure/table,
-/obj/item/book/manual/wiki/engineering_guide,
+/obj/item/book/manual/wiki/engineering,
/turf/open/floor/wood,
/area/ship/hallway/central)
"XJ" = (
diff --git a/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm b/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm
index 669e1df22ab8..935f0a2595d3 100644
--- a/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm
+++ b/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm
@@ -1365,7 +1365,7 @@
pixel_x = 6;
pixel_y = -3
},
-/obj/item/book/manual/wiki/engineering_guide{
+/obj/item/book/manual/wiki/engineering{
pixel_x = -3;
pixel_y = -8
},
@@ -3506,12 +3506,6 @@
},
/turf/open/floor/plasteel/tech,
/area/ship/engineering/electrical)
-"mW" = (
-/obj/structure/guncase,
-/obj/item/gun/ballistic/automatic/pistol/m1911/no_mag,
-/obj/item/gun/ballistic/automatic/pistol/m1911/no_mag,
-/turf/open/floor/plasteel/tech,
-/area/ship/cargo/office)
"mX" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/purple/hidden,
@@ -4314,27 +4308,6 @@
},
/turf/open/floor/plasteel/white,
/area/ship/medical)
-"pS" = (
-/obj/structure/closet/wall/orange{
- name = "Pilot's Locker";
- pixel_y = 28
- },
-/obj/item/clothing/under/rank/security/officer/military/eng,
-/obj/item/clothing/suit/jacket/leather/duster,
-/obj/item/clothing/suit/jacket/miljacket,
-/obj/item/clothing/mask/bandana/skull,
-/obj/item/clothing/suit/armor/vest/marine,
-/obj/item/instrument/piano_synth/headphones/spacepods{
- pixel_x = -5;
- pixel_y = -1
- },
-/obj/item/clothing/neck/shemagh,
-/obj/item/reagent_containers/spray/pepper{
- pixel_x = 7;
- pixel_y = -6
- },
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/hangar)
"pT" = (
/obj/machinery/atmospherics/pipe/layer_manifold{
dir = 1
@@ -5851,6 +5824,26 @@
},
/turf/open/floor/plasteel/elevatorshaft,
/area/ship/science/robotics)
+"vb" = (
+/obj/structure/closet/wall/orange{
+ name = "Pilot's Locker";
+ pixel_y = 28
+ },
+/obj/item/clothing/under/rank/security/officer/military/eng,
+/obj/item/clothing/suit/jacket/leather/duster,
+/obj/item/clothing/suit/jacket/miljacket,
+/obj/item/clothing/suit/armor/vest/marine,
+/obj/item/instrument/piano_synth/headphones/spacepods{
+ pixel_x = -5;
+ pixel_y = -1
+ },
+/obj/item/clothing/neck/shemagh,
+/obj/item/reagent_containers/spray/pepper{
+ pixel_x = 7;
+ pixel_y = -6
+ },
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/hangar)
"vg" = (
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
dir = 8
@@ -6508,7 +6501,7 @@
/obj/item/survey_handheld{
pixel_x = -2
},
-/obj/item/book/manual/wiki/robotics_cyborgs{
+/obj/item/book/manual/wiki/robotics{
pixel_y = -1;
pixel_x = 5
},
@@ -9197,6 +9190,27 @@
},
/turf/open/floor/wood,
/area/ship/crew/dorm/dormtwo)
+"HI" = (
+/obj/structure/closet/wall/orange{
+ name = "Pilot's Locker";
+ pixel_y = 28
+ },
+/obj/item/clothing/under/rank/security/officer/military/eng,
+/obj/item/clothing/suit/jacket/leather/duster,
+/obj/item/clothing/suit/jacket/miljacket,
+/obj/item/clothing/mask/bandana/skull,
+/obj/item/clothing/suit/armor/vest/marine,
+/obj/item/instrument/piano_synth/headphones/spacepods{
+ pixel_x = -5;
+ pixel_y = -1
+ },
+/obj/item/clothing/neck/shemagh,
+/obj/item/reagent_containers/spray/pepper{
+ pixel_x = 7;
+ pixel_y = -6
+ },
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/hangar)
"HO" = (
/obj/effect/turf_decal/techfloor{
dir = 4
@@ -9367,26 +9381,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/tech,
/area/ship/engineering/electrical)
-"Io" = (
-/obj/structure/closet/wall/orange{
- name = "Pilot's Locker";
- pixel_y = 28
- },
-/obj/item/clothing/under/rank/security/officer/military/eng,
-/obj/item/clothing/suit/jacket/leather/duster,
-/obj/item/clothing/suit/jacket/miljacket,
-/obj/item/clothing/suit/armor/vest/marine,
-/obj/item/instrument/piano_synth/headphones/spacepods{
- pixel_x = -5;
- pixel_y = -1
- },
-/obj/item/clothing/neck/shemagh,
-/obj/item/reagent_containers/spray/pepper{
- pixel_x = 7;
- pixel_y = -6
- },
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/hangar)
"Ip" = (
/obj/structure/table,
/obj/item/reagent_containers/food/snacks/mint,
@@ -11619,6 +11613,12 @@
/obj/item/kirbyplants/random,
/turf/open/floor/plasteel,
/area/ship/hallway/aft)
+"Rs" = (
+/obj/structure/guncase,
+/obj/item/gun/ballistic/automatic/pistol/candor/no_mag,
+/obj/item/gun/ballistic/automatic/pistol/candor/no_mag,
+/turf/open/floor/plasteel/tech,
+/area/ship/cargo/office)
"Ru" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
dir = 4
@@ -11794,10 +11794,6 @@
/area/ship/engineering/electrical)
"Se" = (
/obj/structure/table/reinforced,
-/obj/item/book/manual/wiki/security_space_law{
- pixel_x = 5;
- pixel_y = 2
- },
/obj/item/cigbutt/cigarbutt{
pixel_x = 8;
pixel_y = -1
@@ -12200,10 +12196,6 @@
/area/ship/engineering/engine)
"TE" = (
/obj/structure/table,
-/obj/item/book/manual/wiki/security_space_law{
- pixel_x = -5;
- pixel_y = 16
- },
/obj/machinery/light/directional/west{
light_color = "#e8eaff"
},
@@ -13955,10 +13947,6 @@
/area/ship/crew/canteen)
"ZX" = (
/obj/structure/table/reinforced,
-/obj/item/book/manual/wiki/security_space_law{
- pixel_x = 4;
- pixel_y = 2
- },
/obj/machinery/door/window/brigdoor/southright,
/obj/machinery/door/window/brigdoor/southright{
dir = 1;
@@ -15417,7 +15405,7 @@ uQ
uQ
uQ
uQ
-pS
+HI
JE
gN
MI
@@ -15454,9 +15442,9 @@ Ob
Zg
mk
lv
-mW
+Rs
Zg
-Io
+vb
zC
EO
fv
diff --git a/_maps/shuttles/nanotrasen/nanotrasen_mimir.dmm b/_maps/shuttles/nanotrasen/nanotrasen_mimir.dmm
index 8f7fb343e1a4..d6cc2ca80968 100644
--- a/_maps/shuttles/nanotrasen/nanotrasen_mimir.dmm
+++ b/_maps/shuttles/nanotrasen/nanotrasen_mimir.dmm
@@ -70,16 +70,6 @@
},
/turf/open/floor/plasteel/tech/grid,
/area/ship/maintenance/port)
-"aC" = (
-/obj/structure/window/reinforced/spawner{
- dir = 4
- },
-/obj/machinery/conveyor{
- id = "prison_scrap";
- dir = 1
- },
-/turf/open/floor/plating,
-/area/ship/engineering/engine)
"aE" = (
/obj/structure/table,
/obj/machinery/door/window,
@@ -1696,7 +1686,7 @@
/area/ship/engineering/electrical)
"jC" = (
/obj/structure/rack,
-/obj/item/gun/ballistic/shotgun/lethal,
+/obj/item/gun/ballistic/shotgun/brimstone,
/obj/item/storage/box/lethalshot,
/obj/effect/turf_decal/siding/red{
dir = 10
@@ -3721,6 +3711,16 @@
},
/turf/open/floor/plasteel/tech/grid,
/area/ship/maintenance/starboard)
+"vT" = (
+/obj/structure/window/reinforced/spawner{
+ dir = 4
+ },
+/obj/machinery/conveyor{
+ id = "prison_scrap";
+ dir = 1
+ },
+/turf/open/floor/plating,
+/area/ship/engineering/engine)
"wa" = (
/obj/structure/sink/kitchen{
dir = 8;
@@ -5775,7 +5775,7 @@
/area/ship/maintenance/port)
"Ht" = (
/obj/structure/rack,
-/obj/item/gun/ballistic/shotgun/riot,
+/obj/item/gun/ballistic/shotgun/hellfire,
/obj/item/storage/box/rubbershot,
/obj/item/clothing/suit/armor/riot,
/obj/item/shield/riot,
@@ -9127,7 +9127,7 @@ yz
tY
jS
TO
-aC
+vT
Kk
wm
Jy
diff --git a/_maps/shuttles/nanotrasen/nanotrasen_osprey.dmm b/_maps/shuttles/nanotrasen/nanotrasen_osprey.dmm
index 2746cd335f88..95486e6fc6ae 100644
--- a/_maps/shuttles/nanotrasen/nanotrasen_osprey.dmm
+++ b/_maps/shuttles/nanotrasen/nanotrasen_osprey.dmm
@@ -177,7 +177,6 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/effect/turf_decal/borderfloor,
-/obj/machinery/door/firedoor,
/turf/open/floor/plasteel/tech,
/area/ship/hallway/central)
"bs" = (
@@ -2976,7 +2975,6 @@
/obj/effect/turf_decal/borderfloor{
dir = 1
},
-/obj/machinery/door/firedoor,
/turf/open/floor/plasteel/tech,
/area/ship/hallway/central)
"tm" = (
@@ -3263,7 +3261,6 @@
"uQ" = (
/obj/machinery/door/airlock/external,
/obj/machinery/atmospherics/pipe/layer_manifold,
-/obj/machinery/door/firedoor,
/turf/open/floor/plasteel/tech,
/area/ship/hallway/central)
"vi" = (
diff --git a/_maps/shuttles/nanotrasen/nanotrasen_skipper.dmm b/_maps/shuttles/nanotrasen/nanotrasen_skipper.dmm
index 1a1d843bbaff..81465759ba48 100644
--- a/_maps/shuttles/nanotrasen/nanotrasen_skipper.dmm
+++ b/_maps/shuttles/nanotrasen/nanotrasen_skipper.dmm
@@ -3710,7 +3710,6 @@
/obj/structure/closet/cardboard{
name = "pranking materials"
},
-/obj/item/storage/box/maid,
/obj/item/toy/katana,
/obj/item/bikehorn,
/obj/item/grown/bananapeel,
diff --git a/_maps/shuttles/pirate/pirate_ember.dmm b/_maps/shuttles/pirate/pirate_ember.dmm
index f114c64f153f..cff10d5446b4 100644
--- a/_maps/shuttles/pirate/pirate_ember.dmm
+++ b/_maps/shuttles/pirate/pirate_ember.dmm
@@ -2894,7 +2894,7 @@
pixel_y = -4;
pixel_x = 3
},
-/obj/item/gun/ballistic/rifle/boltaction/polymer{
+/obj/item/gun/ballistic/rifle/polymer{
pixel_y = -8
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
@@ -5596,11 +5596,11 @@
/area/ship/engineering/incinerator)
"Bx" = (
/obj/structure/table/reinforced,
-/obj/item/gun/ballistic/revolver/nagant{
+/obj/item/gun/ballistic/revolver/shadow{
pixel_y = 6
},
-/obj/item/gun/ballistic/revolver/nagant,
-/obj/item/gun/ballistic/revolver/nagant{
+/obj/item/gun/ballistic/revolver/shadow,
+/obj/item/gun/ballistic/revolver/shadow{
pixel_y = -5
},
/obj/effect/turf_decal/techfloor{
@@ -5614,7 +5614,7 @@
/area/ship/security/armory)
"By" = (
/obj/structure/guncase,
-/obj/item/gun/ballistic/automatic/smg/thompson{
+/obj/item/gun/ballistic/automatic/smg/mini_uzi{
pixel_y = -3
},
/obj/effect/turf_decal/techfloor{
@@ -5623,7 +5623,7 @@
/obj/structure/railing{
dir = 1
},
-/obj/item/gun/ballistic/rifle/boltaction{
+/obj/item/gun/ballistic/rifle/illestren{
pixel_y = 5
},
/turf/open/floor/plasteel/dark,
@@ -8676,7 +8676,7 @@
/obj/structure/closet/crate/trashcart,
/obj/item/trash/candy,
/obj/effect/decal/cleanable/vomit/old,
-/obj/item/book/manual/wiki/chemistry{
+/obj/item/book/manual/wiki/ghetto_chemistry{
pixel_x = 6;
pixel_y = -5
},
@@ -8985,10 +8985,10 @@
/obj/effect/turf_decal/techfloor/hole{
dir = 8
},
-/obj/item/ammo_box/n762{
+/obj/item/ammo_box/c45_speedloader{
pixel_y = -3
},
-/obj/item/ammo_box/n762{
+/obj/item/ammo_box/c45_speedloader{
pixel_y = -1;
pixel_x = 1
},
@@ -8999,20 +8999,20 @@
pixel_y = 2;
pixel_x = -4
},
-/obj/item/ammo_box/magazine/smgm45/drum{
+/obj/item/ammo_box/magazine/uzim9mm{
pixel_y = -4
},
-/obj/item/ammo_box/magazine/smgm45,
-/obj/item/ammo_box/n762{
+/obj/item/ammo_box/magazine/uzim9mm,
+/obj/item/ammo_box/c45_speedloader{
pixel_y = -3
},
-/obj/item/ammo_box/n762{
+/obj/item/ammo_box/c45_speedloader{
pixel_y = -5;
pixel_x = -1
},
-/obj/item/ammo_box/a762,
-/obj/item/ammo_box/a762,
-/obj/item/storage/toolbox/ammo/a762{
+/obj/item/ammo_box/magazine/illestren_a850r,
+/obj/item/ammo_box/magazine/illestren_a850r,
+/obj/item/storage/toolbox/ammo/a850r{
pixel_y = -6;
pixel_x = 5
},
@@ -9360,7 +9360,7 @@
/obj/structure/table/reinforced{
color = "#c1b6a5"
},
-/obj/item/book/manual/wiki/engineering_hacking{
+/obj/item/book/manual/wiki/hacking{
pixel_x = 5;
pixel_y = 4
},
diff --git a/_maps/shuttles/roumain/srm_elder.dmm b/_maps/shuttles/roumain/srm_elder.dmm
new file mode 100644
index 000000000000..5d8cb37ffc6b
--- /dev/null
+++ b/_maps/shuttles/roumain/srm_elder.dmm
@@ -0,0 +1,5504 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"ac" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/effect/turf_decal/siding/brown/corner{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4,
+/turf/open/floor/wood/ebony,
+/area/ship/hallway/starboard)
+"af" = (
+/obj/machinery/power/apc/auto_name/directional/south,
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/obj/effect/turf_decal/siding/wood{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 9
+ },
+/turf/open/floor/wood/maple,
+/area/ship/crew/cryo)
+"ag" = (
+/obj/effect/turf_decal/trimline/opaque/orange/line{
+ dir = 6
+ },
+/obj/structure/cable{
+ icon_state = "1-10"
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/engineering/engine)
+"al" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 6
+ },
+/turf/open/floor/wood/maple,
+/area/ship/storage)
+"ap" = (
+/obj/effect/turf_decal/spline/fancy/wood/corner,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+ dir = 8
+ },
+/turf/open/floor/wood/mahogany,
+/area/ship/bridge)
+"aq" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/blue{
+ dir = 10
+ },
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
+"au" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/effect/turf_decal/spline/fancy/wood/corner{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/wood/mahogany,
+/area/ship/bridge)
+"aF" = (
+/obj/machinery/portable_atmospherics/canister/toxins,
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/turf/open/floor/plating,
+/area/ship/engineering/atmospherics)
+"aM" = (
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/obj/effect/turf_decal/siding/wood{
+ dir = 9
+ },
+/obj/effect/turf_decal/siding/wood/corner,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 6
+ },
+/turf/open/floor/wood/maple,
+/area/ship/hallway/central)
+"aO" = (
+/obj/structure/flora/grass/jungle,
+/turf/open/floor/grass/ship/jungle,
+/area/ship/roumain)
+"aP" = (
+/turf/closed/wall/r_wall,
+/area/ship/bridge)
+"aS" = (
+/obj/structure/railing/corner{
+ dir = 4
+ },
+/obj/structure/railing/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/brown{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/brown{
+ dir = 4
+ },
+/turf/open/floor/wood/maple,
+/area/ship/hallway/starboard)
+"aY" = (
+/obj/structure/flora/grass/jungle,
+/turf/open/floor/grass/ship/jungle,
+/area/ship/bridge)
+"bi" = (
+/obj/structure/window/reinforced/fulltile,
+/obj/structure/grille,
+/obj/machinery/door/firedoor/border_only{
+ dir = 8
+ },
+/obj/machinery/door/firedoor/border_only{
+ dir = 1
+ },
+/obj/machinery/door/poddoor/shutters{
+ id = "elderrearshuts";
+ dir = 8
+ },
+/turf/open/floor/plating,
+/area/ship/bridge)
+"bj" = (
+/obj/item/kirbyplants/random,
+/obj/effect/turf_decal/siding/brown{
+ dir = 6
+ },
+/turf/open/floor/wood/ebony,
+/area/ship/hallway/port)
+"bm" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/airalarm/directional/south,
+/obj/effect/turf_decal/trimline/opaque/orange/filled/line{
+ dir = 8
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/engineering/engine)
+"bv" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 10
+ },
+/obj/effect/turf_decal/siding/wood/corner{
+ dir = 4
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+ dir = 4
+ },
+/turf/open/floor/wood/maple,
+/area/ship/hallway/central)
+"bN" = (
+/obj/machinery/suit_storage_unit/inherit,
+/obj/item/tank/internals/emergency_oxygen/double{
+ pixel_x = 4;
+ pixel_y = -6
+ },
+/obj/item/clothing/suit/space/eva{
+ pixel_x = -8
+ },
+/obj/item/clothing/mask/breath{
+ pixel_y = 9;
+ pixel_x = -6
+ },
+/obj/item/clothing/head/helmet/space/eva{
+ pixel_y = 8;
+ pixel_x = 8
+ },
+/turf/open/floor/wood/ebony,
+/area/ship/hallway/starboard)
+"bO" = (
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/poddoor/shutters{
+ id = "elderbayshutters"
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/hallway/starboard)
+"bW" = (
+/turf/open/floor/engine/hull,
+/area/ship/external/dark)
+"bY" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/structure/window/reinforced/fulltile,
+/obj/structure/grille,
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/poddoor/shutters{
+ id = "elderemergencyairlockshuts"
+ },
+/turf/open/floor/plating,
+/area/ship/hallway/port)
+"ce" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 9
+ },
+/turf/open/floor/wood/maple,
+/area/ship/hallway/central)
+"cg" = (
+/obj/structure/closet/emcloset/wall{
+ pixel_y = 28
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/effect/turf_decal/siding/brown{
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/turf/open/floor/wood/ebony,
+/area/ship/hallway/starboard)
+"cj" = (
+/obj/structure/closet/crate/freezer,
+/obj/item/reagent_containers/food/snacks/egg,
+/obj/item/reagent_containers/food/snacks/egg,
+/obj/item/reagent_containers/food/snacks/egg,
+/obj/item/reagent_containers/food/snacks/egg,
+/obj/item/stack/ore/glass/basalt{
+ amount = 25;
+ pixel_y = -2;
+ pixel_x = -9
+ },
+/obj/item/stack/ore/glass/basalt{
+ amount = 25;
+ pixel_y = -2;
+ pixel_x = -9
+ },
+/obj/item/stack/ore/glass/basalt{
+ amount = 25;
+ pixel_y = -2;
+ pixel_x = -9
+ },
+/obj/item/stack/ore/glass/basalt{
+ amount = 25;
+ pixel_y = -2;
+ pixel_x = -9
+ },
+/turf/open/floor/grass/ship/jungle,
+/area/ship/roumain)
+"co" = (
+/obj/structure/chair/pew/right{
+ dir = 8
+ },
+/obj/structure/flora/grass/jungle/b,
+/turf/open/floor/grass/ship/jungle,
+/area/ship/hallway/central)
+"cp" = (
+/obj/structure/railing{
+ dir = 1
+ },
+/turf/open/floor/grass/ship/jungle,
+/area/ship/roumain)
+"cw" = (
+/obj/structure/window/reinforced/fulltile,
+/obj/structure/grille,
+/obj/machinery/door/firedoor/border_only{
+ dir = 1
+ },
+/obj/machinery/door/poddoor/shutters{
+ dir = 2;
+ id = "elderatriumshuts"
+ },
+/turf/open/floor/plating,
+/area/ship/roumain)
+"cz" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/turf/open/floor/wood/mahogany,
+/area/ship/bridge)
+"cJ" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/effect/turf_decal/siding/brown/corner{
+ dir = 8
+ },
+/turf/open/floor/wood/ebony,
+/area/ship/hallway/port)
+"cN" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/door/airlock/external,
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/poddoor/shutters{
+ id = "elderemergencyairlockshuts"
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/hallway/port)
+"cR" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/door/firedoor/border_only{
+ dir = 8
+ },
+/obj/machinery/door/airlock/medical/glass{
+ name = "Medical Bay";
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/blue/end{
+ dir = 8
+ },
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
+"cU" = (
+/obj/structure/destructible/tribal_torch,
+/turf/open/floor/grass/ship/jungle,
+/area/ship/hallway/central)
+"cY" = (
+/obj/structure/rack,
+/obj/item/storage/toolbox/ammo/a850r{
+ pixel_y = 14;
+ pixel_x = 5
+ },
+/obj/item/ammo_box/c38_box{
+ pixel_x = -6;
+ pixel_y = 7
+ },
+/obj/item/ammo_box/magazine/illestren_a850r{
+ pixel_x = 8;
+ pixel_y = 6
+ },
+/obj/item/ammo_box/magazine/illestren_a850r{
+ pixel_x = 8;
+ pixel_y = 2
+ },
+/obj/item/ammo_box/c38_box{
+ pixel_x = -6;
+ pixel_y = 1
+ },
+/obj/item/ammo_box/magazine/illestren_a850r{
+ pixel_x = 8;
+ pixel_y = -2
+ },
+/turf/open/floor/wood/ebony,
+/area/ship/storage)
+"de" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 5
+ },
+/obj/effect/turf_decal/siding/wood/corner{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 10
+ },
+/turf/open/floor/wood/maple,
+/area/ship/hallway/central)
+"dn" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/effect/turf_decal/spline/fancy/wood/corner{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/turf/open/floor/wood/mahogany,
+/area/ship/bridge)
+"dq" = (
+/obj/effect/turf_decal/siding/blue{
+ dir = 6
+ },
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
+"ds" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/wood/corner,
+/obj/structure/destructible/tribal_torch,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/turf/open/floor/wood/maple,
+/area/ship/storage)
+"dt" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+ dir = 6
+ },
+/obj/structure/destructible/tribal_torch{
+ pixel_x = -7;
+ pixel_y = 2
+ },
+/obj/effect/turf_decal/trimline/opaque/red/arrow_cw{
+ dir = 4
+ },
+/obj/effect/turf_decal/industrial/warning{
+ dir = 1
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/hallway/port)
+"dL" = (
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/wood/corner,
+/obj/effect/turf_decal/siding/wood/corner{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+ dir = 1
+ },
+/turf/open/floor/wood/maple,
+/area/ship/hallway/central)
+"dR" = (
+/obj/structure/destructible/tribal_torch,
+/turf/open/floor/ship/dirt/dark,
+/area/ship/roumain)
+"dV" = (
+/obj/structure/chair/pew/left{
+ dir = 4
+ },
+/obj/structure/flora/grass/jungle/b,
+/turf/open/floor/grass/ship/jungle,
+/area/ship/hallway/central)
+"ef" = (
+/obj/effect/turf_decal/siding/brown,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+ dir = 1
+ },
+/turf/open/floor/wood/ebony,
+/area/ship/hallway/starboard)
+"ei" = (
+/turf/open/floor/wood/ebony,
+/area/ship/roumain)
+"el" = (
+/obj/structure/rack,
+/obj/item/stack/sheet/metal/twenty{
+ pixel_x = 5;
+ pixel_y = 2
+ },
+/obj/item/stack/sheet/glass/twenty{
+ pixel_x = -5;
+ pixel_y = 1
+ },
+/obj/item/stack/sheet/mineral/wood/twentyfive,
+/obj/item/clothing/gloves/color/yellow,
+/obj/item/clothing/head/welding{
+ pixel_x = 5;
+ pixel_y = -4
+ },
+/turf/open/floor/wood/ebony,
+/area/ship/storage)
+"eH" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+ dir = 4
+ },
+/obj/machinery/button/door{
+ id = "elderengineshuts";
+ name = "Engine Shutters";
+ dir = 2;
+ pixel_x = 7;
+ pixel_y = 21
+ },
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/turf/open/floor/plating,
+/area/ship/engineering/atmospherics)
+"eU" = (
+/obj/structure/railing{
+ dir = 4
+ },
+/obj/item/lighter{
+ pixel_x = -2;
+ pixel_y = 2
+ },
+/turf/open/floor/grass/ship/jungle,
+/area/ship/roumain)
+"eZ" = (
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/obj/effect/turf_decal/siding/wood{
+ dir = 8
+ },
+/turf/open/floor/wood/maple,
+/area/ship/storage)
+"fa" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 5
+ },
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/turf/open/floor/plating,
+/area/ship/engineering/atmospherics)
+"fe" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/effect/turf_decal/spline/fancy/wood/cee,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/airlock/command{
+ name = "Bridge"
+ },
+/turf/open/floor/wood/mahogany,
+/area/ship/bridge)
+"ff" = (
+/obj/structure/destructible/tribal_torch{
+ pixel_x = 7;
+ pixel_y = 3
+ },
+/obj/effect/turf_decal/corner/opaque/blue/diagonal,
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
+"fi" = (
+/turf/closed/wall/r_wall,
+/area/ship/medical)
+"fm" = (
+/obj/effect/turf_decal/spline/fancy/wood{
+ dir = 8
+ },
+/obj/structure/destructible/tribal_torch,
+/turf/open/floor/wood/mahogany,
+/area/ship/bridge)
+"fs" = (
+/obj/structure/fermenting_barrel,
+/turf/open/floor/grass/ship/jungle,
+/area/ship/roumain)
+"fz" = (
+/obj/structure/table/wood,
+/obj/item/toy/cards/deck{
+ pixel_x = -5;
+ pixel_y = 1
+ },
+/obj/item/toy/cards/deck/tarot{
+ pixel_y = 7;
+ pixel_x = 8
+ },
+/obj/item/toy/cards/deck/kotahi{
+ pixel_y = 10;
+ pixel_x = -4
+ },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
+/turf/open/floor/wood/maple,
+/area/ship/hallway/port)
+"fC" = (
+/obj/machinery/portable_atmospherics/canister/toxins,
+/turf/open/floor/plasteel/dark,
+/area/ship/engineering/engine)
+"fP" = (
+/obj/machinery/holopad/emergency/command,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/effect/turf_decal/spline/fancy/wood{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/wood/mahogany,
+/area/ship/bridge)
+"gb" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/effect/turf_decal/trimline/opaque/syndiered/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/opaque/syndiered/line{
+ dir = 4
+ },
+/turf/open/floor/wood/maple,
+/area/ship/hallway/starboard)
+"gd" = (
+/obj/effect/turf_decal/siding/wood,
+/obj/effect/turf_decal/siding/wood/corner{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 9
+ },
+/turf/open/floor/wood/maple,
+/area/ship/storage)
+"ge" = (
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/obj/effect/turf_decal/siding/wood{
+ dir = 10
+ },
+/obj/effect/turf_decal/siding/wood/corner{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 5
+ },
+/turf/open/floor/wood/maple,
+/area/ship/hallway/central)
+"gi" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/effect/turf_decal/siding/brown/corner,
+/obj/effect/turf_decal/siding/brown/corner{
+ dir = 1
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
+/turf/open/floor/wood/ebony,
+/area/ship/hallway/port)
+"gE" = (
+/obj/structure/table/wood,
+/obj/item/storage/pill_bottle/dice,
+/turf/open/floor/wood/maple,
+/area/ship/hallway/port)
+"gG" = (
+/obj/machinery/power/port_gen/pacman,
+/obj/item/stack/sheet/mineral/plasma/twenty,
+/obj/effect/turf_decal/trimline/opaque/orange/filled,
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/turf/open/floor/plating,
+/area/ship/engineering/engine)
+"gK" = (
+/obj/structure/reagent_dispensers/fueltank,
+/turf/open/floor/wood/ebony,
+/area/ship/storage)
+"gO" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 6
+ },
+/turf/open/floor/engine/hull,
+/area/ship/external/dark)
+"gR" = (
+/obj/structure/table/wood,
+/obj/item/reagent_containers/food/drinks/breakawayflask{
+ pixel_x = -6;
+ pixel_y = 13
+ },
+/obj/item/reagent_containers/food/drinks/breakawayflask{
+ pixel_x = 6;
+ pixel_y = 7
+ },
+/turf/open/floor/grass/ship/jungle,
+/area/ship/roumain)
+"hc" = (
+/obj/effect/turf_decal/siding/brown{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/turf/open/floor/wood/ebony,
+/area/ship/hallway/starboard)
+"hg" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/turf/open/floor/wood/mahogany,
+/area/ship/bridge)
+"hh" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/effect/turf_decal/siding/brown{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+ dir = 8
+ },
+/turf/open/floor/wood/ebony,
+/area/ship/hallway/port)
+"hl" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/effect/turf_decal/siding/wood/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/wood/corner,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 8
+ },
+/turf/open/floor/wood/maple,
+/area/ship/storage)
+"hp" = (
+/obj/machinery/power/smes/shuttle/precharged{
+ dir = 4
+ },
+/obj/structure/cable/pink{
+ icon_state = "0-8"
+ },
+/obj/machinery/door/poddoor/shutters{
+ dir = 8;
+ id = "elderengineshuts"
+ },
+/turf/open/floor/plating,
+/area/ship/engineering/engine)
+"hT" = (
+/obj/structure/railing/corner,
+/obj/effect/turf_decal/siding/brown,
+/turf/open/floor/wood/maple,
+/area/ship/hallway/starboard)
+"hV" = (
+/obj/machinery/power/shieldwallgen/atmos/roundstart{
+ dir = 4;
+ id = "elderbayholos";
+ locked = 1
+ },
+/obj/structure/cable{
+ icon_state = "0-5"
+ },
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/poddoor/shutters{
+ id = "elderbayshutters"
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/hallway/starboard)
+"hZ" = (
+/obj/machinery/power/shuttle/engine/electric{
+ dir = 4
+ },
+/obj/structure/cable/pink{
+ icon_state = "0-4"
+ },
+/turf/open/floor/plating,
+/area/ship/engineering/atmospherics)
+"ie" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/effect/turf_decal/siding/brown,
+/turf/open/floor/wood/ebony,
+/area/ship/hallway/starboard)
+"ih" = (
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/obj/machinery/power/smes/engineering,
+/obj/effect/turf_decal/trimline/opaque/orange/filled,
+/turf/open/floor/plating,
+/area/ship/engineering/engine)
+"ir" = (
+/obj/effect/turf_decal/spline/fancy/wood{
+ dir = 9
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+ dir = 4
+ },
+/turf/open/floor/wood/mahogany,
+/area/ship/bridge)
+"iB" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+ dir = 10
+ },
+/obj/structure/closet/emcloset/wall{
+ dir = 8;
+ pixel_x = 28
+ },
+/obj/effect/turf_decal/trimline/opaque/red/arrow_cw{
+ dir = 8
+ },
+/obj/effect/turf_decal/industrial/warning{
+ dir = 1
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/hallway/port)
+"iP" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/effect/turf_decal/siding/brown,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+ dir = 1
+ },
+/turf/open/floor/wood/ebony,
+/area/ship/hallway/starboard)
+"iR" = (
+/obj/effect/turf_decal/siding/brown{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/wood/ebony,
+/area/ship/hallway/port)
+"iT" = (
+/obj/structure/closet/firecloset/wall{
+ pixel_y = 28
+ },
+/obj/effect/turf_decal/siding/brown{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 8
+ },
+/turf/open/floor/wood/ebony,
+/area/ship/hallway/port)
+"iY" = (
+/obj/structure/cable{
+ icon_state = "1-6"
+ },
+/obj/structure/cable{
+ icon_state = "1-10"
+ },
+/obj/effect/turf_decal/industrial/warning,
+/obj/effect/turf_decal/trimline/opaque/syndiered/end,
+/turf/open/floor/wood/maple,
+/area/ship/hallway/starboard)
+"ji" = (
+/obj/effect/turf_decal/siding/brown{
+ dir = 6
+ },
+/turf/open/floor/wood/ebony,
+/area/ship/hallway/port)
+"jk" = (
+/obj/structure/table/wood,
+/obj/item/reagent_containers/food/drinks/breakawayflask{
+ pixel_x = 6;
+ pixel_y = 15
+ },
+/obj/item/reagent_containers/food/drinks/breakawayflask{
+ pixel_x = -6;
+ pixel_y = 10
+ },
+/turf/open/floor/grass/ship/jungle,
+/area/ship/roumain)
+"jl" = (
+/obj/machinery/power/terminal{
+ dir = 8
+ },
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/turf/open/floor/plating,
+/area/ship/engineering/atmospherics)
+"jm" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/blue{
+ dir = 10
+ },
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
+"jr" = (
+/turf/open/floor/plasteel/dark,
+/area/ship/engineering/engine)
+"jv" = (
+/obj/structure/closet/firecloset/wall{
+ pixel_y = 28
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/effect/turf_decal/siding/brown{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/turf/open/floor/wood/ebony,
+/area/ship/hallway/starboard)
+"jG" = (
+/obj/machinery/atmospherics/components/binary/pump/layer2{
+ dir = 1;
+ name = "Air Supply Pump"
+ },
+/obj/effect/turf_decal/trimline/opaque/orange/line{
+ dir = 5
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/engineering/atmospherics)
+"jV" = (
+/obj/structure/window/reinforced/fulltile,
+/obj/structure/grille,
+/obj/machinery/door/firedoor/border_only{
+ dir = 4
+ },
+/obj/machinery/door/poddoor/shutters{
+ dir = 4;
+ id = "elderatriumshuts"
+ },
+/turf/open/floor/plating,
+/area/ship/roumain)
+"ko" = (
+/obj/structure/grille,
+/obj/structure/window/reinforced/fulltile,
+/obj/machinery/door/poddoor/shutters{
+ dir = 2;
+ id = "elderatriumshuts"
+ },
+/turf/open/floor/plating,
+/area/ship/storage)
+"kq" = (
+/obj/effect/turf_decal/siding/brown{
+ dir = 1
+ },
+/turf/open/floor/wood/maple,
+/area/ship/hallway/starboard)
+"kD" = (
+/obj/structure/destructible/tribal_torch{
+ pixel_x = -7;
+ pixel_y = 4
+ },
+/obj/effect/turf_decal/corner/opaque/blue/diagonal,
+/obj/machinery/airalarm/directional/south,
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
+"kL" = (
+/obj/machinery/door/airlock/external,
+/obj/machinery/door/firedoor/border_only{
+ dir = 1
+ },
+/obj/machinery/door/poddoor/shutters{
+ id = "elderemergencyairlockshuts"
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/hallway/port)
+"kN" = (
+/obj/structure/kitchenspike,
+/turf/open/floor/ship/dirt/dark,
+/area/ship/roumain)
+"lb" = (
+/obj/machinery/door/window{
+ dir = 8
+ },
+/obj/effect/turf_decal/stoneborder{
+ dir = 1
+ },
+/obj/effect/turf_decal/stoneborder,
+/obj/item/towel,
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/hallway/starboard)
+"lf" = (
+/obj/structure/chair/pew/right{
+ dir = 4
+ },
+/obj/structure/flora/grass/jungle/b,
+/turf/open/floor/grass/ship/jungle,
+/area/ship/hallway/central)
+"lg" = (
+/obj/item/book/manual/srmlore{
+ pixel_y = 13;
+ pixel_x = 2
+ },
+/obj/item/candle/infinite{
+ pixel_y = 19;
+ pixel_x = -8
+ },
+/obj/item/candle/infinite{
+ pixel_y = 10;
+ pixel_x = -8
+ },
+/obj/item/candle/infinite{
+ pixel_y = 1;
+ pixel_x = -8
+ },
+/obj/item/candle/infinite{
+ pixel_y = 1;
+ pixel_x = -3
+ },
+/obj/item/candle/infinite{
+ pixel_y = 1;
+ pixel_x = 3
+ },
+/obj/item/candle/infinite{
+ pixel_y = 1;
+ pixel_x = 9
+ },
+/obj/effect/turf_decal/spline/fancy/wood{
+ dir = 8
+ },
+/obj/structure/table/wood/fancy,
+/turf/open/floor/wood/mahogany,
+/area/ship/bridge)
+"li" = (
+/obj/structure/chair/wood{
+ dir = 4
+ },
+/obj/structure/railing{
+ dir = 8
+ },
+/turf/open/floor/wood/maple,
+/area/ship/hallway/starboard)
+"lk" = (
+/obj/structure/chair/wood{
+ dir = 4
+ },
+/turf/open/floor/grass/ship/jungle,
+/area/ship/roumain)
+"lA" = (
+/obj/machinery/suit_storage_unit/inherit,
+/obj/item/clothing/suit/space/hardsuit/mining/independent,
+/obj/item/clothing/mask/breath,
+/obj/item/tank/internals/emergency_oxygen/double,
+/obj/effect/turf_decal/spline/fancy/wood{
+ dir = 6
+ },
+/turf/open/floor/wood/mahogany,
+/area/ship/bridge)
+"lM" = (
+/turf/closed/wall/r_wall,
+/area/ship/engineering/atmospherics)
+"md" = (
+/obj/structure/chair/wood{
+ dir = 8
+ },
+/turf/open/floor/grass/ship/jungle,
+/area/ship/roumain)
+"mj" = (
+/obj/effect/turf_decal/siding/brown{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 5
+ },
+/turf/open/floor/wood/ebony,
+/area/ship/hallway/port)
+"mr" = (
+/obj/structure/window/reinforced/fulltile,
+/obj/structure/grille,
+/obj/machinery/door/firedoor/border_only{
+ dir = 4
+ },
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/poddoor/shutters{
+ dir = 4;
+ id = "elderatriumshuts"
+ },
+/turf/open/floor/plating,
+/area/ship/roumain)
+"mw" = (
+/obj/structure/closet/crate/hydroponics,
+/obj/item/seeds/cotton,
+/obj/item/seeds/cotton,
+/obj/item/seeds/lavaland/ember,
+/obj/item/seeds/lavaland/ember,
+/obj/item/seeds/lavaland/inocybe,
+/obj/item/seeds/lavaland/inocybe,
+/obj/item/seeds/lavaland/polypore,
+/obj/item/seeds/lavaland/polypore,
+/obj/item/seeds/lavaland/porcini,
+/obj/item/seeds/lavaland/porcini,
+/obj/item/seeds/lavaland/cactus,
+/obj/item/seeds/lavaland/cactus,
+/obj/item/seeds/wheat,
+/obj/item/seeds/wheat,
+/obj/item/seeds/carrot,
+/obj/item/seeds/carrot,
+/obj/item/seeds/lavaland/puce,
+/obj/item/seeds/lavaland/puce,
+/obj/item/seeds/tobacco,
+/obj/item/seeds/tobacco,
+/obj/item/seeds/tea,
+/obj/item/seeds/tea,
+/obj/item/seeds/coffee,
+/obj/item/seeds/coffee,
+/turf/open/floor/grass/ship/jungle,
+/area/ship/roumain)
+"mA" = (
+/obj/structure/railing{
+ dir = 1
+ },
+/obj/structure/tank_dispenser/oxygen,
+/turf/open/floor/wood/ebony,
+/area/ship/hallway/starboard)
+"mD" = (
+/obj/machinery/portable_atmospherics/canister/air,
+/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer2{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/opaque/orange/line{
+ dir = 4
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/engineering/atmospherics)
+"mE" = (
+/obj/structure/window/reinforced/fulltile,
+/obj/structure/grille,
+/obj/machinery/door/firedoor/border_only{
+ dir = 8
+ },
+/obj/machinery/door/poddoor/shutters{
+ id = "elderrearshuts";
+ dir = 8
+ },
+/turf/open/floor/plating,
+/area/ship/bridge)
+"mS" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/effect/turf_decal/siding/brown,
+/obj/structure/destructible/tribal_torch,
+/turf/open/floor/wood/ebony,
+/area/ship/hallway/port)
+"mW" = (
+/obj/structure/window/reinforced/fulltile,
+/obj/structure/grille,
+/obj/machinery/door/poddoor/shutters{
+ dir = 2;
+ id = "elderatriumshuts"
+ },
+/turf/open/floor/plating,
+/area/ship/roumain)
+"na" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/closed/wall/r_wall,
+/area/ship/engineering/atmospherics)
+"nj" = (
+/obj/effect/turf_decal/siding/brown,
+/turf/open/floor/wood/ebony,
+/area/ship/hallway/starboard)
+"nk" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 5
+ },
+/obj/effect/turf_decal/siding/wood/corner{
+ dir = 8
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+ dir = 8
+ },
+/turf/open/floor/wood/maple,
+/area/ship/roumain)
+"nt" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/effect/turf_decal/siding/blue{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/blue/corner{
+ dir = 4
+ },
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
+"nO" = (
+/obj/structure/table/wood,
+/obj/item/reagent_containers/syringe/calomel{
+ pixel_x = 3;
+ pixel_y = -5
+ },
+/obj/item/reagent_containers/syringe/antiviral{
+ pixel_y = -6;
+ pixel_x = 8
+ },
+/obj/item/reagent_containers/hypospray/medipen/stimpack{
+ pixel_x = -4
+ },
+/obj/item/reagent_containers/hypospray/medipen/survival{
+ pixel_x = -7;
+ pixel_y = -5
+ },
+/obj/item/reagent_containers/glass/bottle/potass_iodide{
+ pixel_y = 10;
+ pixel_x = -7
+ },
+/obj/item/reagent_containers/glass/bottle/atropine{
+ pixel_y = 9
+ },
+/obj/effect/turf_decal/corner/opaque/blue/diagonal,
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
+"nZ" = (
+/obj/effect/turf_decal/siding/brown{
+ dir = 10
+ },
+/turf/open/floor/wood/ebony,
+/area/ship/hallway/starboard)
+"os" = (
+/obj/structure/window/reinforced/fulltile,
+/obj/structure/grille,
+/obj/machinery/door/poddoor/shutters{
+ dir = 2;
+ id = "elderatriumshuts"
+ },
+/turf/open/floor/plating,
+/area/ship/medical)
+"ou" = (
+/obj/structure/chair/wood{
+ dir = 1
+ },
+/obj/structure/flora/grass/jungle/b,
+/turf/open/floor/grass/ship/jungle,
+/area/ship/hallway/central)
+"ox" = (
+/obj/structure/guncase,
+/obj/machinery/door/window/eastright{
+ dir = 8
+ },
+/obj/item/gun/ballistic/shotgun/flamingarrow{
+ pixel_y = -5
+ },
+/obj/item/gun/ballistic/shotgun/flamingarrow{
+ pixel_y = 0
+ },
+/obj/item/gun/ballistic/shotgun/flamingarrow/bolt{
+ pixel_y = 5
+ },
+/turf/open/floor/wood/ebony,
+/area/ship/storage)
+"oC" = (
+/obj/structure/window/reinforced/fulltile,
+/obj/structure/grille,
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/poddoor/shutters{
+ dir = 2;
+ id = "elderatriumshuts"
+ },
+/turf/open/floor/plating,
+/area/ship/roumain)
+"oE" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/effect/turf_decal/siding/brown{
+ dir = 4
+ },
+/turf/open/floor/wood/ebony,
+/area/ship/hallway/port)
+"oY" = (
+/obj/machinery/power/shuttle/engine/fueled/plasma{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/ship/engineering/engine)
+"pb" = (
+/obj/structure/railing{
+ dir = 8
+ },
+/obj/structure/chair/comfy/black{
+ dir = 4
+ },
+/turf/open/floor/wood/maple,
+/area/ship/hallway/port)
+"pd" = (
+/obj/structure/table/wood,
+/obj/item/flashlight/lantern{
+ pixel_y = 2;
+ pixel_x = 7
+ },
+/obj/item/flashlight/lantern{
+ pixel_y = 2;
+ pixel_x = 7
+ },
+/obj/item/flashlight/lantern{
+ pixel_y = 2;
+ pixel_x = 7
+ },
+/obj/item/flashlight/lantern{
+ pixel_y = 2;
+ pixel_x = 7
+ },
+/obj/item/flashlight/lantern{
+ pixel_y = 2;
+ pixel_x = 7
+ },
+/obj/item/flashlight/lantern{
+ pixel_y = 2;
+ pixel_x = 7
+ },
+/obj/item/flashlight/lantern{
+ pixel_y = 2;
+ pixel_x = 7
+ },
+/obj/item/radio{
+ pixel_y = 3;
+ pixel_x = -5
+ },
+/obj/item/radio{
+ pixel_y = 3;
+ pixel_x = -5
+ },
+/obj/item/radio{
+ pixel_y = 3;
+ pixel_x = -5
+ },
+/obj/item/radio{
+ pixel_y = 3;
+ pixel_x = -5
+ },
+/obj/item/radio{
+ pixel_y = 3;
+ pixel_x = -5
+ },
+/obj/item/radio{
+ pixel_y = 3;
+ pixel_x = -5
+ },
+/obj/item/radio{
+ pixel_y = 3;
+ pixel_x = -5
+ },
+/turf/open/floor/wood/ebony,
+/area/ship/crew/cryo)
+"pH" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+ dir = 4
+ },
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/turf/open/floor/plating,
+/area/ship/engineering/engine)
+"qv" = (
+/obj/structure/cable{
+ icon_state = "2-9"
+ },
+/obj/structure/cable{
+ icon_state = "9-10"
+ },
+/obj/effect/turf_decal/siding/brown{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+ dir = 1
+ },
+/turf/open/floor/wood/ebony,
+/area/ship/hallway/port)
+"qz" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 5
+ },
+/obj/effect/turf_decal/siding/wood/corner{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 10
+ },
+/turf/open/floor/wood/maple,
+/area/ship/hallway/central)
+"qB" = (
+/obj/item/kirbyplants/random,
+/turf/open/floor/wood/ebony,
+/area/ship/crew/cryo)
+"qD" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 6
+ },
+/obj/structure/destructible/tribal_torch,
+/obj/machinery/atmospherics/components/binary/valve/layer4{
+ dir = 1;
+ name = "Disposals Outlet Valve"
+ },
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/turf/open/floor/plating,
+/area/ship/engineering/atmospherics)
+"qJ" = (
+/obj/structure/destructible/tribal_torch,
+/turf/open/floor/grass/ship/jungle,
+/area/ship/roumain)
+"qN" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/effect/turf_decal/spline/fancy/wood/corner,
+/obj/effect/turf_decal/spline/fancy/wood/corner{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/wood/mahogany,
+/area/ship/bridge)
+"qQ" = (
+/obj/effect/turf_decal/siding/brown{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 10
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 10
+ },
+/obj/structure/sign/warning/vacuum/external{
+ pixel_y = 24
+ },
+/turf/open/floor/wood/ebony,
+/area/ship/hallway/port)
+"qZ" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 9
+ },
+/obj/effect/turf_decal/siding/wood/corner,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 6
+ },
+/turf/open/floor/wood/maple,
+/area/ship/hallway/central)
+"re" = (
+/obj/vehicle/ridden/wheelchair{
+ dir = 4
+ },
+/obj/item/melee/transforming/cleaving_saw/old,
+/turf/open/floor/ship/dirt/dark,
+/area/ship/bridge)
+"rj" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 9
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 8
+ },
+/obj/machinery/door/firedoor/border_only{
+ dir = 8
+ },
+/obj/machinery/door/airlock/maintenance{
+ name = "Equipment";
+ dir = 4
+ },
+/turf/open/floor/wood/maple,
+/area/ship/storage)
+"rv" = (
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/obj/effect/turf_decal/siding/wood{
+ dir = 6
+ },
+/obj/effect/turf_decal/siding/wood/corner{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 9
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 9
+ },
+/turf/open/floor/wood/maple,
+/area/ship/hallway/central)
+"rD" = (
+/obj/structure/window/reinforced/tinted/frosted,
+/obj/structure/toilet{
+ dir = 8;
+ pixel_y = 9;
+ pixel_x = 7
+ },
+/obj/effect/turf_decal/stoneborder,
+/obj/effect/turf_decal/stoneborder{
+ dir = 1
+ },
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/hallway/starboard)
+"rE" = (
+/obj/machinery/atmospherics/components/unary/shuttle/heater{
+ dir = 4
+ },
+/obj/machinery/door/poddoor/shutters{
+ dir = 8;
+ id = "elderengineshuts"
+ },
+/turf/open/floor/plating,
+/area/ship/engineering/engine)
+"rK" = (
+/obj/machinery/atmospherics/components/binary/pump{
+ dir = 8
+ },
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/turf/open/floor/plating,
+/area/ship/engineering/atmospherics)
+"rW" = (
+/obj/machinery/smartfridge/drying_rack,
+/turf/open/floor/ship/dirt/dark,
+/area/ship/roumain)
+"sb" = (
+/obj/effect/turf_decal/siding/brown{
+ dir = 10
+ },
+/turf/open/floor/wood/maple,
+/area/ship/hallway/starboard)
+"sc" = (
+/obj/structure/railing{
+ dir = 4
+ },
+/obj/structure/rack,
+/obj/item/stack/marker_beacon/thirty{
+ pixel_x = -6;
+ pixel_y = -3
+ },
+/obj/item/stack/marker_beacon/thirty{
+ pixel_x = -6;
+ pixel_y = 1
+ },
+/obj/item/stack/marker_beacon/thirty{
+ pixel_x = -6;
+ pixel_y = 5
+ },
+/obj/item/stack/marker_beacon/thirty{
+ pixel_x = -6;
+ pixel_y = 9
+ },
+/obj/item/mining_scanner{
+ pixel_x = 5;
+ pixel_y = -4
+ },
+/obj/item/mining_scanner{
+ pixel_x = 5;
+ pixel_y = 1
+ },
+/obj/item/mining_scanner{
+ pixel_x = 5;
+ pixel_y = 6
+ },
+/turf/open/floor/wood/ebony,
+/area/ship/hallway/starboard)
+"sm" = (
+/obj/docking_port/stationary{
+ width = 30;
+ height = 15;
+ dwidth = 15
+ },
+/turf/template_noop,
+/area/template_noop)
+"sr" = (
+/obj/structure/table/wood,
+/obj/item/paper_bin/bundlenatural{
+ pixel_y = 4
+ },
+/obj/item/pen/charcoal,
+/obj/effect/turf_decal/spline/fancy/wood{
+ dir = 10
+ },
+/obj/machinery/airalarm/directional/west,
+/turf/open/floor/wood/mahogany,
+/area/ship/bridge)
+"ss" = (
+/obj/structure/railing,
+/turf/open/floor/grass/ship/jungle,
+/area/ship/roumain)
+"sA" = (
+/obj/machinery/portable_atmospherics/scrubber,
+/turf/open/floor/plasteel/dark,
+/area/ship/engineering/atmospherics)
+"sD" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/structure/cable{
+ icon_state = "1-6"
+ },
+/obj/effect/turf_decal/siding/brown/corner{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+ dir = 8
+ },
+/turf/open/floor/wood/ebony,
+/area/ship/hallway/starboard)
+"sH" = (
+/turf/template_noop,
+/area/template_noop)
+"sT" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/wood/corner{
+ dir = 8
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
+/turf/open/floor/wood/maple,
+/area/ship/storage)
+"ts" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/blue,
+/obj/effect/turf_decal/siding/blue/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/blue/corner{
+ dir = 1
+ },
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
+"tC" = (
+/obj/effect/turf_decal/siding/brown{
+ dir = 5
+ },
+/obj/structure/destructible/tribal_torch{
+ pixel_y = 13;
+ pixel_x = 1
+ },
+/turf/open/floor/wood/ebony,
+/area/ship/hallway/starboard)
+"tF" = (
+/obj/structure/table/optable,
+/obj/effect/turf_decal/corner/opaque/blue/diagonal,
+/obj/item/toy/plush/mora,
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
+"uc" = (
+/obj/effect/turf_decal/spline/fancy/wood/corner{
+ dir = 4
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+ dir = 8
+ },
+/turf/open/floor/wood/mahogany,
+/area/ship/bridge)
+"up" = (
+/obj/structure/table/wood,
+/obj/item/reagent_containers/glass/bowl/mushroom_bowl{
+ pixel_x = -4;
+ pixel_y = 8
+ },
+/obj/item/reagent_containers/glass/mortar{
+ pixel_y = 9;
+ pixel_x = 6
+ },
+/obj/item/reagent_containers/food/snacks/grown/ash_flora/cactus_fruit,
+/obj/item/pestle{
+ pixel_y = 6
+ },
+/obj/item/reagent_containers/food/snacks/grown/ash_flora/mushroom_leaf,
+/obj/item/reagent_containers/food/snacks/meat/slab/bear{
+ pixel_y = 1;
+ pixel_x = -7
+ },
+/obj/item/reagent_containers/food/snacks/grown/ash_flora/puce,
+/obj/effect/turf_decal/corner/opaque/blue/diagonal,
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
+"ut" = (
+/obj/machinery/atmospherics/components/unary/tank/air{
+ dir = 1;
+ piping_layer = 2
+ },
+/obj/effect/turf_decal/trimline/opaque/orange/line{
+ dir = 8
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/engineering/atmospherics)
+"uM" = (
+/obj/structure/table/wood,
+/obj/effect/turf_decal/spline/fancy/wood{
+ dir = 4
+ },
+/obj/item/reagent_containers/food/drinks/bottle/whiskey{
+ pixel_y = 16;
+ pixel_x = 5
+ },
+/obj/item/clothing/mask/cigarette/cigar/havana{
+ pixel_x = 7;
+ pixel_y = -1
+ },
+/obj/item/storage/box/matches{
+ pixel_y = 8;
+ pixel_x = -9
+ },
+/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+ pixel_y = 16;
+ pixel_x = -6
+ },
+/turf/open/floor/wood/mahogany,
+/area/ship/bridge)
+"uP" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+ dir = 4
+ },
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/turf/open/floor/plating,
+/area/ship/engineering/atmospherics)
+"uV" = (
+/obj/structure/flora/grass/jungle/b,
+/turf/open/floor/grass/ship/jungle,
+/area/ship/roumain)
+"uW" = (
+/turf/open/floor/grass/ship/jungle,
+/area/ship/roumain)
+"uY" = (
+/obj/structure/ore_box,
+/turf/open/floor/wood/ebony,
+/area/ship/hallway/starboard)
+"va" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/wood/corner,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
+/turf/open/floor/wood/maple,
+/area/ship/storage)
+"vd" = (
+/obj/structure/railing/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/brown{
+ dir = 1
+ },
+/turf/open/floor/wood/maple,
+/area/ship/hallway/starboard)
+"vm" = (
+/obj/structure/window/reinforced/fulltile,
+/obj/structure/grille,
+/obj/machinery/door/poddoor/shutters{
+ dir = 2;
+ id = "elderatriumshuts"
+ },
+/turf/open/floor/plating,
+/area/ship/storage)
+"vn" = (
+/obj/structure/destructible/tribal_torch{
+ pixel_x = -8
+ },
+/obj/effect/turf_decal/trimline/opaque/syndiered/arrow_cw{
+ dir = 4
+ },
+/obj/effect/turf_decal/industrial/warning,
+/turf/open/floor/wood/maple,
+/area/ship/hallway/starboard)
+"vz" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/wood/corner,
+/obj/effect/turf_decal/siding/wood/corner{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+ dir = 8
+ },
+/turf/open/floor/wood/maple,
+/area/ship/hallway/central)
+"vC" = (
+/turf/closed/wall/r_wall,
+/area/ship/hallway/port)
+"vG" = (
+/obj/machinery/atmospherics/components/binary/pump/layer2{
+ dir = 1;
+ name = "Air Supply Pump"
+ },
+/obj/effect/turf_decal/trimline/opaque/orange/line{
+ dir = 9
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/engineering/atmospherics)
+"vH" = (
+/obj/structure/sink{
+ dir = 4;
+ pixel_y = 8;
+ pixel_x = -14
+ },
+/obj/effect/turf_decal/spline/fancy/wood/corner,
+/obj/effect/turf_decal/spline/fancy/wood{
+ dir = 8
+ },
+/obj/effect/turf_decal/spline/fancy/wood/corner{
+ dir = 4
+ },
+/turf/open/floor/wood/mahogany,
+/area/ship/hallway/starboard)
+"vX" = (
+/obj/structure/railing{
+ dir = 4
+ },
+/obj/structure/chair/comfy/black{
+ dir = 8
+ },
+/turf/open/floor/wood/maple,
+/area/ship/hallway/port)
+"wm" = (
+/turf/closed/wall/r_wall,
+/area/ship/engineering/engine)
+"wp" = (
+/turf/closed/wall/r_wall,
+/area/ship/roumain)
+"wy" = (
+/obj/structure/flora/grass/jungle/b,
+/obj/structure/flora/junglebush/c,
+/turf/open/floor/grass/ship/jungle,
+/area/ship/hallway/central)
+"wA" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 10
+ },
+/obj/effect/turf_decal/siding/wood/corner{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 5
+ },
+/turf/open/floor/wood/maple,
+/area/ship/hallway/central)
+"wC" = (
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/obj/effect/turf_decal/siding/wood{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/wood{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/wood/maple,
+/area/ship/hallway/central)
+"wD" = (
+/obj/structure/destructible/tribal_torch,
+/turf/open/floor/grass/ship/jungle,
+/area/ship/bridge)
+"wE" = (
+/obj/structure/closet/firecloset/wall{
+ dir = 4;
+ pixel_x = -28
+ },
+/turf/open/floor/grass/ship/jungle,
+/area/ship/roumain)
+"xe" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/effect/turf_decal/trimline/opaque/red/arrow_cw{
+ dir = 8
+ },
+/obj/effect/turf_decal/industrial/warning,
+/turf/open/floor/plasteel/dark,
+/area/ship/hallway/port)
+"xv" = (
+/obj/effect/turf_decal/siding/brown{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 8
+ },
+/turf/open/floor/wood/ebony,
+/area/ship/hallway/port)
+"xC" = (
+/turf/open/floor/ship/dirt/dark,
+/area/ship/bridge)
+"xD" = (
+/mob/living/simple_animal/cow,
+/turf/open/floor/ship/dirt/dark,
+/area/ship/roumain)
+"xN" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/effect/turf_decal/siding/wood,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/turf/open/floor/wood/maple,
+/area/ship/crew/cryo)
+"yn" = (
+/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer3{
+ dir = 8
+ },
+/obj/machinery/portable_atmospherics/canister/toxins,
+/obj/effect/turf_decal/trimline/opaque/orange/filled/line{
+ dir = 8
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/engineering/atmospherics)
+"yp" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/effect/turf_decal/siding/brown/corner{
+ dir = 8
+ },
+/turf/open/floor/wood/ebony,
+/area/ship/hallway/starboard)
+"yq" = (
+/obj/structure/railing{
+ dir = 1
+ },
+/obj/structure/closet/crate/miningcar,
+/obj/item/storage/box/emptysandbags,
+/obj/item/storage/box/emptysandbags,
+/obj/item/storage/box/emptysandbags,
+/obj/item/storage/box/emptysandbags,
+/turf/open/floor/wood/ebony,
+/area/ship/hallway/starboard)
+"yz" = (
+/turf/closed/wall/r_wall,
+/area/ship/crew/cryo)
+"yA" = (
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/obj/effect/turf_decal/siding/brown{
+ dir = 9
+ },
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/structure/destructible/tribal_torch{
+ pixel_y = 13;
+ pixel_x = -4
+ },
+/turf/open/floor/wood/ebony,
+/area/ship/hallway/starboard)
+"yN" = (
+/obj/machinery/airalarm/directional/west,
+/turf/open/floor/ship/dirt/dark,
+/area/ship/roumain)
+"yV" = (
+/obj/structure/railing/corner{
+ dir = 8
+ },
+/obj/structure/flora/grass/jungle/b,
+/turf/open/floor/grass/ship/jungle,
+/area/ship/roumain)
+"yZ" = (
+/obj/structure/flora/grass/jungle/b,
+/obj/structure/flora/junglebush/b,
+/turf/open/floor/grass/ship/jungle,
+/area/ship/hallway/central)
+"zc" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/wood{
+ dir = 4
+ },
+/obj/machinery/airalarm/directional/east,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/turf/open/floor/wood/maple,
+/area/ship/hallway/central)
+"zv" = (
+/obj/structure/closet/secure_closet/montagnes,
+/obj/item/clothing/shoes/combat,
+/obj/item/clothing/shoes/cowboy,
+/obj/item/clothing/shoes/cowboy/black,
+/obj/item/clothing/under/suit/roumain,
+/obj/item/clothing/suit/armor/hos/roumain/montagne,
+/obj/item/clothing/head/HoS/cowboy/montagne,
+/obj/item/flashlight/lantern,
+/obj/item/storage/fancy/candle_box{
+ pixel_y = 3;
+ pixel_x = 8
+ },
+/obj/item/lighter{
+ pixel_x = -2;
+ pixel_y = 2
+ },
+/obj/item/kitchen/knife/combat,
+/obj/effect/turf_decal/spline/fancy/wood{
+ dir = 5
+ },
+/obj/item/gps{
+ pixel_x = -7
+ },
+/obj/item/gun/ballistic/revolver/montagne,
+/obj/item/ammo_box/c38/match,
+/obj/item/ammo_box/c38/match,
+/obj/item/storage/backpack/satchel/leather,
+/turf/open/floor/wood/mahogany,
+/area/ship/bridge)
+"zH" = (
+/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer3{
+ dir = 8
+ },
+/obj/machinery/portable_atmospherics/canister/toxins,
+/obj/effect/turf_decal/trimline/opaque/orange/filled/line{
+ dir = 8
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/engineering/engine)
+"zT" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 10
+ },
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/turf/open/floor/plating,
+/area/ship/engineering/engine)
+"zX" = (
+/obj/structure/table/wood,
+/obj/machinery/fax,
+/obj/effect/turf_decal/spline/fancy/wood{
+ dir = 8
+ },
+/turf/open/floor/wood/mahogany,
+/area/ship/bridge)
+"zY" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 4
+ },
+/obj/structure/destructible/tribal_torch,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/wood/maple,
+/area/ship/storage)
+"zZ" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
+/turf/open/floor/wood/ebony,
+/area/ship/hallway/port)
+"Ac" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/effect/turf_decal/siding/brown/corner{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/wood/ebony,
+/area/ship/hallway/starboard)
+"Ao" = (
+/obj/item/toy/plush/snakeplushie,
+/obj/structure/flora/grass/jungle/b,
+/turf/open/floor/grass/ship/jungle,
+/area/ship/bridge)
+"Aq" = (
+/obj/machinery/hydroponics/soil,
+/turf/open/floor/grass/ship/jungle,
+/area/ship/roumain)
+"Ar" = (
+/obj/structure/window/reinforced/fulltile,
+/obj/structure/grille,
+/obj/machinery/door/poddoor/shutters{
+ dir = 8;
+ id = "elderbridgeforeshuts"
+ },
+/turf/open/floor/plating,
+/area/ship/bridge)
+"At" = (
+/obj/structure/table/wood,
+/obj/item/reagent_containers/food/drinks/breakawayflask/vintage/ashwine{
+ pixel_y = 13;
+ pixel_x = -6
+ },
+/obj/item/reagent_containers/food/drinks/breakawayflask/vintage/icewine{
+ pixel_y = 7;
+ pixel_x = 6
+ },
+/turf/open/floor/grass/ship/jungle,
+/area/ship/roumain)
+"AL" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/effect/turf_decal/siding/brown,
+/turf/open/floor/wood/ebony,
+/area/ship/hallway/starboard)
+"AM" = (
+/obj/structure/chair/pew{
+ dir = 8
+ },
+/obj/structure/flora/grass/jungle/b,
+/turf/open/floor/grass/ship/jungle,
+/area/ship/hallway/central)
+"AN" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 5
+ },
+/turf/open/floor/wood/maple,
+/area/ship/storage)
+"AQ" = (
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/obj/machinery/power/terminal{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/obj/structure/sign/warning/nosmoking{
+ pixel_y = 28
+ },
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/turf/open/floor/plating,
+/area/ship/engineering/engine)
+"AS" = (
+/obj/structure/table/wood,
+/obj/item/reagent_containers/food/drinks/mug/tea{
+ pixel_y = 3;
+ pixel_x = -4
+ },
+/turf/open/floor/wood/maple,
+/area/ship/hallway/starboard)
+"AX" = (
+/obj/structure/flora/rock/jungle,
+/turf/open/floor/grass/ship/jungle,
+/area/ship/bridge)
+"AY" = (
+/obj/structure/chair/comfy/black{
+ dir = 4
+ },
+/obj/structure/railing{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/wood/maple,
+/area/ship/hallway/port)
+"AZ" = (
+/obj/effect/turf_decal/siding/brown{
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 8
+ },
+/turf/open/floor/wood/ebony,
+/area/ship/hallway/port)
+"Bi" = (
+/obj/structure/rack,
+/obj/machinery/door/window{
+ dir = 8
+ },
+/obj/item/gun/ballistic/rifle/illestren{
+ pixel_x = -4;
+ pixel_y = -5
+ },
+/obj/item/gun/ballistic/rifle/illestren{
+ pixel_x = -4;
+ pixel_y = -1
+ },
+/obj/item/gun/ballistic/rifle/illestren{
+ pixel_x = -4;
+ pixel_y = 3
+ },
+/turf/open/floor/wood/ebony,
+/area/ship/storage)
+"Bq" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/effect/turf_decal/siding/blue{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/blue/corner{
+ dir = 8
+ },
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
+"Bt" = (
+/obj/effect/turf_decal/siding/brown{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/brown/corner{
+ dir = 4
+ },
+/turf/open/floor/wood/maple,
+/area/ship/hallway/starboard)
+"Bu" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/mob/living/simple_animal/pet/mothroach{
+ name = "Rom";
+ desc = "You've never seen a more vacuous mothroach."
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/wood/mahogany,
+/area/ship/bridge)
+"Bx" = (
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/obj/effect/turf_decal/siding/wood{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/wood/corner,
+/obj/effect/turf_decal/siding/wood/corner{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/turf/open/floor/wood/maple,
+/area/ship/hallway/central)
+"BA" = (
+/turf/closed/wall/r_wall,
+/area/ship/hallway/starboard)
+"BB" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 6
+ },
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/turf/open/floor/plating,
+/area/ship/engineering/atmospherics)
+"BJ" = (
+/obj/structure/crate_shelf,
+/obj/structure/closet/crate,
+/obj/item/reagent_containers/food/snacks/meat/steak{
+ pixel_y = 7;
+ pixel_x = -3
+ },
+/obj/item/reagent_containers/food/snacks/meat/steak/chicken,
+/obj/item/reagent_containers/food/snacks/meat/steak/chicken{
+ pixel_y = 6;
+ pixel_x = 4
+ },
+/obj/item/reagent_containers/food/snacks/meat/steak{
+ pixel_y = 0;
+ pixel_x = -9
+ },
+/obj/item/reagent_containers/food/snacks/meat/steak{
+ pixel_y = -6;
+ pixel_x = 5
+ },
+/obj/item/reagent_containers/food/snacks/meat/steak/chicken{
+ pixel_y = -4;
+ pixel_x = -6
+ },
+/obj/item/reagent_containers/food/snacks/meat/steak/chicken{
+ pixel_y = 5;
+ pixel_x = -6
+ },
+/turf/open/floor/wood/ebony,
+/area/ship/storage)
+"BK" = (
+/obj/structure/window/reinforced/fulltile,
+/obj/structure/grille,
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/poddoor/shutters{
+ id = "elderrearshuts"
+ },
+/turf/open/floor/plating,
+/area/ship/bridge)
+"BO" = (
+/obj/machinery/portable_atmospherics/canister/air,
+/turf/open/floor/plasteel/dark,
+/area/ship/engineering/atmospherics)
+"Cr" = (
+/obj/structure/closet/emcloset/wall{
+ dir = 4;
+ pixel_x = -28
+ },
+/turf/open/floor/grass/ship/jungle,
+/area/ship/roumain)
+"Cx" = (
+/obj/structure/table/wood,
+/obj/item/lighter{
+ pixel_y = 5;
+ pixel_x = -6
+ },
+/obj/item/book/manual/srmlore{
+ pixel_x = 5;
+ pixel_y = 3
+ },
+/obj/item/book/manual/srmlore{
+ pixel_x = 5;
+ pixel_y = 3
+ },
+/obj/item/book/manual/srmlore{
+ pixel_x = 5;
+ pixel_y = 3
+ },
+/obj/item/book/manual/srmlore{
+ pixel_x = 5;
+ pixel_y = 3
+ },
+/obj/item/book/manual/srmlore{
+ pixel_x = 5;
+ pixel_y = 3
+ },
+/obj/item/book/manual/srmlore{
+ pixel_x = 5;
+ pixel_y = 3
+ },
+/obj/item/book/manual/srmlore{
+ pixel_x = 5;
+ pixel_y = 3
+ },
+/obj/item/lighter{
+ pixel_y = 5;
+ pixel_x = -6
+ },
+/obj/item/lighter{
+ pixel_y = 5;
+ pixel_x = -6
+ },
+/obj/item/lighter{
+ pixel_y = 5;
+ pixel_x = -6
+ },
+/obj/item/lighter{
+ pixel_y = 5;
+ pixel_x = -6
+ },
+/obj/item/lighter{
+ pixel_y = 5;
+ pixel_x = -6
+ },
+/turf/open/floor/wood/ebony,
+/area/ship/crew/cryo)
+"CC" = (
+/obj/structure/window/reinforced/fulltile,
+/obj/structure/grille,
+/obj/machinery/door/firedoor/border_only{
+ dir = 1
+ },
+/obj/machinery/door/poddoor/shutters{
+ id = "elderemergencyairlockshuts"
+ },
+/turf/open/floor/plating,
+/area/ship/hallway/port)
+"CF" = (
+/obj/structure/closet/emcloset/wall{
+ pixel_y = 28
+ },
+/obj/effect/turf_decal/siding/brown{
+ dir = 1
+ },
+/turf/open/floor/wood/ebony,
+/area/ship/hallway/port)
+"CH" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/door/firedoor/border_only{
+ dir = 4
+ },
+/obj/machinery/door/airlock/grunge{
+ dir = 4;
+ name = "Engine Room"
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/engineering/atmospherics)
+"Dg" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/effect/turf_decal/siding/brown,
+/obj/structure/destructible/tribal_torch,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/wood/ebony,
+/area/ship/hallway/port)
+"Dz" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/effect/turf_decal/siding/brown,
+/turf/open/floor/wood/ebony,
+/area/ship/hallway/port)
+"DL" = (
+/obj/structure/destructible/tribal_torch{
+ pixel_y = 18
+ },
+/turf/open/floor/grass/ship/jungle,
+/area/ship/hallway/central)
+"DR" = (
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/obj/effect/turf_decal/siding/wood{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/wood{
+ dir = 8
+ },
+/turf/open/floor/wood/maple,
+/area/ship/roumain)
+"DS" = (
+/obj/machinery/power/apc/auto_name/directional/east,
+/obj/structure/cable,
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/turf/open/floor/plating,
+/area/ship/engineering/engine)
+"DV" = (
+/obj/structure/flora/driftlog,
+/turf/open/floor/plating/ship/water,
+/area/ship/roumain)
+"Eh" = (
+/obj/structure/table/wood,
+/obj/item/spear/bonespear{
+ pixel_y = -3;
+ pixel_x = 2
+ },
+/obj/item/spear/bonespear{
+ pixel_y = 1;
+ pixel_x = 2
+ },
+/obj/item/spear/bonespear{
+ pixel_y = 5;
+ pixel_x = 2
+ },
+/turf/open/floor/grass/ship/jungle,
+/area/ship/hallway/central)
+"Eq" = (
+/obj/effect/turf_decal/siding/brown/corner,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 9
+ },
+/turf/open/floor/wood/ebony,
+/area/ship/hallway/port)
+"Et" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/turf/open/floor/plating,
+/area/ship/engineering/engine)
+"EJ" = (
+/obj/structure/table/wood,
+/obj/item/book/manual/trickwines_4_brewers,
+/turf/open/floor/grass/ship/jungle,
+/area/ship/roumain)
+"EN" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 5
+ },
+/turf/open/floor/wood/ebony,
+/area/ship/hallway/starboard)
+"Fa" = (
+/obj/structure/railing/corner,
+/obj/structure/flora/grass/jungle,
+/turf/open/floor/ship/dirt/dark,
+/area/ship/roumain)
+"Fn" = (
+/obj/machinery/atmospherics/components/binary/pump{
+ dir = 8
+ },
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/turf/open/floor/plating,
+/area/ship/engineering/engine)
+"Fp" = (
+/obj/effect/turf_decal/siding/brown{
+ dir = 1
+ },
+/obj/machinery/airalarm/directional/north,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 8
+ },
+/turf/open/floor/wood/ebony,
+/area/ship/hallway/port)
+"Fr" = (
+/obj/structure/crate_shelf,
+/obj/structure/closet/crate{
+ name = "Fishing Crate"
+ },
+/obj/item/storage/toolbox/fishing{
+ pixel_x = -3;
+ pixel_y = -6
+ },
+/obj/item/storage/toolbox/fishing{
+ pixel_x = 3;
+ pixel_y = -6
+ },
+/obj/item/storage/toolbox/fishing{
+ pixel_y = 0
+ },
+/turf/open/floor/wood/ebony,
+/area/ship/storage)
+"Fu" = (
+/obj/effect/turf_decal/trimline/opaque/orange/line,
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/engineering/engine)
+"FF" = (
+/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer2{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/opaque/red/arrow_cw{
+ dir = 8
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/hallway/port)
+"FG" = (
+/obj/machinery/power/terminal{
+ dir = 8
+ },
+/obj/structure/cable{
+ icon_state = "0-5"
+ },
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/turf/open/floor/plating,
+/area/ship/engineering/atmospherics)
+"FW" = (
+/obj/machinery/power/terminal{
+ dir = 8
+ },
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/turf/open/floor/plating,
+/area/ship/engineering/engine)
+"Ga" = (
+/obj/machinery/atmospherics/components/unary/outlet_injector/on/layer4{
+ dir = 8
+ },
+/turf/open/floor/engine/hull,
+/area/ship/external/dark)
+"GM" = (
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/obj/effect/turf_decal/siding/wood{
+ dir = 6
+ },
+/obj/effect/turf_decal/siding/wood/corner{
+ dir = 1
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+ dir = 8
+ },
+/turf/open/floor/wood/maple,
+/area/ship/roumain)
+"GP" = (
+/obj/item/kirbyplants/random,
+/obj/effect/turf_decal/siding/brown{
+ dir = 6
+ },
+/turf/open/floor/wood/ebony,
+/area/ship/hallway/starboard)
+"Hw" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 5
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
+/turf/open/floor/wood/maple,
+/area/ship/crew/cryo)
+"Hx" = (
+/obj/structure/destructible/tribal_torch{
+ pixel_y = 6;
+ pixel_x = 10
+ },
+/turf/open/floor/wood/ebony,
+/area/ship/hallway/starboard)
+"HA" = (
+/obj/item/clothing/under/suit/roumain,
+/obj/item/clothing/suit/armor/roumain,
+/obj/item/clothing/head/cowboy/sec/roumain,
+/obj/item/clothing/suit/armor/riot/chaplain/witchhunter,
+/obj/item/flashlight/lantern,
+/obj/structure/closet/secure_closet/hunter,
+/obj/item/lighter,
+/obj/item/clothing/shoes/cowboy/black,
+/obj/item/clothing/shoes/cowboy,
+/obj/item/clothing/shoes/combat,
+/obj/item/kitchen/knife/combat/survival,
+/obj/item/gps{
+ pixel_x = -7
+ },
+/obj/item/storage/backpack/satchel/leather,
+/turf/open/floor/wood/ebony,
+/area/ship/storage)
+"HB" = (
+/obj/structure/closet/wall/blue{
+ dir = 8;
+ pixel_x = 28;
+ name = "Spare EVA Closet"
+ },
+/obj/item/clothing/suit/space/eva{
+ pixel_x = -8
+ },
+/obj/item/clothing/head/helmet/space/eva{
+ pixel_y = 8;
+ pixel_x = 8
+ },
+/obj/item/clothing/mask/breath{
+ pixel_y = 9;
+ pixel_x = -6
+ },
+/obj/item/tank/internals/emergency_oxygen{
+ pixel_x = 7;
+ pixel_y = -7
+ },
+/obj/effect/turf_decal/trimline/opaque/syndiered/arrow_ccw{
+ dir = 8
+ },
+/turf/open/floor/wood/maple,
+/area/ship/hallway/starboard)
+"HO" = (
+/obj/structure/chair/wood/wings,
+/obj/effect/turf_decal/spline/fancy/wood{
+ dir = 5
+ },
+/turf/open/floor/wood/mahogany,
+/area/ship/bridge)
+"Ii" = (
+/obj/structure/closet/firecloset/wall{
+ dir = 8;
+ pixel_x = 28
+ },
+/obj/effect/turf_decal/spline/fancy/wood{
+ dir = 4
+ },
+/turf/open/floor/wood/mahogany,
+/area/ship/bridge)
+"Il" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/wood{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/turf/open/floor/wood/maple,
+/area/ship/hallway/central)
+"Im" = (
+/obj/structure/destructible/tribal_torch{
+ pixel_x = -10
+ },
+/obj/effect/turf_decal/spline/fancy/wood/cee,
+/turf/open/floor/wood/mahogany,
+/area/ship/hallway/starboard)
+"In" = (
+/obj/effect/turf_decal/siding/brown{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+ dir = 1
+ },
+/turf/open/floor/wood/ebony,
+/area/ship/hallway/starboard)
+"Ir" = (
+/obj/effect/turf_decal/siding/wood,
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/door/firedoor/border_only{
+ dir = 4
+ },
+/obj/machinery/door/airlock/glass{
+ dir = 4;
+ name = "Atrium"
+ },
+/turf/open/floor/wood/maple,
+/area/ship/roumain)
+"ID" = (
+/obj/machinery/power/apc/auto_name/directional/east,
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/turf/open/floor/plating,
+/area/ship/engineering/atmospherics)
+"IF" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/wood,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/turf/open/floor/wood/maple,
+/area/ship/storage)
+"IM" = (
+/obj/item/candle/infinite{
+ pixel_y = 11;
+ pixel_x = 9
+ },
+/obj/item/candle/infinite{
+ pixel_y = 11;
+ pixel_x = -8
+ },
+/obj/item/candle/infinite{
+ pixel_y = 11;
+ pixel_x = -3
+ },
+/obj/item/candle/infinite{
+ pixel_y = 11;
+ pixel_x = 3
+ },
+/obj/item/candle/infinite{
+ pixel_y = 2;
+ pixel_x = -8
+ },
+/obj/item/candle/infinite{
+ pixel_y = -6;
+ pixel_x = -8
+ },
+/obj/item/disk/holodisk/roumain{
+ pixel_x = 2;
+ pixel_y = -3
+ },
+/obj/effect/turf_decal/spline/fancy/wood{
+ dir = 9
+ },
+/obj/structure/table/wood/fancy,
+/turf/open/floor/wood/mahogany,
+/area/ship/bridge)
+"IZ" = (
+/obj/structure/window/reinforced/fulltile,
+/obj/structure/grille,
+/obj/machinery/door/firedoor/border_only{
+ dir = 8
+ },
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/poddoor/shutters{
+ id = "elderrearshuts";
+ dir = 8
+ },
+/turf/open/floor/plating,
+/area/ship/bridge)
+"Jc" = (
+/obj/effect/turf_decal/siding/brown{
+ dir = 8
+ },
+/obj/machinery/airalarm/directional/west,
+/turf/open/floor/wood/ebony,
+/area/ship/hallway/starboard)
+"Jn" = (
+/obj/structure/railing{
+ dir = 8
+ },
+/turf/open/floor/grass/ship/jungle,
+/area/ship/roumain)
+"Jr" = (
+/obj/structure/cable{
+ icon_state = "4-9"
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/brown,
+/turf/open/floor/wood/ebony,
+/area/ship/hallway/starboard)
+"Ju" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/effect/turf_decal/trimline/opaque/syndiered/end{
+ dir = 1
+ },
+/turf/open/floor/wood/maple,
+/area/ship/hallway/starboard)
+"Jx" = (
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/obj/effect/turf_decal/siding/brown,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 9
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 9
+ },
+/turf/open/floor/wood/ebony,
+/area/ship/hallway/starboard)
+"Jy" = (
+/obj/effect/turf_decal/siding/brown{
+ dir = 10
+ },
+/turf/open/floor/wood/ebony,
+/area/ship/hallway/port)
+"JD" = (
+/obj/structure/cable{
+ icon_state = "0-5"
+ },
+/obj/effect/turf_decal/siding/brown{
+ dir = 10
+ },
+/obj/machinery/power/apc/auto_name/directional/west,
+/turf/open/floor/wood/ebony,
+/area/ship/hallway/port)
+"JG" = (
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/obj/effect/turf_decal/siding/wood/corner,
+/obj/effect/turf_decal/siding/wood/corner{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 10
+ },
+/turf/open/floor/wood/maple,
+/area/ship/crew/cryo)
+"JO" = (
+/obj/structure/flora/junglebush,
+/turf/open/floor/plating/ship/water,
+/area/ship/roumain)
+"Kd" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/effect/turf_decal/siding/wood{
+ dir = 10
+ },
+/obj/machinery/door/firedoor/border_only{
+ dir = 8
+ },
+/obj/machinery/door/airlock/maintenance{
+ name = "Equipment";
+ dir = 4
+ },
+/turf/open/floor/wood/maple,
+/area/ship/storage)
+"Kk" = (
+/obj/structure/table/wood,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 8
+ },
+/turf/open/floor/wood/maple,
+/area/ship/hallway/port)
+"KO" = (
+/obj/structure/flora/grass/jungle/b,
+/turf/open/floor/ship/dirt/dark,
+/area/ship/roumain)
+"KP" = (
+/obj/item/flashlight/lamp/green{
+ pixel_y = 12;
+ pixel_x = 4
+ },
+/obj/structure/table/wood,
+/turf/open/floor/wood/ebony,
+/area/ship/crew/cryo)
+"KQ" = (
+/obj/structure/rack,
+/obj/item/storage/toolbox/electrical{
+ pixel_y = 6;
+ pixel_x = 2
+ },
+/obj/item/storage/toolbox/mechanical{
+ pixel_x = -2
+ },
+/obj/item/weldingtool{
+ pixel_y = 0;
+ pixel_x = -5
+ },
+/turf/open/floor/wood/ebony,
+/area/ship/storage)
+"KX" = (
+/obj/machinery/power/port_gen/pacman,
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/obj/item/stack/sheet/mineral/plasma/twenty,
+/obj/effect/turf_decal/trimline/opaque/orange/filled,
+/turf/open/floor/plating,
+/area/ship/engineering/engine)
+"Lj" = (
+/obj/effect/turf_decal/trimline/opaque/orange/filled/line{
+ dir = 8
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/engineering/atmospherics)
+"Lk" = (
+/mob/living/simple_animal/chicken,
+/obj/structure/flora/grass/jungle,
+/turf/open/floor/grass/ship/jungle,
+/area/ship/roumain)
+"LG" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/obj/effect/turf_decal/siding/brown,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/wood/ebony,
+/area/ship/hallway/port)
+"LL" = (
+/obj/structure/cable{
+ icon_state = "5-8"
+ },
+/obj/structure/cable{
+ icon_state = "2-5"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 10
+ },
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/turf/open/floor/plating,
+/area/ship/engineering/engine)
+"LN" = (
+/turf/closed/wall/r_wall,
+/area/ship/storage)
+"LS" = (
+/obj/machinery/advanced_airlock_controller{
+ pixel_x = -25;
+ pixel_y = 3
+ },
+/obj/machinery/atmospherics/pipe/layer_manifold,
+/obj/effect/turf_decal/trimline/opaque/red/arrow_cw{
+ dir = 4
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/hallway/port)
+"LX" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 6
+ },
+/obj/effect/turf_decal/siding/wood/corner{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 9
+ },
+/turf/open/floor/wood/maple,
+/area/ship/storage)
+"Ma" = (
+/obj/structure/railing/corner{
+ dir = 1
+ },
+/turf/open/floor/grass/ship/jungle,
+/area/ship/roumain)
+"Mh" = (
+/obj/effect/turf_decal/corner/opaque/blue/diagonal,
+/obj/machinery/door/firedoor/border_only{
+ dir = 1
+ },
+/obj/machinery/door/airlock/medical/glass{
+ name = "Medical Bay";
+ dir = 2
+ },
+/obj/effect/turf_decal/siding/blue/end{
+ dir = 1
+ },
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
+"Mj" = (
+/obj/machinery/power/shuttle/engine/electric{
+ dir = 4
+ },
+/obj/structure/cable/pink{
+ icon_state = "0-4"
+ },
+/turf/open/floor/plating,
+/area/ship/engineering/engine)
+"My" = (
+/turf/closed/wall/r_wall,
+/area/ship/hallway/central)
+"Mz" = (
+/obj/structure/loom,
+/turf/open/floor/grass/ship/jungle,
+/area/ship/roumain)
+"MG" = (
+/obj/structure/table/wood,
+/obj/effect/turf_decal/spline/fancy/wood{
+ dir = 4
+ },
+/obj/machinery/button/door{
+ id = "elderatriumshuts";
+ name = "Atrium Shutters";
+ dir = 8;
+ pixel_y = 11;
+ pixel_x = 21
+ },
+/obj/machinery/button/door{
+ id = "elderrearshuts";
+ name = "Bridge Rear Shutters";
+ dir = 8;
+ pixel_y = 2;
+ pixel_x = 21
+ },
+/obj/machinery/button/door{
+ id = "elderbridgeforeshuts";
+ name = "Bridge Fore Shutters";
+ dir = 8;
+ pixel_x = 21;
+ pixel_y = -7
+ },
+/obj/machinery/button/door{
+ id = "elderengineshuts";
+ name = "Engine Shutters";
+ dir = 8;
+ pixel_y = -16;
+ pixel_x = 21
+ },
+/obj/item/binoculars{
+ pixel_y = 0;
+ pixel_x = -4
+ },
+/obj/item/megaphone{
+ pixel_y = 9;
+ pixel_x = 3
+ },
+/turf/open/floor/wood/mahogany,
+/area/ship/bridge)
+"MH" = (
+/obj/machinery/cryopod,
+/turf/open/floor/wood/ebony,
+/area/ship/crew/cryo)
+"MM" = (
+/obj/structure/window/reinforced/fulltile,
+/obj/structure/grille,
+/obj/machinery/door/poddoor/shutters{
+ dir = 4;
+ id = "elderatriumshuts"
+ },
+/turf/open/floor/plating,
+/area/ship/roumain)
+"MR" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 10
+ },
+/obj/machinery/airalarm/directional/west,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 5
+ },
+/turf/open/floor/wood/maple,
+/area/ship/crew/cryo)
+"MU" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/obj/effect/turf_decal/siding/brown{
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/wood/ebony,
+/area/ship/hallway/starboard)
+"MV" = (
+/obj/machinery/atmospherics/components/unary/shuttle/heater{
+ dir = 4
+ },
+/obj/machinery/door/poddoor/shutters{
+ dir = 8;
+ id = "elderengineshuts"
+ },
+/turf/open/floor/plating,
+/area/ship/engineering/atmospherics)
+"MW" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/effect/turf_decal/siding/wood/end,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/airlock/glass{
+ name = "Cryopods"
+ },
+/turf/open/floor/wood/maple,
+/area/ship/crew/cryo)
+"MZ" = (
+/obj/structure/window/reinforced/fulltile,
+/obj/structure/grille,
+/obj/machinery/door/firedoor/border_only{
+ dir = 1
+ },
+/obj/machinery/door/poddoor/shutters{
+ id = "elderrearshuts"
+ },
+/turf/open/floor/plating,
+/area/ship/bridge)
+"Nd" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/effect/turf_decal/siding/wood{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/wood{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/turf/open/floor/wood/maple,
+/area/ship/hallway/central)
+"Ng" = (
+/obj/structure/railing/corner{
+ dir = 4
+ },
+/turf/open/floor/grass/ship/jungle,
+/area/ship/roumain)
+"Nm" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/door/firedoor/border_only{
+ dir = 4
+ },
+/obj/machinery/door/airlock/grunge{
+ dir = 4;
+ name = "Engine Room"
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/engineering/engine)
+"No" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/wood{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/holopad/emergency/command,
+/turf/open/floor/wood/maple,
+/area/ship/hallway/central)
+"Nq" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/wood{
+ dir = 4
+ },
+/turf/open/floor/wood/maple,
+/area/ship/hallway/central)
+"NC" = (
+/obj/structure/flora/grass/jungle/b,
+/turf/open/floor/plating/ship/water,
+/area/ship/roumain)
+"NF" = (
+/obj/structure/chair/wood/wings{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/effect/turf_decal/spline/fancy/wood{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/wood/mahogany,
+/area/ship/bridge)
+"NH" = (
+/obj/effect/turf_decal/siding/brown{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/brown{
+ dir = 4
+ },
+/turf/open/floor/wood/maple,
+/area/ship/hallway/starboard)
+"NL" = (
+/turf/open/floor/ship/dirt/dark,
+/area/ship/roumain)
+"NT" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/effect/turf_decal/trimline/opaque/orange/filled/line{
+ dir = 8
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/engineering/engine)
+"NX" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/obj/effect/turf_decal/spline/fancy/wood/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/spline/fancy/wood/corner{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/wood/mahogany,
+/area/ship/bridge)
+"Od" = (
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/obj/structure/destructible/tribal_torch,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 5
+ },
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/turf/open/floor/plating,
+/area/ship/engineering/engine)
+"Oo" = (
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/obj/machinery/power/apc/auto_name/directional/east,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 10
+ },
+/obj/effect/turf_decal/siding/blue{
+ dir = 5
+ },
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
+"OA" = (
+/obj/structure/fermenting_barrel/distiller,
+/turf/open/floor/grass/ship/jungle,
+/area/ship/roumain)
+"OF" = (
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/obj/effect/turf_decal/spline/fancy/wood{
+ dir = 1
+ },
+/turf/open/floor/wood/mahogany,
+/area/ship/bridge)
+"OO" = (
+/obj/structure/chair/wood{
+ dir = 8
+ },
+/obj/structure/railing{
+ dir = 4
+ },
+/turf/open/floor/wood/maple,
+/area/ship/hallway/starboard)
+"OV" = (
+/obj/machinery/button/shieldwallgen{
+ dir = 8;
+ pixel_x = 20;
+ pixel_y = 2;
+ id = "elderbayholos"
+ },
+/obj/machinery/button/door{
+ id = "elderbayshutters";
+ name = "Bay Shutters";
+ dir = 8;
+ pixel_x = 22;
+ pixel_y = -6
+ },
+/obj/effect/turf_decal/trimline/opaque/syndiered/arrow_ccw{
+ dir = 8
+ },
+/obj/effect/turf_decal/industrial/warning,
+/turf/open/floor/wood/maple,
+/area/ship/hallway/starboard)
+"Ph" = (
+/obj/effect/turf_decal/siding/wood/end,
+/obj/machinery/door/airlock/maintenance{
+ name = "Equipment"
+ },
+/turf/open/floor/wood/maple,
+/area/ship/storage)
+"Px" = (
+/obj/item/kirbyplants/random,
+/obj/effect/turf_decal/siding/brown{
+ dir = 5
+ },
+/turf/open/floor/wood/ebony,
+/area/ship/hallway/starboard)
+"Py" = (
+/obj/machinery/power/shuttle/engine/fueled/plasma{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/ship/engineering/atmospherics)
+"PE" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+ dir = 1
+ },
+/turf/open/floor/wood/ebony,
+/area/ship/hallway/starboard)
+"PI" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/effect/turf_decal/siding/wood/end,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/airlock/glass{
+ name = "Breezeway"
+ },
+/turf/open/floor/wood/maple,
+/area/ship/hallway/central)
+"PZ" = (
+/obj/effect/turf_decal/siding/brown{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/turf/open/floor/wood/ebony,
+/area/ship/hallway/starboard)
+"Qi" = (
+/obj/structure/chair/wood,
+/obj/structure/flora/grass/jungle/b,
+/turf/open/floor/grass/ship/jungle,
+/area/ship/hallway/central)
+"Qm" = (
+/obj/machinery/computer/cryopod/directional/west,
+/obj/effect/turf_decal/siding/wood{
+ dir = 9
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
+/turf/open/floor/wood/maple,
+/area/ship/crew/cryo)
+"QA" = (
+/obj/effect/turf_decal/corner/opaque/blue/diagonal,
+/obj/structure/table/wood,
+/obj/item/scalpel{
+ pixel_y = 7;
+ pixel_x = 8
+ },
+/obj/item/circular_saw{
+ pixel_x = 6
+ },
+/obj/item/cautery{
+ pixel_x = -7;
+ pixel_y = 6
+ },
+/obj/item/retractor{
+ pixel_x = -5
+ },
+/obj/item/hemostat,
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
+"QD" = (
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/turf/open/floor/plating,
+/area/ship/engineering/atmospherics)
+"QE" = (
+/obj/structure/flora/junglebush/c,
+/turf/open/floor/plating/ship/water,
+/area/ship/roumain)
+"QJ" = (
+/obj/item/soap/deluxe,
+/obj/machinery/shower{
+ dir = 1
+ },
+/obj/structure/curtain/bounty,
+/obj/effect/turf_decal/stoneborder{
+ dir = 1
+ },
+/obj/effect/turf_decal/stoneborder,
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/hallway/starboard)
+"QR" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/effect/turf_decal/siding/wood{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/wood{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/wood/maple,
+/area/ship/hallway/central)
+"QX" = (
+/obj/structure/bonfire/dense,
+/turf/open/floor/ship/dirt/dark,
+/area/ship/roumain)
+"Ra" = (
+/obj/effect/turf_decal/spline/fancy/wood{
+ dir = 10
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+ dir = 4
+ },
+/turf/open/floor/wood/mahogany,
+/area/ship/bridge)
+"Ri" = (
+/mob/living/simple_animal/chicken,
+/turf/open/floor/grass/ship/jungle,
+/area/ship/roumain)
+"Rm" = (
+/obj/structure/closet/crate/hydroponics,
+/obj/item/storage/bag/plants/portaseeder,
+/obj/item/storage/bag/plants,
+/obj/item/storage/bag/plants,
+/obj/item/hatchet,
+/obj/item/shovel{
+ pixel_x = 5
+ },
+/obj/item/cultivator/rake{
+ pixel_x = -4;
+ pixel_y = 0
+ },
+/turf/open/floor/grass/ship/jungle,
+/area/ship/roumain)
+"Rz" = (
+/obj/structure/chair/pew{
+ dir = 4
+ },
+/obj/structure/flora/grass/jungle/b,
+/turf/open/floor/grass/ship/jungle,
+/area/ship/hallway/central)
+"RC" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 10
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 9
+ },
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/turf/open/floor/plating,
+/area/ship/engineering/atmospherics)
+"RF" = (
+/obj/structure/closet/secure_closet/medicalsrm,
+/obj/item/storage/firstaid/roumain,
+/obj/item/disk/holodisk/roumain,
+/obj/item/clothing/head/cowboy/sec/roumain/med,
+/obj/item/clothing/suit/toggle/labcoat/roumain_med,
+/obj/item/clothing/under/suit/roumain,
+/obj/item/storage/belt/medical,
+/obj/item/healthanalyzer,
+/obj/item/storage/firstaid,
+/obj/item/storage/box/beakers,
+/obj/item/storage/box/syringes,
+/obj/item/storage/box/bodybags,
+/obj/item/storage/box/gloves,
+/obj/item/storage/box/masks,
+/obj/effect/turf_decal/corner/opaque/blue/diagonal,
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
+"RJ" = (
+/obj/effect/turf_decal/siding/brown{
+ dir = 9
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 5
+ },
+/obj/machinery/button/door{
+ id = "elderemergencyairlockshuts";
+ name = "Airlock Shutters";
+ pixel_y = 6;
+ pixel_x = -21;
+ dir = 4
+ },
+/turf/open/floor/wood/ebony,
+/area/ship/hallway/port)
+"RT" = (
+/obj/machinery/power/smes/shuttle/precharged{
+ dir = 4
+ },
+/obj/structure/cable/pink{
+ icon_state = "0-8"
+ },
+/obj/machinery/door/poddoor/shutters{
+ dir = 8;
+ id = "elderengineshuts"
+ },
+/turf/open/floor/plating,
+/area/ship/engineering/atmospherics)
+"RW" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
+/turf/open/floor/wood/maple,
+/area/ship/crew/cryo)
+"Sg" = (
+/obj/machinery/computer/cargo/express{
+ dir = 8
+ },
+/obj/effect/turf_decal/spline/fancy/wood{
+ dir = 4
+ },
+/turf/open/floor/wood/mahogany,
+/area/ship/bridge)
+"Sz" = (
+/obj/structure/cable{
+ icon_state = "5-8"
+ },
+/obj/structure/cable{
+ icon_state = "5-10"
+ },
+/obj/structure/cable{
+ icon_state = "2-5"
+ },
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/turf/open/floor/plating,
+/area/ship/engineering/engine)
+"SL" = (
+/obj/structure/closet/crate/freezer,
+/obj/item/reagent_containers/blood/random,
+/obj/item/reagent_containers/blood/random,
+/obj/item/reagent_containers/blood/random,
+/obj/item/reagent_containers/blood/random,
+/obj/item/organ_storage,
+/obj/item/organ_storage,
+/obj/item/organ_storage,
+/obj/item/stack/medical/gauze/twelve,
+/obj/item/stack/medical/gauze/twelve,
+/obj/item/stack/medical/splint,
+/obj/item/stack/medical/splint,
+/obj/effect/turf_decal/corner/opaque/blue/diagonal,
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
+"SR" = (
+/obj/item/clothing/under/suit/roumain,
+/obj/item/clothing/suit/armor/roumain/shadow,
+/obj/item/clothing/head/cowboy/sec/roumain/shadow,
+/obj/item/flashlight/lantern,
+/obj/structure/closet/secure_closet/shadow,
+/obj/item/lighter,
+/obj/item/clothing/shoes/cowboy,
+/obj/item/clothing/shoes/cowboy/black,
+/obj/item/clothing/shoes/combat,
+/obj/item/kitchen/knife/hunting,
+/obj/item/gps{
+ pixel_x = -7
+ },
+/obj/item/storage/backpack/satchel/leather,
+/turf/open/floor/wood/ebony,
+/area/ship/storage)
+"Tc" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+ dir = 4
+ },
+/obj/machinery/button/door{
+ id = "elderengineshuts";
+ name = "Engine Shutters";
+ dir = 1;
+ pixel_x = 7;
+ pixel_y = -21
+ },
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/turf/open/floor/plating,
+/area/ship/engineering/engine)
+"Tx" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/structure/destructible/tribal_torch{
+ pixel_x = -7
+ },
+/obj/effect/turf_decal/trimline/opaque/red/arrow_cw{
+ dir = 4
+ },
+/obj/effect/turf_decal/industrial/warning,
+/turf/open/floor/plasteel/dark,
+/area/ship/hallway/port)
+"TO" = (
+/obj/machinery/autolathe,
+/turf/open/floor/wood/ebony,
+/area/ship/storage)
+"TX" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/effect/turf_decal/siding/brown{
+ dir = 9
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/turf/open/floor/wood/ebony,
+/area/ship/hallway/starboard)
+"Ui" = (
+/obj/effect/turf_decal/siding/wood,
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
+/turf/open/floor/wood/maple,
+/area/ship/storage)
+"Ul" = (
+/obj/machinery/computer/helm{
+ dir = 8
+ },
+/obj/effect/turf_decal/spline/fancy/wood{
+ dir = 4
+ },
+/turf/open/floor/wood/mahogany,
+/area/ship/bridge)
+"Un" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 9
+ },
+/obj/machinery/airalarm/directional/west,
+/turf/open/floor/wood/maple,
+/area/ship/storage)
+"Uu" = (
+/obj/docking_port/mobile{
+ dir = 2;
+ preferred_direction = 4;
+ port_direction = 8
+ },
+/turf/open/floor/engine/hull,
+/area/ship/external/dark)
+"UD" = (
+/obj/structure/flora/rock/jungle,
+/turf/open/floor/plating/ship/water,
+/area/ship/roumain)
+"US" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/effect/turf_decal/siding/brown{
+ dir = 10
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/turf/open/floor/wood/ebony,
+/area/ship/hallway/starboard)
+"UZ" = (
+/obj/structure/chair/pew/left{
+ dir = 8
+ },
+/obj/structure/flora/grass/jungle/b,
+/turf/open/floor/grass/ship/jungle,
+/area/ship/hallway/central)
+"Vc" = (
+/obj/structure/table/wood,
+/obj/item/storage/box/matches{
+ pixel_y = 3
+ },
+/obj/item/storage/fancy/cigarettes/cigpack_midori{
+ pixel_y = 6;
+ pixel_x = -3
+ },
+/obj/item/reagent_containers/food/drinks/mug/tea{
+ pixel_x = 6;
+ pixel_y = 6
+ },
+/turf/open/floor/wood/maple,
+/area/ship/hallway/port)
+"Vn" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/effect/turf_decal/siding/brown{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/wood/ebony,
+/area/ship/hallway/port)
+"Vu" = (
+/obj/structure/railing{
+ dir = 4
+ },
+/obj/structure/rack,
+/obj/item/pickaxe{
+ pixel_x = 1;
+ pixel_y = -4
+ },
+/obj/item/pickaxe{
+ pixel_x = 1;
+ pixel_y = 0
+ },
+/obj/item/pickaxe{
+ pixel_x = 1;
+ pixel_y = 4
+ },
+/obj/item/pickaxe{
+ pixel_x = 1;
+ pixel_y = 8
+ },
+/obj/item/shovel{
+ pixel_x = -2;
+ pixel_y = -8
+ },
+/obj/item/shovel{
+ pixel_x = -2;
+ pixel_y = -2
+ },
+/obj/item/shovel{
+ pixel_x = -2;
+ pixel_y = 5
+ },
+/obj/item/shovel{
+ pixel_x = -2;
+ pixel_y = 11
+ },
+/obj/item/storage/bag/ore,
+/obj/item/storage/bag/ore,
+/obj/item/storage/bag/ore,
+/obj/item/storage/bag/ore,
+/turf/open/floor/wood/ebony,
+/area/ship/hallway/starboard)
+"VI" = (
+/obj/structure/window/reinforced/fulltile,
+/obj/structure/grille,
+/obj/machinery/door/poddoor/shutters{
+ id = "elderrearshuts"
+ },
+/turf/open/floor/plating,
+/area/ship/bridge)
+"VL" = (
+/obj/structure/cable{
+ icon_state = "6-8"
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/effect/turf_decal/siding/brown{
+ dir = 9
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 10
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 10
+ },
+/turf/open/floor/wood/ebony,
+/area/ship/hallway/port)
+"VQ" = (
+/obj/machinery/power/shieldwallgen/atmos/roundstart{
+ dir = 8;
+ locked = 1;
+ id = "elderbayholos"
+ },
+/obj/structure/cable{
+ icon_state = "0-9"
+ },
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/poddoor/shutters{
+ id = "elderbayshutters"
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/hallway/starboard)
+"Wd" = (
+/obj/structure/table/wood,
+/obj/item/radio/intercom/wideband/table{
+ dir = 4;
+ pixel_y = 2;
+ pixel_x = 1
+ },
+/obj/effect/turf_decal/spline/fancy/wood{
+ dir = 4
+ },
+/turf/open/floor/wood/mahogany,
+/area/ship/bridge)
+"Wr" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 9
+ },
+/obj/effect/turf_decal/siding/wood/corner,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+ dir = 4
+ },
+/turf/open/floor/wood/maple,
+/area/ship/hallway/central)
+"Wy" = (
+/obj/structure/chair/comfy/black{
+ dir = 8
+ },
+/obj/structure/railing{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 9
+ },
+/turf/open/floor/wood/maple,
+/area/ship/hallway/port)
+"WJ" = (
+/obj/effect/turf_decal/siding/brown,
+/turf/open/floor/wood/maple,
+/area/ship/hallway/starboard)
+"WS" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/effect/turf_decal/siding/wood,
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/door/firedoor/border_only{
+ dir = 4
+ },
+/obj/machinery/door/airlock/glass{
+ dir = 4;
+ name = "Atrium"
+ },
+/turf/open/floor/wood/maple,
+/area/ship/roumain)
+"WU" = (
+/obj/effect/turf_decal/siding/brown{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/wood/ebony,
+/area/ship/hallway/starboard)
+"Xn" = (
+/obj/effect/turf_decal/siding/wood,
+/obj/effect/turf_decal/siding/wood/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/wood/corner{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/turf/open/floor/wood/maple,
+/area/ship/hallway/central)
+"Xq" = (
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/obj/effect/turf_decal/siding/wood{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/wood/corner{
+ dir = 8
+ },
+/turf/open/floor/wood/maple,
+/area/ship/storage)
+"Xt" = (
+/turf/open/floor/plating/ship/water,
+/area/ship/roumain)
+"XH" = (
+/obj/effect/turf_decal/siding/blue{
+ dir = 5
+ },
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
+"XI" = (
+/obj/structure/destructible/tribal_torch{
+ pixel_y = 2;
+ pixel_x = 9
+ },
+/turf/open/floor/ship/dirt/dark,
+/area/ship/roumain)
+"XK" = (
+/obj/structure/table/wood,
+/obj/item/folder/blue{
+ pixel_x = -6;
+ pixel_y = 4
+ },
+/obj/item/folder/red,
+/obj/item/folder/yellow{
+ pixel_x = 6;
+ pixel_y = 1
+ },
+/obj/effect/turf_decal/spline/fancy/wood,
+/turf/open/floor/wood/mahogany,
+/area/ship/bridge)
+"XW" = (
+/mob/living/simple_animal/cow,
+/turf/open/floor/grass/ship/jungle,
+/area/ship/roumain)
+"XY" = (
+/obj/structure/table/wood,
+/obj/item/reagent_containers/food/drinks/bottle/whiskey{
+ pixel_x = 7;
+ pixel_y = 6
+ },
+/obj/item/reagent_containers/food/drinks/bottle/absinthe,
+/obj/item/reagent_containers/food/drinks/bottle/absinthe{
+ pixel_y = 8;
+ pixel_x = -6
+ },
+/obj/item/book/manual/wiki/surgery,
+/obj/effect/turf_decal/corner/opaque/blue/diagonal,
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
+"Yu" = (
+/obj/structure/window/reinforced/fulltile,
+/obj/structure/grille,
+/obj/machinery/door/firedoor/border_only{
+ dir = 1
+ },
+/obj/machinery/door/firedoor/border_only{
+ dir = 4
+ },
+/obj/machinery/door/poddoor/shutters{
+ dir = 4;
+ id = "elderatriumshuts"
+ },
+/turf/open/floor/plating,
+/area/ship/roumain)
+"Yx" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/effect/turf_decal/spline/fancy/wood/cee{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/door/firedoor/border_only{
+ dir = 1
+ },
+/obj/machinery/door/airlock/command{
+ name = "Bridge"
+ },
+/turf/open/floor/wood/mahogany,
+/area/ship/bridge)
+"YD" = (
+/obj/effect/turf_decal/trimline/opaque/syndiered/arrow_cw{
+ dir = 4
+ },
+/turf/open/floor/wood/maple,
+/area/ship/hallway/starboard)
+"YM" = (
+/obj/effect/turf_decal/siding/wood/end{
+ dir = 1
+ },
+/obj/machinery/door/firedoor/border_only{
+ dir = 1
+ },
+/obj/machinery/door/airlock/glass{
+ name = "Breezeway"
+ },
+/turf/open/floor/wood/maple,
+/area/ship/hallway/central)
+"YP" = (
+/obj/machinery/portable_atmospherics/pump,
+/turf/open/floor/plasteel/dark,
+/area/ship/engineering/atmospherics)
+"YT" = (
+/obj/structure/cable{
+ icon_state = "4-10"
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/airalarm/directional/north,
+/obj/effect/turf_decal/trimline/opaque/orange/filled/line{
+ dir = 8
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/engineering/atmospherics)
+"YX" = (
+/obj/structure/flora/grass/jungle,
+/turf/open/floor/ship/dirt/dark,
+/area/ship/roumain)
+"Zh" = (
+/obj/machinery/door/firedoor/border_only{
+ dir = 1
+ },
+/obj/machinery/door/airlock/wood{
+ name = "Restroom"
+ },
+/obj/effect/turf_decal/spline/fancy/wood/cee{
+ dir = 1
+ },
+/turf/open/floor/wood/mahogany,
+/area/ship/hallway/starboard)
+"Zi" = (
+/obj/structure/table/wood,
+/obj/item/storage/fancy/cigarettes/cigpack_midori,
+/obj/item/lighter{
+ pixel_y = 3;
+ pixel_x = 7
+ },
+/turf/open/floor/wood/maple,
+/area/ship/hallway/starboard)
+"Zl" = (
+/obj/effect/turf_decal/spline/fancy/wood{
+ dir = 6
+ },
+/obj/structure/table/wood,
+/obj/item/paper/natural{
+ pixel_y = 3
+ },
+/obj/item/reagent_containers/food/drinks/coffee{
+ pixel_x = 8;
+ pixel_y = 4
+ },
+/obj/item/pen/charcoal{
+ pixel_x = -5
+ },
+/turf/open/floor/wood/mahogany,
+/area/ship/bridge)
+"Zr" = (
+/obj/effect/turf_decal/siding/brown/corner{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 10
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 10
+ },
+/turf/open/floor/wood/ebony,
+/area/ship/hallway/starboard)
+"Zs" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 10
+ },
+/obj/effect/turf_decal/siding/blue{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/blue/corner{
+ dir = 8
+ },
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
+"Zx" = (
+/obj/structure/flora/junglebush/b,
+/turf/open/floor/plating/ship/water,
+/area/ship/roumain)
+"ZE" = (
+/obj/structure/window/reinforced/tinted/frosted,
+/obj/structure/urinal{
+ pixel_y = 29
+ },
+/obj/effect/turf_decal/spline/fancy/wood{
+ dir = 5
+ },
+/turf/open/floor/wood/mahogany,
+/area/ship/hallway/starboard)
+"ZI" = (
+/obj/structure/closet/emcloset/wall{
+ dir = 8;
+ pixel_x = 28
+ },
+/obj/effect/turf_decal/spline/fancy/wood{
+ dir = 4
+ },
+/turf/open/floor/wood/mahogany,
+/area/ship/bridge)
+"ZK" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/wood/mahogany,
+/area/ship/bridge)
+"ZW" = (
+/obj/structure/flora/tree/srm,
+/turf/open/floor/ship/dirt/dark,
+/area/ship/hallway/central)
+
+(1,1,1) = {"
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+"}
+(2,1,1) = {"
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+"}
+(3,1,1) = {"
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+"}
+(4,1,1) = {"
+sH
+sH
+sH
+sH
+sH
+sH
+oY
+Mj
+Mj
+wm
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+lM
+hZ
+hZ
+Py
+sH
+sH
+sH
+sH
+"}
+(5,1,1) = {"
+sH
+sH
+sH
+sH
+sH
+wm
+rE
+hp
+hp
+wm
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+lM
+RT
+RT
+MV
+lM
+sH
+sH
+sH
+"}
+(6,1,1) = {"
+sH
+sH
+sH
+sH
+sH
+wm
+Fn
+FW
+FW
+wm
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+lM
+jl
+FG
+rK
+lM
+sH
+sH
+sH
+"}
+(7,1,1) = {"
+sH
+sH
+sH
+sH
+sH
+wm
+zH
+NT
+bm
+wm
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+lM
+YT
+Lj
+yn
+lM
+sH
+sH
+sH
+"}
+(8,1,1) = {"
+sH
+sH
+sH
+sH
+wm
+wm
+fC
+pH
+Tc
+wm
+wm
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+lM
+lM
+eH
+uP
+aF
+lM
+lM
+sH
+sH
+"}
+(9,1,1) = {"
+sH
+sH
+sH
+sH
+wm
+KX
+gG
+zT
+LL
+Od
+wm
+sH
+sH
+sH
+sH
+sH
+bi
+mE
+mE
+mE
+IZ
+sH
+sH
+sH
+sH
+gO
+na
+qD
+fa
+QD
+vG
+ut
+lM
+sH
+sH
+"}
+(10,1,1) = {"
+sH
+sH
+sH
+sH
+wm
+AQ
+Fu
+Sz
+DS
+Et
+wm
+sH
+sH
+sH
+sH
+bi
+VI
+AX
+aY
+AX
+VI
+IZ
+sH
+sH
+sH
+Ga
+lM
+BB
+ID
+RC
+jG
+mD
+lM
+sH
+sH
+"}
+(11,1,1) = {"
+sH
+sH
+sH
+wm
+wm
+ih
+ag
+jr
+wm
+Nm
+vC
+vC
+aP
+aP
+aP
+MZ
+wD
+xC
+re
+xC
+wD
+BK
+aP
+aP
+aP
+BA
+BA
+CH
+lM
+BO
+YP
+sA
+lM
+lM
+sH
+"}
+(12,1,1) = {"
+sH
+sH
+bW
+vC
+vC
+vC
+vC
+vC
+vC
+VL
+mj
+JD
+aP
+IM
+lg
+fm
+Ra
+aY
+Ao
+aY
+ir
+fm
+zX
+sr
+aP
+yA
+Jc
+US
+BA
+BA
+BA
+BA
+BA
+BA
+sH
+"}
+(13,1,1) = {"
+sH
+sH
+bW
+CC
+dt
+LS
+Tx
+bY
+RJ
+gi
+qv
+Vn
+Yx
+NX
+ZK
+Bu
+dn
+NF
+fP
+NF
+au
+hg
+cz
+qN
+fe
+MU
+sD
+Jx
+mA
+bN
+bN
+bN
+uY
+BA
+sH
+"}
+(14,1,1) = {"
+sH
+sH
+bW
+kL
+iB
+FF
+xe
+cN
+iR
+Dz
+AY
+pb
+aP
+OF
+ap
+ZI
+uM
+Sg
+Wd
+Ul
+MG
+Ii
+uc
+XK
+aP
+li
+hc
+Jr
+aS
+NH
+Bt
+sb
+uY
+BA
+sH
+"}
+(15,1,1) = {"
+sm
+sH
+bW
+vC
+vC
+vC
+vC
+vC
+qQ
+Dg
+fz
+Vc
+aP
+zv
+lA
+aP
+Ar
+Ar
+Ar
+Ar
+aP
+aP
+HO
+Zl
+aP
+AS
+PZ
+AL
+yq
+Hx
+kq
+WJ
+uY
+BA
+sH
+"}
+(16,1,1) = {"
+sH
+sH
+sH
+yz
+qB
+Qm
+MR
+yz
+CF
+mS
+Kk
+gE
+aP
+aP
+aP
+aP
+Wr
+Nq
+Nq
+Nq
+bv
+aP
+aP
+aP
+aP
+Zi
+In
+iP
+BA
+Vu
+vd
+hT
+sc
+BA
+bW
+"}
+(17,1,1) = {"
+sH
+sH
+sH
+yz
+MH
+RW
+JG
+MW
+hh
+LG
+Wy
+vX
+My
+qZ
+Il
+Il
+ce
+UZ
+AM
+co
+qz
+wC
+QR
+ge
+My
+OO
+WU
+yp
+nZ
+YD
+YD
+YD
+vn
+hV
+bW
+"}
+(18,1,1) = {"
+sH
+sH
+sH
+yz
+MH
+RW
+xN
+yz
+iT
+cJ
+xv
+Jy
+YM
+Xn
+Qi
+Eh
+DL
+wy
+ZW
+yZ
+cU
+Eh
+ou
+dL
+PI
+TX
+ac
+PE
+ie
+Ju
+gb
+gb
+iY
+bO
+bW
+"}
+(19,1,1) = {"
+sH
+sH
+sH
+yz
+KP
+Hw
+af
+yz
+Fp
+zZ
+Eq
+ji
+My
+de
+Il
+zc
+wA
+lf
+Rz
+dV
+aM
+Nd
+Nd
+rv
+My
+Px
+Zr
+EN
+nj
+HB
+HB
+HB
+OV
+VQ
+bW
+"}
+(20,1,1) = {"
+sH
+sH
+sH
+yz
+yz
+Cx
+pd
+yz
+AZ
+oE
+bj
+wp
+wp
+MM
+MM
+wp
+de
+vz
+No
+Bx
+rv
+wp
+MM
+MM
+wp
+wp
+tC
+Ac
+ef
+BA
+BA
+BA
+BA
+BA
+Uu
+"}
+(21,1,1) = {"
+sH
+sH
+sH
+sH
+LN
+LN
+LN
+LN
+rj
+Kd
+LN
+wp
+rW
+Mz
+dR
+wp
+wp
+Ir
+wp
+WS
+wp
+wp
+Xt
+qJ
+uW
+wp
+wp
+jv
+nj
+Zh
+vH
+Im
+BA
+sH
+sH
+"}
+(22,1,1) = {"
+sH
+sH
+sH
+sH
+LN
+HA
+Un
+eZ
+hl
+Xq
+Ph
+uW
+NL
+aO
+uW
+yN
+wE
+nk
+DR
+GM
+Cr
+Xt
+QE
+KO
+NL
+uV
+wp
+cg
+GP
+BA
+ZE
+lb
+BA
+sH
+sH
+"}
+(23,1,1) = {"
+sH
+sH
+sH
+sH
+LN
+HA
+va
+zY
+gd
+TO
+LN
+NL
+uW
+uW
+NL
+aO
+Ri
+uW
+uV
+NL
+ei
+ei
+uW
+NL
+YX
+uW
+fi
+cR
+fi
+BA
+rD
+QJ
+BA
+sH
+sH
+"}
+(24,1,1) = {"
+sH
+sH
+sH
+sH
+LN
+HA
+Ui
+Fr
+IF
+el
+vm
+cj
+uW
+Aq
+Aq
+aO
+aO
+NL
+YX
+NL
+NC
+lk
+lk
+uW
+YX
+uW
+Mh
+ts
+kD
+BA
+BA
+BA
+BA
+sH
+sH
+"}
+(25,1,1) = {"
+sH
+sH
+sH
+sH
+LN
+SR
+Ui
+BJ
+IF
+KQ
+vm
+Rm
+uW
+Aq
+Aq
+uW
+dR
+NL
+NL
+Xt
+UD
+gR
+At
+qJ
+uW
+uW
+fi
+Zs
+jm
+up
+nO
+XY
+fi
+sH
+sH
+"}
+(26,1,1) = {"
+sH
+sH
+sH
+sH
+LN
+SR
+sT
+ds
+LX
+gK
+ko
+mw
+aO
+Aq
+Aq
+uW
+uW
+NL
+Xt
+Zx
+Xt
+jk
+EJ
+uW
+aO
+XI
+os
+Oo
+Bq
+nt
+aq
+tF
+fi
+sH
+sH
+"}
+(27,1,1) = {"
+sH
+sH
+sH
+sH
+LN
+SR
+AN
+al
+cY
+LN
+LN
+wp
+uW
+Aq
+Aq
+uW
+aO
+Xt
+Xt
+DV
+Xt
+md
+md
+uV
+OA
+wp
+fi
+fi
+RF
+XH
+dq
+QA
+fi
+sH
+sH
+"}
+(28,1,1) = {"
+sH
+sH
+sH
+sH
+LN
+LN
+ox
+Bi
+LN
+LN
+sH
+cw
+aO
+uW
+aO
+aO
+XW
+Xt
+UD
+Xt
+NL
+uW
+Lk
+KO
+fs
+oC
+sH
+fi
+fi
+SL
+ff
+fi
+fi
+sH
+sH
+"}
+(29,1,1) = {"
+sH
+sH
+sH
+sH
+sH
+LN
+LN
+LN
+LN
+sH
+sH
+cw
+NL
+YX
+dR
+YX
+uW
+JO
+Xt
+Fa
+eU
+Ng
+uW
+uW
+fs
+oC
+sH
+sH
+fi
+fi
+fi
+fi
+sH
+sH
+sH
+"}
+(30,1,1) = {"
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+Yu
+mW
+kN
+YX
+uW
+uV
+ei
+ei
+ss
+QX
+cp
+YX
+fs
+mW
+mr
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+"}
+(31,1,1) = {"
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+cw
+kN
+NL
+NL
+Xt
+Xt
+xD
+yV
+Jn
+Ma
+aO
+fs
+oC
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+"}
+(32,1,1) = {"
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+Yu
+mW
+kN
+kN
+Xt
+uW
+aO
+YX
+NL
+uV
+qJ
+mW
+mr
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+"}
+(33,1,1) = {"
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+Yu
+jV
+jV
+jV
+jV
+jV
+jV
+jV
+jV
+jV
+mr
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+"}
+(34,1,1) = {"
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+"}
+(35,1,1) = {"
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+"}
+(36,1,1) = {"
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+sH
+"}
diff --git a/_maps/shuttles/roumain/srm_glaive.dmm b/_maps/shuttles/roumain/srm_glaive.dmm
deleted file mode 100644
index 5c7f90c25492..000000000000
--- a/_maps/shuttles/roumain/srm_glaive.dmm
+++ /dev/null
@@ -1,4889 +0,0 @@
-//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
-"ac" = (
-/obj/structure/cable/orange{
- icon_state = "1-10"
- },
-/turf/open/floor/plating,
-/area/ship/engineering/electrical)
-"af" = (
-/obj/structure/cable/orange{
- icon_state = "1-2"
- },
-/obj/machinery/cryopod{
- dir = 8
- },
-/obj/machinery/computer/cryopod/directional/east,
-/turf/open/floor/wood/ebony,
-/area/ship/crew/dorm)
-"al" = (
-/obj/structure/chair/pew/left{
- dir = 1
- },
-/mob/living/simple_animal/chicken,
-/turf/open/floor/ship/dirt/dark,
-/area/ship/roumain)
-"ap" = (
-/obj/machinery/airalarm/directional/east,
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/storage)
-"au" = (
-/obj/structure/cable/orange{
- icon_state = "4-8"
- },
-/obj/structure/cable/orange{
- icon_state = "4-6"
- },
-/turf/open/floor/plasteel/tech,
-/area/ship/storage)
-"aF" = (
-/obj/machinery/atmospherics/components/binary/pump,
-/obj/item/flashlight/lantern,
-/turf/open/floor/plating,
-/area/ship/engineering)
-"aH" = (
-/obj/structure/cable/orange{
- icon_state = "2-4"
- },
-/obj/item/clothing/under/suit/roumain,
-/obj/item/clothing/suit/armor/roumain/shadow,
-/obj/item/clothing/head/cowboy/sec/roumain/shadow,
-/obj/item/storage/backpack/cultpack,
-/obj/item/flashlight/lantern,
-/obj/item/kitchen/knife/hunting,
-/obj/item/gun/ballistic/derringer,
-/obj/structure/closet/secure_closet/shadow,
-/obj/item/lighter,
-/obj/item/ammo_box/c38_box,
-/obj/item/disk/holodisk/roumain,
-/obj/item/clothing/shoes/cowboy,
-/obj/item/clothing/shoes/cowboy/black,
-/obj/item/clothing/shoes/jackboots,
-/obj/item/book/manual/srmlore,
-/turf/open/floor/wood/ebony,
-/area/ship/crew/dorm)
-"aM" = (
-/obj/structure/flora/ausbushes/brflowers,
-/obj/structure/flora/ausbushes/sparsegrass,
-/turf/open/floor/grass/ship/jungle,
-/area/ship/roumain)
-"aS" = (
-/obj/item/storage/box/masks,
-/obj/item/storage/box/gloves,
-/obj/item/storage/box/bodybags,
-/obj/item/storage/box/syringes,
-/obj/item/storage/box/beakers,
-/obj/item/storage/firstaid,
-/obj/item/healthanalyzer,
-/obj/item/storage/belt/medical,
-/obj/item/lazarus_injector,
-/obj/structure/cable/orange{
- icon_state = "1-4"
- },
-/obj/item/clothing/under/suit/roumain,
-/obj/item/clothing/suit/toggle/labcoat/roumain_med,
-/obj/item/clothing/head/cowboy/sec/roumain/med,
-/obj/item/gun/ballistic/derringer,
-/obj/structure/closet/secure_closet/medicalsrm,
-/obj/item/disk/holodisk/roumain,
-/obj/item/ammo_box/c38_box,
-/obj/item/storage/firstaid/roumain,
-/obj/effect/turf_decal/corner/opaque/blue/diagonal,
-/turf/open/floor/plasteel/white,
-/area/ship/medical)
-"aY" = (
-/obj/structure/destructible/tribal_torch,
-/turf/open/floor/grass/ship/jungle,
-/area/ship/crew/toilet)
-"bi" = (
-/obj/machinery/mineral/ore_redemption,
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/storage)
-"bm" = (
-/obj/machinery/power/terminal{
- dir = 1
- },
-/obj/structure/cable/green{
- icon_state = "0-4"
- },
-/obj/structure/cable/orange{
- icon_state = "5-8"
- },
-/turf/open/floor/plating,
-/area/ship/engineering/electrical)
-"bv" = (
-/obj/structure/cable/orange{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/door/firedoor/border_only{
- dir = 1
- },
-/obj/machinery/door/firedoor/border_only,
-/obj/machinery/door/airlock/maintenance_hatch{
- name = "Engine Room"
- },
-/turf/open/floor/plasteel/tech,
-/area/ship/engineering/engine)
-"bN" = (
-/obj/structure/flora/ausbushes/brflowers,
-/obj/structure/flora/ausbushes/fullgrass,
-/obj/structure/closet/mob_capture,
-/turf/open/floor/grass/ship/jungle,
-/area/ship/roumain)
-"bW" = (
-/obj/structure/railing/corner{
- dir = 1
- },
-/obj/machinery/hydroponics/soil,
-/obj/item/seeds/tower,
-/obj/item/seeds/tower,
-/obj/item/hatchet,
-/turf/open/floor/ship/dirt/dark,
-/area/ship/roumain)
-"bY" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/turf/open/floor/wood/maple,
-/area/ship/construction)
-"ce" = (
-/obj/item/clothing/under/suit/roumain,
-/obj/item/clothing/suit/armor/roumain/shadow,
-/obj/item/clothing/head/cowboy/sec/roumain/shadow,
-/obj/item/storage/backpack/cultpack,
-/obj/item/flashlight/lantern,
-/obj/item/kitchen/knife/hunting,
-/obj/item/gun/ballistic/derringer,
-/obj/structure/closet/secure_closet/shadow,
-/obj/item/lighter,
-/obj/item/ammo_box/c38_box,
-/obj/item/disk/holodisk/roumain,
-/obj/item/clothing/shoes/cowboy,
-/obj/item/clothing/shoes/cowboy/black,
-/obj/item/clothing/shoes/jackboots,
-/obj/item/book/manual/srmlore,
-/turf/open/floor/wood/ebony,
-/area/ship/crew/dorm)
-"cg" = (
-/mob/living/simple_animal/crab{
- name = "Jannet"
- },
-/turf/open/floor/plating/ship/water,
-/area/ship/roumain)
-"cj" = (
-/obj/structure/railing{
- dir = 8
- },
-/turf/open/floor/ship/dirt/dark,
-/area/ship/roumain)
-"co" = (
-/obj/machinery/power/terminal,
-/obj/structure/cable/orange{
- icon_state = "0-9"
- },
-/obj/structure/cable/orange{
- icon_state = "8-9"
- },
-/obj/structure/cable/orange{
- icon_state = "4-9"
- },
-/turf/open/floor/plating,
-/area/ship/engineering)
-"cp" = (
-/obj/structure/cable/orange{
- icon_state = "0-4"
- },
-/obj/machinery/door/poddoor{
- id = "port_blasts";
- name = "Port Blast Door"
- },
-/obj/machinery/power/shieldwallgen/atmos/roundstart{
- dir = 4;
- id = "glaive_shields";
- locked = 1
- },
-/turf/open/floor/plasteel/tech,
-/area/ship/storage)
-"cz" = (
-/obj/structure/flora/ausbushes/brflowers,
-/obj/structure/flora/ausbushes/sparsegrass,
-/obj/item/book/manual/trickwines_4_brewers,
-/turf/open/floor/grass/ship/jungle,
-/area/ship/roumain)
-"cJ" = (
-/obj/structure/cable/orange{
- icon_state = "1-4"
- },
-/obj/structure/cable/orange{
- icon_state = "2-4"
- },
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
- dir = 8
- },
-/turf/open/floor/plasteel/tech,
-/area/ship/roumain)
-"cR" = (
-/obj/structure/cable/orange{
- icon_state = "2-4"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 6
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 6
- },
-/turf/open/floor/engine/hull,
-/area/ship/external/dark)
-"cU" = (
-/obj/structure/cable/orange{
- icon_state = "0-4"
- },
-/obj/machinery/power/apc/auto_name/directional/west,
-/turf/open/floor/wood/ebony,
-/area/ship/crew/dorm)
-"cW" = (
-/turf/closed/wall,
-/area/ship/engineering/engine)
-"dq" = (
-/turf/closed/wall/r_wall,
-/area/ship/crew/toilet)
-"ds" = (
-/obj/structure/flora/ausbushes/sparsegrass,
-/obj/structure/flora/ausbushes/brflowers,
-/obj/item/reagent_containers/food/drinks/breakawayflask,
-/turf/open/floor/grass/ship/jungle,
-/area/ship/roumain)
-"dt" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/door/poddoor/shutters{
- name = "Body Shutters";
- id = "body_shutters";
- dir = 4
- },
-/turf/open/floor/plating,
-/area/ship/crew/dorm)
-"dV" = (
-/obj/structure/chair/pew/right{
- dir = 1
- },
-/obj/structure/flora/ausbushes/brflowers,
-/mob/living/simple_animal/hostile/retaliate/goat,
-/turf/open/floor/grass/ship/jungle,
-/area/ship/roumain)
-"eU" = (
-/obj/effect/turf_decal/industrial/warning,
-/obj/effect/turf_decal/industrial/caution,
-/obj/structure/ore_box,
-/obj/structure/cable/orange{
- icon_state = "8-9"
- },
-/turf/open/floor/plasteel/tech,
-/area/ship/storage)
-"fa" = (
-/obj/effect/turf_decal/industrial/warning,
-/obj/effect/turf_decal/industrial/caution,
-/obj/structure/cable/orange{
- icon_state = "4-9"
- },
-/obj/structure/cable/orange{
- icon_state = "2-4"
- },
-/turf/open/floor/plasteel/tech,
-/area/ship/storage)
-"fe" = (
-/obj/structure/flora/ausbushes/sparsegrass,
-/obj/structure/flora/ausbushes/brflowers,
-/obj/structure/closet/crate,
-/obj/item/stack/sheet/bone{
- amount = 10
- },
-/obj/item/stack/sheet/sinew/wolf{
- amount = 10
- },
-/obj/item/stack/sheet/animalhide/goliath_hide/polar_bear_hide{
- amount = 5
- },
-/obj/item/reagent_containers/food/snacks/meat/slab,
-/obj/item/reagent_containers/food/snacks/meat/slab,
-/obj/item/reagent_containers/food/snacks/meat/slab,
-/obj/item/reagent_containers/food/snacks/meat/slab/bear,
-/turf/open/floor/grass/ship/jungle,
-/area/ship/roumain)
-"ff" = (
-/obj/docking_port/mobile{
- callTime = 250;
- name = "Glaive-class";
- port_direction = 4;
- dir = 8
- },
-/turf/closed/wall/r_wall,
-/area/ship/engineering)
-"fi" = (
-/turf/closed/wall/r_wall,
-/area/ship/medical)
-"fm" = (
-/turf/closed/wall/r_wall,
-/area/ship/crew/dorm)
-"fs" = (
-/turf/closed/wall,
-/area/ship/engineering)
-"fv" = (
-/obj/machinery/computer/cargo/express,
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/storage)
-"fz" = (
-/obj/machinery/power/port_gen/pacman,
-/obj/structure/cable/green{
- icon_state = "0-4"
- },
-/turf/open/floor/plating,
-/area/ship/engineering/electrical)
-"fC" = (
-/obj/effect/turf_decal/siding/wood/end,
-/obj/item/clothing/under/suit/roumain,
-/obj/item/clothing/suit/armor/hos/roumain/montagne,
-/obj/item/clothing/head/HoS/cowboy/montagne,
-/obj/item/clothing/suit/armor/riot/chaplain/ancient,
-/obj/item/clothing/head/helmet/chaplain/ancient,
-/obj/item/storage/backpack/cultpack,
-/obj/item/flashlight/lantern,
-/obj/item/storage/fancy/candle_box{
- pixel_y = 3;
- pixel_x = 8
- },
-/obj/item/lighter{
- pixel_x = -2;
- pixel_y = 2
- },
-/obj/item/kitchen/knife/combat,
-/obj/item/gun/ballistic/revolver/nagant,
-/obj/item/ammo_box/n762,
-/obj/structure/closet/secure_closet/montagnes,
-/obj/item/disk/holodisk/roumain,
-/obj/item/clothing/shoes/cowboy/black,
-/obj/item/clothing/shoes/cowboy,
-/obj/item/clothing/shoes/jackboots,
-/obj/item/book/manual/srmlore,
-/turf/open/floor/wood/mahogany,
-/area/ship/roumain)
-"fP" = (
-/obj/structure/cable/orange{
- icon_state = "2-8"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 6
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 6
- },
-/turf/open/floor/wood/ebony,
-/area/ship/crew/dorm)
-"gb" = (
-/obj/effect/turf_decal/industrial/warning,
-/obj/effect/turf_decal/industrial/caution,
-/obj/structure/cable/orange{
- icon_state = "1-6"
- },
-/turf/open/floor/plasteel/tech,
-/area/ship/storage)
-"gd" = (
-/obj/structure/cable/orange{
- icon_state = "5-9"
- },
-/obj/structure/cable/orange{
- icon_state = "4-8"
- },
-/obj/machinery/airalarm/directional/south,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
- dir = 8
- },
-/turf/open/floor/plating,
-/area/ship/engineering/electrical)
-"ge" = (
-/turf/closed/wall/r_wall,
-/area/ship/construction)
-"gi" = (
-/obj/structure/chair/pew/left{
- dir = 1
- },
-/obj/structure/flora/ausbushes/brflowers,
-/turf/open/floor/grass/ship/jungle,
-/area/ship/roumain)
-"go" = (
-/obj/machinery/power/apc/auto_name/directional/west,
-/obj/structure/cable/orange{
- icon_state = "0-6"
- },
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/storage)
-"gE" = (
-/obj/structure/cable/orange{
- icon_state = "1-4"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 5
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 5
- },
-/turf/open/floor/engine/hull,
-/area/ship/external/dark)
-"gK" = (
-/obj/structure/cable/orange{
- icon_state = "2-8"
- },
-/turf/open/floor/engine/hull,
-/area/ship/external/dark)
-"gO" = (
-/obj/structure/cable/orange{
- icon_state = "1-4"
- },
-/obj/structure/cable/orange{
- icon_state = "8-9"
- },
-/turf/open/floor/wood/ebony,
-/area/ship/crew/dorm)
-"gR" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable/orange{
- icon_state = "2-4"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 6
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 6
- },
-/obj/machinery/door/poddoor/shutters{
- name = "Body Shutters";
- id = "body_shutters";
- dir = 4
- },
-/turf/open/floor/plating,
-/area/ship/roumain)
-"hc" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable/orange{
- icon_state = "2-8"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 10
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 10
- },
-/obj/machinery/door/poddoor/shutters{
- name = "Body Shutters";
- id = "body_shutters";
- dir = 8
- },
-/turf/open/floor/plating,
-/area/ship/roumain)
-"hh" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/door/poddoor/shutters{
- name = "Body Shutters";
- id = "body_shutters"
- },
-/turf/open/floor/plating,
-/area/ship/crew/dorm)
-"hp" = (
-/obj/structure/destructible/tribal_torch,
-/obj/effect/turf_decal/industrial/warning/full,
-/turf/open/floor/plasteel/tech,
-/area/ship/storage)
-"hu" = (
-/obj/machinery/button/door{
- id = "port_blasts";
- name = "port blasts control";
- pixel_y = 27
- },
-/turf/open/floor/engine/hull,
-/area/ship/external/dark)
-"hz" = (
-/obj/machinery/hydroponics/soil,
-/obj/item/seeds/wheat,
-/obj/item/seeds/wheat,
-/obj/item/shovel,
-/obj/item/seeds/carrot,
-/obj/item/seeds/carrot,
-/obj/item/reagent_containers/food/snacks/egg,
-/obj/item/reagent_containers/food/snacks/egg,
-/obj/item/reagent_containers/food/snacks/egg,
-/obj/item/reagent_containers/food/snacks/egg,
-/obj/item/seeds/lavaland/puce,
-/obj/item/seeds/lavaland/puce,
-/turf/open/floor/ship/dirt/dark,
-/area/ship/roumain)
-"hT" = (
-/obj/structure/cable/orange{
- icon_state = "1-8"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 9
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 9
- },
-/obj/effect/turf_decal/corner/opaque/blue/diagonal,
-/turf/open/floor/plasteel/white,
-/area/ship/medical)
-"ie" = (
-/obj/structure/window/plasma/reinforced/spawner{
- dir = 1
- },
-/obj/structure/window/plasma/reinforced/spawner{
- dir = 8
- },
-/obj/structure/window/plasma/reinforced/spawner{
- dir = 4
- },
-/obj/machinery/atmospherics/components/unary/outlet_injector/on/layer4{
- dir = 4
- },
-/turf/open/floor/engine/airless,
-/area/ship/engineering/engine)
-"iq" = (
-/obj/structure/table/wood,
-/obj/item/spear/bonespear{
- pixel_y = 8;
- pixel_x = -4
- },
-/obj/item/spear/bonespear{
- pixel_y = 7
- },
-/obj/item/spear/bonespear{
- pixel_x = 6;
- pixel_y = 7
- },
-/turf/open/floor/grass/ship/jungle,
-/area/ship/roumain)
-"ir" = (
-/obj/structure/cable/orange{
- icon_state = "1-4"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 5
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 5
- },
-/turf/open/floor/plating,
-/area/ship/engineering/electrical)
-"iu" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 4
- },
-/obj/machinery/door/airlock/glass{
- name = "Dormitories";
- dir = 4
- },
-/obj/machinery/door/firedoor/border_only{
- dir = 4
- },
-/obj/machinery/door/firedoor/border_only{
- dir = 8
- },
-/turf/open/floor/wood/ebony,
-/area/ship/crew/dorm)
-"iB" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 8
- },
-/obj/effect/turf_decal/siding/wood{
- dir = 4
- },
-/obj/structure/fence/door,
-/obj/machinery/door/firedoor/border_only{
- dir = 1
- },
-/turf/open/floor/wood/yew,
-/area/ship/roumain)
-"iP" = (
-/obj/structure/railing{
- dir = 8
- },
-/obj/structure/flora/ausbushes/reedbush,
-/turf/open/floor/plating/ship/water,
-/area/ship/roumain)
-"iR" = (
-/obj/structure/cable/orange{
- icon_state = "8-10"
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
- dir = 8
- },
-/obj/effect/turf_decal/corner/opaque/blue/diagonal,
-/turf/open/floor/plasteel/white,
-/area/ship/medical)
-"iT" = (
-/obj/structure/railing/corner{
- dir = 4
- },
-/obj/structure/flora/ausbushes/brflowers,
-/obj/structure/flora/ausbushes/fullgrass,
-/obj/structure/fence{
- dir = 4
- },
-/obj/machinery/door/firedoor/border_only{
- dir = 1
- },
-/turf/open/floor/grass/ship/jungle,
-/area/ship/roumain)
-"iY" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable/orange{
- icon_state = "4-8"
- },
-/obj/structure/cable/orange{
- icon_state = "2-4"
- },
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
- dir = 1
- },
-/obj/machinery/door/poddoor/shutters{
- name = "Body Shutters";
- id = "body_shutters"
- },
-/turf/open/floor/plating,
-/area/ship/roumain)
-"jk" = (
-/obj/structure/cable/orange{
- icon_state = "8-9"
- },
-/turf/open/floor/plasteel/tech,
-/area/ship/storage)
-"jl" = (
-/obj/structure/cable/orange{
- icon_state = "2-10"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 4
- },
-/turf/open/floor/wood/ebony,
-/area/ship/crew/dorm)
-"jm" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 9
- },
-/obj/structure/cable/orange{
- icon_state = "1-8"
- },
-/obj/machinery/airalarm/directional/east,
-/obj/machinery/atmospherics/components/binary/pump/layer2{
- dir = 1
- },
-/turf/open/floor/plating,
-/area/ship/engineering)
-"jq" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 8
- },
-/obj/structure/destructible/tribal_torch,
-/turf/open/floor/wood/maple,
-/area/ship/construction)
-"jr" = (
-/obj/machinery/atmospherics/components/unary/tank/air{
- dir = 1;
- piping_layer = 2
- },
-/turf/open/floor/plating,
-/area/ship/engineering)
-"jv" = (
-/obj/structure/window/reinforced/spawner{
- dir = 8
- },
-/obj/structure/window/reinforced/spawner,
-/obj/machinery/atmospherics/components/unary/shuttle/heater{
- dir = 1
- },
-/obj/machinery/door/poddoor/shutters{
- id = "port_shutters";
- name = "Engine Shutters"
- },
-/turf/open/floor/plating,
-/area/ship/engineering)
-"jy" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 4
- },
-/turf/closed/wall/r_wall,
-/area/ship/engineering/engine)
-"jG" = (
-/obj/structure/flora/ausbushes/ppflowers,
-/obj/structure/flora/tree/srm,
-/turf/open/floor/grass/ship/jungle,
-/area/ship/roumain)
-"ko" = (
-/obj/structure/railing{
- dir = 1
- },
-/obj/structure/destructible/tribal_torch,
-/turf/open/floor/grass/ship/jungle,
-/area/ship/roumain)
-"kD" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 6
- },
-/turf/open/floor/wood/maple,
-/area/ship/construction)
-"lb" = (
-/obj/structure/flora/ausbushes/brflowers,
-/obj/structure/flora/ausbushes/sparsegrass,
-/obj/structure/fermenting_barrel,
-/turf/open/floor/grass/ship/jungle,
-/area/ship/roumain)
-"lf" = (
-/obj/structure/cable/orange{
- icon_state = "2-8"
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 10
- },
-/obj/structure/cable/orange{
- icon_state = "1-6"
- },
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
- dir = 4
- },
-/turf/open/floor/plating,
-/area/ship/engineering/electrical)
-"lg" = (
-/obj/effect/turf_decal/spline/fancy{
- dir = 1
- },
-/obj/item/storage/box/emptysandbags,
-/obj/item/storage/belt/mining,
-/obj/item/reagent_containers/hypospray/medipen/survival,
-/obj/item/flashlight/seclite,
-/obj/item/borg/upgrade/modkit/indoors,
-/obj/item/gun/energy/kinetic_accelerator,
-/obj/item/storage/bag/ore,
-/obj/structure/cable/orange{
- icon_state = "4-10"
- },
-/obj/item/shovel,
-/obj/item/gps/mining,
-/obj/structure/closet/secure_closet/miningcloset,
-/obj/item/stack/marker_beacon/thirty,
-/obj/item/pickaxe,
-/obj/item/t_scanner/adv_mining_scanner/lesser,
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/storage)
-"li" = (
-/obj/machinery/door/airlock/engineering{
- name = "Starboard Wing";
- dir = 4
- },
-/obj/machinery/door/firedoor/border_only{
- dir = 4
- },
-/obj/machinery/door/firedoor/border_only{
- dir = 8
- },
-/turf/open/floor/plasteel/tech,
-/area/ship/roumain)
-"lk" = (
-/obj/effect/turf_decal/siding/wood/corner,
-/obj/effect/turf_decal/siding/wood/corner{
- dir = 1
- },
-/obj/effect/turf_decal/siding/wood/corner{
- dir = 4
- },
-/obj/effect/turf_decal/siding/wood/corner{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
- dir = 1
- },
-/turf/open/floor/wood/yew,
-/area/ship/roumain)
-"ln" = (
-/obj/structure/railing{
- dir = 4
- },
-/obj/effect/turf_decal/spline/fancy{
- dir = 1
- },
-/obj/structure/cable/orange{
- icon_state = "8-10"
- },
-/obj/machinery/button/door{
- id = "port_blasts";
- name = "port blasts control";
- pixel_x = -6;
- pixel_y = 2
- },
-/obj/structure/table/wood,
-/obj/machinery/button/shieldwallgen{
- pixel_x = 4;
- id = "glaive_shields"
- },
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/storage)
-"lA" = (
-/obj/structure/sink/puddle,
-/obj/item/reagent_containers/glass/bucket/wooden{
- pixel_y = -3;
- pixel_x = 6
- },
-/obj/item/reagent_containers/glass/bucket/wooden{
- pixel_y = 9;
- pixel_x = -4
- },
-/turf/open/floor/ship/dirt/dark,
-/area/ship/roumain)
-"lM" = (
-/obj/structure/railing/corner{
- dir = 4
- },
-/obj/machinery/hydroponics/soil,
-/obj/item/seeds/cotton,
-/obj/item/seeds/cotton,
-/obj/item/storage/bag/plants/portaseeder,
-/obj/item/storage/bag/plants,
-/turf/open/floor/ship/dirt/dark,
-/area/ship/roumain)
-"lO" = (
-/obj/structure/cable/orange{
- icon_state = "4-5"
- },
-/obj/structure/cable/orange{
- icon_state = "8-10"
- },
-/turf/open/floor/plasteel/tech,
-/area/ship/storage)
-"md" = (
-/obj/docking_port{
- dwidth = 15;
- dir = 2;
- width = 30;
- height = 15
- },
-/turf/open/floor/engine/hull,
-/area/ship/external/dark)
-"mj" = (
-/obj/structure/flora/ausbushes/brflowers,
-/obj/structure/flora/ausbushes/sparsegrass,
-/obj/item/kirbyplants/random,
-/turf/open/floor/grass/ship/jungle,
-/area/ship/roumain)
-"mr" = (
-/obj/structure/cable/orange{
- icon_state = "4-5"
- },
-/obj/structure/cable/orange{
- icon_state = "2-6"
- },
-/obj/item/clothing/under/suit/roumain,
-/obj/item/clothing/suit/armor/roumain,
-/obj/item/clothing/head/cowboy/sec/roumain,
-/obj/item/clothing/suit/armor/riot/chaplain/witchhunter,
-/obj/item/clothing/head/helmet/chaplain/witchunter_hat,
-/obj/item/storage/backpack/cultpack,
-/obj/item/flashlight/lantern,
-/obj/item/kitchen/knife/combat/survival,
-/obj/item/gun/ballistic/shotgun/winchester,
-/obj/structure/closet/secure_closet/hunter,
-/obj/item/lighter,
-/obj/item/ammo_box/c38_box,
-/obj/item/disk/holodisk/roumain,
-/obj/item/clothing/shoes/cowboy/black,
-/obj/item/clothing/shoes/cowboy,
-/obj/item/clothing/shoes/jackboots,
-/obj/item/book/manual/srmlore,
-/turf/open/floor/wood/ebony,
-/area/ship/crew/dorm)
-"mw" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/door/poddoor/shutters{
- name = "Body Shutters";
- id = "body_shutters";
- dir = 8
- },
-/turf/open/floor/plating,
-/area/ship/roumain)
-"mD" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/door/poddoor/shutters{
- name = "Body Shutters";
- id = "body_shutters"
- },
-/turf/open/floor/plating,
-/area/ship/medical)
-"mE" = (
-/obj/structure/window/reinforced/spawner{
- dir = 1
- },
-/obj/machinery/power/shuttle/engine/electric{
- dir = 1
- },
-/obj/structure/cable/pink,
-/turf/open/floor/engine/hull,
-/area/ship/engineering/engine)
-"mJ" = (
-/obj/structure/mirror{
- pixel_y = -32
- },
-/obj/structure/closet/wall/white{
- dir = 8;
- pixel_x = 32
- },
-/turf/open/floor/grass/ship/jungle,
-/area/ship/crew/toilet)
-"mS" = (
-/obj/structure/cable/orange{
- icon_state = "5-10"
- },
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
- dir = 1
- },
-/turf/open/floor/wood/maple,
-/area/ship/construction)
-"na" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/toilet)
-"nj" = (
-/obj/structure/chair/pew/right{
- dir = 1
- },
-/mob/living/simple_animal/cow,
-/turf/open/floor/ship/dirt/dark,
-/area/ship/roumain)
-"nk" = (
-/obj/item/storage/box/emptysandbags,
-/obj/item/storage/belt/mining,
-/obj/item/reagent_containers/hypospray/medipen/survival,
-/obj/item/flashlight/seclite,
-/obj/item/borg/upgrade/modkit/indoors,
-/obj/item/gun/energy/kinetic_accelerator,
-/obj/item/storage/bag/ore,
-/obj/item/gun/ballistic/shotgun/winchester/mk1,
-/obj/item/shovel,
-/obj/item/gps/mining,
-/obj/structure/closet/secure_closet/miningcloset,
-/obj/item/stack/marker_beacon/thirty,
-/obj/item/pickaxe,
-/obj/item/t_scanner/adv_mining_scanner/lesser,
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/storage)
-"nt" = (
-/obj/structure/railing{
- dir = 4
- },
-/obj/effect/turf_decal/siding/wood/end{
- dir = 4
- },
-/turf/open/floor/wood/yew,
-/area/ship/roumain)
-"nO" = (
-/obj/structure/table/wood,
-/obj/item/storage/toolbox/electrical{
- pixel_x = -1;
- pixel_y = 4
- },
-/obj/item/storage/toolbox/mechanical{
- pixel_y = -3;
- pixel_x = 3
- },
-/obj/item/weldingtool/largetank,
-/obj/item/clothing/head/welding,
-/turf/open/floor/plating,
-/area/ship/engineering/electrical)
-"nY" = (
-/obj/structure/railing/corner{
- dir = 8
- },
-/obj/effect/landmark/observer_start,
-/turf/open/floor/plating{
- icon_state = "greenerdirt"
- },
-/area/ship/roumain)
-"nZ" = (
-/obj/effect/turf_decal/industrial/warning,
-/obj/effect/turf_decal/siding/wood{
- dir = 4
- },
-/obj/machinery/door/firedoor/border_only,
-/obj/structure/railing,
-/turf/open/floor/wood/maple,
-/area/ship/construction)
-"oC" = (
-/obj/structure/cable/orange{
- icon_state = "8-10"
- },
-/obj/structure/cable/orange{
- icon_state = "4-6"
- },
-/turf/open/floor/plasteel/tech,
-/area/ship/storage)
-"pb" = (
-/obj/structure/cable/orange{
- icon_state = "4-10"
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
- dir = 8
- },
-/obj/machinery/button/door{
- id = "starboard_shutters";
- name = "starboard shutters control";
- pixel_y = 23
- },
-/obj/item/flashlight/lantern,
-/turf/open/floor/plating,
-/area/ship/engineering/engine)
-"pd" = (
-/obj/structure/flora/rock/jungle,
-/turf/open/floor/plating/ship/water,
-/area/ship/roumain)
-"pH" = (
-/obj/structure/cable/orange{
- icon_state = "4-5"
- },
-/obj/structure/cable/orange{
- icon_state = "2-5"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 6
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 6
- },
-/obj/effect/turf_decal/corner/opaque/blue/diagonal,
-/obj/machinery/airalarm/directional/west,
-/turf/open/floor/plasteel/white,
-/area/ship/medical)
-"qv" = (
-/obj/structure/table/rolling,
-/obj/item/melee/baton/cattleprod{
- pixel_x = -6;
- pixel_y = 7
- },
-/obj/item/lighter{
- pixel_x = -5;
- pixel_y = 2
- },
-/obj/item/screwdriver{
- pixel_y = 4
- },
-/obj/item/wirecutters{
- pixel_y = 4;
- pixel_x = 10
- },
-/obj/item/kitchen/knife{
- pixel_x = 8;
- pixel_y = 5
- },
-/obj/item/crowbar{
- pixel_y = 8
- },
-/obj/structure/cable/orange{
- icon_state = "2-9"
- },
-/obj/item/wrench{
- pixel_y = 5
- },
-/obj/effect/turf_decal/corner/opaque/blue/diagonal,
-/turf/open/floor/plasteel/white,
-/area/ship/medical)
-"qz" = (
-/obj/machinery/door/poddoor{
- id = "port_blasts";
- name = "Port Blast Door"
- },
-/turf/open/floor/plasteel/tech,
-/area/ship/storage)
-"qJ" = (
-/obj/structure/destructible/tribal_torch,
-/turf/open/floor/grass/ship/jungle,
-/area/ship/roumain)
-"qN" = (
-/obj/structure/railing/corner{
- dir = 1
- },
-/turf/open/floor/ship/dirt/dark,
-/area/ship/roumain)
-"qQ" = (
-/obj/machinery/suit_storage_unit/inherit,
-/obj/effect/turf_decal/siding/wood/end,
-/obj/item/clothing/suit/space/hardsuit/mining/independent,
-/obj/item/clothing/mask/breath,
-/obj/item/tank/internals/oxygen,
-/turf/open/floor/wood/mahogany,
-/area/ship/roumain)
-"qZ" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/door/poddoor/shutters{
- name = "Body Shutters";
- id = "body_shutters"
- },
-/obj/structure/cable/orange{
- icon_state = "1-2"
- },
-/turf/open/floor/plating,
-/area/ship/roumain)
-"re" = (
-/obj/structure/railing/corner{
- dir = 4
- },
-/turf/open/floor/ship/dirt/dark,
-/area/ship/roumain)
-"rj" = (
-/obj/structure/table/wood,
-/obj/item/slimepotion/slime/sentience,
-/turf/open/floor/grass/ship/jungle,
-/area/ship/roumain)
-"rD" = (
-/obj/effect/turf_decal/siding/wood/end,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
- dir = 1
- },
-/turf/open/floor/wood/yew,
-/area/ship/roumain)
-"rE" = (
-/turf/open/floor/grass/ship/jungle,
-/area/ship/crew/toilet)
-"rK" = (
-/obj/machinery/airalarm/directional/east,
-/turf/open/floor/grass/ship/jungle,
-/area/ship/crew/toilet)
-"sb" = (
-/obj/effect/turf_decal/industrial/warning,
-/obj/structure/reagent_dispensers/fueltank,
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/storage)
-"sm" = (
-/obj/structure/flora/rock/jungle,
-/obj/structure/railing{
- dir = 10
- },
-/turf/open/floor/ship/dirt/dark,
-/area/ship/roumain)
-"sr" = (
-/obj/machinery/door/airlock/mining{
- name = "Manufacturing and Expedition"
- },
-/obj/machinery/door/firedoor/border_only{
- dir = 1
- },
-/obj/machinery/door/firedoor/border_only,
-/turf/open/floor/wood/maple,
-/area/ship/construction)
-"ss" = (
-/obj/structure/window/reinforced/spawner,
-/obj/machinery/power/smes/shuttle/precharged{
- dir = 1
- },
-/obj/structure/cable/pink{
- icon_state = "0-2"
- },
-/obj/machinery/door/poddoor/shutters{
- id = "port_shutters";
- name = "Engine Shutters"
- },
-/turf/open/floor/plating,
-/area/ship/engineering)
-"sv" = (
-/obj/structure/curtain/bounty,
-/obj/machinery/shower{
- pixel_y = 8
- },
-/obj/effect/turf_decal/stoneborder,
-/obj/effect/turf_decal/stoneborder{
- dir = 1
- },
-/turf/open/floor/ship/dirt/dark,
-/area/ship/crew/toilet)
-"sA" = (
-/obj/structure/cable/orange{
- icon_state = "1-4"
- },
-/turf/open/floor/engine/hull,
-/area/ship/external/dark)
-"sD" = (
-/obj/structure/cable/orange{
- icon_state = "1-2"
- },
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/door/poddoor/shutters{
- name = "Body Shutters";
- id = "body_shutters"
- },
-/turf/open/floor/plating,
-/area/ship/roumain)
-"sH" = (
-/turf/template_noop,
-/area/template_noop)
-"sT" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable/orange{
- icon_state = "1-4"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 5
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 5
- },
-/obj/machinery/door/poddoor/shutters{
- name = "Body Shutters";
- id = "body_shutters";
- dir = 4
- },
-/turf/open/floor/plating,
-/area/ship/roumain)
-"ts" = (
-/obj/machinery/door/airlock/glass{
- name = "Port Wing";
- dir = 4
- },
-/obj/machinery/door/firedoor/border_only{
- dir = 8
- },
-/obj/machinery/door/firedoor/border_only{
- dir = 4
- },
-/turf/open/floor/plasteel/dark,
-/area/ship/roumain)
-"tu" = (
-/obj/structure/window/reinforced/spawner{
- dir = 8
- },
-/obj/machinery/power/smes/shuttle/precharged{
- dir = 1
- },
-/obj/structure/cable/pink{
- icon_state = "0-2"
- },
-/obj/machinery/door/poddoor/shutters{
- id = "starboard_shutters";
- name = "Starboard Engine Shutters"
- },
-/turf/open/floor/plating,
-/area/ship/engineering/engine)
-"tC" = (
-/obj/machinery/airalarm/directional/east,
-/obj/machinery/power/apc/auto_name/directional/north,
-/obj/structure/cable/orange{
- icon_state = "0-2"
- },
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/toilet)
-"tF" = (
-/obj/structure/cable/orange{
- icon_state = "1-6"
- },
-/obj/structure/cable/orange{
- icon_state = "2-10"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 10
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 10
- },
-/obj/effect/turf_decal/corner/opaque/blue/diagonal,
-/turf/open/floor/plasteel/white,
-/area/ship/medical)
-"tM" = (
-/obj/effect/turf_decal/industrial/warning,
-/obj/effect/turf_decal/industrial/caution,
-/obj/structure/ore_box,
-/obj/structure/cable/orange{
- icon_state = "4-8"
- },
-/turf/open/floor/plasteel/tech,
-/area/ship/storage)
-"uI" = (
-/obj/structure/railing,
-/turf/open/floor/ship/dirt/dark,
-/area/ship/roumain)
-"uM" = (
-/obj/structure/railing/corner{
- dir = 1
- },
-/obj/item/lighter,
-/turf/open/floor/ship/dirt/dark,
-/area/ship/roumain)
-"uP" = (
-/obj/effect/turf_decal/industrial/warning,
-/obj/effect/turf_decal/industrial/caution,
-/obj/structure/ore_box,
-/turf/open/floor/plasteel/tech,
-/area/ship/storage)
-"uY" = (
-/turf/open/floor/plasteel/dark,
-/area/ship/roumain)
-"vd" = (
-/obj/structure/window/reinforced/spawner{
- dir = 1
- },
-/obj/machinery/power/shuttle/engine/fueled/plasma{
- dir = 1
- },
-/turf/open/floor/engine/hull,
-/area/ship/engineering/engine)
-"vn" = (
-/obj/structure/cable/orange{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
- dir = 1
- },
-/obj/structure/cable/orange{
- icon_state = "1-4"
- },
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/toilet)
-"vz" = (
-/obj/machinery/power/apc/auto_name/directional/south,
-/obj/structure/cable/orange{
- icon_state = "0-8"
- },
-/turf/open/floor/plating,
-/area/ship/engineering/electrical)
-"vW" = (
-/obj/machinery/computer/helm,
-/obj/effect/turf_decal/siding/wood/end{
- dir = 1
- },
-/turf/open/floor/wood/mahogany,
-/area/ship/roumain)
-"vX" = (
-/obj/effect/turf_decal/siding/wood,
-/obj/effect/turf_decal/siding/wood/end{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 4
- },
-/turf/open/floor/wood/yew,
-/area/ship/roumain)
-"wm" = (
-/turf/closed/wall/r_wall,
-/area/ship/engineering/engine)
-"wp" = (
-/turf/closed/wall/r_wall,
-/area/ship/roumain)
-"ww" = (
-/obj/structure/sink/puddle,
-/turf/open/floor/ship/dirt/dark,
-/area/ship/crew/toilet)
-"wA" = (
-/obj/structure/flora/ausbushes/brflowers,
-/obj/structure/flora/ausbushes/sparsegrass,
-/obj/structure/railing,
-/turf/open/floor/grass/ship/jungle,
-/area/ship/roumain)
-"wC" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/door/poddoor/shutters{
- name = "Body Shutters";
- id = "body_shutters";
- dir = 4
- },
-/turf/open/floor/plating,
-/area/ship/roumain)
-"wD" = (
-/obj/vehicle/ridden/wheelchair,
-/obj/item/melee/transforming/cleaving_saw/old,
-/turf/open/floor/ship/dirt/dark,
-/area/ship/roumain)
-"wE" = (
-/obj/machinery/door/airlock/glass{
- name = "Port Wing";
- dir = 4
- },
-/obj/structure/cable/orange{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
- },
-/obj/machinery/door/firedoor/border_only{
- dir = 8
- },
-/obj/machinery/door/firedoor/border_only{
- dir = 4
- },
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/toilet)
-"xe" = (
-/obj/structure/table/wood,
-/obj/item/storage/toolbox/mechanical{
- pixel_y = -3;
- pixel_x = 3
- },
-/obj/item/storage/toolbox/electrical{
- pixel_x = -1;
- pixel_y = 4
- },
-/obj/item/multitool{
- pixel_y = 6;
- pixel_x = -8
- },
-/obj/item/weldingtool/largetank,
-/obj/item/clothing/head/welding,
-/obj/item/clothing/gloves/color/yellow,
-/turf/open/floor/wood/maple,
-/area/ship/construction)
-"xf" = (
-/obj/structure/cable/orange{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/turf/open/floor/engine/hull,
-/area/ship/external/dark)
-"xB" = (
-/obj/structure/railing{
- dir = 8
- },
-/turf/open/floor/plating/ship/water,
-/area/ship/roumain)
-"xC" = (
-/obj/structure/chair/pew/right{
- dir = 1
- },
-/obj/structure/flora/ausbushes/brflowers,
-/turf/open/floor/grass/ship/jungle,
-/area/ship/roumain)
-"xD" = (
-/obj/structure/sink/puddle,
-/turf/open/floor/ship/dirt/dark,
-/area/ship/medical)
-"yn" = (
-/obj/structure/cable/orange{
- icon_state = "8-10"
- },
-/obj/machinery/airalarm/directional/north,
-/obj/machinery/portable_atmospherics/canister/toxins,
-/obj/machinery/atmospherics/components/unary/portables_connector/visible,
-/turf/open/floor/plating,
-/area/ship/engineering/engine)
-"yp" = (
-/obj/structure/cable/orange{
- icon_state = "4-6"
- },
-/obj/structure/tank_dispenser/oxygen,
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/storage)
-"yq" = (
-/obj/structure/cable/orange{
- icon_state = "1-2"
- },
-/obj/structure/destructible/tribal_torch,
-/turf/open/floor/wood/ebony,
-/area/ship/crew/dorm)
-"yz" = (
-/obj/structure/cable/orange{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 9
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 5
- },
-/obj/structure/cable/orange{
- icon_state = "2-6"
- },
-/turf/open/floor/plasteel/tech,
-/area/ship/storage)
-"yA" = (
-/obj/structure/cable/orange{
- icon_state = "1-2"
- },
-/obj/structure/cable/orange{
- icon_state = "1-8"
- },
-/obj/structure/cable/orange{
- icon_state = "1-4"
- },
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 10
- },
-/turf/open/floor/plating,
-/area/ship/engineering/electrical)
-"yN" = (
-/obj/structure/flora/ausbushes/brflowers,
-/obj/structure/flora/ausbushes/grassybush,
-/turf/open/floor/grass/ship/jungle,
-/area/ship/roumain)
-"yV" = (
-/obj/item/soap/deluxe,
-/obj/item/bikehorn/rubberducky,
-/obj/structure/window/reinforced/tinted/frosted{
- dir = 1
- },
-/obj/machinery/door/window{
- dir = 4
- },
-/obj/effect/turf_decal/stoneborder,
-/obj/effect/turf_decal/stoneborder{
- dir = 1
- },
-/turf/open/floor/ship/dirt/dark,
-/area/ship/crew/toilet)
-"yZ" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable/orange{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/door/poddoor/shutters{
- name = "Body Shutters";
- id = "body_shutters"
- },
-/turf/open/floor/plating,
-/area/ship/roumain)
-"zc" = (
-/obj/structure/destructible/tribal_torch,
-/obj/effect/turf_decal/corner/opaque/blue/diagonal,
-/obj/machinery/power/apc/auto_name/directional/east,
-/obj/structure/cable/orange,
-/turf/open/floor/plasteel/white,
-/area/ship/medical)
-"zv" = (
-/obj/effect/turf_decal/siding/wood/end{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 4
- },
-/turf/open/floor/wood/yew,
-/area/ship/roumain)
-"zO" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable/orange{
- icon_state = "1-8"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 9
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 9
- },
-/obj/machinery/door/poddoor/shutters{
- name = "Body Shutters";
- id = "body_shutters";
- dir = 4
- },
-/turf/open/floor/plating,
-/area/ship/roumain)
-"zT" = (
-/obj/machinery/power/smes/engineering,
-/obj/structure/cable/orange{
- icon_state = "0-4"
- },
-/turf/open/floor/plating,
-/area/ship/engineering/electrical)
-"zX" = (
-/obj/structure/bedsheetbin,
-/obj/structure/table/wood,
-/obj/item/flashlight/lantern,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
- dir = 1
- },
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/toilet)
-"zZ" = (
-/obj/structure/railing{
- dir = 8
- },
-/obj/effect/turf_decal/spline/fancy{
- dir = 1
- },
-/obj/machinery/suit_storage_unit/inherit,
-/obj/item/clothing/suit/space/hardsuit/mining/independent,
-/obj/item/clothing/mask/breath,
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/storage)
-"Ac" = (
-/obj/structure/railing{
- dir = 1
- },
-/obj/structure/kitchenspike,
-/turf/open/floor/ship/dirt/dark,
-/area/ship/roumain)
-"Ao" = (
-/obj/structure/railing/corner,
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/ship/dirt/dark,
-/area/ship/roumain)
-"Ar" = (
-/obj/structure/closet/crate/freezer,
-/obj/item/stack/medical/mesh/advanced,
-/obj/item/stack/medical/gauze/twelve,
-/obj/item/stack/medical/splint,
-/obj/item/stack/medical/suture/medicated,
-/obj/item/organ_storage,
-/obj/item/organ_storage,
-/obj/item/organ_storage,
-/obj/structure/cable/orange{
- icon_state = "2-5"
- },
-/obj/item/reagent_containers/blood/random,
-/obj/item/reagent_containers/blood/OMinus,
-/obj/item/reagent_containers/blood/random,
-/obj/effect/turf_decal/corner/opaque/blue/diagonal,
-/turf/open/floor/plasteel/white,
-/area/ship/medical)
-"At" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/item/reagent_containers/food/drinks/breakawayflask/vintage/ashwine,
-/turf/open/floor/plating{
- icon_state = "greenerdirt"
- },
-/area/ship/roumain)
-"AL" = (
-/obj/structure/cable/orange{
- icon_state = "2-4"
- },
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 6
- },
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/toilet)
-"AM" = (
-/obj/structure/window/reinforced/spawner{
- dir = 4
- },
-/obj/structure/window/reinforced/spawner,
-/obj/machinery/power/smes/shuttle/precharged{
- dir = 1
- },
-/obj/structure/cable/pink{
- icon_state = "0-2"
- },
-/obj/machinery/door/poddoor/shutters{
- id = "port_shutters";
- name = "Engine Shutters"
- },
-/turf/open/floor/plating,
-/area/ship/engineering)
-"AN" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/door/poddoor/shutters{
- name = "Body Shutters";
- id = "body_shutters"
- },
-/turf/open/floor/plating,
-/area/ship/roumain)
-"AQ" = (
-/obj/structure/cable/orange{
- icon_state = "1-8"
- },
-/obj/machinery/door/poddoor{
- id = "port_blasts";
- name = "Port Blast Door"
- },
-/turf/open/floor/plasteel/tech,
-/area/ship/storage)
-"AY" = (
-/obj/machinery/power/terminal,
-/obj/structure/cable/orange{
- icon_state = "0-4"
- },
-/obj/item/candle/tribal_torch,
-/obj/item/candle/tribal_torch,
-/turf/open/floor/plating,
-/area/ship/engineering)
-"AZ" = (
-/obj/structure/chair/pew/right{
- dir = 1
- },
-/mob/living/simple_animal/chicken,
-/turf/open/floor/ship/dirt/dark,
-/area/ship/roumain)
-"Bu" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable/orange{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/door/poddoor/shutters{
- name = "Body Shutters";
- id = "body_shutters"
- },
-/turf/open/floor/plating,
-/area/ship/medical)
-"Bx" = (
-/obj/structure/railing/corner{
- dir = 8
- },
-/obj/structure/flora/ausbushes/brflowers,
-/obj/structure/flora/ausbushes/sparsegrass,
-/obj/machinery/smartfridge/drying_rack,
-/turf/open/floor/grass/ship/jungle,
-/area/ship/roumain)
-"Bz" = (
-/obj/structure/railing{
- dir = 1
- },
-/obj/item/reagent_containers/food/drinks/breakawayflask/vintage/ashwine,
-/turf/open/floor/ship/dirt/dark,
-/area/ship/roumain)
-"BB" = (
-/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/bottle/whiskey{
- pixel_x = 7;
- pixel_y = 6
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
- dir = 8
- },
-/obj/effect/turf_decal/corner/opaque/blue/diagonal,
-/obj/item/reagent_containers/food/drinks/bottle/absinthe,
-/obj/item/reagent_containers/food/drinks/bottle/absinthe{
- pixel_y = 8;
- pixel_x = -6
- },
-/obj/item/book/manual/wiki/surgery,
-/turf/open/floor/plasteel/white,
-/area/ship/medical)
-"BK" = (
-/obj/structure/window/plasma/reinforced/spawner{
- dir = 8
- },
-/obj/structure/window/plasma/reinforced/spawner,
-/obj/structure/window/plasma/reinforced/spawner{
- dir = 4
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/layer4{
- dir = 8
- },
-/turf/open/floor/engine/airless,
-/area/ship/engineering/engine)
-"BO" = (
-/obj/structure/chair/pew/left{
- dir = 1
- },
-/mob/living/simple_animal/cow,
-/turf/open/floor/ship/dirt/dark,
-/area/ship/roumain)
-"Cr" = (
-/obj/structure/cable/orange{
- icon_state = "1-8"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 9
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 9
- },
-/turf/open/floor/engine/hull,
-/area/ship/external/dark)
-"Cx" = (
-/obj/structure/cable/orange{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 4
- },
-/turf/open/floor/engine/hull,
-/area/ship/external/dark)
-"CC" = (
-/obj/structure/chair/pew{
- dir = 1
- },
-/turf/open/floor/ship/dirt/dark,
-/area/ship/roumain)
-"CF" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 4
- },
-/obj/effect/turf_decal/siding/wood{
- dir = 8
- },
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/turf/open/floor/wood/yew,
-/area/ship/roumain)
-"CH" = (
-/obj/structure/cable/orange{
- icon_state = "1-8"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 9
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 9
- },
-/obj/structure/cable/orange{
- icon_state = "1-2"
- },
-/turf/open/floor/plasteel/dark,
-/area/ship/roumain)
-"Dg" = (
-/obj/structure/railing/corner{
- dir = 1
- },
-/obj/structure/flora/ausbushes/brflowers,
-/obj/structure/flora/ausbushes/grassybush,
-/obj/structure/fence{
- dir = 4
- },
-/obj/machinery/door/firedoor/border_only{
- dir = 1
- },
-/turf/open/floor/grass/ship/jungle,
-/area/ship/roumain)
-"Du" = (
-/obj/structure/cable/orange{
- icon_state = "1-9"
- },
-/obj/structure/cable/orange{
- icon_state = "6-8"
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
- dir = 1
- },
-/turf/open/floor/wood/ebony,
-/area/ship/crew/dorm)
-"Dz" = (
-/obj/machinery/door/poddoor{
- id = "glaive_body_blasts";
- name = "Body Blast Door";
- dir = 4
- },
-/turf/open/floor/plasteel/dark,
-/area/ship/roumain)
-"DG" = (
-/turf/closed/wall/r_wall,
-/area/ship/engineering/electrical)
-"DL" = (
-/obj/structure/cable/orange{
- icon_state = "2-8"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 10
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 10
- },
-/turf/open/floor/engine/hull,
-/area/ship/external/dark)
-"DR" = (
-/obj/machinery/portable_atmospherics/canister/toxins,
-/obj/machinery/atmospherics/components/unary/portables_connector/visible,
-/turf/open/floor/plating,
-/area/ship/engineering)
-"DS" = (
-/obj/structure/flora/ausbushes/grassybush,
-/obj/structure/flora/ausbushes/brflowers,
-/turf/open/floor/grass/ship/jungle,
-/area/ship/roumain)
-"DX" = (
-/obj/structure/flora/ausbushes/brflowers,
-/obj/structure/flora/ausbushes/sunnybush,
-/turf/open/floor/grass/ship/jungle,
-/area/ship/roumain)
-"Et" = (
-/obj/structure/cable/orange{
- icon_state = "2-8"
- },
-/turf/open/floor/plating,
-/area/ship/engineering/electrical)
-"Ex" = (
-/obj/structure/table/wood,
-/obj/item/reagent_containers/food/snacks/grown/ash_flora/mushroom_leaf{
- pixel_y = -2;
- pixel_x = -3
- },
-/obj/structure/cable/orange{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/item/reagent_containers/food/snacks/grown/ash_flora/shavings{
- pixel_x = 4;
- pixel_y = -3
- },
-/obj/item/reagent_containers/food/snacks/grown/ash_flora/mushroom_stem{
- pixel_x = -3;
- pixel_y = -6
- },
-/obj/item/reagent_containers/food/snacks/grown/ash_flora/mushroom_cap{
- pixel_y = -1;
- pixel_x = -6
- },
-/obj/item/reagent_containers/food/snacks/meat/slab/bear{
- pixel_y = 1;
- pixel_x = -7
- },
-/obj/item/reagent_containers/food/snacks/meat/slab/bear{
- pixel_y = 1;
- pixel_x = -7
- },
-/obj/item/reagent_containers/food/snacks/meat/slab/bear{
- pixel_y = 1;
- pixel_x = -7
- },
-/obj/item/reagent_containers/food/snacks/grown/ash_flora/cactus_fruit{
- pixel_x = -9;
- pixel_y = -3
- },
-/obj/item/reagent_containers/glass/bowl/mushroom_bowl{
- pixel_x = -4;
- pixel_y = 8
- },
-/obj/item/reagent_containers/glass/mortar{
- pixel_y = 9;
- pixel_x = 6
- },
-/obj/item/pestle{
- pixel_y = 6
- },
-/obj/item/reagent_containers/food/snacks/grown/ash_flora/mushroom_leaf,
-/obj/effect/turf_decal/corner/opaque/blue/diagonal,
-/obj/item/reagent_containers/food/snacks/grown/ash_flora/puce,
-/obj/item/reagent_containers/food/snacks/grown/ash_flora/fireblossom,
-/obj/structure/flora/ash/fern,
-/obj/item/reagent_containers/food/snacks/grown/ash_flora/cactus_fruit,
-/obj/item/reagent_containers/food/snacks/grown/ash_flora/cactus_fruit,
-/obj/item/reagent_containers/food/snacks/grown/ash_flora/cactus_fruit,
-/obj/item/reagent_containers/food/snacks/grown/ash_flora/mushroom_leaf,
-/turf/open/floor/plasteel/white,
-/area/ship/medical)
-"EJ" = (
-/obj/machinery/power/smes/engineering,
-/obj/structure/cable/orange{
- icon_state = "0-8"
- },
-/turf/open/floor/plating,
-/area/ship/engineering/electrical)
-"EN" = (
-/obj/item/reagent_containers/glass/bottle/diethylamine,
-/obj/item/reagent_containers/glass/bottle/diethylamine,
-/turf/open/floor/grass/ship/jungle,
-/area/ship/construction)
-"EO" = (
-/obj/structure/cable/orange{
- icon_state = "2-8"
- },
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 9
- },
-/obj/effect/turf_decal/corner/opaque/blue/diagonal,
-/turf/open/floor/plasteel/white,
-/area/ship/medical)
-"Fa" = (
-/obj/structure/railing/corner,
-/turf/open/floor/ship/dirt/dark,
-/area/ship/roumain)
-"Fd" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 8
- },
-/obj/effect/turf_decal/siding/wood{
- dir = 4
- },
-/obj/structure/destructible/tribal_torch,
-/turf/open/floor/wood/mahogany,
-/area/ship/roumain)
-"Fn" = (
-/obj/structure/table/wood,
-/obj/item/reagent_containers/syringe/calomel{
- pixel_x = 3;
- pixel_y = -5
- },
-/obj/item/reagent_containers/syringe/antiviral{
- pixel_y = -6;
- pixel_x = 8
- },
-/obj/item/reagent_containers/hypospray/medipen/stimpack{
- pixel_x = -4
- },
-/obj/item/reagent_containers/hypospray/medipen/survival{
- pixel_x = -7;
- pixel_y = -5
- },
-/obj/item/reagent_containers/glass/bottle/potass_iodide{
- pixel_y = 10;
- pixel_x = -7
- },
-/obj/item/reagent_containers/glass/bottle/atropine{
- pixel_y = 9
- },
-/obj/structure/cable/orange{
- icon_state = "2-10"
- },
-/obj/effect/turf_decal/corner/opaque/blue/diagonal,
-/turf/open/floor/plasteel/white,
-/area/ship/medical)
-"Fp" = (
-/obj/structure/railing{
- dir = 5
- },
-/obj/structure/kitchenspike,
-/turf/open/floor/ship/dirt/dark,
-/area/ship/roumain)
-"Fr" = (
-/obj/structure/table/wood,
-/obj/item/storage/box/stockparts/basic,
-/obj/item/storage/box/stockparts/basic,
-/turf/open/floor/wood/maple,
-/area/ship/construction)
-"Fu" = (
-/obj/structure/railing/corner,
-/obj/structure/flora/ausbushes/brflowers,
-/obj/structure/flora/ausbushes/sparsegrass,
-/obj/machinery/button/door{
- dir = 1;
- pixel_x = -5;
- pixel_y = -26;
- name = "Body Blast Door Control";
- id = "glaive_body_blasts"
- },
-/obj/machinery/button/shieldwallgen{
- dir = 1;
- pixel_y = -25;
- pixel_x = 6;
- name = "Body Holofield Switch";
- id = "glaive_body_holo"
- },
-/obj/structure/fermenting_barrel,
-/turf/open/floor/grass/ship/jungle,
-/area/ship/roumain)
-"FA" = (
-/turf/open/floor/engine/hull,
-/area/ship/external/dark)
-"FE" = (
-/obj/structure/cable/orange{
- icon_state = "2-4"
- },
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
-/turf/open/floor/plating,
-/area/ship/engineering/electrical)
-"FG" = (
-/obj/structure/cable/orange{
- icon_state = "2-8"
- },
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/turf/open/floor/wood/ebony,
-/area/ship/crew/dorm)
-"FR" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 4
- },
-/obj/structure/destructible/tribal_torch,
-/turf/open/floor/wood/maple,
-/area/ship/construction)
-"FW" = (
-/obj/machinery/power/terminal,
-/obj/structure/cable/orange{
- icon_state = "0-5"
- },
-/obj/item/candle/tribal_torch,
-/obj/item/candle/tribal_torch,
-/turf/open/floor/plating,
-/area/ship/engineering/engine)
-"Gi" = (
-/obj/structure/cable/orange{
- icon_state = "2-9"
- },
-/turf/open/floor/plasteel/tech,
-/area/ship/storage)
-"GM" = (
-/obj/machinery/power/terminal,
-/obj/structure/cable/orange,
-/turf/open/floor/plating,
-/area/ship/engineering/engine)
-"GP" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/item/toy/plush/snakeplushie,
-/turf/open/floor/ship/dirt/dark,
-/area/ship/roumain)
-"Ho" = (
-/obj/structure/cable/orange{
- icon_state = "1-2"
- },
-/turf/open/floor/engine/hull,
-/area/ship/external/dark)
-"Hw" = (
-/obj/effect/turf_decal/spline/fancy{
- dir = 1
- },
-/obj/machinery/suit_storage_unit/inherit,
-/obj/item/clothing/suit/space/hardsuit/mining/independent,
-/obj/structure/cable/orange{
- icon_state = "6-9"
- },
-/obj/item/clothing/mask/breath,
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/storage)
-"HA" = (
-/obj/effect/turf_decal/industrial/warning,
-/obj/effect/turf_decal/siding/wood{
- dir = 8
- },
-/obj/machinery/door/firedoor/border_only,
-/obj/structure/railing,
-/turf/open/floor/wood/maple,
-/area/ship/construction)
-"HB" = (
-/obj/machinery/power/shieldwallgen/atmos/roundstart{
- dir = 1;
- id = "glaive_body_holo"
- },
-/obj/structure/cable/orange{
- icon_state = "0-8"
- },
-/obj/machinery/door/poddoor{
- id = "glaive_body_blasts";
- name = "Body Blast Door";
- dir = 4
- },
-/turf/open/floor/plasteel/dark,
-/area/ship/roumain)
-"HS" = (
-/obj/machinery/power/apc/auto_name/directional/north,
-/obj/structure/cable/orange{
- icon_state = "0-4"
- },
-/obj/structure/cable/orange{
- icon_state = "0-6"
- },
-/obj/machinery/portable_atmospherics/pump,
-/turf/open/floor/plating,
-/area/ship/engineering)
-"Ii" = (
-/obj/machinery/power/shieldwallgen/atmos/roundstart{
- id = "glaive_body_holo"
- },
-/obj/machinery/door/poddoor{
- id = "glaive_body_blasts";
- name = "Body Blast Door";
- dir = 4
- },
-/obj/structure/cable/orange{
- icon_state = "0-8"
- },
-/turf/open/floor/plasteel/dark,
-/area/ship/roumain)
-"Il" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
- dir = 4
- },
-/obj/structure/cable/orange{
- icon_state = "4-8"
- },
-/obj/machinery/portable_atmospherics/canister/air,
-/turf/open/floor/plating,
-/area/ship/engineering)
-"Io" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/on/layer4{
- dir = 4
- },
-/turf/open/floor/engine/hull,
-/area/ship/external/dark)
-"Ir" = (
-/obj/machinery/power/terminal{
- dir = 1
- },
-/obj/structure/cable/green{
- icon_state = "0-8"
- },
-/obj/structure/cable/orange{
- icon_state = "4-9"
- },
-/turf/open/floor/plating,
-/area/ship/engineering/electrical)
-"ID" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/structure/cable/orange{
- icon_state = "1-2"
- },
-/obj/machinery/door/airlock/maintenance_hatch{
- name = "Engine Room"
- },
-/obj/machinery/door/firedoor/border_only{
- dir = 1
- },
-/obj/machinery/door/firedoor/border_only,
-/turf/open/floor/plating,
-/area/ship/engineering)
-"IF" = (
-/turf/closed/wall,
-/area/ship/crew/dorm)
-"IZ" = (
-/turf/closed/wall,
-/area/ship/construction)
-"Jc" = (
-/obj/structure/cable/orange{
- icon_state = "1-5"
- },
-/obj/structure/cable/orange{
- icon_state = "8-10"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/turf/open/floor/wood/ebony,
-/area/ship/crew/dorm)
-"Jn" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/turf/open/floor/plasteel/stairs,
-/area/ship/storage)
-"Jx" = (
-/obj/structure/cable/orange{
- icon_state = "2-8"
- },
-/obj/structure/cable/orange{
- icon_state = "4-8"
- },
-/turf/open/floor/engine/hull,
-/area/ship/external/dark)
-"Jy" = (
-/obj/machinery/power/terminal,
-/obj/structure/cable/orange{
- icon_state = "0-8"
- },
-/turf/open/floor/plating,
-/area/ship/engineering)
-"JD" = (
-/obj/structure/cable/orange{
- icon_state = "1-5"
- },
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
-/obj/effect/turf_decal/corner/opaque/blue/diagonal,
-/turf/open/floor/plasteel/white,
-/area/ship/medical)
-"JG" = (
-/obj/structure/cable/orange{
- icon_state = "5-6"
- },
-/obj/structure/cable/orange{
- icon_state = "8-9"
- },
-/turf/open/floor/plasteel/tech,
-/area/ship/storage)
-"Kk" = (
-/obj/structure/cable/orange{
- icon_state = "5-9"
- },
-/obj/structure/cable/orange{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 4
- },
-/turf/open/floor/plating,
-/area/ship/engineering/electrical)
-"KP" = (
-/obj/structure/railing{
- dir = 5
- },
-/turf/open/floor/plating/ship/water,
-/area/ship/roumain)
-"KX" = (
-/obj/structure/flora/ausbushes/reedbush,
-/obj/structure/railing/corner{
- dir = 4
- },
-/mob/living/simple_animal/crab{
- name = "Tracie"
- },
-/turf/open/floor/plating/ship/water,
-/area/ship/roumain)
-"Lj" = (
-/obj/structure/destructible/tribal_torch,
-/obj/structure/railing{
- dir = 8
- },
-/turf/open/floor/ship/dirt/dark,
-/area/ship/roumain)
-"Lk" = (
-/obj/structure/flora/ausbushes/brflowers,
-/obj/structure/flora/ausbushes/fullgrass,
-/turf/open/floor/grass/ship/jungle,
-/area/ship/roumain)
-"LG" = (
-/obj/structure/flora/rock/jungle,
-/turf/open/floor/ship/dirt/dark,
-/area/ship/roumain)
-"LL" = (
-/obj/structure/cable/orange{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 4
- },
-/turf/open/floor/plasteel/tech,
-/area/ship/roumain)
-"LN" = (
-/turf/closed/wall/r_wall,
-/area/ship/storage)
-"LS" = (
-/obj/machinery/door/airlock{
- name = "Restroom";
- dir = 4
- },
-/obj/machinery/door/firedoor/border_only{
- dir = 8
- },
-/obj/machinery/door/firedoor/border_only{
- dir = 4
- },
-/turf/open/floor/grass/ship/jungle,
-/area/ship/crew/toilet)
-"Ma" = (
-/obj/machinery/power/shuttle/engine/fueled/plasma{
- dir = 1
- },
-/turf/open/floor/engine/hull,
-/area/ship/engineering)
-"Mh" = (
-/obj/structure/table/wood,
-/obj/item/radio{
- pixel_y = 6;
- pixel_x = 5
- },
-/obj/item/radio{
- pixel_y = 6;
- pixel_x = 5
- },
-/obj/item/radio{
- pixel_y = 6;
- pixel_x = 5
- },
-/obj/item/radio{
- pixel_y = 6;
- pixel_x = 5
- },
-/obj/item/radio{
- pixel_y = 6;
- pixel_x = 5
- },
-/obj/item/radio{
- pixel_y = 6;
- pixel_x = 5
- },
-/obj/item/radio{
- pixel_y = 6;
- pixel_x = 5
- },
-/obj/item/reagent_containers/food/snacks/grown/ash_flora/mushroom_stem{
- pixel_x = -7;
- pixel_y = 6
- },
-/obj/item/gps{
- pixel_x = -7
- },
-/obj/item/gps{
- pixel_x = -7
- },
-/obj/item/gps{
- pixel_x = -7
- },
-/obj/item/gps{
- pixel_x = -7
- },
-/obj/item/gps{
- pixel_x = -7
- },
-/obj/item/gps{
- pixel_x = -7
- },
-/obj/item/gps{
- pixel_x = -7
- },
-/obj/structure/cable/orange{
- icon_state = "1-2"
- },
-/obj/item/flashlight/lantern,
-/obj/item/flashlight/lantern,
-/obj/item/flashlight/lantern,
-/obj/item/flashlight/lantern,
-/obj/item/flashlight/lantern,
-/obj/item/flashlight/lantern,
-/obj/item/flashlight/lantern,
-/obj/machinery/airalarm/directional/east,
-/turf/open/floor/wood/ebony,
-/area/ship/crew/dorm)
-"Mi" = (
-/obj/effect/turf_decal/siding/wood,
-/obj/effect/turf_decal/siding/wood{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 4
- },
-/turf/open/floor/wood/yew,
-/area/ship/roumain)
-"Mj" = (
-/obj/machinery/airalarm/directional/east,
-/obj/structure/chair/wood/wings{
- dir = 1
- },
-/obj/effect/turf_decal/siding/wood/corner{
- dir = 1
- },
-/obj/effect/turf_decal/siding/wood{
- dir = 4
- },
-/obj/structure/cable/orange{
- icon_state = "1-8"
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
- dir = 1
- },
-/obj/effect/turf_decal/siding/wood/corner{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 1
- },
-/turf/open/floor/wood/mahogany,
-/area/ship/roumain)
-"MG" = (
-/obj/effect/turf_decal/industrial/warning,
-/obj/machinery/door/firedoor/border_only,
-/obj/structure/railing,
-/turf/open/floor/wood/maple,
-/area/ship/construction)
-"MR" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 4
- },
-/obj/effect/turf_decal/corner/opaque/blue/diagonal,
-/obj/machinery/door/firedoor/border_only{
- dir = 4
- },
-/obj/machinery/door/firedoor/border_only{
- dir = 8
- },
-/obj/machinery/door/airlock/medical/glass{
- name = "Medical Bay";
- dir = 4
- },
-/turf/open/floor/plasteel/white,
-/area/ship/medical)
-"MU" = (
-/obj/item/kinetic_crusher,
-/obj/item/storage/box/emptysandbags,
-/obj/item/storage/belt/mining,
-/obj/item/reagent_containers/hypospray/medipen/survival,
-/obj/item/flashlight/seclite,
-/obj/item/borg/upgrade/modkit/indoors,
-/obj/item/gun/energy/kinetic_accelerator,
-/obj/item/storage/bag/ore,
-/obj/item/shovel,
-/obj/item/gps/mining,
-/obj/structure/closet/secure_closet/miningcloset,
-/obj/item/stack/marker_beacon/thirty,
-/obj/item/pickaxe,
-/obj/item/t_scanner/adv_mining_scanner/lesser,
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/storage)
-"MV" = (
-/obj/structure/table/wood,
-/obj/machinery/button/door{
- id = "body_shutters";
- name = "body shutters control";
- pixel_y = 3
- },
-/obj/effect/turf_decal/siding/wood{
- dir = 4
- },
-/obj/effect/turf_decal/siding/wood{
- dir = 8
- },
-/obj/item/flashlight/lantern{
- pixel_x = -10
- },
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
- dir = 1
- },
-/turf/open/floor/wood/mahogany,
-/area/ship/roumain)
-"MW" = (
-/obj/machinery/power/port_gen/pacman,
-/obj/item/stack/sheet/mineral/plasma/twenty,
-/obj/structure/cable/green{
- icon_state = "0-8"
- },
-/turf/open/floor/plating,
-/area/ship/engineering/electrical)
-"MZ" = (
-/obj/structure/railing{
- dir = 9
- },
-/obj/item/kirbyplants/random,
-/turf/open/floor/ship/dirt/dark,
-/area/ship/roumain)
-"Nd" = (
-/obj/machinery/door/airlock/glass{
- name = "Dormitories";
- dir = 4
- },
-/obj/structure/cable/orange{
- icon_state = "4-8"
- },
-/obj/machinery/door/firedoor/border_only{
- dir = 4
- },
-/obj/machinery/door/firedoor/border_only{
- dir = 8
- },
-/turf/open/floor/wood/ebony,
-/area/ship/construction)
-"Ng" = (
-/obj/machinery/power/apc/auto_name/directional/north,
-/obj/structure/cable/orange{
- icon_state = "0-8"
- },
-/obj/structure/cable/orange{
- icon_state = "0-2"
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 4
- },
-/turf/open/floor/plating,
-/area/ship/engineering/engine)
-"Nm" = (
-/obj/machinery/holopad/emergency/command,
-/obj/effect/turf_decal/siding/wood{
- dir = 1
- },
-/obj/structure/cable/orange{
- icon_state = "4-8"
- },
-/obj/effect/turf_decal/siding/wood,
-/obj/item/disk/holodisk/roumain,
-/turf/open/floor/wood/mahogany,
-/area/ship/roumain)
-"Nq" = (
-/obj/machinery/hydroponics/soil,
-/obj/item/seeds/lavaland/ember,
-/obj/item/seeds/lavaland/inocybe,
-/obj/item/seeds/lavaland/polypore,
-/obj/item/seeds/lavaland/porcini,
-/obj/item/seeds/lavaland/cactus,
-/obj/item/cultivator/rake,
-/obj/item/stack/ore/glass/basalt{
- amount = 25;
- pixel_y = -2;
- pixel_x = -9
- },
-/obj/item/seeds/sunflower/moonflower,
-/turf/open/floor/ship/dirt/dark,
-/area/ship/roumain)
-"NE" = (
-/obj/structure/toilet{
- dir = 4;
- pixel_y = 7
- },
-/obj/effect/turf_decal/spline/fancy/wood/cee{
- dir = 4
- },
-/turf/open/floor/wood/ebony,
-/area/ship/crew/toilet)
-"NL" = (
-/turf/open/floor/ship/dirt/dark,
-/area/ship/roumain)
-"NT" = (
-/obj/structure/railing/corner{
- dir = 8
- },
-/turf/open/floor/ship/dirt/dark,
-/area/ship/roumain)
-"NV" = (
-/obj/item/reagent_containers/glass/bottle/mutagen,
-/obj/item/reagent_containers/glass/bottle/mutagen,
-/turf/open/floor/grass/ship/jungle,
-/area/ship/construction)
-"NX" = (
-/obj/machinery/atmospherics/components/binary/pump,
-/obj/machinery/portable_atmospherics/scrubber,
-/turf/open/floor/plating,
-/area/ship/engineering/engine)
-"Od" = (
-/turf/closed/wall,
-/area/ship/roumain)
-"Oo" = (
-/turf/closed/wall,
-/area/ship/crew/toilet)
-"OF" = (
-/obj/machinery/vending/mining_equipment,
-/obj/effect/turf_decal/industrial/warning,
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/storage)
-"OR" = (
-/obj/structure/cable/orange{
- icon_state = "0-9"
- },
-/obj/machinery/door/poddoor{
- id = "port_blasts";
- name = "Port Blast Door"
- },
-/obj/machinery/power/shieldwallgen/atmos/roundstart{
- dir = 8;
- locked = 1;
- id = "glaive_shields"
- },
-/turf/open/floor/plasteel/tech,
-/area/ship/storage)
-"Py" = (
-/obj/structure/cable/orange{
- icon_state = "6-9"
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
- dir = 1
- },
-/turf/open/floor/wood/maple,
-/area/ship/construction)
-"PE" = (
-/obj/structure/cable/orange{
- icon_state = "1-6"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/effect/turf_decal/corner/opaque/blue/diagonal,
-/turf/open/floor/plasteel/white,
-/area/ship/medical)
-"PU" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 9
- },
-/obj/structure/cable/orange{
- icon_state = "6-8"
- },
-/obj/structure/closet/emcloset/wall{
- pixel_y = 32
- },
-/turf/open/floor/wood/maple,
-/area/ship/construction)
-"Qi" = (
-/obj/structure/railing{
- dir = 9
- },
-/turf/open/floor/plating/ship/water,
-/area/ship/roumain)
-"Qm" = (
-/obj/structure/railing{
- dir = 4
- },
-/turf/open/floor/plating/ship/water,
-/area/ship/roumain)
-"QA" = (
-/obj/structure/cable/orange{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 4
- },
-/obj/machinery/door/airlock/medical/glass{
- name = "Medical Bay";
- dir = 4
- },
-/obj/effect/turf_decal/corner/opaque/blue/diagonal,
-/obj/machinery/door/firedoor/border_only{
- dir = 4
- },
-/obj/machinery/door/firedoor/border_only{
- dir = 8
- },
-/turf/open/floor/plasteel/white,
-/area/ship/construction)
-"QD" = (
-/obj/machinery/power/smes/shuttle/precharged{
- dir = 1
- },
-/obj/structure/cable/pink{
- icon_state = "0-2"
- },
-/obj/machinery/door/poddoor/shutters{
- id = "starboard_shutters";
- name = "Starboard Engine Shutters"
- },
-/turf/open/floor/plating,
-/area/ship/engineering/engine)
-"QJ" = (
-/obj/structure/cable/orange{
- icon_state = "4-6"
- },
-/obj/structure/cable/orange{
- icon_state = "8-10"
- },
-/obj/structure/destructible/tribal_torch,
-/turf/open/floor/plating,
-/area/ship/engineering/electrical)
-"QQ" = (
-/obj/machinery/power/apc/auto_name/directional/north,
-/obj/effect/turf_decal/siding/wood{
- dir = 1
- },
-/obj/structure/cable/orange{
- icon_state = "0-4"
- },
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 4
- },
-/turf/open/floor/wood/maple,
-/area/ship/construction)
-"QX" = (
-/obj/structure/bonfire/dense,
-/turf/open/floor/ship/dirt/dark,
-/area/ship/roumain)
-"Ra" = (
-/obj/structure/cable/orange{
- icon_state = "4-8"
- },
-/obj/structure/cable/orange{
- icon_state = "1-9"
- },
-/turf/open/floor/plasteel/tech,
-/area/ship/storage)
-"Rm" = (
-/obj/structure/flora/ausbushes/reedbush,
-/obj/structure/railing{
- dir = 8
- },
-/turf/open/floor/plating/ship/water,
-/area/ship/roumain)
-"Rn" = (
-/obj/structure/table/wood,
-/obj/item/survey_handheld,
-/obj/effect/turf_decal/siding/wood{
- dir = 4
- },
-/obj/item/circuitboard/machine/rdserver,
-/obj/item/circuitboard/machine/autolathe,
-/obj/item/disk/design_disk/ammo_n762,
-/obj/item/disk/design_disk/ammo_1911,
-/obj/item/circuitboard/machine/protolathe/department/ballistics,
-/obj/item/circuitboard/computer/rdconsole,
-/turf/open/floor/wood/maple,
-/area/ship/construction)
-"RF" = (
-/obj/structure/railing{
- dir = 8
- },
-/obj/effect/turf_decal/siding/wood/end{
- dir = 8
- },
-/turf/open/floor/wood/yew,
-/area/ship/roumain)
-"RJ" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/ship/dirt/dark,
-/area/ship/roumain)
-"RT" = (
-/obj/structure/cable/orange{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/toilet)
-"RU" = (
-/obj/structure/cable/green{
- icon_state = "2-8"
- },
-/obj/structure/cable/green{
- icon_state = "2-4"
- },
-/turf/open/floor/plating,
-/area/ship/engineering/electrical)
-"Sg" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 4
- },
-/obj/structure/cable/orange{
- icon_state = "4-8"
- },
-/obj/machinery/button/door{
- id = "port_shutters";
- name = "port shutter control";
- pixel_y = 25
- },
-/turf/open/floor/plating,
-/area/ship/engineering)
-"Sl" = (
-/obj/structure/flora/ausbushes/brflowers,
-/obj/structure/flora/ausbushes/sparsegrass,
-/obj/structure/fermenting_barrel/distiller,
-/turf/open/floor/grass/ship/jungle,
-/area/ship/roumain)
-"Sx" = (
-/obj/structure/window/reinforced/spawner{
- dir = 4
- },
-/obj/machinery/atmospherics/components/unary/shuttle/heater{
- dir = 1
- },
-/obj/machinery/door/poddoor/shutters{
- id = "starboard_shutters";
- name = "Starboard Engine Shutters"
- },
-/turf/open/floor/plating,
-/area/ship/engineering/engine)
-"Sz" = (
-/obj/structure/flora/ausbushes/brflowers,
-/obj/structure/flora/ausbushes/sparsegrass,
-/obj/structure/flora/ausbushes/sparsegrass,
-/obj/structure/loom,
-/turf/open/floor/grass/ship/jungle,
-/area/ship/roumain)
-"SK" = (
-/obj/structure/railing/corner{
- dir = 1
- },
-/obj/structure/cable/orange{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
- dir = 8
- },
-/turf/open/floor/plasteel/tech,
-/area/ship/storage)
-"SL" = (
-/obj/machinery/power/shuttle/engine/electric{
- dir = 1
- },
-/obj/structure/cable/pink,
-/turf/open/floor/engine/hull,
-/area/ship/engineering)
-"Tc" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 8
- },
-/obj/effect/turf_decal/siding/wood{
- dir = 4
- },
-/turf/open/floor/wood/yew,
-/area/ship/roumain)
-"Tj" = (
-/obj/structure/cable/orange{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 4
- },
-/obj/machinery/door/airlock/engineering{
- name = "Starboard Wing";
- dir = 4
- },
-/obj/machinery/door/firedoor/border_only{
- dir = 4
- },
-/obj/machinery/door/firedoor/border_only{
- dir = 8
- },
-/turf/open/floor/plasteel/tech,
-/area/ship/engineering/electrical)
-"Tx" = (
-/obj/structure/table/wood,
-/obj/item/stack/sheet/metal/fifty,
-/obj/item/stack/sheet/plasteel/fifty,
-/obj/effect/turf_decal/siding/wood{
- dir = 8
- },
-/obj/item/stack/rods/fifty,
-/obj/item/stack/sheet/glass/fifty,
-/turf/open/floor/wood/maple,
-/area/ship/construction)
-"TO" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/railing{
- dir = 4
- },
-/turf/open/floor/ship/dirt/dark,
-/area/ship/roumain)
-"TS" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/door/poddoor/shutters{
- name = "Body Shutters";
- id = "body_shutters";
- dir = 4
- },
-/turf/open/floor/plating,
-/area/ship/medical)
-"Ue" = (
-/obj/structure/flora/ausbushes/reedbush,
-/obj/structure/railing{
- dir = 4
- },
-/turf/open/floor/plating/ship/water,
-/area/ship/roumain)
-"Ul" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 5
- },
-/obj/structure/cable/orange{
- icon_state = "4-10"
- },
-/obj/structure/cable/orange{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 4
- },
-/obj/structure/closet/firecloset/wall{
- pixel_y = 32
- },
-/turf/open/floor/wood/maple,
-/area/ship/construction)
-"Un" = (
-/obj/structure/flora/rock/jungle,
-/obj/structure/railing{
- dir = 6
- },
-/turf/open/floor/ship/dirt/dark,
-/area/ship/roumain)
-"US" = (
-/obj/structure/cable/orange{
- icon_state = "1-4"
- },
-/obj/structure/cable/orange{
- icon_state = "2-6"
- },
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
- dir = 1
- },
-/turf/open/floor/plating,
-/area/ship/engineering/engine)
-"UZ" = (
-/mob/living/simple_animal/pet/gondola{
- name = "Grand Hunter Montagnes"
- },
-/turf/open/floor/grass/ship/jungle,
-/area/ship/construction)
-"Vn" = (
-/obj/machinery/power/terminal,
-/obj/structure/cable/orange,
-/obj/structure/cable/orange{
- icon_state = "1-9"
- },
-/obj/structure/cable/orange{
- icon_state = "1-5"
- },
-/turf/open/floor/plating,
-/area/ship/engineering/engine)
-"Vu" = (
-/turf/closed/wall/r_wall,
-/area/ship/engineering)
-"VB" = (
-/obj/structure/destructible/tribal_torch,
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/toilet)
-"VI" = (
-/obj/structure/railing{
- dir = 1
- },
-/obj/structure/flora/junglebush/large,
-/turf/open/floor/ship/dirt/dark,
-/area/ship/roumain)
-"VL" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable/orange{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 4
- },
-/obj/machinery/door/poddoor/shutters{
- name = "Body Shutters";
- id = "body_shutters"
- },
-/turf/open/floor/plating,
-/area/ship/roumain)
-"VQ" = (
-/obj/structure/flora/junglebush/c,
-/turf/open/floor/ship/dirt/dark,
-/area/ship/roumain)
-"VX" = (
-/turf/open/floor/plasteel/tech,
-/area/ship/storage)
-"Wd" = (
-/obj/structure/cable/orange{
- icon_state = "4-5"
- },
-/obj/structure/destructible/tribal_torch,
-/obj/effect/turf_decal/industrial/warning/full,
-/obj/structure/cable/orange{
- icon_state = "8-9"
- },
-/turf/open/floor/plasteel/tech,
-/area/ship/storage)
-"Wr" = (
-/obj/machinery/suit_storage_unit/inherit,
-/obj/item/clothing/suit/space/hardsuit/mining/independent,
-/obj/item/clothing/mask/breath,
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/storage)
-"Wy" = (
-/obj/structure/cable/orange{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/turf/open/floor/engine/hull,
-/area/ship/external/dark)
-"WS" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 6
- },
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
- dir = 1
- },
-/turf/open/floor/wood/maple,
-/area/ship/construction)
-"Xg" = (
-/obj/structure/flora/ausbushes/brflowers,
-/obj/structure/flora/ausbushes/fullgrass,
-/obj/structure/railing,
-/turf/open/floor/grass/ship/jungle,
-/area/ship/roumain)
-"Xp" = (
-/obj/structure/table/optable,
-/obj/structure/cable/orange{
- icon_state = "1-9"
- },
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
- dir = 8
- },
-/obj/effect/turf_decal/corner/opaque/blue/diagonal,
-/turf/open/floor/plasteel/white,
-/area/ship/medical)
-"Xq" = (
-/obj/item/seeds/cotton/durathread,
-/turf/open/floor/grass/ship/jungle,
-/area/ship/construction)
-"Xt" = (
-/turf/open/floor/plating/ship/water,
-/area/ship/roumain)
-"XB" = (
-/obj/structure/railing{
- dir = 1
- },
-/obj/structure/flora/junglebush/b,
-/turf/open/floor/ship/dirt/dark,
-/area/ship/roumain)
-"XK" = (
-/obj/structure/cable/green,
-/obj/structure/cable/orange{
- icon_state = "2-6"
- },
-/obj/structure/cable/orange{
- icon_state = "2-10"
- },
-/obj/machinery/power/port_gen/pacman/super,
-/obj/item/stack/sheet/mineral/uranium/twenty,
-/obj/structure/cable/green{
- icon_state = "1-4"
- },
-/obj/structure/cable/green{
- icon_state = "1-8"
- },
-/turf/open/floor/plating,
-/area/ship/engineering/electrical)
-"XY" = (
-/obj/structure/table/wood,
-/obj/effect/turf_decal/siding/wood/end{
- dir = 1
- },
-/obj/structure/cable/orange{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/item/radio/intercom/wideband/table{
- dir = 1
- },
-/turf/open/floor/wood/mahogany,
-/area/ship/roumain)
-"XZ" = (
-/turf/closed/wall,
-/area/ship/medical)
-"Yb" = (
-/obj/structure/cable/orange{
- icon_state = "5-6"
- },
-/obj/structure/cable/orange{
- icon_state = "5-9"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/turf/open/floor/wood/maple,
-/area/ship/construction)
-"Yi" = (
-/obj/structure/cable/orange{
- icon_state = "4-5"
- },
-/turf/open/floor/plasteel/tech,
-/area/ship/storage)
-"Yx" = (
-/obj/structure/railing{
- dir = 4
- },
-/turf/open/floor/ship/dirt/dark,
-/area/ship/roumain)
-"YE" = (
-/obj/machinery/power/apc/auto_name/directional/west,
-/obj/structure/chair/wood/wings{
- dir = 1
- },
-/obj/effect/turf_decal/siding/wood/corner{
- dir = 4
- },
-/obj/effect/turf_decal/siding/wood{
- dir = 8
- },
-/obj/structure/cable/orange{
- icon_state = "0-4"
- },
-/obj/effect/turf_decal/siding/wood/corner,
-/turf/open/floor/wood/mahogany,
-/area/ship/roumain)
-"YM" = (
-/obj/effect/turf_decal/industrial/warning,
-/obj/structure/cable/orange{
- icon_state = "6-9"
- },
-/obj/machinery/door/firedoor/border_only,
-/obj/structure/railing,
-/turf/open/floor/wood/maple,
-/area/ship/construction)
-"YP" = (
-/obj/structure/flora/ausbushes/grassybush,
-/obj/structure/flora/ausbushes/brflowers,
-/obj/structure/flora/ausbushes/sparsegrass,
-/obj/structure/destructible/tribal_torch,
-/obj/structure/sign/warning/vacuum/external{
- pixel_y = -6;
- pixel_x = -31
- },
-/turf/open/floor/grass/ship/jungle,
-/area/ship/roumain)
-"YT" = (
-/obj/item/kirbyplants/random,
-/obj/structure/flora/ausbushes/fullgrass,
-/turf/open/floor/grass/ship/jungle,
-/area/ship/roumain)
-"Zh" = (
-/obj/effect/turf_decal/industrial/warning,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/door/firedoor/border_only,
-/turf/open/floor/wood/maple,
-/area/ship/construction)
-"Zs" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 1
- },
-/obj/effect/turf_decal/siding/wood/corner,
-/obj/effect/turf_decal/siding/wood/corner{
- dir = 8
- },
-/turf/open/floor/wood/yew,
-/area/ship/roumain)
-"ZE" = (
-/obj/structure/flora/rock/jungle,
-/obj/structure/railing/corner{
- dir = 1
- },
-/turf/open/floor/plating/ship/water,
-/area/ship/roumain)
-"ZK" = (
-/obj/structure/cable/orange{
- icon_state = "1-4"
- },
-/obj/item/clothing/under/suit/roumain,
-/obj/item/clothing/suit/armor/roumain,
-/obj/item/clothing/head/cowboy/sec/roumain,
-/obj/item/clothing/suit/armor/riot/chaplain/witchhunter,
-/obj/item/clothing/head/helmet/chaplain/witchunter_hat,
-/obj/item/storage/backpack/cultpack,
-/obj/item/flashlight/lantern,
-/obj/item/kitchen/knife/combat/survival,
-/obj/item/gun/ballistic/shotgun/winchester,
-/obj/structure/closet/secure_closet/hunter,
-/obj/item/lighter,
-/obj/item/ammo_box/c38_box,
-/obj/item/disk/holodisk/roumain,
-/obj/item/clothing/shoes/cowboy/black,
-/obj/item/clothing/shoes/cowboy,
-/obj/item/clothing/shoes/jackboots,
-/obj/item/book/manual/srmlore,
-/turf/open/floor/wood/ebony,
-/area/ship/crew/dorm)
-"ZV" = (
-/obj/structure/flora/ausbushes/reedbush,
-/turf/open/floor/plating/ship/water,
-/area/ship/roumain)
-"ZW" = (
-/obj/structure/railing/corner{
- dir = 4
- },
-/obj/structure/cable/orange{
- icon_state = "4-6"
- },
-/obj/structure/cable/orange{
- icon_state = "8-10"
- },
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
- dir = 4
- },
-/turf/open/floor/plasteel/tech,
-/area/ship/storage)
-
-(1,1,1) = {"
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-"}
-(2,1,1) = {"
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-"}
-(3,1,1) = {"
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-"}
-(4,1,1) = {"
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-"}
-(5,1,1) = {"
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-dq
-dq
-Vu
-Vu
-Vu
-Vu
-ff
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-"}
-(6,1,1) = {"
-sH
-sH
-sH
-sH
-sH
-sH
-dq
-dq
-dq
-sv
-fs
-DR
-aF
-jv
-Ma
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-"}
-(7,1,1) = {"
-sH
-sH
-sH
-sH
-sH
-dq
-dq
-NE
-ww
-yV
-fs
-HS
-AY
-ss
-SL
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-"}
-(8,1,1) = {"
-sH
-sH
-sH
-sH
-sH
-dq
-aY
-rE
-rK
-mJ
-fs
-Il
-co
-ss
-SL
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-"}
-(9,1,1) = {"
-sH
-sH
-sH
-sH
-sH
-dq
-Oo
-LS
-Oo
-Oo
-fs
-Sg
-Jy
-AM
-SL
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-"}
-(10,1,1) = {"
-sH
-sH
-sH
-sH
-sH
-dq
-VB
-na
-AL
-RT
-ID
-jm
-jr
-Vu
-Vu
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-"}
-(11,1,1) = {"
-sH
-sH
-sH
-sH
-sH
-dq
-dq
-tC
-vn
-zX
-Vu
-Vu
-Vu
-Vu
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-"}
-(12,1,1) = {"
-sH
-sH
-sH
-sH
-sH
-sH
-dq
-dq
-wE
-dq
-Vu
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-"}
-(13,1,1) = {"
-sH
-sH
-sH
-sH
-sH
-sH
-cR
-yZ
-CH
-qZ
-sA
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-"}
-(14,1,1) = {"
-sH
-sH
-sH
-sH
-sH
-cR
-Cr
-AN
-uY
-AN
-gK
-sA
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-fm
-dt
-dt
-dt
-dt
-fm
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-"}
-(15,1,1) = {"
-sH
-sH
-sH
-sH
-cR
-Cr
-wp
-wp
-ts
-wp
-wp
-Jx
-Ho
-Ho
-sA
-FA
-FA
-sH
-sH
-sH
-fm
-fm
-aH
-ZK
-mr
-ZK
-fm
-ge
-ge
-ge
-sH
-sH
-sH
-sH
-sH
-sH
-"}
-(16,1,1) = {"
-sH
-sH
-sH
-sH
-Cx
-wp
-wp
-lM
-aM
-Nq
-wp
-Ii
-Dz
-Dz
-HB
-wp
-FA
-FA
-FA
-sH
-hh
-ce
-fP
-Jc
-FG
-Du
-cU
-IZ
-UZ
-ge
-LN
-LN
-LN
-LN
-LN
-FA
-"}
-(17,1,1) = {"
-sH
-sH
-cR
-Wy
-Cr
-AN
-ZV
-ko
-Lk
-cz
-YP
-ds
-lb
-Sl
-Fu
-wp
-wp
-wp
-FA
-FA
-hh
-ce
-jl
-af
-yq
-Mh
-gO
-IZ
-Xq
-IZ
-MU
-go
-yp
-OF
-cp
-FA
-"}
-(18,1,1) = {"
-sH
-FA
-Cx
-wp
-wC
-wp
-cg
-Ac
-NL
-LG
-NL
-NL
-VQ
-aM
-Xg
-ZV
-Xt
-wp
-wp
-wC
-fm
-IF
-iu
-IF
-IF
-IZ
-Nd
-IZ
-IZ
-IZ
-nk
-Yi
-JG
-fa
-AQ
-FA
-"}
-(19,1,1) = {"
-FA
-gR
-zO
-wp
-Ue
-Qm
-KX
-Fp
-re
-Fa
-TO
-re
-NL
-RJ
-NT
-sm
-ZV
-Xt
-Od
-DX
-rj
-YT
-vX
-gi
-bN
-IZ
-PU
-jq
-Tx
-HA
-lg
-lO
-Yi
-Wd
-qz
-FA
-"}
-(20,1,1) = {"
-FA
-VL
-vW
-YE
-Fd
-fC
-KP
-Qm
-VI
-uI
-QX
-Bz
-BO
-NL
-al
-NT
-cj
-RF
-Dg
-yN
-Lk
-qJ
-Mi
-dV
-bN
-IZ
-kD
-Py
-xe
-MG
-ln
-ZW
-oC
-tM
-qz
-FA
-"}
-(21,1,1) = {"
-FA
-VL
-jG
-Nm
-wD
-GP
-NL
-NL
-NL
-nY
-Lj
-uM
-CC
-NL
-CC
-RJ
-NL
-Zs
-iB
-Tc
-Tc
-Tc
-lk
-CF
-rD
-sr
-WS
-bY
-Yb
-Zh
-Jn
-yz
-Ra
-eU
-qz
-md
-"}
-(22,1,1) = {"
-FA
-iY
-XY
-Mj
-MV
-qQ
-Qi
-iP
-VI
-RJ
-lA
-At
-nj
-NL
-AZ
-Fa
-Yx
-nt
-iT
-aM
-aM
-qJ
-Mi
-gi
-bN
-IZ
-QQ
-mS
-Fr
-YM
-zZ
-SK
-jk
-uP
-qz
-FA
-"}
-(23,1,1) = {"
-FA
-hc
-sT
-wp
-xB
-Rm
-ZE
-MZ
-qN
-NL
-NL
-NL
-NL
-NL
-Ao
-Un
-pd
-ZV
-Od
-DX
-iq
-YT
-zv
-xC
-bN
-IZ
-Ul
-FR
-Rn
-nZ
-Hw
-au
-VX
-hp
-qz
-FA
-"}
-(24,1,1) = {"
-sH
-FA
-Cx
-wp
-wC
-wp
-Xt
-XB
-RJ
-LG
-NL
-NL
-VQ
-Lk
-wA
-Xt
-ZV
-wp
-wp
-mw
-fi
-XZ
-MR
-XZ
-XZ
-IZ
-QA
-IZ
-IZ
-IZ
-Wr
-jk
-Gi
-gb
-qz
-FA
-"}
-(25,1,1) = {"
-sH
-sH
-DL
-xf
-gE
-AN
-ZV
-ko
-DS
-Lk
-mj
-qJ
-fe
-Sz
-Bx
-wp
-wp
-wp
-cR
-xf
-Bu
-Ex
-JD
-Ar
-aS
-pH
-hT
-IZ
-NV
-IZ
-fv
-ap
-bi
-sb
-OR
-FA
-"}
-(26,1,1) = {"
-sH
-sH
-sH
-sH
-Cx
-wp
-wp
-bW
-Lk
-hz
-wp
-wC
-wC
-wC
-wC
-wp
-cR
-xf
-Cr
-sH
-mD
-Fn
-tF
-PE
-iR
-EO
-zc
-IZ
-EN
-ge
-LN
-LN
-LN
-LN
-LN
-hu
-"}
-(27,1,1) = {"
-sH
-sH
-sH
-sH
-DL
-gE
-wp
-wp
-li
-wp
-wp
-cR
-Wy
-Wy
-Wy
-Wy
-Cr
-sH
-sH
-sH
-fi
-fi
-xD
-qv
-Xp
-BB
-fi
-ge
-ge
-ge
-sH
-sH
-sH
-sH
-sH
-sH
-"}
-(28,1,1) = {"
-sH
-sH
-sH
-sH
-sH
-DL
-xf
-sD
-cJ
-sD
-xf
-Cr
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-fi
-TS
-TS
-TS
-TS
-fi
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-"}
-(29,1,1) = {"
-sH
-sH
-sH
-sH
-sH
-sH
-FA
-AN
-LL
-AN
-FA
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-"}
-(30,1,1) = {"
-sH
-sH
-sH
-sH
-sH
-sH
-DG
-DG
-Tj
-DG
-wm
-FA
-Io
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-"}
-(31,1,1) = {"
-sH
-sH
-sH
-sH
-sH
-DG
-DG
-FE
-lf
-ir
-wm
-wm
-jy
-wm
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-"}
-(32,1,1) = {"
-sH
-sH
-sH
-sH
-sH
-DG
-zT
-bm
-fz
-Kk
-cW
-ie
-BK
-wm
-wm
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-"}
-(33,1,1) = {"
-sH
-sH
-sH
-sH
-sH
-DG
-QJ
-RU
-XK
-yA
-bv
-US
-GM
-tu
-mE
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-"}
-(34,1,1) = {"
-sH
-sH
-sH
-sH
-sH
-DG
-EJ
-Ir
-MW
-gd
-cW
-Ng
-Vn
-QD
-mE
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-"}
-(35,1,1) = {"
-sH
-sH
-sH
-sH
-sH
-DG
-DG
-Et
-ac
-vz
-cW
-pb
-FW
-QD
-mE
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-"}
-(36,1,1) = {"
-sH
-sH
-sH
-sH
-sH
-sH
-DG
-DG
-DG
-nO
-cW
-yn
-NX
-Sx
-vd
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-"}
-(37,1,1) = {"
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-DG
-DG
-wm
-wm
-wm
-wm
-wm
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-"}
-(38,1,1) = {"
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-"}
-(39,1,1) = {"
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-"}
-(40,1,1) = {"
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-"}
-(41,1,1) = {"
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-"}
diff --git a/_maps/shuttles/solgov/solgov_paracelsus.dmm b/_maps/shuttles/solgov/solgov_paracelsus.dmm
index 656a6e1645bf..70bfabe5d26b 100644
--- a/_maps/shuttles/solgov/solgov_paracelsus.dmm
+++ b/_maps/shuttles/solgov/solgov_paracelsus.dmm
@@ -38,11 +38,18 @@
/turf/open/floor/plasteel/tech/techmaint,
/area/ship/maintenance/starboard)
"aF" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/structure/cable{
icon_state = "1-4"
},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+ dir = 8
+ },
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
/turf/open/floor/wood/ebony,
/area/ship/crew/dorm)
"aG" = (
@@ -62,6 +69,7 @@
/obj/effect/turf_decal/borderfloorblack{
dir = 4
},
+/obj/machinery/computer/helm/viewscreen/directional/east,
/turf/open/floor/plasteel/patterned,
/area/ship/cargo/office)
"be" = (
@@ -157,6 +165,7 @@
/obj/structure/chair/wood{
dir = 1
},
+/obj/machinery/computer/helm/viewscreen/directional/south,
/turf/open/floor/wood/ebony,
/area/ship/crew/crewtwo)
"bD" = (
@@ -194,6 +203,8 @@
/obj/structure/chair/sofa/right{
dir = 1
},
+/obj/machinery/power/apc/auto_name/directional/east,
+/obj/structure/cable,
/turf/open/floor/carpet/royalblue,
/area/ship/crew/canteen)
"co" = (
@@ -295,8 +306,18 @@
"cN" = (
/obj/effect/turf_decal/siding/wood,
/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/cable,
-/obj/machinery/power/apc/auto_name/directional/west,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 9
+ },
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
/turf/open/floor/wood,
/area/ship/crew/canteen)
"cO" = (
@@ -743,7 +764,6 @@
/turf/open/floor/plasteel/tech/techmaint,
/area/ship/maintenance/port)
"hM" = (
-/obj/structure/closet/cabinet,
/obj/effect/decal/cleanable/dirt/dust,
/obj/item/clothing/neck/stripedsolgovscarf,
/obj/item/clothing/neck/stripedsolgovscarf,
@@ -764,6 +784,8 @@
/obj/item/clothing/suit/solgov/suit,
/obj/item/clothing/suit/hooded/wintercoat/solgov,
/obj/item/clothing/suit/hooded/wintercoat/solgov,
+/obj/item/toy/plush/blahaj,
+/obj/structure/closet/cabinet,
/turf/open/floor/wood/ebony,
/area/ship/crew/dorm)
"if" = (
@@ -1278,16 +1300,10 @@
/turf/open/floor/plating,
/area/ship/medical/surgery)
"ns" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 1
- },
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 9
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 10
- },
-/turf/open/floor/wood,
+/turf/open/floor/wood/ebony,
/area/ship/crew/canteen)
"nt" = (
/obj/effect/turf_decal/borderfloorblack{
@@ -1766,9 +1782,12 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/machinery/door/airlock/medical{
name = "Chemistry";
- req_one_access = list(5,45);
+ req_one_access = list(5,10,45);
id_tag = "sg_par_chem_bolt"
},
+/obj/effect/mapping_helpers/airlock/unres{
+ dir = 1
+ },
/turf/open/floor/plasteel/dark,
/area/ship/medical)
"rz" = (
@@ -1823,19 +1842,21 @@
/obj/structure/cable{
icon_state = "2-8"
},
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2,
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/turf_decal/siding/wood,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+ dir = 4
+ },
/turf/open/floor/wood,
/area/ship/crew/dorm)
"rT" = (
/obj/structure/chair/sofa{
dir = 1
},
+/obj/machinery/computer/helm/viewscreen/directional/south,
/turf/open/floor/carpet/royalblue,
/area/ship/crew/canteen)
"rY" = (
@@ -1871,7 +1892,9 @@
dir = 8
},
/obj/structure/closet/secure_closet/wall{
- pixel_y = 28
+ pixel_y = 28;
+ name = "navigational supplies";
+ req_access_txt = "19"
},
/obj/item/gps,
/obj/item/binoculars,
@@ -2393,7 +2416,6 @@
/area/ship/crew/canteen)
"xp" = (
/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/railing/wood,
/turf/open/floor/wood/ebony,
/area/ship/crew/canteen)
"xw" = (
@@ -2560,19 +2582,12 @@
/turf/open/floor/plasteel/tech/techmaint,
/area/ship/maintenance/starboard)
"yY" = (
-/obj/machinery/door/airlock/solgov/glass{
- dir = 4;
- name = "Cafeteria"
- },
/obj/effect/turf_decal/industrial/warning{
dir = 4
},
/obj/effect/turf_decal/industrial/warning{
dir = 8
},
-/obj/structure/cable{
- icon_state = "4-8"
- },
/obj/machinery/door/firedoor/border_only{
dir = 8
},
@@ -2585,6 +2600,13 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 4
},
+/obj/machinery/door/airlock/solgov/glass{
+ dir = 4;
+ name = "Cafeteria"
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
/turf/open/floor/plasteel/dark,
/area/ship/crew/dorm)
"zc" = (
@@ -2740,6 +2762,10 @@
"AX" = (
/turf/open/floor/wood/ebony,
/area/ship/crew/crewtwo)
+"AZ" = (
+/obj/structure/bookcase/random,
+/turf/open/floor/wood/ebony,
+/area/ship/crew/dorm)
"Ba" = (
/obj/effect/turf_decal/techfloor/corner{
dir = 8
@@ -2834,16 +2860,19 @@
/obj/structure/railing/wood{
dir = 8
},
-/obj/structure/closet/wall/red{
- dir = 1;
- pixel_y = -28
- },
/obj/item/gun/ballistic/automatic/pistol/solgov,
/obj/item/gun/ballistic/automatic/pistol/solgov,
/obj/item/ammo_box/magazine/pistol556mm,
/obj/item/ammo_box/magazine/pistol556mm,
/obj/item/ammo_box/magazine/pistol556mm,
/obj/item/ammo_box/magazine/pistol556mm,
+/obj/structure/closet/secure_closet/wall{
+ dir = 1;
+ icon_state = "sec_wall";
+ name = "firearms locker";
+ pixel_y = -28;
+ req_access_txt = "19"
+ },
/turf/open/floor/carpet/royalblue,
/area/ship/bridge)
"BU" = (
@@ -3022,10 +3051,10 @@
/turf/open/floor/wood/ebony,
/area/ship/crew/crewtwo)
"DD" = (
-/obj/structure/table/wood,
-/obj/item/cutting_board,
-/obj/item/kitchen/knife,
/obj/machinery/light/directional/north,
+/obj/structure/sink/kitchen{
+ pixel_y = 16
+ },
/turf/open/floor/wood/ebony,
/area/ship/crew/canteen)
"DL" = (
@@ -3049,22 +3078,24 @@
/turf/open/floor/wood/yew,
/area/ship/crew)
"Ea" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 1
- },
-/obj/effect/turf_decal/siding/wood/corner{
- dir = 1
- },
-/obj/structure/cable{
- icon_state = "2-8"
- },
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
+ dir = 6
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
+/obj/structure/railing/wood,
+/obj/machinery/light_switch{
+ dir = 4;
+ pixel_x = -19;
+ pixel_y = -5
},
-/turf/open/floor/wood,
+/obj/machinery/button/door{
+ dir = 4;
+ id = "sg_par_cafeteria";
+ name = "shutter control";
+ pixel_x = -20;
+ pixel_y = 7
+ },
+/obj/structure/table/wood,
+/turf/open/floor/wood/ebony,
/area/ship/crew/canteen)
"Eh" = (
/obj/item/bedsheet/double/solgov{
@@ -3206,6 +3237,9 @@
pixel_x = -6;
pixel_y = 2
},
+/obj/item/toy/cards/deck{
+ pixel_x = 3
+ },
/turf/open/floor/carpet/royalblue,
/area/ship/crew/canteen)
"EV" = (
@@ -3269,13 +3303,8 @@
"FG" = (
/obj/structure/table/wood,
/obj/machinery/airalarm/directional/north,
-/obj/machinery/reagentgrinder,
-/obj/item/reagent_containers/food/condiment/saltshaker{
- pixel_x = -17
- },
-/obj/item/reagent_containers/food/condiment/peppermill{
- pixel_x = -10;
- pixel_y = 6
+/obj/machinery/microwave{
+ pixel_y = 5
},
/turf/open/floor/wood/ebony,
/area/ship/crew/canteen)
@@ -3353,15 +3382,15 @@
/turf/open/floor/plasteel/mono/white,
/area/ship/medical/surgery)
"Hl" = (
-/obj/machinery/power/apc/auto_name/directional/east,
-/obj/structure/cable{
- icon_state = "0-8"
- },
/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/light_switch{
- dir = 8;
- pixel_x = 20;
- pixel_y = -12
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 8
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
},
/turf/open/floor/wood/ebony,
/area/ship/crew/dorm)
@@ -3515,11 +3544,17 @@
/area/ship/maintenance/starboard)
"IO" = (
/obj/structure/table/wood,
-/obj/machinery/microwave{
- pixel_y = 5
+/obj/machinery/reagentgrinder{
+ pixel_y = 8;
+ pixel_x = -7
},
-/obj/structure/sign/poster/solgov/random{
- pixel_y = 30
+/obj/item/reagent_containers/food/condiment/saltshaker{
+ pixel_x = 4;
+ pixel_y = 10
+ },
+/obj/item/reagent_containers/food/condiment/peppermill{
+ pixel_x = 10;
+ pixel_y = 10
},
/turf/open/floor/wood/ebony,
/area/ship/crew/canteen)
@@ -3796,6 +3831,15 @@
/area/ship/hallway/port)
"Lw" = (
/obj/effect/turf_decal/siding/wood,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
/turf/open/floor/wood,
/area/ship/crew/canteen)
"Lx" = (
@@ -3850,7 +3894,6 @@
/turf/open/floor/plasteel/patterned,
/area/ship/cargo/office)
"LK" = (
-/obj/structure/closet/crate/bin,
/obj/effect/turf_decal/trimline/opaque/solgovblue/filled/line,
/obj/machinery/button/door{
dir = 4;
@@ -3868,6 +3911,7 @@
specialfunctions = 4;
normaldoorcontrol = 1
},
+/obj/machinery/autolathe,
/turf/open/floor/plasteel/white,
/area/ship/medical)
"LS" = (
@@ -3898,13 +3942,20 @@
/turf/open/floor/wood/ebony,
/area/ship/hallway/starboard)
"Mk" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 1
- },
-/obj/effect/turf_decal/siding/wood/corner{
- dir = 4
- },
-/turf/open/floor/wood,
+/obj/structure/railing/wood,
+/obj/structure/closet/secure_closet/freezer{
+ anchored = 1;
+ name = "refrigerator"
+ },
+/obj/item/storage/box/ingredients/vegetarian,
+/obj/item/storage/box/ingredients/wildcard,
+/obj/item/reagent_containers/food/snacks/meat/slab,
+/obj/item/reagent_containers/food/snacks/meat/slab,
+/obj/item/reagent_containers/food/snacks/meat/slab,
+/obj/item/reagent_containers/food/snacks/meat/slab,
+/obj/item/storage/fancy/egg_box,
+/obj/item/storage/fancy/egg_box,
+/turf/open/floor/wood/ebony,
/area/ship/crew/canteen)
"Mo" = (
/obj/structure/chair/office{
@@ -3966,8 +4017,7 @@
/turf/open/floor/carpet/royalblue,
/area/ship/crew/office)
"ML" = (
-/obj/structure/closet/secure_closet/freezer/fridge,
-/obj/structure/railing/wood,
+/obj/item/reagent_containers/food/condiment/flour,
/obj/item/reagent_containers/food/condiment/flour,
/obj/item/reagent_containers/food/condiment/flour,
/obj/item/reagent_containers/food/condiment/flour,
@@ -3977,8 +4027,14 @@
/obj/item/reagent_containers/food/condiment/milk,
/obj/item/reagent_containers/food/condiment/soymilk,
/obj/item/reagent_containers/food/condiment/soymilk,
-/obj/item/storage/fancy/egg_box,
/obj/item/reagent_containers/food/condiment/enzyme,
+/obj/structure/closet/secure_closet/freezer{
+ anchored = 1;
+ name = "refrigerator"
+ },
+/obj/structure/sign/poster/solgov/random{
+ pixel_y = 30
+ },
/turf/open/floor/wood/ebony,
/area/ship/crew/canteen)
"MO" = (
@@ -4082,7 +4138,15 @@
/area/ship/medical/surgery)
"NY" = (
/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/extinguisher_cabinet/directional/west,
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/machinery/light_switch{
+ dir = 4;
+ pixel_y = 12;
+ pixel_x = -20
+ },
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
/turf/open/floor/wood/ebony,
/area/ship/crew/dorm)
"Ol" = (
@@ -4122,16 +4186,10 @@
/turf/open/floor/wood,
/area/ship/bridge)
"OO" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 1
- },
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 8
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/turf/open/floor/wood,
+/turf/open/floor/wood/ebony,
/area/ship/crew/canteen)
"OS" = (
/obj/structure/sink/kitchen{
@@ -4233,6 +4291,9 @@
dir = 8
},
/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
/turf/open/floor/wood,
/area/ship/crew/canteen)
"Pk" = (
@@ -4379,15 +4440,6 @@
dir = 1
},
/obj/effect/turf_decal/siding/wood,
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
/obj/item/radio/intercom/directional/north,
/turf/open/floor/wood,
/area/ship/crew/dorm)
@@ -4434,6 +4486,7 @@
/obj/item/clothing/suit/solgov/suit,
/obj/item/clothing/suit/hooded/wintercoat/solgov,
/obj/item/clothing/suit/hooded/wintercoat/solgov,
+/obj/item/toy/plush/blahaj,
/turf/open/floor/wood/ebony,
/area/ship/crew/dorm)
"QQ" = (
@@ -4643,11 +4696,20 @@
/obj/effect/turf_decal/siding/wood,
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+ dir = 8
+ },
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/obj/effect/turf_decal/siding/wood{
dir = 1
},
/turf/open/floor/wood,
/area/ship/crew/canteen)
"SG" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
/turf/open/floor/carpet/royalblue,
/area/ship/crew/canteen)
"SK" = (
@@ -4670,19 +4732,10 @@
/area/ship/hallway/starboard)
"SP" = (
/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/railing/wood,
-/obj/machinery/light_switch{
- dir = 4;
- pixel_x = -19;
- pixel_y = -5
- },
-/obj/machinery/button/door{
- dir = 4;
- id = "sg_par_cafeteria";
- name = "shutter control";
- pixel_x = -20;
- pixel_y = 7
- },
+/obj/structure/table/wood,
+/obj/item/cutting_board,
+/obj/item/kitchen/knife,
+/obj/item/kitchen/rollingpin,
/turf/open/floor/wood/ebony,
/area/ship/crew/canteen)
"Tc" = (
@@ -5013,6 +5066,9 @@
/obj/item/desk_flag/solgov{
pixel_y = 3
},
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
/turf/open/floor/carpet/royalblue,
/area/ship/crew/canteen)
"Wt" = (
@@ -5117,7 +5173,21 @@
/obj/effect/turf_decal/techfloor{
dir = 10
},
-/obj/machinery/autolathe,
+/obj/structure/table,
+/obj/item/cigbutt{
+ pixel_y = 5
+ },
+/obj/item/cigbutt{
+ pixel_y = 15
+ },
+/obj/item/cigbutt{
+ pixel_y = 9;
+ pixel_x = -11
+ },
+/obj/item/clothing/mask/cigarette/robust{
+ pixel_y = 10;
+ pixel_x = 8
+ },
/turf/open/floor/plasteel/tech/techmaint,
/area/ship/maintenance/port)
"Xe" = (
@@ -6281,7 +6351,7 @@ pK
NY
dh
Wt
-eH
+AZ
bf
wI
"}
@@ -6313,7 +6383,7 @@ rO
aF
Bg
Pk
-eH
+AZ
bf
wI
"}
@@ -6373,8 +6443,8 @@ qL
qL
qL
Ev
-yY
vL
+yY
Ky
Ky
Ky
diff --git a/_maps/shuttles/subshuttles/Subshuttle Catalog.txt b/_maps/shuttles/subshuttles/Subshuttle Catalog.txt
index 3424b7605354..a95d150418a6 100644
--- a/_maps/shuttles/subshuttles/Subshuttle Catalog.txt
+++ b/_maps/shuttles/subshuttles/Subshuttle Catalog.txt
@@ -13,6 +13,11 @@ Size = "12x7"
Purpose = "A multi-role dropship used by almost every group faring space. Its ease of manufacture and high mobility makes it ideal for transport."
File Path = "_maps\shuttles\subshuttles\indepenent_kunai.dmm"
+Name = "Haste-class Patient Recovery Ship"
+Size = "6x4"
+Purpose = "A small, nimble ship utilized as an ambulance by Inteq forces."
+File Path = "_maps\shuttles\subshuttles\independant_haste.dmm"
+
Name = "Sugarcube"
Size = "12x6"
Purpose = "A prisoner transport vessel turned "
@@ -25,7 +30,7 @@ File Path = "_maps\shuttles\subshuttles\independant_pill.dmm"
Name = "blackpill"
Size = "1x3"
-Purpose = "Supposedly an manned torpedo. What is this. Subtest?"
+Purpose = "Supposedly a manned torpedo. What is this. Subtest?"
File Path = "_maps\shuttles\subshuttles\independant_pill.dmm"
Name = "Superpill"
@@ -38,4 +43,23 @@ Size = "13x7"
Purpose = "A Nanotrasen dropship, primarily used by Heron-Class carriers."
File Path = "_maps\shuttles\subshuttles\nanotrasen_falcon.dmm"
+Name = "Crux Dropship"
+Size = "12x7"
+Purpose = "A very common general-purpose transport Minutemen vessel."
+File Path = "_maps\shuttles\subshuttles\minutemen_crux.dmm"
+
+Name = "Ancon Intern Ship"
+Size = "15x11"
+Purpose = "A CentCom internship ship, which is essentially a small office with thrusters."
+File Path = "_maps\shuttles\subshuttles\nanotrasen_ancon.dmm"
+
+Name = "Anvil Dropship"
+Size = "15x11"
+Purpose = "A general-purpose, Inteq-made dropship."
+File Path = "_maps\shuttles\subshuttles\inteq_anvil.dmm"
+
+Name = "Runner Ambulance"
+Size = "15x11"
+Purpose = "An ambulance procured by Cybersun for use with smaller Trauma Teams."
+File Path = "_maps\shuttles\subshuttles\syndicate_runner.dmm"
diff --git a/_maps/shuttles/subshuttles/inteq_anvil.dmm b/_maps/shuttles/subshuttles/inteq_anvil.dmm
new file mode 100644
index 000000000000..b210a8874ded
--- /dev/null
+++ b/_maps/shuttles/subshuttles/inteq_anvil.dmm
@@ -0,0 +1,543 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/obj/machinery/computer/secure_data{
+ dir = 8
+ },
+/obj/effect/turf_decal/techfloor{
+ dir = 4
+ },
+/turf/open/floor/plasteel/telecomms_floor,
+/area/ship/bridge)
+"b" = (
+/obj/effect/turf_decal/corner/opaque/brown{
+ dir = 8
+ },
+/obj/effect/turf_decal/corner/opaque/yellow,
+/obj/effect/turf_decal/corner/opaque/yellow{
+ dir = 1
+ },
+/obj/structure/table/reinforced,
+/obj/machinery/fax,
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"c" = (
+/obj/machinery/power/shuttle/engine/electric{
+ dir = 4
+ },
+/obj/structure/window/reinforced{
+ dir = 1
+ },
+/obj/structure/window/reinforced,
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/turf/open/floor/engine/hull/reinforced,
+/area/ship/external)
+"d" = (
+/obj/effect/turf_decal/corner/opaque/yellow,
+/obj/effect/turf_decal/corner/opaque/brown{
+ dir = 8
+ },
+/obj/effect/turf_decal/corner/opaque/brown{
+ dir = 4
+ },
+/obj/structure/chair/comfy/shuttle{
+ dir = 1
+ },
+/obj/effect/landmark/ert_shuttle_spawn,
+/obj/machinery/light/directional/east,
+/obj/structure/closet/emcloset/wall{
+ dir = 1;
+ pixel_y = -28
+ },
+/obj/item/tank/internals/oxygen,
+/obj/item/tank/internals/oxygen,
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"e" = (
+/obj/effect/turf_decal/trimline/opaque/yellow/filled/warning{
+ dir = 8
+ },
+/obj/machinery/power/terminal{
+ dir = 1
+ },
+/obj/structure/cable/yellow{
+ icon_state = "0-2"
+ },
+/obj/structure/cable{
+ icon_state = "1-6"
+ },
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/bridge)
+"g" = (
+/obj/machinery/power/smes/shuttle/precharged,
+/obj/structure/cable,
+/obj/structure/window/reinforced{
+ dir = 1
+ },
+/turf/open/floor/plating,
+/area/ship/bridge)
+"h" = (
+/obj/structure/cable{
+ icon_state = "2-9"
+ },
+/obj/structure/cable{
+ icon_state = "1-9"
+ },
+/obj/structure/cable{
+ icon_state = "4-9"
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/bridge)
+"i" = (
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/bridge)
+"m" = (
+/obj/effect/turf_decal/corner/opaque/yellow{
+ dir = 1
+ },
+/obj/effect/turf_decal/corner/opaque/brown{
+ dir = 8
+ },
+/obj/effect/landmark/ert_shuttle_brief_spawn,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"n" = (
+/obj/structure/chair,
+/obj/machinery/door/window/brigdoor/southright,
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"o" = (
+/obj/machinery/power/port_gen/pacman,
+/obj/structure/cable/yellow,
+/obj/machinery/light/directional/south,
+/obj/item/stack/sheet/mineral/plasma/twenty,
+/turf/open/floor/plating,
+/area/ship/bridge)
+"q" = (
+/obj/effect/turf_decal/corner/opaque/yellow,
+/obj/effect/turf_decal/corner/opaque/brown{
+ dir = 8
+ },
+/obj/structure/chair/comfy/shuttle{
+ dir = 1
+ },
+/obj/effect/landmark/ert_shuttle_spawn,
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"r" = (
+/obj/machinery/power/terminal{
+ dir = 1
+ },
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/obj/machinery/button/door{
+ dir = 8;
+ pixel_x = 20;
+ pixel_y = 12;
+ id = "anvil_door"
+ },
+/obj/machinery/button/shieldwallgen{
+ dir = 8;
+ pixel_x = 20;
+ pixel_y = 2;
+ id = "anvil_holo"
+ },
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/bridge)
+"t" = (
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/obj/machinery/light_switch{
+ pixel_y = 22;
+ pixel_x = 11
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"u" = (
+/obj/machinery/door/poddoor{
+ dir = 4;
+ id = "anvil_door"
+ },
+/obj/machinery/power/shieldwallgen/atmos/roundstart{
+ id = "anvil_holo"
+ },
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"v" = (
+/obj/machinery/power/shuttle/engine/electric{
+ dir = 4
+ },
+/obj/structure/window/reinforced,
+/obj/structure/window/reinforced{
+ dir = 1
+ },
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/turf/open/floor/engine/hull/reinforced,
+/area/ship/external)
+"w" = (
+/turf/template_noop,
+/area/template_noop)
+"x" = (
+/obj/machinery/porta_turret/ship/weak{
+ faction = list("playerInteq","turret");
+ dir = 1
+ },
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/bridge)
+"y" = (
+/obj/machinery/power/terminal,
+/obj/structure/cable{
+ icon_state = "0-1"
+ },
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/bridge)
+"z" = (
+/obj/machinery/power/smes/shuttle/precharged{
+ dir = 1
+ },
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/obj/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/ship/bridge)
+"A" = (
+/obj/effect/turf_decal/corner/opaque/brown{
+ dir = 4
+ },
+/obj/effect/turf_decal/corner/opaque/yellow{
+ dir = 1
+ },
+/obj/effect/turf_decal/corner/opaque/yellow,
+/obj/structure/chair/comfy/shuttle,
+/obj/effect/landmark/ert_shuttle_spawn,
+/obj/machinery/turretid{
+ pixel_y = 25
+ },
+/obj/machinery/light/directional/east,
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"B" = (
+/obj/structure/table/reinforced,
+/obj/effect/turf_decal/techfloor{
+ dir = 4
+ },
+/obj/item/radio/intercom/wideband/table{
+ dir = 4;
+ pixel_x = -1
+ },
+/turf/open/floor/plasteel/telecomms_floor,
+/area/ship/bridge)
+"D" = (
+/obj/effect/turf_decal/corner/opaque/yellow{
+ dir = 1
+ },
+/obj/effect/turf_decal/corner/opaque/brown{
+ dir = 8
+ },
+/obj/machinery/light/directional/west,
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"E" = (
+/obj/structure/grille,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/structure/window/reinforced{
+ dir = 4
+ },
+/obj/structure/window/reinforced{
+ dir = 8
+ },
+/turf/open/floor/plating,
+/area/ship/external)
+"F" = (
+/obj/machinery/power/smes/engineering,
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/obj/machinery/light/directional/north,
+/turf/open/floor/plating,
+/area/ship/bridge)
+"G" = (
+/obj/machinery/door/airlock/security{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"H" = (
+/obj/effect/turf_decal/corner/opaque/brown{
+ dir = 4
+ },
+/obj/effect/turf_decal/corner/opaque/yellow{
+ dir = 1
+ },
+/obj/structure/chair/comfy/shuttle,
+/obj/effect/landmark/ert_shuttle_spawn,
+/obj/machinery/airalarm/directional/north,
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"I" = (
+/obj/machinery/power/shieldwallgen/atmos/roundstart{
+ dir = 1;
+ id = "anvil_holo"
+ },
+/obj/machinery/door/poddoor{
+ dir = 4;
+ id = "anvil_door"
+ },
+/obj/structure/cable,
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"K" = (
+/obj/effect/turf_decal/trimline/opaque/yellow/filled/warning{
+ dir = 8
+ },
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/bridge)
+"L" = (
+/obj/structure/window/plasma/reinforced/plastitanium,
+/obj/structure/grille,
+/turf/open/floor/plating,
+/area/ship/bridge)
+"M" = (
+/obj/structure/chair/comfy/shuttle{
+ dir = 4
+ },
+/obj/effect/turf_decal/corner/opaque/yellow,
+/obj/effect/turf_decal/corner/opaque/brown{
+ dir = 4
+ },
+/obj/effect/landmark/ert_shuttle_spawn,
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"O" = (
+/obj/effect/turf_decal/trimline/opaque/yellow/filled/warning{
+ dir = 8
+ },
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/bridge)
+"P" = (
+/obj/structure/window/reinforced{
+ dir = 1
+ },
+/obj/structure/window/reinforced{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/obj/structure/grille,
+/turf/open/floor/engine/hull/reinforced,
+/area/ship/external)
+"Q" = (
+/obj/docking_port/mobile{
+ dir = 8;
+ name = "anvil dock";
+ preferred_direction = 4
+ },
+/obj/machinery/door/poddoor{
+ dir = 4;
+ id = "anvil_door"
+ },
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"R" = (
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"S" = (
+/obj/effect/turf_decal/corner/opaque/yellow,
+/obj/effect/turf_decal/corner/opaque/brown{
+ dir = 4
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"T" = (
+/obj/machinery/porta_turret/ship/weak{
+ faction = list("playerInteq","turret")
+ },
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/bridge)
+"U" = (
+/obj/effect/turf_decal/corner/opaque/brown{
+ dir = 8
+ },
+/obj/effect/turf_decal/corner/opaque/yellow,
+/obj/structure/table/reinforced,
+/obj/item/paper_bin,
+/obj/item/pen,
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"W" = (
+/obj/structure/window/reinforced,
+/obj/structure/window/reinforced{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/obj/structure/grille,
+/turf/open/floor/engine/hull/reinforced,
+/area/ship/external)
+"X" = (
+/turf/closed/wall/mineral/plastitanium,
+/area/ship/bridge)
+"Y" = (
+/obj/machinery/computer/helm{
+ dir = 8
+ },
+/obj/effect/turf_decal/techfloor{
+ dir = 4
+ },
+/turf/open/floor/plasteel/telecomms_floor,
+/area/ship/bridge)
+"Z" = (
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+
+(1,1,1) = {"
+w
+x
+X
+u
+Q
+I
+X
+T
+w
+"}
+(2,1,1) = {"
+c
+i
+F
+e
+O
+K
+o
+i
+v
+"}
+(3,1,1) = {"
+P
+E
+g
+r
+h
+y
+z
+E
+W
+"}
+(4,1,1) = {"
+w
+i
+i
+i
+G
+i
+i
+i
+w
+"}
+(5,1,1) = {"
+w
+i
+n
+D
+m
+D
+b
+i
+w
+"}
+(6,1,1) = {"
+w
+i
+X
+t
+Z
+R
+U
+X
+w
+"}
+(7,1,1) = {"
+w
+X
+H
+R
+R
+R
+q
+X
+w
+"}
+(8,1,1) = {"
+w
+X
+A
+S
+M
+S
+d
+X
+w
+"}
+(9,1,1) = {"
+w
+i
+i
+Y
+B
+a
+i
+i
+w
+"}
+(10,1,1) = {"
+w
+w
+i
+L
+L
+L
+i
+w
+w
+"}
diff --git a/_maps/shuttles/subshuttles/inteq_haste.dmm b/_maps/shuttles/subshuttles/inteq_haste.dmm
new file mode 100644
index 000000000000..74144c3fe930
--- /dev/null
+++ b/_maps/shuttles/subshuttles/inteq_haste.dmm
@@ -0,0 +1,262 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/closed/wall/mineral/plastitanium,
+/area/ship/bridge)
+"f" = (
+/obj/machinery/power/terminal{
+ dir = 1
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/structure/cable/yellow{
+ icon_state = "0-2"
+ },
+/obj/effect/turf_decal/techfloor{
+ dir = 1
+ },
+/turf/open/floor/plasteel/tech,
+/area/ship/bridge)
+"s" = (
+/obj/machinery/door/poddoor/shutters/preopen{
+ dir = 8;
+ id = "haste_door"
+ },
+/obj/machinery/power/shieldwallgen/atmos{
+ id = "haste_holo";
+ anchored = 1
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/structure/cable/yellow{
+ icon_state = "0-2"
+ },
+/turf/open/floor/engine/hull/interior,
+/area/ship/bridge)
+"B" = (
+/obj/machinery/power/smes/engineering{
+ charge = 1e+006
+ },
+/obj/effect/turf_decal/spline/fancy/opaque/black{
+ dir = 1
+ },
+/obj/structure/cable/yellow{
+ icon_state = "0-5"
+ },
+/obj/effect/turf_decal/techfloor,
+/turf/open/floor/plasteel/tech,
+/area/ship/bridge)
+"D" = (
+/obj/structure/cable{
+ icon_state = "4-10"
+ },
+/obj/structure/cable/yellow{
+ icon_state = "2-8"
+ },
+/obj/machinery/light_switch{
+ pixel_y = 22;
+ pixel_x = 10
+ },
+/obj/effect/turf_decal/techfloor{
+ dir = 1
+ },
+/obj/effect/turf_decal/spline/fancy/opaque/black{
+ dir = 8
+ },
+/turf/open/floor/plasteel/tech,
+/area/ship/bridge)
+"F" = (
+/obj/structure/window/reinforced,
+/obj/structure/window/reinforced{
+ dir = 8
+ },
+/obj/structure/window/reinforced{
+ dir = 4
+ },
+/obj/structure/cable/yellow{
+ icon_state = "0-4"
+ },
+/obj/machinery/power/smes/shuttle/precharged{
+ dir = 1
+ },
+/turf/open/floor/plasteel/tech,
+/area/ship/bridge)
+"I" = (
+/obj/effect/turf_decal/spline/fancy/opaque/black,
+/obj/structure/rack,
+/obj/item/storage/firstaid/regular{
+ pixel_x = 4;
+ pixel_y = 2
+ },
+/obj/item/storage/firstaid/medical{
+ pixel_x = -4;
+ pixel_y = 6
+ },
+/obj/item/defibrillator/loaded{
+ pixel_x = -4
+ },
+/obj/effect/turf_decal/spline/fancy/opaque/black{
+ dir = 1
+ },
+/obj/machinery/power/terminal{
+ dir = 8
+ },
+/obj/structure/cable{
+ icon_state = "0-5"
+ },
+/obj/machinery/light/directional/south,
+/obj/effect/turf_decal/techfloor,
+/turf/open/floor/plasteel/tech,
+/area/ship/bridge)
+"J" = (
+/obj/structure/window/reinforced{
+ dir = 1
+ },
+/obj/structure/window/reinforced{
+ dir = 8
+ },
+/obj/structure/window/reinforced{
+ dir = 4
+ },
+/obj/structure/cable/yellow{
+ icon_state = "0-4"
+ },
+/obj/machinery/power/smes/shuttle/precharged,
+/turf/open/floor/plasteel/tech,
+/area/ship/bridge)
+"K" = (
+/obj/structure/grille,
+/obj/structure/window/plasma/reinforced/plastitanium,
+/turf/open/floor/plating,
+/area/ship/bridge)
+"M" = (
+/obj/structure/bed/roller,
+/obj/effect/turf_decal/spline/fancy/opaque/black/corner{
+ dir = 1
+ },
+/obj/machinery/power/apc/auto_name/directional/south,
+/obj/structure/cable/yellow,
+/obj/structure/cable/yellow{
+ icon_state = "1-4"
+ },
+/obj/effect/turf_decal/techfloor,
+/turf/open/floor/plasteel/tech,
+/area/ship/bridge)
+"O" = (
+/obj/machinery/power/shieldwallgen/atmos{
+ dir = 1;
+ id = "haste_holo";
+ anchored = 1
+ },
+/obj/machinery/door/poddoor/shutters/preopen{
+ dir = 8;
+ id = "haste_door"
+ },
+/obj/docking_port/mobile{
+ dir = 8;
+ name = "ambulance dock";
+ preferred_direction = 8;
+ port_direction = 2
+ },
+/obj/structure/cable/yellow{
+ icon_state = "0-8"
+ },
+/obj/structure/cable/yellow{
+ icon_state = "1-8"
+ },
+/turf/open/floor/engine/hull/interior,
+/area/ship/bridge)
+"R" = (
+/obj/machinery/power/terminal,
+/obj/structure/cable/yellow{
+ icon_state = "0-8"
+ },
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/obj/structure/cable/yellow{
+ icon_state = "1-8"
+ },
+/obj/effect/turf_decal/techfloor,
+/turf/open/floor/plasteel/tech,
+/area/ship/bridge)
+"T" = (
+/obj/machinery/power/shuttle/engine/electric{
+ dir = 8
+ },
+/obj/structure/cable/yellow{
+ icon_state = "0-8"
+ },
+/turf/open/floor/engine/hull/interior,
+/area/ship/bridge)
+"X" = (
+/obj/machinery/computer/helm{
+ dir = 4;
+ layer = 3
+ },
+/obj/structure/railing{
+ dir = 10
+ },
+/obj/machinery/button/shieldwallgen{
+ pixel_y = 21;
+ pixel_x = 9;
+ id = "haste_holo"
+ },
+/obj/machinery/button/door{
+ pixel_x = -2;
+ pixel_y = 23;
+ id = "haste_door"
+ },
+/turf/open/floor/plasteel/telecomms_floor,
+/area/ship/bridge)
+"Z" = (
+/obj/structure/chair/comfy/shuttle{
+ dir = 8
+ },
+/obj/structure/railing,
+/obj/item/radio/intercom/wideband/directional/north{
+ pixel_x = -9
+ },
+/obj/structure/cable/yellow{
+ icon_state = "4-10"
+ },
+/turf/open/floor/plasteel/telecomms_floor,
+/area/ship/bridge)
+
+(1,1,1) = {"
+a
+K
+K
+a
+"}
+(2,1,1) = {"
+a
+X
+B
+a
+"}
+(3,1,1) = {"
+a
+Z
+I
+a
+"}
+(4,1,1) = {"
+a
+D
+M
+a
+"}
+(5,1,1) = {"
+J
+f
+R
+F
+"}
+(6,1,1) = {"
+T
+s
+O
+T
+"}
diff --git a/_maps/shuttles/subshuttles/minutemen_crux.dmm b/_maps/shuttles/subshuttles/minutemen_crux.dmm
new file mode 100644
index 000000000000..3e32e2694bc6
--- /dev/null
+++ b/_maps/shuttles/subshuttles/minutemen_crux.dmm
@@ -0,0 +1,489 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/obj/effect/turf_decal/techfloor{
+ dir = 10
+ },
+/obj/structure/chair/comfy/shuttle{
+ dir = 4;
+ name = "tactical chair"
+ },
+/obj/machinery/power/terminal{
+ dir = 8
+ },
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/turf/open/floor/plasteel/telecomms_floor,
+/area/ship/bridge)
+"b" = (
+/obj/machinery/power/shieldwallgen/atmos/roundstart{
+ id = "crux_holofan"
+ },
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/obj/machinery/door/poddoor{
+ id = "crux_blastdoors";
+ dir = 4
+ },
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/bridge)
+"d" = (
+/obj/structure/cable{
+ icon_state = "1-10"
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/effect/turf_decal/siding/thinplating/dark{
+ dir = 4
+ },
+/obj/machinery/holopad/emergency/command,
+/obj/effect/turf_decal/siding/thinplating/dark{
+ dir = 8
+ },
+/obj/effect/landmark/ert_shuttle_brief_spawn,
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/bridge)
+"f" = (
+/obj/structure/railing{
+ dir = 8
+ },
+/obj/machinery/light/directional/south,
+/obj/structure/chair/comfy/shuttle{
+ dir = 1
+ },
+/obj/effect/landmark/ert_shuttle_spawn,
+/turf/open/floor/plasteel/tech,
+/area/ship/bridge)
+"g" = (
+/obj/docking_port/mobile{
+ dir = 8;
+ name = "crux dock";
+ preferred_direction = 8
+ },
+/obj/machinery/door/poddoor{
+ id = "crux_blastdoors";
+ dir = 4
+ },
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/bridge)
+"h" = (
+/obj/structure/railing{
+ dir = 8
+ },
+/obj/machinery/light/directional/north,
+/obj/structure/chair/comfy/shuttle,
+/obj/effect/landmark/ert_shuttle_spawn,
+/turf/open/floor/plasteel/tech,
+/area/ship/bridge)
+"i" = (
+/obj/effect/turf_decal/steeldecal/steel_decals10,
+/obj/effect/turf_decal/steeldecal/steel_decals10{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel/tech,
+/area/ship/bridge)
+"k" = (
+/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
+/obj/machinery/door/poddoor{
+ id = "crux_windows"
+ },
+/turf/open/floor/plating,
+/area/ship/bridge)
+"m" = (
+/turf/template_noop,
+/area/template_noop)
+"o" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/power/shieldwallgen/atmos/roundstart{
+ id = "crux_holofan";
+ dir = 1
+ },
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/obj/machinery/door/poddoor{
+ id = "crux_blastdoors";
+ dir = 4
+ },
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/bridge)
+"q" = (
+/obj/effect/turf_decal/techfloor/orange{
+ dir = 4
+ },
+/obj/machinery/power/smes/engineering,
+/obj/effect/turf_decal/industrial/hatch/yellow,
+/obj/structure/sign/poster/official/obey{
+ pixel_x = -32
+ },
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ship/bridge)
+"r" = (
+/obj/structure/chair/comfy/shuttle{
+ dir = 1
+ },
+/obj/machinery/button/door{
+ id = "crux_blastdoors";
+ name = "Cargo Bay Doors";
+ pixel_y = -22;
+ pixel_x = -4;
+ dir = 1
+ },
+/obj/effect/landmark/ert_shuttle_spawn,
+/turf/open/floor/plasteel/tech,
+/area/ship/bridge)
+"u" = (
+/obj/structure/chair/comfy/shuttle,
+/obj/effect/turf_decal/steeldecal/steel_decals10,
+/obj/effect/turf_decal/steeldecal/steel_decals10{
+ dir = 4
+ },
+/obj/machinery/airalarm/directional/north,
+/obj/effect/landmark/ert_shuttle_spawn,
+/turf/open/floor/plasteel/tech,
+/area/ship/bridge)
+"v" = (
+/obj/structure/railing/corner{
+ dir = 8
+ },
+/obj/structure/railing/corner{
+ dir = 1
+ },
+/obj/structure/cable{
+ icon_state = "5-8"
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel/tech,
+/area/ship/bridge)
+"w" = (
+/turf/closed/wall/r_wall/syndicate/nodiagonal,
+/area/ship/bridge)
+"x" = (
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/obj/machinery/power/shuttle/engine/electric/premium{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/ship/bridge)
+"y" = (
+/obj/effect/turf_decal/siding/thinplating/dark{
+ dir = 8
+ },
+/obj/effect/turf_decal/industrial/caution{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/turf/open/floor/plasteel,
+/area/ship/bridge)
+"z" = (
+/turf/closed/wall/r_wall/syndicate,
+/area/ship/bridge)
+"A" = (
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/structure/cable{
+ icon_state = "0-10"
+ },
+/obj/structure/chair/comfy/shuttle,
+/obj/effect/turf_decal/steeldecal/steel_decals6,
+/obj/effect/landmark/ert_shuttle_spawn,
+/turf/open/floor/plasteel/tech,
+/area/ship/bridge)
+"B" = (
+/obj/machinery/door/window/brigdoor/southright{
+ req_one_access = list(1)
+ },
+/obj/effect/turf_decal/siding/thinplating/dark{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/thinplating/dark{
+ dir = 8
+ },
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/bridge)
+"E" = (
+/obj/effect/turf_decal/corner/opaque/black/diagonal,
+/obj/machinery/light/directional/south,
+/obj/effect/turf_decal/industrial/warning{
+ color = "#808080"
+ },
+/turf/open/floor/plasteel,
+/area/ship/bridge)
+"G" = (
+/obj/effect/turf_decal/techfloor/orange{
+ dir = 4
+ },
+/obj/effect/turf_decal/techfloor/hole{
+ dir = 4
+ },
+/obj/machinery/power/port_gen/pacman,
+/obj/effect/turf_decal/industrial/hatch/yellow,
+/obj/structure/cable{
+ icon_state = "0-5"
+ },
+/obj/effect/decal/cleanable/greenglow,
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ship/bridge)
+"I" = (
+/obj/effect/turf_decal/siding/thinplating/dark{
+ dir = 9
+ },
+/obj/structure/sign/minutemen{
+ pixel_y = 28
+ },
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/turf/open/floor/plasteel,
+/area/ship/bridge)
+"J" = (
+/obj/effect/turf_decal/techfloor{
+ dir = 4
+ },
+/obj/machinery/computer/crew{
+ dir = 8
+ },
+/turf/open/floor/plasteel/telecomms_floor,
+/area/ship/bridge)
+"L" = (
+/obj/structure/bed,
+/obj/item/bedsheet,
+/obj/effect/turf_decal/corner/opaque/black/diagonal,
+/turf/open/floor/plasteel,
+/area/ship/bridge)
+"M" = (
+/obj/effect/turf_decal/techfloor/orange{
+ dir = 4
+ },
+/obj/machinery/power/terminal{
+ dir = 8
+ },
+/obj/structure/cable{
+ icon_state = "0-1"
+ },
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/obj/machinery/button/door{
+ id = "crux_windows";
+ name = "Window Shutters";
+ pixel_y = -22;
+ pixel_x = -22;
+ dir = 4
+ },
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ship/bridge)
+"N" = (
+/obj/effect/turf_decal/techfloor{
+ dir = 8
+ },
+/obj/structure/table/reinforced,
+/obj/machinery/button/door{
+ id = "crux_windows";
+ name = "Window Blast Doors";
+ pixel_y = 10;
+ pixel_x = -22;
+ dir = 4
+ },
+/obj/machinery/recharger{
+ pixel_x = 6
+ },
+/obj/machinery/button/shieldwallgen{
+ id = "crux_holofan";
+ pixel_x = -21;
+ pixel_y = -3;
+ dir = 4
+ },
+/obj/item/paper_bin{
+ pixel_x = -6
+ },
+/turf/open/floor/plasteel/telecomms_floor,
+/area/ship/bridge)
+"P" = (
+/obj/effect/turf_decal/steeldecal/steel_decals9{
+ dir = 8
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel/tech,
+/area/ship/bridge)
+"Q" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel/stairs{
+ icon = 'icons/obj/stairs.dmi';
+ dir = 8
+ },
+/area/ship/bridge)
+"S" = (
+/obj/machinery/power/smes/shuttle/precharged{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/obj/structure/window/reinforced{
+ dir = 8
+ },
+/obj/machinery/door/window/eastleft,
+/obj/machinery/door/poddoor{
+ id = "crux_windows";
+ dir = 8
+ },
+/turf/open/floor/plating,
+/area/ship/bridge)
+"T" = (
+/obj/effect/turf_decal/techfloor{
+ dir = 6
+ },
+/obj/machinery/computer/helm{
+ dir = 8
+ },
+/turf/open/floor/plasteel/telecomms_floor,
+/area/ship/bridge)
+"U" = (
+/obj/effect/turf_decal/siding/thinplating/dark{
+ dir = 10
+ },
+/obj/structure/sign/minutemen{
+ pixel_y = -32
+ },
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/turf/open/floor/plasteel,
+/area/ship/bridge)
+"X" = (
+/obj/structure/guncase,
+/obj/structure/window/reinforced,
+/obj/effect/turf_decal/techfloor{
+ dir = 9
+ },
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/bridge)
+"Y" = (
+/obj/structure/chair/comfy/shuttle{
+ dir = 1
+ },
+/obj/effect/turf_decal/steeldecal/steel_decals10,
+/obj/effect/turf_decal/steeldecal/steel_decals10{
+ dir = 4
+ },
+/obj/item/radio/intercom/directional/south{
+ pixel_x = -12
+ },
+/obj/machinery/firealarm/directional/south{
+ pixel_x = 7
+ },
+/obj/effect/landmark/ert_shuttle_spawn,
+/turf/open/floor/plasteel/tech,
+/area/ship/bridge)
+
+(1,1,1) = {"
+m
+m
+w
+x
+w
+m
+m
+"}
+(2,1,1) = {"
+m
+w
+w
+S
+w
+w
+m
+"}
+(3,1,1) = {"
+w
+w
+q
+M
+G
+w
+w
+"}
+(4,1,1) = {"
+k
+N
+a
+d
+B
+E
+w
+"}
+(5,1,1) = {"
+k
+J
+T
+Q
+X
+L
+w
+"}
+(6,1,1) = {"
+k
+w
+h
+v
+f
+w
+w
+"}
+(7,1,1) = {"
+m
+w
+A
+P
+r
+w
+m
+"}
+(8,1,1) = {"
+m
+w
+u
+i
+Y
+w
+m
+"}
+(9,1,1) = {"
+m
+w
+I
+y
+U
+w
+m
+"}
+(10,1,1) = {"
+m
+z
+b
+g
+o
+z
+m
+"}
diff --git a/_maps/shuttles/subshuttles/nanotrasen_ancon.dmm b/_maps/shuttles/subshuttles/nanotrasen_ancon.dmm
new file mode 100644
index 000000000000..4565f12416f6
--- /dev/null
+++ b/_maps/shuttles/subshuttles/nanotrasen_ancon.dmm
@@ -0,0 +1,555 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"aD" = (
+/obj/effect/turf_decal/corner/opaque/green/diagonal,
+/obj/structure/extinguisher_cabinet/directional/north,
+/obj/effect/turf_decal/siding/thinplating/light{
+ dir = 1
+ },
+/turf/open/floor/plasteel/white,
+/area/ship/bridge)
+"aW" = (
+/obj/machinery/computer/card/centcom{
+ dir = 8
+ },
+/obj/effect/turf_decal/techfloor{
+ dir = 4
+ },
+/obj/effect/turf_decal/spline/fancy/opaque/black{
+ dir = 8
+ },
+/turf/open/floor/plasteel/telecomms_floor,
+/area/ship/bridge)
+"br" = (
+/obj/machinery/door/airlock/external{
+ dir = 4
+ },
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/ship/bridge)
+"dw" = (
+/obj/machinery/door/airlock/external/glass{
+ dir = 4
+ },
+/obj/docking_port/mobile{
+ dir = 8;
+ name = "ancon dock";
+ preferred_direction = 4
+ },
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/ship/bridge)
+"hj" = (
+/obj/effect/turf_decal/corner/opaque/green/diagonal{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/thinplating/light,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel/white,
+/area/ship/bridge)
+"jj" = (
+/obj/effect/turf_decal/trimline/opaque/green/warning{
+ dir = 8
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel/white,
+/area/ship/bridge)
+"kE" = (
+/obj/effect/turf_decal/corner/opaque/green/half{
+ dir = 1
+ },
+/obj/machinery/power/port_gen/pacman,
+/obj/machinery/power/terminal{
+ dir = 8
+ },
+/obj/item/stack/sheet/mineral/plasma/fifty,
+/obj/structure/cable/yellow{
+ icon_state = "0-8"
+ },
+/turf/open/floor/plasteel/white,
+/area/ship/bridge)
+"lu" = (
+/obj/machinery/power/terminal{
+ dir = 8
+ },
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/obj/effect/turf_decal/corner/opaque/green/half{
+ dir = 1
+ },
+/turf/open/floor/plasteel/white,
+/area/ship/bridge)
+"nV" = (
+/obj/structure/chair/office/light{
+ dir = 8
+ },
+/obj/effect/turf_decal/corner/opaque/green/diagonal{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/thinplating/light{
+ dir = 4
+ },
+/obj/effect/landmark/ert_shuttle_spawn,
+/turf/open/floor/plasteel/white,
+/area/ship/bridge)
+"pk" = (
+/obj/effect/turf_decal/trimline/opaque/green/corner{
+ dir = 8
+ },
+/obj/structure/cable{
+ icon_state = "2-5"
+ },
+/obj/structure/cable{
+ icon_state = "1-5"
+ },
+/obj/machinery/light/directional/west,
+/turf/open/floor/plasteel/white,
+/area/ship/bridge)
+"te" = (
+/obj/effect/turf_decal/corner/opaque/green/diagonal,
+/obj/effect/turf_decal/siding/thinplating/light,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel/white,
+/area/ship/bridge)
+"tk" = (
+/turf/template_noop,
+/area/template_noop)
+"ty" = (
+/obj/effect/turf_decal/corner/opaque/green/diagonal{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/thinplating/light{
+ dir = 6
+ },
+/obj/machinery/power/apc/auto_name/directional/south,
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/obj/machinery/light/directional/east,
+/obj/machinery/light_switch{
+ pixel_x = 12;
+ pixel_y = -19;
+ dir = 1
+ },
+/turf/open/floor/plasteel/white,
+/area/ship/bridge)
+"up" = (
+/obj/machinery/photocopier,
+/obj/effect/turf_decal/corner/opaque/green/half,
+/turf/open/floor/plasteel/white,
+/area/ship/bridge)
+"vV" = (
+/obj/structure/closet/emcloset/wall{
+ pixel_y = 28
+ },
+/obj/item/clothing/suit/space/eva,
+/obj/item/clothing/suit/space/eva,
+/obj/item/clothing/suit/space/eva,
+/obj/item/clothing/suit/space/eva,
+/obj/item/clothing/head/helmet/space/eva,
+/obj/item/clothing/head/helmet/space/eva,
+/obj/item/clothing/head/helmet/space/eva,
+/obj/item/clothing/head/helmet/space/eva,
+/turf/open/floor/plating,
+/area/ship/bridge)
+"xH" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 6
+ },
+/obj/structure/table,
+/obj/item/taperecorder{
+ pixel_x = -12;
+ pixel_y = 9
+ },
+/obj/item/taperecorder{
+ pixel_y = 8;
+ pixel_x = -2
+ },
+/obj/item/tape{
+ pixel_x = -4;
+ pixel_y = -1
+ },
+/obj/item/tape{
+ pixel_x = 4;
+ pixel_y = 1
+ },
+/turf/open/floor/wood,
+/area/ship/bridge)
+"xZ" = (
+/obj/machinery/power/smes/shuttle/precharged{
+ dir = 4
+ },
+/obj/machinery/door/window/eastleft,
+/obj/machinery/door/poddoor/shutters/preopen{
+ id = "ancon_engine";
+ name = "Engine Shutters";
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/ship/bridge)
+"yi" = (
+/obj/effect/turf_decal/corner/opaque/green/border{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/ship/bridge)
+"yp" = (
+/obj/structure/grille,
+/obj/structure/window/reinforced/fulltile/shuttle,
+/turf/open/floor/plating,
+/area/ship/bridge)
+"zI" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 5
+ },
+/obj/structure/table,
+/obj/item/camera{
+ pixel_x = -4;
+ pixel_y = 7
+ },
+/obj/item/camera{
+ pixel_x = 2;
+ pixel_y = 2
+ },
+/obj/item/camera_film{
+ pixel_x = -11;
+ pixel_y = -6
+ },
+/obj/item/camera_film{
+ pixel_x = -5;
+ pixel_y = -9
+ },
+/turf/open/floor/wood,
+/area/ship/bridge)
+"zJ" = (
+/obj/machinery/power/shuttle/engine/electric/premium{
+ dir = 4
+ },
+/turf/open/floor/plating/airless,
+/area/ship/external/dark)
+"Ct" = (
+/obj/structure/chair/office/light{
+ dir = 4
+ },
+/obj/effect/turf_decal/corner/opaque/green/diagonal{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/thinplating/light{
+ dir = 8
+ },
+/obj/effect/landmark/ert_shuttle_spawn,
+/turf/open/floor/plasteel/white,
+/area/ship/bridge)
+"DF" = (
+/obj/machinery/power/terminal{
+ dir = 8
+ },
+/obj/structure/cable{
+ icon_state = "0-1"
+ },
+/obj/effect/turf_decal/corner/opaque/green/half,
+/turf/open/floor/plasteel/white,
+/area/ship/bridge)
+"Fz" = (
+/obj/effect/turf_decal/corner/opaque/green/diagonal{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/thinplating/light{
+ dir = 9
+ },
+/turf/open/floor/plasteel/white,
+/area/ship/bridge)
+"FS" = (
+/obj/effect/turf_decal/corner/opaque/green/diagonal,
+/obj/effect/turf_decal/siding/thinplating/light{
+ dir = 5
+ },
+/obj/machinery/airalarm/directional/north,
+/obj/machinery/light/directional/east,
+/turf/open/floor/plasteel/white,
+/area/ship/bridge)
+"IJ" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 10
+ },
+/obj/structure/table,
+/obj/item/paper_bin{
+ pixel_y = 3
+ },
+/obj/item/pen{
+ pixel_y = 3
+ },
+/turf/open/floor/wood,
+/area/ship/bridge)
+"KF" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 9
+ },
+/obj/structure/table,
+/obj/item/clipboard{
+ pixel_x = -4;
+ pixel_y = 3
+ },
+/obj/item/clipboard{
+ pixel_x = 5
+ },
+/turf/open/floor/wood,
+/area/ship/bridge)
+"LE" = (
+/turf/closed/wall/mineral/titanium,
+/area/template_noop)
+"LV" = (
+/turf/closed/wall/mineral/titanium,
+/area/ship/bridge)
+"MW" = (
+/obj/structure/chair/office/light{
+ dir = 4
+ },
+/obj/effect/turf_decal/corner/opaque/green/diagonal{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/thinplating/light{
+ dir = 8
+ },
+/obj/effect/landmark/ert_shuttle_spawn,
+/turf/open/floor/plasteel/white,
+/area/ship/bridge)
+"Nk" = (
+/obj/effect/turf_decal/trimline/opaque/green/corner{
+ dir = 1
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/obj/machinery/light/directional/west,
+/turf/open/floor/plasteel/white,
+/area/ship/bridge)
+"Om" = (
+/obj/machinery/door/airlock/external/glass{
+ dir = 4
+ },
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 8
+ },
+/turf/open/floor/plating,
+/area/ship/bridge)
+"Rg" = (
+/obj/effect/turf_decal/siding/thinplating/light{
+ dir = 4
+ },
+/obj/structure/chair/office/light{
+ dir = 8
+ },
+/obj/effect/turf_decal/corner/opaque/green/diagonal{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/thinplating/light{
+ dir = 4
+ },
+/obj/effect/landmark/ert_shuttle_spawn,
+/turf/open/floor/plasteel/white,
+/area/ship/bridge)
+"Rz" = (
+/obj/effect/turf_decal/corner/opaque/green/half{
+ dir = 1
+ },
+/obj/machinery/power/smes/engineering,
+/obj/structure/cable{
+ icon_state = "0-10"
+ },
+/obj/structure/cable/yellow{
+ icon_state = "0-4"
+ },
+/turf/open/floor/plasteel/white,
+/area/ship/bridge)
+"SI" = (
+/obj/effect/turf_decal/corner/opaque/green/border{
+ dir = 4
+ },
+/obj/structure/chair/comfy{
+ dir = 4
+ },
+/obj/effect/landmark/ert_shuttle_spawn,
+/turf/open/floor/plasteel,
+/area/ship/bridge)
+"Th" = (
+/obj/machinery/power/smes/shuttle/precharged{
+ dir = 4
+ },
+/obj/machinery/door/window/eastright,
+/obj/machinery/door/poddoor/shutters/preopen{
+ id = "ancon_engine";
+ name = "Engine Shutters";
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/ship/bridge)
+"TQ" = (
+/obj/effect/turf_decal/corner/opaque/green/diagonal{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/thinplating/light{
+ dir = 10
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel/white,
+/area/ship/bridge)
+"Vu" = (
+/obj/machinery/computer/helm{
+ dir = 8
+ },
+/obj/effect/turf_decal/techfloor{
+ dir = 4
+ },
+/obj/effect/turf_decal/spline/fancy/opaque/black{
+ dir = 8
+ },
+/turf/open/floor/plasteel/telecomms_floor,
+/area/ship/bridge)
+"XH" = (
+/obj/effect/turf_decal/corner/opaque/green/diagonal{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/thinplating/light{
+ dir = 1
+ },
+/obj/effect/landmark/ert_shuttle_brief_spawn,
+/turf/open/floor/plasteel/white,
+/area/ship/bridge)
+"Zr" = (
+/turf/open/floor/plating,
+/area/ship/bridge)
+"ZG" = (
+/obj/structure/table,
+/obj/machinery/fax{
+ pixel_y = 5
+ },
+/obj/effect/turf_decal/corner/opaque/green/half,
+/turf/open/floor/plasteel/white,
+/area/ship/bridge)
+
+(1,1,1) = {"
+tk
+tk
+LV
+dw
+br
+LV
+tk
+tk
+"}
+(2,1,1) = {"
+tk
+zJ
+LV
+vV
+Zr
+LV
+zJ
+tk
+"}
+(3,1,1) = {"
+LV
+xZ
+LV
+Om
+Om
+LV
+Th
+LV
+"}
+(4,1,1) = {"
+yp
+lu
+pk
+jj
+jj
+Nk
+DF
+yp
+"}
+(5,1,1) = {"
+yp
+Rz
+Fz
+Ct
+MW
+TQ
+ZG
+yp
+"}
+(6,1,1) = {"
+yp
+kE
+XH
+KF
+IJ
+hj
+up
+yp
+"}
+(7,1,1) = {"
+LV
+LV
+aD
+zI
+xH
+te
+LV
+LV
+"}
+(8,1,1) = {"
+tk
+LV
+FS
+nV
+Rg
+ty
+LV
+tk
+"}
+(9,1,1) = {"
+tk
+LV
+LV
+SI
+yi
+LV
+LV
+tk
+"}
+(10,1,1) = {"
+tk
+tk
+LV
+Vu
+aW
+LV
+tk
+tk
+"}
+(11,1,1) = {"
+tk
+tk
+LV
+yp
+yp
+LE
+tk
+tk
+"}
diff --git a/_maps/shuttles/subshuttles/syndicate_runner.dmm b/_maps/shuttles/subshuttles/syndicate_runner.dmm
new file mode 100644
index 000000000000..21e4f84a10e5
--- /dev/null
+++ b/_maps/shuttles/subshuttles/syndicate_runner.dmm
@@ -0,0 +1,638 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"aa" = (
+/obj/machinery/power/smes/shuttle/precharged,
+/obj/structure/window/reinforced{
+ dir = 4
+ },
+/obj/structure/window/reinforced{
+ dir = 8
+ },
+/obj/structure/cable,
+/turf/open/floor/plating,
+/area/ship/bridge)
+"ac" = (
+/obj/effect/turf_decal/spline/fancy/opaque/syndiered{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/opaque/bar/warning{
+ dir = 8
+ },
+/turf/open/floor/plasteel/white,
+/area/ship/bridge)
+"ae" = (
+/obj/structure/table/chem,
+/obj/structure/sink/chem{
+ dir = 4
+ },
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/bridge)
+"af" = (
+/obj/structure/grille,
+/obj/structure/window/reinforced{
+ dir = 4
+ },
+/obj/structure/window/reinforced{
+ dir = 1
+ },
+/obj/structure/window/reinforced,
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/turf/open/floor/engine/hull,
+/area/ship/external)
+"ah" = (
+/obj/effect/turf_decal/spline/fancy/opaque/syndiered{
+ dir = 4
+ },
+/obj/machinery/holopad/emergency/medical,
+/turf/open/floor/plasteel/white,
+/area/ship/bridge)
+"aj" = (
+/obj/machinery/power/shuttle/engine/electric/premium{
+ dir = 4
+ },
+/obj/structure/window/reinforced,
+/obj/structure/window/reinforced{
+ dir = 1
+ },
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/turf/open/floor/engine/hull,
+/area/ship/external)
+"ak" = (
+/obj/effect/turf_decal/trimline/opaque/syndiered/filled/shrink_ccw{
+ dir = 1;
+ pixel_y = 1
+ },
+/obj/effect/turf_decal/spline/fancy/opaque/black{
+ dir = 1
+ },
+/obj/structure/chair/comfy/shuttle{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/opaque/bar/filled/corner,
+/obj/machinery/power/terminal,
+/obj/effect/landmark/ert_shuttle_spawn,
+/obj/structure/cable{
+ icon_state = "0-1"
+ },
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/obj/machinery/light/directional/west,
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"al" = (
+/obj/structure/table/chem,
+/obj/item/reagent_containers/glass/bottle/bicaridine{
+ pixel_x = 7;
+ pixel_y = 14
+ },
+/obj/item/reagent_containers/glass/bottle/antitoxin{
+ pixel_x = -4;
+ pixel_y = 10
+ },
+/obj/item/reagent_containers/glass/bottle/kelotane{
+ pixel_x = 4;
+ pixel_y = 7
+ },
+/obj/item/reagent_containers/glass/bottle/dexalin{
+ pixel_x = -3;
+ pixel_y = 2
+ },
+/obj/item/reagent_containers/syringe{
+ pixel_x = 8
+ },
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/bridge)
+"bz" = (
+/obj/machinery/power/shieldwallgen/atmos/roundstart{
+ dir = 4;
+ id = "runner_top_holo"
+ },
+/obj/machinery/door/poddoor{
+ id = "runner_top_door"
+ },
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/turf/open/floor/plating,
+/area/ship/bridge)
+"bG" = (
+/obj/effect/turf_decal/spline/fancy/opaque/black{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/opaque/syndiered/filled/shrink_cw{
+ dir = 1
+ },
+/obj/structure/chair/comfy/shuttle{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/opaque/bar/filled/corner{
+ dir = 8
+ },
+/obj/machinery/button/shieldwallgen{
+ dir = 1;
+ pixel_y = -20;
+ pixel_x = -12;
+ id = "runner_sub_holo"
+ },
+/obj/machinery/power/apc/auto_name/directional/east,
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/obj/machinery/button/door{
+ pixel_y = -21;
+ pixel_x = -1;
+ id = "runner_sub_door";
+ dir = 1
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"bY" = (
+/obj/effect/turf_decal/spline/fancy/opaque/syndiered{
+ dir = 8
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/turf/open/floor/plasteel/white,
+/area/ship/bridge)
+"co" = (
+/obj/effect/turf_decal/spline/fancy/opaque/black,
+/obj/effect/turf_decal/trimline/opaque/syndiered/filled/line,
+/obj/effect/turf_decal/trimline/opaque/bar/filled/warning{
+ dir = 1
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"cF" = (
+/obj/structure/chair/comfy/shuttle{
+ dir = 8
+ },
+/obj/effect/turf_decal/spline/fancy/opaque/black,
+/obj/effect/turf_decal/trimline/opaque/syndiered/filled/shrink_ccw,
+/obj/effect/turf_decal/trimline/opaque/bar/filled/corner{
+ dir = 1
+ },
+/obj/structure/closet/emcloset/wall{
+ dir = 8;
+ pixel_x = 28
+ },
+/obj/item/tank/internals/oxygen,
+/obj/item/tank/internals/oxygen,
+/obj/item/tank/internals/oxygen,
+/obj/effect/landmark/ert_shuttle_spawn,
+/obj/machinery/button/shieldwallgen{
+ pixel_y = 20;
+ pixel_x = -12;
+ id = "runner_top_holo"
+ },
+/obj/machinery/button/door{
+ pixel_y = 21;
+ pixel_x = -1;
+ id = "runner_top_door"
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"dB" = (
+/obj/machinery/door/poddoor{
+ id = "runner_sub_door"
+ },
+/obj/machinery/power/shieldwallgen/atmos/roundstart{
+ dir = 4;
+ id = "runner_sub_holo"
+ },
+/obj/structure/cable{
+ icon_state = "0-1"
+ },
+/turf/open/floor/plating,
+/area/ship/bridge)
+"fa" = (
+/obj/machinery/computer/crew/syndie{
+ dir = 8
+ },
+/obj/effect/turf_decal/techfloor{
+ dir = 4
+ },
+/obj/machinery/light/directional/south,
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/bridge)
+"gi" = (
+/obj/item/storage/backpack/duffelbag/med/surgery{
+ pixel_x = -2;
+ pixel_y = 9
+ },
+/obj/structure/table/chem,
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/bridge)
+"gs" = (
+/obj/machinery/power/smes/shuttle/precharged{
+ dir = 1
+ },
+/obj/structure/window/reinforced{
+ dir = 8
+ },
+/obj/structure/window/reinforced{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/turf/open/floor/plating,
+/area/ship/bridge)
+"gA" = (
+/obj/effect/turf_decal/spline/fancy/opaque/syndiered{
+ dir = 5
+ },
+/obj/effect/turf_decal/trimline/opaque/bar/warning{
+ dir = 4
+ },
+/turf/open/floor/plasteel/white,
+/area/ship/bridge)
+"hB" = (
+/obj/effect/turf_decal/spline/fancy/opaque/syndiered{
+ dir = 10
+ },
+/obj/effect/turf_decal/trimline/opaque/bar/warning{
+ dir = 8
+ },
+/turf/open/floor/plasteel/white,
+/area/ship/bridge)
+"hJ" = (
+/obj/effect/turf_decal/spline/fancy/opaque/syndiered{
+ dir = 9
+ },
+/obj/effect/turf_decal/trimline/opaque/bar/warning{
+ dir = 8
+ },
+/turf/open/floor/plasteel/white,
+/area/ship/bridge)
+"iR" = (
+/obj/machinery/stasis,
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/bridge)
+"ku" = (
+/obj/effect/turf_decal/spline/fancy/opaque/syndiered{
+ dir = 6
+ },
+/obj/effect/turf_decal/trimline/opaque/bar/warning{
+ dir = 4
+ },
+/turf/open/floor/plasteel/white,
+/area/ship/bridge)
+"kM" = (
+/obj/effect/turf_decal/spline/fancy/opaque/black{
+ dir = 1
+ },
+/obj/effect/turf_decal/spline/fancy/opaque/black,
+/obj/machinery/power/smes/engineering,
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"lp" = (
+/obj/structure/table/reinforced,
+/obj/item/radio/intercom/wideband/table{
+ dir = 4;
+ pixel_x = 4;
+ pixel_y = 9
+ },
+/obj/item/radio/intercom/table{
+ dir = 4;
+ pixel_x = 4;
+ pixel_y = -6
+ },
+/obj/effect/turf_decal/techfloor{
+ dir = 4
+ },
+/obj/machinery/button/door{
+ pixel_x = -9;
+ dir = 8;
+ pixel_y = 8;
+ id = "runner_bridge"
+ },
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/bridge)
+"nP" = (
+/obj/effect/turf_decal/spline/fancy/opaque/black,
+/obj/effect/turf_decal/trimline/opaque/syndiered/filled/line,
+/obj/effect/turf_decal/trimline/opaque/bar/filled/warning{
+ dir = 1
+ },
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"rR" = (
+/obj/structure/grille,
+/obj/structure/window/plasma/reinforced/plastitanium,
+/obj/machinery/door/poddoor/shutters{
+ dir = 4;
+ id = "runner_bridge"
+ },
+/turf/open/floor/plating,
+/area/ship/bridge)
+"sl" = (
+/obj/machinery/door/poddoor{
+ id = "runner_top_door"
+ },
+/obj/machinery/power/shieldwallgen/atmos/roundstart{
+ dir = 8;
+ id = "runner_top_holo"
+ },
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/turf/open/floor/plating,
+/area/ship/bridge)
+"te" = (
+/obj/structure/grille,
+/obj/structure/window/reinforced{
+ dir = 4
+ },
+/obj/structure/window/reinforced,
+/obj/structure/window/reinforced{
+ dir = 1
+ },
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/turf/open/floor/engine/hull,
+/area/ship/external)
+"wg" = (
+/obj/machinery/computer/helm{
+ dir = 8
+ },
+/obj/effect/turf_decal/techfloor{
+ dir = 4
+ },
+/obj/machinery/light/directional/north,
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/bridge)
+"zS" = (
+/obj/effect/turf_decal/spline/fancy/opaque/black{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/opaque/syndiered/filled/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/opaque/bar/filled/warning,
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"DP" = (
+/obj/structure/chair/comfy/shuttle{
+ dir = 4
+ },
+/obj/effect/turf_decal/spline/fancy/opaque/syndiered{
+ dir = 6
+ },
+/obj/structure/extinguisher_cabinet/directional/south,
+/obj/effect/landmark/ert_shuttle_spawn,
+/turf/open/floor/plasteel/white,
+/area/ship/bridge)
+"DW" = (
+/obj/machinery/power/shuttle/engine/electric/premium{
+ dir = 4
+ },
+/obj/structure/window/reinforced{
+ dir = 1
+ },
+/obj/structure/window/reinforced,
+/turf/open/floor/engine/hull,
+/area/ship/external)
+"Or" = (
+/obj/docking_port/mobile{
+ dir = 2;
+ name = "trauma team shuttle";
+ port_direction = 8;
+ preferred_direction = 4
+ },
+/obj/machinery/door/poddoor{
+ id = "runner_sub_door"
+ },
+/obj/machinery/power/shieldwallgen/atmos/roundstart{
+ dir = 8;
+ id = "runner_sub_holo"
+ },
+/obj/structure/cable{
+ icon_state = "0-1"
+ },
+/turf/open/floor/plating,
+/area/ship/bridge)
+"Pq" = (
+/turf/template_noop,
+/area/template_noop)
+"PD" = (
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/bridge)
+"Rz" = (
+/obj/structure/chair/comfy/shuttle{
+ dir = 4
+ },
+/obj/effect/turf_decal/spline/fancy/opaque/syndiered{
+ dir = 5
+ },
+/obj/effect/landmark/ert_shuttle_spawn,
+/obj/machinery/light_switch{
+ pixel_y = 22;
+ pixel_x = 13
+ },
+/turf/open/floor/plasteel/white,
+/area/ship/bridge)
+"RO" = (
+/obj/effect/turf_decal/spline/fancy/opaque/syndiered{
+ dir = 10
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel/white,
+/area/ship/bridge)
+"SE" = (
+/obj/effect/turf_decal/spline/fancy/opaque/syndiered{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/opaque/bar/warning{
+ dir = 4
+ },
+/obj/effect/landmark/ert_shuttle_brief_spawn,
+/obj/machinery/power/terminal{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/turf/open/floor/plasteel/white,
+/area/ship/bridge)
+"Wx" = (
+/obj/effect/turf_decal/spline/fancy/opaque/syndiered{
+ dir = 9
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel/white,
+/area/ship/bridge)
+"ZN" = (
+/obj/machinery/stasis,
+/obj/item/tank/internals/anesthetic{
+ pixel_x = -6;
+ pixel_y = 3
+ },
+/obj/item/tank/internals/anesthetic{
+ pixel_x = -8;
+ pixel_y = -3
+ },
+/obj/item/clothing/mask/breath/medical{
+ pixel_y = -4;
+ pixel_x = 7
+ },
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/bridge)
+"ZV" = (
+/obj/effect/turf_decal/trimline/opaque/syndiered/filled/shrink_cw,
+/obj/effect/turf_decal/spline/fancy/opaque/black,
+/obj/structure/chair/comfy/shuttle{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/opaque/bar/filled/corner{
+ dir = 4
+ },
+/obj/machinery/power/terminal{
+ dir = 1
+ },
+/obj/effect/landmark/ert_shuttle_spawn,
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/obj/machinery/light/directional/west,
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+
+(1,1,1) = {"
+Pq
+Pq
+PD
+PD
+PD
+PD
+PD
+Pq
+Pq
+"}
+(2,1,1) = {"
+DW
+PD
+PD
+gi
+ae
+al
+PD
+PD
+aj
+"}
+(3,1,1) = {"
+af
+aa
+ZV
+Wx
+bY
+RO
+ak
+gs
+te
+"}
+(4,1,1) = {"
+Pq
+bz
+co
+gA
+SE
+ku
+zS
+dB
+Pq
+"}
+(5,1,1) = {"
+Pq
+sl
+nP
+ZN
+kM
+iR
+zS
+Or
+Pq
+"}
+(6,1,1) = {"
+Pq
+PD
+cF
+hJ
+ac
+hB
+bG
+PD
+Pq
+"}
+(7,1,1) = {"
+Pq
+PD
+PD
+Rz
+ah
+DP
+PD
+PD
+Pq
+"}
+(8,1,1) = {"
+Pq
+Pq
+PD
+wg
+lp
+fa
+PD
+Pq
+Pq
+"}
+(9,1,1) = {"
+Pq
+Pq
+PD
+rR
+rR
+rR
+PD
+Pq
+Pq
+"}
diff --git a/_maps/shuttles/syndicate/syndicate_aegis.dmm b/_maps/shuttles/syndicate/syndicate_aegis.dmm
index 12dbcaea4daa..d86cb9b23de7 100644
--- a/_maps/shuttles/syndicate/syndicate_aegis.dmm
+++ b/_maps/shuttles/syndicate/syndicate_aegis.dmm
@@ -30,29 +30,27 @@
/obj/effect/turf_decal/siding/wood{
dir = 6
},
-/obj/item/clothing/head/HoS/beret/syndicate,
-/obj/item/clothing/head/HoS/syndicate,
-/obj/item/clothing/suit/armor/vest/capcarapace/syndicate,
-/obj/item/clothing/under/syndicate/officer,
-/obj/item/clothing/under/syndicate/combat,
-/obj/item/clothing/glasses/hud/security/sunglasses,
/obj/item/clothing/neck/stripedredscarf,
/obj/item/clothing/neck/tie/red,
-/obj/item/clothing/shoes/combat,
/obj/structure/closet/wall/red{
dir = 8;
name = "Captain's Locker";
- pixel_x = 30
+ pixel_x = 30;
+ req_access_txt = "20"
},
/obj/item/storage/belt/sabre,
/obj/item/reagent_containers/glass/beaker/unholywater,
-/obj/item/clothing/mask/gas/syndicate,
+/obj/item/clothing/mask/breath/suns,
+/obj/item/clothing/gloves/suns/captain,
+/obj/item/clothing/neck/cloak/suns/cap,
+/obj/item/clothing/head/suns/captain,
+/obj/item/clothing/shoes/combat/suns,
+/obj/item/clothing/suit/armor/vest/bulletproof/suns/captain,
+/obj/item/clothing/under/syndicate/suns/captain,
+/obj/item/clothing/shoes/laceup/suns,
+/obj/item/clothing/mask/gas/suns,
/turf/open/floor/wood/walnut,
/area/ship/crew/dorm)
-"az" = (
-/obj/structure/sign/syndicate,
-/turf/closed/wall/mineral/plastitanium,
-/area/ship/crew/dorm)
"aB" = (
/obj/effect/turf_decal/siding/wood{
dir = 5
@@ -119,10 +117,6 @@
/obj/effect/decal/cleanable/food/plant_smudge,
/turf/open/floor/plasteel/tech,
/area/ship/crew/hydroponics)
-"aR" = (
-/obj/structure/sign/syndicate,
-/turf/closed/wall/mineral/plastitanium/nodiagonal,
-/area/ship/crew/janitor)
"aW" = (
/obj/effect/turf_decal/siding/wood{
dir = 1
@@ -150,6 +144,8 @@
dir = 4
},
/obj/effect/decal/cleanable/dirt,
+/obj/item/clothing/shoes/jackboots/suns,
+/obj/item/clothing/mask/gas/suns,
/turf/open/floor/plasteel/tech,
/area/ship/cargo)
"bf" = (
@@ -228,11 +224,9 @@
dir = 5
},
/obj/structure/table/wood,
-/obj/item/paper_bin/carbon,
/obj/item/clothing/under/rank/medical/psychiatrist,
/obj/item/stack/sheet/mineral/wood/fifty,
/obj/item/lighter,
-/obj/item/clothing/suit/toggle/labcoat,
/obj/item/clothing/gloves/color/black,
/obj/item/clothing/gloves/color/white,
/obj/item/clothing/gloves/color/latex/nitrile/evil,
@@ -246,7 +240,16 @@
name = "Psychologists Locker";
pixel_y = 28
},
-/obj/item/gun/syringe/syndicate,
+/obj/item/clothing/head/suns,
+/obj/item/clothing/gloves/suns/xo,
+/obj/item/clothing/neck/cloak/suns,
+/obj/item/clothing/gloves/color/latex/nitrile/suns,
+/obj/item/clothing/shoes/laceup/suns,
+/obj/item/clothing/shoes/sneakers/suns,
+/obj/item/clothing/suit/toggle/labcoat/suns/doctorlabcoat,
+/obj/item/clothing/mask/surgical/suns,
+/obj/item/clothing/gloves/suns/xo,
+/obj/item/flashlight/pen,
/turf/open/floor/carpet/red,
/area/ship/crew/office)
"bx" = (
@@ -507,9 +510,6 @@
pixel_y = 29
},
/obj/structure/catwalk/over,
-/obj/structure/cable/yellow{
- icon_state = "2-4"
- },
/obj/machinery/atmospherics/pipe/manifold/orange/hidden{
dir = 1
},
@@ -569,26 +569,38 @@
/obj/item/surgicaldrill/advanced,
/obj/item/healthanalyzer/advanced,
/obj/item/clothing/glasses/hud/health/sunglasses,
-/obj/item/clothing/shoes/combat,
/obj/item/clothing/neck/stripedredscarf,
/obj/item/clothing/neck/stripedbluescarf,
/obj/structure/closet/wall/red{
name = "Lead Doctor's Locker";
pixel_y = 28
},
-/obj/item/clothing/neck/tie/blue,
-/obj/item/clothing/head/beret/black,
-/obj/item/clothing/under/syndicate/sniper,
/obj/item/reagent_containers/food/drinks/bottle/holywater,
/obj/item/clothing/suit/armor/vest/security/brig_phys{
name = "lead doctor's jacket"
},
-/obj/item/clothing/gloves/color/latex/nitrile,
/obj/item/clothing/glasses/hud/health/night,
-/obj/item/clothing/suit/armor/vest/marine/medium{
- name = "medium medical armor vest"
- },
/obj/item/hypospray/mkii/CMO,
+/obj/item/clothing/under/syndicate/suns/xo,
+/obj/item/clothing/head/suns,
+/obj/item/clothing/mask/breath/suns,
+/obj/item/clothing/gloves/suns/xo,
+/obj/item/clothing/head/suns/surgery,
+/obj/item/clothing/neck/cloak/suns,
+/obj/item/clothing/neck/cloak/suns/xo,
+/obj/item/clothing/gloves/color/latex/nitrile/suns,
+/obj/item/clothing/shoes/laceup/suns,
+/obj/item/clothing/shoes/sneakers/suns,
+/obj/item/clothing/suit/armor/vest/bulletproof/suns/xo,
+/obj/item/clothing/suit/hooded/suns,
+/obj/item/clothing/suit/toggle/labcoat/suns/cmo,
+/obj/item/clothing/under/syndicate/suns/sciencejumpsuit,
+/obj/item/clothing/suit/toggle/labcoat/suns/doctorlabcoat,
+/obj/item/clothing/shoes/combat/suns,
+/obj/item/clothing/mask/surgical/suns,
+/obj/item/clothing/glasses/science/suns,
+/obj/item/flashlight/pen,
+/obj/item/autosurgeon/cmo,
/turf/open/floor/carpet/blue,
/area/ship/medical)
"dZ" = (
@@ -672,6 +684,7 @@
/obj/item/clothing/shoes/laceup,
/obj/item/clothing/gloves/color/black,
/obj/item/reagent_containers/food/drinks/shaker,
+/obj/item/clothing/mask/breath/suns,
/turf/open/floor/wood/walnut,
/area/ship/crew/canteen/kitchen)
"ff" = (
@@ -829,9 +842,6 @@
/obj/effect/turf_decal/corner_techfloor_grid{
dir = 5
},
-/obj/structure/cable/yellow{
- icon_state = "1-4"
- },
/obj/machinery/atmospherics/components/binary/pump{
dir = 1;
layer = 2.35;
@@ -843,9 +853,10 @@
/turf/open/floor/plasteel/tech/techmaint,
/area/ship/engineering)
"gz" = (
-/obj/structure/sign/syndicate,
-/turf/closed/wall/mineral/plastitanium/nodiagonal,
-/area/ship/crew/office)
+/obj/machinery/suit_storage_unit/inherit,
+/obj/item/clothing/suit/space/hardsuit/solgov/suns,
+/turf/open/floor/plasteel/tech,
+/area/ship/crew/dorm)
"gA" = (
/obj/structure/cable/yellow{
icon_state = "1-2"
@@ -991,6 +1002,12 @@
dir = 8
},
/obj/effect/decal/cleanable/dirt,
+/obj/structure/closet/wall/white{
+ pixel_y = 26;
+ name = "bureaucratic supplies"
+ },
+/obj/item/paper_bin,
+/obj/item/pen/fountain,
/turf/open/floor/wood/walnut,
/area/ship/crew/office)
"hl" = (
@@ -1337,23 +1354,32 @@
/turf/open/floor/carpet/red,
/area/ship/bridge)
"kz" = (
-/obj/item/clothing/under/syndicate,
-/obj/item/clothing/under/syndicate/skirt,
-/obj/item/storage/fancy/cigarettes/cigpack_syndicate,
/obj/structure/closet/syndicate{
desc = "It's a basic storage unit.";
name = "uniform closet"
},
-/obj/item/clothing/gloves/combat,
-/obj/item/clothing/shoes/combat,
/obj/effect/turf_decal/siding/wood{
dir = 5
},
/obj/effect/decal/cleanable/dirt,
-/obj/structure/sign/poster/contraband/syndicate{
- pixel_x = 32
- },
-/obj/item/clothing/mask/gas/syndicate,
+/obj/item/clothing/suit/toggle/suns/alt,
+/obj/item/clothing/suit/toggle/suns/alt,
+/obj/item/clothing/suit/toggle/suns,
+/obj/item/clothing/suit/toggle/suns,
+/obj/item/clothing/shoes/laceup/suns,
+/obj/item/clothing/shoes/laceup/suns,
+/obj/item/clothing/shoes/laceup/suns,
+/obj/item/clothing/shoes/laceup/suns,
+/obj/item/clothing/neck/cloak/suns,
+/obj/item/clothing/neck/cloak/suns,
+/obj/item/clothing/neck/cloak/suns,
+/obj/item/clothing/neck/cloak/suns,
+/obj/item/clothing/mask/gas/suns,
+/obj/item/clothing/mask/gas/suns,
+/obj/item/clothing/gloves/suns,
+/obj/item/clothing/gloves/suns,
+/obj/item/clothing/gloves/suns,
+/obj/item/clothing/gloves/suns,
/turf/open/floor/wood/walnut,
/area/ship/crew/dorm)
"kI" = (
@@ -1414,13 +1440,13 @@
dir = 4
},
/obj/machinery/suit_storage_unit/inherit,
-/obj/item/clothing/head/helmet/space/syndicate/black/med,
-/obj/item/clothing/suit/space/syndicate/black/med,
/obj/effect/decal/cleanable/dirt,
/obj/structure/sign/warning/vacuum{
pixel_x = -30
},
-/obj/item/clothing/mask/gas/syndicate,
+/obj/item/clothing/suit/space/syndicate/suns,
+/obj/item/clothing/head/helmet/space/syndicate/suns,
+/obj/item/clothing/mask/gas/suns,
/turf/open/floor/plasteel/tech,
/area/ship/cargo)
"lx" = (
@@ -1444,10 +1470,6 @@
},
/turf/open/floor/plasteel/dark,
/area/ship/medical)
-"lQ" = (
-/obj/structure/sign/syndicate,
-/turf/closed/wall/mineral/plastitanium/nodiagonal,
-/area/ship/crew/hydroponics)
"lY" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
/obj/effect/decal/cleanable/dirt,
@@ -1618,9 +1640,6 @@
/area/ship/engineering)
"mS" = (
/obj/machinery/light/small/directional/south,
-/obj/structure/cable/yellow{
- icon_state = "0-8"
- },
/obj/machinery/atmospherics/components/unary/tank/air{
dir = 1;
layer = 2.35
@@ -1746,6 +1765,7 @@
},
/obj/item/paper_bin/bundlenatural,
/obj/effect/turf_decal/siding/wood,
+/obj/item/pen/fountain/captain,
/turf/open/floor/carpet/red,
/area/ship/bridge)
"oJ" = (
@@ -1848,47 +1868,6 @@
"pu" = (
/turf/open/floor/wood/walnut,
/area/ship/bridge)
-"pI" = (
-/obj/structure/closet/wall/orange{
- name = "Engineering locker";
- pixel_y = 30
- },
-/obj/machinery/atmospherics/pipe/simple/orange/hidden{
- dir = 8
- },
-/obj/item/clothing/suit/space/syndicate/black/engie,
-/obj/item/clothing/head/helmet/space/syndicate/black/engie,
-/obj/item/tank/internals/oxygen,
-/obj/item/extinguisher/advanced,
-/obj/item/storage/toolbox/syndicate{
- name = "syndicate toolbox";
- pixel_x = -3;
- pixel_y = 5
- },
-/obj/item/storage/belt/utility{
- pixel_x = 3;
- pixel_y = 5
- },
-/obj/item/clothing/shoes/combat,
-/obj/item/clothing/suit/hooded/wintercoat/engineering,
-/obj/item/holosign_creator/atmos,
-/obj/item/clothing/gloves/color/orange,
-/obj/item/clothing/neck/scarf/orange,
-/obj/item/clothing/neck/tie/orange,
-/obj/item/clothing/glasses/hud/diagnostic/night,
-/obj/item/clothing/glasses/meson/engine/tray,
-/obj/item/clothing/head/beret/eng/hazard,
-/obj/structure/catwalk/over,
-/obj/item/clothing/gloves/color/yellow,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 6
- },
-/obj/structure/cable/yellow{
- icon_state = "4-8"
- },
-/obj/item/tank/internals/emergency_oxygen/engi,
-/turf/open/floor/plating,
-/area/ship/engineering)
"pS" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
@@ -2068,18 +2047,11 @@
/area/ship/engineering)
"rf" = (
/obj/structure/table,
-/obj/item/storage/box/maid{
- pixel_x = -5;
- pixel_y = 7
- },
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/siding/wood{
dir = 8
},
/obj/structure/bedsheetbin,
-/obj/item/storage/box/maid{
- pixel_x = 6
- },
/obj/machinery/light_switch{
pixel_y = 22
},
@@ -2212,10 +2184,6 @@
/obj/item/seeds/corn,
/turf/open/floor/plasteel/tech,
/area/ship/crew/hydroponics)
-"sI" = (
-/obj/structure/sign/syndicate,
-/turf/closed/wall/mineral/plastitanium/nodiagonal,
-/area/ship/engineering)
"sN" = (
/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
/obj/machinery/door/poddoor/shutters{
@@ -2240,9 +2208,6 @@
/turf/open/floor/mineral/plastitanium/red,
/area/ship/hallway/central)
"tn" = (
-/obj/structure/cable/yellow{
- icon_state = "4-8"
- },
/obj/machinery/atmospherics/components/unary/tank/toxins{
dir = 1;
layer = 2.35
@@ -2367,7 +2332,7 @@
name = "Cooks Clothing";
pixel_x = -30
},
-/obj/item/book/manual/wiki/cooking_to_serve_man,
+/obj/item/book/manual/wiki/cooking,
/obj/item/clothing/under/rank/civilian/chef,
/obj/item/clothing/under/rank/civilian/chef/skirt,
/obj/item/clothing/suit/toggle/chef,
@@ -2379,6 +2344,7 @@
/obj/item/circuitboard/machine/processor,
/obj/item/circuitboard/machine/gibber,
/obj/item/circuitboard/machine/deep_fryer,
+/obj/item/clothing/mask/breath/suns,
/turf/open/floor/wood/walnut,
/area/ship/crew/canteen/kitchen)
"vj" = (
@@ -2404,28 +2370,13 @@
dir = 8
},
/obj/item/tank/internals/oxygen,
-/obj/item/extinguisher/advanced,
/obj/item/storage/toolbox/syndicate{
name = "syndicate toolbox";
pixel_x = -3;
pixel_y = 5
},
-/obj/item/storage/belt/utility{
- pixel_x = 3;
- pixel_y = 5
- },
/obj/item/storage/belt/utility/syndicate,
-/obj/item/clothing/shoes/combat,
-/obj/item/clothing/suit/hooded/wintercoat/engineering,
-/obj/item/holosign_creator/atmos,
-/obj/item/clothing/gloves/color/orange,
-/obj/item/clothing/neck/scarf/orange,
-/obj/item/clothing/neck/tie/orange,
-/obj/item/clothing/glasses/hud/diagnostic/night,
-/obj/item/clothing/glasses/meson/engine/tray,
-/obj/item/clothing/head/beret/eng/hazard,
/obj/structure/catwalk/over,
-/obj/item/clothing/gloves/color/yellow,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 8
},
@@ -2434,6 +2385,13 @@
icon_state = "4-8"
},
/obj/item/tank/internals/emergency_oxygen/engi,
+/obj/item/clothing/gloves/suns/yellow,
+/obj/item/clothing/shoes/jackboots/suns,
+/obj/item/clothing/suit/toggle/suns/workervest,
+/obj/item/clothing/under/syndicate/suns/workerjumpsuit,
+/obj/item/clothing/mask/gas/suns,
+/obj/item/clothing/head/safety_helmet/suns,
+/obj/item/clothing/glasses/meson/engine,
/turf/open/floor/plating,
/area/ship/engineering)
"vw" = (
@@ -2479,9 +2437,6 @@
dir = 5
},
/obj/effect/decal/cleanable/cobweb/cobweb2,
-/obj/structure/cable/yellow{
- icon_state = "0-8"
- },
/obj/structure/railing{
dir = 1
},
@@ -2492,20 +2447,34 @@
/turf/open/floor/plasteel/tech/techmaint,
/area/ship/engineering)
"wh" = (
-/obj/item/clothing/under/syndicate,
-/obj/item/clothing/under/syndicate/skirt,
-/obj/item/storage/fancy/cigarettes/cigpack_syndicate,
/obj/structure/closet/syndicate{
desc = "It's a basic storage unit.";
name = "uniform closet"
},
-/obj/item/clothing/gloves/combat,
-/obj/item/clothing/shoes/combat,
/obj/effect/turf_decal/siding/wood{
dir = 6
},
/obj/machinery/airalarm/directional/east,
-/obj/item/clothing/mask/gas/syndicate,
+/obj/item/clothing/under/syndicate/suns/uniform3,
+/obj/item/clothing/under/syndicate/suns/uniform3,
+/obj/item/clothing/under/syndicate/suns/uniform2,
+/obj/item/clothing/under/syndicate/suns/uniform2,
+/obj/item/clothing/under/syndicate/suns,
+/obj/item/clothing/under/syndicate/suns,
+/obj/item/clothing/under/syndicate/suns/alt,
+/obj/item/clothing/under/syndicate/suns/alt,
+/obj/item/clothing/under/syndicate/suns/uniform2/alt,
+/obj/item/clothing/under/syndicate/suns/uniform2/alt,
+/obj/item/clothing/under/syndicate/suns/uniform3/alt,
+/obj/item/clothing/under/syndicate/suns/uniform3/alt,
+/obj/item/clothing/accessory/waistcoat/suns/poof,
+/obj/item/clothing/accessory/waistcoat/suns/poof,
+/obj/item/clothing/accessory/waistcoat/suns/ribbon,
+/obj/item/clothing/accessory/waistcoat/suns/ribbon,
+/obj/item/clothing/accessory/waistcoat/suns/gembow,
+/obj/item/clothing/accessory/waistcoat/suns/gembow,
+/obj/item/clothing/accessory/waistcoat/suns,
+/obj/item/clothing/accessory/waistcoat/suns,
/turf/open/floor/wood/walnut,
/area/ship/crew/dorm)
"wk" = (
@@ -2542,8 +2511,12 @@
/turf/open/floor/plating,
/area/ship/engineering)
"wM" = (
-/obj/structure/frame/machine,
/obj/machinery/atmospherics/pipe/layer_manifold,
+/obj/item/clothing/mask/gas/suns,
+/obj/item/clothing/mask/gas/suns,
+/obj/item/clothing/mask/gas/suns,
+/obj/item/holosign_creator/atmos,
+/obj/structure/rack,
/turf/open/floor/plasteel/tech/techmaint,
/area/ship/engineering)
"wQ" = (
@@ -3133,42 +3106,6 @@
/obj/structure/table/wood/reinforced,
/turf/open/floor/wood/walnut,
/area/ship/crew/canteen/kitchen)
-"DX" = (
-/obj/structure/closet/wall/white/med{
- name = "medical locker";
- pixel_y = 29
- },
-/obj/item/clothing/gloves/color/latex/nitrile/evil,
-/obj/item/storage/belt/medical/surgery,
-/obj/item/clothing/suit/longcoat/brig_phys{
- name = "syndicate medic's longcoat"
- },
-/obj/item/clothing/suit/longcoat/roboblack{
- name = "syndicate medic's black longcoat"
- },
-/obj/item/clothing/under/rank/medical/doctor/red,
-/obj/item/clothing/suit/longcoat,
-/obj/item/clothing/neck/stripedbluescarf,
-/obj/item/clothing/neck/stripedredscarf,
-/obj/item/clothing/shoes/laceup,
-/obj/item/clothing/suit/hooded/wintercoat/medical,
-/obj/structure/cable/yellow{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 4
- },
-/obj/item/wallframe/defib_mount,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 8
- },
-/obj/item/hypospray/mkii,
-/obj/item/clothing/mask/surgical,
-/obj/item/storage/backpack/duffelbag/med/surgery,
-/obj/item/clothing/glasses/hud/health,
-/obj/item/storage/firstaid/regular,
-/turf/open/floor/plasteel/dark,
-/area/ship/medical)
"Ee" = (
/obj/structure/chair/sofa{
dir = 1
@@ -3337,9 +3274,6 @@
/turf/open/floor/plating,
/area/ship/bridge)
"FS" = (
-/obj/structure/cable/yellow{
- icon_state = "1-2"
- },
/obj/effect/decal/cleanable/oil/slippery,
/obj/machinery/atmospherics/pipe/layer_manifold,
/turf/open/floor/plasteel/tech/techmaint,
@@ -3477,6 +3411,8 @@
/obj/item/mining_scanner,
/obj/item/radio,
/obj/effect/turf_decal/corner_techfloor_grid/diagonal,
+/obj/item/clothing/shoes/jackboots/suns,
+/obj/item/clothing/mask/gas/suns,
/turf/open/floor/plasteel/tech,
/area/ship/cargo)
"Hp" = (
@@ -3496,7 +3432,8 @@
/obj/effect/turf_decal/techfloor{
dir = 5
},
-/obj/structure/frame/machine,
+/obj/item/clothing/suit/space/hardsuit/mining/suns,
+/obj/machinery/suit_storage_unit/inherit,
/turf/open/floor/plasteel/tech/techmaint,
/area/ship/engineering)
"Im" = (
@@ -3645,33 +3582,37 @@
},
/obj/item/clothing/gloves/color/latex/nitrile/evil,
/obj/item/storage/belt/medical/surgery,
-/obj/item/clothing/suit/longcoat/brig_phys{
- name = "syndicate medic's longcoat"
- },
-/obj/item/clothing/suit/longcoat/roboblack{
- name = "syndicate medic's black longcoat"
- },
-/obj/item/clothing/under/rank/medical/doctor/red,
-/obj/item/clothing/suit/longcoat,
/obj/item/clothing/neck/stripedbluescarf,
/obj/item/clothing/neck/stripedredscarf,
-/obj/item/clothing/shoes/laceup,
-/obj/item/clothing/suit/hooded/wintercoat/medical,
/obj/structure/cable/yellow{
- icon_state = "2-4"
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 6
+ dir = 4
},
/obj/item/wallframe/defib_mount,
-/obj/item/defibrillator/loaded,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 6
+ dir = 8
},
+/obj/item/hypospray/mkii,
/obj/item/clothing/mask/surgical,
/obj/item/storage/backpack/duffelbag/med/surgery,
-/obj/item/clothing/glasses/hud/health,
/obj/item/storage/firstaid/regular,
+/obj/item/clothing/glasses/hud/health/suns,
+/obj/item/clothing/head/suns/surgery,
+/obj/item/clothing/gloves/color/latex/nitrile/suns,
+/obj/item/clothing/shoes/laceup/suns,
+/obj/item/clothing/shoes/sneakers/suns,
+/obj/item/clothing/suit/hooded/suns,
+/obj/item/clothing/suit/toggle/labcoat/suns/doctorlabcoat,
+/obj/item/clothing/under/syndicate/suns/doctorscrubs,
+/obj/item/clothing/under/syndicate/suns/sciencejumpsuit,
+/obj/item/clothing/suit/toggle/labcoat/suns/doctorlabcoat,
+/obj/item/clothing/mask/surgical/suns,
+/obj/item/holosign_creator/medical,
+/obj/item/defibrillator/loaded,
+/obj/item/flashlight/pen,
+/obj/item/flashlight/pen,
/turf/open/floor/plasteel/dark,
/area/ship/medical)
"JY" = (
@@ -4540,10 +4481,6 @@
/turf/open/floor/plasteel/tech,
/area/ship/cargo)
"Sy" = (
-/obj/item/clothing/head/maidheadband/syndicate,
-/obj/item/clothing/under/syndicate/skirt/maid,
-/obj/item/clothing/accessory/maidapron/syndicate,
-/obj/item/clothing/gloves/color/latex/nitrile/evil,
/obj/item/clothing/shoes/laceup,
/obj/item/clothing/shoes/laceup,
/obj/item/clothing/suit/toggle/lawyer/black,
@@ -4556,12 +4493,16 @@
name = "Uniform Closet";
pixel_x = 30
},
-/obj/item/clothing/gloves/combat/maid,
/obj/structure/table/wood,
/obj/effect/turf_decal/siding/wood{
dir = 8
},
/obj/machinery/light/small/directional/south,
+/obj/item/clothing/gloves/color/latex/nitrile/suns,
+/obj/item/clothing/shoes/laceup/suns,
+/obj/item/clothing/shoes/sneakers/suns,
+/obj/item/clothing/suit/hooded/suns,
+/obj/item/clothing/mask/surgical/suns,
/turf/open/floor/carpet/red,
/area/ship/crew/janitor)
"SF" = (
@@ -4677,12 +4618,6 @@
pixel_y = 30
},
/obj/item/storage/bag/chemistry,
-/obj/item/clothing/suit/longcoat/chemist,
-/obj/item/clothing/suit/toggle/labcoat/chemist,
-/obj/item/clothing/shoes/combat,
-/obj/item/clothing/shoes/combat,
-/obj/item/clothing/gloves/color/latex,
-/obj/item/clothing/gloves/color/latex,
/obj/item/clothing/glasses/sunglasses/chemical,
/obj/item/reagent_containers/glass/beaker/large,
/obj/item/reagent_containers/glass/beaker/large,
@@ -4699,6 +4634,8 @@
/obj/structure/sign/warning/chemdiamond{
pixel_x = 30
},
+/obj/item/flashlight/pen,
+/obj/item/flashlight/pen,
/turf/open/floor/plasteel/tech,
/area/ship/medical)
"Tw" = (
@@ -4945,10 +4882,6 @@
/obj/effect/turf_decal/trimline/opaque/black/line,
/turf/open/floor/mineral/plastitanium/red,
/area/ship/hallway/central)
-"VG" = (
-/obj/structure/sign/syndicate,
-/turf/closed/wall/mineral/plastitanium/nodiagonal,
-/area/ship/cargo)
"VT" = (
/turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/ship/crew/canteen/kitchen)
@@ -4977,10 +4910,10 @@
"Wb" = (
/obj/effect/turf_decal/corner_techfloor_grid/diagonal,
/obj/machinery/suit_storage_unit/inherit,
-/obj/item/clothing/head/helmet/space/syndicate/black/med,
-/obj/item/clothing/suit/space/syndicate/black/med,
/obj/structure/extinguisher_cabinet/directional/west,
-/obj/item/clothing/mask/gas/syndicate,
+/obj/item/clothing/suit/space/syndicate/suns,
+/obj/item/clothing/head/helmet/space/syndicate/suns,
+/obj/item/clothing/mask/gas/suns,
/turf/open/floor/plasteel/tech,
/area/ship/cargo)
"Wc" = (
@@ -5157,28 +5090,14 @@
name = "Uniform closet";
pixel_x = 32
},
-/obj/item/clothing/under/syndicate/tacticool/skirt,
-/obj/item/clothing/under/syndicate/tacticool/skirt,
-/obj/item/clothing/under/syndicate/tacticool/skirt,
-/obj/item/clothing/under/syndicate/tacticool/skirt,
-/obj/item/clothing/under/syndicate/tacticool,
-/obj/item/clothing/under/syndicate/tacticool,
-/obj/item/clothing/under/syndicate/tacticool,
-/obj/item/clothing/under/syndicate/tacticool,
-/obj/item/clothing/under/syndicate/tacticool,
-/obj/item/clothing/shoes/jackboots,
-/obj/item/clothing/shoes/jackboots,
-/obj/item/clothing/shoes/jackboots,
-/obj/item/clothing/shoes/jackboots,
-/obj/item/clothing/shoes/jackboots,
+/obj/effect/turf_decal/siding/wood{
+ dir = 4
+ },
/obj/item/flashlight,
/obj/item/flashlight,
/obj/item/flashlight,
/obj/item/flashlight,
/obj/item/flashlight,
-/obj/effect/turf_decal/siding/wood{
- dir = 4
- },
/turf/open/floor/wood/walnut,
/area/ship/crew/dorm)
"Xk" = (
@@ -5260,10 +5179,6 @@
/obj/effect/turf_decal/trimline/opaque/brown/filled/line,
/turf/open/floor/plasteel/tech,
/area/ship/crew/canteen/kitchen)
-"Yf" = (
-/obj/structure/sign/syndicate,
-/turf/closed/wall/mineral/plastitanium/nodiagonal,
-/area/ship/medical)
"Yo" = (
/obj/structure/window/plasma/reinforced/spawner/north,
/obj/machinery/atmospherics/components/unary/outlet_injector/on/layer4{
@@ -5341,9 +5256,6 @@
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/structure/catwalk/over,
-/obj/structure/cable/yellow{
- icon_state = "1-4"
- },
/obj/structure/reagent_dispensers/fueltank,
/turf/open/floor/plating,
/area/ship/engineering)
@@ -5401,9 +5313,6 @@
/turf/open/floor/plasteel/tech/techmaint,
/area/ship/engineering)
"ZJ" = (
-/obj/structure/cable/yellow{
- icon_state = "1-2"
- },
/obj/machinery/atmospherics/pipe/simple/orange/hidden,
/obj/effect/decal/cleanable/plasma,
/turf/open/floor/plasteel/tech/techmaint,
@@ -5509,7 +5418,7 @@ hl
kU
kU
kU
-VG
+aP
ls
Cc
Cc
@@ -5554,7 +5463,7 @@ Wb
aP
Xk
Xk
-lQ
+Xk
Im
wk
wk
@@ -5668,7 +5577,7 @@ wk
(7,1,1) = {"
Ss
xO
-xO
+gz
xO
Te
bx
@@ -5730,7 +5639,7 @@ It
sN
Kv
It
-sI
+It
wk
"}
(9,1,1) = {"
@@ -5803,7 +5712,7 @@ wk
"}
(11,1,1) = {"
Ss
-az
+Ss
Ss
wk
wk
@@ -5862,7 +5771,7 @@ Xk
TE
Ch
It
-pI
+vs
zV
UN
It
@@ -6211,7 +6120,7 @@ wk
"}
(23,1,1) = {"
dZ
-aR
+kj
dZ
wk
wk
@@ -6342,7 +6251,7 @@ oP
re
Qt
It
-sI
+It
wk
"}
(27,1,1) = {"
@@ -6462,7 +6371,7 @@ CF
nd
Xb
Bh
-DX
+JI
Do
lN
CM
@@ -6506,7 +6415,7 @@ TS
WQ
WQ
WQ
-gz
+WQ
aL
wk
wk
@@ -6529,7 +6438,7 @@ TS
dL
dL
dL
-Yf
+TS
QV
TS
TS
diff --git a/_maps/shuttles/syndicate/syndicate_gorlex_hyena.dmm b/_maps/shuttles/syndicate/syndicate_gorlex_hyena.dmm
index 46bd016425f1..6a8cee6cc78a 100644
--- a/_maps/shuttles/syndicate/syndicate_gorlex_hyena.dmm
+++ b/_maps/shuttles/syndicate/syndicate_gorlex_hyena.dmm
@@ -491,7 +491,7 @@
pixel_x = 32
},
/obj/effect/turf_decal/industrial/outline,
-/obj/item/gun/ballistic/shotgun/lethal,
+/obj/item/gun/ballistic/shotgun/brimstone,
/obj/machinery/button/door{
dir = 1;
id = "wreckerarmory";
@@ -1669,7 +1669,6 @@
/obj/item/gun/ballistic/automatic/pistol,
/obj/item/clothing/accessory/holster,
/obj/item/grenade/chem_grenade/metalfoam,
-/obj/item/card/mining_access_card,
/obj/machinery/airalarm/directional/west,
/obj/item/tank/jetpack/suit,
/turf/open/floor/carpet/red,
diff --git a/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm b/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm
index 3da232da75dc..35486f0a3759 100644
--- a/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm
+++ b/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm
@@ -992,10 +992,6 @@
/obj/structure/railing{
dir = 1
},
-/obj/item/clothing/under/syndicate/skirt/maid,
-/obj/item/clothing/gloves/combat/maid,
-/obj/item/clothing/head/maidheadband/syndicate,
-/obj/item/clothing/accessory/maidapron/syndicate,
/obj/structure/closet/crate/secure/loot,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 6
@@ -2734,43 +2730,6 @@
},
/turf/open/floor/plasteel,
/area/ship/engineering)
-"AS" = (
-/obj/effect/turf_decal/borderfloor{
- dir = 8
- },
-/obj/item/gun/ballistic/automatic/pistol/m1911{
- pixel_x = 1;
- pixel_y = 5
- },
-/obj/item/ammo_box/magazine/m45,
-/obj/item/ammo_box/magazine/m45{
- pixel_x = 3
- },
-/obj/item/clothing/under/syndicate/aclfgrunt,
-/obj/item/clothing/gloves/tackler/combat/insulated,
-/obj/item/clothing/suit/armor/vest/leather{
- desc = "Lightly armored leather overcoat meant as casual wear for high-ranking officers. Bears the crest of the Gorlex Marauders."
- },
-/obj/item/clothing/mask/gas/sechailer/swat,
-/obj/item/clothing/head/HoS/beret/syndicate,
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/structure/closet/secure_closet/wall{
- dir = 1;
- icon_state = "sec_wall";
- name = "Sergeant's locker";
- pixel_y = -29;
- req_access_txt = "58"
- },
-/obj/item/melee/classic_baton/telescopic,
-/obj/item/clothing/suit/armor/vest/blueshirt,
-/obj/item/clothing/under/syndicate/combat,
-/obj/item/clothing/accessory/holster,
-/obj/item/clothing/shoes/combat,
-/obj/item/radio/headset/syndicate,
-/turf/open/floor/plasteel/dark,
-/area/ship/bridge)
"AY" = (
/obj/structure/sign/syndicate,
/turf/closed/wall/mineral/plastitanium/nodiagonal,
@@ -3137,33 +3096,6 @@
},
/turf/open/floor/mineral/plastitanium/red,
/area/ship/crew/canteen)
-"Ek" = (
-/obj/structure/closet/secure_closet{
- anchored = 1;
- icon_state = "hos";
- name = "captain's locker";
- req_access_txt = "20"
- },
-/obj/item/clothing/under/syndicate/combat,
-/obj/item/clothing/under/syndicate/officer,
-/obj/item/clothing/suit/armor/vest/capcarapace/syndicate,
-/obj/item/clothing/gloves/krav_maga/combatglovesplus,
-/obj/item/clothing/shoes/jackboots,
-/obj/item/clothing/glasses/thermal/eyepatch,
-/obj/item/clothing/head/HoS/beret/syndicate,
-/obj/item/clothing/head/HoS/syndicate,
-/obj/item/clothing/head/gorlexcap{
- pixel_x = 5;
- pixel_y = -4
- },
-/obj/item/gun/ballistic/derringer/traitor,
-/obj/item/clothing/under/syndicate/sniper,
-/obj/item/clothing/suit/gorlex,
-/obj/item/ammo_box/a357,
-/obj/item/ammo_box/a357,
-/obj/item/radio/headset/syndicate/alt/leader,
-/turf/open/floor/carpet/black,
-/area/ship/bridge)
"El" = (
/obj/structure/filingcabinet,
/obj/item/folder/syndicate/mining,
@@ -3886,6 +3818,33 @@
},
/turf/open/floor/plasteel/dark,
/area/ship/bridge)
+"KG" = (
+/obj/structure/closet/secure_closet{
+ anchored = 1;
+ icon_state = "hos";
+ name = "captain's locker";
+ req_access_txt = "20"
+ },
+/obj/item/clothing/under/syndicate/combat,
+/obj/item/clothing/under/syndicate/ngr/officer,
+/obj/item/clothing/suit/armor/vest/capcarapace/syndicate,
+/obj/item/clothing/gloves/krav_maga/combatglovesplus,
+/obj/item/clothing/shoes/jackboots,
+/obj/item/clothing/glasses/thermal/eyepatch,
+/obj/item/clothing/head/HoS/beret/syndicate,
+/obj/item/clothing/head/HoS/syndicate,
+/obj/item/clothing/head/ngrcap{
+ pixel_x = 5;
+ pixel_y = -4
+ },
+/obj/item/gun/ballistic/derringer/traitor,
+/obj/item/clothing/under/syndicate/sniper,
+/obj/item/clothing/suit/armor/vest/capcarapace/ngr_captain,
+/obj/item/ammo_box/a357,
+/obj/item/ammo_box/a357,
+/obj/item/radio/headset/syndicate/alt/leader,
+/turf/open/floor/carpet/black,
+/area/ship/bridge)
"KL" = (
/obj/machinery/vending/custom,
/obj/structure/railing{
@@ -4013,7 +3972,7 @@
pixel_y = 7
},
/obj/item/clothing/under/syndicate/sniper,
-/obj/item/clothing/under/syndicate/aclfgrunt,
+/obj/item/clothing/under/syndicate/ngr,
/obj/item/clothing/shoes/combat,
/obj/item/clothing/mask/gas/syndicate,
/obj/item/clothing/suit/armor/vest/duster,
@@ -4823,6 +4782,43 @@
/obj/structure/catwalk/over,
/turf/open/floor/plating,
/area/ship/engineering)
+"UJ" = (
+/obj/effect/turf_decal/borderfloor{
+ dir = 8
+ },
+/obj/item/gun/ballistic/automatic/pistol/candor{
+ pixel_x = 1;
+ pixel_y = 5
+ },
+/obj/item/ammo_box/magazine/m45,
+/obj/item/ammo_box/magazine/m45{
+ pixel_x = 3
+ },
+/obj/item/clothing/under/syndicate/ngr,
+/obj/item/clothing/gloves/tackler/combat/insulated,
+/obj/item/clothing/suit/armor/vest/leather{
+ desc = "Lightly armored leather overcoat meant as casual wear for high-ranking officers. Bears the crest of the Gorlex Marauders."
+ },
+/obj/item/clothing/mask/gas/sechailer/swat,
+/obj/item/clothing/head/HoS/beret/syndicate,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/structure/closet/secure_closet/wall{
+ dir = 1;
+ icon_state = "sec_wall";
+ name = "Sergeant's locker";
+ pixel_y = -29;
+ req_access_txt = "58"
+ },
+/obj/item/melee/classic_baton/telescopic,
+/obj/item/clothing/suit/armor/vest/blueshirt,
+/obj/item/clothing/under/syndicate/combat,
+/obj/item/clothing/accessory/holster,
+/obj/item/clothing/shoes/combat,
+/obj/item/radio/headset/syndicate,
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
"UK" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/hatch{
@@ -5880,11 +5876,11 @@ ME
WP
WA
TH
-AS
+UJ
tC
FL
up
-Ek
+KG
tC
tC
tC
diff --git a/_maps/shuttles/syndicate/syndicate_luxembourg.dmm b/_maps/shuttles/syndicate/syndicate_luxembourg.dmm
deleted file mode 100644
index 6dde77123cba..000000000000
--- a/_maps/shuttles/syndicate/syndicate_luxembourg.dmm
+++ /dev/null
@@ -1,3314 +0,0 @@
-//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
-"aB" = (
-/turf/open/floor/plasteel/dark,
-/area/ship/hallway/central)
-"aD" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{
- dir = 4
- },
-/turf/open/floor/carpet/red_gold,
-/area/ship/crew/dorm)
-"aK" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
- dir = 9
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
- dir = 9
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/item/radio/intercom/directional/south,
-/obj/machinery/navbeacon/wayfinding{
- codes_txt = "patrol;next_patrol=lux_engine";
- location = "lux_crew"
- },
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/dorm)
-"bi" = (
-/obj/machinery/button/door{
- id = "syndiefuck";
- name = "Loading Shutters Control";
- pixel_x = -25;
- pixel_y = -7;
- dir = 4
- },
-/obj/machinery/button/door{
- id = "warehouse";
- name = "Warehouse Control";
- pixel_x = -25;
- pixel_y = 5;
- dir = 4
- },
-/obj/machinery/button/door{
- id = "cargodoors";
- name = "Cargo Bay Shutter Control";
- pixel_x = -35;
- pixel_y = 5;
- dir = 4
- },
-/obj/machinery/button/door{
- id = "externalshutters";
- name = "External Shutters Control";
- pixel_x = -35;
- pixel_y = -7;
- dir = 4
- },
-/obj/machinery/computer/cargo/express{
- dir = 4
- },
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/hallway/central)
-"bp" = (
-/obj/effect/turf_decal/siding/blue/corner{
- dir = 8
- },
-/obj/effect/turf_decal/corner/opaque/blue/half{
- dir = 1
- },
-/turf/open/floor/plasteel/dark,
-/area/ship/hallway/central)
-"bt" = (
-/obj/structure/cable{
- icon_state = "1-8"
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/components/binary/volume_pump{
- dir = 8
- },
-/obj/structure/catwalk/over/plated_catwalk/white,
-/turf/open/floor/plating,
-/area/ship/engineering)
-"bB" = (
-/obj/structure/rack,
-/obj/machinery/light/directional/north,
-/obj/effect/turf_decal/corner/opaque/brown/border{
- dir = 9
- },
-/obj/item/gps/mining,
-/obj/item/paicard,
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/cargo)
-"bN" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/dorm)
-"bV" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
- dir = 4
- },
-/obj/structure/displaycase,
-/obj/effect/turf_decal/corner/opaque/neutral/mono,
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/hallway/central)
-"cb" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
-/turf/open/floor/carpet/red_gold,
-/area/ship/crew/dorm)
-"cq" = (
-/obj/machinery/power/apc/auto_name/directional/east,
-/obj/structure/cable{
- icon_state = "0-8"
- },
-/obj/machinery/computer/mech_bay_power_console{
- dir = 8
- },
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/storage)
-"cs" = (
-/obj/effect/turf_decal/siding/blue{
- dir = 8
- },
-/obj/effect/turf_decal/siding/blue/corner,
-/turf/open/floor/plasteel/dark,
-/area/ship/hallway/central)
-"cB" = (
-/obj/item/toy/figure/cargotech,
-/obj/item/clothing/suit/hooded/wintercoat/cargo,
-/obj/item/stack/sheet/cardboard/fifty,
-/obj/item/hand_labeler,
-/obj/item/hand_labeler_refill,
-/obj/item/clothing/under/syndicate/donk,
-/obj/item/clothing/suit/hazardvest/donk,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 8
- },
-/obj/item/stack/wrapping_paper,
-/obj/item/stack/packageWrap,
-/obj/structure/closet/wall{
- dir = 8;
- icon_door = "orange_wall";
- name = "employee closet";
- pixel_x = 28
- },
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/engineering)
-"cI" = (
-/obj/structure/rack,
-/obj/item/rack_parts,
-/obj/item/rack_parts,
-/obj/item/rack_parts,
-/obj/item/rack_parts,
-/obj/item/rack_parts,
-/obj/item/rack_parts,
-/obj/item/rack_parts,
-/obj/item/rack_parts,
-/obj/item/rack_parts,
-/obj/item/rack_parts,
-/obj/item/rack_parts,
-/obj/item/rack_parts,
-/obj/item/rack_parts,
-/obj/item/rack_parts,
-/obj/item/rack_parts,
-/obj/item/rack_parts,
-/obj/effect/turf_decal/corner/opaque/neutral/mono,
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/hallway/central)
-"dp" = (
-/obj/structure/displaycase,
-/obj/effect/turf_decal/corner/opaque/neutral/mono,
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/hallway/central)
-"dA" = (
-/obj/structure/chair/comfy/shuttle{
- dir = 1
- },
-/turf/open/floor/carpet/red_gold,
-/area/ship/hallway/central)
-"dC" = (
-/obj/machinery/atmospherics/pipe/layer_manifold{
- dir = 4
- },
-/obj/machinery/space_heater,
-/obj/item/radio/intercom/directional/north,
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/engineering)
-"dH" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
- dir = 4
- },
-/obj/structure/displaycase,
-/obj/effect/turf_decal/corner/opaque/neutral/mono,
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/hallway/central)
-"dL" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
-/obj/machinery/door/firedoor/border_only{
- dir = 1
- },
-/obj/machinery/door/firedoor/border_only,
-/obj/machinery/door/airlock/engineering{
- name = "Engineering"
- },
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/engineering)
-"dM" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
- dir = 5
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/engineering)
-"eD" = (
-/obj/item/storage/belt/utility,
-/obj/item/storage/belt/utility,
-/obj/structure/table,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
- dir = 10
- },
-/obj/item/storage/toolbox/syndicate,
-/obj/item/storage/toolbox/syndicate,
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/engineering)
-"eF" = (
-/obj/structure/sink{
- dir = 8;
- pixel_x = 12
- },
-/obj/structure/mirror{
- pixel_x = 24
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 8
- },
-/obj/item/storage/firstaid/regular,
-/obj/item/storage/firstaid/medical{
- pixel_x = -5;
- pixel_y = -4
- },
-/obj/structure/closet/wall/white/med{
- dir = 1;
- name = "medicine locker";
- pixel_y = -28
- },
-/turf/open/floor/plasteel/patterned,
-/area/ship/crew/dorm)
-"eL" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
-/obj/machinery/door/firedoor/border_only,
-/obj/machinery/door/firedoor/border_only{
- dir = 1
- },
-/obj/structure/catwalk/over/plated_catwalk/white,
-/obj/machinery/door/airlock/engineering{
- name = "Engineering"
- },
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/engineering)
-"eX" = (
-/obj/effect/turf_decal/siding/blue{
- dir = 8
- },
-/obj/effect/turf_decal/siding/blue{
- dir = 4
- },
-/turf/open/floor/plasteel/dark,
-/area/ship/hallway/central)
-"fn" = (
-/obj/machinery/light/directional/east,
-/obj/structure/table,
-/obj/machinery/microwave,
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/crew/canteen)
-"fo" = (
-/obj/item/card/emag,
-/obj/item/tank/internals/emergency_oxygen/double,
-/obj/item/storage/backpack/duffelbag/syndie{
- name = "manager's duffel bag"
- },
-/obj/item/clothing/under/syndicate/donk/qm,
-/obj/item/clothing/suit/hazardvest/donk/qm,
-/obj/item/melee/classic_baton/telescopic,
-/obj/item/radio/headset/syndicate/alt/leader,
-/obj/item/spacecash/bundle/c1000,
-/obj/item/spacecash/bundle/c1000,
-/obj/item/spacecash/bundle/c1000,
-/obj/item/spacecash/bundle/c1000,
-/obj/item/spacecash/bundle/c1000,
-/obj/item/spacecash/bundle/c1000,
-/obj/structure/closet/secure_closet/wall{
- dir = 4;
- icon_state = "solgov_wall";
- name = "manager's locker";
- pixel_x = -28;
- req_access_txt = "41"
- },
-/obj/machinery/light_switch{
- pixel_y = 22
- },
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/engineering)
-"fv" = (
-/obj/machinery/selling_pad,
-/obj/effect/turf_decal/box,
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/hallway/central)
-"fy" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/trimline/opaque/brown/filled/warning,
-/obj/structure/cable{
- icon_state = "2-8"
- },
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/cargo)
-"fB" = (
-/obj/effect/decal/cleanable/oil,
-/obj/effect/turf_decal/corner/opaque/brown/border{
- dir = 8
- },
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/cargo)
-"ga" = (
-/obj/structure/table/reinforced,
-/obj/machinery/door/window{
- dir = 4
- },
-/obj/machinery/door/firedoor,
-/obj/machinery/door/poddoor/shutters{
- dir = 4;
- id = "cargodoors"
- },
-/obj/item/radio/intercom/directional/north{
- pixel_y = 22
- },
-/turf/open/floor/plasteel/dark,
-/area/ship/cargo)
-"gf" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
- dir = 4
- },
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/cargo)
-"gj" = (
-/obj/machinery/light/directional/north,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
- dir = 6
- },
-/obj/structure/closet/secure_closet/engineering_welding,
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/engineering)
-"gC" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/siding/blue{
- dir = 8
- },
-/obj/effect/turf_decal/siding/blue{
- dir = 4
- },
-/turf/open/floor/plasteel/dark,
-/area/ship/hallway/central)
-"hd" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/on{
- dir = 1
- },
-/turf/open/floor/plating,
-/area/ship/engineering)
-"hi" = (
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/cargo)
-"hm" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel/patterned/cargo_one,
-/area/ship/storage)
-"hs" = (
-/turf/closed/wall/mineral/plastitanium/nodiagonal,
-/area/ship/cargo)
-"hu" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/firealarm/directional/east,
-/obj/effect/turf_decal/corner/opaque/brown/border{
- dir = 4
- },
-/obj/machinery/suit_storage_unit/inherit/industrial,
-/obj/item/clothing/suit/space/syndicate,
-/obj/item/clothing/head/helmet/space/syndicate,
-/obj/item/clothing/mask/breath,
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/cargo)
-"hX" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/corner/opaque/brown/border{
- dir = 8
- },
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/cargo)
-"if" = (
-/obj/machinery/cryopod{
- dir = 4
- },
-/obj/machinery/computer/cryopod/directional/south,
-/obj/machinery/light/small/directional/west,
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/crew/dorm)
-"it" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/power/shieldwallgen/atmos{
- anchored = 1;
- dir = 1;
- id = "luxembourg_cargo";
- locked = 1
- },
-/obj/structure/cable{
- icon_state = "0-4"
- },
-/obj/machinery/door/poddoor/shutters{
- dir = 4;
- id = "syndiefuck"
- },
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/cargo)
-"iF" = (
-/obj/structure/cable{
- icon_state = "1-4"
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/closet/crate,
-/obj/item/vending_refill/engineering,
-/obj/item/vending_refill/engineering,
-/obj/item/vending_refill/engivend,
-/obj/item/vending_refill/engivend,
-/obj/item/vending_refill/hydronutrients,
-/obj/item/vending_refill/hydronutrients,
-/obj/item/vending_refill/boozeomat,
-/obj/item/vending_refill/boozeomat,
-/obj/item/vending_refill/medical,
-/obj/item/vending_refill/medical,
-/obj/item/vending_refill/cigarette,
-/obj/item/vending_refill/cigarette,
-/obj/item/vending_refill/snack,
-/obj/item/vending_refill/snack,
-/obj/item/vending_refill/sovietsoda,
-/obj/item/vending_refill/cola,
-/obj/item/vending_refill/cola,
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/storage)
-"iO" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
- dir = 10
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
- dir = 10
- },
-/turf/open/floor/plasteel/patterned/cargo_one,
-/area/ship/storage)
-"iR" = (
-/obj/machinery/power/shuttle/engine/fueled/plasma{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/layer_manifold,
-/turf/open/floor/plating,
-/area/ship/engineering)
-"iZ" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
- dir = 9
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
- dir = 9
- },
-/obj/structure/catwalk/over/plated_catwalk/white,
-/obj/machinery/atmospherics/components/unary/portables_connector{
- dir = 4
- },
-/turf/open/floor/plating,
-/area/ship/engineering)
-"jr" = (
-/turf/open/floor/carpet/red_gold,
-/area/ship/hallway/central)
-"jv" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 4
- },
-/obj/structure/rack,
-/obj/effect/turf_decal/corner/opaque/neutral/mono,
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/hallway/central)
-"jH" = (
-/obj/structure/table,
-/obj/item/radio/intercom/wideband/table{
- dir = 4
- },
-/obj/machinery/light_switch{
- pixel_y = 22
- },
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/hallway/central)
-"jK" = (
-/obj/machinery/air_sensor/atmos/air_tank,
-/turf/open/floor/engine/air,
-/area/ship/engineering)
-"ke" = (
-/obj/machinery/mech_bay_recharge_port{
- dir = 1
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/storage)
-"ks" = (
-/obj/structure/closet/crate,
-/obj/item/gun_voucher,
-/obj/item/gun_voucher,
-/obj/item/gun_voucher,
-/obj/item/gun_voucher,
-/obj/item/gun_voucher,
-/obj/item/gun_voucher,
-/obj/item/gun_voucher,
-/obj/item/gun_voucher,
-/obj/item/gun_voucher,
-/obj/item/gun_voucher,
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/storage)
-"kE" = (
-/obj/machinery/chem_master/condimaster,
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/crew/canteen)
-"kI" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
- dir = 5
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
- dir = 5
- },
-/turf/open/floor/plasteel/patterned/cargo_one,
-/area/ship/storage)
-"kZ" = (
-/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
-/obj/machinery/door/poddoor/shutters{
- dir = 4;
- id = "externalshutters"
- },
-/turf/open/floor/plating,
-/area/ship/hallway/central)
-"lb" = (
-/obj/structure/cable{
- icon_state = "1-8"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
- dir = 8
- },
-/obj/machinery/portable_atmospherics/scrubber,
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/engineering)
-"lg" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/structure/cable{
- icon_state = "2-4"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
-/turf/open/floor/plasteel/patterned/cargo_one,
-/area/ship/storage)
-"lt" = (
-/obj/machinery/atmospherics/components/binary/volume_pump,
-/obj/structure/catwalk/over/plated_catwalk/white,
-/turf/open/floor/plating,
-/area/ship/engineering)
-"lK" = (
-/obj/effect/turf_decal/siding/blue/corner{
- dir = 8
- },
-/obj/effect/turf_decal/siding/blue/corner{
- dir = 1
- },
-/turf/open/floor/plasteel/dark,
-/area/ship/hallway/central)
-"lQ" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
-/obj/machinery/door/firedoor/border_only,
-/obj/machinery/door/firedoor/border_only{
- dir = 1
- },
-/obj/machinery/door/poddoor/shutters{
- id = "warehouse"
- },
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/storage)
-"lW" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/manifold/orange/visible{
- dir = 1
- },
-/obj/structure/catwalk/over/plated_catwalk/white,
-/turf/open/floor/plating,
-/area/ship/engineering)
-"mi" = (
-/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
-/obj/machinery/door/poddoor/shutters{
- dir = 4;
- id = "externalshutters"
- },
-/turf/open/floor/plating,
-/area/ship/crew/dorm)
-"mm" = (
-/obj/item/toy/figure/cargotech,
-/obj/item/clothing/suit/hooded/wintercoat/cargo,
-/obj/item/stack/sheet/cardboard/fifty,
-/obj/item/hand_labeler,
-/obj/item/hand_labeler_refill,
-/obj/item/clothing/under/syndicate/donk,
-/obj/item/clothing/suit/hazardvest/donk,
-/obj/item/stack/wrapping_paper,
-/obj/item/stack/packageWrap,
-/obj/structure/railing,
-/obj/structure/closet/wall{
- dir = 4;
- icon_door = "orange_wall";
- name = "employee closet";
- pixel_x = -28
- },
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/engineering)
-"mE" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
-/obj/structure/catwalk/over/plated_catwalk/dark,
-/obj/effect/turf_decal/kfp_small/left{
- dir = 4
- },
-/turf/open/floor/plating,
-/area/ship/engineering)
-"mK" = (
-/obj/machinery/light/directional/south,
-/obj/machinery/computer/atmos_control/tank/air_tank{
- dir = 4
- },
-/obj/machinery/airalarm/directional/west,
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/engineering)
-"na" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
-/turf/closed/wall/mineral/plastitanium/nodiagonal,
-/area/ship/engineering)
-"nz" = (
-/obj/structure/sign/donk{
- pixel_x = -32
- },
-/obj/structure/rack,
-/obj/item/radio/headset,
-/obj/item/radio/headset,
-/obj/item/radio/headset,
-/obj/item/radio/headset,
-/obj/item/radio/headset,
-/obj/item/radio/headset,
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/dorm)
-"ow" = (
-/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
-/obj/machinery/door/poddoor/shutters{
- id = "externalshutters"
- },
-/turf/open/floor/plating,
-/area/ship/crew/canteen)
-"pd" = (
-/obj/machinery/light/directional/east,
-/obj/structure/closet/crate/large{
- name = "Donk! Co. Powerloader In a Box"
- },
-/obj/effect/decal/cleanable/oil,
-/obj/effect/turf_decal/rechargefloor,
-/obj/mecha/working/ripley/cargo{
- name = "\improper Donk! Co. Cargo Loading Device"
- },
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/storage)
-"pt" = (
-/turf/closed/wall/mineral/plastitanium,
-/area/ship/engineering)
-"pJ" = (
-/obj/machinery/firealarm/directional/south,
-/obj/machinery/autolathe,
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/engineering)
-"pL" = (
-/obj/effect/turf_decal/siding/blue{
- dir = 1
- },
-/obj/effect/turf_decal/siding/blue/corner{
- dir = 8
- },
-/turf/open/floor/plasteel/dark,
-/area/ship/hallway/central)
-"pR" = (
-/obj/machinery/power/smes/engineering,
-/obj/structure/cable{
- icon_state = "0-2"
- },
-/obj/machinery/door/firedoor/border_only,
-/obj/machinery/door/firedoor/border_only{
- dir = 1
- },
-/turf/open/floor/plating,
-/area/ship/engineering)
-"qe" = (
-/obj/effect/turf_decal/atmos/air,
-/turf/open/floor/engine/air,
-/area/ship/engineering)
-"qf" = (
-/obj/structure/table,
-/obj/machinery/door/firedoor,
-/obj/item/radio/intercom/directional/north,
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/crew/canteen)
-"qh" = (
-/obj/machinery/airalarm/directional/west,
-/obj/item/stack/sheet/cardboard/fifty,
-/obj/item/hand_labeler,
-/obj/effect/turf_decal/corner/opaque/brown/border{
- dir = 8
- },
-/obj/machinery/navbeacon/wayfinding{
- codes_txt = "patrol;next_patrol=lux_shopfloor";
- location = "lux_lobby"
- },
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/cargo)
-"ql" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/orange/visible{
- dir = 4
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 4
- },
-/obj/structure/catwalk/over/plated_catwalk,
-/turf/open/floor/plating,
-/area/ship/engineering)
-"qO" = (
-/obj/structure/cable{
- icon_state = "2-4"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
- dir = 4
- },
-/obj/structure/chair/plastic{
- dir = 4
- },
-/obj/effect/turf_decal/siding/red{
- dir = 8
- },
-/obj/effect/turf_decal/corner/opaque/neutral/border{
- dir = 4
- },
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/hallway/central)
-"qP" = (
-/obj/machinery/door/airlock/external,
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/orange/visible{
- dir = 5
- },
-/turf/open/floor/plating,
-/area/ship/engineering)
-"qR" = (
-/turf/open/floor/engine/air,
-/area/ship/engineering)
-"qV" = (
-/obj/item/toy/sword,
-/obj/structure/closet/crate/wooden/toy,
-/obj/item/ammo_box/magazine/toy/smgm45/riot,
-/obj/item/ammo_box/magazine/toy/smgm45/riot,
-/obj/item/gun/ballistic/automatic/smg/c20r/toy/unrestricted/riot,
-/obj/item/soap/syndie,
-/obj/item/soap/syndie,
-/obj/item/soap/syndie,
-/obj/item/soap/syndie,
-/obj/item/soap/syndie,
-/obj/item/soap/syndie,
-/obj/item/soap/syndie,
-/obj/item/soap/syndie,
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/storage)
-"rh" = (
-/obj/effect/turf_decal/siding/blue/corner{
- dir = 8
- },
-/obj/effect/turf_decal/siding/blue/corner,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
-/obj/effect/turf_decal/trimline/opaque/blue/filled/warning{
- dir = 1
- },
-/turf/open/floor/plasteel/dark,
-/area/ship/hallway/central)
-"rm" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
- dir = 9
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
- dir = 9
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/carpet/red_gold,
-/area/ship/crew/dorm)
-"rq" = (
-/obj/machinery/door/firedoor/border_only{
- dir = 4
- },
-/obj/machinery/door/firedoor/border_only{
- dir = 8
- },
-/obj/machinery/door/window{
- dir = 8;
- name = "Canteen"
- },
-/obj/effect/turf_decal/siding/red,
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/crew/canteen)
-"rG" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
-/obj/effect/turf_decal/corner/opaque/neutral/mono,
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/crew/canteen)
-"rU" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/trimline/opaque/orange/filled/warning,
-/turf/open/floor/plasteel/patterned/cargo_one,
-/area/ship/storage)
-"rV" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/atmos/air_output{
- dir = 4
- },
-/obj/structure/window/plasma/reinforced/spawner/east,
-/turf/open/floor/engine/air,
-/area/ship/engineering)
-"sh" = (
-/obj/machinery/power/shuttle/engine/fueled/plasma{
- dir = 1
- },
-/turf/open/floor/plating,
-/area/ship/engineering)
-"sk" = (
-/obj/effect/turf_decal/atmos/plasma,
-/turf/open/floor/engine/plasma,
-/area/ship/engineering)
-"sF" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 8
- },
-/obj/effect/turf_decal/corner/opaque/neutral/mono,
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/crew/canteen)
-"sI" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
- dir = 8
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
- dir = 6
- },
-/obj/effect/turf_decal/industrial/traffic{
- dir = 8
- },
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/dorm)
-"sV" = (
-/mob/living/simple_animal/bot/mulebot{
- bot_name = "\proper Christine";
- desc = "A Multiple Utility Load Effector bot. This one seems oddly menacing...";
- id = "Christine";
- name = "\proper Christine"
- },
-/obj/effect/turf_decal/corner/opaque/brown/bordercee,
-/obj/machinery/navbeacon/wayfinding{
- codes_txt = null;
- location = "mulestation"
- },
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/cargo)
-"tx" = (
-/obj/machinery/power/port_gen/pacman,
-/obj/structure/cable/yellow{
- icon_state = "0-4"
- },
-/obj/item/stack/sheet/mineral/plasma/five,
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/engineering)
-"tF" = (
-/obj/structure/bed/pod,
-/obj/item/bedsheet/blue,
-/obj/structure/curtain/bounty,
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/dorm)
-"tH" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/effect/turf_decal/siding/red{
- dir = 10
- },
-/obj/effect/turf_decal/corner/opaque/neutral/bordercorner{
- dir = 4
- },
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/hallway/central)
-"tO" = (
-/obj/effect/turf_decal/siding/blue/corner,
-/obj/effect/turf_decal/siding/blue/corner{
- dir = 8
- },
-/obj/effect/turf_decal/siding/blue/corner{
- dir = 4
- },
-/turf/open/floor/plasteel/dark,
-/area/ship/hallway/central)
-"tU" = (
-/obj/machinery/camera{
- dir = 10
- },
-/turf/open/floor/plating,
-/area/template_noop)
-"tV" = (
-/obj/machinery/door/firedoor/border_only{
- dir = 4
- },
-/obj/machinery/door/firedoor/border_only{
- dir = 8
- },
-/obj/machinery/button/door{
- id = "cargodoors";
- pixel_x = 8;
- pixel_y = -24
- },
-/obj/machinery/door/window{
- dir = 8;
- name = "Cargo Bay"
- },
-/obj/machinery/door/poddoor/shutters{
- dir = 4;
- id = "cargodoors"
- },
-/turf/open/floor/plasteel/dark,
-/area/ship/cargo)
-"ug" = (
-/obj/structure/table/reinforced,
-/obj/machinery/door/window/eastright,
-/obj/machinery/door/firedoor,
-/obj/machinery/door/poddoor/shutters{
- dir = 4;
- id = "cargodoors"
- },
-/turf/open/floor/plasteel/dark,
-/area/ship/cargo)
-"ul" = (
-/obj/structure/cable/yellow{
- icon_state = "0-8"
- },
-/obj/machinery/power/port_gen/pacman,
-/obj/item/stack/sheet/mineral/plasma/five,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/engineering)
-"uo" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/components/binary/pump{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
- dir = 5
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
-/obj/structure/catwalk/over/plated_catwalk,
-/turf/open/floor/plating,
-/area/ship/engineering)
-"uB" = (
-/obj/structure/table,
-/obj/machinery/reagentgrinder,
-/obj/item/reagent_containers/food/drinks/shaker{
- pixel_x = 10
- },
-/obj/item/kitchen/knife{
- pixel_x = -8
- },
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/crew/canteen)
-"uK" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/toxin_input{
- dir = 8
- },
-/obj/structure/window/plasma/reinforced/spawner/west,
-/turf/open/floor/engine/plasma,
-/area/ship/engineering)
-"uX" = (
-/obj/machinery/power/apc/auto_name/directional/east,
-/obj/structure/cable{
- icon_state = "0-8"
- },
-/obj/effect/turf_decal/corner/opaque/brown/border{
- dir = 4
- },
-/obj/machinery/suit_storage_unit/inherit/industrial,
-/obj/item/clothing/suit/space/syndicate/green,
-/obj/item/clothing/head/helmet/space/syndicate/green,
-/obj/item/clothing/mask/breath,
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/cargo)
-"vb" = (
-/obj/machinery/door/firedoor/border_only,
-/obj/machinery/door/firedoor/border_only{
- dir = 1
- },
-/obj/machinery/door/poddoor/shutters{
- id = "warehouse"
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/storage)
-"vf" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4,
-/obj/effect/turf_decal/siding/blue{
- dir = 8
- },
-/turf/open/floor/plasteel/dark,
-/area/ship/hallway/central)
-"vp" = (
-/turf/closed/wall/mineral/plastitanium/nodiagonal,
-/area/ship/engineering)
-"vw" = (
-/obj/machinery/camera{
- dir = 1
- },
-/turf/open/floor/plating,
-/area/template_noop)
-"vz" = (
-/obj/machinery/atmospherics/components/unary/shuttle/heater{
- dir = 1
- },
-/obj/structure/window/reinforced/spawner,
-/obj/machinery/door/poddoor/shutters{
- id = "externalshutters"
- },
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/engineering)
-"vT" = (
-/obj/structure/closet/crate,
-/obj/item/grenade/c4,
-/obj/item/grenade/c4,
-/obj/item/grenade/c4,
-/obj/item/grenade/c4,
-/obj/item/grenade/c4,
-/obj/item/grenade/c4,
-/obj/item/grenade/c4,
-/obj/item/grenade/c4,
-/obj/item/grenade/c4,
-/obj/item/grenade/c4,
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/storage)
-"wd" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
-/obj/effect/turf_decal/siding/blue{
- dir = 4
- },
-/turf/open/floor/plasteel/dark,
-/area/ship/hallway/central)
-"wN" = (
-/obj/structure/table,
-/obj/machinery/chem_dispenser/drinks,
-/obj/machinery/light/directional/north,
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/crew/canteen)
-"wP" = (
-/obj/structure/cable{
- icon_state = "2-4"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/cargo)
-"wT" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/toxin_output{
- dir = 8
- },
-/obj/structure/window/plasma/reinforced/spawner/west,
-/turf/open/floor/engine/plasma,
-/area/ship/engineering)
-"xa" = (
-/obj/effect/turf_decal/siding/blue,
-/obj/effect/turf_decal/corner/opaque/blue/half{
- dir = 1
- },
-/turf/open/floor/plasteel/dark,
-/area/ship/hallway/central)
-"xc" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/structure/chair/plastic{
- dir = 4
- },
-/obj/effect/turf_decal/siding/red{
- dir = 8
- },
-/obj/effect/turf_decal/corner/opaque/neutral/border{
- dir = 4
- },
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/hallway/central)
-"xt" = (
-/obj/machinery/light/directional/east,
-/obj/item/clothing/head/HoS/beret/syndicate,
-/obj/item/radio/headset/syndicate/alt,
-/obj/item/gun/ballistic/shotgun/doublebarrel,
-/obj/item/clothing/under/rank/civilian/bartender,
-/obj/structure/closet/secure_closet/bar{
- req_access = null;
- req_one_access_txt = list(25,41)
- },
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/engineering)
-"xw" = (
-/obj/structure/cable{
- icon_state = "1-8"
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/vending/clothing{
- default_price = 0;
- extra_price = 0
- },
-/obj/machinery/light/small/directional/east,
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/dorm)
-"yd" = (
-/obj/structure/table,
-/obj/machinery/chem_dispenser/drinks/beer,
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/crew/canteen)
-"yf" = (
-/obj/effect/turf_decal/siding/blue/corner{
- dir = 4
- },
-/obj/effect/turf_decal/siding/blue{
- dir = 10
- },
-/turf/open/floor/plasteel/dark,
-/area/ship/hallway/central)
-"yh" = (
-/obj/machinery/light_switch{
- dir = 8;
- pixel_x = 24;
- pixel_y = 5
- },
-/obj/effect/turf_decal/corner/opaque/brown/border{
- dir = 4
- },
-/obj/effect/turf_decal/corner/opaque/brown/bordercorner{
- dir = 1
- },
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/cargo)
-"ym" = (
-/obj/effect/turf_decal/siding/blue{
- dir = 8
- },
-/turf/open/floor/plasteel/dark,
-/area/ship/hallway/central)
-"yQ" = (
-/obj/structure/cable/yellow{
- icon_state = "2-8"
- },
-/obj/structure/cable/yellow{
- icon_state = "2-4"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
-/obj/structure/catwalk/over/plated_catwalk/dark,
-/turf/open/floor/plating,
-/area/ship/engineering)
-"yX" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/siding/blue/corner{
- dir = 8
- },
-/obj/effect/turf_decal/siding/blue/corner,
-/obj/effect/turf_decal/siding/blue/corner{
- dir = 1
- },
-/obj/effect/turf_decal/siding/blue/corner{
- dir = 4
- },
-/obj/machinery/navbeacon/wayfinding{
- codes_txt = "patrol;next_patrol=lux_kitchen";
- location = "lux_shopfloor"
- },
-/obj/machinery/holopad/emergency/cargo,
-/turf/open/floor/plasteel/dark,
-/area/ship/hallway/central)
-"zc" = (
-/obj/structure/rack,
-/obj/effect/turf_decal/corner/opaque/neutral/mono,
-/obj/machinery/airalarm/directional/east,
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/hallway/central)
-"zW" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
- dir = 6
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
- dir = 6
- },
-/turf/open/floor/carpet/red_gold,
-/area/ship/crew/dorm)
-"Ai" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
-/obj/machinery/door/airlock{
- name = "Dormitory"
- },
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/crew/dorm)
-"AE" = (
-/obj/machinery/door/airlock/external,
-/obj/effect/mapping_helpers/airlock/cyclelink_helper,
-/obj/machinery/atmospherics/pipe/layer_manifold,
-/turf/open/floor/plating,
-/area/ship/engineering)
-"AL" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/cargo)
-"Bt" = (
-/turf/closed/wall/mineral/plastitanium,
-/area/ship/crew/canteen)
-"Bw" = (
-/turf/closed/wall/mineral/plastitanium,
-/area/ship/cargo)
-"BM" = (
-/obj/structure/bed/pod,
-/obj/item/bedsheet/blue,
-/obj/structure/window/reinforced/tinted/frosted,
-/obj/structure/curtain/bounty,
-/obj/machinery/power/apc/auto_name/directional/west,
-/obj/structure/cable{
- icon_state = "0-4"
- },
-/obj/machinery/light_switch{
- dir = 4;
- pixel_x = -19;
- pixel_y = 12
- },
-/turf/open/floor/carpet/red_gold,
-/area/ship/crew/dorm)
-"BX" = (
-/obj/machinery/airalarm/directional/west,
-/obj/machinery/cryopod{
- dir = 4
- },
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/crew/dorm)
-"BZ" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/corner/opaque/brown/border{
- dir = 4
- },
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/cargo)
-"CC" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/cargo)
-"CI" = (
-/obj/effect/turf_decal/siding/blue/corner{
- dir = 1
- },
-/obj/effect/turf_decal/siding/blue{
- dir = 6
- },
-/turf/open/floor/plasteel/dark,
-/area/ship/hallway/central)
-"CM" = (
-/obj/structure/cable{
- icon_state = "2-4"
- },
-/obj/structure/cable{
- icon_state = "2-8"
- },
-/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/catwalk/over/plated_catwalk,
-/turf/open/floor/plating,
-/area/ship/engineering)
-"CT" = (
-/obj/machinery/computer/atmos_control/tank/toxin_tank{
- dir = 8
- },
-/obj/machinery/light/directional/south,
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/engineering)
-"CV" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/siding/red,
-/obj/structure/cable{
- icon_state = "2-8"
- },
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/crew/canteen)
-"CW" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
- dir = 8
- },
-/obj/structure/closet/secure_closet/engineering_electrical,
-/obj/item/stack/circuit_stack/full,
-/obj/item/stack/circuit_stack/full,
-/obj/item/stack/circuit_stack/full,
-/obj/item/stack/circuit_stack/full,
-/obj/machinery/light/directional/north,
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/engineering)
-"Da" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
-/obj/machinery/door/firedoor/border_only{
- dir = 1
- },
-/obj/machinery/door/firedoor/border_only,
-/obj/machinery/door/airlock{
- name = "Canteen"
- },
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/crew/canteen)
-"Dq" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/corner/opaque/neutral/mono,
-/obj/machinery/navbeacon/wayfinding{
- codes_txt = "patrol;next_patrol=lux_crew";
- location = "lux_kitchen"
- },
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/crew/canteen)
-"Dw" = (
-/obj/structure/table,
-/obj/structure/window/plasma/reinforced,
-/obj/item/reagent_containers/food/drinks/shaker,
-/obj/machinery/door/firedoor,
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/crew/canteen)
-"DA" = (
-/obj/effect/turf_decal/siding/red,
-/obj/machinery/firealarm/directional/south,
-/obj/machinery/light_switch{
- dir = 1;
- pixel_x = 6;
- pixel_y = -24
- },
-/obj/machinery/airalarm/directional/east,
-/obj/machinery/vending/dinnerware,
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/crew/canteen)
-"DE" = (
-/obj/structure/rack,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 8
- },
-/obj/effect/turf_decal/corner/opaque/neutral/mono,
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/hallway/central)
-"DG" = (
-/obj/machinery/light/directional/south,
-/obj/structure/rack,
-/obj/effect/turf_decal/corner/opaque/neutral/mono,
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/hallway/central)
-"DJ" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
- dir = 4
- },
-/obj/structure/catwalk/over/plated_catwalk/dark,
-/obj/effect/turf_decal/number/five{
- dir = 4
- },
-/turf/open/floor/plating,
-/area/ship/engineering)
-"DW" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/light_switch{
- dir = 8;
- pixel_x = 24
- },
-/obj/structure/chair/plastic,
-/turf/open/floor/carpet/red_gold,
-/area/ship/crew/dorm)
-"Ee" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
- dir = 4
- },
-/obj/effect/turf_decal/corner/opaque/brown/border{
- dir = 4
- },
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/cargo)
-"Ej" = (
-/obj/machinery/modular_computer/console/preset/command{
- dir = 4
- },
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/hallway/central)
-"Er" = (
-/obj/machinery/atmospherics/pipe/simple/orange/visible{
- dir = 9
- },
-/turf/closed/wall/mineral/plastitanium/nodiagonal,
-/area/ship/engineering)
-"EG" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 8
- },
-/obj/effect/turf_decal/trimline/opaque/brown/filled/warning{
- dir = 4
- },
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/cargo)
-"EO" = (
-/turf/closed/wall/mineral/plastitanium/nodiagonal,
-/area/ship/crew/dorm)
-"EW" = (
-/turf/open/floor/engine/plasma,
-/area/ship/engineering)
-"EZ" = (
-/obj/item/radio/headset/syndicate/alt,
-/obj/item/toy/figure/cargotech,
-/obj/item/clothing/suit/hooded/wintercoat/cargo,
-/obj/item/stack/sheet/cardboard/fifty,
-/obj/item/hand_labeler,
-/obj/item/hand_labeler_refill,
-/obj/item/clothing/under/syndicate/donk,
-/obj/item/clothing/suit/hazardvest/donk,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 4
- },
-/obj/item/stack/wrapping_paper,
-/obj/item/stack/packageWrap,
-/obj/structure/closet/wall{
- dir = 4;
- icon_door = "orange_wall";
- name = "employee closet";
- pixel_x = -28
- },
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/engineering)
-"Fj" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
-/obj/item/paper{
- desc = "A piece of paper depicting a extremely pissed up upper manager";
- default_raw_text = "YOU DAMNNED FOOLS! YOU ARENT SUPPOSED TO USE YOUR STOCK, YOU'RE SUPPOSED TO SELL THEM!! WE AREN'T WASTING MY MONEY ARE WE!?! NOW GET BACK TO WORK!!!";
- name = "angry letter from upper management"
- },
-/turf/open/floor/plasteel/patterned/cargo_one,
-/area/ship/storage)
-"Fq" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
- dir = 4
- },
-/obj/machinery/holopad/emergency/bar,
-/obj/effect/turf_decal/corner/opaque/neutral/mono,
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/crew/canteen)
-"FV" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{
- dir = 8
- },
-/turf/open/floor/plasteel/patterned,
-/area/ship/crew/dorm)
-"Ga" = (
-/obj/machinery/computer/helm,
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/hallway/central)
-"Gr" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/orange/visible{
- dir = 4
- },
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 8
- },
-/obj/structure/catwalk/over/plated_catwalk,
-/turf/open/floor/plating,
-/area/ship/engineering)
-"GD" = (
-/obj/docking_port/stationary{
- width = 30;
- height = 15;
- dir = 8;
- dwidth = 15
- },
-/turf/template_noop,
-/area/template_noop)
-"GG" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/orange/visible{
- dir = 6
- },
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
- dir = 1
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/catwalk/over/plated_catwalk,
-/turf/open/floor/plating,
-/area/ship/engineering)
-"Hx" = (
-/turf/closed/wall/mineral/plastitanium,
-/area/ship/crew/dorm)
-"HG" = (
-/obj/machinery/power/shieldwallgen/atmos{
- anchored = 1;
- id = "luxembourg_cargo";
- locked = 1
- },
-/obj/structure/cable{
- icon_state = "0-4"
- },
-/obj/machinery/door/poddoor/shutters{
- dir = 4;
- id = "syndiefuck"
- },
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/cargo)
-"HK" = (
-/obj/structure/rack,
-/obj/effect/turf_decal/corner/opaque/neutral/mono,
-/obj/machinery/light/directional/east,
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/hallway/central)
-"HZ" = (
-/obj/structure/table,
-/obj/item/reagent_containers/glass/rag,
-/obj/machinery/door/firedoor,
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/crew/canteen)
-"Id" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
-/obj/structure/cable{
- icon_state = "2-8"
- },
-/turf/open/floor/carpet/red_gold,
-/area/ship/crew/dorm)
-"Ij" = (
-/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
-/obj/docking_port/mobile{
- can_move_docking_ports = 1;
- dir = 2;
- launch_status = 0
- },
-/obj/machinery/door/poddoor/shutters{
- id = "externalshutters"
- },
-/turf/open/floor/plating,
-/area/ship/hallway/central)
-"Ip" = (
-/obj/item/toy/figure/cargotech,
-/obj/item/clothing/suit/hooded/wintercoat/cargo,
-/obj/item/stack/sheet/cardboard/fifty,
-/obj/item/hand_labeler,
-/obj/item/hand_labeler_refill,
-/obj/item/clothing/under/syndicate/donk,
-/obj/item/clothing/suit/hazardvest/donk,
-/obj/item/stack/wrapping_paper,
-/obj/item/stack/packageWrap,
-/obj/structure/railing,
-/obj/structure/closet/wall{
- dir = 8;
- icon_door = "orange_wall";
- name = "employee closet";
- pixel_x = 28
- },
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/engineering)
-"Iv" = (
-/obj/effect/turf_decal/siding/blue{
- dir = 4
- },
-/obj/effect/turf_decal/siding/blue{
- dir = 8
- },
-/turf/open/floor/plasteel/dark,
-/area/ship/hallway/central)
-"IT" = (
-/obj/machinery/power/apc/auto_name/directional/east,
-/obj/structure/cable,
-/obj/effect/turf_decal/siding/blue,
-/obj/machinery/light_switch{
- dir = 8;
- pixel_x = 20;
- pixel_y = 11
- },
-/turf/open/floor/plasteel/dark,
-/area/ship/hallway/central)
-"Je" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/cargo)
-"Ji" = (
-/obj/structure/bed/pod,
-/obj/item/bedsheet/blue,
-/obj/structure/curtain/bounty,
-/turf/open/floor/carpet/red_gold,
-/area/ship/crew/dorm)
-"Jq" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/siding/blue/corner{
- dir = 1
- },
-/obj/effect/turf_decal/siding/blue/corner{
- dir = 4
- },
-/turf/open/floor/plasteel/dark,
-/area/ship/hallway/central)
-"Jr" = (
-/obj/effect/turf_decal/siding/blue{
- dir = 1
- },
-/obj/effect/turf_decal/siding/blue/corner,
-/turf/open/floor/plasteel/dark,
-/area/ship/hallway/central)
-"JO" = (
-/obj/structure/closet/crate/science,
-/obj/item/circuitboard/machine/chem_dispenser/drinks,
-/obj/item/circuitboard/machine/chem_dispenser/drinks,
-/obj/item/circuitboard/machine/chem_dispenser/drinks,
-/obj/item/circuitboard/machine/chem_dispenser/drinks/beer,
-/obj/item/circuitboard/machine/chem_dispenser/drinks/beer,
-/obj/item/circuitboard/machine/chem_dispenser/drinks/beer,
-/obj/item/circuitboard/machine/deep_fryer,
-/obj/item/circuitboard/machine/deep_fryer,
-/obj/item/circuitboard/machine/deep_fryer,
-/obj/item/circuitboard/machine/mechfab,
-/obj/item/circuitboard/machine/mechfab,
-/obj/item/circuitboard/machine/mechfab,
-/obj/item/circuitboard/machine/mechfab,
-/obj/item/circuitboard/machine/mechfab,
-/obj/item/circuitboard/machine/ore_redemption,
-/obj/item/circuitboard/machine/ore_redemption,
-/obj/item/circuitboard/machine/ore_redemption,
-/obj/item/circuitboard/machine/microwave,
-/obj/item/circuitboard/machine/microwave,
-/obj/item/circuitboard/machine/microwave,
-/obj/machinery/firealarm/directional/east,
-/obj/machinery/light_switch{
- pixel_x = 6;
- pixel_y = 24
- },
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/storage)
-"JT" = (
-/obj/machinery/door/poddoor/shutters{
- dir = 4;
- id = "syndiefuck"
- },
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/cargo)
-"JU" = (
-/obj/effect/turf_decal/corner/opaque/brown/border{
- dir = 6
- },
-/obj/machinery/suit_storage_unit/inherit/industrial,
-/obj/item/clothing/suit/space/syndicate/blue,
-/obj/item/clothing/head/helmet/space/syndicate/blue,
-/obj/item/clothing/mask/breath,
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/cargo)
-"JV" = (
-/obj/effect/turf_decal/corner/opaque/brown/bordercorner{
- dir = 1
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/cargo)
-"Ka" = (
-/turf/closed/wall/mineral/plastitanium/nodiagonal,
-/area/ship/storage)
-"Kg" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/shower{
- dir = 4
- },
-/obj/structure/window/reinforced/tinted/frosted,
-/obj/structure/curtain,
-/obj/effect/turf_decal/steeldecal/steel_decals10{
- dir = 8
- },
-/obj/machinery/light_switch{
- pixel_y = 23;
- pixel_x = 11
- },
-/turf/open/floor/plasteel/patterned,
-/area/ship/crew/dorm)
-"Kk" = (
-/obj/machinery/air_sensor/atmos/toxin_tank,
-/turf/open/floor/engine/plasma,
-/area/ship/engineering)
-"Ko" = (
-/obj/structure/cable{
- icon_state = "2-8"
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/navbeacon/wayfinding{
- codes_txt = "patrol;next_patrol=lux_lobby";
- location = "lux_warehouse"
- },
-/turf/open/floor/plasteel/patterned/cargo_one,
-/area/ship/storage)
-"KH" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/vending/autodrobe/all_access{
- default_price = 0;
- extra_price = 0
- },
-/obj/machinery/firealarm/directional/south,
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/dorm)
-"KX" = (
-/obj/structure/closet/crate,
-/obj/item/construction/rcd/combat,
-/obj/item/construction/rcd/combat,
-/obj/item/construction/rcd/combat,
-/obj/item/construction/rcd/combat,
-/obj/item/construction/rcd/combat,
-/obj/item/construction/rcd/combat,
-/obj/item/construction/rcd/combat,
-/obj/item/construction/rcd/combat,
-/obj/item/construction/rcd/combat,
-/obj/item/construction/rcd/combat,
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/storage)
-"KZ" = (
-/obj/effect/turf_decal/siding/red,
-/obj/structure/closet/secure_closet/freezer/wall{
- dir = 1;
- name = "refrigerator";
- pixel_y = -32
- },
-/obj/item/storage/box/donkpockets/donkpocketteriyaki,
-/obj/item/storage/box/donkpockets/donkpocketteriyaki,
-/obj/item/storage/box/donkpockets/donkpocketteriyaki,
-/obj/item/storage/box/donkpockets/donkpocketteriyaki,
-/obj/item/storage/box/donkpockets/donkpocketspicy,
-/obj/item/storage/box/donkpockets/donkpocketspicy,
-/obj/item/storage/box/donkpockets/donkpocketspicy,
-/obj/item/storage/box/donkpockets/donkpocketspicy,
-/obj/item/storage/box/donkpockets/donkpockethonk,
-/obj/item/storage/box/donkpockets/donkpockethonk,
-/obj/item/storage/box/donkpockets/donkpockethonk,
-/obj/item/storage/box/donkpockets/donkpockethonk,
-/obj/item/storage/box/donkpockets,
-/obj/item/storage/box/donkpockets,
-/obj/item/storage/box/donkpockets,
-/obj/item/storage/box/donkpockets,
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/crew/canteen)
-"La" = (
-/obj/effect/turf_decal/corner/opaque/blue{
- dir = 4
- },
-/obj/machinery/button/door{
- id = "cargodoors";
- pixel_y = 25
- },
-/turf/open/floor/plasteel/dark,
-/area/ship/hallway/central)
-"Lr" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
- dir = 4
- },
-/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/drinkingglass{
- pixel_x = -4;
- pixel_y = -4
- },
-/obj/item/paper{
- desc = "A piece of paper depicting a extremely pissed up upper manager";
- default_raw_text = "YOU ARENT SUPPOSED TO BE MINING, HEAR ME!?!! YOU'RE SUPPOSED TO BE SELLING SHIT TO THE CONSUMERS YOU HEAR!! AS PUNISHMENT FOR THE LAST SHIFT, I HAVE REMOVED ALLL OF YOUR MINING TOOLS!! NOW GET BACK TO WORK!!";
- name = "angry letter from upper management"
- },
-/obj/machinery/door/firedoor,
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/crew/canteen)
-"Lu" = (
-/obj/structure/chair/plastic{
- dir = 1
- },
-/turf/open/floor/carpet/red_gold,
-/area/ship/crew/dorm)
-"LU" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/air_input{
- dir = 4
- },
-/obj/structure/window/plasma/reinforced/spawner/east,
-/turf/open/floor/engine/air,
-/area/ship/engineering)
-"LV" = (
-/obj/machinery/vending/boozeomat/all_access{
- default_price = 0;
- extra_price = 0
- },
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/crew/canteen)
-"LY" = (
-/obj/machinery/firealarm/directional/west,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 8
- },
-/obj/structure/closet/crate,
-/obj/item/card/emag/limited,
-/obj/item/card/emag/limited,
-/obj/item/card/emag/limited,
-/obj/item/card/emag/limited,
-/obj/item/card/emag/limited,
-/obj/item/card/emag/limited,
-/obj/item/card/emag/limited,
-/obj/item/card/emag/limited,
-/obj/item/card/emag/limited,
-/obj/item/card/emag/limited,
-/obj/item/radio/intercom/directional/east,
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/storage)
-"Mg" = (
-/obj/structure/cable{
- icon_state = "2-8"
- },
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
- dir = 1
- },
-/obj/effect/turf_decal/corner/opaque/neutral/mono,
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/crew/canteen)
-"Mi" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/table/reinforced,
-/obj/structure/window/plasma/reinforced,
-/obj/machinery/door/window/eastright,
-/obj/machinery/door/firedoor,
-/obj/machinery/door/poddoor/shutters{
- dir = 4;
- id = "cargodoors"
- },
-/turf/open/floor/plasteel/dark,
-/area/ship/cargo)
-"Mj" = (
-/obj/machinery/atmospherics/components/binary/dp_vent_pump,
-/obj/machinery/advanced_airlock_controller{
- pixel_x = -25
- },
-/turf/open/floor/plating,
-/area/ship/engineering)
-"Mx" = (
-/obj/effect/turf_decal/siding/blue{
- dir = 8
- },
-/obj/machinery/light_switch{
- dir = 1;
- pixel_x = 10;
- pixel_y = -21
- },
-/obj/machinery/firealarm/directional/south,
-/obj/effect/turf_decal/trimline/opaque/blue/filled/warning,
-/turf/open/floor/plasteel/dark,
-/area/ship/hallway/central)
-"Mz" = (
-/obj/structure/tank_dispenser/oxygen,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/corner/opaque/brown/border{
- dir = 9
- },
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/cargo)
-"MT" = (
-/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
-/obj/machinery/door/poddoor/shutters{
- dir = 4;
- id = "externalshutters"
- },
-/turf/open/floor/plating,
-/area/ship/cargo)
-"MU" = (
-/obj/machinery/door/window/brigdoor{
- name = "Bridge";
- req_access_txt = "41"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
- dir = 6
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
- dir = 10
- },
-/turf/open/floor/carpet/red_gold,
-/area/ship/hallway/central)
-"Nr" = (
-/turf/template_noop,
-/area/template_noop)
-"NH" = (
-/obj/effect/turf_decal/siding/blue/corner,
-/obj/effect/turf_decal/corner/opaque/blue/half{
- dir = 1
- },
-/turf/open/floor/plasteel/dark,
-/area/ship/hallway/central)
-"NJ" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
- dir = 4
- },
-/turf/open/floor/plasteel/dark,
-/area/ship/hallway/central)
-"NQ" = (
-/obj/machinery/light/directional/west,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/table,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 4
- },
-/obj/item/storage/fancy/cigarettes/cigpack_syndicate{
- pixel_x = 6
- },
-/obj/item/lighter/greyscale{
- pixel_x = -3;
- pixel_y = 4
- },
-/turf/open/floor/carpet/red_gold,
-/area/ship/crew/dorm)
-"On" = (
-/obj/item/storage/toolbox/syndicate,
-/obj/item/storage/toolbox/syndicate,
-/obj/item/storage/toolbox/syndicate,
-/obj/item/storage/toolbox/syndicate,
-/obj/item/storage/toolbox/syndicate,
-/obj/item/storage/toolbox/syndicate,
-/obj/item/storage/toolbox/syndicate,
-/obj/item/storage/toolbox/syndicate,
-/obj/item/storage/toolbox/syndicate,
-/obj/item/storage/toolbox/syndicate,
-/obj/item/storage/toolbox/syndicate,
-/obj/structure/closet/crate,
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/storage)
-"Op" = (
-/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
-/obj/machinery/door/poddoor/shutters{
- dir = 4;
- id = "externalshutters"
- },
-/turf/open/floor/plating,
-/area/ship/crew/canteen)
-"Oq" = (
-/obj/structure/table,
-/obj/item/toy/cards/deck/syndicate,
-/turf/open/floor/carpet/red_gold,
-/area/ship/crew/dorm)
-"Oz" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
-/obj/effect/turf_decal/siding/blue{
- dir = 8
- },
-/turf/open/floor/plasteel/dark,
-/area/ship/hallway/central)
-"OR" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
- dir = 6
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
- dir = 6
- },
-/obj/effect/decal/cleanable/oil,
-/obj/structure/cable{
- icon_state = "2-8"
- },
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/cargo)
-"OY" = (
-/obj/structure/closet/crate/trashcart,
-/obj/effect/spawner/lootdrop/maintenance/eight,
-/obj/effect/turf_decal/corner/opaque/brown/border{
- dir = 9
- },
-/obj/machinery/button/shieldwallgen{
- id = "luxembourg_cargo";
- pixel_x = -10;
- pixel_y = 25
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/button/door{
- id = "syndiefuck";
- pixel_x = -20;
- pixel_y = 26
- },
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/cargo)
-"Pb" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/closed/wall/mineral/plastitanium/nodiagonal,
-/area/ship/crew/dorm)
-"Ph" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
-/obj/structure/catwalk/over/plated_catwalk/dark,
-/obj/effect/turf_decal/number/zero{
- dir = 4
- },
-/turf/open/floor/plating,
-/area/ship/engineering)
-"Ps" = (
-/obj/machinery/light/directional/south,
-/obj/item/banner/cargo,
-/obj/effect/turf_decal/corner/opaque/brown/border{
- dir = 10
- },
-/obj/machinery/button/shieldwallgen{
- dir = 1;
- id = "luxembourg_cargo";
- pixel_x = -10;
- pixel_y = -25
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/button/door{
- dir = 1;
- id = "syndiefuck";
- pixel_x = -20;
- pixel_y = -26
- },
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/cargo)
-"PO" = (
-/obj/structure/sign/poster/contraband/syndicate_recruitment{
- pixel_x = 4;
- pixel_y = -30
- },
-/obj/effect/turf_decal/siding/blue{
- dir = 4
- },
-/obj/effect/turf_decal/trimline/opaque/blue/filled/warning,
-/turf/open/floor/plasteel/dark,
-/area/ship/hallway/central)
-"PW" = (
-/obj/structure/sign/donk{
- pixel_x = -32
- },
-/obj/structure/rack,
-/obj/effect/turf_decal/corner/opaque/neutral/mono,
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/hallway/central)
-"QG" = (
-/obj/machinery/light/directional/west,
-/obj/machinery/vending/toyliberationstation,
-/obj/structure/window/plasma/reinforced,
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/hallway/central)
-"QQ" = (
-/obj/structure/window/plasma/reinforced,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 4
- },
-/turf/open/floor/carpet/red_gold,
-/area/ship/hallway/central)
-"QT" = (
-/obj/machinery/light/directional/east,
-/obj/structure/window/plasma/reinforced,
-/obj/machinery/computer/selling_pad_control{
- dir = 8
- },
-/obj/machinery/airalarm/directional/north,
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/hallway/central)
-"QU" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
-/obj/machinery/button/door{
- id = "warehouse";
- pixel_x = 24;
- pixel_y = 21
- },
-/turf/open/floor/plasteel/patterned/cargo_one,
-/area/ship/storage)
-"Rk" = (
-/obj/structure/rack,
-/obj/effect/turf_decal/corner/opaque/neutral/mono,
-/obj/machinery/light/directional/west,
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/hallway/central)
-"Ro" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
-/obj/machinery/door/firedoor/border_only{
- dir = 1
- },
-/obj/machinery/door/firedoor/border_only,
-/obj/structure/catwalk/over/plated_catwalk/white,
-/obj/machinery/door/airlock/engineering{
- name = "Engineering"
- },
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/engineering)
-"Rp" = (
-/turf/open/floor/carpet/red_gold,
-/area/ship/crew/dorm)
-"RH" = (
-/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
-/obj/machinery/door/poddoor/shutters{
- id = "externalshutters"
- },
-/turf/open/floor/plating,
-/area/ship/cargo)
-"RM" = (
-/obj/effect/turf_decal/trimline/opaque/brown/filled/warning,
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/cargo)
-"Sn" = (
-/obj/effect/turf_decal/siding/blue,
-/obj/effect/turf_decal/siding/blue{
- dir = 1
- },
-/turf/open/floor/plasteel/dark,
-/area/ship/hallway/central)
-"SS" = (
-/obj/item/radio/headset/syndicate/alt,
-/obj/item/toy/figure/cargotech,
-/obj/item/clothing/suit/hooded/wintercoat/cargo,
-/obj/item/stack/sheet/cardboard/fifty,
-/obj/item/hand_labeler,
-/obj/item/hand_labeler_refill,
-/obj/item/clothing/under/syndicate/donk,
-/obj/item/clothing/suit/hazardvest/donk,
-/obj/item/stack/wrapping_paper,
-/obj/item/stack/packageWrap,
-/obj/structure/closet/wall{
- dir = 4;
- icon_door = "orange_wall";
- name = "employee closet";
- pixel_x = -28
- },
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/engineering)
-"Tj" = (
-/obj/effect/turf_decal/siding/red,
-/obj/machinery/power/apc/auto_name/directional/south,
-/obj/structure/cable{
- icon_state = "0-4"
- },
-/obj/machinery/light_switch{
- dir = 1;
- pixel_x = 11;
- pixel_y = -16
- },
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/crew/canteen)
-"Ty" = (
-/obj/machinery/light/directional/east,
-/obj/structure/closet/crate/large,
-/obj/item/mecha_parts/mecha_equipment/mining_scanner,
-/mob/living/simple_animal/bot/secbot/grievous/toy,
-/obj/effect/decal/cleanable/blood/old,
-/obj/item/hand_labeler_refill,
-/obj/item/mecha_parts/mecha_equipment/hydraulic_clamp,
-/obj/item/mecha_parts/mecha_equipment/rcd,
-/obj/item/mecha_parts/mecha_equipment/cable_layer,
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/storage)
-"TB" = (
-/obj/effect/turf_decal/siding/blue{
- dir = 8
- },
-/obj/effect/turf_decal/siding/blue{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
-/turf/open/floor/plasteel/dark,
-/area/ship/hallway/central)
-"TJ" = (
-/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
-/obj/machinery/door/poddoor/shutters{
- dir = 4;
- id = "externalshutters"
- },
-/turf/open/floor/plating,
-/area/ship/storage)
-"TP" = (
-/obj/structure/rack,
-/obj/effect/turf_decal/corner/opaque/neutral/mono,
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/hallway/central)
-"TY" = (
-/obj/effect/turf_decal/corner/opaque/brown/bordercorner{
- dir = 1
- },
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/cargo)
-"Ud" = (
-/obj/effect/turf_decal/siding/blue,
-/turf/open/floor/plasteel/dark,
-/area/ship/hallway/central)
-"Uk" = (
-/turf/closed/wall/mineral/plastitanium,
-/area/ship/storage)
-"Uo" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/components/binary/volume_pump,
-/obj/structure/catwalk/over/plated_catwalk,
-/turf/open/floor/plating,
-/area/ship/engineering)
-"Uu" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
- dir = 4
- },
-/turf/open/floor/plasteel/patterned/cargo_one,
-/area/ship/storage)
-"Uw" = (
-/obj/structure/toilet{
- dir = 4
- },
-/obj/structure/curtain,
-/obj/machinery/airalarm/directional/south,
-/turf/open/floor/plasteel/patterned,
-/area/ship/crew/dorm)
-"UE" = (
-/turf/open/floor/plating,
-/area/ship/engineering)
-"UI" = (
-/obj/effect/turf_decal/corner/opaque/neutral/mono,
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/crew/canteen)
-"UO" = (
-/obj/machinery/atmospherics/pipe/layer_manifold,
-/turf/closed/wall/mineral/plastitanium/nodiagonal,
-/area/ship/engineering)
-"Va" = (
-/obj/structure/cable{
- icon_state = "1-8"
- },
-/obj/structure/cable{
- icon_state = "1-4"
- },
-/obj/machinery/atmospherics/pipe/simple/orange/visible{
- dir = 4
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
- dir = 4
- },
-/obj/structure/catwalk/over/plated_catwalk,
-/turf/open/floor/plating,
-/area/ship/engineering)
-"Vb" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/trimline/opaque/blue/filled/warning,
-/turf/open/floor/plasteel/dark,
-/area/ship/hallway/central)
-"Vi" = (
-/obj/structure/cable{
- icon_state = "2-4"
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
-/obj/effect/turf_decal/industrial/traffic{
- dir = 8
- },
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/dorm)
-"Vn" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/corner/opaque/brown/border{
- dir = 4
- },
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/cargo)
-"Vs" = (
-/obj/machinery/atmospherics/components/binary/volume_pump,
-/obj/structure/catwalk/over/plated_catwalk,
-/turf/open/floor/plating,
-/area/ship/engineering)
-"VG" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/catwalk/over/plated_catwalk/dark,
-/obj/effect/turf_decal/number/two{
- dir = 4
- },
-/turf/open/floor/plating,
-/area/ship/engineering)
-"VR" = (
-/turf/closed/wall/r_wall/syndicate/nodiagonal,
-/area/ship/engineering)
-"VS" = (
-/obj/structure/closet/crate,
-/obj/item/stack/sheet/metal/fifty,
-/obj/item/stack/sheet/glass/fifty,
-/obj/item/stack/sheet/plastitaniumglass{
- amount = 20
- },
-/obj/item/stack/sheet/mineral/plastitanium{
- amount = 20
- },
-/obj/item/stack/sheet/metal/fifty,
-/obj/item/stack/sheet/glass/fifty,
-/obj/effect/decal/cleanable/dirt,
-/obj/item/hand_labeler_refill,
-/obj/item/stack/sheet/mineral/wood/fifty,
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/storage)
-"Wh" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
-/obj/effect/turf_decal/trimline/opaque/orange/filled/warning,
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
- dir = 8
- },
-/turf/open/floor/plasteel/patterned,
-/area/ship/crew/dorm)
-"Wt" = (
-/obj/machinery/smartfridge/bloodbank/preloaded,
-/turf/closed/wall/mineral/plastitanium/nodiagonal,
-/area/ship/storage)
-"WB" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/siding/blue{
- dir = 4
- },
-/turf/open/floor/plasteel/dark,
-/area/ship/hallway/central)
-"WE" = (
-/turf/closed/wall/mineral/plastitanium/nodiagonal,
-/area/ship/hallway/central)
-"WQ" = (
-/obj/machinery/firealarm/directional/east,
-/obj/machinery/suit_storage_unit/inherit{
- req_access_txt = "41"
- },
-/obj/item/clothing/suit/space/syndicate,
-/obj/item/clothing/head/helmet/space/syndicate,
-/obj/item/clothing/mask/breath,
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/engineering)
-"WU" = (
-/obj/effect/turf_decal/siding/blue{
- dir = 8
- },
-/obj/effect/turf_decal/siding/blue{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/plasteel/dark,
-/area/ship/hallway/central)
-"Xf" = (
-/obj/machinery/power/terminal{
- dir = 8
- },
-/obj/machinery/power/terminal{
- dir = 4
- },
-/obj/structure/cable/yellow,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
-/obj/machinery/door/firedoor/border_only,
-/obj/machinery/door/firedoor/border_only{
- dir = 1
- },
-/obj/machinery/navbeacon/wayfinding{
- codes_txt = "patrol;next_patrol=lux_warehouse";
- location = "lux_engine"
- },
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/engineering)
-"Xw" = (
-/obj/machinery/washing_machine,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 8
- },
-/obj/machinery/light/small/directional/north,
-/turf/open/floor/plasteel/patterned,
-/area/ship/crew/dorm)
-"XM" = (
-/obj/structure/cable{
- icon_state = "1-4"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/portable_atmospherics/pump,
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/engineering)
-"XS" = (
-/obj/machinery/atmospherics/components/unary/shuttle/heater{
- dir = 1
- },
-/obj/structure/window/reinforced/spawner,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
-/obj/machinery/door/poddoor/shutters{
- id = "externalshutters"
- },
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/engineering)
-"Yd" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/manifold/orange/visible{
- dir = 1
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/catwalk/over/plated_catwalk/white,
-/obj/structure/cable{
- icon_state = "1-8"
- },
-/turf/open/floor/plating,
-/area/ship/engineering)
-"Yq" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
- dir = 4
- },
-/obj/effect/turf_decal/siding/blue{
- dir = 8
- },
-/obj/effect/turf_decal/siding/blue{
- dir = 4
- },
-/turf/open/floor/plasteel/dark,
-/area/ship/hallway/central)
-"YE" = (
-/obj/structure/window/plasma/reinforced,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 8
- },
-/obj/item/radio/intercom/directional/east{
- pixel_y = 37
- },
-/turf/open/floor/carpet/red_gold,
-/area/ship/hallway/central)
-"YI" = (
-/turf/closed/wall/mineral/plastitanium/nodiagonal,
-/area/ship/crew/canteen)
-"YK" = (
-/obj/machinery/airalarm/directional/west,
-/obj/item/clothing/head/collectable/chef,
-/obj/item/clothing/head/collectable/paper,
-/obj/item/clothing/head/collectable/tophat,
-/obj/item/clothing/head/collectable/captain,
-/obj/item/clothing/head/collectable/beret,
-/obj/item/clothing/head/collectable/welding,
-/obj/item/clothing/head/collectable/flatcap,
-/obj/item/clothing/head/collectable/pirate,
-/obj/item/clothing/head/collectable/kitty,
-/obj/item/clothing/head/collectable/rabbitears,
-/obj/item/clothing/head/collectable/wizard,
-/obj/item/clothing/head/collectable/hardhat,
-/obj/item/clothing/head/collectable/HoS,
-/obj/item/clothing/head/collectable/HoP,
-/obj/item/clothing/head/collectable/thunderdome,
-/obj/item/clothing/head/collectable/swat,
-/obj/item/clothing/head/collectable/slime,
-/obj/item/clothing/head/collectable/police,
-/obj/item/clothing/head/collectable/xenom,
-/obj/item/clothing/head/collectable/petehat,
-/obj/structure/closet/crate,
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/storage)
-"YL" = (
-/obj/structure/chair/plastic{
- dir = 4
- },
-/obj/effect/turf_decal/siding/red{
- dir = 8
- },
-/obj/effect/turf_decal/corner/opaque/neutral/border{
- dir = 4
- },
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/hallway/central)
-"YO" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
- dir = 5
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
- dir = 5
- },
-/turf/open/floor/plasteel/patterned/cargo_one,
-/area/ship/storage)
-"YZ" = (
-/obj/structure/closet/secure{
- icon_state = "eng_secure";
- name = "GEC Engineer's locker"
- },
-/obj/item/clothing/gloves/color/yellow,
-/obj/item/pipe_dispenser,
-/obj/item/clothing/glasses/meson/engine,
-/obj/item/clothing/suit/toggle/hazard,
-/obj/item/clothing/head/beret/eng/hazard,
-/obj/item/clothing/head/beret/eng,
-/obj/item/holosign_creator/engineering,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
- dir = 8
- },
-/obj/item/clothing/under/syndicate/gec,
-/obj/item/clothing/under/syndicate/gec,
-/obj/item/stack/tape/industrial/pro,
-/obj/machinery/power/apc/auto_name/directional/north,
-/obj/structure/cable{
- icon_state = "0-2"
- },
-/obj/machinery/light_switch{
- pixel_y = 23;
- pixel_x = 11
- },
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/engineering)
-"Zm" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/manifold/orange/visible{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
- dir = 9
- },
-/obj/structure/catwalk/over/plated_catwalk,
-/turf/open/floor/plating,
-/area/ship/engineering)
-"ZV" = (
-/obj/structure/cable{
- icon_state = "1-4"
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
- dir = 5
- },
-/obj/structure/catwalk/over/plated_catwalk,
-/obj/machinery/atmospherics/components/unary/portables_connector{
- dir = 8
- },
-/turf/open/floor/plating,
-/area/ship/engineering)
-
-(1,1,1) = {"
-Nr
-Nr
-Nr
-Nr
-Nr
-Nr
-Nr
-Nr
-Nr
-GD
-Nr
-Nr
-Nr
-Nr
-Nr
-Nr
-Nr
-Nr
-Nr
-Nr
-Nr
-Nr
-Nr
-Nr
-Nr
-Nr
-Nr
-"}
-(2,1,1) = {"
-Nr
-Nr
-Nr
-Nr
-Nr
-Nr
-hs
-HG
-JT
-JT
-JT
-it
-Ka
-Nr
-Nr
-Nr
-Nr
-Nr
-Nr
-Nr
-Nr
-Nr
-Nr
-Nr
-Nr
-Nr
-Nr
-"}
-(3,1,1) = {"
-Nr
-Nr
-Nr
-Nr
-Bw
-MT
-hs
-OY
-hX
-hX
-fB
-Ps
-Ka
-TJ
-TJ
-Uk
-Nr
-Nr
-Nr
-Nr
-pt
-VR
-pt
-Nr
-Nr
-Nr
-Nr
-"}
-(4,1,1) = {"
-Nr
-Nr
-Nr
-Bw
-hs
-Mz
-qh
-JV
-AL
-hi
-CC
-RM
-vb
-VS
-qV
-Wt
-TJ
-Uk
-Nr
-Uk
-VR
-qe
-VR
-pt
-Nr
-Nr
-Nr
-"}
-(5,1,1) = {"
-Nr
-Nr
-hs
-hs
-bB
-TY
-CC
-OR
-gf
-Je
-wP
-fy
-lQ
-QU
-kI
-iF
-vT
-Ka
-TJ
-Ka
-VR
-qR
-jK
-VR
-Nr
-Nr
-Nr
-"}
-(6,1,1) = {"
-Nr
-Nr
-RH
-sV
-yh
-BZ
-Vn
-Ee
-EG
-hu
-uX
-JU
-Ka
-JO
-iO
-Fj
-YO
-YK
-ks
-On
-vp
-rV
-LU
-VR
-pt
-Nr
-Nr
-"}
-(7,1,1) = {"
-Nr
-Nr
-hs
-hs
-hs
-ga
-ug
-Mi
-tV
-hs
-hs
-hs
-Ka
-Ka
-Ty
-Ko
-Uu
-lg
-hm
-rU
-Ro
-uo
-ZV
-mK
-vp
-pt
-Nr
-"}
-(8,1,1) = {"
-Nr
-Nr
-Nr
-WE
-WE
-La
-aB
-NJ
-Ud
-TP
-Rk
-PW
-cI
-Ka
-Ka
-KX
-LY
-cq
-pd
-ke
-vp
-dC
-GG
-Uo
-XS
-iR
-hd
-"}
-(9,1,1) = {"
-tU
-WE
-kZ
-WE
-QG
-NH
-wd
-WB
-tO
-Iv
-Iv
-Iv
-yf
-DG
-Ka
-Ka
-Ka
-Ka
-Ka
-Ka
-vp
-gj
-Zm
-Vs
-vz
-sh
-Nr
-"}
-(10,1,1) = {"
-WE
-WE
-Ej
-bi
-QQ
-xa
-dp
-bV
-Sn
-TP
-TP
-jv
-pL
-Mx
-vp
-fo
-SS
-EZ
-mm
-tx
-pR
-XM
-ql
-pJ
-vp
-vp
-vp
-"}
-(11,1,1) = {"
-Ij
-Ga
-dA
-jr
-MU
-rh
-TB
-WU
-yX
-gC
-gC
-Yq
-Jq
-Vb
-dL
-VG
-Ph
-DJ
-mE
-yQ
-Xf
-CM
-Va
-dM
-AE
-Mj
-qP
-"}
-(12,1,1) = {"
-WE
-WE
-jH
-fv
-YE
-xa
-dp
-dH
-Sn
-TP
-TP
-DE
-Jr
-PO
-vp
-WQ
-xt
-cB
-Ip
-ul
-pR
-lb
-Gr
-eD
-na
-UO
-Er
-"}
-(13,1,1) = {"
-vw
-WE
-kZ
-WE
-QT
-bp
-Oz
-vf
-lK
-ym
-cs
-eX
-CI
-DG
-EO
-EO
-EO
-EO
-EO
-EO
-vp
-CW
-lW
-lt
-vz
-sh
-Nr
-"}
-(14,1,1) = {"
-Nr
-Nr
-Nr
-WE
-WE
-YL
-YL
-qO
-xc
-tH
-IT
-HK
-zc
-EO
-EO
-BX
-if
-EO
-Kg
-Uw
-vp
-YZ
-Yd
-lt
-vz
-sh
-UE
-"}
-(15,1,1) = {"
-Nr
-Nr
-YI
-YI
-YI
-qf
-HZ
-Lr
-Dw
-rq
-YI
-EO
-EO
-EO
-nz
-Vi
-sI
-Ai
-FV
-Wh
-eL
-iZ
-bt
-CT
-vp
-pt
-Nr
-"}
-(16,1,1) = {"
-Nr
-Nr
-ow
-YI
-yd
-UI
-UI
-Fq
-UI
-Tj
-YI
-Ji
-NQ
-BM
-zW
-bN
-aK
-Pb
-Xw
-eF
-vp
-uK
-wT
-VR
-pt
-Nr
-Nr
-"}
-(17,1,1) = {"
-Nr
-Nr
-Bt
-YI
-wN
-UI
-rG
-Mg
-Dq
-CV
-Da
-cb
-aD
-Id
-rm
-xw
-KH
-EO
-mi
-EO
-VR
-EW
-Kk
-VR
-Nr
-Nr
-Nr
-"}
-(18,1,1) = {"
-Nr
-Nr
-Nr
-Bt
-YI
-uB
-kE
-sF
-UI
-KZ
-YI
-Rp
-DW
-Oq
-Lu
-EO
-mi
-Hx
-Nr
-Hx
-VR
-sk
-VR
-pt
-Nr
-Nr
-Nr
-"}
-(19,1,1) = {"
-Nr
-Nr
-Nr
-Nr
-Bt
-Op
-YI
-fn
-LV
-DA
-YI
-tF
-EO
-mi
-mi
-Hx
-Nr
-Nr
-Nr
-Nr
-pt
-VR
-pt
-Nr
-Nr
-Nr
-Nr
-"}
-(20,1,1) = {"
-Nr
-Nr
-Nr
-Nr
-Nr
-Nr
-YI
-YI
-Op
-YI
-YI
-EO
-EO
-Nr
-Nr
-Nr
-Nr
-Nr
-Nr
-Nr
-Nr
-Nr
-Nr
-Nr
-Nr
-Nr
-Nr
-"}
diff --git a/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm b/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm
index 7914b314998c..4b6183391ff1 100644
--- a/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm
+++ b/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm
@@ -37,19 +37,29 @@
/obj/structure/catwalk/over/plated_catwalk/dark,
/obj/machinery/light/directional/east,
/turf/open/floor/plating,
-/area/ship/hallway/central)
+/area/ship/hallway/aft)
"aj" = (
-/obj/machinery/atmospherics/pipe/manifold/purple/visible,
-/turf/open/floor/plating,
+/obj/machinery/atmospherics/pipe/simple/purple/visible,
+/obj/machinery/power/terminal{
+ dir = 8
+ },
+/obj/structure/cable/yellow{
+ icon_state = "0-4"
+ },
+/obj/effect/turf_decal/techfloor/orange{
+ dir = 8
+ },
+/turf/open/floor/plasteel/tech/grid,
/area/ship/engineering/atmospherics)
"ak" = (
-/obj/effect/turf_decal/corner/opaque/syndiered/three_quarters{
- dir = 8
+/obj/effect/turf_decal/corner/opaque/syndiered{
+ dir = 4
+ },
+/obj/effect/turf_decal/borderfloorblack{
+ dir = 10
},
-/obj/machinery/light/directional/north,
-/obj/machinery/vending/cola/random,
/turf/open/floor/plasteel/tech,
-/area/ship/hallway/central)
+/area/ship/hallway/starboard)
"al" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/structure/cable/yellow{
@@ -64,23 +74,18 @@
/turf/open/floor/plasteel/mono/dark,
/area/ship/medical)
"aA" = (
-/obj/effect/turf_decal/corner/transparent/bar/diagonal,
-/obj/structure/table/wood,
-/obj/item/reagent_containers/food/snacks/syndicake{
- pixel_y = 10;
- pixel_x = 3
+/obj/machinery/shieldgen{
+ anchored = 1;
+ req_access = list(150)
},
-/obj/item/reagent_containers/food/drinks/beer{
- pixel_x = -10;
- pixel_y = 5
+/obj/effect/turf_decal/corner/opaque/syndiered/bordercee{
+ dir = 8
},
-/obj/item/reagent_containers/food/drinks/beer{
- pixel_x = -3;
- pixel_y = 3
+/obj/effect/turf_decal/spline/fancy/opaque/black{
+ dir = 1
},
-/obj/machinery/firealarm/directional/south,
-/turf/open/floor/plasteel,
-/area/ship/crew/dorm)
+/turf/open/floor/mineral/plastitanium,
+/area/ship/bridge)
"aD" = (
/obj/structure/sign/poster/contraband/m90{
icon_state = "poster-m90";
@@ -92,14 +97,34 @@
/obj/effect/turf_decal/spline/fancy/opaque/syndiered{
dir = 9
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/structure/cable/yellow{
- icon_state = "1-2"
+/obj/structure/closet/secure_closet{
+ anchored = 1;
+ icon_state = "syndicate";
+ name = "lieutenant locker";
+ req_access = list(3,150)
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 1
+/obj/item/clothing/under/syndicate/ngr/officer,
+/obj/item/clothing/suit/armor/vest/capcarapace/ngr_captain,
+/obj/item/clothing/head/ngrcap,
+/obj/item/clothing/shoes/combat,
+/obj/item/megaphone/sec{
+ name = "syndicate megaphone"
},
-/turf/open/floor/mineral/plastitanium/red,
+/obj/item/gun/ballistic/automatic/pistol/no_mag,
+/obj/item/clothing/head/HoS/beret/syndicate,
+/obj/item/radio/headset/syndicate/alt/leader,
+/obj/item/clothing/gloves/krav_maga/combatglovesplus,
+/obj/item/ammo_box/magazine/m10mm/ap,
+/obj/item/ammo_box/magazine/m10mm/ap,
+/obj/item/clothing/suit/armor/hos/trenchcoat,
+/obj/machinery/button/door{
+ pixel_x = 9;
+ pixel_y = 25;
+ id = "twinkle_armory";
+ name = "Armory Access";
+ req_access = list(3,150)
+ },
+/turf/open/floor/mineral/plastitanium,
/area/ship/security)
"aE" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
@@ -110,31 +135,44 @@
/turf/open/floor/plating,
/area/ship/engineering/atmospherics)
"aG" = (
-/obj/machinery/light/directional/east,
-/obj/structure/reagent_dispensers/fueltank,
-/turf/open/floor/plating,
-/area/ship/engineering/atmospherics)
+/obj/structure/closet/secure_closet/wall{
+ dir = 8;
+ pixel_x = 28
+ },
+/obj/item/kitchen/knife,
+/obj/item/cutting_board,
+/obj/item/clothing/under/suit/waiter/syndicate,
+/obj/item/clothing/suit/hazardvest/donk,
+/obj/item/clothing/under/syndicate/donk,
+/obj/item/clothing/shoes/sneakers/black,
+/obj/item/radio/headset/syndicate{
+ keyslot = null
+ },
+/obj/item/reagent_containers/food/drinks/shaker,
+/turf/open/floor/carpet/red,
+/area/ship/crew/canteen)
"aX" = (
-/obj/effect/turf_decal/corner/opaque/syndiered/full,
-/obj/effect/turf_decal/syndicateemblem/middle/middle{
+/obj/effect/turf_decal/syndicateemblem/middle/right{
dir = 8
},
/obj/structure/cable/yellow{
icon_state = "1-2"
},
-/obj/machinery/holopad/emergency/command,
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/mineral/plastitanium,
+/obj/effect/turf_decal/syndicateemblem/bottom/middle,
+/turf/open/floor/mineral/plastitanium/red,
/area/ship/bridge)
"bd" = (
-/obj/effect/turf_decal/corner/opaque/syndiered/three_quarters{
- dir = 8
+/obj/effect/turf_decal/syndicateemblem/bottom/middle,
+/obj/effect/turf_decal/syndicateemblem/middle/right{
+ dir = 1
},
-/obj/effect/turf_decal/syndicateemblem/bottom/right{
+/obj/effect/turf_decal/syndicateemblem/middle/left{
+ dir = 4
+ },
+/obj/effect/turf_decal/spline/fancy/opaque/black{
dir = 8
},
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/mineral/plastitanium,
+/turf/open/floor/mineral/plastitanium/red,
/area/ship/bridge)
"bf" = (
/obj/machinery/atmospherics/pipe/manifold/orange/visible{
@@ -184,17 +222,17 @@
},
/turf/open/floor/plating,
/area/ship/engineering/atmospherics)
-"bv" = (
-/obj/structure/bed,
-/obj/structure/curtain/cloth/fancy{
- name = "blood-red curtains"
- },
-/obj/item/bedsheet/black,
-/obj/machinery/light_switch{
- pixel_x = 8;
- pixel_y = 23
+"br" = (
+/obj/effect/turf_decal/syndicateemblem/middle/middle,
+/obj/effect/turf_decal/spline/fancy/opaque/black{
+ dir = 8
},
-/turf/open/floor/carpet/nanoweave/red,
+/turf/open/floor/mineral/plastitanium/red,
+/area/ship/bridge)
+"bv" = (
+/obj/structure/dresser,
+/obj/effect/turf_decal/corner/transparent/bar/diagonal,
+/turf/open/floor/plasteel,
/area/ship/crew/dorm)
"bH" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
@@ -218,13 +256,9 @@
/turf/open/floor/plasteel/tech/grid,
/area/ship/bridge)
"bL" = (
-/obj/machinery/light_switch{
- dir = 8;
- pixel_x = 20;
- pixel_y = 11
- },
-/turf/template_noop,
-/area/template_noop)
+/obj/structure/table/reinforced,
+/turf/open/floor/mineral/plastitanium,
+/area/ship/bridge)
"bM" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 8
@@ -246,40 +280,28 @@
/turf/open/floor/plasteel/dark,
/area/ship/medical)
"bQ" = (
-/obj/effect/turf_decal/corner/opaque/orange{
- dir = 10
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 5
+/obj/effect/turf_decal/corner/opaque/syndiered/bordercorner,
+/obj/machinery/light/directional/north,
+/obj/machinery/turretid{
+ pixel_y = 32;
+ req_access = null;
+ req_access_txt = "150"
},
-/obj/structure/closet/secure_closet/miner{
- req_access = list(150,10);
- populate = 0
+/obj/effect/turf_decal/spline/fancy/opaque/black/corner,
+/obj/effect/turf_decal/corner/opaque/syndiered/bordercorner{
+ dir = 4
},
-/obj/item/clothing/under/syndicate/gorlex,
-/obj/item/clothing/suit/space/syndicate/black/orange,
-/obj/item/clothing/head/helmet/space/syndicate/black/orange,
-/obj/item/gun/energy/kinetic_accelerator,
-/obj/item/flashlight/seclite,
-/obj/item/storage/belt/mining/alt,
-/obj/item/stack/sheet/mineral/sandbags,
-/obj/item/storage/bag/ore,
-/obj/item/shovel,
-/turf/open/floor/plasteel/dark,
-/area/ship/engineering)
+/turf/open/floor/mineral/plastitanium,
+/area/ship/bridge)
"bR" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 9
- },
-/obj/structure/catwalk/over/plated_catwalk/dark,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 9
- },
-/obj/structure/cable/yellow{
- icon_state = "1-8"
+/obj/effect/turf_decal/corner/opaque/syndiered/three_quarters,
+/obj/machinery/light/directional/south,
+/obj/machinery/vending/snack/random,
+/obj/effect/turf_decal/borderfloorblack{
+ dir = 1
},
-/turf/open/floor/plating,
-/area/ship/hallway/central)
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/port)
"bU" = (
/obj/structure/cable/yellow{
icon_state = "2-8"
@@ -287,22 +309,15 @@
/turf/open/floor/engine,
/area/ship/engineering/engine)
"bV" = (
-/obj/effect/turf_decal/corner/opaque/orange/three_quarters{
- dir = 1
- },
-/obj/item/clothing/under/syndicate/gec,
-/obj/item/clothing/shoes/magboots/syndie,
-/obj/item/clothing/head/helmet/space/syndicate/black/engie,
-/obj/item/clothing/suit/space/syndicate/black/engie,
-/obj/structure/closet/secure_closet/engineering_personal{
- req_access = list(150,10)
- },
-/obj/item/pipe_dispenser,
-/obj/structure/sign/poster/contraband/gec{
- pixel_y = -32
+/obj/machinery/light/directional/south,
+/obj/machinery/airalarm/directional/south,
+/obj/structure/bed,
+/obj/structure/curtain/cloth/fancy{
+ name = "blood-red curtains"
},
-/turf/open/floor/plasteel/dark,
-/area/ship/engineering)
+/obj/item/bedsheet/black,
+/turf/open/floor/carpet/nanoweave/red,
+/area/ship/crew/dorm)
"bY" = (
/obj/effect/turf_decal/trimline/opaque/syndiered/warning{
dir = 1
@@ -311,21 +326,10 @@
/turf/open/floor/plasteel/dark,
/area/ship/engineering/atmospherics)
"cd" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 8
- },
-/obj/structure/cable/yellow{
- icon_state = "4-8"
- },
-/obj/structure/catwalk/over/plated_catwalk/dark,
-/obj/machinery/camera/autoname{
- dir = 10
- },
-/turf/open/floor/plating,
-/area/ship/hallway/central)
+/obj/machinery/light/directional/east,
+/obj/effect/turf_decal/steeldecal/steel_decals3,
+/turf/open/floor/mineral/plastitanium/red,
+/area/ship/security)
"ch" = (
/obj/machinery/atmospherics/pipe/simple/purple/visible,
/turf/closed/wall/r_wall/syndicate/nodiagonal{
@@ -333,21 +337,47 @@
},
/area/ship/engineering/communications)
"cj" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/turf_decal/corner/opaque/syndiered/border{
- dir = 4
+/obj/structure/closet,
+/obj/machinery/light/small/directional/east,
+/obj/item/clothing/mask/gas/syndicate/voicechanger,
+/obj/item/clothing/mask/gas/syndicate/voicechanger,
+/obj/item/clothing/mask/gas/syndicate/voicechanger,
+/obj/item/flashlight/seclite,
+/obj/item/flashlight/seclite,
+/obj/item/flashlight/seclite,
+/obj/item/radio/headset/syndicate{
+ keyslot = null
},
-/obj/effect/turf_decal/corner/opaque/syndiered{
- dir = 8
+/obj/item/radio/headset/syndicate{
+ keyslot = null
},
-/obj/effect/turf_decal/spline/fancy/opaque/black{
+/obj/item/radio/headset/syndicate{
+ keyslot = null
+ },
+/obj/item/radio/headset/syndicate{
+ keyslot = null
+ },
+/obj/item/radio/headset/syndicate{
+ keyslot = null
+ },
+/obj/item/radio/headset/syndicate{
+ keyslot = null
+ },
+/obj/item/radio,
+/obj/item/radio,
+/obj/item/radio,
+/obj/item/radio,
+/obj/item/radio,
+/obj/item/radio,
+/obj/effect/turf_decal/techfloor{
dir = 4
},
-/turf/open/floor/mineral/plastitanium,
-/area/ship/bridge)
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/crew/cryo)
"ck" = (
/obj/machinery/chem_heater,
/obj/effect/turf_decal/corner/opaque/orange/full,
+/obj/effect/turf_decal/steeldecal/steel_decals_central1,
/turf/open/floor/plasteel/dark,
/area/ship/medical)
"cp" = (
@@ -368,7 +398,7 @@
},
/obj/structure/catwalk/over/plated_catwalk/dark,
/turf/open/floor/plating,
-/area/ship/hallway/central)
+/area/ship/hallway/aft)
"cw" = (
/obj/effect/turf_decal/siding/thinplating/dark{
dir = 1
@@ -383,17 +413,36 @@
/turf/open/floor/plasteel/dark,
/area/ship/engineering/atmospherics)
"cC" = (
-/obj/machinery/vending/coffee,
/obj/effect/turf_decal/corner/opaque/syndiered{
dir = 10
},
+/obj/item/canvas/twentythreeXtwentythree{
+ name = "Battleplan Board";
+ desc = "Remember, no plan survives the battle.";
+ pixel_y = 32
+ },
+/obj/structure/table,
+/obj/machinery/fax{
+ pixel_y = 5
+ },
/turf/open/floor/plasteel/tech,
/area/ship/crew/office)
"cD" = (
-/obj/machinery/holopad/emergency/bar,
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel,
-/area/ship/crew/canteen)
+/obj/structure/cable/yellow{
+ icon_state = "6-8"
+ },
+/obj/effect/turf_decal/spline/fancy/opaque/syndiered{
+ dir = 9
+ },
+/turf/open/floor/mineral/plastitanium/red,
+/area/ship/security/armory)
+"cI" = (
+/obj/effect/turf_decal/steeldecal/steel_decals10,
+/obj/effect/turf_decal/steeldecal/steel_decals10{
+ dir = 4
+ },
+/turf/open/floor/mineral/plastitanium,
+/area/ship/bridge)
"cJ" = (
/obj/effect/turf_decal/siding/thinplating/dark{
dir = 1
@@ -411,20 +460,35 @@
/turf/open/floor/plasteel/dark,
/area/ship/engineering/atmospherics)
"cL" = (
-/obj/machinery/atmospherics/pipe/simple/cyan/visible{
- dir = 6
+/obj/machinery/atmospherics/pipe/simple/purple/visible{
+ dir = 9
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/structure/cable/yellow{
icon_state = "1-2"
},
-/obj/structure/cable/yellow{
- icon_state = "1-8"
- },
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/turf/open/floor/plating,
+/obj/effect/turf_decal/corner_techfloor_grid/full{
+ dir = 8
+ },
+/obj/effect/turf_decal/techfloor/orange/corner{
+ dir = 1
+ },
+/turf/open/floor/pod/dark,
/area/ship/engineering/atmospherics)
+"cT" = (
+/obj/effect/turf_decal/corner/opaque/syndiered{
+ dir = 10
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/power/apc/auto_name/directional/south,
+/obj/structure/cable/yellow,
+/obj/effect/turf_decal/borderfloorblack{
+ dir = 1
+ },
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/port)
"cW" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 8
@@ -432,34 +496,43 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 8
},
-/obj/machinery/light/directional/south,
-/obj/structure/cable/yellow{
- icon_state = "4-8"
+/obj/effect/turf_decal/trimline/opaque/orange/filled/warning,
+/obj/effect/turf_decal/trimline/opaque/orange/filled/warning{
+ dir = 1
},
-/obj/structure/catwalk/over/plated_catwalk/dark,
-/turf/open/floor/plating,
-/area/ship/hallway/central)
-"cX" = (
-/obj/structure/cable/yellow{
- icon_state = "4-8"
+/obj/machinery/door/airlock/engineering{
+ req_access = list(150,10);
+ dir = 4;
+ name = "Engineering Access"
},
-/obj/effect/turf_decal/spline/fancy/opaque/syndiered{
- dir = 5
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 8
+ },
+/turf/open/floor/engine,
+/area/ship/engineering/engine)
+"cX" = (
+/obj/machinery/light/directional/north,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 6
},
+/obj/structure/catwalk/over/plated_catwalk/dark,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 4
+ dir = 6
},
-/turf/open/floor/mineral/plastitanium/red,
-/area/ship/security)
+/obj/structure/cable/yellow{
+ icon_state = "2-4"
+ },
+/turf/open/floor/plating,
+/area/ship/hallway/port)
"da" = (
-/obj/effect/turf_decal/spline/fancy/opaque/syndiered{
- dir = 10
+/obj/machinery/suit_storage_unit/syndicate,
+/obj/structure/window/reinforced{
+ dir = 1
},
-/turf/open/floor/mineral/plastitanium/red,
+/turf/open/floor/mineral/plastitanium,
/area/ship/security)
"db" = (
/obj/machinery/door/airlock/atmos/glass{
- name = "Atmospherics";
req_one_access_txt = "150";
req_access = list(150,10);
dir = 4
@@ -484,49 +557,30 @@
/turf/open/floor/pod/dark,
/area/ship/cargo)
"dk" = (
-/obj/effect/turf_decal/corner/opaque/syndiered/full,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/structure/cable/yellow{
- icon_state = "1-2"
+/obj/effect/turf_decal/corner/opaque/syndiered{
+ dir = 5
},
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/mineral/plastitanium,
-/area/ship/bridge)
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/starboard)
"dl" = (
-/obj/machinery/light/directional/north,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 6
+ dir = 9
},
/obj/structure/catwalk/over/plated_catwalk/dark,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 6
+ dir = 9
},
/obj/structure/cable/yellow{
- icon_state = "2-4"
+ icon_state = "1-8"
},
/turf/open/floor/plating,
-/area/ship/hallway/central)
+/area/ship/hallway/port)
"dm" = (
-/obj/structure/closet/secure_closet{
- anchored = 1;
- icon_state = "hos";
- name = "Captain's Locker";
- req_access = list(151)
- },
-/obj/item/areaeditor/shuttle,
-/obj/item/clothing/under/syndicate/officer,
-/obj/item/clothing/suit/armor/vest/capcarapace/syndicate,
-/obj/item/clothing/head/HoS/syndicate,
-/obj/item/codespeak_manual/unlimited,
-/obj/item/storage/belt/sabre,
-/obj/item/shield/riot/tele,
-/obj/item/storage/lockbox/medal,
-/obj/item/ammo_box/a357,
-/obj/item/ammo_box/a357,
+/obj/structure/rack,
/obj/machinery/light/directional/north,
-/obj/item/card/id/syndicate_command/captain_id,
-/turf/open/floor/carpet/nanoweave/red,
-/area/ship/crew/dorm/dormtwo)
+/obj/item/gun/energy/ionrifle/carbine,
+/turf/open/floor/mineral/plastitanium,
+/area/ship/security/armory)
"do" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 8
@@ -540,29 +594,28 @@
/turf/open/floor/plasteel/dark,
/area/ship/bridge)
"dp" = (
-/obj/machinery/door/airlock/public/glass,
-/obj/effect/turf_decal/corner/opaque/syndiered/border{
- dir = 1
+/obj/effect/turf_decal/industrial/warning,
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
},
-/obj/machinery/door/firedoor/border_only,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/door/firedoor/border_only{
- dir = 1
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 10
},
-/turf/open/floor/plasteel/tech,
-/area/ship/crew/canteen)
+/turf/open/floor/pod/dark,
+/area/ship/cargo)
"dq" = (
/obj/structure/table/reinforced,
-/obj/machinery/door/window/westright,
-/obj/machinery/door/window/eastright{
- req_access = list(3,150)
+/obj/machinery/computer/secure_data/laptop{
+ dir = 8;
+ pixel_y = 6;
+ pixel_x = 1
},
-/obj/machinery/recharger,
+/obj/machinery/door/window/brigdoor/eastright,
/obj/machinery/door/firedoor/border_only{
- dir = 8
+ dir = 4
},
/obj/machinery/door/firedoor/border_only{
- dir = 4
+ dir = 8
},
/turf/open/floor/mineral/plastitanium,
/area/ship/security)
@@ -572,40 +625,38 @@
},
/area/ship/medical)
"dD" = (
-/obj/effect/turf_decal/corner/opaque/syndiered/border,
-/obj/effect/turf_decal/corner/opaque/syndiered/border{
- dir = 1
- },
-/obj/machinery/nuclearbomb/beer{
- desc = "It's an old, decommissioned bomb, previously used by Nuclear Operatives during the Corporate War. It seems to have a tap drilled in.";
- name = "\improper nuclear fission explosive"
- },
-/turf/open/floor/plasteel,
+/obj/machinery/vending/boozeomat/syndicate_access,
+/turf/open/floor/carpet/red,
/area/ship/crew/canteen)
"dE" = (
-/obj/structure/cable/yellow{
- icon_state = "4-8"
- },
-/obj/machinery/holopad/emergency/medical,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+/obj/effect/turf_decal/siding/thinplating/dark{
dir = 8
},
-/obj/effect/turf_decal/trimline/opaque/syndiered/filled/line,
/turf/open/floor/plasteel/dark,
-/area/ship/medical)
+/area/ship/security)
"dH" = (
-/obj/structure/table/reinforced,
-/obj/machinery/chem_dispenser/drinks/beer,
/obj/machinery/light/directional/north,
-/turf/open/floor/wood,
-/area/ship/crew/canteen)
-"dL" = (
-/obj/effect/turf_decal/corner/opaque/syndiered{
- dir = 9
+/obj/structure/rack,
+/obj/item/clothing/shoes/sneakers/orange,
+/obj/item/clothing/shoes/sneakers/orange,
+/obj/item/clothing/shoes/sneakers/orange,
+/obj/item/clothing/shoes/sneakers/orange,
+/obj/item/clothing/shoes/sneakers/orange,
+/obj/item/clothing/under/rank/prisoner/skirt,
+/obj/item/clothing/under/rank/prisoner/skirt,
+/obj/item/clothing/under/rank/prisoner,
+/obj/item/clothing/under/rank/prisoner,
+/obj/effect/turf_decal/siding/thinplating/dark{
+ dir = 5
},
-/obj/machinery/light/directional/west,
/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/mineral/plastitanium,
+/turf/open/floor/plasteel/dark,
+/area/ship/security)
+"dL" = (
+/obj/effect/turf_decal/spline/fancy/opaque/black{
+ dir = 8
+ },
+/turf/open/floor/mineral/plastitanium/red,
/area/ship/bridge)
"dO" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
@@ -616,12 +667,11 @@
/obj/structure/catwalk/over/plated_catwalk/dark,
/obj/machinery/firealarm/directional/east,
/turf/open/floor/plating,
-/area/ship/hallway/central)
+/area/ship/hallway/aft)
"dP" = (
/obj/structure/sign/poster/contraband/tools{
pixel_y = 32
},
-/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/modular_computer/console/preset/engineering,
/turf/open/floor/plasteel/tech,
/area/ship/engineering/atmospherics)
@@ -631,11 +681,8 @@
/area/ship/engineering/atmospherics)
"dU" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
-/obj/structure/cable/yellow{
- icon_state = "1-2"
- },
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel,
+/obj/machinery/light/directional/east,
+/turf/open/floor/wood,
/area/ship/crew/canteen)
"dV" = (
/obj/machinery/stasis,
@@ -651,10 +698,6 @@
/turf/open/floor/plasteel/mono/dark,
/area/ship/medical)
"ea" = (
-/obj/machinery/door/firedoor/border_only,
-/obj/machinery/door/firedoor/border_only{
- dir = 1
- },
/obj/effect/turf_decal/industrial/warning{
dir = 1
},
@@ -664,22 +707,36 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
+/obj/machinery/door/firedoor,
/turf/open/floor/plasteel/mono/dark,
-/area/ship/hallway/central)
+/area/ship/hallway/aft)
+"ec" = (
+/obj/structure/closet/crate/bin,
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/starboard)
"eg" = (
-/obj/machinery/atmospherics/pipe/simple/purple/visible,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 6
+ },
/obj/structure/cable/yellow{
- icon_state = "1-2"
+ icon_state = "2-4"
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/button/door{
- dir = 4;
- pixel_x = -25;
- name = "Engine Shutters";
- id = "twinkle_engines"
+/obj/machinery/power/terminal{
+ dir = 8
},
-/turf/open/floor/plating,
+/obj/structure/cable/yellow{
+ icon_state = "0-4"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/simple/purple/visible{
+ dir = 1
+ },
+/obj/effect/turf_decal/techfloor/orange{
+ dir = 8
+ },
+/turf/open/floor/plasteel/tech/grid,
/area/ship/engineering/atmospherics)
"en" = (
/obj/effect/turf_decal/corner/opaque/syndiered{
@@ -696,24 +753,24 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
-/obj/machinery/door/airlock/hatch{
- name = "Bridge";
- req_access = list(150)
- },
+/obj/machinery/door/airlock/grunge,
/turf/open/floor/mineral/plastitanium,
/area/ship/bridge)
"ep" = (
-/obj/effect/turf_decal/industrial/warning{
- dir = 10
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
},
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/rack,
-/obj/item/clothing/head/helmet/space/syndicate,
-/obj/item/clothing/head/helmet/space/syndicate,
-/obj/item/clothing/suit/space/syndicate,
-/obj/item/clothing/suit/space/syndicate,
-/turf/open/floor/pod/dark,
-/area/ship/cargo)
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/thinplating/dark{
+ dir = 1
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/security)
"er" = (
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/engine,
@@ -742,24 +799,45 @@
},
/area/ship/medical)
"eF" = (
-/obj/effect/turf_decal/corner/opaque/syndiered{
- dir = 10
+/obj/structure/table/wood,
+/obj/item/storage/fancy/cigarettes/cigars/havana{
+ pixel_x = 4;
+ pixel_y = 2
},
-/obj/machinery/vending/cigarette/syndicate,
-/turf/open/floor/plasteel/tech,
-/area/ship/hallway/central)
-"eL" = (
-/obj/structure/chair/stool{
- dir = 8
+/obj/item/lighter{
+ pixel_x = -10;
+ pixel_y = -2
},
-/obj/effect/turf_decal/corner/opaque/syndiered{
- dir = 5
+/obj/item/clothing/mask/cigarette/cigar{
+ pixel_x = -4
+ },
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/structure/cable/yellow{
+ icon_state = "0-2"
+ },
+/obj/item/toy/plush/moth/punished{
+ pixel_x = 7;
+ pixel_y = 11
+ },
+/turf/open/floor/carpet/nanoweave/red,
+/area/ship/crew/dorm/dormtwo)
+"eL" = (
+/obj/structure/chair/stool{
+ dir = 8
+ },
+/obj/effect/turf_decal/corner/opaque/syndiered{
+ dir = 5
},
/turf/open/floor/plasteel/dark,
/area/ship/bridge)
+"eN" = (
+/obj/effect/turf_decal/spline/fancy/opaque/syndiered,
+/obj/structure/closet/crate/bin,
+/turf/open/floor/plasteel/dark,
+/area/ship/security)
"eQ" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plating,
+/obj/effect/spawner/lootdrop/maintenance,
+/turf/open/floor/pod/dark,
/area/ship/engineering/atmospherics)
"eR" = (
/obj/structure/grille,
@@ -771,27 +849,31 @@
/obj/effect/turf_decal/trimline/opaque/orange/line{
dir = 1
},
-/obj/structure/extinguisher_cabinet/directional/south,
+/obj/machinery/vending/medical/syndicate_access,
/turf/open/floor/plasteel/dark,
/area/ship/medical)
"fm" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 10
+ dir = 5
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 10
+ dir = 5
},
/obj/structure/cable/yellow{
- icon_state = "2-8"
+ icon_state = "1-4"
},
/obj/structure/catwalk/over/plated_catwalk/dark,
+/obj/machinery/light/directional/south,
/turf/open/floor/plating,
-/area/ship/hallway/central)
+/area/ship/hallway/starboard)
"fn" = (
-/obj/machinery/cryopod{
+/obj/machinery/cryopod/syndicate{
dir = 8
},
-/obj/machinery/light/directional/north,
+/obj/machinery/computer/cryopod/directional/south,
+/obj/effect/turf_decal/techfloor{
+ dir = 6
+ },
/turf/open/floor/plasteel/tech/grid,
/area/ship/crew/cryo)
"fz" = (
@@ -819,37 +901,55 @@
/turf/open/floor/engine,
/area/ship/engineering/engine)
"fJ" = (
-/obj/effect/turf_decal/spline/fancy/opaque/black{
- dir = 1
+/obj/structure/closet/secure_closet/security{
+ populate = 0;
+ icon_state = "syndicate";
+ name = "operative's locker"
},
-/obj/structure/reagent_dispensers/water_cooler,
-/obj/effect/turf_decal/spline/fancy/opaque/syndiered{
- dir = 5
+/obj/item/clothing/suit/armor/vest/syndie,
+/obj/item/clothing/head/helmet/operator,
+/obj/item/gun/ballistic/automatic/pistol/no_mag,
+/obj/item/ammo_box/magazine/m10mm,
+/obj/item/ammo_box/magazine/m10mm,
+/obj/item/storage/belt/security/webbing{
+ name = "syndicate webbing";
+ desc = "Unique and versatile chest rig, can hold syndicate gear."
},
-/obj/machinery/light_switch{
- pixel_y = 22
+/obj/item/radio/headset/syndicate/alt{
+ keyslot = null
},
-/turf/open/floor/mineral/plastitanium/red,
+/obj/item/clothing/shoes/combat,
+/obj/item/clothing/gloves/color/black,
+/obj/machinery/light/directional/east,
+/obj/item/flashlight/seclite,
+/obj/item/kitchen/knife/combat,
+/turf/open/floor/mineral/plastitanium,
/area/ship/security)
"fK" = (
-/obj/structure/table,
-/obj/item/paper_bin{
- pixel_y = 3
- },
-/obj/item/pen{
- pixel_y = 3
- },
-/turf/open/floor/mineral/plastitanium,
+/obj/machinery/light/directional/south,
+/turf/open/floor/mineral/plastitanium/red,
/area/ship/security)
"fN" = (
-/obj/structure/window/reinforced/spawner,
-/obj/effect/turf_decal/corner/opaque/white/diagonal,
-/obj/structure/window/reinforced/spawner{
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/opaque/orange/filled/warning{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/opaque/orange/filled/warning,
+/obj/machinery/door/airlock/engineering{
+ req_access = list(150,10);
+ dir = 4;
+ name = "Engineering Access"
+ },
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
},
-/obj/machinery/vending/dinnerware,
-/turf/open/floor/plasteel,
-/area/ship/crew/canteen)
+/turf/open/floor/engine,
+/area/ship/engineering/engine)
"fO" = (
/obj/structure/railing,
/obj/structure/railing{
@@ -861,13 +961,11 @@
/turf/open/floor/plating,
/area/ship/external/dark)
"fQ" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
-/obj/structure/cable/yellow{
- icon_state = "1-2"
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 5
},
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/pod/dark,
-/area/ship/cargo)
+/turf/open/floor/wood,
+/area/ship/crew/canteen)
"fT" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 6
@@ -883,7 +981,6 @@
/area/ship/medical)
"fV" = (
/obj/machinery/door/airlock/atmos/glass{
- name = "Atmospherics";
req_one_access_txt = "150";
dir = 4
},
@@ -899,13 +996,20 @@
/turf/open/floor/plasteel/dark,
/area/ship/engineering/atmospherics)
"fX" = (
-/obj/machinery/suit_storage_unit/syndicate,
-/obj/effect/turf_decal/box/white/corners{
- dir = 4
+/obj/structure/bed/double,
+/obj/item/bedsheet/double/black,
+/obj/item/paper{
+ name = "concealed note";
+ icon_state = "scrap";
+ color = "#505050";
+ desc = "This note is crumpled and torn.";
+ default_raw_text = "ever since the war ended some eighteen years ago, the syndicate has been at odds with ourselves. our branches' ideals and personal goals are dividing the syndicate more and more. deep . this melting pot of ideologies, at its worst, is going to tear your leadership apart. you're going to need to keep tensions low on this two decade old warship so it doesn't all go to shit. Dear Admiral, Congratulations on being chosen to lead one of our top-of-the-line Twinkleshine Battle Cruisers. Your leadership and efforts have been hereby noted, and your name will share space with the titles of many other great Syndicate officers. check under your bed";
+ desc = "This sheet of paper looks old and dusty.";
+ color = "#3f010d"
+ },
/turf/open/floor/carpet/nanoweave/red,
/area/ship/crew/dorm/dormtwo)
"Cl" = (
@@ -4642,18 +4876,35 @@
},
/turf/open/floor/circuit/red,
/area/ship/engineering/communications)
-"Cw" = (
-/obj/effect/turf_decal/industrial/warning{
- dir = 1
- },
-/obj/structure/cable{
+"Cq" = (
+/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/simple/orange/visible{
- dir = 4
- },
-/obj/machinery/camera/autoname{
- dir = 6
+/obj/effect/decal/cleanable/dirt/dust,
+/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/dark,
+/obj/structure/cable/yellow{
+ icon_state = "1-8"
+ },
+/turf/open/floor/plating,
+/area/ship/hallway/starboard)
+"Cw" = (
+/obj/effect/turf_decal/industrial/warning{
+ dir = 1
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/orange/visible{
+ dir = 4
+ },
+/obj/machinery/camera/autoname{
+ dir = 6
},
/turf/open/floor/engine,
/area/ship/engineering/engine)
@@ -4683,11 +4934,10 @@
/turf/open/floor/engine,
/area/ship/engineering/engine)
"CJ" = (
-/obj/effect/turf_decal/spline/fancy/opaque/syndiered{
- dir = 9
- },
-/turf/open/floor/mineral/plastitanium/red,
-/area/ship/security)
+/obj/machinery/light/small/directional/west,
+/obj/effect/turf_decal/steeldecal/steel_decals_central4,
+/turf/open/floor/plasteel/patterned/brushed,
+/area/ship/crew/dorm)
"CQ" = (
/obj/structure/grille,
/obj/structure/window/plasma/reinforced/plastitanium,
@@ -4707,8 +4957,7 @@
dir = 8
},
/obj/effect/turf_decal/corner/opaque/syndiered/full,
-/obj/machinery/door/airlock/hatch{
- name = "Briefing";
+/obj/machinery/door/airlock/grunge{
dir = 4
},
/turf/open/floor/plasteel/tech,
@@ -4733,14 +4982,12 @@
/area/ship/medical)
"CU" = (
/obj/machinery/light/directional/south,
-/obj/structure/chair{
- dir = 1
+/obj/item/chair{
+ pixel_x = -12;
+ pixel_y = -4
},
/obj/effect/turf_decal/techfloor,
-/obj/effect/turf_decal/corner/opaque/syndiered/half{
- dir = 1
- },
-/turf/open/floor/plasteel/tech/grid,
+/turf/open/floor/plating,
/area/ship/bridge)
"CV" = (
/obj/effect/turf_decal/industrial/warning{
@@ -4766,48 +5013,39 @@
/turf/open/floor/engine,
/area/ship/engineering/engine)
"De" = (
-/obj/structure/table,
-/obj/effect/turf_decal/corner/opaque/syndiered/full,
-/obj/item/storage/box/medipens{
- pixel_y = 7;
- pixel_x = -4
+/obj/effect/turf_decal/corner/opaque/orange{
+ dir = 10
},
-/obj/item/storage/firstaid/tactical{
- pixel_y = 4;
- pixel_x = 8
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 5
},
-/obj/item/clothing/glasses/hud/health/night,
+/obj/structure/closet/crate/bin,
/turf/open/floor/plasteel/dark,
-/area/ship/medical)
+/area/ship/engineering)
"Dh" = (
-/obj/machinery/smartfridge/bloodbank/preloaded{
- pixel_y = 32;
- density = 0
- },
/obj/effect/turf_decal/corner/opaque/syndiered/full,
-/obj/structure/closet/wall/white/med{
- name = "medical locker";
- dir = 8;
- pixel_x = 28
- },
-/obj/item/clothing/gloves/color/latex/nitrile/evil,
-/obj/item/clothing/gloves/color/latex/nitrile/evil,
-/obj/item/clothing/glasses/hud/health/night,
-/obj/item/clothing/glasses/hud/health/night,
-/obj/item/clothing/suit/longcoat/roboblack{
- name = "syndicate medic's black longcoat"
+/obj/structure/closet/secure_closet/medical3{
+ req_access = list(150, 5);
+ icon_state = "tac";
+ populate = 0
},
+/obj/machinery/light/directional/north,
+/obj/item/clothing/under/rank/medical/doctor/red,
/obj/item/clothing/suit/longcoat/roboblack{
name = "syndicate medic's black longcoat"
},
-/obj/item/clothing/under/rank/medical/doctor/red,
-/obj/item/clothing/under/rank/medical/doctor/red,
-/obj/item/clothing/under/syndicate/cybersun,
-/obj/item/clothing/under/syndicate/cybersun,
-/obj/item/storage/belt/medical/webbing,
-/obj/item/storage/belt/medical/webbing,
-/obj/item/storage/belt/medical,
+/obj/item/clothing/under/syndicate/medic/skirt,
+/obj/item/clothing/under/syndicate/medic,
+/obj/item/clothing/head/helmet/medical,
+/obj/item/clothing/suit/armor/vest/marine/trauma,
+/obj/item/antag_spawner/nuke_ops/borg_tele/medical/unlocked,
/obj/item/storage/belt/medical,
+/obj/item/storage/belt/medical/webbing,
+/obj/item/clothing/gloves/color/latex/nitrile/evil,
+/obj/item/clothing/shoes/sneakers/white,
+/obj/item/radio/headset/syndicate{
+ keyslot = null
+ },
/turf/open/floor/plasteel/dark,
/area/ship/medical)
"Dk" = (
@@ -4841,53 +5079,62 @@
dir = 8
},
/obj/machinery/door/airlock/atmos/glass{
- name = "Atmospherics";
req_one_access_txt = "150";
dir = 4
},
/turf/open/floor/plating,
/area/ship/engineering/atmospherics)
"Dp" = (
-/obj/machinery/door/airlock/hatch{
- name = "Lieutenant's Office";
- req_access = list(3,150)
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
},
-/turf/open/floor/mineral/plastitanium,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 8
+ },
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/structure/cable/yellow{
+ icon_state = "0-4"
+ },
+/obj/machinery/light_switch{
+ pixel_y = 22;
+ pixel_x = -12
+ },
+/obj/effect/turf_decal/siding/thinplating/dark{
+ dir = 1
+ },
+/turf/open/floor/plasteel/dark,
/area/ship/security)
"Dt" = (
/obj/machinery/air_sensor/atmos/air_tank,
/turf/open/floor/engine/air,
/area/ship/engineering/atmospherics)
"Dx" = (
-/obj/structure/chair{
- dir = 8
- },
/obj/effect/turf_decal/corner/opaque/syndiered{
dir = 6
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 1
},
+/obj/structure/chair{
+ dir = 1
+ },
/turf/open/floor/mineral/plastitanium,
/area/ship/crew/office)
+"DB" = (
+/obj/effect/turf_decal/steeldecal/steel_decals8,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/mineral/plastitanium/red,
+/area/ship/security)
"DF" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/cyan/visible,
/obj/structure/cable/yellow{
icon_state = "1-2"
},
-/obj/structure/sign/poster/official/moth/piping{
- desc = "This informational poster uses Safety Moth(TM) to tell atmospheric technicians correct types of piping to be used. Proper pipe placement prevents poor performance! It's signed by 'AspEv'.";
- pixel_x = 32
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/door/airlock/atmos/glass{
- name = "Atmospherics";
- req_one_access_txt = "150";
- req_access = list(150,10)
- },
-/turf/open/floor/plasteel/telecomms_floor,
-/area/ship/engineering/communications)
+/obj/effect/turf_decal/corner/transparent/bar/diagonal,
+/turf/open/floor/plasteel,
+/area/ship/crew/dorm)
"DK" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/machinery/atmospherics/pipe/simple/cyan/visible,
@@ -4923,26 +5170,30 @@
/turf/open/floor/engine,
/area/ship/engineering/engine)
"DW" = (
-/obj/structure/catwalk/over/plated_catwalk/dark,
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
- dir = 1
+/obj/effect/turf_decal/corner/opaque/syndiered{
+ dir = 10
},
/obj/structure/cable/yellow{
- icon_state = "2-4"
+ icon_state = "1-2"
},
-/turf/open/floor/plating,
-/area/ship/hallway/central)
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/effect/turf_decal/borderfloorblack{
+ dir = 1
+ },
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/port)
"Ed" = (
-/obj/effect/turf_decal/spline/fancy/opaque/syndiered{
- dir = 5
+/obj/structure/toilet{
+ dir = 4
},
-/obj/machinery/airalarm/directional/north,
-/obj/structure/extinguisher_cabinet/directional/east,
-/turf/open/floor/mineral/plastitanium/red,
-/area/ship/security)
+/obj/structure/sink{
+ dir = 8;
+ pixel_x = 12;
+ pixel_y = 12
+ },
+/turf/open/floor/plasteel/patterned/brushed,
+/area/ship/crew/dorm)
"Ee" = (
/obj/structure/sign/syndicate,
/turf/closed/wall/r_wall/syndicate/nodiagonal{
@@ -4950,10 +5201,12 @@
},
/area/ship/crew/office)
"Eh" = (
-/obj/structure/chair{
- dir = 4
+/obj/structure/cable/yellow{
+ icon_state = "1-5"
+ },
+/turf/closed/wall/r_wall/syndicate/nodiagonal{
+ rad_insulation = 0
},
-/turf/open/floor/mineral/plastitanium,
/area/ship/security)
"Ei" = (
/obj/effect/turf_decal/corner/opaque/syndiered{
@@ -4963,8 +5216,11 @@
dir = 4;
pixel_x = -28
},
+/obj/effect/turf_decal/borderfloorblack{
+ dir = 4
+ },
/turf/open/floor/plasteel/tech,
-/area/ship/hallway/central)
+/area/ship/hallway/aft)
"En" = (
/obj/effect/turf_decal/industrial/warning,
/turf/open/floor/engine,
@@ -4975,6 +5231,12 @@
},
/turf/open/floor/mineral/plastitanium/red,
/area/ship/security/armory)
+"Eq" = (
+/obj/structure/sign/directions/security,
+/turf/closed/wall/r_wall/syndicate/nodiagonal{
+ rad_insulation = 0
+ },
+/area/ship/crew/office)
"Et" = (
/obj/effect/turf_decal/industrial/warning{
dir = 1
@@ -4992,19 +5254,12 @@
/turf/open/floor/engine,
/area/ship/engineering/engine)
"Ey" = (
-/obj/structure/rack,
-/obj/item/storage/box/handcuffs{
- pixel_y = 9;
- pixel_x = -8
- },
-/obj/item/storage/box/flashes{
- pixel_x = 8;
- pixel_y = 7
+/obj/effect/turf_decal/spline/fancy/opaque/syndiered{
+ dir = 8
},
-/obj/item/storage/box/evidence{
- pixel_x = -2
+/turf/closed/wall/r_wall/syndicate/nodiagonal{
+ rad_insulation = 0
},
-/turf/open/floor/mineral/plastitanium,
/area/ship/security)
"ED" = (
/obj/effect/turf_decal/corner/opaque/orange{
@@ -5025,25 +5280,8 @@
/turf/open/floor/engine,
/area/ship/engineering/engine)
"EG" = (
-/obj/effect/turf_decal/spline/fancy/opaque/black/corner{
- dir = 1
- },
-/obj/machinery/button/flasher{
- pixel_x = 23;
- dir = 8;
- pixel_y = 6;
- id = "twinkle_flash1"
- },
-/obj/machinery/button/flasher{
- pixel_x = 23;
- dir = 8;
- pixel_y = -7;
- id = "twinkle_flash2"
- },
-/obj/effect/turf_decal/trimline/opaque/syndiered/warning{
- dir = 4
- },
-/turf/open/floor/mineral/plastitanium,
+/obj/effect/turf_decal/spline/fancy/opaque/syndiered,
+/turf/open/floor/plasteel/dark,
/area/ship/security)
"EH" = (
/obj/item/trash/chips,
@@ -5051,14 +5289,10 @@
/turf/open/floor/plating,
/area/ship/engineering/atmospherics)
"EJ" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/turf_decal/corner/opaque/syndiered{
- dir = 9
- },
-/obj/effect/turf_decal/corner/opaque/syndiered/border{
+/obj/effect/turf_decal/spline/fancy/opaque/black{
dir = 4
},
-/obj/effect/turf_decal/spline/fancy/opaque/black{
+/obj/effect/turf_decal/corner/opaque/syndiered/border{
dir = 4
},
/turf/open/floor/mineral/plastitanium,
@@ -5074,11 +5308,10 @@
/turf/open/floor/pod/dark,
/area/ship/cargo)
"EQ" = (
-/obj/effect/turf_decal/industrial/warning,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/structure/cable/yellow{
icon_state = "1-2"
},
+/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/pod/dark,
/area/ship/cargo)
"ER" = (
@@ -5086,12 +5319,6 @@
/turf/open/floor/engine/n2,
/area/ship/engineering/atmospherics)
"ET" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
- dir = 1
- },
-/obj/effect/turf_decal/spline/fancy/opaque/syndiered{
- dir = 2
- },
/turf/open/floor/mineral/plastitanium/red,
/area/ship/security)
"EU" = (
@@ -5100,32 +5327,38 @@
/turf/open/floor/engine,
/area/ship/engineering/engine)
"EX" = (
-/obj/effect/turf_decal/corner/opaque/syndiered{
- dir = 10
+/obj/effect/turf_decal/corner/opaque/syndiered/half{
+ dir = 8
},
-/obj/machinery/light_switch{
- dir = 8;
- pixel_x = 20;
- pixel_y = 0
+/obj/effect/turf_decal/steeldecal/steel_decals_central6{
+ dir = 4
},
-/turf/open/floor/plasteel/tech,
-/area/ship/hallway/central)
+/turf/open/floor/mineral/plastitanium,
+/area/ship/bridge)
"Fa" = (
-/obj/effect/turf_decal/corner/opaque/syndiered/border{
- dir = 8
- },
/obj/machinery/light/directional/west,
-/obj/effect/turf_decal/corner/opaque/syndiered/border{
+/obj/structure/cable/yellow{
+ icon_state = "1-6"
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
+/obj/structure/chair/stool/bar{
dir = 4
},
-/turf/open/floor/plasteel,
+/turf/open/floor/wood,
/area/ship/crew/canteen)
"Fc" = (
/obj/effect/turf_decal/techfloor,
/obj/effect/turf_decal/corner/opaque/syndiered/half{
dir = 1
},
-/obj/structure/rack,
+/obj/structure/fluff/broken_flooring{
+ icon_state = "plating";
+ dir = 4
+ },
+/obj/item/stack/ore/salvage/scrapplasma{
+ pixel_x = 3;
+ pixel_y = 2
+ },
/turf/open/floor/plasteel/tech/grid,
/area/ship/bridge)
"Fh" = (
@@ -5169,6 +5402,13 @@
dir = 1
},
/obj/structure/rack,
+/obj/item/storage/bag/trash{
+ pixel_x = -6
+ },
+/obj/item/storage/bag/trash{
+ pixel_y = 3;
+ pixel_x = 6
+ },
/obj/item/soap/syndie{
pixel_y = -3;
pixel_x = -2
@@ -5177,22 +5417,24 @@
pixel_y = -6;
pixel_x = 2
},
-/obj/item/storage/bag/trash{
- pixel_x = -6
- },
-/obj/item/storage/bag/trash,
/turf/open/floor/wood/walnut,
/area/ship/crew/janitor)
"Fl" = (
-/obj/effect/turf_decal/corner/opaque/syndiered{
- dir = 5
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 8
},
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/closet/firecloset/wall{
- pixel_y = 28
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 8
},
-/turf/open/floor/plasteel/tech,
-/area/ship/hallway/central)
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/obj/machinery/camera/autoname{
+ dir = 10
+ },
+/turf/open/floor/plating,
+/area/ship/hallway/starboard)
"Fm" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/machinery/atmospherics/pipe/simple/cyan/visible,
@@ -5220,18 +5462,29 @@
/turf/open/floor/plasteel/dark,
/area/ship/bridge)
"Fr" = (
-/obj/structure/cable/yellow{
- icon_state = "4-8"
+/obj/structure/rack,
+/obj/item/storage/toolbox/ammo/c10mm{
+ pixel_x = -5;
+ pixel_y = 10;
+ name = "ammo can (10mm)"
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 8
+/obj/item/storage/toolbox/ammo/a308{
+ pixel_x = 6;
+ pixel_y = 6;
+ name = "ammo can (.308)"
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
+/obj/item/storage/toolbox/ammo/c45{
+ pixel_x = -4;
+ pixel_y = 2;
+ name = "ammo can (.45)"
},
-/obj/structure/catwalk/over/plated_catwalk/dark,
-/turf/open/floor/plating,
-/area/ship/hallway/central)
+/obj/item/storage/toolbox/ammo/shotgun{
+ pixel_x = 4;
+ pixel_y = -2;
+ name = "ammo can (Buckshot)"
+ },
+/turf/open/floor/mineral/plastitanium,
+/area/ship/security/armory)
"Fs" = (
/obj/effect/turf_decal/industrial/warning{
dir = 4
@@ -5239,17 +5492,18 @@
/obj/effect/turf_decal/industrial/warning{
dir = 8
},
-/obj/machinery/door/firedoor/border_only{
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 8
},
-/obj/machinery/door/firedoor/border_only{
- dir = 4
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 8
},
-/obj/structure/sign/poster/contraband/space_cola{
- pixel_y = 32
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
},
+/obj/machinery/door/firedoor,
/turf/open/floor/plasteel/mono/dark,
-/area/ship/hallway/central)
+/area/ship/hallway/starboard)
"Ft" = (
/obj/effect/turf_decal/industrial/warning{
dir = 1
@@ -5257,13 +5511,23 @@
/turf/open/floor/engine,
/area/ship/engineering/engine)
"Fu" = (
-/obj/item/kirbyplants/random,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/turf_decal/corner/opaque/syndiered{
- dir = 6
+/obj/structure/sign/poster/contraband/bulldog{
+ pixel_y = 32
},
-/turf/open/floor/mineral/plastitanium,
-/area/ship/bridge)
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 8
+ },
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/obj/effect/turf_decal/siding/thinplating/dark{
+ dir = 1
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/security)
"FE" = (
/obj/structure/table/reinforced,
/obj/item/book/manual/wiki/surgery{
@@ -5275,27 +5539,38 @@
pixel_x = 6
},
/obj/effect/turf_decal/trimline/opaque/syndiered/line,
+/obj/item/storage/backpack/duffelbag/syndie/surgery{
+ pixel_x = 3
+ },
+/obj/item/reagent_containers/medigel/sterilizine{
+ pixel_x = -11;
+ pixel_y = 1
+ },
/turf/open/floor/plasteel/dark,
/area/ship/medical/surgery)
"FI" = (
-/obj/effect/turf_decal/corner/transparent/bar/diagonal,
-/obj/structure/cable/yellow{
- icon_state = "1-2"
+/obj/machinery/smartfridge/bloodbank/preloaded,
+/turf/closed/wall/r_wall/syndicate/nodiagonal{
+ rad_insulation = 0
},
-/turf/open/floor/plasteel,
-/area/ship/crew/dorm)
+/area/ship/medical/surgery)
"FR" = (
/turf/closed/wall/r_wall/syndicate/nodiagonal{
rad_insulation = 0
},
/area/ship/engineering/atmospherics)
"FS" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/turf_decal/corner/opaque/syndiered{
- dir = 5
+/obj/effect/turf_decal/syndicateemblem/top/left{
+ dir = 8
},
-/obj/effect/turf_decal/corner/opaque/syndiered,
-/turf/open/floor/mineral/plastitanium,
+/obj/effect/turf_decal/syndicateemblem/middle/left,
+/obj/effect/turf_decal/syndicateemblem/middle/right{
+ dir = 8
+ },
+/obj/effect/turf_decal/spline/fancy/opaque/black{
+ dir = 4
+ },
+/turf/open/floor/mineral/plastitanium/red,
/area/ship/bridge)
"FV" = (
/obj/machinery/door/poddoor{
@@ -5310,6 +5585,7 @@
/obj/machinery/chem_dispenser,
/obj/machinery/light/directional/south,
/obj/effect/turf_decal/corner/opaque/orange/full,
+/obj/effect/turf_decal/steeldecal/steel_decals_central1,
/turf/open/floor/plasteel/dark,
/area/ship/medical)
"Gg" = (
@@ -5323,44 +5599,61 @@
/turf/open/floor/plasteel/tech/grid,
/area/ship/bridge)
"Gj" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/turf_decal/corner/opaque/syndiered/half{
- dir = 8
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
},
-/turf/open/floor/mineral/plastitanium,
-/area/ship/bridge)
-"Gk" = (
-/obj/item/clothing/gloves/krav_maga/combatglovesplus,
-/obj/item/ammo_box/magazine/m10mm/ap,
-/obj/item/ammo_box/magazine/m10mm/ap,
-/obj/item/clothing/head/HoS/beret/syndicate,
-/obj/item/radio/headset/syndicate/alt/leader,
-/obj/item/gun/ballistic/automatic/pistol/no_mag,
-/obj/item/megaphone/sec,
-/obj/item/clothing/under/syndicate/combat,
-/obj/machinery/light/directional/north,
-/obj/item/clothing/shoes/combat,
-/obj/effect/turf_decal/spline/fancy/opaque/syndiered{
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
+/obj/structure/cable/yellow{
+ icon_state = "1-8"
+ },
+/obj/effect/turf_decal/corner/opaque/syndiered{
dir = 5
},
-/obj/item/clothing/head/gorlexcap,
-/obj/item/clothing/suit/gorlex,
-/obj/item/clothing/under/syndicate/officer,
-/obj/structure/closet/secure_closet{
- anchored = 1;
- icon_state = "syndicate";
- name = "lieutenant locker";
- req_access = list(3,150)
+/obj/effect/turf_decal/borderfloorblack,
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/port)
+"Gk" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/light_switch{
+ dir = 8;
+ pixel_x = 20;
+ pixel_y = 0
},
/turf/open/floor/mineral/plastitanium/red,
/area/ship/security)
"Gm" = (
-/obj/structure/closet/crate/bin,
-/obj/effect/turf_decal/corner/opaque/syndiered{
- dir = 10
+/obj/structure/rack,
+/obj/item/gun/ballistic/automatic/ebr{
+ pixel_x = -16;
+ pixel_y = 7;
+ spawnwithmagazine = 0
},
-/turf/open/floor/plasteel/tech,
-/area/ship/hallway/central)
+/obj/item/gun/ballistic/automatic/ebr{
+ pixel_x = -9;
+ pixel_y = 2;
+ spawnwithmagazine = 0
+ },
+/obj/item/ammo_box/magazine/ebr{
+ pixel_x = 10;
+ pixel_y = -1
+ },
+/obj/item/ammo_box/magazine/ebr{
+ pixel_x = 4
+ },
+/obj/item/ammo_box/magazine/ebr{
+ pixel_y = -3;
+ pixel_x = 7
+ },
+/obj/item/ammo_box/magazine/ebr{
+ pixel_y = -2
+ },
+/turf/open/floor/mineral/plastitanium,
+/area/ship/security/armory)
"Gn" = (
/obj/machinery/atmospherics/components/unary/thermomachine/freezer{
dir = 1;
@@ -5370,15 +5663,18 @@
/turf/open/floor/plasteel/tech/grid,
/area/ship/engineering/engine)
"Go" = (
-/obj/effect/turf_decal/industrial/warning{
- dir = 10
- },
/obj/structure/cable/yellow{
icon_state = "1-4"
},
/obj/machinery/camera/autoname{
dir = 5
},
+/obj/effect/turf_decal/industrial/warning{
+ dir = 8
+ },
+/obj/machinery/mineral/ore_redemption{
+ dir = 4
+ },
/turf/open/floor/pod/dark,
/area/ship/cargo)
"Gq" = (
@@ -5415,33 +5711,47 @@
/turf/open/floor/plasteel/dark,
/area/ship/bridge)
"Gx" = (
-/obj/item/trash/sosjerky,
-/turf/open/floor/plating,
+/obj/machinery/light/directional/east,
+/obj/structure/reagent_dispensers/fueltank,
+/turf/open/floor/pod/dark,
/area/ship/engineering/atmospherics)
"Gy" = (
-/obj/effect/turf_decal/corner/opaque/syndiered{
- dir = 5
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
},
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel/tech,
-/area/ship/hallway/central)
-"GC" = (
+/obj/structure/catwalk/over/plated_catwalk/dark,
/obj/structure/cable/yellow{
- icon_state = "1-8"
+ icon_state = "2-8"
+ },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+ dir = 1
},
/turf/open/floor/plating,
+/area/ship/hallway/starboard)
+"GC" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 8
+ },
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/obj/structure/cable/yellow{
+ icon_state = "2-4"
+ },
+/turf/open/floor/pod/dark,
/area/ship/engineering/atmospherics)
"GD" = (
-/obj/structure/rack,
-/obj/item/clothing/under/rank/prisoner,
-/obj/item/clothing/under/rank/prisoner,
-/obj/item/clothing/under/rank/prisoner/skirt,
-/obj/item/clothing/under/rank/prisoner/skirt,
-/obj/item/clothing/shoes/sneakers/orange,
-/obj/item/clothing/shoes/sneakers/orange,
-/obj/item/clothing/shoes/sneakers/orange,
-/obj/item/clothing/shoes/sneakers/orange,
-/turf/open/floor/mineral/plastitanium/red,
+/obj/effect/turf_decal/siding/thinplating/dark/corner{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/dark,
/area/ship/security)
"GE" = (
/obj/effect/turf_decal/siding/thinplating/dark{
@@ -5458,29 +5768,22 @@
/turf/open/floor/plasteel/dark,
/area/ship/engineering/atmospherics)
"GG" = (
-/obj/item/kirbyplants/random,
/obj/effect/turf_decal/corner/opaque/syndiered{
dir = 5
},
/obj/structure/sign/poster/contraband/aclf{
pixel_y = -32
},
+/obj/machinery/photocopier{
+ pixel_x = 1
+ },
/turf/open/floor/plasteel/tech,
/area/ship/crew/office)
"GH" = (
-/obj/structure/cable/yellow{
- icon_state = "4-8"
- },
-/obj/effect/decal/cleanable/dirt/dust,
-/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/dark,
-/turf/open/floor/plating,
-/area/ship/hallway/central)
+/obj/effect/turf_decal/corner/transparent/bar/diagonal,
+/obj/machinery/vending/cigarette/syndicate,
+/turf/open/floor/plasteel,
+/area/ship/crew/dorm)
"GM" = (
/obj/effect/turf_decal/industrial/warning{
dir = 4
@@ -5488,31 +5791,25 @@
/obj/effect/turf_decal/industrial/warning{
dir = 8
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 8
- },
-/obj/machinery/door/firedoor/border_only{
- dir = 4
- },
-/obj/machinery/door/firedoor/border_only{
- dir = 8
- },
-/obj/structure/cable/yellow{
- icon_state = "4-8"
+/obj/structure/sign/poster/contraband/space_up{
+ pixel_y = -32
},
+/obj/machinery/door/firedoor,
/turf/open/floor/plasteel/mono/dark,
-/area/ship/hallway/central)
+/area/ship/hallway/port)
"GN" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer4{
- dir = 1
+/obj/structure/closet/emcloset/wall{
+ dir = 4;
+ pixel_x = -28
},
-/obj/machinery/light/small/directional/west,
-/turf/open/floor/plasteel/dark,
-/area/ship/hallway/central)
+/obj/item/clothing/suit/space/syndicate,
+/obj/item/clothing/suit/space/syndicate,
+/obj/item/clothing/head/helmet/space/syndicate,
+/obj/item/clothing/head/helmet/space/syndicate,
+/obj/effect/turf_decal/trimline/opaque/syndiered/warning,
+/obj/machinery/atmospherics/pipe/layer_manifold,
+/turf/open/floor/plasteel/dark,
+/area/ship/hallway/starboard)
"GO" = (
/obj/effect/turf_decal/industrial/warning{
dir = 1
@@ -5528,6 +5825,21 @@
},
/turf/open/floor/engine,
/area/ship/engineering/engine)
+"GP" = (
+/obj/effect/turf_decal/industrial/warning{
+ dir = 8
+ },
+/obj/structure/closet/crate,
+/obj/effect/spawner/lootdrop/maintenance/eight,
+/obj/item/circuitboard/machine/autolathe,
+/obj/item/stock_parts/manipulator,
+/obj/item/stock_parts/matter_bin,
+/obj/item/stock_parts/matter_bin,
+/obj/item/stock_parts/matter_bin,
+/obj/item/stack/sheet/glass,
+/obj/machinery/airalarm/directional/west,
+/turf/open/floor/pod/dark,
+/area/ship/cargo)
"GU" = (
/obj/effect/turf_decal/rechargefloor,
/obj/effect/turf_decal/techfloor{
@@ -5539,34 +5851,18 @@
/turf/open/floor/plasteel/tech/grid,
/area/ship/bridge)
"GW" = (
-/obj/structure/cable/yellow{
- icon_state = "4-8"
+/obj/effect/turf_decal/corner/opaque/syndiered{
+ dir = 10
},
/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
-/obj/effect/turf_decal/industrial/warning{
- dir = 1
- },
/turf/open/floor/plasteel/tech,
-/area/ship/hallway/central)
+/area/ship/hallway/port)
"GZ" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
dir = 4
},
/obj/effect/turf_decal/trimline/opaque/syndiered/line,
-/obj/structure/closet/crate/freezer,
-/obj/item/bodypart/chest/robot,
-/obj/item/bodypart/leg/right/robot,
-/obj/item/bodypart/r_arm/robot,
-/obj/item/bodypart/leg/left/robot,
-/obj/item/bodypart/l_arm/robot,
-/obj/item/organ/ears/cat,
-/obj/item/organ/tail/cat,
-/obj/item/organ/liver/cybernetic/tier2,
-/obj/item/organ/lungs/cybernetic/tier2,
-/obj/item/organ/heart/cybernetic/tier2,
-/obj/item/organ/ears/cybernetic,
+/obj/structure/closet/crate/freezer/surplus_limbs/organs,
/turf/open/floor/plasteel/dark,
/area/ship/medical/surgery)
"Hd" = (
@@ -5580,16 +5876,11 @@
/turf/open/floor/plating,
/area/ship/external/dark)
"He" = (
-/obj/structure/toilet{
- dir = 4
- },
-/obj/structure/sink{
- dir = 8;
- pixel_x = 12
+/obj/machinery/door/airlock/external{
+ req_access = list(150)
},
-/obj/machinery/light/small/directional/west,
/turf/open/floor/plasteel/dark,
-/area/ship/crew/dorm)
+/area/ship/hallway/port)
"Hj" = (
/obj/item/radio/intercom/directional/west,
/obj/effect/turf_decal/corner/opaque/syndiered{
@@ -5598,16 +5889,20 @@
/turf/open/floor/plasteel/dark,
/area/ship/bridge)
"Hk" = (
-/obj/machinery/atmospherics/pipe/manifold/purple/visible{
- dir = 8
- },
-/obj/machinery/power/terminal{
- dir = 8
- },
+/obj/machinery/atmospherics/pipe/simple/purple/visible,
+/obj/machinery/power/apc/auto_name/directional/west,
/obj/structure/cable/yellow{
icon_state = "0-4"
},
-/turf/open/floor/plating,
+/obj/machinery/light_switch{
+ dir = 4;
+ pixel_x = -20;
+ pixel_y = 12
+ },
+/obj/effect/turf_decal/techfloor/orange{
+ dir = 8
+ },
+/turf/open/floor/plasteel/tech/grid,
/area/ship/engineering/atmospherics)
"Ht" = (
/obj/machinery/telecomms/receiver/preset_right{
@@ -5617,18 +5912,27 @@
/turf/open/floor/circuit/red,
/area/ship/engineering/communications)
"Hu" = (
-/obj/effect/turf_decal/siding/thinplating/dark{
- dir = 8
+/obj/effect/turf_decal/siding/thinplating/dark/corner{
+ dir = 1
+ },
+/obj/structure/cable/yellow{
+ icon_state = "1-8"
+ },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+ dir = 4
},
-/obj/machinery/power/apc/auto_name/directional/east,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/structure/cable/yellow,
/obj/structure/cable/yellow{
icon_state = "1-2"
},
-/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/turf/open/floor/plasteel/dark,
/area/ship/engineering/atmospherics)
+"Hx" = (
+/obj/machinery/light/directional/west,
+/obj/structure/table/reinforced,
+/obj/item/binoculars,
+/turf/open/floor/mineral/plastitanium,
+/area/ship/bridge)
"HF" = (
/obj/structure/table,
/obj/item/wrench/medical{
@@ -5639,88 +5943,32 @@
/turf/open/floor/plasteel/dark,
/area/ship/medical)
"HG" = (
-/obj/machinery/light/directional/north,
-/obj/structure/closet/crate/bin,
-/obj/effect/turf_decal/spline/fancy/opaque/syndiered{
+/obj/effect/turf_decal/siding/thinplating/dark/corner{
dir = 1
},
-/turf/open/floor/mineral/plastitanium/red,
+/turf/open/floor/plasteel/dark,
/area/ship/security)
"HH" = (
-/obj/effect/turf_decal/spline/fancy/opaque/syndiered{
- dir = 4
- },
-/obj/structure/table,
-/obj/item/clothing/head/warden/drill{
- name = "lieutenant's campaign hat";
- desc = "A special armored campaign hat with the Syndicate insignia emblazoned on it. Uses reinforced fabric to offer sufficient protection.";
- pixel_x = 2;
- pixel_y = -7
- },
-/obj/item/reagent_containers/food/snacks/donut/choco{
- pixel_x = 3;
- pixel_y = 7
- },
-/obj/item/reagent_containers/food/drinks/coffee{
- pixel_x = -7;
- pixel_y = 6
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/turf/open/floor/mineral/plastitanium/red,
/area/ship/security)
"HI" = (
/obj/structure/chair/office{
dir = 8
},
-/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plasteel/tech,
/area/ship/engineering/atmospherics)
"HL" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
-/obj/structure/cable/yellow{
- icon_state = "4-8"
- },
-/obj/structure/cable/yellow{
- icon_state = "1-8"
- },
-/obj/structure/catwalk/over/plated_catwalk/dark,
-/turf/open/floor/plating,
-/area/ship/hallway/central)
-"HQ" = (
-/obj/structure/chair{
+/obj/effect/turf_decal/syndicateemblem/middle/middle,
+/obj/effect/turf_decal/spline/fancy/opaque/black{
dir = 4
},
-/obj/item/canvas/twentythreeXtwentythree{
- name = "Battleplan Board";
- desc = "Remember, no plan survives the battle.";
- pixel_x = -25;
- pixel_y = 5
- },
-/obj/effect/turf_decal/corner/opaque/syndiered{
- dir = 9
- },
-/turf/open/floor/mineral/plastitanium,
-/area/ship/crew/office)
-"HY" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 8
- },
-/obj/structure/cable/yellow{
- icon_state = "4-8"
- },
-/obj/effect/turf_decal/corner/opaque/syndiered{
- dir = 5
- },
-/obj/machinery/camera/autoname{
- dir = 6
- },
-/turf/open/floor/plasteel/tech,
-/area/ship/hallway/central)
+/turf/open/floor/mineral/plastitanium/red,
+/area/ship/bridge)
"Ib" = (
/obj/machinery/door/window/eastright{
dir = 8;
@@ -5740,6 +5988,7 @@
icon_state = "1-2"
},
/obj/structure/catwalk/over/plated_catwalk/dark,
+/obj/machinery/light/directional/west,
/turf/open/floor/plating,
/area/ship/hallway/central)
"Ie" = (
@@ -5756,6 +6005,17 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
dir = 8
},
+/obj/machinery/camera/autoname{
+ dir = 9
+ },
+/obj/machinery/light_switch{
+ pixel_y = 11;
+ dir = 8;
+ pixel_x = 20
+ },
+/obj/effect/turf_decal/borderfloorblack{
+ dir = 8
+ },
/turf/open/floor/plasteel/tech,
/area/ship/hallway/central)
"Ig" = (
@@ -5777,22 +6037,14 @@
/turf/open/floor/engine,
/area/ship/engineering/engine)
"Ii" = (
-/obj/effect/turf_decal/corner/opaque/white/diagonal,
-/obj/structure/closet/secure_closet/freezer/kitchen/wall{
- dir = 4;
- pixel_x = -28;
- req_access = null
+/obj/structure/table/reinforced,
+/obj/machinery/microwave{
+ pixel_y = 4
},
-/obj/item/reagent_containers/food/condiment/milk,
-/obj/item/reagent_containers/food/condiment/milk,
-/obj/item/storage/box/ingredients/vegetarian,
-/obj/item/storage/box/ingredients/carnivore,
-/obj/item/reagent_containers/food/condiment/flour,
-/obj/item/reagent_containers/food/condiment/flour,
-/obj/item/reagent_containers/food/condiment/flour,
-/obj/item/storage/fancy/egg_box,
-/obj/item/storage/fancy/egg_box,
-/turf/open/floor/plasteel,
+/obj/effect/turf_decal/siding/wood{
+ dir = 4
+ },
+/turf/open/floor/wood,
/area/ship/crew/canteen)
"Il" = (
/obj/effect/turf_decal/techfloor,
@@ -5822,29 +6074,40 @@
icon_state = "0-8"
},
/obj/effect/turf_decal/trimline/opaque/syndiered/filled/line,
+/obj/machinery/light_switch{
+ dir = 1;
+ pixel_x = 10;
+ pixel_y = -20
+ },
/turf/open/floor/plasteel/white,
/area/ship/medical/surgery)
"IB" = (
-/obj/effect/turf_decal/spline/fancy/opaque/syndiered{
- dir = 2
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 8
},
-/turf/open/floor/mineral/plastitanium/red,
-/area/ship/security)
-"IC" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/door/firedoor/border_only,
-/obj/machinery/door/firedoor/border_only{
- dir = 1
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 8
},
-/obj/machinery/door/airlock/hatch{
- name = "Security"
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/turf/open/floor/plating,
+/area/ship/hallway/port)
+"IC" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 8
},
/obj/structure/cable/yellow{
- icon_state = "1-2"
+ icon_state = "4-8"
},
-/turf/open/floor/mineral/plastitanium,
-/area/ship/security)
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 8
+ },
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/obj/machinery/firealarm/directional/north,
+/turf/open/floor/plating,
+/area/ship/hallway/port)
"ID" = (
/obj/effect/turf_decal/siding/wood/end{
dir = 1
@@ -5877,6 +6140,7 @@
/obj/effect/turf_decal/trimline/opaque/syndiered/filled/line{
dir = 8
},
+/obj/machinery/holopad/emergency/medical,
/turf/open/floor/plasteel/mono/dark,
/area/ship/medical)
"IN" = (
@@ -5884,10 +6148,7 @@
dir = 1
},
/obj/effect/turf_decal/industrial/warning,
-/obj/machinery/door/firedoor/border_only{
- dir = 1
- },
-/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/firedoor,
/turf/open/floor/plasteel/mono/dark,
/area/ship/hallway/central)
"IT" = (
@@ -5912,11 +6173,20 @@
/turf/open/floor/plasteel/telecomms_floor,
/area/ship/engineering/communications)
"IV" = (
-/obj/machinery/door/airlock/external{
- req_access = list(150)
+/obj/structure/closet/emcloset/wall{
+ dir = 4;
+ pixel_x = -28
+ },
+/obj/item/clothing/suit/space/syndicate,
+/obj/item/clothing/head/helmet/space/syndicate,
+/obj/item/clothing/head/helmet/space/syndicate,
+/obj/item/clothing/suit/space/syndicate,
+/obj/effect/turf_decal/trimline/opaque/syndiered/warning{
+ dir = 1
},
+/obj/machinery/atmospherics/pipe/layer_manifold,
/turf/open/floor/plasteel/dark,
-/area/ship/hallway/central)
+/area/ship/hallway/port)
"Jf" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
dir = 8
@@ -5952,29 +6222,17 @@
"Jr" = (
/obj/effect/decal/cleanable/plasma,
/obj/effect/decal/cleanable/vomit/old{
- pixel_y = -6;
- pixel_x = -6
+ pixel_y = 22;
+ pixel_x = 12
},
-/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
dir = 8
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 8
},
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/bridge)
-"Jw" = (
-/obj/effect/turf_decal/corner/opaque/syndiered/bordercorner{
- dir = 4
- },
/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/light/directional/south,
-/obj/effect/turf_decal/corner/opaque/syndiered/border,
-/obj/effect/turf_decal/spline/fancy/opaque/black/corner{
- dir = 4
- },
-/turf/open/floor/mineral/plastitanium,
+/turf/open/floor/plasteel/tech/grid,
/area/ship/bridge)
"Jy" = (
/obj/effect/turf_decal/trimline/opaque/syndiered/line{
@@ -5983,28 +6241,19 @@
/turf/open/floor/plasteel/dark,
/area/ship/medical)
"Jz" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 8
- },
-/obj/structure/sign/warning/radiation{
- pixel_y = 32
- },
-/obj/effect/turf_decal/trimline/opaque/orange/filled/warning,
-/obj/effect/turf_decal/trimline/opaque/orange/filled/warning{
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
dir = 1
},
-/obj/machinery/door/airlock/external{
- req_access = list(150,10);
- dir = 4
+/obj/structure/cable/yellow{
+ icon_state = "2-4"
},
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 8
+/obj/effect/turf_decal/borderfloorblack,
+/obj/effect/turf_decal/corner/opaque/syndiered{
+ dir = 5
},
-/turf/open/floor/engine,
-/area/ship/engineering/engine)
+/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4,
+/turf/open/floor/plating,
+/area/ship/hallway/port)
"JA" = (
/obj/effect/turf_decal/industrial/warning/corner,
/obj/structure/cable{
@@ -6070,46 +6319,39 @@
/turf/template_noop,
/area/template_noop)
"JY" = (
-/obj/structure/bed,
-/obj/structure/sign/poster/official/no_erp{
- pixel_x = 32
- },
-/obj/item/storage/box/syndie_kit/sleepytime,
-/obj/structure/curtain/cloth/fancy{
- name = "blood-red curtains"
+/obj/effect/turf_decal/corner/opaque/syndiered{
+ dir = 5
},
-/obj/item/bedsheet/black,
-/turf/open/floor/carpet/nanoweave/red,
-/area/ship/crew/dorm)
+/obj/machinery/vending/coffee,
+/obj/effect/turf_decal/borderfloorblack,
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/starboard)
"Ke" = (
-/obj/machinery/atmospherics/pipe/simple/purple/visible{
- dir = 10
- },
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
- dir = 8
+/obj/machinery/atmospherics/pipe/simple/cyan/visible{
+ dir = 5
},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/structure/cable/yellow{
icon_state = "1-2"
},
+/obj/structure/cable/yellow{
+ icon_state = "2-8"
+ },
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/turf/open/floor/plating,
+/turf/open/floor/pod/dark,
/area/ship/engineering/atmospherics)
"Kg" = (
-/obj/structure/cable/yellow{
- icon_state = "1-4"
- },
-/obj/effect/turf_decal/spline/fancy/opaque/syndiered{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 4
+/obj/effect/turf_decal/corner/opaque/syndiered/three_quarters{
+ dir = 8
},
-/obj/structure/cable/yellow{
- icon_state = "4-8"
+/obj/machinery/light/directional/north,
+/obj/machinery/vending/cola/random,
+/obj/effect/turf_decal/borderfloorblack/corner{
+ dir = 8
},
-/turf/open/floor/mineral/plastitanium/red,
-/area/ship/security)
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/starboard)
"Kk" = (
/obj/effect/turf_decal/corner/opaque/syndiered/half{
dir = 8
@@ -6144,23 +6386,14 @@
"Ks" = (
/obj/machinery/chem_master,
/obj/effect/turf_decal/corner/opaque/orange/full,
+/obj/effect/turf_decal/steeldecal/steel_decals_central1,
/turf/open/floor/plasteel/dark,
/area/ship/medical)
"Ku" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 8
- },
-/obj/structure/cable/yellow{
- icon_state = "4-8"
- },
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
- },
/obj/structure/cable/yellow{
- icon_state = "1-4"
+ icon_state = "1-2"
},
-/turf/open/floor/plating,
+/turf/open/floor/pod/dark,
/area/ship/engineering/atmospherics)
"Kw" = (
/obj/machinery/door/poddoor{
@@ -6171,22 +6404,19 @@
/turf/open/floor/plating,
/area/ship/bridge)
"Kx" = (
-/obj/effect/turf_decal/corner/opaque/white/diagonal,
-/obj/machinery/door/window/eastleft,
-/turf/open/floor/plasteel,
+/obj/structure/table/wood,
+/obj/machinery/jukebox/boombox{
+ pixel_x = -1;
+ pixel_y = 1
+ },
+/obj/machinery/door/firedoor/border_only,
+/turf/open/floor/carpet/red,
/area/ship/crew/canteen)
"Ky" = (
-/obj/structure/chair/stool/bar{
- dir = 1
- },
-/obj/effect/turf_decal/corner/opaque/syndiered/border{
- dir = 1
- },
-/obj/structure/cable/yellow{
- icon_state = "2-8"
+/obj/machinery/camera/autoname{
+ dir = 8
},
-/obj/effect/turf_decal/corner/opaque/syndiered/border,
-/turf/open/floor/plasteel,
+/turf/open/floor/wood,
/area/ship/crew/canteen)
"Kz" = (
/obj/structure/cable/yellow{
@@ -6207,35 +6437,19 @@
/turf/open/floor/plasteel/dark,
/area/ship/medical/surgery)
"KA" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/effect/turf_decal/industrial/warning,
/obj/effect/turf_decal/industrial/warning{
dir = 1
},
-/obj/machinery/door/airlock/hatch{
- name = "Cargo Bay"
- },
-/obj/machinery/door/firedoor/border_only,
-/obj/machinery/door/firedoor/border_only{
- dir = 1
- },
-/turf/open/floor/pod/dark,
-/area/ship/cargo)
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/hallway/port)
"KB" = (
-/obj/machinery/light/directional/west,
-/obj/effect/turf_decal/corner/opaque/syndiered{
- dir = 6
- },
-/obj/machinery/computer/camera_advanced{
- dir = 4;
- icon_state = "computer-right";
- icon_keyboard = "syndie_key"
- },
-/obj/effect/turf_decal/corner/opaque/syndiered/half{
- dir = 8
+/obj/structure/reagent_dispensers/water_cooler,
+/obj/effect/turf_decal/siding/thinplating/dark{
+ dir = 9
},
-/turf/open/floor/mineral/plastitanium,
-/area/ship/bridge)
+/turf/open/floor/plasteel/dark,
+/area/ship/security)
"KD" = (
/obj/structure/table,
/obj/machinery/button/massdriver{
@@ -6267,74 +6481,76 @@
/turf/open/floor/plasteel/tech/grid,
/area/ship/bridge)
"KF" = (
-/obj/structure/table/wood/reinforced,
-/obj/item/disk/nuclear/fake/obvious{
- pixel_y = 5;
- pixel_x = 6
- },
-/obj/item/book/manual/nuclear{
- pixel_x = -8
- },
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 9
},
-/turf/open/floor/carpet/red,
+/turf/open/floor/mineral/plastitanium,
/area/ship/crew/office)
"KI" = (
/obj/structure/table/optable,
/obj/effect/turf_decal/trimline/opaque/syndiered/filled/line{
dir = 1
},
+/obj/machinery/camera/autoname{
+ dir = 6
+ },
/turf/open/floor/plasteel/white,
/area/ship/medical/surgery)
"KJ" = (
-/obj/effect/turf_decal/corner/opaque/syndiered{
- dir = 5
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
},
-/turf/open/floor/plasteel/tech,
-/area/ship/hallway/central)
+/obj/machinery/door/airlock/grunge,
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/firedoor/border_only{
+ dir = 1
+ },
+/turf/open/floor/mineral/plastitanium,
+/area/ship/security)
"KK" = (
-/obj/effect/turf_decal/spline/fancy/opaque/syndiered{
- dir = 4
+/obj/machinery/cryopod/syndicate{
+ dir = 8
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 4
+/obj/effect/turf_decal/techfloor{
+ dir = 5
},
-/turf/open/floor/mineral/plastitanium/red,
-/area/ship/security)
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/crew/cryo)
"KM" = (
/obj/effect/turf_decal/corner/opaque/syndiered{
dir = 6
},
+/obj/effect/turf_decal/borderfloorblack{
+ dir = 8
+ },
/turf/open/floor/plasteel/tech,
/area/ship/hallway/central)
"KQ" = (
/obj/effect/turf_decal/industrial/warning{
dir = 1
},
-/obj/effect/turf_decal/industrial/warning,
-/obj/machinery/door/airlock/hatch{
- name = "Cargo Bay"
- },
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/structure/cable/yellow{
icon_state = "1-2"
},
-/obj/machinery/door/firedoor/border_only,
-/obj/machinery/door/firedoor/border_only{
- dir = 1
- },
-/turf/open/floor/pod/dark,
-/area/ship/cargo)
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/hallway/port)
"KU" = (
-/obj/machinery/atmospherics/pipe/simple/cyan/visible,
+/obj/machinery/atmospherics/pipe/simple/cyan/visible{
+ dir = 6
+ },
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/structure/cable/yellow{
icon_state = "1-2"
},
+/obj/structure/cable/yellow{
+ icon_state = "1-8"
+ },
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/turf/open/floor/plating,
+/turf/open/floor/pod/dark,
/area/ship/engineering/atmospherics)
"La" = (
/obj/structure/chair/stool{
@@ -6348,27 +6564,25 @@
/area/ship/bridge)
"Lp" = (
/obj/machinery/door/airlock/engineering/glass{
- name = "Laser Room";
req_access = list(150,10);
dir = 4
},
/turf/open/floor/engine,
/area/ship/engineering/engine)
"Ls" = (
-/obj/structure/chair{
- dir = 4
- },
-/obj/item/canvas/twentythreeXtwentythree{
- name = "Battleplan Board";
- desc = "Remember, no plan survives the battle.";
- pixel_x = -25;
- pixel_y = -1
- },
/obj/effect/turf_decal/corner/opaque/syndiered{
dir = 9
},
+/obj/structure/chair{
+ dir = 1
+ },
/turf/open/floor/mineral/plastitanium,
/area/ship/crew/office)
+"Lw" = (
+/obj/item/clothing/suit/space/hardsuit/security/suns,
+/obj/machinery/suit_storage_unit/inherit,
+/turf/open/floor/mineral/plastitanium,
+/area/ship/bridge)
"LF" = (
/obj/effect/turf_decal/atmos/air{
dir = 8
@@ -6376,18 +6590,70 @@
/turf/open/floor/engine/air,
/area/ship/engineering/atmospherics)
"LG" = (
-/obj/machinery/door/airlock/hatch{
- name = "Restroom"
+/obj/effect/turf_decal/corner/transparent/bar/diagonal,
+/obj/structure/closet{
+ icon_state = "syndicate"
},
+/obj/item/clothing/suit/jacket/letterman_syndie,
+/obj/item/clothing/suit/jacket/letterman_syndie,
+/obj/item/clothing/suit/hooded/hoodie/red,
+/obj/item/clothing/suit/hooded/hoodie/red,
+/obj/item/clothing/under/syndicate,
+/obj/item/clothing/under/syndicate,
+/obj/item/clothing/under/syndicate/skirt,
+/obj/item/clothing/under/syndicate/skirt,
+/obj/item/clothing/shoes/sneakers/black,
+/obj/item/clothing/shoes/sneakers/black,
+/obj/item/clothing/shoes/sneakers/black,
+/obj/item/clothing/shoes/sneakers/black,
+/obj/item/clothing/head/soft/black,
+/obj/item/clothing/head/soft/black,
+/obj/item/clothing/head/soft/black,
+/obj/item/clothing/head/soft/black,
/turf/open/floor/plasteel,
/area/ship/crew/dorm)
"LH" = (
/obj/machinery/atmospherics/pipe/simple/purple/visible,
-/obj/machinery/power/apc/auto_name/directional/west,
-/obj/structure/cable/yellow{
- icon_state = "0-4"
+/obj/structure/closet/cardboard{
+ name = "mot containment box";
+ desc = "WARNING: Contains mot."
},
-/turf/open/floor/plating,
+/obj/item/storage/box/syndimaid,
+/obj/item/trash/cheesie,
+/mob/living/carbon/human/species/moth{
+ name = "Secret Box Moth";
+ real_name = "Box Moth";
+ gender = "female";
+ faction = list("neutral","playerSyndicate")
+ },
+/obj/item/reagent_containers/food/snacks/spacetwinkie{
+ pixel_y = 12;
+ pixel_x = 10
+ },
+/obj/item/reagent_containers/food/snacks/spacetwinkie{
+ pixel_x = -9;
+ pixel_y = 8
+ },
+/obj/item/reagent_containers/food/snacks/spacetwinkie{
+ pixel_x = 7
+ },
+/obj/item/reagent_containers/food/snacks/spacetwinkie{
+ pixel_x = -2;
+ pixel_y = 14
+ },
+/obj/item/reagent_containers/food/snacks/spacetwinkie{
+ pixel_y = -5;
+ pixel_x = -6
+ },
+/obj/structure/sign/poster/contraband/syndiemoth{
+ pixel_x = -32;
+ desc = "A Syndicate-commissioned poster that uses Syndie Moth(TM?) to tell the viewer to keep the nuclear authentication disk unsecured. It's signed by 'AspEv'."
+ },
+/obj/item/toy/balloon/syndicate,
+/obj/effect/turf_decal/techfloor/orange{
+ dir = 8
+ },
+/turf/open/floor/plasteel/tech/grid,
/area/ship/engineering/atmospherics)
"LX" = (
/obj/machinery/power/shuttle/engine/electric{
@@ -6423,19 +6689,8 @@
/turf/open/floor/plasteel/dark,
/area/ship/engineering/atmospherics)
"Mo" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 8
- },
-/obj/structure/cable/yellow{
- icon_state = "4-8"
- },
-/obj/structure/cable/yellow{
- icon_state = "2-4"
- },
-/turf/open/floor/plating,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/pod/dark,
/area/ship/engineering/atmospherics)
"Mq" = (
/obj/effect/turf_decal/industrial/warning,
@@ -6472,6 +6727,10 @@
pixel_x = 9
},
/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/fluff/paper/stack{
+ pixel_x = -7;
+ pixel_y = -15
+ },
/turf/open/floor/plasteel/tech/grid,
/area/ship/bridge)
"MA" = (
@@ -6479,14 +6738,14 @@
name = "captain's suit storage unit";
suit_type = /obj/item/clothing/suit/space/hardsuit/syndi/elite
},
-/obj/structure/sign/poster/contraband/have_a_puff{
- pixel_x = -32
- },
/obj/machinery/light_switch{
dir = 1;
pixel_x = 10;
pixel_y = -20
},
+/obj/structure/sign/poster/contraband/have_a_puff{
+ pixel_x = -32
+ },
/turf/open/floor/carpet/nanoweave/red,
/area/ship/crew/dorm/dormtwo)
"MC" = (
@@ -6496,7 +6755,10 @@
/turf/open/floor/engine,
/area/ship/engineering/engine)
"MK" = (
-/turf/open/floor/mineral/plastitanium,
+/obj/machinery/door/window/brigdoor/westleft{
+ req_access = list(150, 58)
+ },
+/turf/open/floor/mineral/plastitanium/red,
/area/ship/security)
"ML" = (
/obj/machinery/door/poddoor{
@@ -6522,16 +6784,17 @@
/turf/open/floor/circuit/red,
/area/ship/engineering/communications)
"MZ" = (
-/obj/machinery/door/airlock/atmos/glass{
- name = "Atmospherics";
- req_one_access_txt = "150";
- req_access = list(150,10);
+/obj/machinery/atmospherics/pipe/simple/purple/visible,
+/obj/machinery/power/terminal{
dir = 8
},
/obj/structure/cable/yellow{
- icon_state = "4-8"
+ icon_state = "0-4"
},
-/turf/open/floor/plating,
+/obj/effect/turf_decal/techfloor/orange{
+ dir = 10
+ },
+/turf/open/floor/plasteel/tech/grid,
/area/ship/engineering/atmospherics)
"Na" = (
/obj/effect/turf_decal/industrial/warning,
@@ -6551,89 +6814,53 @@
/turf/open/floor/engine,
/area/ship/engineering/engine)
"Nh" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/structure/cable/yellow{
- icon_state = "4-8"
- },
-/obj/structure/cable/yellow{
- icon_state = "0-4"
- },
-/obj/machinery/power/apc/auto_name/directional/north,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 4
+ icon_state = "1-2"
},
-/obj/structure/closet/secure_closet/armory1{
- populate = 0;
- icon_state = "syndicate"
+/obj/item/kirbyplants{
+ icon_state = "plant-21";
+ pixel_x = 8
},
-/obj/item/clothing/head/helmet/swat,
-/obj/item/clothing/head/helmet/swat,
-/obj/item/clothing/head/helmet/swat,
-/obj/item/clothing/suit/armor/vest/bulletproof,
-/obj/item/clothing/suit/armor/vest/bulletproof,
-/obj/item/clothing/suit/armor/vest/bulletproof,
-/obj/machinery/light_switch{
- pixel_y = 22;
- pixel_x = -12
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/obj/structure/cable/yellow{
+ icon_state = "2-8"
},
-/turf/open/floor/mineral/plastitanium,
-/area/ship/security)
+/turf/open/floor/plating,
+/area/ship/hallway/aft)
"Nj" = (
-/obj/machinery/door/firedoor/border_only{
- dir = 8
- },
-/obj/machinery/door/window/brigdoor/southleft{
- dir = 8;
- req_access = list(3,150)
+/obj/effect/turf_decal/spline/fancy/opaque/black/corner{
+ dir = 1
},
-/turf/open/floor/mineral/plastitanium,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/dark,
/area/ship/security)
"No" = (
-/obj/effect/turf_decal/corner/transparent/bar/diagonal,
-/obj/machinery/holopad/emergency,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/obj/structure/cable/yellow{
- icon_state = "4-8"
+/obj/machinery/firealarm/directional/south,
+/obj/structure/bed,
+/obj/item/bedsheet/black,
+/obj/structure/curtain/cloth/fancy{
+ name = "blood-red curtains"
},
-/turf/open/floor/plasteel,
+/turf/open/floor/carpet/nanoweave/red,
/area/ship/crew/dorm)
"Nr" = (
/obj/effect/turf_decal/corner/transparent/bar/diagonal,
/turf/open/floor/plasteel,
/area/ship/crew/dorm)
"NC" = (
-/obj/item/kirbyplants/random,
/obj/effect/turf_decal/corner/opaque/syndiered{
dir = 5
},
+/obj/structure/filingcabinet/double,
/turf/open/floor/plasteel/tech,
/area/ship/crew/office)
"NE" = (
-/obj/structure/sign/poster/contraband/bulldog{
- pixel_y = 32
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 4
- },
-/obj/structure/cable/yellow{
- icon_state = "4-8"
- },
-/turf/open/floor/mineral/plastitanium,
-/area/ship/security)
-"NF" = (
-/obj/structure/closet/emcloset/wall{
- dir = 4;
- pixel_x = -28
+/turf/closed/wall/r_wall/syndicate/nodiagonal{
+ rad_insulation = 0
},
-/obj/item/clothing/suit/space/syndicate,
-/obj/item/clothing/suit/space/syndicate,
-/obj/item/clothing/head/helmet/space/syndicate,
-/obj/item/clothing/head/helmet/space/syndicate,
-/obj/effect/turf_decal/trimline/opaque/syndiered/warning,
-/obj/machinery/atmospherics/pipe/layer_manifold,
-/turf/open/floor/plasteel/dark,
-/area/ship/hallway/central)
+/area/ship/hallway/port)
"NI" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/atmospherics/pipe/simple/green/visible{
@@ -6767,7 +6994,6 @@
/area/ship/engineering/engine)
"Oz" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
/turf/open/floor/plasteel/tech,
/area/ship/engineering/atmospherics)
@@ -6781,11 +7007,19 @@
/turf/open/floor/engine,
/area/ship/engineering/engine)
"OK" = (
-/obj/effect/turf_decal/corner/opaque/syndiered{
- dir = 6
+/obj/effect/turf_decal/syndicateemblem/bottom/middle{
+ dir = 1
},
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/mineral/plastitanium,
+/obj/effect/turf_decal/syndicateemblem/middle/left{
+ dir = 1
+ },
+/obj/effect/turf_decal/syndicateemblem/middle/left{
+ dir = 8
+ },
+/obj/effect/turf_decal/spline/fancy/opaque/black{
+ dir = 4
+ },
+/turf/open/floor/mineral/plastitanium/red,
/area/ship/bridge)
"ON" = (
/obj/structure/cable/yellow{
@@ -6811,67 +7045,63 @@
/turf/open/floor/engine,
/area/ship/engineering/engine)
"OS" = (
-/obj/machinery/atmospherics/pipe/simple/purple/visible{
- dir = 1
+/obj/machinery/atmospherics/pipe/simple/purple/visible,
+/obj/machinery/power/terminal{
+ dir = 8
},
-/obj/item/trash/pistachios,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/power/apc/auto_name/directional/west,
/obj/structure/cable/yellow{
icon_state = "0-4"
},
-/turf/open/floor/plating,
-/area/ship/engineering/atmospherics)
-"OY" = (
-/obj/structure/closet/secure_closet/brig/wall{
- pixel_y = 28;
- req_access = list(3,150)
- },
-/obj/effect/turf_decal/spline/fancy/opaque/syndiered{
- dir = 6
- },
-/obj/machinery/camera/autoname{
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/techfloor/orange{
dir = 8
},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/engineering/atmospherics)
+"OY" = (
+/obj/structure/bed,
/turf/open/floor/mineral/plastitanium/red,
/area/ship/security)
"OZ" = (
-/obj/machinery/atmospherics/pipe/simple/purple/visible{
- dir = 9
- },
+/obj/machinery/atmospherics/pipe/simple/purple/visible,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/structure/cable/yellow{
icon_state = "1-2"
},
-/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/turf/open/floor/plating,
+/obj/machinery/button/door{
+ dir = 4;
+ pixel_x = -25;
+ name = "Engine Shutters";
+ id = "twinkle_engines"
+ },
+/obj/effect/turf_decal/techfloor/orange{
+ dir = 8
+ },
+/turf/open/floor/plasteel/tech/grid,
/area/ship/engineering/atmospherics)
"Pa" = (
-/obj/effect/turf_decal/spline/fancy/opaque/syndiered{
- dir = 6
- },
-/obj/machinery/computer/secure_data/laptop{
- dir = 8;
- pixel_y = 6;
- pixel_x = 2
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
},
-/obj/structure/table,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/door/airlock/grunge,
/turf/open/floor/mineral/plastitanium/red,
/area/ship/security)
"Pb" = (
-/obj/effect/turf_decal/siding/thinplating/dark/corner{
- dir = 1
- },
/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/cable/yellow{
- icon_state = "1-8"
+/obj/machinery/camera/autoname{
+ dir = 10
},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
- dir = 4
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 5
},
/obj/structure/cable/yellow{
- icon_state = "1-2"
+ icon_state = "1-4"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 5
},
/turf/open/floor/plasteel/dark,
/area/ship/engineering/atmospherics)
@@ -6889,11 +7119,18 @@
/turf/open/floor/engine,
/area/ship/engineering/engine)
"Pe" = (
-/obj/effect/turf_decal/corner/opaque/syndiered{
- dir = 4
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 8
},
-/turf/open/floor/plasteel/tech,
-/area/ship/hallway/central)
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 8
+ },
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/turf/open/floor/plating,
+/area/ship/hallway/starboard)
"Pn" = (
/obj/machinery/light/small/directional/east,
/obj/effect/turf_decal/trimline/opaque/syndiered/warning,
@@ -6915,15 +7152,18 @@
/turf/open/floor/engine,
/area/ship/engineering/engine)
"Pv" = (
-/obj/effect/turf_decal/trimline/opaque/syndiered/filled/line{
- dir = 1
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/machinery/light_switch{
+ dir = 4;
+ pixel_x = -20;
+ pixel_y = 12
},
-/obj/structure/table/optable,
-/obj/machinery/camera/autoname{
- dir = 6
+/obj/effect/turf_decal/steeldecal/steel_decals_central7,
+/obj/structure/cable/yellow{
+ icon_state = "0-4"
},
-/turf/open/floor/plasteel/white,
-/area/ship/medical/surgery)
+/turf/open/floor/mineral/plastitanium,
+/area/ship/bridge)
"Pz" = (
/obj/structure/sign/syndicate,
/turf/closed/wall/r_wall/syndicate/nodiagonal{
@@ -6931,18 +7171,16 @@
},
/area/ship/engineering/atmospherics)
"PA" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/turf_decal/corner/opaque/syndiered{
- dir = 10
- },
-/obj/effect/turf_decal/corner/opaque/syndiered{
+/obj/effect/turf_decal/syndicateemblem/middle/middle{
dir = 1
},
-/turf/open/floor/mineral/plastitanium,
+/obj/effect/turf_decal/spline/fancy/opaque/black{
+ dir = 4
+ },
+/turf/open/floor/mineral/plastitanium/red,
/area/ship/bridge)
"PB" = (
/obj/machinery/door/airlock/hatch{
- name = "Mech Launcher #1";
req_access = list(150);
dir = 4
},
@@ -6952,14 +7190,26 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 8
},
+/obj/effect/mapping_helpers/airlock/abandoned,
+/obj/machinery/door/firedoor/border_only{
+ dir = 8
+ },
+/obj/machinery/door/firedoor/border_only{
+ dir = 4
+ },
/turf/open/floor/plasteel/tech/grid,
/area/ship/bridge)
"PE" = (
-/obj/machinery/atmospherics/pipe/manifold/purple/visible{
- dir = 1
+/obj/machinery/power/terminal{
+ dir = 8
},
-/obj/item/trash/candy,
-/turf/open/floor/plating,
+/obj/structure/cable/yellow{
+ icon_state = "0-4"
+ },
+/obj/effect/turf_decal/techfloor/orange{
+ dir = 10
+ },
+/turf/open/floor/plasteel/tech/grid,
/area/ship/engineering/atmospherics)
"PL" = (
/turf/closed/wall/r_wall/syndicate/nodiagonal{
@@ -6981,8 +7231,12 @@
/turf/open/floor/wood/walnut,
/area/ship/crew/janitor)
"PN" = (
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/hallway/central)
+/obj/effect/turf_decal/corner/opaque/syndiered{
+ dir = 5
+ },
+/obj/effect/turf_decal/borderfloorblack,
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/starboard)
"PQ" = (
/obj/effect/turf_decal/corner/opaque/syndiered{
dir = 6
@@ -6993,9 +7247,6 @@
/turf/open/floor/mineral/plastitanium,
/area/ship/crew/office)
"PY" = (
-/obj/machinery/door/airlock/public/glass{
- name = "Dorms"
- },
/obj/effect/turf_decal/corner/transparent/bar{
dir = 5
},
@@ -7008,11 +7259,12 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
+/obj/machinery/door/airlock/public/glass,
/turf/open/floor/plasteel,
/area/ship/crew/dorm)
"Qa" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel,
+/obj/structure/table/wood,
+/turf/open/floor/wood,
/area/ship/crew/canteen)
"Qd" = (
/obj/effect/turf_decal/corner/opaque/orange{
@@ -7052,13 +7304,18 @@
/turf/open/floor/plasteel/dark,
/area/ship/medical/surgery)
"Qk" = (
-/obj/effect/turf_decal/corner/opaque/syndiered{
- dir = 5
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
},
-/obj/machinery/light/directional/north,
-/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+ dir = 1
+ },
+/obj/effect/turf_decal/industrial/warning,
/turf/open/floor/plasteel/tech,
-/area/ship/hallway/central)
+/area/ship/hallway/starboard)
"Ql" = (
/obj/effect/turf_decal/corner/transparent/bar/diagonal,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
@@ -7091,46 +7348,53 @@
/turf/open/floor/plasteel/dark,
/area/ship/crew/janitor)
"Qt" = (
-/obj/structure/extinguisher_cabinet/directional/north,
-/obj/machinery/power/apc/auto_name/directional/west,
-/obj/structure/cable/yellow{
- icon_state = "0-4"
- },
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/turf_decal/corner/opaque/syndiered{
- dir = 9
- },
-/obj/machinery/light_switch{
- dir = 4;
- pixel_x = -20;
- pixel_y = 12
+/obj/structure/closet/secure_closet/warden{
+ name = "redshield's locker";
+ populate = 0
},
+/obj/item/clothing/shoes/combat/suns,
+/obj/item/clothing/shoes/laceup/suns,
+/obj/item/clothing/glasses/hud/security/suns,
+/obj/item/clothing/gloves/tackler/dolphin/suns,
+/obj/item/clothing/suit/toggle/suns/pkcoat,
+/obj/item/clothing/suit/armor/vest/bulletproof/suns/hos,
+/obj/item/clothing/suit/armor/vest/bulletproof/suns/ehos,
+/obj/item/clothing/head/welding/suns/hos,
+/obj/item/clothing/under/syndicate/suns/pkuniform,
+/obj/item/radio/headset/syndicate/alt{
+ keyslot = null
+ },
+/obj/item/gun/ballistic/automatic/powered/gauss/modelh,
+/obj/item/storage/belt/sabre/solgov,
+/obj/item/ammo_box/magazine/modelh,
+/obj/item/ammo_box/magazine/modelh,
/turf/open/floor/mineral/plastitanium,
/area/ship/bridge)
"Qv" = (
-/obj/effect/turf_decal/corner/opaque/syndiered/border,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
+/obj/structure/sign/poster/official/moth{
+ pixel_x = 32
},
/obj/structure/cable/yellow{
- icon_state = "1-2"
- },
-/obj/effect/turf_decal/corner/opaque/syndiered/border{
- dir = 1
+ icon_state = "2-8"
},
-/turf/open/floor/plasteel,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/turf/open/floor/wood,
/area/ship/crew/canteen)
-"Qx" = (
-/obj/structure/closet/secure_closet/brig/wall{
- pixel_y = 28;
- req_access = list(3,150)
+"QC" = (
+/obj/effect/turf_decal/corner/opaque/syndiered{
+ dir = 5
},
-/obj/effect/turf_decal/spline/fancy/opaque/syndiered{
- dir = 10
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/structure/cable/yellow{
+ icon_state = "0-2"
},
-/turf/open/floor/mineral/plastitanium/red,
-/area/ship/security)
+/obj/machinery/light_switch{
+ pixel_x = 11;
+ pixel_y = 23
+ },
+/obj/effect/turf_decal/borderfloorblack,
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/starboard)
"QD" = (
/obj/machinery/door/window/eastright{
name = "Engine Access"
@@ -7160,19 +7424,10 @@
/turf/open/floor/plating,
/area/ship/bridge)
"QR" = (
-/obj/effect/turf_decal/corner/transparent/bar/diagonal,
-/obj/structure/table/wood,
-/obj/item/storage/photo_album/syndicate{
- pixel_x = 4;
- pixel_y = 4
- },
-/obj/item/camera{
- pixel_x = -2
- },
-/obj/machinery/light/directional/south,
-/obj/machinery/airalarm/directional/south,
-/turf/open/floor/plasteel,
-/area/ship/crew/dorm)
+/obj/structure/bed,
+/obj/machinery/light/directional/east,
+/turf/open/floor/mineral/plastitanium/red,
+/area/ship/security)
"QT" = (
/obj/effect/turf_decal/corner/opaque/syndiered{
dir = 10
@@ -7210,30 +7465,29 @@
/area/ship/engineering)
"Rc" = (
/obj/machinery/atmospherics/pipe/simple/cyan/visible,
+/obj/machinery/light/directional/east,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/structure/cable/yellow{
icon_state = "1-2"
},
-/obj/structure/cable/yellow{
- icon_state = "1-8"
- },
-/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/structure/cable/yellow{
- icon_state = "4-8"
- },
-/turf/open/floor/plating,
+/turf/open/floor/pod/dark,
/area/ship/engineering/atmospherics)
"Rd" = (
/obj/structure/cable/yellow{
- icon_state = "1-2"
+ icon_state = "2-8"
},
-/obj/machinery/light_switch{
- pixel_y = -10;
- dir = 8;
- pixel_x = 20
+/obj/structure/closet/emcloset,
+/obj/effect/spawner/lootdrop/maintenance/four,
+/obj/item/reagent_containers/food/snacks/burger/red{
+ name = "suspicious red burger";
+ desc = "A suspicious looking burger.";
+ color = "#730622"
},
-/turf/open/floor/plating,
+/obj/effect/turf_decal/techfloor/orange{
+ dir = 1
+ },
+/turf/open/floor/pod/dark,
/area/ship/engineering/atmospherics)
"Rh" = (
/obj/effect/turf_decal/industrial/warning{
@@ -7250,15 +7504,17 @@
"Rj" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/machinery/atmospherics/pipe/simple/cyan/visible,
-/obj/machinery/light/directional/east,
/obj/structure/cable/yellow{
icon_state = "1-2"
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/structure/cable/yellow{
- icon_state = "1-5"
+ icon_state = "2-8"
},
-/turf/open/floor/plating,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/effect/turf_decal/techfloor/orange{
+ dir = 1
+ },
+/turf/open/floor/pod/dark,
/area/ship/engineering/atmospherics)
"Ru" = (
/obj/effect/turf_decal/corner/opaque/syndiered{
@@ -7267,16 +7523,39 @@
/obj/machinery/camera/autoname{
dir = 5
},
+/obj/effect/turf_decal/borderfloorblack{
+ dir = 4
+ },
/turf/open/floor/plasteel/tech,
-/area/ship/hallway/central)
+/area/ship/hallway/aft)
"Rv" = (
-/obj/effect/turf_decal/spline/fancy/opaque/syndiered{
- dir = 4
+/obj/structure/rack,
+/obj/item/gun/ballistic/shotgun/bulldog{
+ pixel_x = -7;
+ pixel_y = 7;
+ spawnwithmagazine = 0
},
-/obj/effect/turf_decal/spline/fancy/opaque/syndiered{
- dir = 1
+/obj/item/gun/ballistic/shotgun/bulldog{
+ pixel_y = -3;
+ pixel_x = 2;
+ spawnwithmagazine = 0
},
-/turf/open/floor/mineral/plastitanium/red,
+/obj/machinery/light/directional/north,
+/obj/item/ammo_box/magazine/m12g{
+ pixel_x = -8;
+ pixel_y = -4
+ },
+/obj/item/ammo_box/magazine/m12g{
+ pixel_y = -7
+ },
+/obj/item/ammo_box/magazine/m12g{
+ pixel_y = -9;
+ pixel_x = -10
+ },
+/obj/item/ammo_box/magazine/m12g{
+ pixel_y = -12
+ },
+/turf/open/floor/mineral/plastitanium,
/area/ship/security/armory)
"Ry" = (
/obj/effect/decal/cleanable/dirt/dust,
@@ -7300,15 +7579,23 @@
/turf/open/floor/plasteel/dark,
/area/ship/bridge)
"RB" = (
-/obj/effect/turf_decal/corner/opaque/white/diagonal,
-/obj/machinery/light/directional/north,
-/obj/structure/table/reinforced,
-/obj/item/kitchen/knife,
-/obj/item/kitchen/rollingpin,
-/obj/item/reagent_containers/food/condiment/sugar,
-/obj/item/reagent_containers/food/condiment/sugar,
-/turf/open/floor/plasteel,
-/area/ship/crew/canteen)
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 8
+ },
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/obj/effect/turf_decal/corner/opaque/syndiered{
+ dir = 5
+ },
+/obj/machinery/camera/autoname{
+ dir = 6
+ },
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/port)
"RE" = (
/obj/machinery/atmospherics/pipe/simple/purple/visible,
/obj/machinery/light/directional/south,
@@ -7339,39 +7626,32 @@
/turf/open/floor/engine,
/area/ship/engineering/engine)
"RT" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/shieldgen{
- anchored = 1;
- req_access = list(150)
- },
-/obj/effect/turf_decal/corner/opaque/syndiered/bordercee{
- dir = 8
- },
-/obj/effect/turf_decal/spline/fancy/opaque/black{
- dir = 1
+/obj/structure/table,
+/obj/effect/turf_decal/corner/opaque/syndiered/full,
+/obj/item/storage/box/medipens{
+ pixel_y = 7;
+ pixel_x = -4
},
-/turf/open/floor/mineral/plastitanium,
-/area/ship/bridge)
+/turf/open/floor/plasteel/dark,
+/area/ship/medical)
"RU" = (
-/obj/structure/cable/yellow{
- icon_state = "4-8"
+/obj/effect/turf_decal/corner/opaque/syndiered{
+ dir = 10
},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
-/obj/structure/cable/yellow{
- icon_state = "1-8"
+/obj/machinery/newscaster/directional/south,
+/obj/machinery/light/directional/south,
+/obj/effect/turf_decal/borderfloorblack{
+ dir = 1
},
-/obj/structure/catwalk/over/plated_catwalk/dark,
-/turf/open/floor/plating,
-/area/ship/hallway/central)
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/port)
"RW" = (
-/obj/machinery/door/airlock/external{
- req_access = list(150)
- },
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer4{
+ dir = 1
+ },
/turf/open/floor/plasteel/dark,
-/area/ship/hallway/central)
+/area/ship/hallway/starboard)
"Sa" = (
/obj/structure/chair/comfy/shuttle{
dir = 4
@@ -7382,59 +7662,92 @@
/turf/open/floor/mineral/plastitanium,
/area/ship/bridge)
"Sb" = (
-/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer4,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/light/small/directional/west,
-/turf/open/floor/plasteel/dark,
-/area/ship/hallway/central)
-"Sd" = (
-/obj/effect/turf_decal/corner/opaque/syndiered/border{
- dir = 4
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/structure/cable/yellow{
+ icon_state = "0-2"
},
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/turf_decal/corner/opaque/syndiered{
+/obj/machinery/light_switch{
+ pixel_x = 11;
+ pixel_y = 23
+ },
+/obj/effect/turf_decal/techfloor{
dir = 1
},
-/obj/effect/turf_decal/spline/fancy/opaque/black{
+/obj/effect/turf_decal/borderfloorblack,
+/turf/open/floor/plasteel/telecomms_floor,
+/area/ship/crew/cryo)
+"Sd" = (
+/obj/effect/turf_decal/corner/opaque/syndiered/bordercorner{
+ dir = 4
+ },
+/obj/machinery/light/directional/south,
+/obj/effect/turf_decal/spline/fancy/opaque/black/corner{
dir = 4
},
+/obj/effect/turf_decal/corner/opaque/syndiered/bordercorner,
/turf/open/floor/mineral/plastitanium,
/area/ship/bridge)
"Sg" = (
+/turf/open/floor/mineral/plastitanium,
+/area/ship/security/armory)
+"Si" = (
/obj/machinery/power/apc/auto_name/directional/west,
/obj/structure/cable/yellow{
icon_state = "0-4"
},
-/obj/effect/turf_decal/spline/fancy/opaque/syndiered{
- dir = 1
- },
/obj/machinery/light_switch{
dir = 4;
pixel_x = -20;
pixel_y = 12
},
-/turf/open/floor/mineral/plastitanium,
-/area/ship/security/armory)
-"Si" = (
-/obj/machinery/vending/security/marine/syndicate,
+/obj/structure/rack,
+/obj/item/clothing/suit/armor/riot/minutemen{
+ desc = "Designed to protect against close range attacks. This one is painted black.";
+ pixel_y = 1;
+ pixel_x = 5
+ },
+/obj/item/clothing/head/helmet/riot{
+ pixel_x = -8
+ },
/turf/open/floor/mineral/plastitanium,
/area/ship/security/armory)
"Sj" = (
-/obj/machinery/vending/boozeomat/syndicate_access,
-/obj/machinery/light/directional/north,
-/turf/open/floor/wood,
-/area/ship/crew/canteen)
-"Sp" = (
-/obj/machinery/atmospherics/pipe/simple/orange/visible,
-/obj/effect/turf_decal/corner/opaque/orange/full,
-/obj/machinery/shieldgen{
- anchored = 1;
- req_access = list(150)
+/obj/machinery/door/airlock/grunge,
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/firedoor/border_only{
+ dir = 1
},
/turf/open/floor/plasteel/dark,
-/area/ship/engineering)
-"Sr" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+/area/ship/crew/dorm)
+"Sk" = (
+/obj/effect/turf_decal/corner/opaque/syndiered{
+ dir = 9
+ },
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/structure/cable/yellow{
+ icon_state = "0-4"
+ },
+/obj/machinery/light_switch{
+ dir = 4;
+ pixel_x = -20;
+ pixel_y = 12
+ },
+/obj/effect/turf_decal/borderfloorblack{
+ dir = 4
+ },
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/aft)
+"Sp" = (
+/obj/machinery/atmospherics/pipe/simple/orange/visible,
+/obj/effect/turf_decal/corner/opaque/orange/full,
+/obj/machinery/shieldgen{
+ anchored = 1;
+ req_access = list(150)
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/engineering)
+"Sr" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 8
},
/obj/structure/cable/yellow{
@@ -7444,35 +7757,23 @@
/turf/open/floor/plasteel/dark,
/area/ship/engineering)
"Sv" = (
-/obj/machinery/door/airlock/atmos/glass{
- name = "Atmospherics";
- req_one_access_txt = "150";
- req_access = list(150,10);
- dir = 4
- },
-/obj/structure/cable/yellow{
- icon_state = "4-10"
- },
-/turf/open/floor/plating,
+/obj/machinery/portable_atmospherics/canister/toxins,
+/turf/open/floor/pod/dark,
/area/ship/engineering/atmospherics)
"Sy" = (
-/obj/structure/table/wood,
-/obj/item/pizzabox/pineapple{
- pixel_y = 5
- },
-/obj/item/pizzabox/pineapple{
- pixel_y = 10
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 8
},
-/obj/item/pizzabox/pineapple{
- pixel_y = 15
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 8
},
-/obj/item/pizzabox/pineapple{
- pixel_y = 20
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
},
-/obj/machinery/door/firedoor/border_only,
-/obj/machinery/airalarm/directional/east,
-/turf/open/floor/wood,
-/area/ship/crew/canteen)
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/obj/machinery/camera/autoname,
+/turf/open/floor/plating,
+/area/ship/hallway/port)
"SA" = (
/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer4,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
@@ -7502,79 +7803,57 @@
/turf/open/floor/plasteel/tech/grid,
/area/ship/bridge)
"SI" = (
-/obj/item/trash/syndi_cakes,
-/obj/machinery/atmospherics/pipe/simple/purple/visible{
- dir = 9
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 5
+/obj/machinery/atmospherics/pipe/simple/purple/visible,
+/obj/machinery/power/terminal{
+ dir = 8
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 5
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
},
/obj/structure/cable/yellow{
- icon_state = "1-4"
+ icon_state = "0-2"
},
-/turf/open/floor/plating,
+/obj/effect/turf_decal/techfloor/orange{
+ dir = 8
+ },
+/turf/open/floor/plasteel/tech/grid,
/area/ship/engineering/atmospherics)
"SK" = (
-/obj/machinery/atmospherics/pipe/simple/purple/visible,
-/obj/structure/closet/cardboard{
- name = "mot containment box";
- desc = "WARNING: Contains mot."
- },
-/obj/item/storage/box/syndimaid,
-/obj/item/trash/cheesie,
-/mob/living/carbon/human/species/moth{
- name = "Secret Box Moth";
- real_name = "Box Moth";
- gender = "female";
- faction = list("neutral","PlayerSyndicate")
- },
-/obj/item/reagent_containers/food/snacks/spacetwinkie{
- pixel_y = 12;
- pixel_x = 10
- },
-/obj/item/reagent_containers/food/snacks/spacetwinkie{
- pixel_x = -9;
- pixel_y = 8
- },
-/obj/item/reagent_containers/food/snacks/spacetwinkie{
- pixel_x = 7
- },
-/obj/item/reagent_containers/food/snacks/spacetwinkie{
- pixel_x = -2;
- pixel_y = 14
+/obj/machinery/atmospherics/pipe/simple/cyan/visible,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
},
-/obj/item/reagent_containers/food/snacks/spacetwinkie{
- pixel_y = -5;
- pixel_x = -6
+/obj/structure/cable/yellow{
+ icon_state = "1-8"
},
-/obj/structure/sign/poster/contraband/syndiemoth{
- pixel_x = -32;
- desc = "A Syndicate-commissioned poster that uses Syndie Moth(TM?) to tell the viewer to keep the nuclear authentication disk unsecured. It's signed by 'AspEv'."
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
},
-/obj/item/toy/balloon/syndicate,
-/turf/open/floor/plating,
+/obj/effect/turf_decal/techfloor/orange,
+/turf/open/floor/pod/dark,
/area/ship/engineering/atmospherics)
"SM" = (
-/obj/effect/turf_decal/industrial/warning{
- dir = 8
+/obj/effect/turf_decal/corner/opaque/syndiered{
+ dir = 6
},
-/obj/structure/sign/warning/radiation{
- pixel_x = -32
+/obj/effect/turf_decal/borderfloorblack{
+ dir = 8
},
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/hallway/central)
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/starboard)
"SR" = (
-/obj/machinery/door/airlock/glass{
- name = "Cryo"
- },
-/obj/structure/cable/yellow{
- icon_state = "1-2"
+/obj/effect/turf_decal/industrial/warning{
+ dir = 10
},
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/crew/cryo)
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/tank_dispenser/oxygen,
+/turf/open/floor/pod/dark,
+/area/ship/cargo)
"SS" = (
/obj/structure/sign/poster/official/moth/meth{
pixel_y = -32
@@ -7588,10 +7867,15 @@
pixel_y = 1
},
/obj/structure/table/glass,
-/obj/effect/turf_decal/trimline/opaque/orange/line,
/obj/effect/turf_decal/trimline/opaque/orange/filled/line{
dir = 8
},
+/obj/effect/turf_decal/trimline/opaque/orange/line{
+ dir = 4
+ },
+/obj/structure/sign/poster/contraband/mothpill{
+ pixel_x = 32
+ },
/turf/open/floor/plasteel/dark,
/area/ship/medical)
"ST" = (
@@ -7603,56 +7887,71 @@
/turf/open/floor/plating,
/area/ship/engineering/atmospherics)
"SV" = (
-/obj/structure/chair/office{
- dir = 8
- },
-/obj/effect/turf_decal/spline/fancy/opaque/syndiered{
- dir = 8
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer4{
+ dir = 1
},
-/turf/open/floor/mineral/plastitanium/red,
-/area/ship/security)
+/obj/machinery/light/small/directional/west,
+/turf/open/floor/plasteel/dark,
+/area/ship/hallway/starboard)
"SZ" = (
-/obj/machinery/door/window/brigdoor/southleft{
- dir = 8;
- req_access = list(3,150)
- },
-/obj/machinery/door/firedoor/border_only{
- dir = 8
+/obj/structure/bed,
+/obj/structure/curtain/cloth/fancy{
+ name = "blood-red curtains"
},
-/turf/open/floor/mineral/plastitanium,
-/area/ship/security)
+/obj/item/bedsheet/black,
+/obj/item/storage/box/syndie_kit/sleepytime,
+/turf/open/floor/carpet/nanoweave/red,
+/area/ship/crew/dorm)
"Tl" = (
-/obj/item/kirbyplants/random,
-/obj/effect/turf_decal/corner/opaque/syndiered{
- dir = 6
+/obj/effect/turf_decal/syndicateemblem/top/right{
+ dir = 1
},
-/obj/machinery/camera/autoname{
- dir = 6
+/obj/effect/turf_decal/spline/fancy/opaque/black{
+ dir = 4
},
-/turf/open/floor/mineral/plastitanium,
+/turf/open/floor/mineral/plastitanium/red,
/area/ship/bridge)
"Tn" = (
-/obj/effect/turf_decal/corner/opaque/syndiered{
- dir = 5
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
},
-/obj/structure/closet/emcloset/anchored,
-/turf/open/floor/plasteel/tech,
-/area/ship/hallway/central)
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 8
+ },
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 8
+ },
+/turf/open/floor/plating,
+/area/ship/hallway/port)
"Tq" = (
-/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/table,
/obj/item/paper_bin/construction,
/obj/item/pen,
/turf/open/floor/plasteel/tech,
/area/ship/engineering/atmospherics)
"Tt" = (
-/obj/effect/turf_decal/corner/opaque/syndiered{
- dir = 10
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
},
-/obj/machinery/newscaster/directional/south,
-/obj/machinery/light/directional/south,
-/turf/open/floor/plasteel/tech,
-/area/ship/hallway/central)
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 8
+ },
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/obj/effect/turf_decal/siding/thinplating/dark{
+ dir = 1
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/security)
+"Tv" = (
+/obj/effect/turf_decal/spline/fancy/opaque/black{
+ dir = 4
+ },
+/turf/open/floor/mineral/plastitanium/red,
+/area/ship/bridge)
"TC" = (
/obj/effect/turf_decal/spline/fancy/opaque/syndiered{
dir = 6
@@ -7676,21 +7975,34 @@
/turf/open/floor/wood/walnut,
/area/ship/crew/janitor)
"TM" = (
-/obj/structure/grille,
-/obj/structure/window/plasma/reinforced/plastitanium,
-/obj/machinery/door/poddoor{
- id = "twinkle_external"
+/obj/machinery/door/airlock/engineering/glass/critical{
+ name = "Supermatter";
+ req_access = list(150,10);
+ dir = 4
},
-/turf/open/floor/plating,
-/area/ship/security)
-"TR" = (
-/obj/machinery/power/terminal{
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
+/turf/open/floor/engine,
+/area/ship/engineering/engine)
+"TR" = (
+/obj/item/trash/syndi_cakes,
+/obj/machinery/atmospherics/pipe/simple/purple/visible{
+ dir = 9
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 5
+ },
/obj/structure/cable/yellow{
- icon_state = "0-4"
+ icon_state = "1-4"
},
-/turf/open/floor/plating,
+/obj/effect/turf_decal/techfloor/orange{
+ dir = 8
+ },
+/turf/open/floor/plasteel/tech/grid,
/area/ship/engineering/atmospherics)
"TT" = (
/obj/machinery/vending/wallmed{
@@ -7701,6 +8013,14 @@
},
/turf/open/floor/engine,
/area/ship/engineering/engine)
+"TU" = (
+/obj/effect/turf_decal/corner/opaque/syndiered{
+ dir = 5
+ },
+/obj/machinery/light/directional/north,
+/obj/effect/turf_decal/borderfloorblack,
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/starboard)
"TY" = (
/obj/machinery/atmospherics/pipe/simple/green/visible{
dir = 9
@@ -7714,33 +8034,41 @@
/turf/open/floor/engine,
/area/ship/engineering/engine)
"Ua" = (
-/obj/machinery/atmospherics/pipe/simple/purple/visible,
-/obj/machinery/power/terminal{
- dir = 8
+/obj/machinery/atmospherics/pipe/simple/purple/visible{
+ dir = 1
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/structure/cable/yellow{
icon_state = "1-2"
},
-/obj/structure/cable/yellow{
- icon_state = "0-2"
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/button/door{
+ dir = 4;
+ pixel_x = -25;
+ name = "Engine Shutters";
+ id = "twinkle_engines"
},
-/turf/open/floor/plating,
+/obj/effect/turf_decal/techfloor/orange{
+ dir = 8
+ },
+/turf/open/floor/plasteel/tech/grid,
/area/ship/engineering/atmospherics)
"Uc" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/pod/dark,
-/area/ship/cargo)
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
+/obj/machinery/door/poddoor{
+ id = "twinkle_armory"
+ },
+/turf/open/floor/mineral/plastitanium/red,
+/area/ship/security/armory)
"Uf" = (
-/obj/effect/turf_decal/techfloor{
- dir = 1
+/obj/item/wallframe/extinguisher_cabinet{
+ pixel_y = 17;
+ pixel_x = -2
},
-/obj/effect/turf_decal/corner/opaque/syndiered/half,
-/obj/structure/rack,
-/obj/structure/extinguisher_cabinet/directional/north,
-/turf/open/floor/plasteel/tech/grid,
+/turf/open/floor/plating,
/area/ship/bridge)
"Ug" = (
/obj/machinery/power/emitter/welded,
@@ -7751,15 +8079,31 @@
/turf/open/floor/engine,
/area/ship/engineering/engine)
"Um" = (
-/obj/effect/turf_decal/industrial/warning{
- dir = 8
- },
-/obj/machinery/light/directional/west,
/turf/open/floor/pod/dark,
/area/ship/cargo)
"Up" = (
-/obj/effect/turf_decal/spline/fancy/opaque/syndiered{
- dir = 1
+/obj/structure/closet/secure_closet/security{
+ populate = 0;
+ icon_state = "syndicate";
+ name = "explosives locker"
+ },
+/obj/item/storage/backpack/duffelbag/syndie/c4{
+ pixel_x = -1;
+ pixel_y = -10
+ },
+/obj/item/gun/ballistic/rocketlauncher{
+ pixel_y = 6;
+ pixel_x = -3
+ },
+/obj/item/ammo_casing/caseless/rocket/hedp,
+/obj/item/ammo_casing/caseless/rocket/hedp,
+/obj/item/ammo_casing/caseless/rocket{
+ pixel_x = -6;
+ pixel_y = -3
+ },
+/obj/item/ammo_casing/caseless/rocket{
+ pixel_x = -6;
+ pixel_y = -3
},
/turf/open/floor/mineral/plastitanium,
/area/ship/security/armory)
@@ -7769,14 +8113,32 @@
/turf/open/floor/engine,
/area/ship/engineering/engine)
"Ux" = (
-/obj/effect/turf_decal/corner/opaque/white/diagonal,
-/obj/structure/window/reinforced/spawner{
+/obj/machinery/door/airlock/medical/glass{
+ req_one_access_txt = "150";
+ req_access = list(150);
dir = 4
},
-/obj/structure/table/reinforced,
-/obj/machinery/microwave,
-/turf/open/floor/plasteel,
-/area/ship/crew/canteen)
+/obj/machinery/door/firedoor/border_only{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 8
+ },
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/obj/effect/turf_decal/corner/opaque/syndiered/full,
+/obj/machinery/door/firedoor/border_only{
+ dir = 4
+ },
+/obj/effect/mapping_helpers/airlock/unres{
+ dir = 4
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/medical)
"UA" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
@@ -7789,10 +8151,12 @@
/obj/effect/turf_decal/corner/opaque/syndiered{
dir = 9
},
+/obj/effect/turf_decal/borderfloorblack{
+ dir = 4
+ },
/turf/open/floor/plasteel/tech,
/area/ship/hallway/central)
"UB" = (
-/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/extinguisher_cabinet/directional/south,
/turf/open/floor/plasteel/dark,
/area/ship/engineering/atmospherics)
@@ -7821,7 +8185,6 @@
/turf/open/floor/plasteel/dark,
/area/ship/engineering)
"UF" = (
-/obj/machinery/door/airlock/public/glass,
/obj/effect/turf_decal/corner/opaque/syndiered/border{
dir = 1
},
@@ -7833,20 +8196,13 @@
/obj/machinery/door/firedoor/border_only{
dir = 1
},
+/obj/machinery/door/airlock/public/glass,
/turf/open/floor/plasteel/tech,
/area/ship/crew/canteen)
"UH" = (
/obj/effect/turf_decal/trimline/opaque/syndiered/filled/line,
/turf/open/floor/plasteel/dark,
/area/ship/medical)
-"UI" = (
-/obj/effect/turf_decal/corner/opaque/syndiered/full,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/turf_decal/spline/fancy/opaque/black{
- dir = 4
- },
-/turf/open/floor/mineral/plastitanium,
-/area/ship/bridge)
"UK" = (
/obj/structure/cable/yellow{
icon_state = "2-4"
@@ -7877,9 +8233,8 @@
/turf/open/floor/engine,
/area/ship/engineering/engine)
"UW" = (
-/obj/effect/turf_decal/corner/opaque/syndiered,
-/turf/open/floor/plasteel/tech,
-/area/ship/hallway/central)
+/turf/open/floor/wood,
+/area/ship/crew/canteen)
"Va" = (
/obj/structure/sign/syndicate,
/turf/closed/wall/r_wall/syndicate/nodiagonal{
@@ -7895,51 +8250,28 @@
/turf/open/floor/plasteel/dark,
/area/ship/bridge)
"Vk" = (
-/obj/machinery/atmospherics/pipe/simple/cyan/visible,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/structure/cable/yellow{
- icon_state = "1-2"
- },
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/structure/cable/yellow{
- icon_state = "1-8"
- },
-/turf/open/floor/plating,
-/area/ship/engineering/atmospherics)
+/turf/open/floor/pod/light,
+/area/ship/cargo)
"Vu" = (
/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/oxygen_input{
dir = 4
},
/turf/open/floor/engine/o2,
/area/ship/engineering/atmospherics)
-"Vv" = (
-/obj/effect/turf_decal/industrial/warning{
- dir = 4
- },
-/obj/machinery/mineral/ore_redemption{
- dir = 8
- },
-/obj/effect/turf_decal/box/corners{
- dir = 1
- },
-/obj/effect/turf_decal/box/corners{
- dir = 8
- },
-/obj/machinery/light/directional/east,
-/turf/open/floor/pod/dark,
-/area/ship/cargo)
"Vy" = (
/obj/effect/turf_decal/siding/thinplating/dark{
dir = 8
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 9
- },
+/obj/machinery/power/apc/auto_name/directional/east,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/structure/cable/yellow,
/obj/structure/cable/yellow{
icon_state = "1-2"
},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/turf/open/floor/plasteel/dark,
/area/ship/engineering/atmospherics)
"VA" = (
@@ -7972,76 +8304,103 @@
/turf/open/floor/plating,
/area/ship/cargo)
"VG" = (
-/obj/structure/chair/stool/bar{
- dir = 1
+/obj/effect/turf_decal/industrial/warning,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 5
},
-/obj/effect/turf_decal/corner/opaque/syndiered/border{
- dir = 1
+/turf/open/floor/pod/dark,
+/area/ship/cargo)
+"VH" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 8
},
-/obj/structure/cable/yellow{
- icon_state = "4-8"
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 8
},
-/obj/effect/turf_decal/corner/opaque/syndiered/border,
-/turf/open/floor/plasteel,
-/area/ship/crew/canteen)
-"VH" = (
-/obj/effect/turf_decal/corner/opaque/syndiered{
- dir = 5
+/obj/effect/turf_decal/industrial/warning{
+ dir = 8
},
-/obj/structure/extinguisher_cabinet/directional/north,
-/turf/open/floor/plasteel/tech,
-/area/ship/hallway/central)
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/hallway/port)
"VJ" = (
-/obj/effect/turf_decal/corner/opaque/syndiered/full,
-/obj/effect/turf_decal/syndicateemblem/middle/left{
+/obj/effect/turf_decal/syndicateemblem/middle/middle{
dir = 8
},
/obj/structure/cable/yellow{
icon_state = "1-2"
},
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/mineral/plastitanium,
+/obj/machinery/holopad/emergency/command,
+/turf/open/floor/mineral/plastitanium/red,
/area/ship/bridge)
"VM" = (
-/obj/structure/mirror{
- pixel_y = 32
- },
-/obj/structure/sink{
- pixel_y = 25
+/obj/effect/turf_decal/trimline/opaque/orange/filled/corner{
+ dir = 8
},
+/obj/structure/table/glass,
/obj/effect/turf_decal/trimline/opaque/orange/line{
- dir = 1
+ dir = 5
},
-/obj/effect/turf_decal/trimline/opaque/orange/filled/corner{
- dir = 8
+/obj/structure/closet/wall/orange{
+ name = "Chemical Closet";
+ pixel_y = 28
+ },
+/obj/item/storage/bag/chemistry,
+/obj/item/reagent_containers/glass/beaker/large,
+/obj/item/reagent_containers/glass/beaker/large,
+/obj/item/reagent_containers/glass/beaker,
+/obj/item/reagent_containers/glass/beaker,
+/obj/item/clothing/glasses/sunglasses/chemical,
+/obj/structure/sign/warning/chemdiamond{
+ pixel_x = 30
},
+/obj/item/hypospray/mkii/CMO/combat,
+/obj/item/reagent_containers/glass/bottle/vial/large,
+/obj/item/reagent_containers/glass/bottle/vial/large,
+/obj/item/reagent_containers/glass/bottle/vial/large,
+/obj/item/reagent_containers/glass/bottle/vial/large,
/turf/open/floor/plasteel/dark,
/area/ship/medical)
"VO" = (
-/turf/open/floor/wood,
+/obj/structure/table/wood,
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/airalarm/directional/east,
+/obj/machinery/reagentgrinder/constructed{
+ pixel_y = 9
+ },
+/turf/open/floor/carpet/red,
/area/ship/crew/canteen)
"VU" = (
-/obj/effect/turf_decal/corner/opaque/syndiered/bordercorner,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/light/directional/north,
-/obj/effect/turf_decal/corner/opaque/syndiered/border{
- dir = 1
+/obj/structure/table/wood,
+/obj/machinery/door/firedoor/border_only,
+/obj/item/reagent_containers/food/drinks/waterbottle{
+ pixel_x = -5;
+ pixel_y = 10
},
-/obj/machinery/turretid{
- pixel_y = 32;
- req_access = null;
- req_access_txt = "150"
+/obj/item/reagent_containers/food/drinks/waterbottle{
+ pixel_x = 3;
+ pixel_y = 6
},
-/obj/effect/turf_decal/spline/fancy/opaque/black/corner,
-/turf/open/floor/mineral/plastitanium,
-/area/ship/bridge)
+/obj/item/reagent_containers/food/drinks/waterbottle{
+ pixel_y = 3;
+ pixel_x = -3
+ },
+/turf/open/floor/carpet/red,
+/area/ship/crew/canteen)
"VY" = (
-/obj/effect/turf_decal/corner/opaque/syndiered{
+/obj/effect/turf_decal/industrial/warning{
dir = 5
},
-/obj/machinery/light/directional/north,
-/turf/open/floor/plasteel/tech,
-/area/ship/hallway/central)
+/obj/machinery/power/apc/auto_name/directional/east,
+/obj/structure/cable/yellow{
+ icon_state = "0-8"
+ },
+/obj/machinery/light_switch{
+ dir = 8;
+ pixel_x = 20;
+ pixel_y = 11
+ },
+/turf/open/floor/pod/dark,
+/area/ship/cargo)
"VZ" = (
/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2,
/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4,
@@ -8054,6 +8413,9 @@
/obj/effect/turf_decal/corner/opaque/syndiered{
dir = 9
},
+/obj/effect/turf_decal/borderfloorblack{
+ dir = 4
+ },
/turf/open/floor/plasteel/tech,
/area/ship/hallway/central)
"Wd" = (
@@ -8070,28 +8432,13 @@
},
/area/ship/bridge)
"Wj" = (
-/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/bottle/lizardwine{
- pixel_y = 14;
- pixel_x = 10
- },
-/obj/item/storage/fancy/cigarettes/cigars/havana{
- pixel_x = 4;
- pixel_y = 2
- },
-/obj/item/lighter{
- pixel_x = -10;
- pixel_y = -2
- },
-/obj/item/clothing/mask/cigarette/cigar{
- pixel_x = -4
- },
-/obj/machinery/power/apc/auto_name/directional/west,
-/obj/structure/cable/yellow{
- icon_state = "0-2"
+/obj/effect/turf_decal/corner/opaque/syndiered{
+ dir = 5
},
-/turf/open/floor/carpet/nanoweave/red,
-/area/ship/crew/dorm/dormtwo)
+/obj/structure/closet/crate/bin,
+/obj/effect/turf_decal/borderfloorblack,
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/port)
"Wm" = (
/obj/structure/table,
/obj/item/storage/bag/medical{
@@ -8110,34 +8457,17 @@
pixel_y = -1;
pixel_x = -5
},
-/turf/open/floor/plasteel/dark,
-/area/ship/medical)
-"Wo" = (
-/obj/effect/turf_decal/industrial/warning/corner{
- dir = 4
- },
-/obj/structure/cable/yellow{
- icon_state = "4-8"
- },
-/turf/open/floor/pod/dark,
-/area/ship/cargo)
-"Wr" = (
-/obj/effect/turf_decal/corner/transparent/bar/diagonal,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 6
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 6
- },
-/obj/structure/cable/yellow{
- icon_state = "0-2"
+/turf/open/floor/plasteel/dark,
+/area/ship/medical)
+"Wo" = (
+/obj/effect/turf_decal/industrial/warning/corner{
+ dir = 4
},
-/obj/machinery/power/apc/auto_name/directional/west,
/obj/structure/cable/yellow{
- icon_state = "2-4"
+ icon_state = "4-8"
},
-/turf/open/floor/plasteel,
-/area/ship/crew/dorm)
+/turf/open/floor/pod/dark,
+/area/ship/cargo)
"Ws" = (
/obj/effect/turf_decal/atmos/plasma{
dir = 8
@@ -8145,12 +8475,16 @@
/turf/open/floor/engine/plasma,
/area/ship/engineering/atmospherics)
"Wy" = (
-/obj/effect/turf_decal/industrial/warning{
- dir = 1
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 8
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/hallway/central)
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plating,
+/area/ship/hallway/port)
"WB" = (
/obj/structure/chair{
dir = 1
@@ -8158,24 +8492,31 @@
/turf/open/floor/mineral/plastitanium,
/area/ship/crew/office)
"WC" = (
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+/obj/machinery/atmospherics/pipe/manifold/purple/visible,
+/obj/effect/turf_decal/techfloor/orange{
+ dir = 10
+ },
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/engineering/atmospherics)
+"WG" = (
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
dir = 4
},
-/obj/machinery/door/airlock/engineering/glass/critical{
- name = "Supermatter";
- req_access = list(150,10);
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
dir = 4
},
-/turf/open/floor/engine,
-/area/ship/engineering/engine)
-"WG" = (
-/obj/effect/turf_decal/corner/transparent/bar/diagonal,
-/obj/machinery/vending/cigarette/syndicate,
-/obj/structure/sign/departments/restroom{
- pixel_y = 32
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
},
-/turf/open/floor/plasteel,
-/area/ship/crew/dorm)
+/obj/structure/cable/yellow{
+ icon_state = "1-8"
+ },
+/obj/structure/cable/yellow{
+ icon_state = "2-8"
+ },
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/turf/open/floor/plating,
+/area/ship/hallway/starboard)
"WH" = (
/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/nitrogen_input{
dir = 8
@@ -8198,16 +8539,15 @@
/turf/open/floor/plasteel/dark,
/area/ship/engineering)
"WL" = (
-/obj/structure/cable/yellow{
- icon_state = "4-8"
+/obj/effect/turf_decal/corner/opaque/syndiered{
+ dir = 10
},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 8
+/obj/structure/extinguisher_cabinet/directional/south,
+/obj/effect/turf_decal/borderfloorblack{
+ dir = 1
},
-/obj/structure/catwalk/over/plated_catwalk/dark,
-/turf/open/floor/plating,
-/area/ship/hallway/central)
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/port)
"WR" = (
/obj/effect/turf_decal/trimline/opaque/syndiered/filled/line{
dir = 1
@@ -8218,73 +8558,76 @@
/turf/open/floor/plasteel/dark,
/area/ship/medical)
"WV" = (
-/obj/machinery/light/directional/north,
-/obj/structure/bed,
-/obj/item/toy/plush/beeplushie,
-/obj/effect/turf_decal/spline/fancy/opaque/syndiered{
- dir = 2
+/obj/machinery/door/airlock/engineering/glass/critical{
+ name = "Supermatter";
+ req_access = list(150,10);
+ dir = 4
},
-/turf/open/floor/mineral/plastitanium/red,
-/area/ship/security)
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 4
+ },
+/turf/open/floor/engine,
+/area/ship/engineering/engine)
"WX" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/cyan/visible,
-/obj/structure/cable/yellow{
- icon_state = "1-2"
+/obj/effect/turf_decal/corner/opaque/syndiered{
+ dir = 5
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/door/airlock/atmos/glass{
- name = "Atmospherics";
- req_one_access_txt = "150";
- req_access = list(150,10)
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/closet/firecloset/wall{
+ pixel_y = 28
},
-/turf/open/floor/plasteel/telecomms_floor,
-/area/ship/engineering/communications)
+/obj/effect/turf_decal/borderfloorblack,
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/starboard)
"WZ" = (
-/obj/effect/turf_decal/corner/opaque/syndiered/three_quarters{
+/obj/effect/turf_decal/syndicateemblem/bottom/middle,
+/obj/effect/turf_decal/syndicateemblem/middle/left{
dir = 4
},
-/obj/effect/turf_decal/syndicateemblem/top/right{
- dir = 8
+/obj/effect/turf_decal/syndicateemblem/middle/right{
+ dir = 1
},
-/turf/open/floor/mineral/plastitanium,
+/obj/effect/turf_decal/spline/fancy/opaque/black{
+ dir = 4
+ },
+/turf/open/floor/mineral/plastitanium/red,
/area/ship/bridge)
"Xb" = (
-/obj/machinery/light/directional/north,
-/obj/structure/table/reinforced,
-/obj/item/paper_bin/carbon,
-/obj/item/pen/fountain,
-/obj/effect/turf_decal/corner/opaque/syndiered,
+/obj/effect/turf_decal/steeldecal/steel_decals10{
+ dir = 4
+ },
+/obj/effect/turf_decal/steeldecal/steel_decals10,
/turf/open/floor/mineral/plastitanium,
/area/ship/bridge)
"Xc" = (
/obj/structure/table/reinforced,
-/obj/machinery/fax,
/obj/effect/turf_decal/corner/opaque/syndiered/half{
dir = 8
},
+/obj/machinery/fax,
/turf/open/floor/mineral/plastitanium,
/area/ship/bridge)
"Xf" = (
-/obj/structure/rack,
-/obj/effect/turf_decal/box/white/corners{
+/obj/structure/table/wood,
+/obj/machinery/door/firedoor/border_only,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/turf/open/floor/carpet/red,
+/area/ship/crew/canteen)
+"Xg" = (
+/obj/effect/turf_decal/industrial/warning{
dir = 4
},
-/obj/effect/turf_decal/box/white/corners,
-/obj/structure/closet/firecloset/wall{
- dir = 1;
- pixel_y = -28
+/obj/effect/turf_decal/industrial/warning{
+ dir = 8
},
-/turf/open/floor/mineral/plastitanium,
-/area/ship/security)
-"Xg" = (
-/obj/structure/bed,
-/obj/item/bedsheet/syndie,
-/obj/structure/curtain/cloth/fancy{
- name = "blood-red curtains"
+/obj/structure/sign/poster/contraband/space_cola{
+ pixel_y = 32
},
-/turf/open/floor/carpet/red,
-/area/ship/crew/dorm/dormtwo)
+/obj/machinery/door/firedoor,
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/hallway/starboard)
"Xj" = (
/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/toxin_output{
dir = 8
@@ -8292,14 +8635,10 @@
/turf/open/floor/engine/plasma,
/area/ship/engineering/atmospherics)
"Xq" = (
-/obj/structure/table/wood/reinforced,
-/obj/item/storage/fancy/donut_box{
- name = "suspicious donut box"
- },
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 6
},
-/turf/open/floor/carpet/red,
+/turf/open/floor/mineral/plastitanium,
/area/ship/crew/office)
"Xs" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
@@ -8335,42 +8674,27 @@
/obj/machinery/camera/autoname{
dir = 8
},
+/obj/effect/turf_decal/borderfloorblack{
+ dir = 8
+ },
/turf/open/floor/plasteel/tech,
/area/ship/hallway/central)
"XL" = (
-/obj/structure/cable/yellow{
- icon_state = "4-8"
- },
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
- dir = 1
+/obj/machinery/door/airlock/external{
+ req_access = list(150)
},
-/obj/effect/turf_decal/industrial/warning,
-/turf/open/floor/plasteel/tech,
-/area/ship/hallway/central)
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/plasteel/dark,
+/area/ship/hallway/starboard)
"XN" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 6
- },
-/obj/structure/cable/yellow{
- icon_state = "2-4"
+/obj/machinery/atmospherics/pipe/simple/purple/visible{
+ dir = 10
},
-/obj/machinery/power/terminal{
+/obj/effect/turf_decal/techfloor/orange{
dir = 8
},
-/obj/structure/cable/yellow{
- icon_state = "0-4"
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 6
- },
-/obj/machinery/atmospherics/pipe/simple/purple/visible{
- dir = 1
- },
-/turf/open/floor/plating,
+/turf/open/floor/plasteel/tech/grid,
/area/ship/engineering/atmospherics)
"XU" = (
/obj/effect/turf_decal/corner/opaque/syndiered{
@@ -8379,20 +8703,11 @@
/turf/open/floor/plasteel/dark,
/area/ship/medical)
"Ya" = (
-/obj/structure/closet/emcloset/wall{
- dir = 4;
- pixel_x = -28
- },
-/obj/item/clothing/suit/space/syndicate,
-/obj/item/clothing/head/helmet/space/syndicate,
-/obj/item/clothing/head/helmet/space/syndicate,
-/obj/item/clothing/suit/space/syndicate,
-/obj/effect/turf_decal/trimline/opaque/syndiered/warning{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/layer_manifold,
+/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/light/small/directional/west,
/turf/open/floor/plasteel/dark,
-/area/ship/hallway/central)
+/area/ship/hallway/port)
"Yc" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber,
/obj/structure/sign/warning/nosmoking/burnt{
@@ -8405,9 +8720,6 @@
/turf/open/floor/engine,
/area/ship/engineering/engine)
"Yi" = (
-/obj/structure/chair{
- dir = 8
- },
/obj/effect/turf_decal/corner/opaque/syndiered{
dir = 6
},
@@ -8420,17 +8732,30 @@
pixel_x = 20;
pixel_y = 11
},
+/obj/structure/chair{
+ dir = 1
+ },
/turf/open/floor/mineral/plastitanium,
/area/ship/crew/office)
"Yj" = (
-/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer4,
+/obj/machinery/door/airlock/external{
+ req_access = list(150)
+ },
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/turf/open/floor/plasteel/dark,
-/area/ship/hallway/central)
+/area/ship/hallway/port)
"Yl" = (
-/obj/structure/grille,
-/obj/structure/window/plasma/reinforced/plastitanium,
-/turf/open/floor/plating,
+/obj/effect/turf_decal/corner/opaque/syndiered/border{
+ dir = 1
+ },
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/firedoor/border_only{
+ dir = 1
+ },
+/obj/machinery/door/airlock/public/glass,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/plasteel/tech,
/area/ship/crew/canteen)
"Ym" = (
/obj/machinery/door/firedoor/border_only{
@@ -8454,20 +8779,17 @@
/turf/open/floor/plasteel/dark,
/area/ship/bridge)
"Yn" = (
-/obj/item/kirbyplants/random,
-/obj/effect/turf_decal/corner/opaque/syndiered{
- dir = 10
+/obj/machinery/light/small/directional/west,
+/obj/effect/turf_decal/techfloor{
+ dir = 8
},
-/turf/open/floor/plasteel/tech,
-/area/ship/hallway/central)
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/crew/cryo)
"Yo" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/turf_decal/corner/opaque/syndiered{
- dir = 9
- },
-/obj/machinery/airalarm/directional/south,
-/turf/open/floor/mineral/plastitanium,
-/area/ship/bridge)
+/obj/structure/table/reinforced,
+/obj/machinery/chem_dispenser/drinks,
+/turf/open/floor/carpet/red,
+/area/ship/crew/canteen)
"Yp" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
@@ -8485,39 +8807,45 @@
/obj/effect/turf_decal/siding/thinplating/dark{
dir = 1
},
-/obj/effect/turf_decal/siding/thinplating/dark,
-/turf/open/floor/plasteel/telecomms_floor,
-/area/ship/engineering/communications)
-"Yz" = (
-/obj/item/kirbyplants/random,
-/obj/machinery/light/directional/west,
-/obj/structure/sign/poster/official/moth/smokey{
- pixel_y = 32
+/obj/effect/turf_decal/siding/thinplating/dark,
+/turf/open/floor/plasteel/telecomms_floor,
+/area/ship/engineering/communications)
+"Yv" = (
+/obj/effect/turf_decal/steeldecal/steel_decals_central2{
+ dir = 1
+ },
+/turf/open/floor/mineral/plastitanium/red,
+/area/ship/security)
+"Yz" = (
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+ dir = 1
},
-/obj/effect/turf_decal/corner/opaque/syndiered{
- dir = 5
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
},
-/turf/open/floor/plasteel/tech,
-/area/ship/hallway/central)
-"YB" = (
-/obj/machinery/atmospherics/components/trinary/mixer/airmix/flipped/inverse{
- dir = 1
+/obj/structure/cable/yellow{
+ icon_state = "2-8"
},
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/turf/open/floor/plating,
+/area/ship/hallway/port)
+"YB" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/cyan/visible,
+/obj/machinery/light/directional/east,
/obj/structure/cable/yellow{
icon_state = "1-2"
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/structure/cable/yellow{
- icon_state = "2-8"
+ icon_state = "1-5"
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/turf/open/floor/plating,
+/turf/open/floor/pod/dark,
/area/ship/engineering/atmospherics)
"YF" = (
-/obj/effect/turf_decal/corner/opaque/syndiered{
- dir = 9
- },
-/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/turf_decal/corner/opaque/syndiered/border{
dir = 4
},
@@ -8545,86 +8873,146 @@
/turf/open/floor/engine,
/area/ship/engineering/engine)
"YO" = (
-/obj/effect/turf_decal/corner/transparent/bar/diagonal,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
- dir = 8
+/obj/structure/rack,
+/obj/item/gun/ballistic/automatic/smg/c20r{
+ pixel_x = 2;
+ pixel_y = 8;
+ spawnwithmagazine = 0
},
-/obj/structure/cable/yellow{
- icon_state = "1-8"
+/obj/item/gun/ballistic/automatic/smg/c20r{
+ pixel_y = 3;
+ spawnwithmagazine = 0
},
-/turf/open/floor/plasteel,
-/area/ship/crew/dorm)
+/obj/item/gun/ballistic/automatic/smg/c20r{
+ pixel_y = -2;
+ pixel_x = 3;
+ spawnwithmagazine = 0
+ },
+/obj/item/ammo_box/magazine/smgm45,
+/obj/item/ammo_box/magazine/smgm45,
+/obj/item/ammo_box/magazine/smgm45,
+/obj/item/ammo_box/magazine/smgm45,
+/obj/item/ammo_box/magazine/smgm45,
+/obj/item/ammo_box/magazine/smgm45,
+/turf/open/floor/mineral/plastitanium,
+/area/ship/security/armory)
"YR" = (
-/obj/structure/closet/secure_closet/engineering_personal{
- req_access = list(150,10)
+/obj/structure/table/reinforced,
+/obj/machinery/door/window/brigdoor/eastleft,
+/obj/item/paper_bin,
+/obj/item/pen,
+/obj/machinery/door/firedoor/border_only{
+ dir = 4
},
-/obj/effect/turf_decal/corner/opaque/orange{
- dir = 10
+/obj/machinery/door/firedoor/border_only{
+ dir = 8
},
-/obj/machinery/light/directional/south,
-/obj/item/clothing/shoes/magboots/syndie,
-/obj/item/clothing/head/helmet/space/syndicate/black/engie,
-/obj/item/clothing/suit/space/syndicate/black/engie,
-/obj/item/pipe_dispenser,
-/turf/open/floor/plasteel/dark,
-/area/ship/engineering)
+/turf/open/floor/mineral/plastitanium,
+/area/ship/security)
"YT" = (
-/obj/effect/turf_decal/corner/opaque/syndiered{
- dir = 10
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 8
},
/obj/structure/cable/yellow{
- icon_state = "1-2"
+ icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/turf/open/floor/plasteel/tech,
-/area/ship/hallway/central)
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 8
+ },
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/obj/structure/cable/yellow{
+ icon_state = "2-4"
+ },
+/obj/machinery/light/directional/north,
+/turf/open/floor/plating,
+/area/ship/hallway/port)
"YW" = (
-/obj/effect/turf_decal/corner/opaque/syndiered/border{
+/obj/machinery/camera/autoname{
+ dir = 6
+ },
+/obj/effect/turf_decal/syndicateemblem/middle/left{
+ dir = 8
+ },
+/obj/effect/turf_decal/syndicateemblem/bottom/middle{
dir = 1
},
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/turf_decal/corner/opaque/syndiered/border,
/obj/effect/turf_decal/spline/fancy/opaque/black{
- dir = 1
+ dir = 4
},
-/turf/open/floor/mineral/plastitanium,
+/turf/open/floor/mineral/plastitanium/red,
/area/ship/bridge)
"Zc" = (
-/obj/effect/turf_decal/corner/opaque/syndiered{
+/obj/structure/closet/secure_closet/engineering_personal{
+ req_access = list(150,10);
+ populate = 0
+ },
+/obj/effect/turf_decal/corner/opaque/orange{
dir = 10
},
-/obj/structure/closet/emcloset/anchored,
-/turf/open/floor/plasteel/tech,
-/area/ship/hallway/central)
+/obj/machinery/light/directional/south,
+/obj/item/clothing/shoes/magboots/syndie,
+/obj/item/clothing/head/helmet/space/syndicate/black/engie,
+/obj/item/clothing/suit/space/syndicate/black/engie,
+/obj/item/pipe_dispenser,
+/obj/item/storage/belt/utility/syndicate,
+/obj/item/clothing/under/syndicate/gec,
+/obj/item/clothing/glasses/meson/engine,
+/obj/item/clothing/suit/hazardvest,
+/obj/item/clothing/gloves/color/yellow,
+/obj/item/clothing/head/hardhat/red{
+ name = "hard hat"
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/engineering)
"Zg" = (
/obj/effect/turf_decal/industrial/warning{
dir = 6
},
-/obj/structure/tank_dispenser/oxygen,
+/obj/structure/sign/poster/solgov/suns{
+ pixel_x = 32
+ },
+/obj/structure/crate_shelf,
/turf/open/floor/pod/dark,
/area/ship/cargo)
"Zk" = (
-/obj/effect/turf_decal/corner/opaque/syndiered/full,
-/obj/effect/turf_decal/syndicateemblem/bottom/middle{
+/obj/effect/turf_decal/syndicateemblem/bottom/right{
dir = 8
},
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/mineral/plastitanium,
+/obj/effect/turf_decal/syndicateemblem/middle/left{
+ dir = 1
+ },
+/obj/effect/turf_decal/syndicateemblem/middle/right{
+ dir = 4
+ },
+/obj/effect/turf_decal/spline/fancy/opaque/black{
+ dir = 8
+ },
+/turf/open/floor/mineral/plastitanium/red,
/area/ship/bridge)
"Zt" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
+/obj/machinery/cryopod/syndicate{
+ dir = 4
+ },
+/obj/effect/turf_decal/techfloor{
+ dir = 9
},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/crew/cryo)
+"Zu" = (
/obj/structure/cable/yellow{
- icon_state = "4-8"
+ icon_state = "1-2"
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+/obj/effect/turf_decal/industrial/warning{
+ dir = 4
+ },
+/obj/effect/turf_decal/industrial/warning{
dir = 8
},
-/obj/structure/catwalk/over/plated_catwalk/dark,
-/turf/open/floor/plating,
-/area/ship/hallway/central)
+/obj/effect/turf_decal/steeldecal/steel_decals_central6{
+ dir = 4
+ },
+/turf/open/floor/plasteel/telecomms_floor,
+/area/ship/crew/cryo)
"Zw" = (
/obj/machinery/atmospherics/pipe/simple/orange/visible{
dir = 10
@@ -8649,13 +9037,9 @@
/turf/open/floor/engine,
/area/ship/engineering/engine)
"ZC" = (
-/obj/effect/turf_decal/industrial/warning/corner{
- dir = 8
- },
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/pod/dark,
/area/ship/cargo)
"ZD" = (
@@ -8664,33 +9048,26 @@
},
/area/ship/engineering/engine)
"ZJ" = (
-/obj/structure/cable/yellow{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 8
+/obj/effect/turf_decal/corner/opaque/syndiered{
+ dir = 10
},
-/obj/structure/cable/yellow{
- icon_state = "1-8"
+/obj/structure/closet/emcloset/anchored,
+/obj/effect/turf_decal/borderfloorblack{
+ dir = 1
},
-/obj/structure/catwalk/over/plated_catwalk/dark,
-/turf/open/floor/plating,
-/area/ship/hallway/central)
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/port)
"ZO" = (
/obj/effect/turf_decal/industrial/warning{
dir = 1
},
/obj/effect/turf_decal/industrial/warning,
-/obj/machinery/door/firedoor/border_only,
-/obj/machinery/door/firedoor/border_only{
- dir = 1
- },
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/structure/cable/yellow{
icon_state = "1-2"
},
+/obj/machinery/door/firedoor,
/turf/open/floor/plasteel/mono/dark,
/area/ship/hallway/central)
"ZQ" = (
@@ -8719,7 +9096,6 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
dir = 1
},
-/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plasteel/tech,
/area/ship/engineering/atmospherics)
@@ -8836,25 +9212,25 @@ NO
iJ
wM
FR
-PE
-sj
-SK
+tU
+aj
LH
Hk
iC
sj
+MZ
uP
nk
NK
RE
ch
-uY
Aq
uY
OS
nq
-sj
+pL
aj
+WC
FR
NO
iJ
@@ -8867,33 +9243,33 @@ mp
mp
mp
FR
-TR
xh
XN
eg
OZ
cL
KU
-Vk
+zi
xw
hZ
Rc
-WX
+SK
+iL
Fm
DK
IU
-DF
-pw
+si
Rj
YB
gv
-KU
+tg
zi
Ke
zs
Ua
SI
TR
+PE
FR
mp
mp
@@ -8902,25 +9278,24 @@ mp
mp
mp
FR
-iu
Rd
Ku
zr
wm
tl
-aG
+jr
Gx
-tl
+Sv
+jr
FR
-MZ
+wz
UN
UN
UN
UN
UN
-Sv
+lw
FR
-tl
jr
sY
ky
@@ -8929,6 +9304,7 @@ lv
eQ
Mo
GC
+iG
FR
mp
mp
@@ -9151,7 +9527,7 @@ ZX
Qd
bM
zH
-bV
+zZ
ZX
hN
IT
@@ -9160,7 +9536,7 @@ Zz
Zz
ZD
ZD
-WC
+WV
ZD
ZD
um
@@ -9186,7 +9562,7 @@ ZX
fz
zK
qK
-YR
+Zc
ZX
RG
BV
@@ -9216,12 +9592,12 @@ mp
(15,1,1) = {"
mp
mp
-bL
+mp
ZX
WK
pB
wA
-bQ
+De
ZX
Dk
NI
@@ -9230,7 +9606,7 @@ ZD
ZD
ZD
ZD
-AL
+TM
ZD
ZD
ZD
@@ -9274,10 +9650,10 @@ Et
yf
qo
mX
+ia
Vy
Hu
Pb
-yn
FR
mp
mp
@@ -9293,7 +9669,7 @@ xj
xj
xj
xj
-oB
+fN
ZD
Na
vJ
@@ -9312,7 +9688,7 @@ PL
PL
PL
PL
-jA
+kT
Bj
Bj
Bj
@@ -9320,13 +9696,13 @@ We
"}
(18,1,1) = {"
xj
-RB
-jx
Ii
+iu
+jo
pj
qA
Fa
-nE
+fQ
xj
Kq
ZD
@@ -9343,27 +9719,27 @@ xo
pc
TT
PL
+Gm
Si
Sg
-wR
PL
-NE
+Fu
+sd
yN
nr
Bj
-Bj
"}
(19,1,1) = {"
xj
-xj
-Ux
+qP
+sf
Kx
-fN
-mO
+ih
+UW
Qa
-dD
+lY
xj
-Jz
+cW
ZD
ZD
ZD
@@ -9378,30 +9754,30 @@ ZD
ZD
ZD
PL
-Si
-si
+dm
+cD
sr
Eo
-lT
-da
-vn
-Bj
+Tt
+sd
+ET
+ET
Bj
"}
(20,1,1) = {"
-mp
-xj
-Sj
-VO
-wz
-VG
-qP
+ML
+dD
+sf
+VU
+ih
+UW
+Qa
ma
xj
+VH
yF
-SM
-sd
-xP
+oX
+Sk
xa
Ru
Ei
@@ -9411,32 +9787,32 @@ xa
xP
oX
PN
-PN
+ec
PL
-sG
+YO
ji
wg
-gk
-Kg
-IB
-fX
+Uc
+mO
+sd
+ET
+fK
Bj
-mp
"}
(21,1,1) = {"
-mp
ML
-lY
-VO
-tU
-VG
-cD
+Yo
+sf
+Xf
+ih
+UW
+UW
ml
Yl
+Jz
DW
-YT
-gW
-cq
+ea
+Nh
ag
Ax
kd
@@ -9445,32 +9821,32 @@ jk
ag
cq
ea
+BG
tY
-kl
PL
-Si
Rv
+jx
TC
on
-cX
-AK
+ep
+sd
+da
kH
Bj
-mp
"}
(22,1,1) = {"
-mp
-ML
-sf
+xj
+wb
+aG
VO
ih
Ky
dU
Qv
UF
-HL
-lw
-vz
+AL
+lT
+uH
vz
vz
uE
@@ -9480,33 +9856,33 @@ gX
sO
sO
sO
-VH
-oi
+AK
+Pe
PL
-Si
+Bq
+Fr
Up
-hS
PL
-Nh
-MK
-vE
+Tt
+sd
+Bj
+Bj
Bj
-mp
"}
(23,1,1) = {"
-mp
xj
-dH
-lq
-Sy
-Bq
-gZ
-zP
-dp
+xj
+xj
+xj
+xj
+xj
+xj
+xj
+xj
+Tn
WL
-ru
vz
-Wj
+eF
Cj
ON
MA
@@ -9515,66 +9891,66 @@ Qs
Ry
PM
sO
+xz
kR
-Fr
PL
PL
jH
jH
PL
-BG
+BL
+EG
da
-Xf
+pN
Bj
-mp
"}
(24,1,1) = {"
-mp
-JM
-JM
-JM
-JM
-JM
-JM
JM
+hP
+Ed
+CJ
+Sj
+Nr
+gZ
+GH
JM
-mG
-lw
+Sy
+lT
vz
-dm
+kl
yM
ts
-Xg
+fX
vz
ID
TI
Fj
sO
-KJ
-ox
-IC
+QC
+Cq
+Bj
aD
+nt
oc
-oc
-oc
-ln
+Eh
+Tt
+EG
+ET
ET
-kc
Bj
-mp
"}
(25,1,1) = {"
-mp
-JM
-yP
-He
+Wd
+Wd
+Wd
+Wd
+Wd
LG
-Nr
-Wr
+hY
qI
PY
+Gj
RU
-Tt
sp
sp
Ee
@@ -9585,101 +9961,101 @@ sp
sp
Ee
sp
-VY
-GH
+TU
+vE
Bj
-Ed
+pw
ow
+gk
oG
-pR
-KK
-AK
-Ey
+Tt
+EG
+ET
+ET
Bj
-mp
"}
(26,1,1) = {"
-mp
-Wd
-Wd
Wd
+Zt
+Yn
+lG
Wd
-WG
+ln
Ql
-QR
+bV
JM
+IB
oi
-zO
sp
cC
ir
mm
Ls
-HQ
+Ls
AQ
oJ
NC
sp
+WX
Fl
-cd
-Bj
Bj
+YR
dq
Bj
Bj
-pD
-sc
-pN
+Tt
+sd
+da
+fJ
Bj
-mp
"}
(27,1,1) = {"
-mp
Wd
+Sb
+Zu
gz
yO
-Wd
+DF
ps
No
-aA
JM
+IC
tH
-At
sp
qN
im
-hE
+im
kF
Xq
KF
WB
wa
sp
-Gy
-oi
+wh
+Pe
+Bj
+ET
+ET
+ET
Bj
-pL
-SV
-pE
Dp
-CJ
-da
-Eh
-wh
-mp
+sd
+Bj
+Bj
+Bj
"}
(28,1,1) = {"
-mp
Wd
+KK
+cj
fn
-iG
-SR
-FI
-YO
+Wd
+SZ
+bv
Fi
JM
-Zt
-pO
+YT
+cT
sp
pm
qT
@@ -9690,32 +10066,32 @@ Dx
gL
GG
sp
+wh
Gy
-nt
-Bj
+KJ
+sG
Gk
HH
Pa
+At
+sd
+da
+pN
Bj
-HG
-IB
-hY
-wh
-mp
"}
(29,1,1) = {"
-mp
+Wd
Va
Wd
Wd
Wd
-bv
-JY
JM
JM
+JM
+JM
+pO
qY
-Bs
-sp
+BT
sp
Ee
sp
@@ -9724,34 +10100,34 @@ CR
sp
sp
Ee
-sp
-kT
-oi
-Bj
-Bj
+Eq
+qp
+Pe
Bj
Bj
Bj
-fJ
-AK
+Ey
+Ey
+kf
+sd
+ET
fK
-TM
-mp
+Bj
"}
(30,1,1) = {"
mp
lo
CV
Go
+pH
+GP
+SR
Bw
-Bw
-Bw
-Bw
+pD
Yz
hr
-Id
-BK
-Yp
+ZO
+pR
Xs
Id
UA
@@ -9760,18 +10136,18 @@ bH
pU
Yp
ZO
-Id
+ru
+WG
lg
tn
-Yn
Bj
-GD
-mB
+KB
+dE
+HG
EG
-ia
-ia
+ET
+ET
Bj
-mp
"}
(31,1,1) = {"
mp
@@ -9779,34 +10155,34 @@ VC
AW
ZC
Um
-pH
-ep
+tp
+VG
Bw
-KJ
-oi
-UW
+Wj
+IB
+nE
IN
wu
If
-KM
+oB
KM
yX
KM
kM
XE
-sz
-KM
+IN
+SM
+ak
Pe
-oi
-Gm
+hS
Bj
-CQ
+dH
+GD
Nj
+eN
+da
+Bn
Bj
-CQ
-SZ
-Bj
-mp
"}
(32,1,1) = {"
JT
@@ -9814,34 +10190,34 @@ VC
AW
UK
EO
-fQ
EQ
+dp
+Bs
KQ
yz
ZJ
-Zc
ex
dz
-uh
-uh
-tg
+dz
+dz
uX
+Ux
uh
uh
dz
dz
zS
-Tn
-oi
-lw
+zO
+Pe
+gi
Bj
-xe
+CQ
+CQ
MK
+CQ
+Bj
Bj
-Qx
-tp
Bj
-mp
"}
(33,1,1) = {"
mp
@@ -9849,12 +10225,12 @@ vQ
dg
NT
Wo
-Uc
+Vk
ng
+vn
KA
Wy
oj
-eF
dz
ii
XU
@@ -9866,30 +10242,30 @@ YJ
jM
vW
dz
+JY
gI
fm
-zZ
-Bj
-WV
-xz
Bj
-BL
+wx
+ET
+DB
+gW
+Yv
qL
Bj
-mp
"}
(34,1,1) = {"
mp
jT
Bw
Bw
+VY
gE
-Vv
Zg
Bw
+cX
dl
bR
-hP
dz
Dh
st
@@ -9901,17 +10277,17 @@ On
JE
rt
dz
+Kg
ak
Pe
-cW
Bj
+QR
+BK
OY
-MK
-Bj
+cd
Bj
Bj
Bj
-mp
"}
(35,1,1) = {"
mp
@@ -9922,11 +10298,11 @@ Bw
Bw
Bw
Bw
+pE
GM
-iL
-je
je
je
+FI
je
je
Jf
@@ -9937,14 +10313,14 @@ uK
fl
dz
dz
+Xg
Fs
-qp
Bj
Bj
Bj
Bj
Bj
-mp
+Bj
mp
mp
"}
@@ -9953,31 +10329,31 @@ mp
mp
mp
mp
+He
IV
Ya
-Sb
-RW
+Yj
+yP
GW
-pO
je
KI
pp
FE
CF
-dE
+zc
Wm
bN
-De
+RT
Ap
Ie
ck
dz
-Gy
+dk
+Qk
XL
-RW
+SV
GN
-NF
-IV
+zk
mp
mp
mp
@@ -9988,12 +10364,12 @@ mp
mp
mp
ZV
-IV
+He
+yn
ql
Yj
-RW
-GW
-kf
+yP
+hd
je
hb
jz
@@ -10007,12 +10383,12 @@ Ap
Ie
FW
dz
+wR
Qk
XL
RW
lO
zk
-IV
xZ
mp
mp
@@ -10024,11 +10400,11 @@ mp
mp
mp
vd
-xB
-xB
-xB
-gi
-pO
+NE
+NE
+NE
+kc
+GW
je
zG
hW
@@ -10042,8 +10418,8 @@ WR
Ie
Ks
dz
-KJ
-hd
+dk
+lx
xB
xB
xB
@@ -10061,9 +10437,9 @@ mp
mp
mp
mp
-xB
-HY
-EX
+NE
+RB
+mG
je
iZ
Iw
@@ -10077,8 +10453,8 @@ nb
VM
SS
dz
+dk
ka
-lx
xB
mp
mp
@@ -10100,17 +10476,17 @@ nb
Ym
nb
nb
-Pv
-pp
+nb
+nb
nb
Xc
Kk
-KB
+mB
zp
np
nb
-jv
-hj
+nb
+nb
nb
nb
Fh
@@ -10135,17 +10511,17 @@ Hj
do
wL
nb
-nb
-nb
-nb
+Pv
+jv
+jO
+ox
Xb
vL
-wb
-vL
-lG
-nb
-nb
-nb
+cI
+bL
+Hx
+Qt
+Lw
nb
MP
Oj
@@ -10170,17 +10546,17 @@ bo
Gv
RA
nb
-Qt
+lq
+br
dL
zy
xg
pI
Zk
bd
-PA
+Bi
kE
wr
-Yo
nb
BU
et
@@ -10205,17 +10581,17 @@ eL
Fq
QT
en
+jA
+oD
oD
-Bc
Bc
ie
VJ
aX
vO
hU
-dk
-dk
-dk
+hU
+hU
vA
yg
Ir
@@ -10240,17 +10616,17 @@ nb
PB
nb
nb
+YW
Tl
-vL
+PA
OK
FS
kV
mx
WZ
+Tv
+HL
tZ
-vL
-OK
-Fu
nb
nb
hR
@@ -10277,13 +10653,13 @@ Fc
nb
VB
nb
-VU
-cj
+bQ
+YF
+YF
EJ
-UI
+YF
YF
Sd
-Jw
nb
FV
nb
@@ -10308,17 +10684,17 @@ mp
nb
iK
jG
-Fc
+nw
nb
mp
QE
uo
-pr
+sc
+Sa
+EX
Sa
-Gj
tS
tr
-YW
QE
mp
nb
@@ -10353,7 +10729,7 @@ jh
zf
oP
Ao
-RT
+aA
QE
mp
nb
diff --git a/_maps/templates/shelter_3.dmm b/_maps/templates/shelter_3.dmm
index 164018096972..402c5f04923c 100644
--- a/_maps/templates/shelter_3.dmm
+++ b/_maps/templates/shelter_3.dmm
@@ -39,7 +39,7 @@
/turf/open/floor/pod/dark,
/area/survivalpod)
"i" = (
-/obj/item/book/manual/wiki/barman_recipes,
+/obj/item/book/manual/wiki/drinks,
/obj/item/reagent_containers/food/drinks/shaker,
/obj/item/reagent_containers/glass/rag,
/obj/structure/table/wood/fancy/black,
diff --git a/check_regex.yaml b/check_regex.yaml
index df64dec9aae1..5420d8fa692c 100644
--- a/check_regex.yaml
+++ b/check_regex.yaml
@@ -38,7 +38,7 @@ standards:
- exactly:
[
- 295,
+ 271,
"non-bitwise << uses",
'(? length
+#define DIGITS(x) (ROUND_UP(log(10, x)))
+
// round() acts like floor(x, 1) by default but can't handle other values
#define FLOOR(x, y) (round((x) / (y)) * (y))
diff --git a/code/__DEFINES/preferences.dm b/code/__DEFINES/preferences.dm
index 6adb8fdbc364..c65f26a89fd3 100644
--- a/code/__DEFINES/preferences.dm
+++ b/code/__DEFINES/preferences.dm
@@ -23,6 +23,7 @@
#define SOUND_ENDOFROUND (1<<20)
#define ADMIN_IGNORE_CULT_GHOST (1<<21)
#define SPLIT_ADMIN_TABS (1<<22)
+#define FAST_MC_REFRESH (1<<23)
#define TOGGLES_DEFAULT (SOUND_ADMINHELP|SOUND_MIDI|SOUND_AMBIENCE|SOUND_LOBBY|SOUND_ENDOFROUND|MEMBER_PUBLIC|INTENT_STYLE|MIDROUND_ANTAG|SOUND_INSTRUMENTS|SOUND_SHIP_AMBIENCE|SOUND_PRAYERS|SOUND_ANNOUNCEMENTS)
diff --git a/code/__DEFINES/statpanel.dm b/code/__DEFINES/statpanel.dm
index c5378235fc63..7f954b6ad378 100644
--- a/code/__DEFINES/statpanel.dm
+++ b/code/__DEFINES/statpanel.dm
@@ -1,11 +1,5 @@
/// Bare minimum required verbs for client functionality
GLOBAL_LIST_INIT(client_verbs_required, list(
- // Stat panel internal verbs
- /client/verb/set_tab,
- /client/verb/send_tabs,
- /client/verb/remove_tabs,
- /client/verb/reset_tabs,
- /client/verb/panel_ready,
// Skin buttons that should always work
/client/verb/rules,
/client/verb/lore,
diff --git a/code/__DEFINES/subsystems.dm b/code/__DEFINES/subsystems.dm
index 7f5569e3e609..629755487849 100644
--- a/code/__DEFINES/subsystems.dm
+++ b/code/__DEFINES/subsystems.dm
@@ -177,6 +177,7 @@
#define FIRE_PRIORITY_TGUI 110
#define FIRE_PRIORITY_TICKER 200
#define FIRE_PRIORITY_ATMOS_ADJACENCY 300
+#define FIRE_PRIORITY_STATPANEL 390
#define FIRE_PRIORITY_CHAT 400
#define FIRE_PRIORITY_RUNECHAT 410
#define FIRE_PRIORITY_MOUSE_ENTERED 450
@@ -257,3 +258,16 @@
} \
A.flags_1 &= ~OVERLAY_QUEUED_1; \
}while(FALSE)
+
+// Vote subsystem counting methods
+/// First past the post. One selection per person, and the selection with the most votes wins.
+#define VOTE_COUNT_METHOD_SINGLE 1
+/// Approval voting. Any number of selections per person, and the selection with the most votes wins.
+#define VOTE_COUNT_METHOD_MULTI 2
+
+/// The choice with the most votes wins. Ties are broken by the first choice to reach that number of votes.
+#define VOTE_WINNER_METHOD_SIMPLE "Simple"
+/// The winning choice is selected randomly based on the number of votes each choice has.
+#define VOTE_WINNER_METHOD_WEIGHTED_RANDOM "Weighted Random"
+/// There is no winner for this vote.
+#define VOTE_WINNER_METHOD_NONE "None"
diff --git a/code/__HELPERS/game.dm b/code/__HELPERS/game.dm
index 6dc31eea2fdb..b249fede86ed 100644
--- a/code/__HELPERS/game.dm
+++ b/code/__HELPERS/game.dm
@@ -363,8 +363,8 @@ block( \
viewing += M.client
flick_overlay(I, viewing, duration)
-/proc/get_active_player_count(alive_check = 0, afk_check = 0, human_check = 0)
- // Get active players who are playing in the round
+///Get active players who are playing in the round
+/proc/get_active_player_count(alive_check = FALSE, afk_check = FALSE, human_check = FALSE)
var/active_players = 0
for(var/i = 1; i <= GLOB.player_list.len; i++)
var/mob/M = GLOB.player_list[i]
diff --git a/code/__HELPERS/global_lists.dm b/code/__HELPERS/global_lists.dm
index 1048aaa5c861..e44755574eea 100644
--- a/code/__HELPERS/global_lists.dm
+++ b/code/__HELPERS/global_lists.dm
@@ -35,6 +35,7 @@
init_sprite_accessory_subtypes(/datum/sprite_accessory/squid_face, GLOB.squid_face_list)
init_sprite_accessory_subtypes(/datum/sprite_accessory/ipc_screens, GLOB.ipc_screens_list)
init_sprite_accessory_subtypes(/datum/sprite_accessory/ipc_antennas, GLOB.ipc_antennas_list)
+ init_sprite_accessory_subtypes(/datum/sprite_accessory/ipc_tail, GLOB.ipc_tail_list)
init_sprite_accessory_subtypes(/datum/sprite_accessory/ipc_chassis, GLOB.ipc_chassis_list)
init_sprite_accessory_subtypes(/datum/sprite_accessory/moth_markings, GLOB.moth_markings_list)
init_sprite_accessory_subtypes(/datum/sprite_accessory/spider_legs, GLOB.spider_legs_list)
diff --git a/code/__HELPERS/mobs.dm b/code/__HELPERS/mobs.dm
index 8838ba324530..fdeadc13b61a 100644
--- a/code/__HELPERS/mobs.dm
+++ b/code/__HELPERS/mobs.dm
@@ -72,6 +72,8 @@
init_sprite_accessory_subtypes(/datum/sprite_accessory/ipc_screens, GLOB.ipc_screens_list)
if(!GLOB.ipc_antennas_list.len)
init_sprite_accessory_subtypes(/datum/sprite_accessory/ipc_antennas, GLOB.ipc_antennas_list)
+ if(!GLOB.ipc_tail_list.len)
+ init_sprite_accessory_subtypes(/datum/sprite_accessory/ipc_antennas, GLOB.ipc_tail_list)
if(!GLOB.ipc_chassis_list.len)
init_sprite_accessory_subtypes(/datum/sprite_accessory/ipc_chassis, GLOB.ipc_chassis_list)
if(!GLOB.spider_legs_list.len)
diff --git a/code/__HELPERS/names.dm b/code/__HELPERS/names.dm
index 820e88389ef1..dc9fbf80e293 100644
--- a/code/__HELPERS/names.dm
+++ b/code/__HELPERS/names.dm
@@ -242,6 +242,15 @@ GLOBAL_LIST_INIT(ship_faction_to_prefixes, list(
"SEV",
"SSV",
),
+ "New Gorlex Republic" = list(
+ "NGRV",
+ ),
+ "CyberSun" = list(
+ "CSSV",
+ ),
+ "Student-Union of Naturalistic Sciences" = list(
+ "SUNS",
+ ),
"SolGov" = list(
"SGSV",
),
@@ -252,6 +261,7 @@ GLOBAL_LIST_INIT(ship_faction_to_prefixes, list(
"SV",
"IMV",
"ISV",
+ "XSV",
),
"Inteq Risk Management Group" = list(
"IRMV",
@@ -263,6 +273,12 @@ GLOBAL_LIST_INIT(ship_faction_to_prefixes, list(
"Nanotrasen" = list(
"NTSV",
),
+ "Frontiersmen Fleet" = list(
+ "FFV",
+ ),
+ "Saint-Roumaine Militia" = list(
+ "SRSV",
+ ),
))
/proc/ship_prefix_to_faction(prefix)
diff --git a/code/__HELPERS/verbs.dm b/code/__HELPERS/verbs.dm
index 7f9fb0e4049a..83bdcb63b7fb 100644
--- a/code/__HELPERS/verbs.dm
+++ b/code/__HELPERS/verbs.dm
@@ -43,9 +43,8 @@
for(var/thing in verbs_list)
var/procpath/verb_to_add = thing
output_list[++output_list.len] = list(verb_to_add.category, verb_to_add.name)
- output_list = url_encode(json_encode(output_list))
- target << output("[output_list];", "statbrowser:add_verb_list")
+ target.stat_panel.send_message("add_verb_list", output_list)
/**
* handles removing verb and sending it to browser to update, use this for removing verbs
@@ -96,6 +95,5 @@
for(var/thing in verbs_list)
var/procpath/verb_to_remove = thing
output_list[++output_list.len] = list(verb_to_remove.category, verb_to_remove.name)
- output_list = url_encode(json_encode(output_list))
- target << output("[output_list];", "statbrowser:remove_verb_list")
+ target.stat_panel.send_message("remove_verb_list", output_list)
diff --git a/code/_globalvars/lists/flavor_misc.dm b/code/_globalvars/lists/flavor_misc.dm
index aca090086487..479e43e34543 100644
--- a/code/_globalvars/lists/flavor_misc.dm
+++ b/code/_globalvars/lists/flavor_misc.dm
@@ -39,6 +39,7 @@ GLOBAL_LIST_EMPTY(moth_markings_list)
GLOBAL_LIST_EMPTY(squid_face_list)
GLOBAL_LIST_EMPTY(ipc_screens_list)
GLOBAL_LIST_EMPTY(ipc_antennas_list)
+GLOBAL_LIST_EMPTY(ipc_tail_list)
GLOBAL_LIST_EMPTY(ipc_chassis_list)
GLOBAL_LIST_INIT(ipc_brain_list, list("Posibrain", "Man-Machine Interface"))
GLOBAL_LIST_EMPTY(spider_legs_list)
diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm
index f8c60ecd97fa..81ce3ceec1eb 100644
--- a/code/_onclick/click.dm
+++ b/code/_onclick/click.dm
@@ -343,15 +343,13 @@
SEND_SIGNAL(src, COMSIG_CLICK_ALT, user)
var/turf/T = get_turf(src)
if(T && (isturf(loc) || isturf(src)) && user.TurfAdjacent(T))
- user.listed_turf = T
- user.client << output("[url_encode(json_encode(T.name))];", "statbrowser:create_listedturf")
+ user.set_listed_turf(T)
/// Use this instead of [/mob/proc/AltClickOn] where you only want turf content listing without additional atom alt-click interaction
/atom/proc/AltClickNoInteract(mob/user, atom/A)
var/turf/T = get_turf(A)
if(T && user.TurfAdjacent(T))
- user.listed_turf = T
- user.client << output("[url_encode(json_encode(T.name))];", "statbrowser:create_listedturf")
+ user.set_listed_turf(T)
/mob/proc/TurfAdjacent(turf/T)
return T.Adjacent(src)
diff --git a/code/_onclick/drag_drop.dm b/code/_onclick/drag_drop.dm
index ac401489f40a..632bc77ec958 100644
--- a/code/_onclick/drag_drop.dm
+++ b/code/_onclick/drag_drop.dm
@@ -15,12 +15,12 @@
if(!Adjacent(usr) || !over.Adjacent(usr))
return // should stop you from dragging through windows
- over.MouseDrop_T(src,usr)
+ over.MouseDrop_T(src,usr,params)
return
// receive a mousedrop
-/atom/proc/MouseDrop_T(atom/dropping, mob/user)
- SEND_SIGNAL(src, COMSIG_MOUSEDROPPED_ONTO, dropping, user)
+/atom/proc/MouseDrop_T(atom/dropping, mob/user, params)
+ SEND_SIGNAL(src, COMSIG_MOUSEDROPPED_ONTO, dropping, user, params)
return
diff --git a/code/controllers/configuration/entries/general.dm b/code/controllers/configuration/entries/general.dm
index 6a5959574754..a59d14cce4d3 100644
--- a/code/controllers/configuration/entries/general.dm
+++ b/code/controllers/configuration/entries/general.dm
@@ -102,9 +102,9 @@
/datum/config_entry/flag/allow_admin_asaycolor //Allows admins with relevant permissions to have a personalized asay color
-/datum/config_entry/flag/allow_vote_restart // allow votes to restart
+/datum/config_entry/flag/allow_vote_restart // allow player votes to restart
-/datum/config_entry/flag/allow_vote_mode // allow votes to change mode
+/datum/config_entry/flag/allow_vote_transfer // allow player votes to initiate a transfer
/datum/config_entry/flag/auth_only // server can only be used for authentication
@@ -120,7 +120,9 @@
integer = FALSE
min_val = 0
-//WS Begin - Autotranfer vote
+/// If disabled, no-voters will automatically have their votes added to certain vote options
+/// (For eample: restart votes will default to "no restart", map votes will default to their preferred map / default map)
+/datum/config_entry/flag/default_no_vote
/datum/config_entry/number/vote_autotransfer_initial //length of time before the first autotransfer vote is called (deciseconds, default 2 hours)
config_entry_value = 72000
@@ -132,9 +134,6 @@
integer = FALSE
min_val = 0
-//WS End
-
-/datum/config_entry/flag/default_no_vote // vote does not default to nochange/norestart
/datum/config_entry/flag/no_dead_vote // dead people can't vote
diff --git a/code/controllers/subsystem/autotransfer.dm b/code/controllers/subsystem/autotransfer.dm
index 1cb5e7851c13..2b1259ef4f5f 100644
--- a/code/controllers/subsystem/autotransfer.dm
+++ b/code/controllers/subsystem/autotransfer.dm
@@ -3,19 +3,19 @@ SUBSYSTEM_DEF(autotransfer)
flags = SS_KEEP_TIMING | SS_BACKGROUND
wait = 1 MINUTES
- var/starttime
- var/targettime
+ COOLDOWN_DECLARE(next_vote)
/datum/controller/subsystem/autotransfer/Initialize(timeofday)
- starttime = world.time
- targettime = starttime + CONFIG_GET(number/vote_autotransfer_initial)
+ COOLDOWN_START(src, next_vote, CONFIG_GET(number/vote_autotransfer_initial))
return ..()
/datum/controller/subsystem/autotransfer/fire()
- if (world.time > targettime)
- SSvote.initiate_vote("transfer",null, FALSE) //WS Edit - Ghost Vote Rework
- targettime = targettime + CONFIG_GET(number/vote_autotransfer_interval)
+ if(COOLDOWN_FINISHED(src, next_vote))
+ //Delay the vote if there's already a vote in progress
+ if(SSvote.current_vote)
+ COOLDOWN_START(src, next_vote, SSvote.current_vote.time_remaining + 10 SECONDS)
+ SSvote.initiate_vote(/datum/vote/transfer_vote, "The Server", forced = TRUE)
+ COOLDOWN_START(src, next_vote, CONFIG_GET(number/vote_autotransfer_interval))
/datum/controller/subsystem/autotransfer/Recover()
- starttime = SSautotransfer.starttime
- targettime = SSautotransfer.targettime
+ next_vote = SSautotransfer.next_vote
diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm
index 92b8d146c4fc..03720e4d641f 100644
--- a/code/controllers/subsystem/mapping.dm
+++ b/code/controllers/subsystem/mapping.dm
@@ -109,11 +109,6 @@ SUBSYSTEM_DEF(mapping)
#define INIT_ANNOUNCE(X) to_chat(world, "[X] "); log_world(X)
-/datum/controller/subsystem/mapping/proc/mapvote()
- SSvote.initiate_vote("map", "automatic map rotation", TRUE) //WS Edit - Ghost Voting Rework
-
-/datum/controller/subsystem/mapping/proc/changemap(datum/map_template/map)
-
/datum/controller/subsystem/mapping/proc/preloadTemplates(path = "_maps/templates/") //see master controller setup
var/list/filelist = flist(path)
for(var/map in filelist)
@@ -181,20 +176,30 @@ SUBSYSTEM_DEF(mapping)
CHECK_LIST_EXISTS("job_slots")
var/datum/map_template/shuttle/S = new(data["map_path"], data["map_name"], TRUE)
S.file_name = data["map_path"]
- S.category = "shiptest"
if(istext(data["map_short_name"]))
S.short_name = data["map_short_name"]
else
S.short_name = copytext(S.name, 1, 20)
+
if(istext(data["prefix"]))
S.prefix = data["prefix"]
+ if(istext(data["faction_name"]))
+ S.faction_name = data["faction_name"]
+ else
+ S.faction_name = ship_prefix_to_faction(S.prefix)
+
+ S.category = S.faction_name
+
if(islist(data["namelists"]))
S.name_categories = data["namelists"]
- if ( isnum( data[ "unique_ship_access" ] && data["unique_ship_access"] ) )
+
+ if(isnum(data[ "unique_ship_access" ] && data["unique_ship_access"]))
S.unique_ship_access = data[ "unique_ship_access" ]
+
if(istext(data["description"]))
S.description = data["description"]
+
if(islist(data["tags"]))
S.tags = data["tags"]
@@ -225,8 +230,10 @@ SUBSYSTEM_DEF(mapping)
S.job_slots[job_slot] = slots
if(isnum(data["limit"]))
S.limit = data["limit"]
+
if(isnum(data["spawn_time_coeff"]))
S.spawn_time_coeff = data["spawn_time_coeff"]
+
if(isnum(data["officer_time_coeff"]))
S.officer_time_coeff = data["officer_time_coeff"]
@@ -236,8 +243,10 @@ SUBSYSTEM_DEF(mapping)
if(isnum(data["enabled"]) && data["enabled"])
S.enabled = TRUE
ship_purchase_list[S.name] = S
+
if(isnum(data["roundstart"]) && data["roundstart"])
maplist[S.name] = S
+
if(isnum(data["space_spawn"]) && data["space_spawn"])
S.space_spawn = TRUE
diff --git a/code/controllers/subsystem/processing/fluids.dm b/code/controllers/subsystem/processing/fluids.dm
index c4fa13d69399..70903e0088c7 100644
--- a/code/controllers/subsystem/processing/fluids.dm
+++ b/code/controllers/subsystem/processing/fluids.dm
@@ -1,5 +1,5 @@
PROCESSING_SUBSYSTEM_DEF(fluids)
name = "Fluids"
- wait = 20
+ wait = 10
stat_tag = "FD" //its actually Fluid Ducts
- flags = SS_NO_INIT | SS_TICKER
+ flags = SS_NO_INIT
diff --git a/code/controllers/subsystem/processing/obj_tab_items.dm b/code/controllers/subsystem/processing/obj_tab_items.dm
new file mode 100644
index 000000000000..53786daf0117
--- /dev/null
+++ b/code/controllers/subsystem/processing/obj_tab_items.dm
@@ -0,0 +1,24 @@
+PROCESSING_SUBSYSTEM_DEF(obj_tab_items)
+ name = "Obj Tab Items"
+ flags = SS_NO_INIT
+ runlevels = RUNLEVEL_LOBBY | RUNLEVELS_DEFAULT
+ wait = 0.1 SECONDS
+
+// I know this is mostly copypasta, but I want to change the processing logic
+// Sorry bestie :(
+/datum/controller/subsystem/processing/obj_tab_items/fire(resumed = FALSE)
+ if (!resumed)
+ currentrun = processing.Copy()
+ //cache for sanic speed (lists are references anyways)
+ var/list/current_run = currentrun
+
+ while(current_run.len)
+ var/datum/thing = current_run[current_run.len]
+ if(QDELETED(thing))
+ processing -= thing
+ else if(thing.process(wait * 0.1) == PROCESS_KILL)
+ // fully stop so that a future START_PROCESSING will work
+ STOP_PROCESSING(src, thing)
+ if (MC_TICK_CHECK)
+ return
+ current_run.len--
diff --git a/code/controllers/subsystem/statpanel.dm b/code/controllers/subsystem/statpanel.dm
index 95e40bff159f..6d6e9549d95f 100644
--- a/code/controllers/subsystem/statpanel.dm
+++ b/code/controllers/subsystem/statpanel.dm
@@ -3,15 +3,26 @@ SUBSYSTEM_DEF(statpanels)
wait = 4
init_order = INIT_ORDER_STATPANELS
init_stage = INITSTAGE_EARLY
+ priority = FIRE_PRIORITY_STATPANEL
runlevels = RUNLEVELS_DEFAULT | RUNLEVEL_LOBBY
+ flags = SS_NO_INIT
var/list/currentrun = list()
- var/encoded_global_data
- var/mc_data_encoded
- var/list/cached_images = list()
+ var/list/global_data
+ var/list/mc_data
+
+ ///how many subsystem fires between most tab updates
+ var/default_wait = 10
+ ///how many subsystem fires between updates of the status tab
+ var/status_wait = 2
+ ///how many subsystem fires between updates of the MC tab
+ var/mc_wait = 5
+ ///how many full runs this subsystem has completed. used for variable rate refreshes.
+ var/num_fires = 0
/datum/controller/subsystem/statpanels/fire(resumed = FALSE)
if (!resumed)
- var/list/global_data = list(
+ num_fires++
+ global_data = list(
"Round ID: [GLOB.round_id ? GLOB.round_id : "NULL"]",
"Time Dilation: [round(SStime_track.time_dilation_current,1)]% AVG:([round(SStime_track.time_dilation_avg_fast,1)]%, [round(SStime_track.time_dilation_avg,1)]%, [round(SStime_track.time_dilation_avg_slow,1)]%)",
"Server Time: [time2text(world.timeofday, "YYYY-MM-DD hh:mm:ss")]",
@@ -26,129 +37,191 @@ SUBSYSTEM_DEF(statpanels)
if(SSshuttle.jump_mode != BS_JUMP_IDLE)
global_data += "Jump: [round(timeleft(SSshuttle.jump_timer)/10)]s"
- encoded_global_data = url_encode(json_encode(global_data))
src.currentrun = GLOB.clients.Copy()
- mc_data_encoded = null
+ mc_data = null
+
var/list/currentrun = src.currentrun
while(length(currentrun))
var/client/target = currentrun[length(currentrun)]
currentrun.len--
- if(!target?.statbrowser_ready)
+
+ if(!target?.stat_panel.is_ready())
continue
- if(target.stat_tab == "Status")
- var/ping_str = url_encode("Ping: [round(target.lastping, 1)]ms (Average: [round(target.avgping, 1)]ms)")
- var/other_str = url_encode(json_encode(target.mob.get_status_tab_items()))
- target << output("[encoded_global_data];[ping_str];[other_str]", "statbrowser:update")
+
+ if(target.stat_tab == "Status" && num_fires % status_wait == 0)
+ set_status_tab(target)
+
if(!target.holder)
- target << output("", "statbrowser:remove_admin_tabs")
+ target.stat_panel.send_message("remove_admin_tabs")
else
- target << output("[!!(target.prefs.toggles & SPLIT_ADMIN_TABS)]", "statbrowser:update_split_admin_tabs")
+ target.stat_panel.send_message("update_split_admin_tabs", !!(target.prefs.toggles & SPLIT_ADMIN_TABS))
+
if(!("MC" in target.panel_tabs) || !("Tickets" in target.panel_tabs))
- target << output("[url_encode(target.holder.href_token)]", "statbrowser:add_admin_tabs")
- if(target.stat_tab == "MC")
- var/turf/eye_turf = get_turf(target.eye)
- var/coord_entry = url_encode(COORD(eye_turf))
- if(!mc_data_encoded)
- generate_mc_data()
- target << output("[mc_data_encoded];[coord_entry]", "statbrowser:update_mc")
- if(target.stat_tab == "Tickets")
- var/list/ahelp_tickets = GLOB.ahelp_tickets.stat_entry()
- target << output("[url_encode(json_encode(ahelp_tickets))];", "statbrowser:update_tickets")
- var/datum/interview_manager/m = GLOB.interviews
-
- // get open interview count
- var/dc = 0
- for (var/ckey in m.open_interviews)
- var/datum/interview/I = m.open_interviews[ckey]
- if (I && !I.owner)
- dc++
- var/stat_string = "([m.open_interviews.len - dc] online / [dc] disconnected)"
-
- // Prepare each queued interview
- var/list/queued = list()
- for (var/datum/interview/I in m.interview_queue)
- queued += list(list(
- "ref" = REF(I),
- "status" = "\[[I.pos_in_queue]\]: [I.owner_ckey][!I.owner ? " (DC)": ""] \[INT-[I.id]\]"
- ))
-
- var/list/data = list(
- "status" = list(
- "Active:" = "[m.open_interviews.len] [stat_string]",
- "Queued:" = "[m.interview_queue.len]",
- "Closed:" = "[m.closed_interviews.len]"),
- "interviews" = queued
- )
-
- // Push update
- target << output("[url_encode(json_encode(data))];", "statbrowser:update_interviews")
+ target.stat_panel.send_message("add_admin_tabs", target.holder.href_token)
+
+ if(target.stat_tab == "MC" && ((num_fires % mc_wait == 0) || (target?.prefs.toggles & FAST_MC_REFRESH)))
+ set_MC_tab(target)
+
+ if(target.stat_tab == "Tickets" && num_fires % default_wait == 0)
+ set_tickets_tab(target)
+
if(!length(GLOB.sdql2_queries) && ("SDQL2" in target.panel_tabs))
- target << output("", "statbrowser:remove_sdql2")
- else if(length(GLOB.sdql2_queries) && (target.stat_tab == "SDQL2" || !("SDQL2" in target.panel_tabs)))
- var/list/sdql2A = list()
- sdql2A[++sdql2A.len] = list("", "Access Global SDQL2 List", REF(GLOB.sdql2_vv_statobj))
- var/list/sdql2B = list()
- for(var/i in GLOB.sdql2_queries)
- var/datum/SDQL2_query/Q = i
- sdql2B = Q.generate_stat()
- sdql2A += sdql2B
- target << output(url_encode(json_encode(sdql2A)), "statbrowser:update_sdql2")
+ target.stat_panel.send_message("remove_sdql2")
+
+ else if(length(GLOB.sdql2_queries) && (target.stat_tab == "SDQL2" || !("SDQL2" in target.panel_tabs)) && num_fires % default_wait == 0)
+ set_SDQL2_tab(target)
+
if(target.mob)
- var/mob/M = target.mob
- if((target.stat_tab in target.spell_tabs) || !length(target.spell_tabs) && (length(M.mob_spell_list) || length(M.mind?.spell_list)))
- var/list/proc_holders = M.get_proc_holders()
- target.spell_tabs.Cut()
- for(var/phl in proc_holders)
- var/list/proc_holder_list = phl
- target.spell_tabs |= proc_holder_list[1]
- var/proc_holders_encoded = ""
- if(length(proc_holders))
- proc_holders_encoded = url_encode(json_encode(proc_holders))
- target << output("[url_encode(json_encode(target.spell_tabs))];[proc_holders_encoded]", "statbrowser:update_spells")
- if(M?.listed_turf)
- var/mob/target_mob = M
- if(!target_mob.TurfAdjacent(target_mob.listed_turf))
- target << output("", "statbrowser:remove_listedturf")
- target_mob.listed_turf = null
- else if(target.stat_tab == M?.listed_turf.name || !(M?.listed_turf.name in target.panel_tabs))
- var/list/overrides = list()
- var/list/turfitems = list()
- for(var/img in target.images)
- var/image/target_image = img
- if(!target_image.loc || target_image.loc.loc != target_mob.listed_turf || !target_image.override)
- continue
- overrides += target_image.loc
- turfitems[++turfitems.len] = list("[target_mob.listed_turf]", REF(target_mob.listed_turf), icon2html(target_mob.listed_turf, target, sourceonly=TRUE))
- for(var/tc in target_mob.listed_turf)
- var/atom/movable/turf_content = tc
- if(turf_content.mouse_opacity == MOUSE_OPACITY_TRANSPARENT)
- continue
- if(turf_content.invisibility > target_mob.see_invisible)
- continue
- if(turf_content in overrides)
- continue
- if(turf_content.IsObscured())
- continue
- if(length(turfitems) < 30) // only create images for the first 30 items on the turf, for performance reasons
- if(!(REF(turf_content) in cached_images))
- cached_images += REF(turf_content)
- turf_content.RegisterSignal(turf_content, COMSIG_PARENT_QDELETING, TYPE_PROC_REF(/atom, remove_from_cache)) // we reset cache if anything in it gets deleted
- if(ismob(turf_content) || length(turf_content.overlays) > 2)
- turfitems[++turfitems.len] = list("[turf_content.name]", REF(turf_content), costly_icon2html(turf_content, target, sourceonly=TRUE))
- else
- turfitems[++turfitems.len] = list("[turf_content.name]", REF(turf_content), icon2html(turf_content, target, sourceonly=TRUE))
- else
- turfitems[++turfitems.len] = list("[turf_content.name]", REF(turf_content))
- else
- turfitems[++turfitems.len] = list("[turf_content.name]", REF(turf_content))
- turfitems = url_encode(json_encode(turfitems))
- target << output("[turfitems];", "statbrowser:update_listedturf")
+ var/mob/target_mob = target.mob
+ if((target.stat_tab in target.spell_tabs) || !length(target.spell_tabs) && (length(target_mob.mob_spell_list) || length(target_mob.mind?.spell_list)))
+ if(num_fires % default_wait == 0)
+ set_spells_tab(target, target_mob)
+
+ // Handle the examined turf of the stat panel, if it's been long enough, or if we've generated new images for it
+ var/turf/listed_turf = target_mob?.listed_turf
+ if(listed_turf && num_fires % default_wait == 0)
+ if(target.stat_tab == listed_turf.name || !(listed_turf.name in target.panel_tabs))
+ set_turf_examine_tab(target, target_mob)
+
if(MC_TICK_CHECK)
return
+/datum/controller/subsystem/statpanels/proc/set_status_tab(client/target)
+ if(!global_data)//statbrowser hasnt fired yet and we were called from immediate_send_stat_data()
+ return
+
+ target.stat_panel.send_message("update_stat", list(
+ "global_data" = global_data,
+ "ping_str" = "Ping: [round(target.lastping, 1)]ms (Average: [round(target.avgping, 1)]ms)",
+ "other_str" = target.mob?.get_status_tab_items(),
+ ))
+
+/datum/controller/subsystem/statpanels/proc/set_MC_tab(client/target)
+ var/turf/eye_turf = get_turf(target.eye)
+ var/coord_entry = COORD(eye_turf)
+ if(!mc_data)
+ generate_mc_data()
+ target.stat_panel.send_message("update_mc", list("mc_data" = mc_data, "coord_entry" = coord_entry))
+
+/datum/controller/subsystem/statpanels/proc/set_tickets_tab(client/target)
+ var/list/ahelp_tickets = GLOB.ahelp_tickets.stat_entry()
+ target.stat_panel.send_message("update_tickets", ahelp_tickets)
+ var/datum/interview_manager/m = GLOB.interviews
+
+ // get open interview count
+ var/dc = 0
+ for (var/ckey in m.open_interviews)
+ var/datum/interview/current_interview = m.open_interviews[ckey]
+ if (current_interview && !current_interview.owner)
+ dc++
+ var/stat_string = "([m.open_interviews.len - dc] online / [dc] disconnected)"
+
+ // Prepare each queued interview
+ var/list/queued = list()
+ for (var/datum/interview/queued_interview in m.interview_queue)
+ queued += list(list(
+ "ref" = REF(queued_interview),
+ "status" = "\[[queued_interview.pos_in_queue]\]: [queued_interview.owner_ckey][!queued_interview.owner ? " (DC)": ""] \[INT-[queued_interview.id]\]"
+ ))
+
+ var/list/data = list(
+ "status" = list(
+ "Active:" = "[m.open_interviews.len] [stat_string]",
+ "Queued:" = "[m.interview_queue.len]",
+ "Closed:" = "[m.closed_interviews.len]"),
+ "interviews" = queued
+ )
+
+ // Push update
+ target.stat_panel.send_message("update_interviews", data)
+
+/datum/controller/subsystem/statpanels/proc/set_SDQL2_tab(client/target)
+ var/list/sdql2A = list()
+ sdql2A[++sdql2A.len] = list("", "Access Global SDQL2 List", REF(GLOB.sdql2_vv_statobj))
+ var/list/sdql2B = list()
+ for(var/datum/SDQL2_query/query as anything in GLOB.sdql2_queries)
+ sdql2B = query.generate_stat()
+
+ sdql2A += sdql2B
+ target.stat_panel.send_message("update_sdql2", sdql2A)
+
+/datum/controller/subsystem/statpanels/proc/set_spells_tab(client/target, mob/target_mob)
+ var/list/proc_holders = target_mob.get_proc_holders()
+ target.spell_tabs.Cut()
+
+ for(var/proc_holder_list as anything in proc_holders)
+ target.spell_tabs |= proc_holder_list[1]
+
+ target.stat_panel.send_message("update_spells", list(spell_tabs = target.spell_tabs, proc_holders_encoded = proc_holders))
+
+/datum/controller/subsystem/statpanels/proc/set_turf_examine_tab(client/target, mob/target_mob)
+ var/list/overrides = list()
+ for(var/image/target_image as anything in target.images)
+ if(!target_image.loc || target_image.loc.loc != target_mob.listed_turf || !target_image.override)
+ continue
+ overrides += target_image.loc
+
+ var/list/atoms_to_display = list(target_mob.listed_turf)
+ for(var/atom/movable/turf_content as anything in target_mob.listed_turf)
+ if(turf_content.mouse_opacity == MOUSE_OPACITY_TRANSPARENT)
+ continue
+ if(turf_content.invisibility > target_mob.see_invisible)
+ continue
+ if(turf_content in overrides)
+ continue
+ if(turf_content.IsObscured())
+ continue
+ atoms_to_display += turf_content
+
+ /// Set the atoms we're meant to display
+ var/datum/object_window_info/obj_window = target.obj_window
+ obj_window.atoms_to_show = atoms_to_display
+ START_PROCESSING(SSobj_tab_items, obj_window)
+ refresh_client_obj_view(target)
+
+/datum/controller/subsystem/statpanels/proc/refresh_client_obj_view(client/refresh)
+ var/list/turf_items = return_object_images(refresh)
+ if(!length(turf_items) || !refresh.mob?.listed_turf)
+ return
+ refresh.stat_panel.send_message("update_listedturf", turf_items)
+
+#define OBJ_IMAGE_LOADING "statpanels obj loading temporary"
+/// Returns all our ready object tab images
+/// Returns a list in the form list(list(object_name, object_ref, loaded_image), ...)
+/datum/controller/subsystem/statpanels/proc/return_object_images(client/load_from)
+ // You might be inclined to think that this is a waste of cpu time, since we
+ // A: Double iterate over atoms in the build case, or
+ // B: Generate these lists over and over in the refresh case
+ // It's really not very hot. The hot portion of this code is genuinely mostly in the image generation
+ // So it's ok to pay a performance cost for cleanliness here
+
+ // No turf? go away
+ if(!load_from.mob?.listed_turf)
+ return list()
+ var/datum/object_window_info/obj_window = load_from.obj_window
+ var/list/already_seen = obj_window.atoms_to_images
+ var/list/to_make = obj_window.atoms_to_imagify
+ var/list/turf_items = list()
+ for(var/atom/turf_item as anything in obj_window.atoms_to_show)
+ // First, we fill up the list of refs to display
+ // If we already have one, just use that
+ var/existing_image = already_seen[turf_item]
+ if(existing_image == OBJ_IMAGE_LOADING)
+ continue
+ // We already have it. Success!
+ if(existing_image)
+ turf_items[++turf_items.len] = list("[turf_item.name]", REF(turf_item), existing_image)
+ continue
+ // Now, we're gonna queue image generation out of those refs
+ to_make += turf_item
+ already_seen[turf_item] = OBJ_IMAGE_LOADING
+ obj_window.RegisterSignal(turf_item, COMSIG_PARENT_QDELETING, /datum/object_window_info/proc/viewing_atom_deleted) // we reset cache if anything in it gets deleted
+ return turf_items
+
+#undef OBJ_IMAGE_LOADING
/datum/controller/subsystem/statpanels/proc/generate_mc_data()
- var/list/mc_data = list(
+ mc_data = list(
list("CPU:", world.cpu),
list("Instances:", "[num2text(world.contents.len, 10)]"),
list("World Time:", "[world.time]"),
@@ -162,45 +235,147 @@ SUBSYSTEM_DEF(statpanels)
for(var/datum/controller/subsystem/sub_system as anything in Master.subsystems)
mc_data[++mc_data.len] = list("\[[sub_system.state_letter()]][sub_system.name]", sub_system.stat_entry(), text_ref(sub_system))
mc_data[++mc_data.len] = list("Camera Net", "Cameras: [GLOB.cameranet.cameras.len] | Chunks: [GLOB.cameranet.chunks.len]", text_ref(GLOB.cameranet))
- mc_data_encoded = url_encode(json_encode(mc_data))
-/atom/proc/remove_from_cache()
- SSstatpanels.cached_images -= REF(src)
+///immediately update the active statpanel tab of the target client
+/datum/controller/subsystem/statpanels/proc/immediate_send_stat_data(client/target)
+ if(!target.stat_panel.is_ready())
+ return FALSE
+
+ if(target.stat_tab == "Status")
+ set_status_tab(target)
+ return TRUE
+
+ var/mob/target_mob = target.mob
+ if((target.stat_tab in target.spell_tabs) || !length(target.spell_tabs) && (length(target_mob.mob_spell_list) || length(target_mob.mind?.spell_list)))
+ set_spells_tab(target, target_mob)
+ return TRUE
+
+ if(target_mob?.listed_turf)
+ if(!target_mob.TurfAdjacent(target_mob.listed_turf))
+ target_mob.set_listed_turf(null)
+
+ else if(target.stat_tab == target_mob?.listed_turf.name || !(target_mob?.listed_turf.name in target.panel_tabs))
+ set_turf_examine_tab(target, target_mob)
+ return TRUE
+
+ if(!target.holder)
+ return FALSE
+
+ if(target.stat_tab == "MC")
+ set_MC_tab(target)
+ return TRUE
-/// verbs that send information from the browser UI
-/client/verb/set_tab(tab as text|null)
- set name = "Set Tab"
- set hidden = TRUE
+ if(target.stat_tab == "Tickets")
+ set_tickets_tab(target)
+ return TRUE
- stat_tab = tab
+ if(!length(GLOB.sdql2_queries) && ("SDQL2" in target.panel_tabs))
+ target.stat_panel.send_message("remove_sdql2")
-/client/verb/send_tabs(tabs as text|null)
- set name = "Send Tabs"
- set hidden = TRUE
+ else if(length(GLOB.sdql2_queries) && target.stat_tab == "SDQL2")
+ set_SDQL2_tab(target)
- panel_tabs |= tabs
+/// Stat panel window declaration
+/client/var/datum/tgui_window/stat_panel
-/client/verb/remove_tabs(tabs as text|null)
- set name = "Remove Tabs"
- set hidden = TRUE
+/// Datum that holds and tracks info about a client's object window
+/// Really only exists because I want to be able to do logic with signals
+/// And need a safe place to do the registration
+/datum/object_window_info
+ /// list of atoms to show to our client via the object tab, at least currently
+ var/list/atoms_to_show = list()
+ /// list of atom -> image string for objects we have had in the right click tab
+ /// this is our caching
+ var/list/atoms_to_images = list()
+ /// list of atoms to turn into images for the object tab
+ var/list/atoms_to_imagify = list()
+ /// Our owner client
+ var/client/parent
+ /// Are we currently tracking a turf?
+ var/actively_tracking = FALSE
- panel_tabs -= tabs
+/datum/object_window_info/New(client/parent)
+ . = ..()
+ src.parent = parent
-/client/verb/reset_tabs()
- set name = "Reset Tabs"
- set hidden = TRUE
+/datum/object_window_info/Destroy(force, ...)
+ atoms_to_show = null
+ atoms_to_images = null
+ atoms_to_imagify = null
+ parent.obj_window = null
+ parent = null
+ STOP_PROCESSING(SSobj_tab_items, src)
+ return ..()
+
+/// Takes a client, attempts to generate object images for it
+/// We will update the client with any improvements we make when we're done
+/datum/object_window_info/process(delta_time)
+ // Cache the datum access for sonic speed
+ var/list/to_make = atoms_to_imagify
+ var/list/newly_seen = atoms_to_images
+ var/index = 0
+ for(index in 1 to length(to_make))
+ var/atom/thing = to_make[index]
+
+ var/generated_string
+ if(ismob(thing) || length(thing.overlays) > 2)
+ generated_string = costly_icon2html(thing, parent, sourceonly=TRUE)
+ else
+ generated_string = icon2html(thing, parent, sourceonly=TRUE)
+
+ newly_seen[thing] = generated_string
+ if(TICK_CHECK)
+ to_make.Cut(1, index + 1)
+ index = 0
+ break
+ // If we've not cut yet, do it now
+ if(index)
+ to_make.Cut(1, index + 1)
+ SSstatpanels.refresh_client_obj_view(parent)
+ if(!length(to_make))
+ return PROCESS_KILL
+
+/datum/object_window_info/proc/start_turf_tracking()
+ if(actively_tracking)
+ stop_turf_tracking()
+ var/static/list/connections = list(
+ COMSIG_MOVABLE_MOVED = PROC_REF(on_mob_move),
+ COMSIG_MOB_LOGOUT = PROC_REF(on_mob_logout),
+ )
+ AddComponent(/datum/component/connect_mob_behalf, parent, connections)
+ actively_tracking = TRUE
- panel_tabs = list()
+/datum/object_window_info/proc/stop_turf_tracking()
+ qdel(GetComponent(/datum/component/connect_mob_behalf))
+ actively_tracking = FALSE
-/client/verb/panel_ready()
- set name = "Panel Ready"
- set hidden = TRUE
+/datum/object_window_info/proc/on_mob_move(mob/source)
+ SIGNAL_HANDLER
+ var/turf/listed = source.listed_turf
+ if(!listed || !source.TurfAdjacent(listed))
+ source.set_listed_turf(null)
- statbrowser_ready = TRUE
- init_verbs()
+/datum/object_window_info/proc/on_mob_logout(mob/source)
+ SIGNAL_HANDLER
+ on_mob_move(parent.mob)
-/client/verb/update_verbs()
- set name = "Update Verbs"
- set hidden = TRUE
+/// Clears any cached object window stuff
+/// We use hard refs cause we'd need a signal for this anyway. Cleaner this way
+/datum/object_window_info/proc/viewing_atom_deleted(atom/deleted)
+ SIGNAL_HANDLER
+ atoms_to_show -= deleted
+ atoms_to_imagify -= deleted
+ atoms_to_images -= deleted
- init_verbs()
+/mob/proc/set_listed_turf(turf/new_turf)
+ listed_turf = new_turf
+ if(!client)
+ return
+ if(!client.obj_window)
+ client.obj_window = new(client)
+ if(listed_turf)
+ client.stat_panel.send_message("create_listedturf", listed_turf.name)
+ client.obj_window.start_turf_tracking()
+ else
+ client.stat_panel.send_message("remove_listedturf")
+ client.obj_window.stop_turf_tracking()
diff --git a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm
index b06baa1c49c2..03c244ae05d2 100644
--- a/code/controllers/subsystem/vote.dm
+++ b/code/controllers/subsystem/vote.dm
@@ -1,383 +1,370 @@
+/// Define to mimic a span macro but for the purple font that vote specifically uses.
+#define vote_font(text) ("" + text + " ")
+
SUBSYSTEM_DEF(vote)
name = "Vote"
- wait = 10
-
- flags = SS_KEEP_TIMING|SS_NO_INIT
-
+ wait = 1 SECONDS
+ flags = SS_KEEP_TIMING
runlevels = RUNLEVEL_LOBBY | RUNLEVELS_DEFAULT
- var/initiator = null
- var/started_time = null
- var/time_remaining = 0
- var/mode = null
- var/question = null
- var/list/choices = list()
+ /// A list of all generated action buttons
+ var/list/datum/action/generated_actions = list()
+ /// All votes that we can possible vote for.
+ var/list/datum/vote/possible_votes = list()
+ /// The vote we're currently voting on.
+ var/datum/vote/current_vote
+ /// A list of all ckeys who have voted for the current vote.
var/list/voted = list()
+ /// A list of all ckeys currently voting for the current vote.
var/list/voting = list()
- var/list/generated_actions = list()
-/datum/controller/subsystem/vote/fire() //called by master_controller
- if(mode)
- time_remaining = round((started_time + CONFIG_GET(number/vote_period) - world.time)/10)
+/datum/controller/subsystem/vote/Initialize(start_timeofday)
+ for(var/vote_type in subtypesof(/datum/vote))
+ var/datum/vote/vote = new vote_type()
+ if(!vote.is_accessible_vote())
+ qdel(vote)
+ continue
- if(time_remaining < 0)
- result()
- for(var/client/C in voting)
- C << browse(null, "window=vote;can_close=0")
- reset()
- else
- var/datum/browser/client_popup
- for(var/client/C in voting)
- client_popup = new(C, "vote", "Voting Panel")
- client_popup.set_window_options("can_close=0")
- client_popup.set_content(interface(C))
- client_popup.open(FALSE)
+ possible_votes[vote.name] = vote
+
+ return ..()
+// Called by master_controller
+/datum/controller/subsystem/vote/fire()
+ if(!current_vote)
+ return
+ current_vote.time_remaining = round((current_vote.started_time + CONFIG_GET(number/vote_period) - world.time) / 10)
+ if(current_vote.time_remaining < 0)
+ process_vote_result()
+ SStgui.close_uis(src)
+ reset()
+
+/// Resets all of our vars after votes conclude / are cancelled.
/datum/controller/subsystem/vote/proc/reset()
- initiator = null
- time_remaining = 0
- mode = null
- question = null
- choices.Cut()
voted.Cut()
voting.Cut()
- remove_action_buttons()
-
-/datum/controller/subsystem/vote/proc/get_result()
- //get the highest number of votes
- var/greatest_votes = 0
- var/total_votes = 0
- for(var/option in choices)
- var/votes = choices[option]
- total_votes += votes
- if(votes > greatest_votes)
- greatest_votes = votes
- //default-vote for everyone who didn't vote
- if(!CONFIG_GET(flag/default_no_vote) && choices.len)
- var/list/non_voters = GLOB.directory.Copy()
- non_voters -= voted
- for (var/non_voter_ckey in non_voters)
- var/client/C = non_voters[non_voter_ckey]
- if (!C || C.is_afk())
- non_voters -= non_voter_ckey
- if(non_voters.len > 0)
- if(mode == "restart")
- choices["Continue Playing"] += non_voters.len
- if(choices["Continue Playing"] >= greatest_votes)
- greatest_votes = choices["Continue Playing"]
- else if(mode == "gamemode")
- if(GLOB.master_mode in choices)
- choices[GLOB.master_mode] += non_voters.len
- if(choices[GLOB.master_mode] >= greatest_votes)
- greatest_votes = choices[GLOB.master_mode]
- else if(mode == "transfer")
- var/factor = 1
- switch(world.time / (1 MINUTES))
- if(0 to 60)
- factor = 0.5
- if(61 to 120)
- factor = 0.8
- if(121 to 240)
- factor = 1
- if(241 to 300)
- factor = 1.2
- else
- factor = 1.4
- choices["Initiate Bluespace Jump"] += round(non_voters.len * factor)
-
- //get all options with that many votes and return them in a list
- . = list()
- if(greatest_votes)
- for(var/option in choices)
- if(choices[option] == greatest_votes)
- . += option
- return .
-
-/datum/controller/subsystem/vote/proc/announce_result()
- var/list/winners = get_result()
- var/text
- if(winners.len > 0)
- if(question)
- text += "[question] "
- else
- text += "[capitalize(mode)] Vote "
- for(var/i=1,i<=choices.len,i++)
- var/votes = choices[choices[i]]
- if(!votes)
- votes = 0
- text += "\n[choices[i]]: [votes]"
- if(mode != "custom")
- if(winners.len > 1)
- text = "\nVote Tied Between: "
- for(var/option in winners)
- text += "\n\t[option]"
- . = pick(winners)
- text += "\nVote Result: [.] "
- else
- text += "\nDid not vote: [GLOB.clients.len-voted.len]"
+
+ current_vote?.reset()
+ current_vote = null
+
+ QDEL_LIST(generated_actions)
+
+ SStgui.update_uis(src)
+
+/**
+ * Process the results of the vote.
+ * Collects all the winners, breaks any ties that occur,
+ * prints the results of the vote to the world,
+ * and finally follows through with the effects of the vote.
+ */
+/datum/controller/subsystem/vote/proc/process_vote_result()
+
+ // First collect all the non-voters we have.
+ var/list/non_voters = GLOB.directory.Copy() - voted
+ // Remove AFK or clientless non-voters.
+ for(var/non_voter_ckey in non_voters)
+ var/client/non_voter_client = non_voters[non_voter_ckey]
+ if(!non_voter_client || non_voter_client.is_afk() || (CONFIG_GET(flag/no_dead_vote) && non_voter_client.mob.stat == DEAD && !non_voter_client.holder))
+ non_voters -= non_voter_ckey
+
+ // Now get the result of the vote.
+ // This is a list, as we could have a tie (multiple winners).
+ var/list/winners = current_vote.get_vote_result(non_voters)
+
+ // Now we should determine who actually won the vote.
+ var/final_winner
+ // 1 winner? That's the winning option
+ if(length(winners) == 1)
+ final_winner = winners[1]
+
+ // More than 1 winner? Tiebreaker between all the winners
+ else if(length(winners) > 1)
+ final_winner = current_vote.tiebreaker(winners)
+
+ // Announce the results of the vote to the world.
+ var/to_display = current_vote.get_result_text(winners, final_winner, non_voters)
+
+ var/log_string = replacetext(to_display, "\n", "\\n") // 'keep' the newlines, but dont actually print them as newlines
+ log_vote(log_string)
+ to_chat(world, span_infoplain(vote_font("\n[to_display]")))
+
+ // Finally, doing any effects on vote completion
+ if (final_winner) // if no one voted, or the vote cannot be won, final_winner will be null
+ current_vote.finalize_vote(final_winner)
+
+/**
+ * One selection per person, and the selection with the most votes wins.
+ */
+/datum/controller/subsystem/vote/proc/submit_single_vote(mob/voter, their_vote)
+ if(!current_vote)
+ return
+ if(!voter?.ckey)
+ return
+ if(CONFIG_GET(flag/no_dead_vote) && voter.stat == DEAD && !voter.client?.holder)
+ return
+
+ // If user has already voted, remove their specific vote
+ if(voter.ckey in current_vote.choices_by_ckey)
+ var/their_old_vote = current_vote.choices_by_ckey[voter.ckey]
+ current_vote.choices[their_old_vote]--
+
else
- text += "Vote Result: Inconclusive - No Votes! "
- log_vote(text)
- remove_action_buttons()
- to_chat(world, span_purple(examine_block(text)))
- return .
-
-/datum/controller/subsystem/vote/proc/result()
- . = announce_result()
- var/restart = FALSE
- if(.)
- switch(mode)
- if("restart")
- if(. == "Restart Round")
- restart = TRUE
- if("gamemode")
- if(GLOB.master_mode != .)
- SSticker.save_mode(.)
- if(SSticker.HasRoundStarted())
- restart = TRUE
- else
- GLOB.master_mode = .
- if("transfer")
- if(. == "Initiate Bluespace Jump")
- SSshuttle.request_jump()
-
- if(restart)
- var/active_admins = FALSE
- for(var/client/C in GLOB.admins)
- if(!C.is_afk() && check_rights_for(C, R_SERVER))
- active_admins = TRUE
- break
- if(!active_admins)
- SSticker.Reboot("Restart vote successful.", "restart vote")
- else
- to_chat(world, "Notice:Restart vote will not restart the server automatically because there are active admins on. ")
- message_admins("A restart vote has passed, but there are active admins on with +server, so it has been canceled. If you wish, you may restart the server.")
-
- return .
-
-/datum/controller/subsystem/vote/proc/submit_vote(vote)
- if(mode)
- if(CONFIG_GET(flag/no_dead_vote) && usr.stat == DEAD && !usr.client.holder)
- return FALSE
- if(!(usr.ckey in voted))
- if(vote && 1<=vote && vote<=choices.len)
- voted += usr.ckey
- choices[choices[vote]]++ //check this
- return vote
- return FALSE
-
-/datum/controller/subsystem/vote/proc/initiate_vote(vote_type, initiator_key, observer_vote_allowed = TRUE)
- if(!MC_RUNNING(init_stage)) //Server is still intializing.
- to_chat(usr, "Cannot start vote, server is not done initializing. ")
+ voted += voter.ckey
+
+ current_vote.choices_by_ckey[voter.ckey] = their_vote
+ current_vote.choices[their_vote]++
+
+ return TRUE
+
+/**
+ * Any number of selections per person, and the selection with the most votes wins.
+ */
+/datum/controller/subsystem/vote/proc/submit_multi_vote(mob/voter, their_vote)
+ if(!current_vote)
+ return
+ if(!voter?.ckey)
+ return
+ if(CONFIG_GET(flag/no_dead_vote) && voter.stat == DEAD && !voter.client?.holder)
+ return
+
+ else
+ voted += voter.ckey
+
+ if(current_vote.choices_by_ckey[voter.ckey + their_vote] == 1)
+ current_vote.choices_by_ckey[voter.ckey + their_vote] = 0
+ current_vote.choices[their_vote]--
+
+ else
+ current_vote.choices_by_ckey[voter.ckey + their_vote] = 1
+ current_vote.choices[their_vote]++
+
+ return TRUE
+
+/**
+ * Initiates a vote, allowing all players to vote on something.
+ *
+ * * vote_type - The type of vote to initiate. Can be a [/datum/vote] typepath, a [/datum/vote] instance, or the name of a vote datum.
+ * * vote_initiator_name - The ckey (if player initiated) or name that initiated a vote. Ex: "UristMcAdmin", "the server"
+ * * vote_initiator - If a person / mob initiated the vote, this is the mob that did it
+ * * forced - Whether we're forcing the vote to go through regardless of existing votes or other circumstances. Note: If the vote is admin created, forced becomes true regardless.
+ */
+/datum/controller/subsystem/vote/proc/initiate_vote(vote_type, vote_initiator_name, mob/vote_initiator, forced = FALSE)
+
+ // Even if it's forced we can't vote before we're set up
+ if(!MC_RUNNING(init_stage))
+ if(vote_initiator)
+ to_chat(vote_initiator, span_warning("You cannot start vote now, the server is not done initializing."))
return FALSE
- var/admin = FALSE
- var/ckey = ckey(initiator_key)
- if(GLOB.admin_datums[ckey])
- admin = TRUE
- if(!mode)
- if(started_time)
- var/next_allowed_time = (started_time + CONFIG_GET(number/vote_delay))
- if(mode)
- to_chat(usr, "There is already a vote in progress! please wait for it to finish. ")
- return FALSE
+ // Check if we have unlimited voting power.
+ // Admin started (or forced) voted will go through even if there's an ongoing vote,
+ // if voting is on cooldown, or regardless if a vote is config disabled (in some cases)
+ var/unlimited_vote_power = forced || !!GLOB.admin_datums[vote_initiator?.ckey]
+ if(current_vote && !unlimited_vote_power)
+ if(vote_initiator)
+ to_chat(vote_initiator, span_warning("There is already a vote in progress! Please wait for it to finish."))
+ return FALSE
- if(next_allowed_time > world.time && !admin)
- to_chat(usr, "A vote was initiated recently, you must wait [DisplayTimeText(next_allowed_time-world.time)] before a new vote can be started! ")
- return FALSE
+ // Get our actual datum
+ var/datum/vote/to_vote
+ // If we were passed a path: find the path in possible_votes
+ if(ispath(vote_type, /datum/vote))
+ var/datum/vote/vote_path = vote_type
+ to_vote = possible_votes[initial(vote_path.name)]
- reset()
- switch(vote_type)
- if("restart")
- choices.Add("Restart Round","Continue Playing")
- if("gamemode")
- choices.Add(config.votable_modes)
- if("transfer")
- if(SSshuttle.jump_mode != BS_JUMP_IDLE)
- return FALSE
- choices.Add("Initiate Bluespace Jump","Continue Playing")
- if("custom")
- question = stripped_input(usr,"What is the vote for?")
- if(!question)
- return FALSE
- for(var/i=1,i<=10,i++)
- var/option = capitalize(stripped_input(usr,"Please enter an option or hit cancel to finish"))
- if(!option || mode || !usr.client)
- break
- choices.Add(option)
- else
- return FALSE
- mode = vote_type
- initiator = initiator_key || "the Server"
- started_time = world.time
- var/text = "[capitalize(mode)] vote started by [initiator]."
- if(mode == "custom")
- text += "\n[question]"
- log_vote(text)
-
- var/vp = CONFIG_GET(number/vote_period)
- var/vote_message = "[text] \nType vote or click here to place your votes.\nYou have [DisplayTimeText(vp)] to vote.Vote: '[question]' "
- else
- . += "Vote: [capitalize(mode)] "
- . += "Time Left: [time_remaining] s"
- for(var/i=1,i<=choices.len,i++)
- var/votes = choices[choices[i]]
- if(!votes)
- votes = 0
- . += "[choices[i]] ([votes] votes) Cancel Vote ) "
+ // If we got neither a path or an instance, it could be a vote name, but is likely just an error / null
else
- . += "Start a vote: "
- //restart
- var/avr = CONFIG_GET(flag/allow_vote_restart)
- if(trialmin || avr)
- . += "Restart "
- else
- . += "Restart (Disallowed) "
- if(trialmin)
- . += "\t([avr ? "Allowed" : "Disallowed"] )"
- . += " "
- //gamemode
- var/avm = CONFIG_GET(flag/allow_vote_mode)
- if(trialmin || avm)
- . += "GameMode "
- else
- . += "GameMode (Disallowed) "
- if(trialmin)
- . += "\t([avm ? "Allowed" : "Disallowed"] )"
-
- . += " "
- //custom
- if(trialmin)
- . += "Custom Close "
- return .
-
-
-/datum/controller/subsystem/vote/Topic(href,href_list[],hsrc)
- if(!usr || !usr.client)
- return //not necessary but meh...just in-case somebody does something stupid
-
- var/trialmin = FALSE
- if(usr.client.holder)
- if(check_rights_for(usr.client, R_ADMIN))
- trialmin = TRUE
-
- switch(href_list["vote"])
- if("close")
- voting -= usr.client
- usr << browse(null, "window=vote")
- return
+ to_vote = possible_votes[vote_type]
+ if(!to_vote)
+ stack_trace("Voting initiate_vote was passed an invalid vote type. (Got: [vote_type || "null"])")
+
+ // No valid vote found? No vote
+ if(!istype(to_vote))
+ if(vote_initiator)
+ to_chat(vote_initiator, span_warning("Invalid voting choice."))
+ return FALSE
+
+ // Vote can't be initiated in our circumstances? No vote
+ if(!to_vote.can_be_initiated(vote_initiator, unlimited_vote_power))
+ return FALSE
+
+ // Okay, we're ready to actually create a vote -
+ // Do a reset, just to make sure
+ reset()
+
+ // Try to create the vote. If the creation fails, no vote
+ if(!to_vote.create_vote(vote_initiator))
+ return FALSE
+
+ // Okay, the vote's happening now, for real. Set it up.
+ current_vote = to_vote
+
+ var/duration = CONFIG_GET(number/vote_period)
+ var/to_display = current_vote.initiate_vote(vote_initiator_name, duration)
+
+ log_vote(to_display)
+ to_chat(world, span_infoplain(vote_font("\n[span_bold(to_display)]\n\
+ Type vote or click here to place your votes.\n\
+ You have [DisplayTimeText(duration)] to vote.")))
+
+ // And now that it's going, give everyone a voter action
+ for(var/client/new_voter as anything in GLOB.clients)
+ var/datum/action/vote/voting_action = new()
+ voting_action.name = "Vote: [current_vote.override_question || current_vote.name]"
+ voting_action.Grant(new_voter.mob)
+
+ new_voter.player_details.player_actions += voting_action
+ generated_actions += voting_action
+
+ if(current_vote.vote_sound && (new_voter.prefs.toggles & SOUND_ANNOUNCEMENTS))
+ SEND_SOUND(new_voter, sound(current_vote.vote_sound))
+
+ return TRUE
+
+/datum/controller/subsystem/vote/ui_state()
+ return GLOB.always_state
+
+/datum/controller/subsystem/vote/ui_interact(mob/user, datum/tgui/ui)
+ // Tracks who is currently voting
+ voting |= user.client?.ckey
+ ui = SStgui.try_update_ui(user, src, ui)
+ if(!ui)
+ ui = new(user, src, "VotePanel")
+ ui.open()
+
+/datum/controller/subsystem/vote/ui_data(mob/user)
+ var/list/data = list()
+
+ var/is_lower_admin = !!user.client?.holder
+ var/is_upper_admin = check_rights_for(user.client, R_ADMIN)
+
+ data["user"] = list(
+ "ckey" = user.client?.ckey,
+ "isLowerAdmin" = is_lower_admin,
+ "isUpperAdmin" = is_upper_admin,
+ // What the current user has selected in any ongoing votes.
+ "singleSelection" = current_vote?.choices_by_ckey[user.client?.ckey],
+ "multiSelection" = current_vote?.choices_by_ckey,
+ )
+
+ data["voting"]= is_lower_admin ? voting : list()
+
+ var/list/all_vote_data = list()
+ for(var/vote_name in possible_votes)
+ var/datum/vote/vote = possible_votes[vote_name]
+ if(!istype(vote))
+ continue
+
+ var/list/vote_data = list(
+ "name" = vote_name,
+ "canBeInitiated" = vote.can_be_initiated(forced = is_lower_admin),
+ "config" = vote.is_config_enabled(),
+ "message" = vote.message,
+ )
+
+ if(vote == current_vote)
+ var/list/choices = list()
+ for(var/key in current_vote.choices)
+ choices += list(list(
+ "name" = key,
+ "votes" = current_vote.choices[key],
+ ))
+
+ data["currentVote"] = list(
+ "name" = current_vote.name,
+ "question" = current_vote.override_question,
+ "timeRemaining" = current_vote.time_remaining,
+ "countMethod" = current_vote.count_method,
+ "choices" = choices,
+ "vote" = vote_data,
+ )
+
+ all_vote_data += list(vote_data)
+
+ data["possibleVotes"] = all_vote_data
+
+ return data
+
+/datum/controller/subsystem/vote/ui_act(action, params)
+ . = ..()
+ if(.)
+ return
+
+ var/mob/voter = usr
+
+ switch(action)
if("cancel")
- if(usr.client.holder)
- reset()
- if("toggle_restart")
- if(usr.client.holder && trialmin)
- CONFIG_SET(flag/allow_vote_restart, !CONFIG_GET(flag/allow_vote_restart))
- if("toggle_gamemode")
- if(usr.client.holder && trialmin)
- CONFIG_SET(flag/allow_vote_mode, !CONFIG_GET(flag/allow_vote_mode))
- if("restart")
- if(CONFIG_GET(flag/allow_vote_restart) || usr.client.holder)
- initiate_vote("restart",usr.key, TRUE)
- if("gamemode")
- if(CONFIG_GET(flag/allow_vote_mode) || usr.client.holder)
- initiate_vote("gamemode",usr.key, TRUE)
- if("custom")
- if(usr.client.holder)
- initiate_vote("custom",usr.key, TRUE)
- else
- submit_vote(round(text2num(href_list["vote"])))
- usr.vote()
-
-/datum/controller/subsystem/vote/proc/remove_action_buttons()
- for(var/v in generated_actions)
- var/datum/action/vote/V = v
- if(!QDELETED(V))
- V.remove_from_client()
- V.Remove(V.owner)
- generated_actions = list()
+ if(!voter.client?.holder)
+ return
+ voter.log_message("[key_name_admin(voter)] cancelled a vote.", LOG_ADMIN)
+ message_admins("[key_name_admin(voter)] has cancelled the current vote.")
+ reset()
+ return TRUE
+
+ if("toggleVote")
+ var/datum/vote/selected = possible_votes[params["voteName"]]
+ if(!istype(selected))
+ return
+
+ return selected.toggle_votable(voter)
+
+ if("callVote")
+ var/datum/vote/selected = possible_votes[params["voteName"]]
+ if(!istype(selected))
+ return
+
+ // Whether the user actually can initiate this vote is checked in initiate_vote,
+ // meaning you can't spoof initiate a vote you're not supposed to be able to
+ return initiate_vote(selected, voter.key, voter)
+
+ if("voteSingle")
+ return submit_single_vote(voter, params["voteOption"])
+
+ if("voteMulti")
+ return submit_multi_vote(voter, params["voteOption"])
+
+/datum/controller/subsystem/vote/ui_close(mob/user)
+ voting -= user.client?.ckey
+
+/// Mob level verb that allows players to vote on the current vote.
/mob/verb/vote()
set category = "OOC"
set name = "Vote"
- var/datum/browser/popup = new(src, "vote", "Voting Panel")
- popup.set_window_options("can_close=0")
- popup.set_content(SSvote.interface(client))
- popup.open(FALSE)
+ SSvote.ui_interact(usr)
+/// Datum action given to mobs that allows players to vote on the current vote.
/datum/action/vote
name = "Vote!"
button_icon_state = "vote"
-/datum/action/vote/Trigger()
- if(owner)
- owner.vote()
- remove_from_client()
- Remove(owner)
-
/datum/action/vote/IsAvailable()
- return TRUE
+ return TRUE // Democracy is always available to the free people
-/datum/action/vote/proc/remove_from_client()
- if(!owner)
+/datum/action/vote/Trigger(trigger_flags)
+ . = ..()
+ if(!.)
return
- if(owner.client)
- owner.client.player_details.player_actions -= src
- else if(owner.ckey)
- var/datum/player_details/P = GLOB.player_details[owner.ckey]
- if(P)
- P.player_actions -= src
+
+ owner.vote()
+ Remove(owner)
+
+// We also need to remove our action from the player actions when we're cleaning up.
+/datum/action/vote/Remove(mob/removed_from)
+ if(removed_from.client)
+ removed_from.client?.player_details.player_actions -= src
+
+ else if(removed_from.ckey)
+ var/datum/player_details/associated_details = GLOB.player_details[removed_from.ckey]
+ associated_details?.player_actions -= src
+
+ return ..()
+
+#undef vote_font
diff --git a/code/datums/components/connect_mob_behalf.dm b/code/datums/components/connect_mob_behalf.dm
new file mode 100644
index 000000000000..1c1a8a652342
--- /dev/null
+++ b/code/datums/components/connect_mob_behalf.dm
@@ -0,0 +1,59 @@
+/// This component behaves similar to connect_loc_behalf, but working off clients and mobs instead of loc
+/// To be clear, we hook into a signal on a tracked client's mob
+/// We retain the ability to react to that signal on a seperate listener, which makes this quite powerful
+/datum/component/connect_mob_behalf
+ dupe_mode = COMPONENT_DUPE_UNIQUE
+
+ /// An assoc list of signal -> procpath to register to the mob our client "owns"
+ var/list/connections
+ /// The master client we're working with
+ var/client/tracked
+ /// The mob we're currently tracking
+ var/mob/tracked_mob
+
+/datum/component/connect_mob_behalf/Initialize(client/tracked, list/connections)
+ . = ..()
+ if (!istype(tracked))
+ return COMPONENT_INCOMPATIBLE
+ src.connections = connections
+ src.tracked = tracked
+
+/datum/component/connect_mob_behalf/RegisterWithParent()
+ RegisterSignal(tracked, COMSIG_PARENT_QDELETING, PROC_REF(handle_tracked_qdel))
+ update_signals()
+
+/datum/component/connect_mob_behalf/UnregisterFromParent()
+ unregister_signals()
+ UnregisterSignal(tracked, COMSIG_PARENT_QDELETING)
+
+ tracked = null
+ tracked_mob = null
+
+/datum/component/connect_mob_behalf/proc/handle_tracked_qdel()
+ SIGNAL_HANDLER
+ qdel(src)
+
+/datum/component/connect_mob_behalf/proc/update_signals()
+ unregister_signals()
+ // Yes this is a runtime silencer
+ // We could be in a position where logout is sent to two things, one thing intercepts it, then deletes the client's new mob
+ // It's rare, and the same check in connect_loc_behalf is more fruitful, but it's still worth doing
+ if(QDELETED(tracked?.mob))
+ return
+ tracked_mob = tracked.mob
+ RegisterSignal(tracked_mob, COMSIG_MOB_LOGOUT, PROC_REF(on_logout))
+ for (var/signal in connections)
+ parent.RegisterSignal(tracked_mob, signal, connections[signal])
+
+/datum/component/connect_mob_behalf/proc/unregister_signals()
+ if(isnull(tracked_mob))
+ return
+
+ parent.UnregisterSignal(tracked_mob, connections)
+ UnregisterSignal(tracked_mob, COMSIG_MOB_LOGOUT)
+
+ tracked_mob = null
+
+/datum/component/connect_mob_behalf/proc/on_logout(mob/source)
+ SIGNAL_HANDLER
+ update_signals()
diff --git a/code/datums/components/storage/concrete/pockets.dm b/code/datums/components/storage/concrete/pockets.dm
index 19d092156405..bd0a59f85f42 100644
--- a/code/datums/components/storage/concrete/pockets.dm
+++ b/code/datums/components/storage/concrete/pockets.dm
@@ -36,7 +36,7 @@
. = ..()
var/static/list/exception_cache = typecacheof(list(
/obj/item/katana, /obj/item/toy/katana, /obj/item/nullrod/claymore/katana,
- /obj/item/energy_katana, /obj/item/gun/ballistic/automatic/smg/thompson/drum
+ /obj/item/energy_katana, /obj/item/gun/ballistic/automatic/smg/firestorm/pan
))
exception_hold = exception_cache
@@ -86,7 +86,7 @@
/obj/item/reagent_containers/food/drinks/bottle/vodka,
/obj/item/reagent_containers/food/drinks/bottle/molotov,
/obj/item/reagent_containers/food/drinks/drinkingglass,
- /obj/item/ammo_box/a762
+ /obj/item/ammo_box/magazine/illestren_a850r
))
/datum/component/storage/concrete/pockets/holster
diff --git a/code/datums/ert.dm b/code/datums/ert.dm
index 844548748824..2b02a2be0198 100644
--- a/code/datums/ert.dm
+++ b/code/datums/ert.dm
@@ -67,6 +67,7 @@
random_names = FALSE
leader_experience = FALSE
spawn_at_outpost = FALSE
+ ert_template = /datum/map_template/shuttle/subshuttles/ancon
/datum/ert/centcom_official/New()
mission = "Conduct a routine review of [station_name()]'s vessels."
@@ -89,6 +90,7 @@
rename_team = "Horde of Interns"
mission = "Assist in conflict resolution."
polldesc = "an unpaid internship opportunity with Nanotrasen"
+ ert_template = /datum/map_template/shuttle/subshuttles/ancon
/datum/ert/intern/unarmed
roles = list(/datum/antagonist/ert/intern/unarmed)
@@ -114,6 +116,7 @@
mission = "Carry out your contract."
rename_team = "Generic Inteq Team"
polldesc = "an Inteq emergency team"
+ ert_template = /datum/map_template/shuttle/subshuttles/anvil
// SolGov
@@ -148,6 +151,7 @@
rename_team = "Generic Minutemen Team"
polldesc = "a Minutemen emergency team"
random_names = TRUE
+ ert_template = /datum/map_template/shuttle/subshuttles/crux
/datum/ert/minutemen/bard
@@ -209,6 +213,7 @@
mission = "Assist CyberSun clients."
rename_team = "Cybersun Medical Intervention Team"
polldesc = "a Cybersun paramedic team"
+ ert_template = /datum/map_template/shuttle/subshuttles/runner
/datum/ert/syndicate/inspector
teamsize = 1
@@ -246,7 +251,6 @@
roles = list(/datum/antagonist/ert/frontier, /datum/antagonist/ert/frontier/medic, /datum/antagonist/ert/frontier/engineer)
rename_team = "Assault Frontiersmen Team"
polldesc = "a well armed squad of pirates"
- ert_template = /datum/map_template/shuttle/subshuttles/frontiersmen_gut
/datum/ert/independent
teamsize = 3
diff --git a/code/datums/mind.dm b/code/datums/mind.dm
index af7d411245e2..fc91d2c71de1 100644
--- a/code/datums/mind.dm
+++ b/code/datums/mind.dm
@@ -728,7 +728,7 @@
if(istype(S, spell))
spell_list -= S
qdel(S)
- current?.client << output(null, "statbrowser:check_spells")
+ current?.client.stat_panel.send_message("check_spells")
/datum/mind/proc/RemoveAllSpells()
for(var/obj/effect/proc_holder/S in spell_list)
diff --git a/code/datums/mutations/space_adaptation.dm b/code/datums/mutations/space_adaptation.dm
deleted file mode 100644
index a77694c6f797..000000000000
--- a/code/datums/mutations/space_adaptation.dm
+++ /dev/null
@@ -1,30 +0,0 @@
-//Cold Resistance gives your entire body an orange halo, and makes you immune to the effects of vacuum and cold.
-/datum/mutation/human/space_adaptation
- name = "Space Adaptation"
- desc = "A strange mutation that renders the host immune to the vacuum of space. Will still need an oxygen supply."
- quality = POSITIVE
- difficulty = 16
- text_gain_indication = "Your body feels warm! "
- time_coeff = 5
- instability = 30
-
-/datum/mutation/human/space_adaptation/New(class_ = MUT_OTHER, timer, datum/mutation/human/copymut)
- ..()
- if(!(type in visual_indicators))
- visual_indicators[type] = list(mutable_appearance('icons/effects/genetics.dmi', "fire", -MUTATIONS_LAYER))
-
-/datum/mutation/human/space_adaptation/get_visual_indicator()
- return visual_indicators[type][1]
-
-/datum/mutation/human/space_adaptation/on_acquiring(mob/living/carbon/human/owner)
- if(..())
- return
- ADD_TRAIT(owner, TRAIT_RESISTCOLD, "space_adaptation")
- ADD_TRAIT(owner, TRAIT_RESISTLOWPRESSURE, "space_adaptation")
-
-/datum/mutation/human/space_adaptation/on_losing(mob/living/carbon/human/owner)
- if(..())
- return
- REMOVE_TRAIT(owner, TRAIT_RESISTCOLD, "space_adaptation")
- REMOVE_TRAIT(owner, TRAIT_RESISTLOWPRESSURE, "space_adaptation")
-
diff --git a/code/datums/ruins/space.dm b/code/datums/ruins/space.dm
index 598f027fd016..362885cfe55e 100644
--- a/code/datums/ruins/space.dm
+++ b/code/datums/ruins/space.dm
@@ -103,12 +103,6 @@
description = "an abandoned secure storage location. there is no power left in the batteries and the former ocupants locked it pretty tight before leaving.\
You will have to power areas to raise the bolts on the doors. look out for secrets."
-/datum/map_template/ruin/space/oldshuttle
- id = "oldcode-nukeops"
- suffix = "oldcodeops.dmm"
- name = "Strange Infiltrator"
- description = "A nuclear operative's ship, drifing along the stars. This thing looks like it belongs in ancient times."
-
/datum/map_template/ruin/space/transport18
id = "transport18"
suffix = "transport18.dmm"
diff --git a/code/datums/shuttles.dm b/code/datums/shuttles.dm
index 35e8ff81a580..a66ed7d125ed 100644
--- a/code/datums/shuttles.dm
+++ b/code/datums/shuttles.dm
@@ -17,7 +17,10 @@
var/short_name
var/list/job_slots = list()
var/list/name_categories = list("GENERAL")
+ /// The prefix of the ship's name.
var/prefix = "ISV"
+ /// The full name of the ship's faction.
+ var/faction_name = "Independent"
var/unique_ship_access = FALSE
/// Set by config JSON. If true, the template's ships' "default" spawn location (when bought by a player or loaded at roundstart)
/// will be in the middle of space, instead of at an outpost.
@@ -326,12 +329,6 @@
category = "subshuttles"
starting_funds = 0
-
-/datum/map_template/shuttle/subshuttles/frontiersmen_gut //i need to give this a better name at some point
- file_name = "frontiersmen_gut"
- name = "Gut Combat Freighter"
- prefix = "ISV"
-
/datum/map_template/shuttle/subshuttles/pill
file_name = "independent_pill"
name = "Pill-Class Torture Device"
@@ -365,3 +362,38 @@
file_name = "nanotrasen_falcon"
name = "Falcon Dropship"
prefix = "NTSV"
+
+/datum/map_template/shuttle/subshuttles/crux
+ file_name = "minutemen_crux"
+ name = "Crux Dropship"
+ prefix = "CMSV"
+
+/datum/map_template/shuttle/subshuttles/ancon
+ file_name = "nanotrasen_ancon"
+ name = "Nanotrasen Ancon-Class Command Ship"
+ prefix = "NTSV"
+ name_categories = list("GENERAL", "SPACE")
+
+/datum/map_template/shuttle/subshuttles/frontiersmen_gut //i need to give this a better name at some point
+ file_name = "frontiersmen_gut"
+ name = "Gut Combat Freighter"
+ prefix = "ISV"
+
+/datum/map_template/shuttle/subshuttles/anvil
+ file_name = "inteq_anvil"
+ name = "Anvil-Class Dropship"
+ prefix = "IRMV"
+ name_categories = list("GENERAL", "SPACE")
+
+/datum/map_template/shuttle/subshuttles/runner
+ file_name = "syndicate_runner"
+ name = "Runner-Class Ambulance"
+ prefix = "CSSV"
+ name_categories = list("GENERAL", "SPACE")
+
+/datum/map_template/shuttle/subshuttles/haste
+ file_name = "inteq_haste"
+ name = "Haste-class Ambulance"
+ prefix = "IRMV"
+
+
diff --git a/code/datums/traits/negative.dm b/code/datums/traits/negative.dm
index dccd4e87877d..8cb9f50008f4 100644
--- a/code/datums/traits/negative.dm
+++ b/code/datums/traits/negative.dm
@@ -123,20 +123,20 @@
//Security/Command
if("Captain")
heirloom_type = /obj/item/reagent_containers/food/drinks/flask/gold
- if("Head of Security")
- heirloom_type = /obj/item/book/manual/wiki/security_space_law
+// if("Head of Security")
+// heirloom_type = /obj/item/book/manual/wiki/security_space_law
if("Head of Personnel")
heirloom_type = /obj/item/reagent_containers/food/drinks/trophy/silver_cup
- if("Warden")
- heirloom_type = /obj/item/book/manual/wiki/security_space_law
+// if("Warden")
+// heirloom_type = /obj/item/book/manual/wiki/security_space_law
if("Security Officer")
- heirloom_type = pick(/obj/item/book/manual/wiki/security_space_law, /obj/item/clothing/head/beret/sec)
+ heirloom_type = pick(/obj/item/clothing/head/beret/sec)
if("Detective")
heirloom_type = /obj/item/reagent_containers/food/drinks/bottle/whiskey
if("Lawyer")
- heirloom_type = pick(/obj/item/gavelhammer, /obj/item/book/manual/wiki/security_space_law)
+ heirloom_type = pick(/obj/item/gavelhammer)
if("Brig Physician") //WS edit - Brig Physicians
- heirloom_type = pick(/obj/item/clothing/neck/stethoscope, /obj/item/roller, /obj/item/book/manual/wiki/security_space_law) //WS edit - Brig Physicians
+ heirloom_type = pick(/obj/item/clothing/neck/stethoscope, /obj/item/roller) //WS edit - Brig Physicians
if("Prisoner")
heirloom_type = /obj/item/pen/blue
//RnD
diff --git a/code/datums/votes/_vote_datum.dm b/code/datums/votes/_vote_datum.dm
new file mode 100644
index 000000000000..c34d4600d2b0
--- /dev/null
+++ b/code/datums/votes/_vote_datum.dm
@@ -0,0 +1,250 @@
+
+/**
+ * # Vote Singleton
+ *
+ * A singleton datum that represents a type of vote for the voting subsystem.
+ */
+/datum/vote
+ /// The name of the vote.
+ var/name
+ /// If supplied, an override question will be displayed instead of the name of the vote.
+ var/override_question
+ /// The sound effect played to everyone when this vote is initiated.
+ var/vote_sound = 'sound/misc/compiler-stage2.ogg'
+ /// A list of default choices we have for this vote.
+ var/list/default_choices
+ /// What message do we want to pass to the player-side vote panel as a tooltip?
+ var/message = "Click to initiate a vote."
+
+ // Internal values used when tracking ongoing votes.
+ // Don't mess with these, change the above values / override procs for subtypes.
+ /// An assoc list of [all choices] to [number of votes in the current running vote].
+ var/list/choices = list()
+ /// A assoc list of [ckey] to [what they voted for in the current running vote].
+ var/list/choices_by_ckey = list()
+ /// The world time this vote was started.
+ var/started_time
+ /// The time remaining in this vote's run.
+ var/time_remaining
+ /// The counting method we use for votes.
+ var/count_method = VOTE_COUNT_METHOD_SINGLE
+ /// The method for selecting a winner.
+ var/winner_method = VOTE_WINNER_METHOD_SIMPLE
+
+/**
+ * Used to determine if this vote is a possible
+ * vote type for the vote subsystem.
+ *
+ * If FALSE is returned, this vote singleton
+ * will not be created when the vote subsystem initializes,
+ * meaning no one will be able to hold this vote.
+ */
+/datum/vote/proc/is_accessible_vote()
+ return !!length(default_choices)
+
+/**
+ * Resets our vote to its default state.
+ */
+/datum/vote/proc/reset()
+ SHOULD_CALL_PARENT(TRUE)
+
+ choices.Cut()
+ choices_by_ckey.Cut()
+ started_time = null
+ time_remaining = null
+
+/**
+ * If this vote has a config associated, toggles it between enabled and disabled.
+ * Returns TRUE on a successful toggle, FALSE otherwise
+ */
+/datum/vote/proc/toggle_votable(mob/toggler)
+ return FALSE
+
+/**
+ * If this vote has a config associated, returns its value (True or False, usually).
+ * If it has no config, returns -1.
+ */
+/datum/vote/proc/is_config_enabled()
+ return -1
+
+/**
+ * Checks if the passed mob can initiate this vote.
+ *
+ * Return TRUE if the mob can begin the vote, allowing anyone to actually vote on it.
+ * Return FALSE if the mob cannot initiate the vote.
+ */
+/datum/vote/proc/can_be_initiated(mob/by_who, forced = FALSE)
+ SHOULD_CALL_PARENT(TRUE)
+
+ if(started_time)
+ var/next_allowed_time = (started_time + CONFIG_GET(number/vote_delay))
+ if(next_allowed_time > world.time && !forced)
+ message = "A vote was initiated recently. You must wait [DisplayTimeText(next_allowed_time - world.time)] before a new vote can be started!"
+ return FALSE
+
+ message = initial(message)
+ return TRUE
+
+/**
+ * Called prior to the vote being initiated.
+ *
+ * Return FALSE to prevent the vote from being initiated.
+ */
+/datum/vote/proc/create_vote(mob/vote_creator)
+ SHOULD_CALL_PARENT(TRUE)
+
+ for(var/key in default_choices)
+ choices[key] = 0
+
+ return TRUE
+
+/**
+ * Called when this vote is actually initiated.
+ *
+ * Return a string - the text displayed to the world when the vote is initiated.
+ */
+/datum/vote/proc/initiate_vote(initiator, duration)
+ SHOULD_CALL_PARENT(TRUE)
+
+ started_time = world.time
+ time_remaining = round(duration / 10)
+
+ return "[capitalize(name)] vote started by [initiator || "Central Command"]."
+
+/**
+ * Gets the result of the vote.
+ *
+ * non_voters - a list of all ckeys who didn't vote in the vote.
+ *
+ * Returns a list of all options that won.
+ * If there were no votes at all, the list will be length = 0, non-null.
+ * If only one option one, the list will be length = 1.
+ * If there was a tie, the list will be length > 1.
+ */
+/datum/vote/proc/get_vote_result(list/non_voters)
+ RETURN_TYPE(/list)
+ SHOULD_CALL_PARENT(TRUE)
+
+ switch(winner_method)
+ if(VOTE_WINNER_METHOD_NONE)
+ return list()
+ if(VOTE_WINNER_METHOD_SIMPLE)
+ return get_simple_winner()
+ if(VOTE_WINNER_METHOD_WEIGHTED_RANDOM)
+ return get_random_winner()
+
+ stack_trace("invalid select winner method: [winner_method]. Defaulting to simple.")
+ return get_simple_winner()
+
+/// Gets the winner of the vote, selecting the choice with the most votes.
+/datum/vote/proc/get_simple_winner()
+ var/highest_vote = 0
+ var/list/current_winners = list()
+
+ for(var/option in choices)
+ var/vote_count = choices[option]
+ if(vote_count < highest_vote)
+ continue
+
+ if(vote_count > highest_vote)
+ highest_vote = vote_count
+ current_winners = list(option)
+ continue
+ current_winners += option
+
+ return length(current_winners) ? current_winners : list()
+
+/// Gets the winner of the vote, selecting a random choice from all choices based on their vote count.
+/datum/vote/proc/get_random_winner()
+ var/winner = pickweight(choices)
+ return winner ? list(winner) : list()
+
+/**
+ * Gets the resulting text displayed when the vote is completed.
+ *
+ * all_winners - list of all options that won. Can be multiple, in the event of ties.
+ * real_winner - the option that actually won.
+ * non_voters - a list of all ckeys who didn't vote in the vote.
+ *
+ * Return a formatted string of text to be displayed to everyone.
+ */
+/datum/vote/proc/get_result_text(list/all_winners, real_winner, list/non_voters)
+ var/returned_text = ""
+ if(override_question)
+ returned_text += span_bold(override_question)
+ else
+ returned_text += span_bold("[capitalize(name)] Vote")
+
+ returned_text += "\nWinner Selection: "
+ switch(winner_method)
+ if(VOTE_WINNER_METHOD_NONE)
+ returned_text += "None"
+ if(VOTE_WINNER_METHOD_WEIGHTED_RANDOM)
+ returned_text += "Weighted Random"
+ else
+ returned_text += "Simple"
+
+ var/total_votes = 0 // for determining percentage of votes
+ for(var/option in choices)
+ total_votes += choices[option]
+
+ if(total_votes <= 0)
+ return span_bold("Vote Result: Inconclusive - No Votes!")
+
+ returned_text += "\nResults:"
+ for(var/option in choices)
+ returned_text += "\n"
+ var/votes = choices[option]
+ var/percentage_text = ""
+ if(votes > 0)
+ var/actual_percentage = round((votes / total_votes) * 100, 0.1)
+ var/text = "[actual_percentage]"
+ var/spaces_needed = 5 - length(text)
+ for(var/_ in 1 to spaces_needed)
+ returned_text += " "
+ percentage_text += "[text]%"
+ else
+ percentage_text = " 0%"
+ returned_text += "[percentage_text] | [span_bold(option)]: [choices[option]]"
+
+ returned_text += "\n [span_bold("Non-Voters")]: [length(non_voters)]"
+
+ if(!real_winner) // vote has no winner or cannot be won, but still had votes
+ return returned_text
+
+ returned_text += "\n"
+ returned_text += get_winner_text(all_winners, real_winner, non_voters)
+
+ return returned_text
+
+/**
+ * Gets the text that displays the winning options within the result text.
+ *
+ * all_winners - list of all options that won. Can be multiple, in the event of ties.
+ * real_winner - the option that actually won.
+ * non_voters - a list of all ckeys who didn't vote in the vote.
+ *
+ * Return a formatted string of text to be displayed to everyone.
+ */
+/datum/vote/proc/get_winner_text(list/all_winners, real_winner, list/non_voters)
+ var/returned_text = ""
+ if(length(all_winners) > 1)
+ returned_text += "\n[span_bold("Vote Tied Between:")]"
+ for(var/a_winner in all_winners)
+ returned_text += "\n\t[a_winner]"
+
+ returned_text += span_bold("\nVote Result: [real_winner]")
+ return returned_text
+
+/**
+ * How this vote handles a tiebreaker between multiple winners.
+ */
+/datum/vote/proc/tiebreaker(list/winners)
+ return pick(winners)
+
+/**
+ * Called when a vote is actually all said and done.
+ * Apply actual vote effects here.
+ */
+/datum/vote/proc/finalize_vote(winning_option)
+ return
diff --git a/code/datums/votes/custom_vote.dm b/code/datums/votes/custom_vote.dm
new file mode 100644
index 000000000000..4dbc984759c8
--- /dev/null
+++ b/code/datums/votes/custom_vote.dm
@@ -0,0 +1,75 @@
+/// The max amount of options someone can have in a custom vote.
+#define MAX_CUSTOM_VOTE_OPTIONS 10
+
+/datum/vote/custom_vote/single
+ name = "Custom Standard"
+ message = "Click here to start a custom vote (one selection per voter)"
+
+/datum/vote/custom_vote/multi
+ name = "Custom Multi"
+ message = "Click here to start a custom multi vote (multiple selections per voter)"
+ count_method = VOTE_COUNT_METHOD_MULTI
+
+// Custom votes ares always accessible.
+/datum/vote/custom_vote/is_accessible_vote()
+ return TRUE
+
+/datum/vote/custom_vote/reset()
+ default_choices = null
+ override_question = null
+ return ..()
+
+/datum/vote/custom_vote/can_be_initiated(mob/by_who, forced = FALSE)
+ . = ..()
+ if(!.)
+ return FALSE
+
+ // Custom votes can only be created if they're forced to be made.
+ // (Either an admin makes it, or otherwise.)
+ return forced
+
+/datum/vote/custom_vote/create_vote(mob/vote_creator)
+ var/custom_win_method = tgui_input_list(
+ vote_creator,
+ "How should the vote winner be determined?",
+ "Winner Method",
+ list("Simple", "Weighted Random", "No Winner"),
+ )
+ if(!custom_win_method)
+ custom_win_method = "Simple"
+ switch(custom_win_method)
+ if("Simple")
+ winner_method = VOTE_WINNER_METHOD_SIMPLE
+ if("Weighted Random")
+ winner_method = VOTE_WINNER_METHOD_WEIGHTED_RANDOM
+ if("No Winner")
+ winner_method = VOTE_WINNER_METHOD_NONE
+ else
+ to_chat(vote_creator, span_boldwarning("Unknown winner method. Contact a coder."))
+ return FALSE
+
+ override_question = input(vote_creator, "What is the vote for?", "Custom Vote") as text|null
+ if(!override_question)
+ return FALSE
+
+ default_choices = list()
+ for(var/i in 1 to MAX_CUSTOM_VOTE_OPTIONS)
+ var/option = input(vote_creator, "Please enter an option, or hit cancel to finish. [MAX_CUSTOM_VOTE_OPTIONS] max.", "Options") as text|null
+ option = copytext(option, 1, MAX_NAME_LEN)
+ if(!vote_creator?.client)
+ return FALSE
+ if(!option)
+ break
+
+ default_choices += capitalize(option)
+
+ if(!length(default_choices))
+ return FALSE
+
+ return ..()
+
+/datum/vote/custom_vote/initiate_vote(initiator, duration)
+ . = ..()
+ . += "\n[override_question]"
+
+#undef MAX_CUSTOM_VOTE_OPTIONS
diff --git a/code/datums/votes/restart_vote.dm b/code/datums/votes/restart_vote.dm
new file mode 100644
index 000000000000..24d38f35396d
--- /dev/null
+++ b/code/datums/votes/restart_vote.dm
@@ -0,0 +1,76 @@
+#define CHOICE_RESTART "Restart Round"
+#define CHOICE_CONTINUE "Continue Playing"
+
+/datum/vote/restart_vote
+ name = "Restart"
+ default_choices = list(
+ CHOICE_RESTART,
+ CHOICE_CONTINUE,
+ )
+ message = "Vote to restart the ongoing round."
+
+/// This proc checks to see if any admins are online for the purposes of this vote to see if it can pass. Returns TRUE if there are valid admins online (Has +SERVER and is not AFK), FALSE otherwise.
+/datum/vote/restart_vote/proc/admins_present()
+ for(var/client/online_admin as anything in GLOB.admins)
+ if(online_admin.is_afk() || !check_rights_for(online_admin, R_SERVER))
+ continue
+
+ return TRUE
+
+ return FALSE
+
+/datum/vote/restart_vote/toggle_votable(mob/toggler)
+ if(!toggler)
+ CRASH("[type] wasn't passed a \"toggler\" mob to toggle_votable.")
+
+ if(!check_rights_for(toggler.client, R_ADMIN))
+ return FALSE
+
+ CONFIG_SET(flag/allow_vote_restart, !CONFIG_GET(flag/allow_vote_restart))
+ return TRUE
+
+/datum/vote/restart_vote/is_config_enabled()
+ return CONFIG_GET(flag/allow_vote_restart)
+
+/datum/vote/restart_vote/can_be_initiated(mob/by_who, forced)
+ . = ..()
+ if(!.)
+ return FALSE
+
+ if(!forced && !CONFIG_GET(flag/allow_vote_restart))
+ message = "Restart voting is disabled by server configuration settings."
+ return FALSE
+
+ // We still want players to be able to vote to restart even if valid admins are online. Let's update the message just so that the player is aware of this fact.
+ // We don't want to lock-out the vote though, so we'll return TRUE.
+ if(admins_present())
+ message = "Regardless of the results of this vote, the round will not automatically restart because an admin is online."
+ return TRUE
+
+ message = initial(message)
+ return TRUE
+
+/datum/vote/restart_vote/get_vote_result(list/non_voters)
+ if(!CONFIG_GET(flag/default_no_vote))
+ // Default no votes will add non-voters to "Continue Playing"
+ choices[CHOICE_CONTINUE] += length(non_voters)
+
+ return ..()
+
+/datum/vote/restart_vote/finalize_vote(winning_option)
+ if(winning_option == CHOICE_CONTINUE)
+ return
+
+ if(winning_option == CHOICE_RESTART)
+ if(admins_present())
+ to_chat(world, span_boldannounce("Notice: A restart vote will not restart the server automatically because there are active admins on."))
+ message_admins("A restart vote has passed, but there are active admins on with +SERVER, so it has been canceled. If you wish, you may restart the server.")
+ return
+
+ SSticker.Reboot("Restart vote successful.", "restart vote", 1)
+ return
+
+ CRASH("[type] wasn't passed a valid winning choice. (Got: [winning_option || "null"])")
+
+#undef CHOICE_RESTART
+#undef CHOICE_CONTINUE
diff --git a/code/datums/votes/transfer_vote.dm b/code/datums/votes/transfer_vote.dm
new file mode 100644
index 000000000000..650c8266f872
--- /dev/null
+++ b/code/datums/votes/transfer_vote.dm
@@ -0,0 +1,66 @@
+#define CHOICE_TRANSFER "Initiate Bluespace Jump"
+#define CHOICE_CONTINUE "Continue Playing"
+
+/// The fraction of non-voters that will be added to the transfer option when the vote is finalized.
+#define TRANSFER_FACTOR clamp((world.time / (1 MINUTES) - 120) / 240, 0, 1)
+
+/datum/vote/transfer_vote
+ name = "Transfer"
+ default_choices = list(
+ CHOICE_TRANSFER,
+ CHOICE_CONTINUE,
+ )
+
+/datum/vote/transfer_vote/toggle_votable(mob/toggler)
+ if(!toggler)
+ CRASH("[type] wasn't passed a \"toggler\" mob to toggle_votable.")
+ if(!check_rights_for(toggler.client, R_ADMIN))
+ return FALSE
+
+ CONFIG_SET(flag/allow_vote_transfer, !CONFIG_GET(flag/allow_vote_transfer))
+ return TRUE
+
+/datum/vote/transfer_vote/is_config_enabled()
+ return CONFIG_GET(flag/allow_vote_transfer)
+
+/datum/vote/transfer_vote/can_be_initiated(mob/by_who, forced)
+ . = ..()
+ if(!.)
+ return FALSE
+
+ if(SSshuttle.jump_mode != BS_JUMP_IDLE)
+ return FALSE
+
+ if(!forced && !CONFIG_GET(flag/allow_vote_transfer))
+ if(by_who)
+ to_chat(by_who, span_warning("Transfer voting is disabled."))
+ return FALSE
+
+ return TRUE
+
+/datum/vote/transfer_vote/get_vote_result(list/non_voters)
+ choices[CHOICE_TRANSFER] += round(length(non_voters) * TRANSFER_FACTOR)
+
+ return ..()
+
+/datum/vote/transfer_vote/get_winner_text(list/all_winners, real_winner, list/non_voters)
+ . = ..()
+ var/boost = round(length(non_voters) * TRANSFER_FACTOR)
+ if(boost)
+ . += "\n"
+ . += span_bold("Transfer option was boosted by [boost] non-voters ([round(TRANSFER_FACTOR * 100, 0.1)]%) due to round length.")
+
+/datum/vote/transfer_vote/finalize_vote(winning_option)
+ if(winning_option == CHOICE_CONTINUE)
+ return
+
+ if(winning_option == CHOICE_TRANSFER)
+ SSshuttle.request_jump()
+ return
+
+ CRASH("[type] wasn't passed a valid winning choice. (Got: [winning_option || "null"])")
+
+#undef TRANSFER_FACTOR
+
+#undef CHOICE_TRANSFER
+#undef CHOICE_CONTINUE
diff --git a/code/game/MapData/shuttles/nanotrasen_ranger.dm b/code/game/MapData/shuttles/nanotrasen_ranger.dm
index df5a0a9b4a08..1766cd11ee0c 100644
--- a/code/game/MapData/shuttles/nanotrasen_ranger.dm
+++ b/code/game/MapData/shuttles/nanotrasen_ranger.dm
@@ -127,7 +127,7 @@
item_state = "hardsuit0-ert_security"
/obj/item/clothing/suit/space/hardsuit/ert/lp/engi
- armor = list("melee" = 30, "bullet" = 15, "laser" = 15, "energy" = 20, "bomb" = 10, "bio" = 100, "rad" = 60, "fire" = 100, "acid" = 75)
+ armor = list("melee" = 30, "bullet" = 15, "laser" = 15, "energy" = 20, "bomb" = 10, "bio" = 100, "rad" = 75, "fire" = 100, "acid" = 75)
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/ert/lp/engi
name = "Loss Prevention Engineering Hardsuit"
desc = "The best of the best engineering staff get assigned to the ERT. Second best are given this Hardsuit as a part of the LP Team."
@@ -135,7 +135,7 @@
item_state = "ert_engineer"
/obj/item/clothing/head/helmet/space/hardsuit/ert/lp/engi
- armor = list("melee" = 30, "bullet" = 15, "laser" = 15, "energy" = 20, "bomb" = 10, "bio" = 100, "rad" = 60, "fire" = 100, "acid" = 75)
+ armor = list("melee" = 30, "bullet" = 15, "laser" = 15, "energy" = 20, "bomb" = 10, "bio" = 100, "rad" = 75, "fire" = 100, "acid" = 75)
name = "Loss Prevention Engineering Hardsuit Helmet"
desc = "The helmet that comes attached to the LP Team Engineering Hardsuit."
icon_state = "hardsuit0-ert_engineer"
diff --git a/code/game/MapData/shuttles/srm_glaive.dm b/code/game/MapData/shuttles/srm_elder.dm
similarity index 100%
rename from code/game/MapData/shuttles/srm_glaive.dm
rename to code/game/MapData/shuttles/srm_elder.dm
diff --git a/code/game/area/areas/ruins/sandplanet.dm b/code/game/area/areas/ruins/sandplanet.dm
index e2fb00acdc10..e3a93b58e065 100644
--- a/code/game/area/areas/ruins/sandplanet.dm
+++ b/code/game/area/areas/ruins/sandplanet.dm
@@ -7,5 +7,13 @@
icon_state = "green"
/area/ruin/whitesands/pubbycrash
- name = "Pubby Crash"
- icon_state = "blue"
+ name = "Pubby-Class Wreckage"
+ icon_state = "bluenew"
+
+/area/ruin/whitesands/pubbycrash/engine_room
+ name = "Pubby-Class Engine Room"
+ icon_state = "green"
+
+/area/ruin/whitesands/pubbycrash/split
+ name = "Pubby-Class Chunk"
+ icon_state = "red"
diff --git a/code/game/gamemodes/clown_ops/clown_ops.dm b/code/game/gamemodes/clown_ops/clown_ops.dm
index 5017b1d38c06..9025f6ec2dcb 100644
--- a/code/game/gamemodes/clown_ops/clown_ops.dm
+++ b/code/game/gamemodes/clown_ops/clown_ops.dm
@@ -47,6 +47,7 @@
uplink_type = /obj/item/uplink/clownop
/datum/outfit/syndicate/clownop/no_crystals
+ name = "Clown Operative - No Crystals"
tc = 0
/datum/outfit/syndicate/clownop/leader
diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm
index ac66aa4f6f26..7ee4a5ce668c 100644
--- a/code/game/machinery/cryopod.dm
+++ b/code/game/machinery/cryopod.dm
@@ -450,7 +450,10 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/computer/cryopod/retro, 17)
sleepyhead.apply_damage_type(15, BURN)
to_chat(sleepyhead, "The symptoms of cryosleep set in as you awaken...")
-
+/obj/machinery/cryopod/syndicate
+ icon_state = "sleeper_s-open"
+ open_state = "sleeper_s-open"
+ close_state = "sleeper_s"
/obj/machinery/cryopod/poor
name = "low quality cryogenic freezer"
diff --git a/code/game/objects/items/desk_flags.dm b/code/game/objects/items/desk_flags.dm
index 3ac3418209e0..3e7c299fc3bd 100644
--- a/code/game/objects/items/desk_flags.dm
+++ b/code/game/objects/items/desk_flags.dm
@@ -1,7 +1,7 @@
/obj/item/desk_flag
- name = "flag"
+ name = "blank desk flag"
desc = "Show your patriotism with WaffleCo. brand desk flags!"
- icon = 'icons/obj/flags.dmi'
+ icon = 'icons/obj/deskflags.dmi'
icon_state = "flag"
force = 3
throwforce = 2
@@ -17,11 +17,16 @@
icon_state = "trans"
/obj/item/desk_flag/solgov
- name = "solgov flag"
+ name = "solgov desk flag"
desc = "The blue and gold flag of the Sol Government."
icon_state = "solgov"
/obj/item/desk_flag/trans
- name = "vampire flag"
+ name = "vampire desk flag"
desc = "The blue, cyan, and white flag of the transylvanian society of vampires."
icon_state = "trans"
+
+/obj/item/desk_flag/gezena
+ name = "gezenan desk flag"
+ desc = "A small banner on a pole depicting the sigil of the Pan-Gezenan Federation."
+ icon_state = "gezena"
diff --git a/code/game/objects/items/dna_injector.dm b/code/game/objects/items/dna_injector.dm
index b63285b24f0e..34563d5e649c 100644
--- a/code/game/objects/items/dna_injector.dm
+++ b/code/game/objects/items/dna_injector.dm
@@ -176,16 +176,6 @@
desc = "Fixes that speaking impairment."
remove_mutations = list(NERVOUS)
-/obj/item/dnainjector/antifire
- name = "\improper DNA injector (Anti-Fire)"
- desc = "Cures fire."
- remove_mutations = list(SPACEMUT)
-
-/obj/item/dnainjector/firemut
- name = "\improper DNA injector (Fire)"
- desc = "Gives you fire."
- add_mutations = list(SPACEMUT)
-
/obj/item/dnainjector/blindmut
name = "\improper DNA injector (Blind)"
desc = "Makes you not see anything."
diff --git a/code/game/objects/items/gift.dm b/code/game/objects/items/gift.dm
index b32169951c46..8ec4353d1ca2 100644
--- a/code/game/objects/items/gift.dm
+++ b/code/game/objects/items/gift.dm
@@ -62,7 +62,7 @@ GLOBAL_LIST_EMPTY(possible_gifts)
/obj/item/grown/corncob,
/obj/item/poster/random_contraband,
/obj/item/poster/random_official,
- /obj/item/book/manual/wiki/barman_recipes,
+ /obj/item/book/manual/wiki/drinks,
/obj/item/book/manual/chef_recipes,
/obj/item/bikehorn,
/obj/item/toy/beach_ball,
diff --git a/code/game/objects/items/holy_weapons.dm b/code/game/objects/items/holy_weapons.dm
index a9f9e792c962..cd01cef70503 100644
--- a/code/game/objects/items/holy_weapons.dm
+++ b/code/game/objects/items/holy_weapons.dm
@@ -83,7 +83,6 @@
item_state = "cage"
worn_x_dimension = 64
worn_y_dimension = 64
- dynamic_hair_suffix = ""
/obj/item/storage/box/holy/sentinel
name = "Stone Sentinel Kit"
diff --git a/code/game/objects/items/manuals.dm b/code/game/objects/items/manuals.dm
index da1906143abc..693858bf1b2e 100644
--- a/code/game/objects/items/manuals.dm
+++ b/code/game/objects/items/manuals.dm
@@ -360,156 +360,177 @@
/obj/item/book/manual/wiki/chemistry
name = "Chemistry Textbook"
- icon_state ="chemistrybook"
- author = "Nanotrasen"
+ icon_state = "chemistrybook"
+ author = "GREMLIN"
title = "Chemistry Textbook"
page_link = "Guide_to_Chemistry"
-/obj/item/book/manual/wiki/engineering_construction
- name = "Station Repairs and Construction"
- icon_state ="bookEngineering"
- author = "Engineering Encyclopedia"
- title = "Station Repairs and Construction"
- page_link = "Guide_to_Construction"
-
-/obj/item/book/manual/wiki/engineering_guide
- name = "Engineering Textbook"
- icon_state ="bookEngineering2"
- author = "Engineering Encyclopedia"
- title = "Engineering Textbook"
+/obj/item/book/manual/wiki/command
+ name = "Command and Delegate"
+ icon_state = "book"
+ author = "Frontier Assistance Program"
+ title = "Command and Delegate: The Entreprising Captain's Guide"
+ page_link = "Guide_to_Command"
+
+/obj/item/book/manual/wiki/piloting
+ name = "You and Helm Consoles"
+ icon_state = "book"
+ author = "Frontier Assistance Program"
+ title = "You and Helm Consoles: The Bold Helmsman's Manual"
+ page_link = "Guide_to_the_Overmap"
+
+/obj/item/book/manual/wiki/ghetto_chemistry
+ name = "Ghetto Chemistry Textbook"
+ icon_state = "chemistrybook"
+ author = "GREMLIN"
+ title = "Less Legal Chemistry Textbook"
+ page_link = "Guide_to_Ghetto_Chemistry"
+
+/obj/item/book/manual/wiki/cooking
+ name = "Cookbook"
+ desc = "It's a cookbook!"
+ icon_state = "cooked_book"
+ author = "Frontier Assistance Program"
+ title = "To Serve Man"
+ page_link = "Guide_to_Food_and_Drinks"
+
+/obj/item/book/manual/wiki/construction
+ name = "Ship Repairs and Construction"
+ icon_state = "bookEngineering"
+ author = "Frontier Assistance Program"
+ title = "Ship Repairs and Construction"
+ page_link = "Construction"
+
+/obj/item/book/manual/wiki/engineering
+ name = "Engineering Guide"
+ icon_state = "bookEngineering2"
+ author = "Frontier Assistance Program"
+ title = "The Ship Engineer's Guide to Mechanical and Electrical Engineering"
page_link = "Guide_to_Engineering"
-/obj/item/book/manual/wiki/engineering_singulo_tesla
- name = "Singularity and Tesla for Dummies"
- icon_state ="bookEngineeringSingularitySafety"
- author = "Engineering Encyclopedia"
- title = "Singularity and Tesla for Dummies"
- page_link = "Singularity_and_Tesla_engines"
-
-/obj/item/book/manual/wiki/security_space_law
- name = "Space Law"
- desc = "A set of Nanotrasen guidelines for keeping law and order on their space stations."
- icon_state = "bookSpaceLaw"
- author = "Nanotrasen"
- title = "Space Law"
- page_link = "Space_Law"
-
-/obj/item/book/manual/wiki/infections
- name = "Infections - Making your own pandemic!"
- icon_state = "bookInfections"
- author = "Infections Encyclopedia"
- title = "Infections - Making your own pandemic!"
- page_link = "Infections"
-
-/obj/item/book/manual/wiki/telescience
- name = "Teleportation Science - Bluespace for dummies!"
- icon_state = "book7"
- author = "University of Bluespace"
- title = "Teleportation Science - Bluespace for dummies!"
- page_link = "Guide_to_telescience"
-
-/obj/item/book/manual/wiki/engineering_hacking
+/obj/item/book/manual/wiki/hacking
name = "Hacking"
- icon_state ="bookHacking"
- author = "Engineering Encyclopedia"
+ icon_state = "bookHacking"
+ author = "Frontier Assistance Program"
title = "Hacking"
page_link = "Hacking"
-/obj/item/book/manual/wiki/detective
- name = "The Film Noir: Proper Procedures for Investigations"
- icon_state ="bookDetective"
- author = "Nanotrasen"
- title = "The Film Noir: Proper Procedures for Investigations"
- page_link = "Detective"
-
-/obj/item/book/manual/wiki/barman_recipes
+/obj/item/book/manual/wiki/drinks
name = "Barman Recipes: Mixing Drinks and Changing Lives"
icon_state = "barbook"
author = "Sir John Rose"
title = "Barman Recipes: Mixing Drinks and Changing Lives"
- page_link = "Guide_to_food_and_drinks"
-
-/obj/item/book/manual/wiki/robotics_cyborgs
- name = "Robotics for Dummies"
- icon_state = "borgbook"
- author = "XISC"
- title = "Robotics for Dummies"
- page_link = "Guide_to_robotics"
-
-/obj/item/book/manual/wiki/research_and_development
- name = "Research and Development 101"
- icon_state = "rdbook"
- author = "Dr. L. Ight"
- title = "Research and Development 101"
- page_link = "Guide_to_Research_and_Development"
-
-/obj/item/book/manual/wiki/experimentor
- name = "Mentoring your Experiments"
- icon_state = "rdbook"
- author = "Dr. H.P. Kritz"
- title = "Mentoring your Experiments"
- page_link = "E.X.P.E.R.I-MENTOR"
-
-/obj/item/book/manual/wiki/cooking_to_serve_man
- name = "To Serve Man"
- desc = "It's a cookbook!"
- icon_state ="cooked_book"
- author = "the Kanamitan Empire"
- title = "To Serve Man"
- page_link = "Guide_to_food_and_drinks"
-
-/obj/item/book/manual/wiki/tcomms
- name = "Subspace Telecommunications And You"
- icon_state = "book3"
- author = "Engineering Encyclopedia"
- title = "Subspace Telecommunications And You"
- page_link = "Guide_to_Telecommunications"
-
-/obj/item/book/manual/wiki/atmospherics
- name = "Lexica Atmosia"
- icon_state = "book5"
- author = "the City-state of Atmosia"
- title = "Lexica Atmosia"
- page_link = "Guide_to_Atmospherics"
+ page_link = "Guide_to_Food_and_Drinks"
/obj/item/book/manual/wiki/medicine
- name = "Medical Space Compendium, Volume 638"
+ name = "Guide to Medical Aid"
icon_state = "book8"
- author = "Medical Journal"
- title = "Medical Space Compendium, Volume 638"
- page_link = "Guide_to_medicine"
+ author = "Frontier Assistance Program"
+ title = "The Crewman's Guide to Medical Aid"
+ page_link = "Guide_to_Medical"
/obj/item/book/manual/wiki/surgery
- name = "Brain Surgery for Dummies"
+ name = "Guide to Surgery"
icon_state = "book4"
- author = "Dr. F. Fran"
- title = "Brain Surgery for Dummies"
- page_link = "Surgery"
+ author = "Frontier Assistance Program"
+ title = "Guide to Surgery: Scalpel, Hemostat, Wristwatch"
+ page_link = "Guide_to_Surgery"
-/obj/item/book/manual/wiki/grenades
- name = "DIY Chemical Grenades"
- icon_state = "book2"
- author = "W. Powell"
- title = "DIY Chemical Grenades"
- page_link = "Grenade"
-
-/obj/item/book/manual/wiki/toxins
- name = "Toxins or: How I Learned to Stop Worrying and Love the Maxcap"
- icon_state = "book6"
- author = "Cuban Pete"
- title = "Toxins or: How I Learned to Stop Worrying and Love the Maxcap"
- page_link = "Guide_to_toxins"
-
-/obj/item/book/manual/wiki/plumbing
- name = "Chemical Factories Without Narcotics"
- icon_state ="plumbingbook"
- author = "Nanotrasen"
- title = "Chemical Factories Without Narcotics"
- page_link = "Guide_to_plumbing"
-
-/obj/item/book/manual/wiki/medical_cloning
- name = "Cloning techniques of the 26th century"
- icon_state ="bookCloning"
- author = "Medical Journal, volume 3"
- title = "Cloning techniques of the 26th century"
- page_link = "Guide_to_genetics#Cloning"
+/obj/item/book/manual/wiki/robotics
+ name = "Robotics for Dummies"
+ icon_state = "borgbook"
+ author = "XISC"
+ title = "Robotics for Dummies"
+ page_link = "Guide_to_Robotics"
+
+// /obj/item/book/manual/wiki/engineering_singulo_tesla
+// name = "Singularity and Tesla for Dummies"
+// icon_state ="bookEngineeringSingularitySafety"
+// author = "Engineering Encyclopedia"
+// title = "Singularity and Tesla for Dummies"
+// page_link = "Singularity_and_Tesla_engines"
+
+// /obj/item/book/manual/wiki/security_space_law
+// name = "Space Law"
+// desc = "A set of Nanotrasen guidelines for keeping law and order on their space stations."
+// icon_state = "bookSpaceLaw"
+// author = "Nanotrasen"
+// title = "Space Law"
+// page_link = "Space_Law"
+
+// /obj/item/book/manual/wiki/infections
+// name = "Infections - Making your own pandemic!"
+// icon_state = "bookInfections"
+// author = "Infections Encyclopedia"
+// title = "Infections - Making your own pandemic!"
+// page_link = "Infections"
+
+// /obj/item/book/manual/wiki/telescience
+// name = "Teleportation Science - Bluespace for dummies!"
+// icon_state = "book7"
+// author = "University of Bluespace"
+// title = "Teleportation Science - Bluespace for dummies!"
+// page_link = "Guide_to_telescience"
+
+// /obj/item/book/manual/wiki/detective
+// name = "The Film Noir: Proper Procedures for Investigations"
+// icon_state ="bookDetective"
+// author = "Nanotrasen"
+// title = "The Film Noir: Proper Procedures for Investigations"
+// page_link = "Detective"
+
+// /obj/item/book/manual/wiki/research_and_development
+// name = "Research and Development 101"
+// icon_state = "rdbook"
+// author = "Dr. L. Ight"
+// title = "Research and Development 101"
+// page_link = "Guide_to_Research_and_Development"
+
+// /obj/item/book/manual/wiki/experimentor
+// name = "Mentoring your Experiments"
+// icon_state = "rdbook"
+// author = "Dr. H.P. Kritz"
+// title = "Mentoring your Experiments"
+// page_link = "E.X.P.E.R.I-MENTOR"
+
+// /obj/item/book/manual/wiki/tcomms
+// name = "Subspace Telecommunications And You"
+// icon_state = "book3"
+// author = "Engineering Encyclopedia"
+// title = "Subspace Telecommunications And You"
+// page_link = "Guide_to_Telecommunications"
+
+// /obj/item/book/manual/wiki/atmospherics
+// name = "Lexica Atmosia"
+// icon_state = "book5"
+// author = "the City-state of Atmosia"
+// title = "Lexica Atmosia"
+// page_link = "Guide_to_Atmospherics"
+
+// /obj/item/book/manual/wiki/grenades
+// name = "DIY Chemical Grenades"
+// icon_state = "book2"
+// author = "W. Powell"
+// title = "DIY Chemical Grenades"
+// page_link = "Grenade"
+
+// /obj/item/book/manual/wiki/toxins
+// name = "Toxins or: How I Learned to Stop Worrying and Love the Maxcap"
+// icon_state = "book6"
+// author = "Cuban Pete"
+// title = "Toxins or: How I Learned to Stop Worrying and Love the Maxcap"
+// page_link = "Guide_to_toxins"
+
+// /obj/item/book/manual/wiki/plumbing
+// name = "Chemical Factories Without Narcotics"
+// icon_state ="plumbingbook"
+// author = "Nanotrasen"
+// title = "Chemical Factories Without Narcotics"
+// page_link = "Guide_to_plumbing"
+
+// /obj/item/book/manual/wiki/medical_cloning
+// name = "Cloning techniques of the 26th century"
+// icon_state ="bookCloning"
+// author = "Medical Journal, volume 3"
+// title = "Cloning techniques of the 26th century"
+// page_link = "Guide_to_genetics#Cloning"
diff --git a/code/game/objects/items/melee/misc.dm b/code/game/objects/items/melee/misc.dm
index 2dbec7311bd1..f4fbd42be38b 100644
--- a/code/game/objects/items/melee/misc.dm
+++ b/code/game/objects/items/melee/misc.dm
@@ -85,6 +85,85 @@
icon_state = "sabresolgov"
item_state = "sabresolgov"
+/obj/item/melee/sabre/suns
+ name = "SUNS sabre"
+ desc = "A blade of Solarian origin given to SUNS followers."
+ icon_state = "suns-sabre"
+ item_state = "suns-sabre"
+
+/obj/item/melee/sabre/suns/captain
+ name = "SUNS captain sabre"
+ desc = "An elegant blade awarded to SUNS captains. Despite its higher craftmanship, it appears to be just as effective as a normal sabre."
+ icon_state = "suns-capsabre"
+ item_state = "suns-capsabre"
+
+/obj/item/melee/sabre/suns/cmo
+ name = "SUNS stick sabre"
+ desc = "A thin blade used by SUNS medical instructors."
+ icon_state = "suns-swordstick"
+ item_state = "suns-swordstick"
+
+/obj/item/melee/sabre/suns/telescopic
+ name = "telescopic sabre"
+ desc = "A telescopic and retractable blade given to SUNS peacekeepers for easy concealment and carry. It's design makes it slightly less effective than normal sabres sadly, however it is still excelent at piercing armor."
+ icon_state = "suns-tsword"
+ item_state = "suns-tsword"
+ force = 0
+ throwforce = 0
+ block_chance = 0
+
+ slot_flags = ITEM_SLOT_BELT
+ w_class = WEIGHT_CLASS_SMALL
+ attack_verb = list("smacked", "prodded")
+
+
+ var/extended = FALSE
+ var/extend_sound = 'sound/weapons/batonextend.ogg'
+
+
+
+ var/on_icon_state = "suns-tsword_ext"
+ var/on_item_state = "suns-tsword_ext"
+ var/off_icon_state = "suns-tsword"
+ var/off_item_state = "suns-tsword"
+
+ var/force_on = 10
+ var/on_throwforce = 10
+ var/on_blockchance = 40
+
+ var/force_off = 0
+ var/off_throwforce = 0
+ var/off_blockchance = 0
+
+ var/weight_class_on = WEIGHT_CLASS_BULKY
+
+/obj/item/melee/sabre/suns/telescopic/attack_self(mob/user)
+ extended = !extended
+
+ if(extended)
+ to_chat(user, "You extend the [src]. ")
+ icon_state = on_icon_state
+ item_state = on_item_state
+ slot_flags = 0
+ w_class = weight_class_on
+ force = force_on
+ throwforce = on_throwforce
+ block_chance = on_blockchance
+ attack_verb = list("slashed", "cut")
+ else
+ to_chat(user, "You collapse the [src]. ")
+ icon_state = off_icon_state
+ item_state = off_item_state
+ slot_flags = ITEM_SLOT_BELT
+ w_class = WEIGHT_CLASS_SMALL
+ force = force_off
+ throwforce = off_throwforce
+ block_chance = off_blockchance
+ attack_verb = list("smacked", "prodded")
+
+ playsound(get_turf(src), extend_sound, 50, TRUE)
+ add_fingerprint(user)
+
/obj/item/melee/beesword
name = "The Stinger"
desc = "Taken from a giant bee and folded over one thousand times in pure honey. Can sting through anything."
diff --git a/code/game/objects/items/robot/robot_items.dm b/code/game/objects/items/robot/robot_items.dm
index f12137df7531..c5ebe82f90e9 100644
--- a/code/game/objects/items/robot/robot_items.dm
+++ b/code/game/objects/items/robot/robot_items.dm
@@ -692,7 +692,7 @@
/obj/item/borg/sight/xray
name = "\proper X-ray vision"
- icon = 'icons/obj/decals.dmi'
+ icon = 'icons/obj/structures/signs/sign.dmi'
icon_state = "securearea"
sight_mode = BORGXRAY
diff --git a/code/game/objects/items/stacks/tape.dm b/code/game/objects/items/stacks/tape.dm
index 92fe31d32a98..d22b1be85344 100644
--- a/code/game/objects/items/stacks/tape.dm
+++ b/code/game/objects/items/stacks/tape.dm
@@ -47,7 +47,7 @@
/obj/item/stack/sticky_tape/super
name = "super sticky tape"
singular_name = "super sticky tape"
- desc = "Quite possibly the most mischevious substance in the galaxy. Use with extreme lack of caution."
+ desc = "Quite possibly the most mischievous substance in the galaxy. Use with extreme lack of caution."
icon_state = "tape_y"
prefix = "super sticky"
conferred_embed = EMBED_HARMLESS_SUPERIOR
diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm
index 835f61682afd..aa50315298cb 100644
--- a/code/game/objects/items/storage/belt.dm
+++ b/code/game/objects/items/storage/belt.dm
@@ -689,17 +689,17 @@
/obj/item/storage/belt/bandolier
name = "bandolier"
- desc = "A bandolier for holding shotgun ammunition."
+ desc = "A bandolier for holding ammunition. Does not hold magazines"
icon_state = "bandolier"
item_state = "bandolier"
/obj/item/storage/belt/bandolier/ComponentInitialize()
. = ..()
var/datum/component/storage/STR = GetComponent(/datum/component/storage)
- STR.max_items = 18
+ STR.max_items = 40
STR.display_numerical_stacking = TRUE
STR.set_holdable(list(
- /obj/item/ammo_casing/shotgun
+ /obj/item/ammo_casing
))
/obj/item/storage/belt/fannypack
@@ -785,7 +785,7 @@
AddElement(/datum/element/update_icon_updates_onmob)
var/datum/component/storage/STR = GetComponent(/datum/component/storage)
STR.max_items = 1
- STR.use_sound = null
+ STR.use_sound = null //if youre wondering why this is null, its so you can look in your sheath to prepare to draw, without letting anyone know youre preparing to draw it
STR.max_w_class = WEIGHT_CLASS_BULKY
STR.set_holdable(list(
/obj/item/melee/sabre
@@ -842,6 +842,90 @@
new /obj/item/melee/sabre/solgov(src)
update_appearance()
+/obj/item/storage/belt/sabre/suns
+ name = "SUNS sabre sheath"
+ desc = "A leather sheath designed to hold a blade."
+
+ icon = 'icons/obj/clothing/faction/suns/belt.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/faction/suns/belt.dmi'
+ lefthand_file = 'icons/mob/inhands/faction/suns/suns_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/faction/suns/suns_righthand.dmi'
+
+ base_icon_state = "suns-sheath"
+ icon_state = "suns-sheath"
+ item_state = "suns-sheath"
+ w_class = WEIGHT_CLASS_BULKY
+
+/obj/item/storage/belt/sabre/suns/ComponentInitialize()
+ AddComponent(component_type)
+ AddElement(/datum/element/update_icon_updates_onmob)
+ var/datum/component/storage/STR = GetComponent(/datum/component/storage)
+ STR.max_items = 1
+ STR.use_sound = null
+ STR.max_w_class = WEIGHT_CLASS_BULKY
+ STR.set_holdable(list(
+ /obj/item/melee/sabre/suns
+ ))
+
+/obj/item/storage/belt/sabre/suns/PopulateContents()
+ new /obj/item/melee/sabre/suns(src)
+ update_appearance()
+
+
+/obj/item/storage/belt/sabre/suns/captain
+ name = "SUNS captain's sabre sheath"
+ desc = "An elegant and impressively made leather sheath designed to hold a captain's blade."
+
+ base_icon_state = "suns-capsheath"
+ icon_state = "suns-capsheath"
+ item_state = "suns-capsheath"
+ w_class = WEIGHT_CLASS_BULKY
+
+/obj/item/storage/belt/sabre/suns/captain/ComponentInitialize()
+ AddComponent(component_type)
+ AddElement(/datum/element/update_icon_updates_onmob)
+ var/datum/component/storage/STR = GetComponent(/datum/component/storage)
+ STR.max_items = 1
+ STR.use_sound = null
+ STR.max_w_class = WEIGHT_CLASS_BULKY
+ STR.set_holdable(list(
+ /obj/item/melee/sabre/suns/captain
+ ))
+
+/obj/item/storage/belt/sabre/suns/captain/PopulateContents()
+ new /obj/item/melee/sabre/suns/captain(src)
+ update_appearance()
+
+/obj/item/storage/belt/sabre/suns/cmo
+ name = "SUNS cane sheath"
+ desc = "A walking cane modified to hold a thin stick sabre. It does not fit on belts, contrary to popular belief."
+ slot_flags = null
+
+ icon = 'icons/obj/clothing/faction/suns/belt.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/faction/suns/belt.dmi'
+ lefthand_file = 'icons/mob/inhands/faction/suns/suns_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/faction/suns/suns_righthand.dmi'
+
+ base_icon_state = "suns-cane"
+ icon_state = "suns-cane"
+ item_state = "suns-cane"
+ w_class = WEIGHT_CLASS_BULKY
+
+/obj/item/storage/belt/sabre/suns/ComponentInitialize()
+ AddComponent(component_type)
+ AddElement(/datum/element/update_icon_updates_onmob)
+ var/datum/component/storage/STR = GetComponent(/datum/component/storage)
+ STR.max_items = 1
+ STR.use_sound = null
+ STR.max_w_class = WEIGHT_CLASS_BULKY
+ STR.set_holdable(list(
+ /obj/item/melee/sabre/suns/cmo
+ ))
+
+/obj/item/storage/belt/sabre/suns/PopulateContents()
+ new /obj/item/melee/sabre/suns/cmo(src)
+ update_appearance()
+
/obj/item/storage/belt/security/webbing/inteq
name = "inteq webbing"
desc = "A set of tactical webbing for operators of the IRMG, can hold security gear."
diff --git a/code/game/objects/items/storage/toolbox.dm b/code/game/objects/items/storage/toolbox.dm
index 89ac1aa123f6..739afba6df5f 100644
--- a/code/game/objects/items/storage/toolbox.dm
+++ b/code/game/objects/items/storage/toolbox.dm
@@ -233,39 +233,47 @@
drop_sound = 'sound/items/handling/ammobox_drop.ogg'
pickup_sound = 'sound/items/handling/ammobox_pickup.ogg'
material_flags = NONE
+ has_latches = FALSE
-/obj/item/storage/toolbox/ammo/a762/PopulateContents()
- name = "ammo can (7.62x54mmR)"
+/obj/item/storage/toolbox/ammo/a850r/PopulateContents()
+ name = "ammo can (8x50mmR)"
+ icon_state = "ammobox_850"
for(var/i in 1 to 7)
- new /obj/item/ammo_box/a762(src)
+ new /obj/item/ammo_box/magazine/illestren_a850r(src)
/obj/item/storage/toolbox/ammo/a762_39/PopulateContents()
name = "ammo can (7.62x39mm)"
+ icon_state = "ammobox_762"
for (var/i in 1 to 4)
new /obj/item/ammo_box/a762_39(src)
/obj/item/storage/toolbox/ammo/a308/PopulateContents()
name = "ammo can (.308)"
+ icon_state = "ammobox_308"
for (var/i in 1 to 4)
new /obj/item/ammo_box/a308(src)
/obj/item/storage/toolbox/ammo/c45/PopulateContents()
name = "ammo can (.45)"
+ icon_state = "ammobox_45"
for (var/i in 1 to 4)
new /obj/item/ammo_box/c45(src)
/obj/item/storage/toolbox/ammo/c9mm/PopulateContents()
name = "ammo can (9mm)"
+ icon_state = "ammobox_9mm"
for (var/i in 1 to 4)
new /obj/item/ammo_box/c9mm(src)
/obj/item/storage/toolbox/ammo/c10mm/PopulateContents()
name = "ammo can (10mm)"
+ icon_state = "ammobox_10mm"
for (var/i in 1 to 4)
new /obj/item/ammo_box/c10mm(src)
/obj/item/storage/toolbox/ammo/shotgun/PopulateContents()
name = "ammo can (12ga)"
+ icon_state = "ammobox_12ga"
for (var/i in 1 to 4)
new /obj/item/ammo_box/a12g(src)
diff --git a/code/game/objects/items/storage/uplink_kits.dm b/code/game/objects/items/storage/uplink_kits.dm
index 6b3658b523df..221cdf42d3f3 100644
--- a/code/game/objects/items/storage/uplink_kits.dm
+++ b/code/game/objects/items/storage/uplink_kits.dm
@@ -194,7 +194,7 @@
if("made_man")
new /obj/effect/spawner/lootdrop/mafia_outfit(src) // 0 TC, just an outfit for the new 'don of this family
- new /obj/item/gun/ballistic/automatic/smg/thompson/drum(src) // 20 TC, a gun with 50 .45 bullets on a three round burst is kinda outstanding
+ new /obj/item/gun/ballistic/automatic/smg/firestorm/pan(src) // 20 TC, a gun with 50 .45 bullets on a three round burst is kinda outstanding
new /obj/item/switchblade(src) // 3 TC? It's nice, but it's really a stealth/oh fuck I'm out of ammo weapon
new /obj/item/reagent_containers/food/drinks/bottle/vodka (src) // 5 TC, free molotov assemblies
new /obj/item/reagent_containers/food/drinks/bottle/vodka (src)
diff --git a/code/game/objects/structures/artstuff.dm b/code/game/objects/structures/artstuff.dm
index 03cff6da3f82..3bf8d8bd0dbd 100644
--- a/code/game/objects/structures/artstuff.dm
+++ b/code/game/objects/structures/artstuff.dm
@@ -220,7 +220,7 @@
/obj/item/wallframe/painting
name = "painting frame"
desc = "The perfect showcase for your favorite deathtrap memories."
- icon = 'icons/obj/decals.dmi'
+ icon = 'icons/obj/structures/signs/sign.dmi'
custom_materials = null
flags_1 = 0
icon_state = "frame-empty"
@@ -229,7 +229,7 @@
/obj/structure/sign/painting
name = "Painting"
desc = "Art or \"Art\"? You decide."
- icon = 'icons/obj/decals.dmi'
+ icon = 'icons/obj/structures/signs/sign.dmi'
icon_state = "frame-empty"
var/obj/item/canvas/C
var/persistence_id = "general"
diff --git a/code/game/objects/structures/beds_chairs/chair.dm b/code/game/objects/structures/beds_chairs/chair.dm
index 3c84cea0de27..80c6bedb49bb 100644
--- a/code/game/objects/structures/beds_chairs/chair.dm
+++ b/code/game/objects/structures/beds_chairs/chair.dm
@@ -368,12 +368,6 @@
icon_state = "wooden_chair_wings_toppled"
origin_type = /obj/structure/chair/wood/wings
-/obj/structure/chair/old
- name = "strange chair"
- desc = "You sit in this. Either by will or force. Looks REALLY uncomfortable."
- icon_state = "chairold"
- item_chair = null
-
/obj/structure/chair/comfy/shuttle/bronze
name = "brass chair"
desc = "A spinny chair made of bronze. It has little cogs for wheels!"
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
index 66b803e7d041..f94a5d5de585 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
@@ -300,7 +300,7 @@
for(var/i in 1 to 3)
new /obj/item/storage/box/rubbershot(src)
for(var/i in 1 to 3)
- new /obj/item/gun/ballistic/shotgun/riot(src)
+ new /obj/item/gun/ballistic/shotgun/hellfire(src)
/obj/structure/closet/secure_closet/armory3
name = "armory energy gun locker"
diff --git a/code/game/objects/structures/icemoon/cave_entrance.dm b/code/game/objects/structures/icemoon/cave_entrance.dm
index a20702886c24..9fc83f9ddc88 100644
--- a/code/game/objects/structures/icemoon/cave_entrance.dm
+++ b/code/game/objects/structures/icemoon/cave_entrance.dm
@@ -19,7 +19,6 @@ GLOBAL_LIST_INIT(ore_probability, list(
/obj/item/tank/jetpack/suit = 10,
/obj/item/survivalcapsule = 15,
/obj/item/reagent_containers/hypospray/medipen/survival = 15,
- /obj/item/card/mining_point_card = 15,
/obj/item/gps/mining = 10,
/obj/item/extraction_pack = 10,
/obj/item/reagent_containers/food/drinks/beer = 15,
@@ -1044,7 +1043,6 @@ GLOBAL_LIST_INIT(ore_probability, list(
new /obj/item/dnainjector/hulkmut(loc)
new /mob/living/simple_animal/hostile/gorilla(loc)
if(prob(35))
- new /obj/item/dnainjector/firemut(loc)
new /mob/living/simple_animal/hostile/gorilla(loc)
if(prob(35))
new /obj/item/dnainjector/gigantism(loc)
diff --git a/code/game/objects/structures/plaques/_plaques.dm b/code/game/objects/structures/plaques/_plaques.dm
index eeb477484b3b..261cec2feda8 100644
--- a/code/game/objects/structures/plaques/_plaques.dm
+++ b/code/game/objects/structures/plaques/_plaques.dm
@@ -1,5 +1,5 @@
/obj/structure/plaque //This is a plaque you can craft with gold, then permanently engrave a title and description on, with a fountain pen.
- icon = 'icons/obj/decals.dmi'
+ icon = 'icons/obj/structures/signs/sign.dmi'
icon_state = "blankplaque"
name = "blank plaque"
desc = "A blank plaque, use a fancy pen to engrave it. It can be detatched from the wall with a wrench."
@@ -15,7 +15,7 @@
var/engraved = FALSE
/obj/item/plaque //The item version of the above.
- icon = 'icons/obj/decals.dmi'
+ icon = 'icons/obj/structures/signs/sign.dmi'
icon_state = "blankplaque"
name = "blank plaque"
desc = "A blank plaque, use a fancy pen to engrave it. It can be placed on a wall."
diff --git a/code/game/objects/structures/signs/_signs.dm b/code/game/objects/structures/signs/_signs.dm
index 4a2a98192243..5b6c209190bb 100644
--- a/code/game/objects/structures/signs/_signs.dm
+++ b/code/game/objects/structures/signs/_signs.dm
@@ -1,5 +1,5 @@
/obj/structure/sign
- icon = 'icons/obj/decals.dmi'
+ icon = 'icons/obj/structures/signs/sign.dmi'
icon_state = "backing"
name = "sign backing"
desc = "A plastic sign backing, use a pen to change the decal. It can be detached from the wall with a wrench."
@@ -22,7 +22,7 @@
/obj/item/sign
name = "sign backing"
desc = "A plastic sign backing, use a pen to change the decal. It can be placed on a wall."
- icon = 'icons/obj/decals.dmi'
+ icon = 'icons/obj/structures/signs/sign.dmi'
icon_state = "backing"
w_class = WEIGHT_CLASS_NORMAL
custom_materials = list(/datum/material/plastic = 2000)
diff --git a/code/game/objects/structures/signs/signs_flags.dm b/code/game/objects/structures/signs/signs_flags.dm
new file mode 100644
index 000000000000..7832c878642a
--- /dev/null
+++ b/code/game/objects/structures/signs/signs_flags.dm
@@ -0,0 +1,53 @@
+/obj/structure/sign/flag
+ name = "missing wall flag"
+ desc = "You forgot something."
+ icon_state = "flag_none"
+ icon = 'icons/obj/structures/signs/wallflags.dmi'
+ buildable_sign = FALSE
+ custom_materials = null
+
+ var/item_flag = /obj/item/sign/flag
+
+// Stops flags from rotating like other signs, because they do that
+/obj/item/sign/flag/Initialize(mapload)
+ . = ..()
+ var/matrix/rotation_reset = matrix()
+ rotation_reset.Turn(0)
+ transform = rotation_reset
+
+/obj/structure/sign/flag/MouseDrop(over_object, src_location, over_location)
+ . = ..()
+ if(over_object == usr && Adjacent(usr))
+ if(!item_flag || src.flags_1 & NODECONSTRUCT_1)
+ return
+ if(!usr.canUseTopic(src, BE_CLOSE, NO_DEXTERITY, FALSE, TRUE))
+ return
+ usr.visible_message(span_notice("[usr] grabs and folds \the [src.name]."), span_notice("You grab and fold \the [src.name]."))
+ playsound(src, "rustle", 50, TRUE, -5)
+ var/obj/item/flag_item = new item_flag(loc)
+ TransferComponents(flag_item)
+ usr.put_in_hands(flag_item)
+ qdel(src)
+
+// STRUCTURE FLAGS - THE WALL MOUNTS
+
+/obj/structure/sign/flag/gezena
+ name = "\improper Gezenan flag"
+ desc = "lizards"
+ icon_state = "flag_gezena"
+ item_flag = /obj/item/sign/flag/gezena
+
+// ITEM FLAGS - THE THINGS YOU HOLD AND PLACE
+
+/obj/item/sign/flag
+ name = "missing flag"
+ desc = "You forgot something."
+ icon_state = "folded_none"
+ icon = 'icons/obj/structures/signs/wallflags.dmi'
+ sign_path = /obj/structure/sign/flag
+
+/obj/item/sign/flag/gezena
+ name = "folded Gezenan flag"
+ desc = "lizards but folded"
+ icon_state = "folded_gezena"
+ sign_path = /obj/structure/sign/flag/gezena
diff --git a/code/game/objects/structures/signs/signs_maps.dm b/code/game/objects/structures/signs/signs_maps.dm
index f2ab429803c1..d9e715e38ca6 100644
--- a/code/game/objects/structures/signs/signs_maps.dm
+++ b/code/game/objects/structures/signs/signs_maps.dm
@@ -3,6 +3,7 @@
/obj/structure/sign/map
name = "station map"
desc = "A navigational chart of the station."
+ icon = 'icons/obj/structures/signs/directions.dmi'
max_integrity = 500
/obj/structure/sign/map/left
@@ -11,6 +12,11 @@
/obj/structure/sign/map/right
icon_state = "map-right"
+/obj/structure/sign/directions
+ name = "You shouldn't see this"
+ icon_state = "direction"
+ icon = 'icons/obj/structures/signs/directions.dmi'
+
/obj/structure/sign/directions/science
name = "science department sign"
desc = "A direction sign, pointing out which way the Science department is."
diff --git a/code/game/objects/structures/spawner.dm b/code/game/objects/structures/spawner.dm
index 572e150815c6..620f1cb6126d 100644
--- a/code/game/objects/structures/spawner.dm
+++ b/code/game/objects/structures/spawner.dm
@@ -19,7 +19,6 @@ GLOBAL_LIST_INIT(astroloot, list(
/obj/item/tank/jetpack/suit = 10,
/obj/item/survivalcapsule = 15,
/obj/item/reagent_containers/hypospray/medipen/survival = 15,
- /obj/item/card/mining_point_card = 15,
/obj/item/gps/mining = 10,
/obj/item/extraction_pack = 10,
/obj/item/reagent_containers/food/drinks/beer = 15,
diff --git a/code/game/turfs/closed/_closed.dm b/code/game/turfs/closed/_closed.dm
index c7a1d9dd6f29..cfede10541d4 100644
--- a/code/game/turfs/closed/_closed.dm
+++ b/code/game/turfs/closed/_closed.dm
@@ -36,11 +36,6 @@
/turf/closed/indestructible/singularity_act()
return
-/turf/closed/indestructible/oldshuttle
- name = "strange shuttle wall"
- icon = 'icons/turf/shuttleold.dmi'
- icon_state = "block"
-
/turf/closed/indestructible/sandstone
name = "sandstone wall"
desc = "A wall with sandstone plating. Rough."
@@ -50,9 +45,6 @@
baseturfs = /turf/closed/indestructible/sandstone
smoothing_flags = SMOOTH_BITMASK
-/turf/closed/indestructible/oldshuttle/corner
- icon_state = "corner"
-
/turf/closed/indestructible/splashscreen
name = "Space Station 13"
icon = 'icons/blank_title.png'
diff --git a/code/game/turfs/open/floor/misc_floor.dm b/code/game/turfs/open/floor/misc_floor.dm
index 525221000f86..98ad4658add0 100644
--- a/code/game/turfs/open/floor/misc_floor.dm
+++ b/code/game/turfs/open/floor/misc_floor.dm
@@ -126,11 +126,6 @@
/turf/open/floor/noslip/MakeSlippery(wet_setting, min_wet_time, wet_time_to_add, max_wet_time, permanent)
return
-/turf/open/floor/oldshuttle
- icon = 'icons/turf/shuttleold.dmi'
- icon_state = "floor"
- floor_tile = /obj/item/stack/tile/plasteel
-
/turf/open/floor/bluespace
slowdown = -1
icon_state = "bluespace"
diff --git a/code/game/world.dm b/code/game/world.dm
index a9881d19d977..aae1ea9d6307 100644
--- a/code/game/world.dm
+++ b/code/game/world.dm
@@ -304,10 +304,6 @@ GLOBAL_VAR(restart_counter)
if (server_name)
s += "[server_name] — "
features += "[CONFIG_GET(flag/norespawn) ? "no " : ""]respawn"
- if(CONFIG_GET(flag/allow_vote_mode))
- features += "vote"
- if(CONFIG_GET(flag/allow_ai))
- features += "AI allowed"
hostedby = CONFIG_GET(string/hostedby)
var/discord_url
diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm
index a853f66963af..986399d63299 100644
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -766,7 +766,7 @@ GLOBAL_PROTECT(admin_verbs_hideable)
set name = "Debug Stat Panel"
set category = "Debug"
- src << output("", "statbrowser:create_debug")
+ src.stat_panel.send_message("create_debug")
#ifdef SENDMAPS_PROFILE
/client/proc/display_sendmaps()
diff --git a/code/modules/admin/verbs/one_click_antag.dm b/code/modules/admin/verbs/one_click_antag.dm
index 6c303cddf060..e1f88a2626b2 100644
--- a/code/modules/admin/verbs/one_click_antag.dm
+++ b/code/modules/admin/verbs/one_click_antag.dm
@@ -323,7 +323,7 @@
ertemplate.random_names = prefs["random_names"]["value"] == "Yes"
ertemplate.spawn_admin = prefs["spawn_admin"]["value"] == "Yes"
ertemplate.use_custom_shuttle = prefs["use_custom_shuttle"]["value"] == "Yes"
- ertemplate.spawn_at_outpost = prefs["use_custom_shuttle"]["value"] == "Yes"
+ ertemplate.spawn_at_outpost = prefs["spawn_at_outpost"]["value"] == "Yes"
var/list/spawnpoints = GLOB.emergencyresponseteamspawn
var/index = 0
@@ -341,11 +341,6 @@
to_chat(usr, span_warning("No applicants for ERT. Aborting spawn."))
return FALSE
- if(ertemplate.spawn_at_outpost && !ertemplate.use_custom_shuttle)
- if(!length(GLOB.emergencyresponseteam_outpostspawn))
- message_admins("No outpost spawns found!")
- spawnpoints = GLOB.emergencyresponseteam_outpostspawn
-
if(ertemplate.use_custom_shuttle && ertemplate.ert_template)
to_chat(usr, span_boldnotice("Attempting to spawn ERT custom shuttle, this may take a few seconds..."))
@@ -356,7 +351,7 @@
if(length(SSovermap.outposts) > 1)
var/temp_loc = input(usr, "Select outpost to spawn at") as null|anything in SSovermap.outposts
if(!temp_loc)
- message_admins("ERT Shuttle found no outpost to spawn at!")
+ message_admins("ERT found no outpost to spawn at!")
return
spawn_location = temp_loc
else
@@ -377,7 +372,7 @@
spawn_turfs += get_turf(spawner)
if(!brief_spawn)
- brief_spawn = locate(/obj/effect/landmark/ert_shuttle_brief_spawn) in shuttle_turfs
+ brief_spawn = locate(/obj/effect/landmark/ert_shuttle_brief_spawn) in ship_turfs
if(!length(spawn_turfs))
stack_trace("ERT shuttle loaded but found no spawnpoints, placing the ERT at wherever inside the shuttle instead.")
@@ -386,9 +381,14 @@
continue
spawn_turfs += open_turf
+ if(!ertemplate.use_custom_shuttle && ertemplate.spawn_at_outpost)
+ if(!length(GLOB.emergencyresponseteam_outpostspawn))
+ message_admins("No outpost spawns found!")
+ spawn_turfs = GLOB.emergencyresponseteam_outpostspawn
+
if(ertemplate.spawn_admin)
if(isobserver(usr))
- var/mob/living/carbon/human/admin_officer = new (brief_spawn || spawn_turfs || spawnpoints[1])
+ var/mob/living/carbon/human/admin_officer = new (brief_spawn || spawnpoints[1])
var/chosen_outfit = usr.client?.prefs?.brief_outfit
usr.client.prefs.copy_to(admin_officer)
admin_officer.equipOutfit(chosen_outfit)
diff --git a/code/modules/antagonists/borer/borer.dm b/code/modules/antagonists/borer/borer.dm
index 41e8b644fa53..d4af47670412 100644
--- a/code/modules/antagonists/borer/borer.dm
+++ b/code/modules/antagonists/borer/borer.dm
@@ -52,7 +52,7 @@
B.victim.adjustOrganLoss(ORGAN_SLOT_BRAIN, rand(5, 10))
to_chat(src, "With an immense exertion of will, you regain control of your body! ")
to_chat(B, "You feel control of the host brain ripped from your grasp, and retract your probosci before the wild neural impulses can damage you. ")
- B.detatch()
+ B.detach()
GLOBAL_LIST_EMPTY(borers)
GLOBAL_VAR_INIT(total_borer_hosts_needed, 3)
@@ -568,7 +568,7 @@ GLOBAL_VAR_INIT(total_borer_hosts_needed, 3)
return
if(controlling)
- detatch()
+ detach()
if(src.mind.language_holder)
var/datum/language_holder/language_holder = src.mind.language_holder
@@ -721,6 +721,8 @@ GLOBAL_VAR_INIT(total_borer_hosts_needed, 3)
victim.med_hud_set_status()
+ RegisterSignal(victim, COMSIG_MOB_GET_STATUS_TAB_ITEMS, PROC_REF(get_borer_stat_panel))
+
/mob/living/simple_animal/borer/verb/punish()
set category = "Borer"
set name = "Punish"
@@ -756,7 +758,6 @@ GLOBAL_VAR_INIT(total_borer_hosts_needed, 3)
/mob/living/carbon/proc/release_control()
-
set category = "Borer"
set name = "Release Control"
set desc = "Release control of your host's body."
@@ -764,8 +765,12 @@ GLOBAL_VAR_INIT(total_borer_hosts_needed, 3)
var/mob/living/simple_animal/borer/B = has_brain_worms()
if(B && B.host_brain)
to_chat(B, "You withdraw your probosci, releasing control of [B.host_brain] ")
+ B.detach()
- B.detatch()
+/mob/living/simple_animal/borer/proc/get_borer_stat_panel(mob/living/source, list/items)
+ SIGNAL_HANDLER
+ items += "Borer Body Health: [health]"
+ items += "Chemicals: [chemicals]"
//Check for brain worms in head.
/mob/proc/has_brain_worms()
@@ -801,7 +806,7 @@ GLOBAL_VAR_INIT(total_borer_hosts_needed, 3)
to_chat(src, "You need 200 chemicals stored to reproduce. ")
return
-/mob/living/simple_animal/borer/proc/detatch()
+/mob/living/simple_animal/borer/proc/detach()
if(!victim || !controlling)
return
@@ -829,6 +834,8 @@ GLOBAL_VAR_INIT(total_borer_hosts_needed, 3)
log_game("[src]/([src.ckey]) released control of [victim]/([victim.ckey]")
+ UnregisterSignal(victim, COMSIG_MOB_GET_STATUS_TAB_ITEMS)
+
qdel(host_brain)
/mob/living/simple_animal/borer/proc/toggle_leap()
diff --git a/code/modules/antagonists/changeling/powers/panacea.dm b/code/modules/antagonists/changeling/powers/panacea.dm
index 5c1010aaf69a..573ebd127fde 100644
--- a/code/modules/antagonists/changeling/powers/panacea.dm
+++ b/code/modules/antagonists/changeling/powers/panacea.dm
@@ -29,7 +29,7 @@
var/mob/living/simple_animal/borer/B = user.has_brain_worms() //WS Begin - Borers
if(B)
if(B.controlling)
- B.detatch()
+ B.detach()
B.leave_victim()
if(iscarbon(user))
var/mob/living/carbon/C = user
diff --git a/code/modules/antagonists/cult/blood_magic.dm b/code/modules/antagonists/cult/blood_magic.dm
index 26f0bb1d81ea..003abfd42991 100644
--- a/code/modules/antagonists/cult/blood_magic.dm
+++ b/code/modules/antagonists/cult/blood_magic.dm
@@ -839,7 +839,7 @@
if(uses < BLOOD_BARRAGE_COST)
to_chat(user, "You need [BLOOD_BARRAGE_COST] charges to perform this rite. ")
else
- var/obj/rite = new /obj/item/gun/ballistic/rifle/boltaction/enchanted/arcane_barrage/blood()
+ var/obj/rite = new /obj/item/gun/ballistic/rifle/illestren/enchanted/arcane_barrage/blood()
uses -= BLOOD_BARRAGE_COST
qdel(src)
if(user.put_in_hands(rite))
diff --git a/code/modules/antagonists/cult/cult_items.dm b/code/modules/antagonists/cult/cult_items.dm
index b09b7d989758..7d0e9f7a4346 100644
--- a/code/modules/antagonists/cult/cult_items.dm
+++ b/code/modules/antagonists/cult/cult_items.dm
@@ -704,7 +704,7 @@
spear.throw_at(owner, 10, 2, owner)
-/obj/item/gun/ballistic/rifle/boltaction/enchanted/arcane_barrage/blood
+/obj/item/gun/ballistic/rifle/illestren/enchanted/arcane_barrage/blood
name = "blood bolt barrage"
desc = "Blood for blood."
color = "#ff0000"
diff --git a/code/modules/antagonists/ert/ert.dm b/code/modules/antagonists/ert/ert.dm
index f9741d39e572..d731343d33f0 100644
--- a/code/modules/antagonists/ert/ert.dm
+++ b/code/modules/antagonists/ert/ert.dm
@@ -207,23 +207,23 @@
/datum/antagonist/ert/lp
name = "Loss Prevention Security Specialist"
- outfit = /datum/outfit/job/nanotrasen/ert/lp
+ outfit = /datum/outfit/job/nanotrasen/security/ert/lp
role = "Security Specialist"
/datum/antagonist/ert/lp/medic
name = "Loss Prevention Medical Specialist"
- outfit = /datum/outfit/job/nanotrasen/ert/lp/medic
+ outfit = /datum/outfit/job/nanotrasen/security/ert/lp/medic
role = "Medical Specialist"
/datum/antagonist/ert/lp/engineer
name = "Loss Prevention Engineering Specialist"
- outfit = /datum/outfit/job/nanotrasen/ert/lp/engineer
+ outfit = /datum/outfit/job/nanotrasen/security/ert/lp/engineer
role = "Engineering Specialist"
/datum/antagonist/ert/lp/lieutenant
name = "Loss Prevention Lieutenant"
leader = TRUE
- outfit = /datum/outfit/job/nanotrasen/ert/lp/lieutenant
+ outfit = /datum/outfit/job/nanotrasen/security/ert/lp/lieutenant
role = "Lieutenant"
// ********************************************************************
diff --git a/code/modules/antagonists/fugitive/fugitive_outfits.dm b/code/modules/antagonists/fugitive/fugitive_outfits.dm
index be343bb8bc6e..df784813df40 100644
--- a/code/modules/antagonists/fugitive/fugitive_outfits.dm
+++ b/code/modules/antagonists/fugitive/fugitive_outfits.dm
@@ -65,7 +65,7 @@
name = "Spacepol Officer"
uniform = /obj/item/clothing/under/rank/security/officer/beatcop
suit = /obj/item/clothing/suit/armor/vest/blueshirt
- belt = /obj/item/gun/ballistic/automatic/pistol/m1911
+ belt = /obj/item/gun/ballistic/automatic/pistol/candor
head = /obj/item/clothing/head/helmet/police
gloves = /obj/item/clothing/gloves/tackler/combat
shoes = /obj/item/clothing/shoes/jackboots
@@ -87,7 +87,7 @@
/datum/outfit/frontier/hunter
name = "Frontiersman Corpse (Hunter)"
ears = /obj/item/radio/headset
- r_hand = /obj/item/gun/ballistic/rifle/boltaction
+ r_hand = /obj/item/gun/ballistic/rifle/illestren
/datum/outfit/frontier/hunter/pre_equip(mob/living/carbon/human/H)
if(prob(50))
@@ -133,7 +133,7 @@
/obj/item/ammo_casing/shotgun/incapacitate = 6
)
-/datum/outfit/bountygrapple/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
+/datum/outfit/bountyhook/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
if(visualsOnly)
return
var/obj/item/card/id/W = H.wear_id
diff --git a/code/modules/antagonists/gang/outfits.dm b/code/modules/antagonists/gang/outfits.dm
index afe4c65b7e28..ae16ec956470 100644
--- a/code/modules/antagonists/gang/outfits.dm
+++ b/code/modules/antagonists/gang/outfits.dm
@@ -1,3 +1,6 @@
+/datum/outfit/families_police
+ name = "Families: Police Officer"
+
/datum/outfit/families_police/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
if(visualsOnly)
return
@@ -21,7 +24,7 @@
ears = /obj/item/radio/headset/headset_sec
mask = null
head = /obj/item/clothing/head/spacepolice
- belt = /obj/item/gun/ballistic/automatic/pistol/m1911
+ belt = /obj/item/gun/ballistic/automatic/pistol/candor
r_pocket = /obj/item/lighter
l_pocket = /obj/item/restraints/handcuffs
id = /obj/item/card/id
diff --git a/code/modules/assembly/health.dm b/code/modules/assembly/health.dm
index 2a07737e2c63..7bc5adc33de2 100644
--- a/code/modules/assembly/health.dm
+++ b/code/modules/assembly/health.dm
@@ -14,6 +14,13 @@
. += "Use it in hand to turn it off/on and Alt-click to swap between \"detect death\" mode and \"detect critical state\" mode."
. += "[src.scanning ? "The sensor is on and you can see [health_scan] displayed on the screen" : "The sensor is off"]."
+/obj/item/assembly/health/Moved(atom/old_loc, movement_dir, forced, list/old_locs, momentum_change)
+ . = ..()
+ if(iscarbon(old_loc))
+ UnregisterSignal(old_loc, COMSIG_MOB_GET_STATUS_TAB_ITEMS)
+ if(iscarbon(loc))
+ RegisterSignal(loc, COMSIG_MOB_GET_STATUS_TAB_ITEMS, PROC_REF(get_status_tab_item))
+
/obj/item/assembly/health/activate()
if(!..())
return FALSE//Cooldown check
@@ -73,3 +80,7 @@
. = ..()
to_chat(user, "You toggle [src] [src.scanning ? "off" : "on"]. ")
toggle_scan()
+
+/obj/item/assembly/health/proc/get_status_tab_item(mob/living/carbon/source, list/items)
+ SIGNAL_HANDLER
+ items += "Health: [round((source.health / source.maxHealth) * 100)]%"
diff --git a/code/modules/autowiki/pages/ships.dm b/code/modules/autowiki/pages/ships.dm
index ecbdf8c65e2d..8a444cd33896 100644
--- a/code/modules/autowiki/pages/ships.dm
+++ b/code/modules/autowiki/pages/ships.dm
@@ -73,9 +73,9 @@
return output
-/datum/autowiki/ship/proc/get_dummy_image(datum/job/to_equip, filename)
+/datum/autowiki/ship/proc/get_dummy_image(datum/job/to_equip)
//Controlled randomisation
- wiki_dummy.seeded_randomization(filename)
+ wiki_dummy.seeded_randomization("[to_equip.outfit]", list(/datum/species/ethereal, /datum/species/human, /datum/species/ipc, /datum/species/lizard, /datum/species/moth, /datum/species/spider))
//Delete all the old stuff they had
wiki_dummy.wipe_state()
diff --git a/code/modules/awaymissions/capture_the_flag.dm b/code/modules/awaymissions/capture_the_flag.dm
index 77c655c38247..daf7299ca970 100644
--- a/code/modules/awaymissions/capture_the_flag.dm
+++ b/code/modules/awaymissions/capture_the_flag.dm
@@ -537,10 +537,14 @@
ADD_TRAIT(I, TRAIT_NODROP, CAPTURE_THE_FLAG_TRAIT)
/datum/outfit/ctf/instagib
+ name = "CTF (Instagib)"
+
r_hand = /obj/item/gun/energy/laser/instakill
shoes = /obj/item/clothing/shoes/jackboots/fast
/datum/outfit/ctf/red
+ name = "CTF (Red)"
+
suit = /obj/item/clothing/suit/space/hardsuit/shielded/ctf/red
r_hand = /obj/item/gun/ballistic/automatic/laser/ctf/red
l_pocket = /obj/item/ammo_box/magazine/recharge/ctf/red
@@ -548,10 +552,14 @@
id = /obj/item/card/id/syndicate_command //it's red
/datum/outfit/ctf/red/instagib
+ name = "CTF (Red, Instagib)"
+
r_hand = /obj/item/gun/energy/laser/instakill/red
shoes = /obj/item/clothing/shoes/jackboots/fast
/datum/outfit/ctf/blue
+ name = "CTF (Blue)"
+
suit = /obj/item/clothing/suit/space/hardsuit/shielded/ctf/blue
r_hand = /obj/item/gun/ballistic/automatic/laser/ctf/blue
l_pocket = /obj/item/ammo_box/magazine/recharge/ctf/blue
@@ -559,6 +567,8 @@
id = /obj/item/card/id/centcom //it's blue
/datum/outfit/ctf/blue/instagib
+ name = "CTF (Blue, Instagib)"
+
r_hand = /obj/item/gun/energy/laser/instakill/blue
shoes = /obj/item/clothing/shoes/jackboots/fast
diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm
index 3cc75b08ae1b..8e8739a5acb0 100644
--- a/code/modules/awaymissions/corpse.dm
+++ b/code/modules/awaymissions/corpse.dm
@@ -514,22 +514,10 @@
/obj/effect/mob_spawn/human/nanotrasensoldier
- name = "\improper Nanotrasen Private Security Officer"
+ name = "\improper Nanotrasen LP Security Specialist"
id_job = "Private Security Force"
id_access_list = list(ACCESS_CENT_CAPTAIN, ACCESS_CENT_GENERAL, ACCESS_CENT_SPECOPS, ACCESS_CENT_MEDICAL, ACCESS_CENT_STORAGE, ACCESS_SECURITY, ACCESS_MECH_SECURITY)
- outfit = /datum/outfit/nanotrasensoldiercorpse
-
-/datum/outfit/nanotrasensoldiercorpse
- name = "NT Private Security Officer Corpse"
- uniform = /obj/item/clothing/under/rank/security/officer
- suit = /obj/item/clothing/suit/armor/vest
- shoes = /obj/item/clothing/shoes/combat
- gloves = /obj/item/clothing/gloves/tackler/combat
- mask = /obj/item/clothing/mask/gas/sechailer/swat
- head = /obj/item/clothing/head/helmet/swat/nanotrasen
- back = /obj/item/storage/backpack/security
- id = /obj/item/card/id
-
+ outfit = /datum/outfit/job/nanotrasen/security/lp
/obj/effect/mob_spawn/human/commander/alive
death = FALSE
diff --git a/code/modules/cargo/bounties/security.dm b/code/modules/cargo/bounties/security.dm
index bcf7b89f3af1..26711f560922 100644
--- a/code/modules/cargo/bounties/security.dm
+++ b/code/modules/cargo/bounties/security.dm
@@ -3,7 +3,7 @@
description = "Hooligans have boarded CentCom! Ship riot shotguns quick, or things are going to get dirty."
reward = 5000
required_count = 2
- wanted_types = list(/obj/item/gun/ballistic/shotgun/riot)
+ wanted_types = list(/obj/item/gun/ballistic/shotgun/hellfire)
/datum/bounty/item/security/recharger
name = "Rechargers"
diff --git a/code/modules/cargo/packs/ammo.dm b/code/modules/cargo/packs/ammo.dm
index 33a5ee37be02..79b3bb780f25 100644
--- a/code/modules/cargo/packs/ammo.dm
+++ b/code/modules/cargo/packs/ammo.dm
@@ -15,8 +15,8 @@
cost = 1500
/datum/supply_pack/ammo/m45_mag
- name = ".45 ACP M1911 Magazine Crate"
- desc = "Contains three .45 ACP magazines for the M1911 pistol, each containing eight rounds."
+ name = ".45 ACP Candor Magazine Crate"
+ desc = "Contains three .45 ACP magazines for the Candor pistol, each containing eight rounds."
contains = list(/obj/item/ammo_box/magazine/m45,
/obj/item/ammo_box/magazine/m45,
/obj/item/ammo_box/magazine/m45)
@@ -75,26 +75,24 @@
/datum/supply_pack/ammo/buckshot
name = "Buckshot Crate"
- desc = "Contains two boxes of buckshot for use in lethal persuasion."
- cost = 2000
- contains = list(/obj/item/storage/box/lethalshot,
- /obj/item/storage/box/lethalshot)
+ desc = "Contains a box of twenty-five buckshot shells for use in lethal persuasion."
+ cost = 500
+ contains = list(/obj/item/ammo_box/a12g)
/datum/supply_pack/ammo/slugs
name = "Shotgun Slug Crate"
- desc = "Contains two boxes of slug shells for use in lethal persuasion."
- cost = 2000
- contains = list(/obj/item/storage/box/slugshot,
- /obj/item/storage/box/slugshot)
+ desc = "Contains a box of twenty-five slug shells for use in lethal persuasion."
+ cost = 500
+ contains = list(/obj/item/ammo_box/a12g/slug)
/*
.38 ammo
*/
/datum/supply_pack/ammo/winchester_ammo
- name = "Winchester and Detective Special .38 Ammo Boxes"
+ name = "Flaming Arrow and Detective Special .38 Ammo Boxes"
desc = "Contains two 30 round ammo boxes for refilling .38 weapons."
- cost = 1000
+ cost = 500
contains = list(/obj/item/ammo_box/c38_box,
/obj/item/ammo_box/c38_box)
crate_name = "ammo crate"
@@ -134,6 +132,13 @@
contains = list(/obj/item/ammo_box/magazine/wt550m9/ap,
/obj/item/ammo_box/magazine/wt550m9/inc)
+/datum/supply_pack/ammo/smgm45ammo
+ name = ".45 Cobra Ammo Crate"
+ desc = "Contains two .45 magazines for the Cobra-20, each containing 24 rounds."
+ cost = 1500
+ contains = list(/obj/item/ammo_box/magazine/smgm45,
+ /obj/item/ammo_box/magazine/smgm45)
+
/*
Rifle ammo
*/
@@ -167,8 +172,8 @@
cost = 2000
/datum/supply_pack/ammo/ak47_ammo
- name = "AKM 7.62x39mm FMJ Magazine Crate"
- desc = "Contains two 7.62x39mm FMJ magazines for the AKM rifle, each containing twenty rounds."
+ name = "SVG 7.62x39mm FMJ Magazine Crate"
+ desc = "Contains two 7.62x39mm FMJ magazines for the SVG rifle, each containing twenty rounds."
contains = list(/obj/item/ammo_box/magazine/ak47,
/obj/item/ammo_box/magazine/ak47)
cost = 2000
@@ -181,10 +186,142 @@
cost = 2000
/datum/supply_pack/ammo/a762_ammo
- name = "7.62x54mm Stripper Clip Crate"
- desc = "Contains four 7.62x54mm stripper clips for rifles like the illestren rifle, each containing five rounds."
- contains = list(/obj/item/ammo_box/a762,
- /obj/item/ammo_box/a762,
- /obj/item/ammo_box/a762,
- /obj/item/ammo_box/a762)
+ name = "8x50mmR Stripper Clip Crate"
+ desc = "Contains four 8x50mmR stripper clips for rifles like the illestren rifle, each containing five rounds."
+ contains = list(/obj/item/ammo_box/magazine/illestren_a850r,
+ /obj/item/ammo_box/magazine/illestren_a850r,
+ /obj/item/ammo_box/magazine/illestren_a850r,
+ /obj/item/ammo_box/magazine/illestren_a850r)
+ cost = 1000
+
+/datum/supply_pack/ammo/a762_ammo_box
+ name = "7.62x39mm Ammo Box Crate"
+ desc = "Contains a sixty-round 7.62x39mm box for rifles like the SVG-67."
+ contains = list(/obj/item/ammo_box/a762_39)
+ cost = 500
+
+/datum/supply_pack/ammo/c556mmHITP_ammo_box
+ name = "5.56 Caseless Ammo Box Crate"
+ desc = "Contains two fifty-round 5.56mm caseless boxes for SolGov sidearms like the Pistole C, for a total of 100 rounds."
+ contains = list(/obj/item/ammo_box/c556mmHITP,
+ /obj/item/ammo_box/c556mmHITP)
+ cost = 500
+
+/datum/supply_pack/ammo/c45_ammo_box
+ name = ".45 Ammo Box Crate"
+ desc = "Contains two fifty-round .45 boxes for pistols and SMGs like the M1911 or the C-20r, for a total of 100 rounds."
+ contains = list(/obj/item/ammo_box/c45,
+ /obj/item/ammo_box/c45)
+ cost = 500
+
+/datum/supply_pack/ammo/c10mm_ammo_box
+ name = "10mm Ammo Box Crate"
+ desc = "Contains two fifty-round 10mm boxes for pistols and SMGs like the Stechkin or the SkM-44(k), for a total of 100 rounds."
+ contains = list(/obj/item/ammo_box/c10mm,
+ /obj/item/ammo_box/c10mm)
+ cost = 500
+
+/datum/supply_pack/ammo/c9mm_ammo_box
+ name = "9mm Ammo Box Crate"
+ desc = "Contains two fifty-round 9mm boxes for pistols and SMGs such as the Commander or Saber, for a total of 100 rounds."
+ contains = list(/obj/item/ammo_box/c9mm,
+ /obj/item/ammo_box/c9mm)
+ cost = 500
+
+/datum/supply_pack/ammo/a308_ammo_box
+ name = "308 Ammo Box Crate"
+ desc = "Contains one thirty-round .308 box for DMRs such as the SsG-04 and CM-GAL-S."
+ contains = list(/obj/item/ammo_box/a308)
+ cost = 500
+
+/datum/supply_pack/ammo/c9mmap_ammo_box
+ name = "9mm AP Ammo Box Crate"
+ desc = "Contains two fifty-round 9mm boxes loaded with armor piercing ammo, for a total of 100 rounds."
+ contains = list(/obj/item/ammo_box/c9mm/ap,
+ /obj/item/ammo_box/c9mm/ap)
+ cost = 1000
+
+/datum/supply_pack/ammo/c556mmHITPap_ammo_box
+ name = "5.56 caseless AP Ammo Box Crate"
+ desc = "Contains two fifty-round 5.56mm caseless boxes loaded with armor piercing ammo, for a total of 100 rounds."
+ contains = list(/obj/item/ammo_box/c556mmHITP/ap,
+ /obj/item/ammo_box/c556mmHITP/ap)
+ cost = 1000
+
+/datum/supply_pack/ammo/c45ap_ammo_box
+ name = ".45 AP Ammo Box Crate"
+ desc = "Contains two fifty-round .45 boxes loaded with armor piercing ammo, for a total of 100 rounds."
+ contains = list(/obj/item/ammo_box/c45/ap,
+ /obj/item/ammo_box/c45/ap)
cost = 1000
+
+/datum/supply_pack/ammo/c10mmap_ammo_box
+ name = "10mm AP Ammo Box Crate"
+ desc = "Contains two fifty-round 10mm boxes loaded with armor piercing ammo, for a total of 100 rounds."
+ contains = list(/obj/item/ammo_box/c10mm/ap,
+ /obj/item/ammo_box/c10mm/ap)
+ cost = 1000
+
+/datum/supply_pack/ammo/c9mmhp_ammo_box
+ name = "9mm HP Ammo Box Crate"
+ desc = "Contains two fifty-round 9mm boxes loaded with hollow point ammo, great against unarmored targets, for a total of 100 rounds."
+ contains = list(/obj/item/ammo_box/c9mm/hp,
+ /obj/item/ammo_box/c9mm/hp)
+ cost = 1000
+
+/datum/supply_pack/ammo/c10mmhp_ammo_box
+ name = "10mm HP Ammo Box Crate"
+ desc = "Contains two fifty-round 10mm boxes loaded with hollow point ammo, great against unarmored targets, for a total of 100 rounds."
+ contains = list(/obj/item/ammo_box/c10mm/hp,
+ /obj/item/ammo_box/c10mm/hp)
+ cost = 1000
+/datum/supply_pack/ammo/c45hp_ammo_box
+ name = ".45 HP Ammo Box Crate"
+ desc = "Contains two fifty-round 10mm boxes loaded with hollow point ammo, great against unarmored targets, for a total of 100 rounds."
+ contains = list(/obj/item/ammo_box/c45/hp,
+ /obj/item/ammo_box/c45/hp)
+ cost = 1000
+
+/datum/supply_pack/ammo/c556mmhitphp_ammo_box
+ name = "5.56 Caseless HP Ammo Box Crate"
+ desc = "Contains two fifty-round 5.56mm caseless boxes loaded with hollow point ammo, great against unarmored targets, for a total of 100 rounds."
+ contains = list(/obj/item/ammo_box/c556mmHITP/hp,
+ /obj/item/ammo_box/c556mmHITP/hp)
+ cost = 1000
+
+/datum/supply_pack/ammo/c9mmrubber_ammo_box
+ name = "9mm Rubber Ammo Box Crate"
+ desc = "Contains two fifty-round 9mm boxes loaded with less-than-lethal rubber rounds for a total of 100 rounds."
+ contains = list(/obj/item/ammo_box/c9mm/rubbershot,
+ /obj/item/ammo_box/c9mm/rubbershot)
+ cost = 500
+
+/datum/supply_pack/ammo/c10mmrubber_ammo_box
+ name = "10mm Rubber Ammo Box Crate"
+ desc = "Contains two fifty-round 10mm boxes loaded with less-than-lethal rubber rounds for a total of 100 rounds."
+ contains = list(/obj/item/ammo_box/c10mm/rubbershot,
+ /obj/item/ammo_box/c10mm/rubbershot)
+ cost = 500
+
+/datum/supply_pack/ammo/c45mmrubber_ammo_box
+ name = ".45 Rubber Ammo Box Crate"
+ desc = "Contains two fifty-round .45 boxes loaded with less-than-lethal rubber rounds for a total of 100 rounds."
+ contains = list(/obj/item/ammo_box/c45/rubbershot,
+ /obj/item/ammo_box/c45/rubbershot)
+ cost = 500
+
+
+/datum/supply_pack/ammo/c556HITPrubber_ammo_box
+ name = "5.56 Caseless Rubber Ammo Box Crate"
+ desc = "Contains two fifty-round 5.56 caseless boxes loaded with less-than-lethal rubber rounds for a total of 100 rounds."
+ contains = list(/obj/item/ammo_box/c556mmHITP/rubbershot,
+ /obj/item/ammo_box/c556mmHITP/rubbershot)
+ cost = 500
+
+/datum/supply_pack/ammo/guncell
+ name = "Weapon Cell Crate"
+ desc = "Contains three weapon cells, compatible with laser guns."
+ contains = list(/obj/item/stock_parts/cell/gun,
+ /obj/item/stock_parts/cell/gun,
+ /obj/item/stock_parts/cell/gun)
+ cost = 1500
diff --git a/code/modules/cargo/packs/gun.dm b/code/modules/cargo/packs/gun.dm
index 6ca715889855..f5c617c971cb 100644
--- a/code/modules/cargo/packs/gun.dm
+++ b/code/modules/cargo/packs/gun.dm
@@ -19,14 +19,14 @@
/datum/supply_pack/gun/commanders
name = "Commander pistol crate"
- desc = "Contains two modified M1911 'Commander' pistols, produced by Nanotrasen and chambered in 9mm."
+ desc = "Contains two modified Candor 'Commander' pistols, produced by Nanotrasen and chambered in 9mm."
cost = 1500
contains = list(/obj/item/gun/ballistic/automatic/pistol/commander,
/obj/item/gun/ballistic/automatic/pistol/commander)
/datum/supply_pack/gun/makarovs
name = "Stechkin pistol crate"
- desc = "Contains two concealable stechkin pistols, produced by the Gorlex Marauders and chambered in 10mm."
+ desc = "Contains two concealable stechkin pistols, produced by Scarborough Arms and chambered in 10mm."
cost = 2000
contains = list(/obj/item/gun/ballistic/automatic/pistol,
/obj/item/gun/ballistic/automatic/pistol)
@@ -45,12 +45,12 @@
contains = list(/obj/item/gun/ballistic/revolver/detective,
/obj/item/gun/ballistic/revolver/detective)
-/datum/supply_pack/gun/cattlemanrevolver
- name = "Cattleman Revolver crate"
- desc = "Contains two concealable Cattleman revolvers, chambered in .45 ACP."
+/datum/supply_pack/gun/shadowrevolver
+ name = "Shadow Revolver crate"
+ desc = "Contains two concealable Shadow revolvers, chambered in .45 ACP."
cost = 2500
- contains = list(/obj/item/gun/ballistic/revolver/cattleman,
- /obj/item/gun/ballistic/revolver/cattleman)
+ contains = list(/obj/item/gun/ballistic/revolver/shadow,
+ /obj/item/gun/ballistic/revolver/shadow)
/*
@@ -86,42 +86,50 @@
Shotguns
*/
-/datum/supply_pack/gun/riot_shotgun
- name = "Riot Shotguns Crate"
- desc = "For when the greytide gets out of hand. Contains 2 pump shotguns, each with a 4-round magazine."
- cost = 2500
- contains = list(/obj/item/gun/ballistic/shotgun/lethal,
- /obj/item/gun/ballistic/shotgun/lethal)
+/datum/supply_pack/gun/hellfire_shotgun
+ name = "Hellfire Shotguns Crate"
+ desc = "For when you need to deal with 7 hooligans. Contains 2 pump shotguns, each with a 8-round capacity."
+ cost = 4500
+ contains = list(/obj/item/gun/ballistic/shotgun/hellfire,
+ /obj/item/gun/ballistic/shotgun/hellfire)
crate_name = "shotguns crate"
-/datum/supply_pack/gun/ballistic
- name = "Combat Shotguns Crate"
- desc = "For when the enemy absolutely needs to be replaced with lead. Contains two Aussec-designed combat shotguns."
+/datum/supply_pack/gun/brimstone_shotgun
+ name = "Brimstone Shotguns Crate"
+ desc = "For when you need to deal with 5 hooligans, and QUICKLY. Contains 2 slamfire shotguns, each with a 5-round capacity. Warranty voided if sawed off."
cost = 4500
- contains = list(/obj/item/gun/ballistic/shotgun/automatic/combat,
- /obj/item/gun/ballistic/shotgun/automatic/combat)
- crate_name = "combat shotguns crate"
+ contains = list(/obj/item/gun/ballistic/shotgun/brimstone,
+ /obj/item/gun/ballistic/shotgun/brimstone)
+ crate_name = "shotguns crate"
/*
Rifles
*/
/datum/supply_pack/gun/winchester
- name = "Winchester Lever Action Rifle Crate"
+ name = "Flaming Arrow Lever Action Rifle Crate"
desc = "Contains three antiquated lever action rifles intended for hunting wildlife. Chambered in .38 rounds."
cost = 1500
- contains = list(/obj/item/gun/ballistic/shotgun/winchester,
- /obj/item/gun/ballistic/shotgun/winchester,
- /obj/item/gun/ballistic/shotgun/winchester)
+ contains = list(/obj/item/gun/ballistic/shotgun/flamingarrow,
+ /obj/item/gun/ballistic/shotgun/flamingarrow,
+ /obj/item/gun/ballistic/shotgun/flamingarrow)
crate_name = "rifle crate"
+/datum/supply_pack/gun/cobra20
+ name = "Cobra-20 SMG Crate"
+ desc = "Contains two .45 submachine guns, manufactured by Scaraborough Arms and chambered in .45"
+ cost = 3000
+ contains = list(/obj/item/gun/ballistic/automatic/smg/c20r/cobra,
+ /obj/item/gun/ballistic/automatic/smg/c20r/cobra)
+ crate_name = "SMG crate"
+
/datum/supply_pack/gun/illestren
name = "Illestren Rifle Crate"
- desc = "Contains three expertly made bolt action rifles intended for hunting wildlife. Chambered in 7.62x54 rounds."
+ desc = "Contains three expertly made bolt action rifles intended for hunting wildlife. Chambered in 8x50mmR rounds."
cost = 4000
- contains = list(/obj/item/gun/ballistic/rifle/boltaction,
- /obj/item/gun/ballistic/rifle/boltaction,
- /obj/item/gun/ballistic/rifle/boltaction)
+ contains = list(/obj/item/gun/ballistic/rifle/illestren,
+ /obj/item/gun/ballistic/rifle/illestren,
+ /obj/item/gun/ballistic/rifle/illestren)
crate_name = "rifle crate"
/datum/supply_pack/gun/wt550
diff --git a/code/modules/cargo/packs/spacesuit_armor.dm b/code/modules/cargo/packs/spacesuit_armor.dm
index b677cb88bc3b..c873a7e2dac4 100644
--- a/code/modules/cargo/packs/spacesuit_armor.dm
+++ b/code/modules/cargo/packs/spacesuit_armor.dm
@@ -136,7 +136,7 @@
/datum/supply_pack/spacesuit_armor/bullet_armor
name = "Bulletproof Armor Crate"
- desc = "Contains three full sets of bulletproof armor, guaranteed to reduce a bullet's stopping power by half but with limited protection against melee weaponry."
+ desc = "Contains two full sets of bulletproof armor, guaranteed to reduce a bullet's stopping power by half but with limited protection against melee weaponry."
cost = 3500
contains = list(/obj/item/clothing/suit/armor/vest/bulletproof,
/obj/item/clothing/suit/armor/vest/bulletproof,
diff --git a/code/modules/client/client_defines.dm b/code/modules/client/client_defines.dm
index de655ece5f1a..64e2476b400f 100644
--- a/code/modules/client/client_defines.dm
+++ b/code/modules/client/client_defines.dm
@@ -150,15 +150,14 @@
/// our current tab
var/stat_tab
- /// whether our browser is ready or not yet
- var/statbrowser_ready = FALSE
-
/// list of all tabs
var/list/panel_tabs = list()
/// list of tabs containing spells and abilities
var/list/spell_tabs = list()
///A lazy list of atoms we've examined in the last EXAMINE_MORE_TIME (default 1.5) seconds, so that we will call [atom/proc/examine_more()] instead of [atom/proc/examine()] on them when examining
var/list/recent_examines
+ ///Our object window datum. It stores info about and handles behavior for the object tab
+ var/datum/object_window_info/obj_window
var/list/parallax_layers
var/list/parallax_layers_cached
diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm
index 8db2e8454828..711af230fd9d 100644
--- a/code/modules/client/client_procs.dm
+++ b/code/modules/client/client_procs.dm
@@ -80,7 +80,7 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
if(tgui_Topic(href_list))
return
if(href_list["reload_statbrowser"])
- src << browse(file('html/statbrowser.html'), "window=statbrowser")
+ stat_panel.reinitialize()
// Log all hrefs
log_href("[src] (usr:[usr]\[[COORD(usr)]\]) : [hsrc ? "[hsrc] " : ""][href]")
@@ -226,8 +226,12 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
GLOB.clients += src
GLOB.directory[ckey] = src
+ // Instantiate stat panel
+ stat_panel = new(src, "statbrowser")
+ stat_panel.subscribe(src, PROC_REF(on_stat_panel_message))
+
// Instantiate tgui panel
- tgui_panel = new(src)
+ tgui_panel = new(src, "browseroutput")
GLOB.ahelp_tickets.client_login(src)
GLOB.interviews.client_login(src)
@@ -346,9 +350,15 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
if(SSinput.initialized)
set_macros()
- // Initialize tgui panel
- src << browse(file('html/statbrowser.html'), "window=statbrowser")
+ // Initialize stat panel
+ stat_panel.initialize(
+ inline_html = file2text('html/statbrowser.html'),
+ inline_js = file2text('html/statbrowser.js'),
+ inline_css = file2text('html/statbrowser.css'),
+ )
addtimer(CALLBACK(src, PROC_REF(check_panel_loaded)), 30 SECONDS)
+
+ // Initialize tgui panel
tgui_panel.initialize()
if(alert_mob_dupe_login)
@@ -506,6 +516,8 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
SSserver_maint.UpdateHubStatus()
if(credits)
QDEL_LIST(credits)
+ if(obj_window)
+ QDEL_NULL(obj_window)
if(holder)
adminGreet(1)
holder.owner = null
@@ -1082,12 +1094,10 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
var/list/verbstoprocess = verbs.Copy()
if(mob?.client?.prefs.broadcast_login_logout)
verbstoprocess += mob.verbs
- for(var/AM in mob.contents)
- var/atom/movable/thing = AM
+ for(var/atom/movable/thing as anything in mob.contents)
verbstoprocess += thing.verbs
panel_tabs.Cut() // panel_tabs get reset in init_verbs on JS side anyway
- for(var/thing in verbstoprocess)
- var/procpath/verb_to_init = thing
+ for(var/procpath/verb_to_init as anything in verbstoprocess)
if(!verb_to_init)
continue
if(verb_to_init.hidden)
@@ -1096,10 +1106,10 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
continue
panel_tabs |= verb_to_init.category
verblist[++verblist.len] = list(verb_to_init.category, verb_to_init.name)
- src << output("[url_encode(json_encode(panel_tabs))];[url_encode(json_encode(verblist))]", "statbrowser:init_verbs")
+ src.stat_panel.send_message("init_verbs", list(panel_tabs = panel_tabs, verblist = verblist))
/client/proc/check_panel_loaded()
- if(statbrowser_ready)
+ if(stat_panel.is_ready())
return
to_chat(src, "Statpanel failed to load, click here to reload the panel ")
@@ -1140,3 +1150,20 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
SSambience.ambience_listening_clients[src] = world.time + 10 SECONDS //Just wait 10 seconds before the next one aight mate? cheers.
else
SSambience.ambience_listening_clients -= src
+
+/**
+ * Handles incoming messages from the stat-panel TGUI.
+ */
+/client/proc/on_stat_panel_message(type, payload)
+ switch(type)
+ if("Update-Verbs")
+ init_verbs()
+ if("Remove-Tabs")
+ panel_tabs -= payload["tab"]
+ if("Send-Tabs")
+ panel_tabs |= payload["tab"]
+ if("Reset-Tabs")
+ panel_tabs = list()
+ if("Set-Tab")
+ stat_tab = payload["tab"]
+ SSstatpanels.immediate_send_stat_data(src)
diff --git a/code/modules/client/loadout/loadout_accessories.dm b/code/modules/client/loadout/loadout_accessories.dm
index b7f7944787db..40702e5fc2be 100644
--- a/code/modules/client/loadout/loadout_accessories.dm
+++ b/code/modules/client/loadout/loadout_accessories.dm
@@ -67,10 +67,6 @@
description = "Only the truly insane would wear this around their neck."
path = /obj/item/clothing/neck/petcollar
-/datum/gear/accessory/maidneckpiece
- display_name = "maid neckpiece"
- path = /obj/item/clothing/neck/maid
-
/datum/gear/accessory/gloves/black
display_name = "black gloves"
description = "Standard hand coverings for everyday use."
@@ -87,11 +83,6 @@
path = /obj/item/clothing/gloves/color/evening
slot = ITEM_SLOT_GLOVES
-/datum/gear/accessory/gloves/maid
- display_name = "maid arm covers"
- path = /obj/item/clothing/gloves/maid
- slot = ITEM_SLOT_GLOVES
-
/datum/gear/accessory/tiki
display_name = "tiki mask"
description = "A wooden mask, simple, really."
diff --git a/code/modules/client/loadout/loadout_eyewear.dm b/code/modules/client/loadout/loadout_eyewear.dm
index 8da667f8819e..99e868ad0854 100644
--- a/code/modules/client/loadout/loadout_eyewear.dm
+++ b/code/modules/client/loadout/loadout_eyewear.dm
@@ -8,6 +8,10 @@
display_name = "glasses, prescription"
path = /obj/item/clothing/glasses/regular
+/datum/gear/eyewear/glasses/thin
+ display_name ="glasses, thin prescription"
+ path = /obj/item/clothing/glasses/regular/thin
+
/datum/gear/eyewear/glasses/large
display_name = "glasses, large prescription"
path = /obj/item/clothing/glasses/regular/circle
@@ -16,6 +20,10 @@
display_name = "glasses, jamjar prescription"
path = /obj/item/clothing/glasses/regular/jamjar
+/datum/gear/eyewear/hipster_glasses
+ display_name = "glasses, hipster prescription"
+ path = /obj/item/clothing/glasses/regular/hipster
+
//Misc
/datum/gear/eyewear/eyepatch
display_name = "eyepatch"
@@ -38,9 +46,7 @@
description = "A blindfold you can still see through."
path = /obj/item/clothing/glasses/trickblindfold
-/datum/gear/eyewear/hipster_glasses
- display_name = "Hipster Glasses"
- path = /obj/item/clothing/glasses/regular/hipster
+
/datum/gear/eyewear/glasses/cold
display_name = "cold goggles"
diff --git a/code/modules/client/loadout/loadout_hat.dm b/code/modules/client/loadout/loadout_hat.dm
index a3337038d9a2..d4ab1c858f26 100644
--- a/code/modules/client/loadout/loadout_hat.dm
+++ b/code/modules/client/loadout/loadout_hat.dm
@@ -80,10 +80,6 @@
display_name = "top hat"
path = /obj/item/clothing/head/that
-/datum/gear/hat/maidheadband
- display_name = "maid headband"
- path = /obj/item/clothing/head/maidheadband
-
/datum/gear/hat/fedora
display_name = "fedora"
path = /obj/item/clothing/head/fedora
diff --git a/code/modules/client/loadout/loadout_uniform.dm b/code/modules/client/loadout/loadout_uniform.dm
index 1410bdb0fe4d..616c4308b437 100644
--- a/code/modules/client/loadout/loadout_uniform.dm
+++ b/code/modules/client/loadout/loadout_uniform.dm
@@ -241,7 +241,3 @@
/datum/gear/uniform/tacticool
display_name = "tacticool turtleneck"
path = /obj/item/clothing/under/syndicate/tacticool
-
-/datum/gear/uniform/maid
- display_name = "maid dress"
- path = /obj/item/clothing/under/costume/maid
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index e73a186087f3..b52052cd15ec 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -48,7 +48,6 @@ GLOBAL_LIST_EMPTY(preferences_datums)
var/tgui_fancy = TRUE
var/tgui_lock = FALSE
var/windowflashing = TRUE
- var/crew_objectives = TRUE
var/toggles = TOGGLES_DEFAULT
var/db_flags
var/chat_toggles = TOGGLES_DEFAULT_CHAT
@@ -112,6 +111,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
"squid_face" = "Squidward",
"ipc_screen" = "Blue",
"ipc_antenna" = "None",
+ "ipc_tail" = "None",
"ipc_chassis" = "Morpheus Cyberkinetics (Custom)",
"ipc_brain" = "Posibrain",
"kepori_feathers" = "Plain",
@@ -675,6 +675,19 @@ GLOBAL_LIST_EMPTY(preferences_datums)
dat += ""
mutant_category = 0
+ if("ipc_tail" in pref_species.default_features)
+ if(!mutant_category)
+ dat += APPEARANCE_CATEGORY_COLUMN
+
+ dat += "Tail Style "
+
+ dat += "[features["ipc_tail"]] Hide Radio Messages: [(chat_toggles & CHAT_RADIO)?"Shown":"Hidden"] Hide Prayers: [(chat_toggles & CHAT_PRAYER)?"Shown":"Hidden"] Split Admin Tabs: [(toggles & SPLIT_ADMIN_TABS)?"Enabled":"Disabled"] Fast MC Refresh: [(toggles & FAST_MC_REFRESH)?"Enabled":"Disabled"] Ignore Being Summoned as Cult Ghost: [(toggles & ADMIN_IGNORE_CULT_GHOST)?"Don't Allow Being Summoned":"Allow Being Summoned"] Briefing Officer Outfit: [brief_outfit] You're not technically old enough to access or serve alcohol, but your ID has been discreetly modified to display your age as [AGE_MINOR]. Try to keep that a secret! ")
-
/datum/outfit/job/syndicate/bartender/twink
- name = "Syndicate - Bartender (Twinkleshine)"
+ name = "Syndicate - Bartender (Twinkleshine, Donk)"
uniform = /obj/item/clothing/under/syndicate/donk
- shoes = /obj/item/clothing/shoes/laceup
- gloves = /obj/item/clothing/gloves/color/white
- ears = /obj/item/radio/headset/syndicate
- mask = /obj/item/clothing/mask/chameleon
- belt = /obj/item/storage/belt/bandolier
- implants = list(/obj/item/implant/weapons_auth)
id = /obj/item/card/id/syndicate_command/crew_id
+ mask = /obj/item/clothing/mask/gas/syndicate/voicechanger
+ suit = null
+ belt = null
+ head = null
+ shoes = /obj/item/clothing/shoes/laceup
+ gloves = null
+ ears = null
+
backpack = /obj/item/storage/backpack/security
satchel = /obj/item/storage/backpack/satchel/sec
@@ -199,13 +227,20 @@
/datum/outfit/job/syndicate/botanist/suns
name = "Syndicate - Botanist-Chemist (SUNS)"
+ uniform = /obj/item/clothing/under/syndicate/suns/sciencejumpsuit
id = /obj/item/card/id/syndicate_command/crew_id
- shoes = /obj/item/clothing/shoes/jackboots
- glasses = /obj/item/clothing/glasses/science
- suit = /obj/item/clothing/suit/toggle/labcoat/chemist
+ shoes = /obj/item/clothing/shoes/sneakers/suns
+ glasses = /obj/item/clothing/glasses/science/suns
+ suit = /obj/item/clothing/suit/hooded/suns
suit_store = null
+ neck = /obj/item/clothing/neck/cloak/suns
-//Capitan
+ backpack = /obj/item/storage/backpack
+ satchel = /obj/item/storage/backpack/satchel
+ duffelbag = /obj/item/storage/backpack/duffelbag
+ courierbag = /obj/item/storage/backpack/messenger
+
+//Captain
/datum/outfit/job/syndicate/captain
name = "Syndicate - Captain"
@@ -214,7 +249,7 @@
id = /obj/item/card/id/syndicate_command/captain_id
ears = /obj/item/radio/headset/syndicate/alt/captain
- uniform = /obj/item/clothing/under/syndicate/officer
+ uniform = /obj/item/clothing/under/syndicate/ngr/officer
shoes = /obj/item/clothing/shoes/jackboots
head = /obj/item/clothing/head/HoS/syndicate
gloves = /obj/item/clothing/gloves/combat
@@ -229,22 +264,21 @@
box = /obj/item/storage/box/survival/syndie
/datum/outfit/job/syndicate/captain/aclf
- name = "Syndicate - Captain (ACLF)"
+ name = "Captain (ACLF)"
+
/datum/outfit/job/syndicate/captain/twink
- name = "Syndicate - Captain (Twinkleshine)"
+ name = "Flotilla Admiral (Twinkleshine, ACLF)"
- uniform = /obj/item/clothing/under/syndicate/officer
- gloves = /obj/item/clothing/gloves/combat
+ uniform = /obj/item/clothing/under/syndicate/ngr/officer
+ head = null
+ gloves = /obj/item/clothing/gloves/color/white
shoes = /obj/item/clothing/shoes/combat
ears = /obj/item/radio/headset/syndicate/alt/captain
- mask = /obj/item/clothing/mask/chameleon
- l_pocket = /obj/item/melee/transforming/energy/sword/saber/red
- suit = /obj/item/clothing/suit/armor/vest/capcarapace/syndicate
- suit_store = /obj/item/gun/ballistic/revolver/mateba
- r_pocket = /obj/item/kitchen/knife/combat/survival
- belt = /obj/item/storage/belt/military/assault
- glasses = /obj/item/clothing/glasses/hud/security/sunglasses/eyepatch
+ mask = /obj/item/clothing/mask/gas/syndicate/voicechanger
+ suit = null
+ belt = null
+ backpack_contents = null
implants = list(/obj/item/implant/weapons_auth)
@@ -255,10 +289,10 @@
/datum/outfit/job/syndicate/captain/gorlex
name = "Syndicate - Captain (Gorlex Marauders)"
- uniform = /obj/item/clothing/under/syndicate/officer
+ uniform = /obj/item/clothing/under/syndicate/ngr/officer
- head = /obj/item/clothing/head/gorlexcap
- suit = /obj/item/clothing/suit/gorlex
+ head = /obj/item/clothing/head/ngrcap
+ suit = /obj/item/clothing/suit/armor/vest/capcarapace/ngr_captain
/datum/outfit/job/syndicate/captain/cybersun
name = "Syndicate - Captain (Cybersun)"
@@ -268,6 +302,22 @@
head = /obj/item/clothing/head/HoS/cybersun
gloves = /obj/item/clothing/gloves/combat
+/datum/outfit/job/syndicate/captain/suns
+ name = "Syndicate - Captain (SUNS)"
+
+ uniform = /obj/item/clothing/under/syndicate/suns/captain
+ shoes = /obj/item/clothing/shoes/combat/suns
+ head = /obj/item/clothing/head/suns/captain
+ gloves = /obj/item/clothing/gloves/suns/captain
+ suit = /obj/item/clothing/suit/armor/vest/bulletproof/suns/captain
+ belt = /obj/item/storage/belt/sabre/suns/captain
+ mask = /obj/item/clothing/mask/breath/suns
+ neck = /obj/item/clothing/neck/cloak/suns/cap
+
+ backpack = /obj/item/storage/backpack
+ satchel = /obj/item/storage/backpack/satchel
+ duffelbag = /obj/item/storage/backpack/duffelbag
+ courierbag = /obj/item/storage/backpack/messenger
//cargo tech
@@ -381,18 +431,26 @@
backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1)
/datum/outfit/job/syndicate/cmo/suns
- name = "Syndicate - Medical Director (SUNS)"
+ name = "Syndicate - Medical Instructor (SUNS)"
- uniform = /obj/item/clothing/under/syndicate
+ uniform = /obj/item/clothing/under/syndicate/suns/doctorscrubs
ears = /obj/item/radio/headset/syndicate/alt/captain
id = /obj/item/card/id/syndicate_command/captain_id
- shoes = /obj/item/clothing/shoes/jackboots
+ shoes = /obj/item/clothing/shoes/combat/suns
l_pocket = /obj/item/pinpointer/crew
- shoes = /obj/item/clothing/shoes/sneakers/brown
- suit = /obj/item/clothing/suit/toggle/labcoat/cmo
+ suit = /obj/item/clothing/suit/toggle/labcoat/suns/cmo
l_hand = /obj/item/storage/firstaid/medical
+ r_hand = /obj/item/storage/belt/sabre/suns/cmo
suit_store = /obj/item/flashlight/pen
backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1)
+ gloves = /obj/item/clothing/gloves/color/latex/nitrile/suns
+ glasses = /obj/item/clothing/glasses/hud/health/suns
+ head = /obj/item/clothing/head/suns/cmo
+
+ backpack = /obj/item/storage/backpack
+ satchel = /obj/item/storage/backpack/satchel
+ duffelbag = /obj/item/storage/backpack/duffelbag
+ courierbag = /obj/item/storage/backpack/messenger
//"Head Of Personnel"
@@ -402,7 +460,7 @@
job_icon = "headofpersonnel"
ears = /obj/item/radio/headset/syndicate/alt
- uniform = /obj/item/clothing/under/syndicate/aclfgrunt
+ uniform = /obj/item/clothing/under/syndicate/ngr
shoes = /obj/item/clothing/shoes/jackboots
head = /obj/item/clothing/head/HoS/beret/syndicate
gloves = /obj/item/clothing/gloves/color/white
@@ -425,6 +483,24 @@
r_pocket = /obj/item/kitchen/knife/combat/survival
glasses = /obj/item/clothing/glasses/sunglasses
+/datum/outfit/job/syndicate/head_of_personnel/suns
+ name = "Syndicate - Academic Staff (SUNS)"
+
+ uniform = /obj/item/clothing/under/syndicate/suns/xo
+ suit = /obj/item/clothing/suit/armor/vest/bulletproof/suns/xo
+ belt = /obj/item/storage/belt/sabre/suns
+ shoes = /obj/item/clothing/shoes/combat/suns
+ head = /obj/item/clothing/head/suns
+ gloves = /obj/item/clothing/gloves/suns/xo
+ neck = /obj/item/clothing/neck/cloak/suns/xo
+ r_pocket = null
+ glasses = /obj/item/clothing/glasses/science/suns
+
+ backpack = /obj/item/storage/backpack
+ satchel = /obj/item/storage/backpack/satchel
+ duffelbag = /obj/item/storage/backpack/duffelbag
+ courierbag = /obj/item/storage/backpack/messenger
+
//head of security
/datum/outfit/job/syndicate/hos
@@ -448,22 +524,25 @@
name = "Syndicate - Sergeant (Gorlex)"
/datum/outfit/job/syndicate/hos/twink
- name = "Syndicate - Lieutenant (Twinkleshine)"
+ name = "Syndicate - Lieutenant (Twinkleshine, NGR)"
+ job_icon = "lieutenant"
- uniform = /obj/item/clothing/under/syndicate/officer
- head = /obj/item/clothing/head/HoS/beret/syndicate
- ears = /obj/item/radio/headset/syndicate/alt
- mask = /obj/item/clothing/mask/chameleon
+ uniform = /obj/item/clothing/under/syndicate/ngr/officer
+ mask = /obj/item/clothing/mask/gas/syndicate/voicechanger
+ id = /obj/item/card/id/syndicate_command/lieutenant
+ head = null
+ ears = null
gloves = /obj/item/clothing/gloves/combat
- l_pocket = /obj/item/gun/ballistic/automatic/pistol
- r_pocket = /obj/item/kitchen/knife/combat/survival
- belt = /obj/item/storage/belt/military/assault
+ l_pocket = null
+ r_pocket = null
+ belt = null
shoes = /obj/item/clothing/shoes/combat
- suit = /obj/item/clothing/suit/armor/vest
- alt_suit = /obj/item/clothing/suit/gorlex
- id = /obj/item/card/id/syndicate_command/lieutenant
+ suit = null
+ suit_store = null
+ alt_suit = null
implants = list(/obj/item/implant/weapons_auth)
- backpack_contents = list(/obj/item/melee/baton)
+
+ backpack_contents = null
backpack = /obj/item/storage/backpack/security
satchel = /obj/item/storage/backpack/satchel/sec
@@ -476,6 +555,41 @@
. = ..()
assign_codename(H)
+/datum/outfit/job/syndicate/hos/suns
+ name = "Syndicate - Senior Peacekeeper (SUNS)"
+ uniform = /obj/item/clothing/under/syndicate/suns/pkuniform
+ suit = /obj/item/clothing/suit/armor/vest/bulletproof/suns/hos
+ belt = /obj/item/melee/sabre/suns/telescopic
+ gloves = /obj/item/clothing/gloves/tackler/dolphin/suns
+ shoes = /obj/item/clothing/shoes/combat/suns
+ head = /obj/item/clothing/head/welding/suns/hos
+ glasses = /obj/item/clothing/glasses/hud/security/suns
+ suit_store = /obj/item/gun/ballistic/automatic/powered/gauss/modelh/suns
+
+ backpack = /obj/item/storage/backpack
+ satchel = /obj/item/storage/backpack/satchel
+ duffelbag = /obj/item/storage/backpack/duffelbag
+ courierbag = /obj/item/storage/backpack/messenger
+
+/datum/outfit/job/syndicate/hos/suns/alt
+ name = "Syndicate - Senior Peacekeeper Alt (SUNS)"
+ suit = /obj/item/clothing/suit/armor/vest/bulletproof/suns/ehos
+ head = /obj/item/clothing/head/HoS/syndicate/suns
+
+/datum/outfit/job/syndicate/hos/suns/twink
+ name = "Syndicate - Redshield Officer (Twinkleshine, SUNS)"
+
+ suit = null
+ mask = /obj/item/clothing/mask/gas/syndicate/voicechanger
+ ears = null
+ head = null
+ suit_store = null
+ glasses = null
+
+/datum/outfit/job/syndicate/hos/suns/twink/post_equip(mob/living/carbon/human/H)
+ . = ..()
+ assign_codename(H)
+
//medical doctors (assorted)
/datum/outfit/job/syndicate/doctor
@@ -493,6 +607,19 @@
/datum/outfit/job/syndicate/doctor/suns
name = "Syndicate - Medical Doctor (SUNS)"
+ uniform = /obj/item/clothing/under/syndicate/suns/doctorscrubs
+ shoes = /obj/item/clothing/shoes/sneakers/suns
+ suit = /obj/item/clothing/suit/toggle/labcoat/suns/doctorlabcoat
+ gloves = /obj/item/clothing/gloves/color/latex/nitrile/suns
+ head = /obj/item/clothing/head/suns/surgery
+ glasses = /obj/item/clothing/glasses/hud/health/suns
+ mask = /obj/item/clothing/mask/surgical/suns
+
+ backpack = /obj/item/storage/backpack
+ satchel = /obj/item/storage/backpack/satchel
+ duffelbag = /obj/item/storage/backpack/duffelbag
+ courierbag = /obj/item/storage/backpack/messenger
+
/datum/outfit/job/syndicate/doctor/cybersun
name = "Syndicate - Medical Doctor (Cybersun)"
@@ -545,22 +672,25 @@
suit = /obj/item/clothing/suit/toggle/labcoat/raincoat
/datum/outfit/job/syndicate/paramedic/twink
- name = "Syndicate - Medic (Twinkleshine)"
+ name = "Syndicate - Medic (Twinkleshine, Cybersun)"
+ mask = /obj/item/clothing/mask/gas/syndicate/voicechanger
+ uniform = /obj/item/clothing/under/rank/medical/doctor/red
+ id = /obj/item/card/id/syndicate_command/crew_id/med
+ belt = null
+ head = null
gloves = /obj/item/clothing/gloves/color/latex/nitrile/evil
- uniform = /obj/item/clothing/under/syndicate/medic
- glasses = /obj/item/clothing/glasses/hud/health
- belt = /obj/item/storage/belt/medical
- back = /obj/item/storage/backpack/duffelbag/syndie/med
shoes = /obj/item/clothing/shoes/combat
- suit = /obj/item/clothing/suit/longcoat/roboblack
- alt_suit = /obj/item/clothing/suit/toggle/labcoat
+ suit = null
+ alt_suit = null
suit_store = null
- ears = /obj/item/radio/headset/syndicate
- mask = /obj/item/clothing/mask/chameleon
- id = /obj/item/card/id/syndicate_command/crew_id/med
+ ears = null
+ l_pocket = null
+ r_pocket = null
implants = list(/obj/item/implant/weapons_auth)
+ backpack_contents = null
+
backpack = /obj/item/storage/backpack/security
satchel = /obj/item/storage/backpack/satchel/sec
duffelbag = /obj/item/storage/backpack/duffelbag/syndie/med
@@ -588,7 +718,19 @@
pda_slot = ITEM_SLOT_BELT
/datum/outfit/job/syndicate/psychologist/suns
- name = "Ship Psychologist (SUNS)"
+ name = "Syndicate - Psychologist (SUNS)"
+
+ uniform = /obj/item/clothing/under/syndicate/suns/uniform3
+ alt_uniform = /obj/item/clothing/under/syndicate/suns/uniform3/alt
+ suit = /obj/item/clothing/suit/toggle/suns
+ alt_suit = /obj/item/clothing/suit/toggle/suns/alt
+ shoes = /obj/item/clothing/shoes/laceup/suns
+ accessory = /obj/item/clothing/accessory/waistcoat/suns/poof
+
+ backpack = /obj/item/storage/backpack
+ satchel = /obj/item/storage/backpack/satchel
+ duffelbag = /obj/item/storage/backpack/duffelbag
+ courierbag = /obj/item/storage/backpack/messenger
//patient (prisoner)
@@ -630,6 +772,30 @@
ears = /obj/item/radio/headset/syndicate/alt
shoes = /obj/item/clothing/shoes/laceup
+//scientists
+
+/datum/outfit/job/syndicate/science
+ name = "Syndicate - Scientist"
+ jobtype = /datum/job/scientist
+ job_icon = "scientist"
+
+ suit = /obj/item/clothing/suit/toggle/labcoat/science
+ dcoat = /obj/item/clothing/suit/hooded/wintercoat/science
+
+/datum/outfit/job/syndicate/science/suns
+ name = "Syndicate - Scientist (SUNS)"
+//more futureproofing than anything, the Aegis currently uses /datum/outfit/job/syndicate/botanist/suns for a similar role
+ uniform = /obj/item/clothing/under/syndicate/suns/sciencejumpsuit
+ suit = /obj/item/clothing/suit/hooded/suns
+ shoes = /obj/item/clothing/shoes/sneakers/suns
+ glasses = /obj/item/clothing/glasses/science/suns
+ neck = /obj/item/clothing/neck/cloak/suns
+
+ backpack = /obj/item/storage/backpack
+ satchel = /obj/item/storage/backpack/satchel
+ duffelbag = /obj/item/storage/backpack/duffelbag
+ courierbag = /obj/item/storage/backpack/messenger
+
//security officers
/datum/outfit/job/syndicate/security
@@ -661,19 +827,22 @@
/datum/outfit/job/syndicate/security/twink
name = "Syndicate - Operative (Twinkleshine)"
+
uniform = /obj/item/clothing/under/syndicate/combat
- ears = /obj/item/radio/headset/syndicate/alt
- mask = /obj/item/clothing/mask/chameleon
- gloves = /obj/item/clothing/gloves/combat
- shoes = /obj/item/clothing/shoes/combat
- l_pocket = /obj/item/gun/ballistic/automatic/pistol
- r_pocket = /obj/item/kitchen/knife/combat/survival
- belt = /obj/item/storage/belt/military/assault
+ mask = /obj/item/clothing/mask/gas/syndicate/voicechanger
id = /obj/item/card/id/syndicate_command/crew_id
+ head = null
+ ears = null
+ suit = null
+ belt = null
+ gloves = /obj/item/clothing/gloves/color/black
+ shoes = /obj/item/clothing/shoes/combat
+ l_pocket = null
+ r_pocket = null
implants = list(/obj/item/implant/weapons_auth)
- backpack_contents = list(/obj/item/gun_voucher/syndicate=1)
- head = null
+ backpack_contents = null
+
backpack = /obj/item/storage/backpack/security
satchel = /obj/item/storage/backpack/satchel/sec
duffelbag = /obj/item/storage/backpack/duffelbag/syndie
@@ -685,6 +854,22 @@
. = ..()
assign_codename(H)
+/datum/outfit/job/syndicate/security/suns
+ name = "Syndicate - Peacekeeper (SUNS)"
+ uniform = /obj/item/clothing/under/syndicate/suns/pkuniform
+ suit = /obj/item/clothing/suit/armor/vest/bulletproof/suns
+ alt_suit = /obj/item/clothing/suit/toggle/suns/pkcoat
+ belt = /obj/item/melee/sabre/suns/telescopic
+ gloves = /obj/item/clothing/gloves/tackler/dolphin/suns
+ shoes = /obj/item/clothing/shoes/jackboots/suns/long
+ head = /obj/item/clothing/head/welding/suns
+ glasses = /obj/item/clothing/glasses/hud/security/suns
+
+ backpack = /obj/item/storage/backpack
+ satchel = /obj/item/storage/backpack/satchel
+ duffelbag = /obj/item/storage/backpack/duffelbag
+ courierbag = /obj/item/storage/backpack/messenger
+
//Miners
/datum/outfit/job/syndicate/miner
@@ -712,18 +897,18 @@
ears = /obj/item/radio/headset/alt
/datum/outfit/job/syndicate/miner/twink
- name = "Syndicate - Miner (Twinkleshine)"
+ name = "Syndicate - Miner (Twinkleshine, SUNS)"
- uniform = /obj/item/clothing/under/syndicate/gorlex
- shoes = /obj/item/clothing/shoes/workboots
- glasses = /obj/item/clothing/glasses/meson/night
- gloves = /obj/item/clothing/gloves/explorer
- ears = /obj/item/radio/headset/syndicate
- mask = /obj/item/clothing/mask/chameleon
- r_pocket = /obj/item/kitchen/knife/combat/survival
- belt = /obj/item/storage/belt/mining/alt
- implants = list(/obj/item/implant/weapons_auth)
- id = /obj/item/card/id/syndicate_command/crew_id/engi
+ uniform = /obj/item/clothing/under/syndicate/suns/workerjumpsuit
+ mask = /obj/item/clothing/mask/gas/syndicate/voicechanger
+ id = /obj/item/card/id/syndicate_command/crew_id
+ shoes = /obj/item/clothing/shoes/jackboots/suns
+ glasses = null
+ gloves = null
+ ears = null
+ r_pocket = null
+ l_pocket = null
+ belt = null
backpack = /obj/item/storage/backpack/security
satchel = /obj/item/storage/backpack/satchel/sec
@@ -768,7 +953,7 @@
job_icon = "stationengineer"
id = /obj/item/card/id/syndicate_command/crew_id
- uniform = /obj/item/clothing/under/syndicate/aclfgrunt
+ uniform = /obj/item/clothing/under/syndicate/ngr
accessory = /obj/item/clothing/accessory/armband/engine
glasses = /obj/item/clothing/glasses/sunglasses
shoes = /obj/item/clothing/shoes/jackboots
@@ -798,23 +983,23 @@
glasses = null
/datum/outfit/job/syndicate/engineer/twink
- name = "Syndicate - Ship Engineer (Twinkleshine)"
+ name = "Syndicate - Ship Engineer (Twinkleshine, GEC)"
uniform = /obj/item/clothing/under/syndicate/gec
+ id = /obj/item/card/id/syndicate_command/crew_id/engi
+ mask = /obj/item/clothing/mask/gas/syndicate/voicechanger
+ ears = null
accessory = null
- glasses = /obj/item/clothing/glasses/meson/night
- head = /obj/item/clothing/head/hardhat/orange
- gloves = /obj/item/clothing/gloves/tackler/combat/insulated
- ears = /obj/item/radio/headset/syndicate
- mask = /obj/item/clothing/mask/chameleon
- back = /obj/item/storage/backpack/industrial
- belt = /obj/item/storage/belt/utility/syndicate
+ glasses = null
+ head = null
+ gloves = /obj/item/clothing/gloves/tackler/combat
+ belt = null
shoes = /obj/item/clothing/shoes/combat
- suit = /obj/item/clothing/suit/hazardvest
- alt_suit = /obj/item/clothing/suit/toggle/hazard
+ suit = null
+ alt_suit = null
+ l_pocket = null
+ r_pocket = null
implants = list(/obj/item/implant/weapons_auth)
- id = /obj/item/card/id/syndicate_command/crew_id/engi
- backpack_contents = list(/obj/item/construction/rcd/combat, /obj/item/rcd_ammo/large)
box = /obj/item/storage/box/survival/syndie
@@ -830,3 +1015,19 @@
r_pocket = /obj/item/radio
head = /obj/item/clothing/head/soft/cybersun
accessory = /obj/item/clothing/accessory/armband/engine
+
+/datum/outfit/job/syndicate/engineer/suns
+ name = "Syndicate - Ship Engineer (SUNS)"
+
+ uniform = /obj/item/clothing/under/syndicate/suns/workerjumpsuit
+ suit = /obj/item/clothing/suit/toggle/suns/workervest
+ gloves = /obj/item/clothing/gloves/suns/yellow
+ shoes = /obj/item/clothing/shoes/jackboots/suns
+ head = /obj/item/clothing/head/safety_helmet/suns
+ accessory = null
+ glasses = null
+
+ backpack = /obj/item/storage/backpack
+ satchel = /obj/item/storage/backpack/satchel
+ duffelbag = /obj/item/storage/backpack/duffelbag
+ courierbag = /obj/item/storage/backpack/messenger
diff --git a/code/modules/clothing/outfits/standard.dm b/code/modules/clothing/outfits/standard.dm
index 72127bbaf7df..7a848b9ca330 100644
--- a/code/modules/clothing/outfits/standard.dm
+++ b/code/modules/clothing/outfits/standard.dm
@@ -1,3 +1,6 @@
+/datum/outfit/centcom
+ name = "CentCom Base"
+
/datum/outfit/centcom/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
if(visualsOnly)
return
@@ -37,6 +40,8 @@
glasses = /obj/item/clothing/glasses/eyepatch
/datum/outfit/pirate/space
+ name = "Space Pirate (EVA)"
+
suit = /obj/item/clothing/suit/space/pirate
head = /obj/item/clothing/head/helmet/space/pirate/bandana
mask = /obj/item/clothing/mask/breath
@@ -45,6 +50,8 @@
id = /obj/item/card/id
/datum/outfit/pirate/space/captain
+ name = "Space Pirate Captain"
+
head = /obj/item/clothing/head/helmet/space/pirate
/datum/outfit/pirate/post_equip(mob/living/carbon/human/H)
diff --git a/code/modules/clothing/outfits/vv_outfit.dm b/code/modules/clothing/outfits/vv_outfit.dm
index 0c5d99cc7488..374cdb427fdc 100644
--- a/code/modules/clothing/outfits/vv_outfit.dm
+++ b/code/modules/clothing/outfits/vv_outfit.dm
@@ -1,6 +1,8 @@
// This outfit preserves varedits made on the items
// Created from admin helpers.
/datum/outfit/varedit
+ name = "Varedit Outfit"
+
var/list/vv_values
var/list/stored_access
var/update_id_name = FALSE //If the name of the human is same as the name on the id they're wearing we'll update provided id when equipping
diff --git a/code/modules/clothing/spacesuits/_spacesuits.dm b/code/modules/clothing/spacesuits/_spacesuits.dm
index 7448dc8cbcbe..4b19735b5f62 100644
--- a/code/modules/clothing/spacesuits/_spacesuits.dm
+++ b/code/modules/clothing/spacesuits/_spacesuits.dm
@@ -9,8 +9,6 @@
permeability_coefficient = 0.01
armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 50, "fire" = 80, "acid" = 70)
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
- dynamic_hair_suffix = ""
- dynamic_fhair_suffix = ""
cold_protection = HEAD
min_cold_protection_temperature = SPACE_HELM_MIN_TEMP_PROTECT
heat_protection = HEAD
diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm
index 8a74e555469a..aa0367f12ead 100644
--- a/code/modules/clothing/spacesuits/miscellaneous.dm
+++ b/code/modules/clothing/spacesuits/miscellaneous.dm
@@ -60,8 +60,6 @@ Contains:
desc = "An armored beret commonly used by special operations officers. Uses advanced force field technology to protect the head from space."
icon_state = "beret_badge"
greyscale_colors = "#397F3F#FFCE5B"
- dynamic_hair_suffix = "+generic"
- dynamic_fhair_suffix = "+generic"
flags_inv = 0
armor = list("melee" = 80, "bullet" = 80, "laser" = 50, "energy" = 60, "bomb" = 100, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 100)
strip_delay = 130
@@ -317,7 +315,7 @@ Contains:
light_system = NO_LIGHT_SUPPORT
light_range = 0 //luminosity when on
actions_types = list()
- flags_inv = HIDEEARS|HIDEHAIR|HIDEFACIALHAIR //facial hair will clip with the helm, this'll need a dynamic_fhair_suffix at some point.
+ flags_inv = HIDEEARS|HIDEHAIR|HIDEFACIALHAIR
/obj/item/clothing/head/helmet/space/hardsuit/carp/Initialize()
. = ..()
diff --git a/code/modules/clothing/spacesuits/syndi.dm b/code/modules/clothing/spacesuits/syndi.dm
index 4bdafe4f7f41..e5a98c7215e5 100644
--- a/code/modules/clothing/spacesuits/syndi.dm
+++ b/code/modules/clothing/spacesuits/syndi.dm
@@ -111,7 +111,6 @@
item_state = "syndicate-black"
allowed = list(/obj/item/gun, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/tank/internals, /obj/item/storage/firstaid, /obj/item/healthanalyzer, /obj/item/stack/medical)
-
//Black-orange syndicate space suit
/obj/item/clothing/head/helmet/space/syndicate/black/orange
name = "black space helmet"
diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm
index 9c363c11551a..5bd84e801382 100644
--- a/code/modules/clothing/suits/armor.dm
+++ b/code/modules/clothing/suits/armor.dm
@@ -150,7 +150,16 @@
/obj/item/clothing/suit/armor/vest/capcarapace/cybersun
name = "Cybersun captain's haori"
desc = "An extraordinarily fashionable haori, utilized by Cybersun captains. Weaved with armored fabric to protect the user from gunshots."
- icon_state = "cybersunhaori"
+ icon_state = "carapace_cybersun"
+
+/obj/item/clothing/suit/armor/vest/capcarapace/ngr_captain
+ name = "\improper 2nd Battlegroup jacket"
+ desc = "An armored jacket worn by the New Gorlex Republic's 2nd Battlegroup."
+ body_parts_covered = CHEST|GROIN|ARMS|HANDS
+ icon_state = "carapace_ngr"
+ item_state = "carapace_ngr"
+ blood_overlay_type = "coat"
+ armor = list("melee" = 35, "bullet" = 30, "laser" = 30, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
/obj/item/clothing/suit/armor/vest/capcarapace/alt
name = "captain's parade jacket"
diff --git a/code/modules/clothing/suits/hoodies.dm b/code/modules/clothing/suits/hoodies.dm
index f07d46420c5b..1feea7adfd0f 100644
--- a/code/modules/clothing/suits/hoodies.dm
+++ b/code/modules/clothing/suits/hoodies.dm
@@ -114,3 +114,4 @@
desc = "A hood for your RILENA themed hoodie."
icon_state = "hoodie_rilena"
item_state = "hoodie_rilena"
+
diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm
index 17bb0329cfef..12a44cbbd252 100644
--- a/code/modules/clothing/suits/jobs.dm
+++ b/code/modules/clothing/suits/jobs.dm
@@ -312,3 +312,4 @@
item_state = "enginseerhood"
body_parts_covered = HEAD
flags_inv = HIDEHAIR|HIDEEARS|HIDEFACE|HIDEFACIALHAIR
+
diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm
index 59b252a9836a..77b7297f4c69 100644
--- a/code/modules/clothing/suits/miscellaneous.dm
+++ b/code/modules/clothing/suits/miscellaneous.dm
@@ -310,7 +310,6 @@
body_parts_covered = HEAD
clothing_flags = THICKMATERIAL
flags_inv = HIDEHAIR|HIDEEARS
- dynamic_hair_suffix = ""
/obj/item/clothing/suit/hooded/bloated_human //OH MY GOD WHAT HAVE YOU DONE!?!?!?
name = "bloated human suit"
@@ -400,7 +399,7 @@
/obj/item/clothing/suit/jacket/leather
name = "leather jacket"
- desc = "Pompadour not included."
+ desc = "This makes you feel like the coolest guy in town!"
icon_state = "leatherjacket"
item_state = "hostrench"
resistance_flags = NONE
@@ -685,12 +684,3 @@
icon_state = "DutchJacket"
item_state = "DutchJacket"
body_parts_covered = ARMS
-
-/obj/item/clothing/suit/gorlex
- name = "\improper 2nd Battlegroup jacket"
- desc = "An armored jacket worn by the 2nd Battlegroup."
- body_parts_covered = CHEST|GROIN|ARMS|HANDS
- icon_state = "gorlexjacket"
- item_state = "gorlexjacket"
- blood_overlay_type = "coat"
- armor = list("melee" = 35, "bullet" = 30, "laser" = 30, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
diff --git a/code/modules/clothing/suits/toggles.dm b/code/modules/clothing/suits/toggles.dm
index 4255335cda74..0eb5a90676c6 100644
--- a/code/modules/clothing/suits/toggles.dm
+++ b/code/modules/clothing/suits/toggles.dm
@@ -75,7 +75,6 @@
/obj/item/clothing/head/hooded
var/obj/item/clothing/suit/hooded/suit
- dynamic_hair_suffix = ""
/obj/item/clothing/head/hooded/Destroy()
suit = null
diff --git a/code/modules/clothing/suits/utility.dm b/code/modules/clothing/suits/utility.dm
index 5a1810e1fba1..ac91351c2324 100644
--- a/code/modules/clothing/suits/utility.dm
+++ b/code/modules/clothing/suits/utility.dm
@@ -61,8 +61,6 @@
clothing_flags = THICKMATERIAL | SNUG_FIT
armor = list("melee" = 20, "bullet" = 0, "laser" = 20,"energy" = 30, "bomb" = 100, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
flags_inv = HIDEFACE|HIDEMASK|HIDEEARS|HIDEEYES|HIDEHAIR|HIDEFACIALHAIR
- dynamic_hair_suffix = ""
- dynamic_fhair_suffix = ""
cold_protection = HEAD
min_cold_protection_temperature = HELMET_MIN_TEMP_PROTECT
heat_protection = HEAD
diff --git a/code/modules/clothing/under/accessories.dm b/code/modules/clothing/under/accessories.dm
index 7bb36a9086b4..2f0660bffebf 100644
--- a/code/modules/clothing/under/accessories.dm
+++ b/code/modules/clothing/under/accessories.dm
@@ -512,7 +512,7 @@
/obj/item/clothing/accessory/holster/marine/Initialize()
. = ..()
- new /obj/item/gun/ballistic/automatic/pistol/m1911(src)
+ new /obj/item/gun/ballistic/automatic/pistol/candor(src)
new /obj/item/ammo_box/magazine/m45(src)
new /obj/item/ammo_box/magazine/m45(src)
diff --git a/code/modules/clothing/under/syndicate.dm b/code/modules/clothing/under/syndicate.dm
index 01ed8b5a082a..36cc7c96220e 100644
--- a/code/modules/clothing/under/syndicate.dm
+++ b/code/modules/clothing/under/syndicate.dm
@@ -93,18 +93,18 @@
armor = list("melee" = 10, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 40)
alt_covers_chest = TRUE
-/obj/item/clothing/under/syndicate/officer
- name = "syndicate officer uniform"
- desc = "A black uniform worn by officers of many branches of the Syndicate."
- icon_state = "officer"
+/obj/item/clothing/under/syndicate/ngr/officer
+ name = "NGR officer uniform"
+ desc = "A black uniform worn by officers of the New Gorlex Republic."
+ icon_state = "ngr_officer"
can_adjust = FALSE
armor = list("melee" = 10, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 40)
alt_covers_chest = TRUE
-/obj/item/clothing/under/syndicate/aclfgrunt
- name = "ACLF uniform"
- desc = "A button-up in a tasteful shade of gray with red pants, used as the uniform of the Anti-Corporate Liberation front on the rim."
- icon_state = "aclfgrunt"
+/obj/item/clothing/under/syndicate/ngr
+ name = "NGR uniform"
+ desc = "A button-up in a tasteful shade of gray with red pants, used as the basic uniform of the New Gorlex Republic."
+ icon_state = "ngr_grunt"
can_adjust = FALSE
armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 40)
alt_covers_chest = TRUE
diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm
index 9ca494d431e9..2f262b562148 100644
--- a/code/modules/flufftext/Hallucination.dm
+++ b/code/modules/flufftext/Hallucination.dm
@@ -764,7 +764,7 @@ GLOBAL_LIST_INIT(hallucination_list, list(
"stun baton","flash","syringe gun","circular saw","tank transfer valve",\
"ritual dagger","spellbook",\
"pulse rifle","hypospray","ship blueprints",\
- "ship keys","M1911","Commander","credits","handcuffs","you",\
+ "ship keys","Candor","Commander","credits","handcuffs","you",\
)] into [equipped_backpack]. ")
message_pool.Add("[other] [pick("sneezes","coughs")].")
diff --git a/code/modules/food_and_drinks/drinks/drinks.dm b/code/modules/food_and_drinks/drinks/drinks.dm
index 08a87b6f9193..64bb4fdae667 100644
--- a/code/modules/food_and_drinks/drinks/drinks.dm
+++ b/code/modules/food_and_drinks/drinks/drinks.dm
@@ -254,13 +254,26 @@
list_reagents = list(/datum/reagent/consumable/tea = 30)
/obj/item/reagent_containers/food/drinks/mug/coco
- name = "Dutch hot coco"
- desc = "Made in Space South America."
+ name = "Pearl Hot Chocolate"
+ desc = "A rich delicacy from the humid regions of Terra."
list_reagents = list(/datum/reagent/consumable/hot_coco = 15, /datum/reagent/consumable/sugar = 5)
foodtype = SUGAR
resistance_flags = FREEZE_PROOF
custom_price = 120
+/obj/item/reagent_containers/food/drinks/cafelatte
+ name = "cafe latte"
+ desc = "A nice, strong and refreshing beverage while you're reading."
+ icon_state = "cafe_latte"
+ list_reagents = list(/datum/reagent/consumable/cafe_latte = 30)
+ custom_price = 200
+
+/obj/item/reagent_containers/food/drinks/soylatte
+ name = "soy latte"
+ desc = "A nice and refreshing beverage while you're reading."
+ icon_state = "soy_latte"
+ list_reagents = list(/datum/reagent/consumable/soy_latte = 30)
+ custom_price = 200
/obj/item/reagent_containers/food/drinks/dry_ramen
name = "cup ramen"
diff --git a/code/modules/food_and_drinks/food/snacks_frozen.dm b/code/modules/food_and_drinks/food/snacks_frozen.dm
index dfbed9ba9112..930fabc31775 100644
--- a/code/modules/food_and_drinks/food/snacks_frozen.dm
+++ b/code/modules/food_and_drinks/food/snacks_frozen.dm
@@ -268,7 +268,7 @@
list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/sodiumchloride = 1, /datum/reagent/consumable/cream = 2, /datum/reagent/consumable/vanilla = 1, /datum/reagent/consumable/sugar = 4)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/sodiumchloride = 1, /datum/reagent/consumable/cream = 2, /datum/reagent/consumable/vanilla = 1, /datum/reagent/consumable/sugar = 4)
tastes = list("salty liquorice")
- overlay_state = "nogga_black"
+ overlay_state = "licorice"
/obj/item/reagent_containers/food/snacks/cornuto
name = "cornuto"
diff --git a/code/modules/jobs/job_types/_job.dm b/code/modules/jobs/job_types/_job.dm
index 2bd5c2fd4667..f46d7768b1f7 100644
--- a/code/modules/jobs/job_types/_job.dm
+++ b/code/modules/jobs/job_types/_job.dm
@@ -172,7 +172,7 @@
return max(0, minimal_player_age - C.player_age)
/datum/job/proc/radio_help_message(mob/M)
- to_chat(M, "Prefix your message with :h to speak on your department's radio. To see other prefixes, look closely at your headset. ")
+ to_chat(M, "Your ship most likely does not have telecomms. Prefix your message with :L or :R, depending on the hand you're holding the radio with, to speak with a handheld radio. Otherwise, you can speak with your headset by prefixing your message with :h. ")
/datum/outfit/job
name = "Standard Gear"
diff --git a/code/modules/library/lib_items.dm b/code/modules/library/lib_items.dm
index dd664843ed41..55d33ee80d20 100644
--- a/code/modules/library/lib_items.dm
+++ b/code/modules/library/lib_items.dm
@@ -181,22 +181,28 @@
/obj/structure/bookcase/manuals/engineering/Initialize()
. = ..()
- new /obj/item/book/manual/wiki/engineering_construction(src)
- new /obj/item/book/manual/wiki/engineering_hacking(src)
- new /obj/item/book/manual/wiki/engineering_guide(src)
- new /obj/item/book/manual/wiki/engineering_singulo_tesla(src)
- new /obj/item/book/manual/wiki/robotics_cyborgs(src)
+ new /obj/item/book/manual/wiki/construction(src)
+ new /obj/item/book/manual/wiki/hacking(src)
+ new /obj/item/book/manual/wiki/engineering(src)
+ new /obj/item/book/manual/wiki/robotics(src)
update_appearance()
-/obj/structure/bookcase/manuals/research_and_development
- name = "\improper R&D manuals bookcase"
+// /obj/structure/bookcase/manuals/research_and_development
+// name = "\improper R&D manuals bookcase"
-/obj/structure/bookcase/manuals/research_and_development/Initialize()
- . = ..()
- new /obj/item/book/manual/wiki/research_and_development(src)
- update_appearance()
+// /obj/structure/bookcase/manuals/research_and_development/Initialize()
+// . = ..()
+// new /obj/item/book/manual/wiki/research_and_development(src)
+// update_appearance()
+/obj/structure/bookcase/manuals/chemistry
+ name = "chemistry manuals bookcase"
+
+/obj/structure/bookcase/manuals/chemistry/Initialize()
+ . = ..()
+ new /obj/item/book/manual/wiki/chemistry(src)
+ new /obj/item/book/manual/wiki/ghetto_chemistry(src)
/*
* Book
@@ -378,7 +384,8 @@
/obj/structure/bookcase/manuals/medical/Initialize()
. = ..()
- new /obj/item/book/manual/wiki/medical_cloning(src)
+ new /obj/item/book/manual/wiki/medicine(src)
+ new /obj/item/book/manual/wiki/surgery(src)
update_appearance()
#undef BOOKCASE_UNANCHORED
diff --git a/code/modules/mining/equipment/mineral_scanner.dm b/code/modules/mining/equipment/mineral_scanner.dm
index 87ed99c0d45b..add30b7d467f 100644
--- a/code/modules/mining/equipment/mineral_scanner.dm
+++ b/code/modules/mining/equipment/mineral_scanner.dm
@@ -10,6 +10,7 @@
w_class = WEIGHT_CLASS_SMALL
flags_1 = CONDUCT_1
slot_flags = ITEM_SLOT_BELT
+ custom_price = 200
var/cooldown = 35
var/current_cooldown = 0
var/speaker = TRUE // Speaker that plays a sound when pulsed.
diff --git a/code/modules/mining/machine_vending.dm b/code/modules/mining/machine_vending.dm
index ba2a1c6984a4..2af7db0f4b6c 100644
--- a/code/modules/mining/machine_vending.dm
+++ b/code/modules/mining/machine_vending.dm
@@ -19,58 +19,25 @@
all_items_free = FALSE
// Mining products are handled differently, because I am too lazy to convert this list stolen from the old vendor.
products = list( //if you add something to this, please, for the love of god, sort it by price/type. use tabs and not spaces.
- /obj/item/stack/marker_beacon/thirty = 6,
- /obj/item/reagent_containers/food/drinks/bottle/whiskey = 3,
- /obj/item/storage/box/gum/bubblegum = 5,
- /obj/item/clothing/mask/cigarette/cigar/havana = 3,
- /obj/item/soap/nanotrasen = 1,
- /obj/item/hivelordstabilizer = 6,
- /obj/item/fulton_core = 1,
- /obj/item/survivalcapsule = 3,
- /obj/item/storage/belt/mining = 3,
- /obj/item/card/mining_point_card = 5,
- /obj/item/reagent_containers/hypospray/medipen/survival = 6,
- /obj/item/storage/firstaid/brute = 3,
- /obj/item/storage/box/minertracker = 5,
- /obj/item/wormhole_jaunter = 3,
- /obj/item/kinetic_crusher = 1,
- /obj/item/gun/energy/kinetic_accelerator = 3,
- /obj/item/mining_scanner = 5,
+ /obj/item/stack/marker_beacon/thirty = 3,
+ /obj/item/mining_scanner = 2,
/obj/item/t_scanner/adv_mining_scanner = 2,
- /obj/item/resonator = 3,
- /obj/item/extraction_pack = 3,
- /obj/item/lazarus_injector = 1,
- /obj/item/pickaxe/silver = 3,
- /obj/item/storage/backpack/duffelbag/mining_conscript = 3,
- /obj/item/tank/jetpack/suit = 3,
- /obj/item/spacecash/bundle/c1000 = 5,
- /obj/item/clothing/suit/space/hardsuit/mining/independent = 3,
- /obj/item/resonator/upgraded = 1,
- /obj/item/clothing/shoes/bhop = 3,
- /obj/item/survivalcapsule/luxury = 3,
- /mob/living/simple_animal/hostile/mining_drone = 3,
- /obj/item/mine_bot_upgrade = 3,
- /obj/item/mine_bot_upgrade/health = 3,
- /obj/item/borg/upgrade/modkit/cooldown/minebot = 3,
- /obj/item/slimepotion/slime/sentience/mining = 1,
- /obj/item/borg/upgrade/modkit/minebot_passthrough = 3,
- /obj/item/borg/upgrade/modkit/tracer = 3,
- /obj/item/borg/upgrade/modkit/tracer/adjustable = 3,
- /obj/item/borg/upgrade/modkit/chassis_mod = 3,
- /obj/item/borg/upgrade/modkit/range = 3,
- /obj/item/borg/upgrade/modkit/damage = 3,
- /obj/item/borg/upgrade/modkit/cooldown = 3,
- /obj/item/borg/upgrade/modkit/aoe/mobs = 2
- )
- premium = list(
- /obj/item/reagent_containers/food/drinks/bottle/absinthe/premium = 3,
- /obj/item/laser_pointer = 1,
- /obj/item/pickaxe/diamond = 1,
- /mob/living/simple_animal/hostile/facehugger/toy = 1,
+ /obj/item/hivelordstabilizer = 3,
/obj/item/clothing/glasses/meson/gar = 2,
- /obj/item/survivalcapsule/luxuryelite = 1,
+ /obj/item/kinetic_crusher = 1,
+ /obj/item/gun/energy/kinetic_accelerator = 2,
+ /obj/item/pickaxe/silver = 1,
+ /obj/item/borg/upgrade/modkit/range = 2,
+ /obj/item/borg/upgrade/modkit/damage = 2,
+ /obj/item/borg/upgrade/modkit/cooldown = 2,
+ /obj/item/borg/upgrade/modkit/aoe/mobs = 1,
+ /obj/item/lazarus_injector = 1,
+ /obj/item/survivalcapsule = 2,
+ /obj/item/survivalcapsule/luxury = 1,
+ /obj/item/survivalcapsule/luxuryelite = 1
)
+
var/voucher_items = list(
"Survival Capsule and Explorer's Webbing" = /obj/item/storage/belt/mining/vendor,
"Resonator Kit" = /obj/item/resonator,
@@ -140,47 +107,8 @@
icon_state = "mining_voucher"
w_class = WEIGHT_CLASS_TINY
-/**********************Mining Point Card**********************/
-
-/obj/item/card/mining_point_card
- name = "mining points card"
- desc = "A small card preloaded with mining points. Swipe your ID card over it to transfer the points, then discard."
- icon_state = "data_1"
- custom_price = 500
- var/points = 500
-
-/obj/item/card/mining_point_card/attackby(obj/item/I, mob/user, params)
- if(istype(I, /obj/item/card/id))
- if(points)
- var/obj/item/card/id/C = I
- C.mining_points += points
- to_chat(user, "You transfer [points] points to [C]. ")
- points = 0
- else
- to_chat(user, "There's no points left on [src]. ")
- ..()
-
-/obj/item/card/mining_point_card/examine(mob/user)
- . = ..()
- . += "There's [points] point\s on the card. "
///Conscript kit
-/obj/item/card/mining_access_card
- name = "mining access card"
- desc = "A small card, that when used on any ID, will add mining access."
- icon_state = "data_1"
-
-/obj/item/card/mining_access_card/afterattack(atom/movable/AM, mob/user, proximity)
- . = ..()
- if(istype(AM, /obj/item/card/id) && proximity)
- var/obj/item/card/id/I = AM
- I.access |= ACCESS_MINING
- I.access |= ACCESS_MINING_STATION
- I.access |= ACCESS_MECH_MINING
- I.access |= ACCESS_MINERAL_STOREROOM
- I.access |= ACCESS_CARGO
- to_chat(user, "You upgrade [I] with mining access. ")
- qdel(src)
/obj/item/storage/backpack/duffelbag/mining_conscript
name = "EXOCOM rapid deployment kit"
@@ -193,7 +121,6 @@
new /obj/item/storage/bag/ore(src)
new /obj/item/clothing/suit/hooded/explorer(src)
new /obj/item/clothing/mask/gas/explorer(src)
- new /obj/item/card/mining_access_card(src)
new /obj/item/gun/energy/kinetic_accelerator(src)
new /obj/item/kitchen/knife/combat/survival(src)
new /obj/item/flashlight/seclite(src)
diff --git a/code/modules/mob/dead/dead.dm b/code/modules/mob/dead/dead.dm
index ee74d0475a34..c09a3c8bd4c8 100644
--- a/code/modules/mob/dead/dead.dm
+++ b/code/modules/mob/dead/dead.dm
@@ -37,12 +37,8 @@ INITIALIZE_IMMEDIATE(/mob/dead)
/mob/dead/get_status_tab_items()
. = ..()
- . += ""
- . += "Game Mode: [SSticker.hide_mode ? "Secret" : "[GLOB.master_mode]"]"
-
if(SSticker.HasRoundStarted())
return
-
var/time_remaining = SSticker.GetTimeLeft()
if(time_remaining > 0)
. += "Time To Start: [round(time_remaining/10)]s"
diff --git a/code/modules/mob/dead/new_player/new_player.dm b/code/modules/mob/dead/new_player/new_player.dm
index d7865c9d2276..9baa46f526b5 100644
--- a/code/modules/mob/dead/new_player/new_player.dm
+++ b/code/modules/mob/dead/new_player/new_player.dm
@@ -493,8 +493,13 @@
/mob/dead/new_player/proc/register_for_interview()
// First we detain them by removing all the verbs they have on client
for (var/procpath/client_verb as anything in client.verbs)
- if(!(client_verb in GLOB.client_verbs_required))
- remove_verb(client, client_verb)
+ if(client_verb in GLOB.client_verbs_required)
+ continue
+ remove_verb(client, client_verb)
+
+ // Then remove those on their mob as well
+ for (var/procpath/verb_path as anything in verbs)
+ remove_verb(src, verb_path)
// Then we create the interview form and show it to the client
var/datum/interview/I = GLOB.interviews.interview_for_client(client)
diff --git a/code/modules/mob/dead/new_player/ship_select.dm b/code/modules/mob/dead/new_player/ship_select.dm
index 1515aa82f799..fe88abdf3399 100644
--- a/code/modules/mob/dead/new_player/ship_select.dm
+++ b/code/modules/mob/dead/new_player/ship_select.dm
@@ -146,7 +146,7 @@
var/list/ship_data = list(
"name" = S.name,
- "faction" = ship_prefix_to_faction(S.source_template.prefix),
+ "faction" = S.source_template.faction_name,
"class" = S.source_template.short_name,
"desc" = S.source_template.description,
"tags" = S.source_template.tags,
diff --git a/code/modules/mob/dead/new_player/sprite_accessories/hair.dm b/code/modules/mob/dead/new_player/sprite_accessories/hair.dm
index af774d9b055b..34d8dd274668 100644
--- a/code/modules/mob/dead/new_player/sprite_accessories/hair.dm
+++ b/code/modules/mob/dead/new_player/sprite_accessories/hair.dm
@@ -1,6 +1,6 @@
// Hair for use on mobs
// Keep the names alphabetical, and capitalized.
-// You do not need to define _s or _l sub-states, game automatically does this for you
+// You do not need to define _s or _l sub-states, game automatically does this for you //what is this
/datum/sprite_accessory/hair
icon = 'icons/mob/human_face.dmi' // default icon for all hairs
@@ -302,6 +302,14 @@
name = "Gentle"
icon_state = "hair_gentle"
+/datum/sprite_accessory/hair/gloomy
+ name = "Gloomy"
+ icon_state = "hair_gloomy"
+
+/datum/sprite_accessory/hair/gloomy_long
+ name = "Gloomy (Long)"
+ icon_state = "hair_gloomylong"
+
/datum/sprite_accessory/hair/halfbang
name = "Half-banged Hair"
icon_state = "hair_halfbang"
@@ -310,9 +318,9 @@
name = "Half-banged Hair 2"
icon_state = "hair_halfbang2"
-/datum/sprite_accessory/hair/halfshaved
- name = "Half-shaved"
- icon_state = "hair_halfshaved"
+/datum/sprite_accessory/hair/halfshave
+ name = "Half-shave"
+ icon_state = "hair_halfshave"
/datum/sprite_accessory/hair/harley
name = "Harley"
@@ -694,6 +702,10 @@
name = "Tress Shoulder"
icon_state = "hair_tressshoulder"
+/datum/sprite_accessory/hair/tribun
+ name = "Tri-bun"
+ icon_state = "hair_tribun"
+
/datum/sprite_accessory/hair/trimmed
name = "Trimmed"
icon_state = "hair_trimmed"
@@ -706,6 +718,10 @@
name = "Twintails"
icon_state = "hair_twintail"
+/datum/sprite_accessory/hair/ruby
+ name = "Ruby"
+ icon_state = "hair_ruby"
+
/datum/sprite_accessory/hair/undercut
name = "Undercut"
icon_state = "hair_undercut"
diff --git a/code/modules/mob/dead/new_player/sprite_accessories/ipc.dm b/code/modules/mob/dead/new_player/sprite_accessories/ipc.dm
index 20f2fe732d31..b13b8f96a51e 100644
--- a/code/modules/mob/dead/new_player/sprite_accessories/ipc.dm
+++ b/code/modules/mob/dead/new_player/sprite_accessories/ipc.dm
@@ -236,12 +236,71 @@
name = "Right Angle"
icon_state = "rangle"
+/datum/sprite_accessory/ipc_antennas/sprinter
+ name = "Sprinter Tail"
+ icon_state = "sprinter"
+
+/datum/sprite_accessory/ipc_antennas/simple
+ name = "Synth Simple"
+ icon_state = "simple_synth"
+
+/datum/sprite_accessory/ipc_antennas/short
+ name = "Synth Short"
+ icon_state = "short_synth"
+
+/datum/sprite_accessory/ipc_antennas/curled
+ name = "Synth Curled"
+ icon_state = "curled_synth"
+
+/datum/sprite_accessory/ipc_antennas/ram //remade
+ name = "Synth Ram"
+ icon_state = "ram_synth"
+
+// Start tails
+
+/datum/sprite_accessory/ipc_tail
+ icon = 'icons/mob/ipc_accessories.dmi'
+ color_src = MUTCOLORS
+
+/datum/sprite_accessory/ipc_tail/none
+ name = "None"
+ icon_state = "none"
+
+/datum/sprite_accessory/ipc_tail/lizard
+ name = "Synthetic Sarathi"
+ icon_state = "synth"
+
+/datum/sprite_accessory/ipc_tail/lizard_big
+ name = "Synthetic Sarathi Large"
+ icon_state = "large"
+
+/datum/sprite_accessory/ipc_tail/plug
+ name = "Power Plug"
+ icon_state = "plug"
+ secondary_color = TRUE
+
+/datum/sprite_accessory/ipc_tail/cat
+ name = "Pawsitrons Cat"
+ icon_state = "cat"
+
+/datum/sprite_accessory/ipc_tail/fox
+ name = "Pawsitrons Fox"
+ icon_state = "fox"
+
+/datum/sprite_accessory/ipc_tail/fox_alt
+ name = "Pawsitrons Fox 2"
+ icon_state = "fox2"
+
// Start chassis - the worst thing ever please rework this
/datum/sprite_accessory/ipc_chassis // Used for changing limb icons, doesn't need to hold the actual icon. That's handled in ipc.dm
icon = null
icon_state = "who cares fuck you" // In order to pull the chassis correctly, we need AN icon_state(see line 36-39). It doesn't have to be useful, because it isn't used.
color_src = 0
+ var/use_eyes = FALSE //do we use normal robotic eyes? used when we dont want a screen but still want visible eyes
+ var/has_screen = TRUE //do we have a screen to toggle
+ var/has_overlay = FALSE //does this chasis have a overlay icon?
+ var/is_digi = FALSE //does this chasis use digitigrade
/datum/sprite_accessory/ipc_chassis/mcgreyscale
name = "Morpheus Cyberkinetics (Custom)"
@@ -287,3 +346,25 @@
/datum/sprite_accessory/ipc_chassis/zenghupharmaceuticals
name = "Zeng-Hu Pharmaceuticals"
limbs_id = "zhpipc"
+
+/datum/sprite_accessory/ipc_chassis/pgfmechanicsplantigrade
+ name = "PGF MECHANICS TYPE-P"
+ limbs_id = "pgfipc-p"
+ has_screen = FALSE
+ color_src = MUTCOLORS
+ has_overlay = TRUE
+ use_eyes = TRUE
+
+/datum/sprite_accessory/ipc_chassis/pgfmechanicsdigigrade
+ name = "PGF MECHANICS TYPE-D"
+ limbs_id = "pgfipc-p" //the digigrade var makes it so we use digi leg variant instead
+ has_screen = FALSE
+ color_src = MUTCOLORS
+ has_overlay = TRUE
+ use_eyes = TRUE
+ is_digi = TRUE
+
+/datum/sprite_accessory/ipc_chassis/inteqsprinter
+ name = "Inteq Mothership 'Sprinter'"
+ limbs_id = "inteqsprinter"
+ has_screen = FALSE
diff --git a/code/modules/mob/living/carbon/alien/alien.dm b/code/modules/mob/living/carbon/alien/alien.dm
index 9dfd2484402e..23e937acf102 100644
--- a/code/modules/mob/living/carbon/alien/alien.dm
+++ b/code/modules/mob/living/carbon/alien/alien.dm
@@ -86,10 +86,6 @@
/mob/living/carbon/alien/IsAdvancedToolUser()
return has_fine_manipulation
-/mob/living/carbon/alien/get_status_tab_items()
- . = ..()
- . += "Intent: [a_intent]"
-
/mob/living/carbon/alien/getTrail()
if(getBruteLoss() < 200)
return pick (list("xltrails_1", "xltrails2"))
diff --git a/code/modules/mob/living/carbon/alien/organs.dm b/code/modules/mob/living/carbon/alien/organs.dm
index 8faa15b83929..cb7c7adafc4b 100644
--- a/code/modules/mob/living/carbon/alien/organs.dm
+++ b/code/modules/mob/living/carbon/alien/organs.dm
@@ -83,17 +83,23 @@
else
owner.adjustPlasma(plasma_rate * 0.1)
-/obj/item/organ/alien/plasmavessel/Insert(mob/living/carbon/M, special = 0)
+/obj/item/organ/alien/plasmavessel/Insert(mob/living/carbon/organ_owner, special = 0)
..()
- if(isalien(M))
- var/mob/living/carbon/alien/A = M
- A.updatePlasmaDisplay()
+ if(isalien(organ_owner))
+ var/mob/living/carbon/alien/target_alien = organ_owner
+ target_alien.updatePlasmaDisplay()
+ RegisterSignal(organ_owner, COMSIG_MOB_GET_STATUS_TAB_ITEMS, PROC_REF(get_status_tab_item))
-/obj/item/organ/alien/plasmavessel/Remove(mob/living/carbon/M, special = 0)
+/obj/item/organ/alien/plasmavessel/Remove(mob/living/carbon/organ_owner, special = 0)
..()
- if(isalien(M))
- var/mob/living/carbon/alien/A = M
- A.updatePlasmaDisplay()
+ if(isalien(organ_owner))
+ var/mob/living/carbon/alien/organ_owner_alien = organ_owner
+ organ_owner_alien.updatePlasmaDisplay()
+ UnregisterSignal(organ_owner, COMSIG_MOB_GET_STATUS_TAB_ITEMS)
+
+/obj/item/organ/alien/plasmavessel/proc/get_status_tab_item(mob/living/carbon/source, list/items)
+ SIGNAL_HANDLER
+ items += "Plasma Stored: [storedPlasma]/[max_plasma]"
#define QUEEN_DEATH_DEBUFF_DURATION 2400
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index 82c27e95174b..5b316dad9cb6 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -28,6 +28,9 @@
if(!held_index)
held_index = (active_hand_index % held_items.len)+1
+ if(!isnum(held_index))
+ CRASH("You passed [held_index] into swap_hand instead of a number. WTF man")
+
var/oindex = active_hand_index
active_hand_index = held_index
if(hud_used)
@@ -415,14 +418,6 @@
var/turf/target = get_turf(loc)
I.safe_throw_at(target,I.throw_range,I.throw_speed,src, force = move_force)
-/mob/living/carbon/get_status_tab_items()
- . = ..()
- var/obj/item/organ/alien/plasmavessel/vessel = getorgan(/obj/item/organ/alien/plasmavessel)
- if(vessel)
- . += "Plasma Stored: [vessel.storedPlasma]/[vessel.max_plasma]"
- if(locate(/obj/item/assembly/health) in src)
- . += "Health: [health]"
-
/mob/living/carbon/get_proc_holders()
. = ..()
. += add_abilities_to_panel()
diff --git a/code/modules/mob/living/carbon/human/consistent_human.dm b/code/modules/mob/living/carbon/human/consistent_human.dm
index cecfe74b7cc8..e63adffeee48 100644
--- a/code/modules/mob/living/carbon/human/consistent_human.dm
+++ b/code/modules/mob/living/carbon/human/consistent_human.dm
@@ -2,7 +2,7 @@
create_dna()
return //No randomisation
-/mob/living/carbon/human/dummy/consistent/proc/seeded_randomization(seed = 0)
+/mob/living/carbon/human/dummy/consistent/proc/seeded_randomization(seed = 0, species_list = null)
seed = md5(seed)
gender = list(MALE, FEMALE)[hex2num(copytext(seed, 1, 2)) % 2 + 1]
@@ -38,5 +38,8 @@
dna.features["ipc_chassis"] = GLOB.ipc_chassis_list[hex2num(copytext(seed, 18, 19)) % length(GLOB.ipc_chassis_list) + 1]
dna.features["ipc_screen"] = GLOB.ipc_screens_list[hex2num(copytext(seed, 19, 20)) % length(GLOB.ipc_screens_list) + 1]
- var/species_id = GLOB.roundstart_races[hex2num(copytext(seed, 3, 4)) % length(GLOB.roundstart_races) + 1]
- set_species(GLOB.species_list[species_id])
+ if(!species_list)
+ species_list = GLOB.species_list
+
+ var/species = species_list[hex2num(copytext(seed, 3, 4)) % length(species_list) + 1]
+ set_species(species)
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index 4bfe35b47060..cd80b13bcda6 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -61,7 +61,8 @@
. = ..()
. += "Intent: [a_intent]"
. += "Move Mode: [m_intent]"
- if (internal)
+
+ if (internal) //TODO: Refactor this to use the signal on tanks
if (!internal.air_contents)
qdel(internal)
else
@@ -69,32 +70,6 @@
. += "Internal Atmosphere Info: [internal.name]"
. += "Tank Pressure: [internal.air_contents.return_pressure()]"
. += "Distribution Pressure: [internal.distribute_pressure]"
- /*WS begin - no cells in suits
- if(istype(wear_suit, /obj/item/clothing/suit/space))
- var/obj/item/clothing/suit/space/S = wear_suit
- . += "Thermal Regulator: [S.thermal_on ? "on" : "off"]"
- . += "Cell Charge: [S.cell ? "[round(S.cell.percent(), 0.1)]%" : "!invalid!"]"
- */
- var/mob/living/simple_animal/borer/B = has_brain_worms() //WS Begin - Borers
- if(B && B.controlling)
- . += "Borer Body Health: [B.health]"
- . += "Chemicals: [B.chemicals]" //WS End
-
- if(mind)
- var/datum/antagonist/changeling/changeling = mind.has_antag_datum(/datum/antagonist/changeling)
- if(changeling)
- . += ""
- . += "Chemical Storage: [changeling.chem_charges]/[changeling.chem_storage]"
- . += "Absorbed DNA: [changeling.absorbedcount]"
-
- //WS Begin - Display Ethereal Charge
- if(istype(src))
- var/datum/species/ethereal/eth_species = src.dna?.species
- if(istype(eth_species))
- var/obj/item/organ/stomach/ethereal/stomach = src.getorganslot(ORGAN_SLOT_STOMACH)
- if(istype(stomach))
- . += "Crystal Charge: [round((stomach.crystal_charge / ETHEREAL_CHARGE_SCALING_MULTIPLIER), 0.1)]%"
- //WS End
//NINJACODE
if(istype(wear_suit, /obj/item/clothing/suit/space/space_ninja)) //Only display if actually a ninja.
diff --git a/code/modules/mob/living/carbon/human/human_say.dm b/code/modules/mob/living/carbon/human/human_say.dm
index 551e60501940..039141bb5fd5 100644
--- a/code/modules/mob/living/carbon/human/human_say.dm
+++ b/code/modules/mob/living/carbon/human/human_say.dm
@@ -16,6 +16,14 @@
return idcard.registered_name
else
return real_name
+ if(istype(wear_mask, /obj/item/clothing/mask/gas/syndicate/voicechanger))
+ var/obj/item/clothing/mask/gas/syndicate/voicechanger/V = wear_mask
+ if(V.voice_change && wear_id)
+ var/obj/item/card/id/idcard = wear_id.GetID()
+ if(istype(idcard))
+ return idcard.registered_name
+ else
+ return real_name
else
return real_name
if(istype(wear_mask, /obj/item/clothing/mask/infiltrator))
diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm
index 0317631206bc..756af00f1839 100644
--- a/code/modules/mob/living/carbon/human/inventory.dm
+++ b/code/modules/mob/living/carbon/human/inventory.dm
@@ -284,10 +284,6 @@
/mob/living/carbon/human/head_update(obj/item/I, forced)
if((I.flags_inv & (HIDEHAIR|HIDEFACIALHAIR)) || forced)
update_hair()
- else
- var/obj/item/clothing/C = I
- if(istype(C) && C.dynamic_hair_suffix)
- update_hair()
if(I.flags_inv & HIDEEYES || forced)
update_inv_glasses()
if(I.flags_inv & HIDEEARS || forced)
diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm
index bbe40388435a..eda9c8c3db64 100644
--- a/code/modules/mob/living/carbon/human/species.dm
+++ b/code/modules/mob/living/carbon/human/species.dm
@@ -268,6 +268,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
qdel(S)
if(!GLOB.roundstart_races.len)
GLOB.roundstart_races += "human"
+ sortList(GLOB.roundstart_races)
/**
* Checks if a species is eligible to be picked at roundstart.
@@ -559,9 +560,6 @@ GLOBAL_LIST_EMPTY(roundstart_races)
var/hair_hidden = FALSE //ignored if the matching dynamic_X_suffix is non-empty
var/facialhair_hidden = FALSE // ^
- var/dynamic_hair_suffix = "" //if this is non-null, and hair+suffix matches an iconstate, then we render that hair instead
- var/dynamic_fhair_suffix = ""
-
//for augmented heads
if(!IS_ORGANIC_LIMB(HD))
return
@@ -569,41 +567,19 @@ GLOBAL_LIST_EMPTY(roundstart_races)
//we check if our hat or helmet hides our facial hair.
if(H.head)
var/obj/item/I = H.head
- if(isclothing(I))
- var/obj/item/clothing/C = I
- dynamic_fhair_suffix = C.dynamic_fhair_suffix
if(I.flags_inv & HIDEFACIALHAIR)
facialhair_hidden = TRUE
if(H.wear_mask)
var/obj/item/I = H.wear_mask
- if(isclothing(I))
- var/obj/item/clothing/C = I
- dynamic_fhair_suffix = C.dynamic_fhair_suffix //mask > head in terms of facial hair
if(I.flags_inv & HIDEFACIALHAIR)
facialhair_hidden = TRUE
- if(H.facial_hairstyle && (FACEHAIR in species_traits) && (!facialhair_hidden || dynamic_fhair_suffix))
+ if(H.facial_hairstyle && (FACEHAIR in species_traits) && !facialhair_hidden)
S = GLOB.facial_hairstyles_list[H.facial_hairstyle]
if(S)
- //List of all valid dynamic_fhair_suffixes
- var/static/list/fextensions
- if(!fextensions)
- var/icon/fhair_extensions = icon('icons/mob/facialhair_extensions.dmi')
- fextensions = list()
- for(var/s in fhair_extensions.IconStates(1))
- fextensions[s] = TRUE
- qdel(fhair_extensions)
-
- //Is hair+dynamic_fhair_suffix a valid iconstate?
- var/fhair_state = S.icon_state
- var/fhair_file = S.icon
- if(fextensions[fhair_state+dynamic_fhair_suffix])
- fhair_state += dynamic_fhair_suffix
- fhair_file = 'icons/mob/facialhair_extensions.dmi'
-
- var/mutable_appearance/facial_overlay = mutable_appearance(fhair_file, fhair_state, -HAIR_LAYER)
+ var/mutable_appearance/facial_overlay = mutable_appearance(S.icon, S.icon_state, -HAIR_LAYER)
if(!forced_colour)
if(hair_color)
@@ -624,21 +600,15 @@ GLOBAL_LIST_EMPTY(roundstart_races)
if(H.head)
var/obj/item/I = H.head
- if(isclothing(I))
- var/obj/item/clothing/C = I
- dynamic_hair_suffix = C.dynamic_hair_suffix
if(I.flags_inv & HIDEHAIR)
hair_hidden = TRUE
if(H.wear_mask)
var/obj/item/I = H.wear_mask
- if(!dynamic_hair_suffix && isclothing(I)) //head > mask in terms of head hair
- var/obj/item/clothing/C = I
- dynamic_hair_suffix = C.dynamic_hair_suffix
if(I.flags_inv & HIDEHAIR)
hair_hidden = TRUE
- if(!hair_hidden || dynamic_hair_suffix)
+ if(!hair_hidden)
var/mutable_appearance/hair_overlay = mutable_appearance(layer = -HAIR_LAYER)
var/mutable_appearance/gradient_overlay = mutable_appearance(layer = -HAIR_LAYER)
if(!hair_hidden && !H.getorgan(/obj/item/organ/brain)) //Applies the debrained overlay if there is no brain
@@ -650,21 +620,8 @@ GLOBAL_LIST_EMPTY(roundstart_races)
S = GLOB.hairstyles_list[H.hairstyle]
if(S)
- //List of all valid dynamic_hair_suffixes
- var/static/list/extensions
- if(!extensions)
- var/icon/hair_extensions = icon('icons/mob/hair_extensions.dmi') //hehe
- extensions = list()
- for(var/s in hair_extensions.IconStates(1))
- extensions[s] = TRUE
- qdel(hair_extensions)
-
- //Is hair+dynamic_hair_suffix a valid iconstate?
var/hair_state = S.icon_state
var/hair_file = S.icon
- if(extensions[hair_state+dynamic_hair_suffix])
- hair_state += dynamic_hair_suffix
- hair_file = 'icons/mob/hair_extensions.dmi'
hair_overlay.icon = hair_file
hair_overlay.icon_state = hair_state
@@ -852,7 +809,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
bodyparts_to_add -= "face_markings"
if("horns" in mutant_bodyparts)
- if(!H.dna.features["horns"] || H.dna.features["horns"] == "None" || H.head && (H.head.flags_inv & HIDEHAIR) || (H.wear_mask && (H.wear_mask.flags_inv & HIDEHAIR)) || !HD)
+ if(!H.dna.features["horns"] || H.dna.features["horns"] == "None" || H.head && (H.head.flags_inv & HIDEHORNS) || (H.wear_mask && (H.wear_mask.flags_inv & HIDEHORNS)) || !HD)
bodyparts_to_add -= "horns"
if("frills" in mutant_bodyparts)
@@ -970,6 +927,8 @@ GLOBAL_LIST_EMPTY(roundstart_races)
S = GLOB.ipc_screens_list[H.dna.features["ipc_screen"]]
if("ipc_antenna")
S = GLOB.ipc_antennas_list[H.dna.features["ipc_antenna"]]
+ if("ipc_tail")
+ S = GLOB.ipc_tail_list[H.dna.features["ipc_tail"]]
if("ipc_chassis")
S = GLOB.ipc_chassis_list[H.dna.features["ipc_chassis"]]
if("ipc_brain")
diff --git a/code/modules/mob/living/carbon/human/species_types/IPC.dm b/code/modules/mob/living/carbon/human/species_types/IPC.dm
index dfa12f329054..381708757fd1 100644
--- a/code/modules/mob/living/carbon/human/species_types/IPC.dm
+++ b/code/modules/mob/living/carbon/human/species_types/IPC.dm
@@ -17,8 +17,8 @@
mutantlungs = null //no more collecting change for you
mutantappendix = null
mutant_organs = list(/obj/item/organ/cyberimp/arm/power_cord)
- mutant_bodyparts = list("ipc_screen", "ipc_antenna", "ipc_chassis", "ipc_brain")
- default_features = list("mcolor" = "#7D7D7D", "ipc_screen" = "Static", "ipc_antenna" = "None", "ipc_chassis" = "Morpheus Cyberkinetics (Custom)", "ipc_brain" = "Posibrain", "body_size" = "Normal")
+ mutant_bodyparts = list("ipc_screen", "ipc_antenna", "ipc_chassis", "ipc_tail", "ipc_brain")
+ default_features = list("mcolor" = "#7D7D7D", "ipc_screen" = "Static", "ipc_antenna" = "None", "ipc_chassis" = "Morpheus Cyberkinetics (Custom)", "ipc_tail" = "None", "ipc_brain" = "Posibrain", "body_size" = "Normal")
meat = /obj/item/stack/sheet/plasteel{amount = 5}
skinned_type = /obj/item/stack/sheet/metal{amount = 10}
exotic_bloodtype = "Coolant"
@@ -49,13 +49,14 @@
/// The last screen used when the IPC died.
var/saved_screen
var/datum/action/innate/change_screen/change_screen
+ var/has_screen = TRUE //do we have a screen. Used to determine if we mess with the screen or not
/datum/species/ipc/random_name(unique)
var/ipc_name = "[pick(GLOB.posibrain_names)]-[rand(100, 999)]"
return ipc_name
/datum/species/ipc/New()
- . = ..()
+
// This is in new because "[HEAD_LAYER]" etc. is NOT a constant compile-time value. For some reason.
// Why not just use HEAD_LAYER? Well, because HEAD_LAYER is a number, and if you try to use numbers as indexes,
// BYOND will try to make it an ordered list. So, we have to use a string. This is annoying, but it's the only way to do it smoothly.
@@ -64,17 +65,19 @@
)
/datum/species/ipc/on_species_gain(mob/living/carbon/C, datum/species/old_species, pref_load) // Let's make that IPC actually robotic.
+ . = ..()
if(ishuman(C))
var/mob/living/carbon/human/H = C
if(!change_screen)
- change_screen = new
- change_screen.Grant(H)
+ var/datum/species/ipc/species_datum = H.dna.species
+ if(species_datum?.has_screen)
+ change_screen = new
+ change_screen.Grant(H)
if(H.dna.features["ipc_brain"] == "Man-Machine Interface")
mutantbrain = /obj/item/organ/brain/mmi_holder
else
mutantbrain = /obj/item/organ/brain/mmi_holder/posibrain
C.RegisterSignal(C, COMSIG_PROCESS_BORGCHARGER_OCCUPANT, TYPE_PROC_REF(/mob/living/carbon, charge))
- return ..()
/datum/species/ipc/on_species_loss(mob/living/carbon/C)
. = ..()
@@ -83,6 +86,8 @@
C.UnregisterSignal(C, COMSIG_PROCESS_BORGCHARGER_OCCUPANT)
/datum/species/ipc/spec_death(gibbed, mob/living/carbon/C)
+ if(!has_screen)
+ return
saved_screen = C.dna.features["ipc_screen"]
C.dna.features["ipc_screen"] = "BSOD"
C.update_body()
@@ -91,6 +96,8 @@
/datum/species/ipc/proc/post_death(mob/living/carbon/C)
if(C.stat < DEAD)
return
+ if(!has_screen)
+ return
C.dna.features["ipc_screen"] = null // Turns off their monitor on death.
C.update_body()
@@ -110,6 +117,11 @@
if(!ishuman(owner))
return
var/mob/living/carbon/human/H = owner
+ var/datum/species/ipc/species_datum = H.dna.species
+ if(!species_datum)
+ return
+ if(!species_datum.has_screen)
+ return
H.dna.features["ipc_screen"] = screen_choice
H.eye_color = sanitize_hexcolor(color_choice)
H.update_body()
@@ -215,14 +227,17 @@
/datum/species/ipc/spec_revival(mob/living/carbon/human/H)
- H.dna.features["ipc_screen"] = "BSOD"
- H.update_body()
+ if(has_screen)
+ H.dna.features["ipc_screen"] = "BSOD"
+ H.update_body()
H.say("Reactivating [pick("core systems", "central subroutines", "key functions")]...")
addtimer(CALLBACK(src, PROC_REF(post_revival), H), 6 SECONDS)
/datum/species/ipc/proc/post_revival(mob/living/carbon/human/H)
if(H.stat == DEAD)
return
+ if(!has_screen)
+ return
H.dna.features["ipc_screen"] = saved_screen
H.update_body()
@@ -231,12 +246,39 @@
var/datum/sprite_accessory/ipc_chassis/chassis_of_choice = GLOB.ipc_chassis_list[C.dna.features["ipc_chassis"]]
+ if(chassis_of_choice.use_eyes)
+ LAZYREMOVE(species_traits, NOEYESPRITES)
+ LAZYADD(species_traits, EYECOLOR)
+ C.update_body()
+
+ if(!chassis_of_choice.has_screen)
+ has_screen = FALSE
+ C.dna.features["ipc_screen"] = null
+ C.update_body()
+
+ if(chassis_of_choice.is_digi)
+ digitigrade_customization = DIGITIGRADE_FORCED
+ bodytype = BODYTYPE_DIGITIGRADE
+
for(var/obj/item/bodypart/BP as anything in C.bodyparts) //Override bodypart data as necessary
if(BP.limb_id=="synth")
BP.uses_mutcolor = chassis_of_choice.color_src ? TRUE : FALSE
+
+ if(chassis_of_choice.icon)
+ BP.static_icon = chassis_of_choice.icon
+ BP.icon = chassis_of_choice.icon
+
+ if(chassis_of_choice.has_overlay)
+ BP.overlay_icon_state = TRUE
+
+ if(chassis_of_choice.is_digi)
+ if(istype(BP,/obj/item/bodypart/leg))
+ BP.bodytype = BODYTYPE_HUMANOID | BODYTYPE_ROBOTIC | BODYTYPE_DIGITIGRADE //i hate this so much
+
if(BP.uses_mutcolor)
BP.should_draw_greyscale = TRUE
BP.species_color = C.dna?.features["mcolor"]
+ BP.species_secondary_color = C.dna?.features["mcolor2"]
BP.limb_id = chassis_of_choice.limbs_id
BP.name = "\improper[chassis_of_choice.name] [parse_zone(BP.body_zone)]"
diff --git a/code/modules/mob/living/carbon/human/species_types/spider.dm b/code/modules/mob/living/carbon/human/species_types/spider.dm
index e93ef5baaead..847d6ad74f3f 100644
--- a/code/modules/mob/living/carbon/human/species_types/spider.dm
+++ b/code/modules/mob/living/carbon/human/species_types/spider.dm
@@ -185,7 +185,6 @@ GLOBAL_LIST_INIT(spider_last, world.file2list("strings/names/spider_last.txt"))
if (H.nutrition >= nutrition_threshold)
to_chat(H, "You pull out a strand from your spinneret, ready to wrap a target. ")
- H.adjust_nutrition(E.spinner_rate * -0.5)
addtimer(VARSET_CALLBACK(E, web_ready, TRUE), E.web_cooldown)
RegisterSignal(H, list(COMSIG_MOB_MIDDLECLICKON, COMSIG_MOB_ALTCLICKON), PROC_REF(cocoonAtom))
return
@@ -217,7 +216,7 @@ GLOBAL_LIST_INIT(spider_last, world.file2list("strings/names/spider_last.txt"))
if(!do_after(H, 10 SECONDS, 1, A))
to_chat(H, "Your web spinning was interrupted! ")
return
- H.adjust_nutrition(E.spinner_rate * -3)
+ H.adjust_nutrition(E.spinner_rate * -3.5)
var/obj/structure/spider_player/cocoon/C = new(A.loc)
if(isliving(A))
C.icon_state = pick("cocoon_large1","cocoon_large2","cocoon_large3")
diff --git a/code/modules/mob/living/carbon/human/species_types/vampire.dm b/code/modules/mob/living/carbon/human/species_types/vampire.dm
index ebc923c01075..070894a92bee 100644
--- a/code/modules/mob/living/carbon/human/species_types/vampire.dm
+++ b/code/modules/mob/living/carbon/human/species_types/vampire.dm
@@ -132,3 +132,15 @@
charge_max = 50
cooldown_min = 50
shapeshift_type = /mob/living/simple_animal/hostile/retaliate/bat
+
+/obj/item/organ/internal/heart/vampire/Insert(mob/living/carbon/receiver, special, drop_if_replaced)
+ . = ..()
+ RegisterSignal(receiver, COMSIG_MOB_GET_STATUS_TAB_ITEMS, PROC_REF(get_status_tab_item))
+
+/obj/item/organ/internal/heart/vampire/Remove(mob/living/carbon/heartless, special)
+ . = ..()
+ UnregisterSignal(heartless, COMSIG_MOB_GET_STATUS_TAB_ITEMS)
+
+/obj/item/organ/internal/heart/vampire/proc/get_status_tab_item(mob/living/carbon/source, list/items)
+ SIGNAL_HANDLER
+ items += "Blood Level: [source.blood_volume]/[BLOOD_VOLUME_MAXIMUM]"
diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm
index be79cf7184ab..405cda36580c 100644
--- a/code/modules/mob/living/silicon/pai/pai.dm
+++ b/code/modules/mob/living/silicon/pai/pai.dm
@@ -67,7 +67,7 @@
var/can_receive = TRUE
var/obj/item/card/id/access_card = null
var/chassis = "repairbot"
- var/list/possible_chassis = list("cat" = TRUE, "mouse" = TRUE, "monkey" = TRUE, "corgi" = FALSE, "fox" = FALSE, "repairbot" = TRUE, "rabbit" = TRUE, "bat" = FALSE, "butterfly" = FALSE, "hawk" = FALSE, "lizard" = FALSE, "duffel" = TRUE, "snake" = FALSE) //assoc value is whether it can be picked up.
+ var/list/possible_chassis = list("bat" = TRUE, "butterfly" = TRUE, "carp" = TRUE, "cat" = TRUE, "corgi" = TRUE, "corgi_puppy" = TRUE, "crow" = TRUE, "duffel" = TRUE, "fox" = TRUE, "frog" = TRUE, "hawk" = TRUE, "lizard" = TRUE, "monkey" = TRUE, "mothroach" = TRUE, "mouse" = TRUE, "rabbit" = TRUE, "repairbot" = TRUE, "snake" = TRUE, "spider" = TRUE) //assoc value is whether it can be picked up.
var/emitterhealth = 20
var/emittermaxhealth = 20
diff --git a/code/modules/mob/living/silicon/pai/pai_shell.dm b/code/modules/mob/living/silicon/pai/pai_shell.dm
index ca65a416691c..31a807b319b2 100644
--- a/code/modules/mob/living/silicon/pai/pai_shell.dm
+++ b/code/modules/mob/living/silicon/pai/pai_shell.dm
@@ -72,11 +72,18 @@
holoform = FALSE
set_resting(resting)
+
+//Sets a new holochassis skin based on a pAI's choice
+
/mob/living/silicon/pai/proc/choose_chassis()
- if(!isturf(loc) && loc != card)
- to_chat(src, "You can not change your holochassis composite while not on the ground or in your card! ")
- return FALSE
- var/choice = input(src, "What would you like to use for your holochassis composite?") as null|anything in sortList(possible_chassis)
+ var/list/skins = list()
+ for(var/holochassis_option in possible_chassis)
+ var/image/item_image = image(icon = src.icon, icon_state = holochassis_option)
+ skins += list("[holochassis_option]" = item_image)
+ sortList(skins)
+
+ var/atom/anchor = get_atom_on_turf(src)
+ var/choice = show_radial_menu(src, anchor, skins, custom_check = CALLBACK(src, PROC_REF(check_menu), anchor), radius = 40, require_near = TRUE)
if(!choice)
return FALSE
chassis = choice
@@ -85,6 +92,18 @@
update_resting()
to_chat(src, "You switch your holochassis projection composite to [chassis]. ")
+//Checks if we are allowed to interact with a radial menu
+
+/mob/living/silicon/pai/proc/check_menu(atom/anchor)
+ if(incapacitated())
+ return FALSE
+ if(get_turf(src) != get_turf(anchor))
+ return FALSE
+ if(!isturf(loc) && loc != card)
+ to_chat(src, "You can not change your holochassis composite while not on the ground or in your card! ")
+ return FALSE
+ return TRUE
+
/mob/living/silicon/pai/update_resting()
. = ..()
if(resting)
diff --git a/code/modules/mob/living/silicon/pai/software.dm b/code/modules/mob/living/silicon/pai/software.dm
index a099c05488fa..08e41f3bee44 100644
--- a/code/modules/mob/living/silicon/pai/software.dm
+++ b/code/modules/mob/living/silicon/pai/software.dm
@@ -29,7 +29,7 @@ GLOBAL_LIST_INIT(pai_faces, list(
"laugh",
"lenny",
"loss",
- "michevious",
+ "mischievous",
"missingno",
"mistake",
"moth",
@@ -53,6 +53,60 @@ GLOBAL_LIST_INIT(pai_faces, list(
"woozy",
))
+// I AM A FAKE AND A FRAUD
+// in order to get radials to work, the below list utilizes an entirely new .dmi that combines the base pAI card sprite along with the two overlays.
+// if you want to add a pAI screen in future, you will need to use one of the two bases I included in aicardsradial.dmi in addition to adding the
+// screen sprite in aicards.dmi
+// I pray to god someone more talented than me can fix this hack in future
+
+GLOBAL_LIST_INIT(pai_faces_icons, list(
+ ":>" = image(icon = 'icons/obj/aicardsradial.dmi', icon_state = "pai-:>"),
+ "=_=" = image(icon = 'icons/obj/aicardsradial.dmi', icon_state = "pai-=_="),
+ "angry" = image(icon = 'icons/obj/aicardsradial.dmi', icon_state = "pai-angry"),
+ "ashamed" = image(icon = 'icons/obj/aicardsradial.dmi', icon_state = "pai-ashamed"),
+ "bookworm" = image(icon = 'icons/obj/aicardsradial.dmi', icon_state = "pai-bookworm"),
+ "boykisser" = image(icon = 'icons/obj/aicardsradial.dmi', icon_state = "pai-boykisser"),
+ "cat" = image(icon = 'icons/obj/aicardsradial.dmi', icon_state = "pai-cat"),
+ "clueless" = image(icon = 'icons/obj/aicardsradial.dmi', icon_state = "pai-clueless"),
+ "concerned" = image(icon = 'icons/obj/aicardsradial.dmi', icon_state = "pai-concerned"),
+ "dread" = image(icon = 'icons/obj/aicardsradial.dmi', icon_state = "pai-dread"),
+ "estatic" = image(icon = 'icons/obj/aicardsradial.dmi', icon_state = "pai-estatic"),
+ "exclaim" = image(icon = 'icons/obj/aicardsradial.dmi', icon_state = "pai-exclaim"),
+ "eye" = image(icon = 'icons/obj/aicardsradial.dmi', icon_state = "pai-eye"),
+ "eyewall" = image(icon = 'icons/obj/aicardsradial.dmi', icon_state = "pai-eyewall"),
+ "face" = image(icon = 'icons/obj/aicardsradial.dmi', icon_state = "pai-face"),
+ "fangs" = image(icon = 'icons/obj/aicardsradial.dmi', icon_state = "pai-fangs"),
+ "flushed" = image(icon = 'icons/obj/aicardsradial.dmi', icon_state = "pai-flushed"),
+ "foureyes" = image(icon = 'icons/obj/aicardsradial.dmi', icon_state = "pai-foureyes"),
+ "greenjary" = image(icon = 'icons/obj/aicardsradial.dmi', icon_state = "pai-greenjary"),
+ "happy" = image(icon = 'icons/obj/aicardsradial.dmi', icon_state = "pai-happy"),
+ "heart" = image(icon = 'icons/obj/aicardsradial.dmi', icon_state = "pai-heart"),
+ "laugh" = image(icon = 'icons/obj/aicardsradial.dmi', icon_state = "pai-laugh"),
+ "lenny" = image(icon = 'icons/obj/aicardsradial.dmi', icon_state = "pai-lenny"),
+ "loss" = image(icon = 'icons/obj/aicardsradial.dmi', icon_state = "pai-loss"),
+ "mischievous" = image(icon = 'icons/obj/aicardsradial.dmi', icon_state = "pai-mischievous"),
+ "missingno" = image(icon = 'icons/obj/aicardsradial.dmi', icon_state = "pai-missingno"),
+ "mistake" = image(icon = 'icons/obj/aicardsradial.dmi', icon_state = "pai-mistake"),
+ "moth" = image(icon = 'icons/obj/aicardsradial.dmi', icon_state = "pai-moth"),
+ "moyai" = image(icon = 'icons/obj/aicardsradial.dmi', icon_state = "pai-moyai"),
+ "neko" = image(icon = 'icons/obj/aicardsradial.dmi', icon_state = "pai-neko"),
+ "null" = image(icon = 'icons/obj/aicardsradial.dmi', icon_state = "pai-null"),
+ "o.o" = image(icon = 'icons/obj/aicardsradial.dmi', icon_state = "pai-o.o"),
+ "off" = image(icon = 'icons/obj/aicardsradial.dmi', icon_state = "pai-off"),
+ "pleading" = image(icon = 'icons/obj/aicardsradial.dmi', icon_state = "pai-pleading"),
+ "question" = image(icon = 'icons/obj/aicardsradial.dmi', icon_state = "pai-question"),
+ "sadcat" = image(icon = 'icons/obj/aicardsradial.dmi', icon_state = "pai-sadcat"),
+ "smug" = image(icon = 'icons/obj/aicardsradial.dmi', icon_state = "pai-smug"),
+ "snek" = image(icon = 'icons/obj/aicardsradial.dmi', icon_state = "pai-snek"),
+ "spiral" = image(icon = 'icons/obj/aicardsradial.dmi', icon_state = "pai-spiral"),
+ "sunglasses" = image(icon = 'icons/obj/aicardsradial.dmi', icon_state = "pai-sunglasses"),
+ "syndisnake" = image(icon = 'icons/obj/aicardsradial.dmi', icon_state = "pai-syndisnake"), //what if cybersun was right all along actually
+ "twoeyes" = image(icon = 'icons/obj/aicardsradial.dmi', icon_state = "pai-twoeyes"),
+ "T_T" = image(icon = 'icons/obj/aicardsradial.dmi', icon_state = "pai-T_T"),
+ "what" = image(icon = 'icons/obj/aicardsradial.dmi', icon_state = "pai-what"),
+ "wink" = image(icon = 'icons/obj/aicardsradial.dmi', icon_state = "pai-wink"),
+ "woozy" = image(icon = 'icons/obj/aicardsradial.dmi', icon_state = "pai-woozy"),
+ ))
/mob/living/silicon/pai/var/list/available_software = list( //WS -- idk what to do about removing code so i'm just putting this note here to say, removes messanger and manifest, thet get it for free now
//Nightvision
@@ -204,7 +258,8 @@ GLOBAL_LIST_INIT(pai_faces, list(
radio.attack_self(src)
if("image") // Set pAI card display face
- var/new_emotion = input("Select your new display image.", "Display Image", "null") in sortList(GLOB.pai_faces)
+ var/atom/anchor = get_atom_on_turf(src)
+ var/new_emotion = show_radial_menu(usr, anchor, GLOB.pai_faces_icons, radius = 40, require_near = TRUE)
card.set_emotion(new_emotion)
if("news")
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 44bfe5626754..4164844c0d8e 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -323,7 +323,6 @@
/mob/living/silicon/robot/get_status_tab_items()
. = ..()
- . += ""
if(cell)
. += "Charge Left: [cell.charge]/[cell.maxcharge]"
else
diff --git a/code/modules/mob/living/simple_animal/corpse.dm b/code/modules/mob/living/simple_animal/corpse.dm
index daac95f38ba4..aa49c6e52b59 100644
--- a/code/modules/mob/living/simple_animal/corpse.dm
+++ b/code/modules/mob/living/simple_animal/corpse.dm
@@ -167,9 +167,10 @@
back = /obj/item/minigunpack
/obj/effect/mob_spawn/human/corpse/frontier/ranged/trooper/heavy/gunless
- outfit = /datum/outfit/russiancorpse/trooper/heavy/gunless
+ outfit = /datum/outfit/frontier/trooper/heavy/gunless
-/datum/outfit/russiancorpse/trooper/heavy/gunless
+/datum/outfit/frontier/trooper/heavy/gunless
+ name = "Frontiersman Heavy Corpse (Gunless)"
back = null
/obj/effect/mob_spawn/human/corpse/wizard
@@ -248,18 +249,5 @@
/obj/effect/mob_spawn/human/corpse/solgov/sonnensoldner
name = "SolGov Sonnensoldner"
id_job = "SolGov Sonnensoldner"
- outfit = /datum/outfit/solgov/sonnensoldner
+ outfit = /datum/outfit/job/solgov/sonnensoldner
id_access_list = list(ACCESS_SOLGOV)
-
-/datum/outfit/solgov/sonnensoldner
- name = "SolGov Sonnensoldner"
- uniform = /obj/item/clothing/under/solgov
- suit = /obj/item/clothing/suit/armor/vest/bulletproof/solgov
- shoes = /obj/item/clothing/shoes/jackboots
- gloves = /obj/item/clothing/gloves/color/black
- ears = /obj/item/radio/headset
- suit_store = null
- head = /obj/item/clothing/head/solgov/sonnensoldner
- back = /obj/item/storage/backpack
- id = /obj/item/card/id/solgov
- backpack_contents = null
diff --git a/code/modules/mob/living/simple_animal/hostile/frontiersman.dm b/code/modules/mob/living/simple_animal/hostile/frontiersman.dm
index 1a71ed52da78..3d33bae0aca1 100644
--- a/code/modules/mob/living/simple_animal/hostile/frontiersman.dm
+++ b/code/modules/mob/living/simple_animal/hostile/frontiersman.dm
@@ -34,12 +34,12 @@
icon_state = "frontiersmanranged"
icon_living = "frontiersmanranged"
loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged,
- /obj/item/gun/ballistic/revolver/nagant)
+ /obj/item/gun/ballistic/revolver)
ranged = 1
retreat_distance = 5
minimum_distance = 5
projectilesound = 'sound/weapons/gun/revolver/shot.ogg'
- casingtype = /obj/item/ammo_casing/n762_38
+ casingtype = /obj/item/ammo_casing/a357
/mob/living/simple_animal/hostile/frontier/ranged/neutered
loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged)
@@ -48,8 +48,8 @@
icon_state = "frontiersmanrangedrifle"
icon_living = "frontiersmanrangedrifle"
loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged,
- /obj/item/gun/ballistic/rifle/boltaction)
- casingtype = /obj/item/ammo_casing/a762_54
+ /obj/item/gun/ballistic/rifle/illestren)
+ casingtype = /obj/item/ammo_casing/a8_50r
projectilesound = 'sound/weapons/gun/rifle/mosin.ogg'
/mob/living/simple_animal/hostile/frontier/ranged/mosin/neutered
@@ -63,7 +63,7 @@
projectilesound = 'sound/weapons/gun/shotgun/shot.ogg'
casingtype = /obj/item/ammo_casing/shotgun/buckshot
loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged/trooper,
- /obj/item/gun/ballistic/shotgun/lethal)
+ /obj/item/gun/ballistic/shotgun/brimstone)
/mob/living/simple_animal/hostile/frontier/ranged/trooper/neutered
loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged/trooper)
@@ -86,8 +86,8 @@
icon_living = "frontiersmanrangedmosin"
loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged/trooper,
- /obj/item/gun/ballistic/rifle/boltaction)
- casingtype = /obj/item/ammo_casing/a762_54
+ /obj/item/gun/ballistic/rifle/illestren)
+ casingtype = /obj/item/ammo_casing/a8_50r
projectilesound = 'sound/weapons/gun/rifle/mosin.ogg'
/mob/living/simple_animal/hostile/frontier/ranged/trooper/rifle/neutered
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm
index 087c538a8c3e..892fba0d61f8 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm
@@ -902,7 +902,7 @@
suit = /obj/item/clothing/suit/armor/roumain
head = /obj/item/clothing/head/cowboy/sec/roumain
if(prob(25))
- suit_store = /obj/item/gun/ballistic/shotgun/winchester
+ suit_store = /obj/item/gun/ballistic/shotgun/flamingarrow
r_pocket = /obj/item/book/manual/trickwines_4_brewers
belt = pick(list(/obj/item/kitchen/knife/hunting = 1, /obj/item/gun/ballistic/derringer = 1))
back = /obj/item/storage/backpack/cultpack
diff --git a/code/modules/mob/living/simple_animal/hostile/survivors.dm b/code/modules/mob/living/simple_animal/hostile/survivors.dm
index c0601050c54c..a1b52f981cec 100644
--- a/code/modules/mob/living/simple_animal/hostile/survivors.dm
+++ b/code/modules/mob/living/simple_animal/hostile/survivors.dm
@@ -324,7 +324,7 @@
suit_store = null
if (survivor_type == "hunter")
if(prob(20))
- new /obj/item/gun/ballistic/rifle/boltaction/polymer(loc)
+ new /obj/item/gun/ballistic/rifle/polymer(loc)
else
visible_message("The hunter's weapon shatters as they impact the ground! ")
suit_store = null
diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm
index d63c300e8ba6..bc22f78ae7a3 100644
--- a/code/modules/mob/living/simple_animal/parrot.dm
+++ b/code/modules/mob/living/simple_animal/parrot.dm
@@ -155,9 +155,7 @@
/mob/living/simple_animal/parrot/get_status_tab_items()
. = ..()
- . += ""
. += "Held Item: [held_item]"
- . += "Mode: [a_intent]"
/mob/living/simple_animal/parrot/Hear(message, atom/movable/speaker, message_langs, raw_message, radio_freq, list/spans, list/message_mods = list())
. = ..()
diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm
index c21a2a6f365d..e4ead25880f9 100644
--- a/code/modules/mob/living/simple_animal/simple_animal.dm
+++ b/code/modules/mob/living/simple_animal/simple_animal.dm
@@ -374,8 +374,8 @@
/mob/living/simple_animal/get_status_tab_items()
. = ..()
- . += ""
. += "Health: [round((health / maxHealth) * 100)]%"
+ . += "Intent: [a_intent]"
/mob/living/simple_animal/proc/drop_loot()
if(loot.len)
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index 9af72b034998..5a2e3731a703 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -843,7 +843,8 @@
/// Adds this list to the output to the stat browser
/mob/proc/get_status_tab_items()
- . = list()
+ . = list("") //we want to offset unique stuff from standard stuff
+ SEND_SIGNAL(src, COMSIG_MOB_GET_STATUS_TAB_ITEMS, .)
/// Gets all relevant proc holders for the browser statpenl
/mob/proc/get_proc_holders()
@@ -990,7 +991,7 @@
mob_spell_list -= S
qdel(S)
if(client)
- client << output(null, "statbrowser:check_spells")
+ client.stat_panel.send_message("check_spells")
///Return any anti magic atom on this mob that matches the magic type
/mob/proc/anti_magic_check(magic = TRUE, holy = FALSE, tinfoil = FALSE, chargecost = 1, self = FALSE)
diff --git a/code/modules/overmap/missions/acquire_mission.dm b/code/modules/overmap/missions/acquire_mission.dm
index 6ae295213496..de60174081db 100644
--- a/code/modules/overmap/missions/acquire_mission.dm
+++ b/code/modules/overmap/missions/acquire_mission.dm
@@ -72,7 +72,7 @@
name = "Diamond needed (urgent!!)"
weight = 3
value = 700
- duration = 20 MINUTES
+ duration = 40 MINUTES
dur_mod_range = 0.2
container_type = /obj/item/storage/box/true_love
objective_type = /obj/item/stack/sheet/mineral/diamond
@@ -115,7 +115,7 @@ Acquire: Anomaly
name = "Anomaly core requested"
weight = 8
value = 3000
- duration = 40 MINUTES
+ duration = 80 MINUTES
dur_mod_range = 0.2
container_type = /obj/item/storage/box/anomaly
objective_type = /obj/item/assembly/signaler/anomaly
@@ -149,7 +149,7 @@ Acquire: Anomaly
desc = "I require a live goliath for research purposes. Trap one within the given \
Lifeform Containment Unit and return it to me and you will be paid handsomely."
value = 1500
- duration = 30 MINUTES
+ duration = 60 MINUTES
weight = 6
container_type = /obj/structure/closet/mob_capture
objective_type = /mob/living/simple_animal/hostile/asteroid/goliath
diff --git a/code/modules/overmap/missions/research_mission.dm b/code/modules/overmap/missions/research_mission.dm
index 0e4996f7719d..a84b07b6529a 100644
--- a/code/modules/overmap/missions/research_mission.dm
+++ b/code/modules/overmap/missions/research_mission.dm
@@ -4,7 +4,7 @@
Please anchor the attached sensor array to your ship and fly it through the storms.\
It must be powered to collect the data. "
value = 3000 // base value, before adding bonus for number of things to fly through
- duration = 30 MINUTES
+ duration = 60 MINUTES
weight = 8
var/datum/overmap/objective_type = /datum/overmap/event/electric
diff --git a/code/modules/photography/photos/frame.dm b/code/modules/photography/photos/frame.dm
index 9b41f9f6236d..30b1cfcde3de 100644
--- a/code/modules/photography/photos/frame.dm
+++ b/code/modules/photography/photos/frame.dm
@@ -3,7 +3,7 @@
/obj/item/wallframe/picture
name = "picture frame"
desc = "The perfect showcase for your favorite deathtrap memories."
- icon = 'icons/obj/decals.dmi'
+ icon = 'icons/obj/structures/signs/sign.dmi'
custom_materials = list(/datum/material/wood = MINERAL_MATERIAL_AMOUNT * 0.5)
flags_1 = 0
icon_state = "frame-empty"
@@ -62,7 +62,7 @@
/obj/structure/sign/picture_frame
name = "picture frame"
desc = "Every time you look it makes you laugh."
- icon = 'icons/obj/decals.dmi'
+ icon = 'icons/obj/structures/signs/sign.dmi'
icon_state = "frame-empty"
var/obj/item/photo/framed
var/persistence_id
diff --git a/code/modules/projectiles/ammunition/_firing.dm b/code/modules/projectiles/ammunition/_firing.dm
index f8e1aa1dff1e..ee155db4e719 100644
--- a/code/modules/projectiles/ammunition/_firing.dm
+++ b/code/modules/projectiles/ammunition/_firing.dm
@@ -34,7 +34,8 @@
if (zone_override)
BB.def_zone = zone_override
else
- BB.def_zone = user.zone_selected
+ if(user)
+ BB.def_zone = user.zone_selected
BB.suppressed = quiet
if(isgun(fired_from))
@@ -66,6 +67,23 @@
BB = null
return TRUE
+#define BULLET_POP_CHANCE 30
+
+/obj/item/ammo_casing/fire_act(exposed_temperature, exposed_volume)
+ . = ..()
+ if(!prob(BULLET_POP_CHANCE) || !BB)
+ return
+ ready_proj()
+ BB.trajectory_ignore_forcemove = TRUE
+ BB.forceMove(get_turf(src))
+ BB.trajectory_ignore_forcemove = FALSE
+ BB.starting = get_turf(src)
+ BB.fire(rand(0,360))
+ BB = null
+ playsound(src, 'sound/weapons/gun/pistol/shot.ogg', 100, TRUE)
+ update_appearance()
+ return TRUE
+
/obj/item/ammo_casing/proc/spread(turf/target, turf/current, distro)
var/dx = abs(target.x - current.x)
var/dy = abs(target.y - current.y)
diff --git a/code/modules/projectiles/ammunition/ballistic/pistol.dm b/code/modules/projectiles/ammunition/ballistic/pistol.dm
index b9237ea91b4d..a105ae6602ee 100644
--- a/code/modules/projectiles/ammunition/ballistic/pistol.dm
+++ b/code/modules/projectiles/ammunition/ballistic/pistol.dm
@@ -76,7 +76,7 @@
bullet_skin = "rubber"
projectile_type = /obj/projectile/bullet/c9mm/rubber
-// .45 (M1911 + C20r)
+// .45 (Candor + C20r)
/obj/item/ammo_casing/c45
name = ".45 bullet casing"
diff --git a/code/modules/projectiles/ammunition/ballistic/revolver.dm b/code/modules/projectiles/ammunition/ballistic/revolver.dm
index 47ad1b7aba84..a15eac049667 100644
--- a/code/modules/projectiles/ammunition/ballistic/revolver.dm
+++ b/code/modules/projectiles/ammunition/ballistic/revolver.dm
@@ -4,6 +4,7 @@
name = ".357 bullet casing"
desc = "A .357 bullet casing."
caliber = ".357"
+ icon_state = "magnum-brass"
projectile_type = /obj/projectile/bullet/a357
/obj/item/ammo_casing/a357/match
@@ -15,14 +16,17 @@
/obj/item/ammo_casing/a357/hp
name = ".357 hollow point bullet casing"
desc = "A .357 hollow point bullet casing."
+ icon_state = "magnum-brass"
+ bullet_skin = "hollow"
projectile_type = /obj/projectile/bullet/a357/hp
-// .45-70 (Hunting Revolver, Contender)
+// .45-70 (Hunting Revolver, Beacon)
/obj/item/ammo_casing/a4570
name = ".45-70 bullet casing"
desc = "A .45-70 bullet casing."
caliber = ".45-70"
+ icon_state = "magnum-brass"
projectile_type = /obj/projectile/bullet/a4570
/obj/item/ammo_casing/a4570/match
@@ -42,15 +46,6 @@
desc = "A .45-70 explosive bullet casing."
projectile_type = /obj/projectile/bullet/a4570/explosive
-// 7.62x38mmR (Nagant Revolver)
-
-/obj/item/ammo_casing/n762_38
- name = "7.62x38mmR bullet casing"
- desc = "A 7.62x38mmR bullet casing."
- caliber = "7.62x38mmR"
- projectile_type = /obj/projectile/bullet/n762
-
-
// .38 Special (Colt Detective Special & Winchester)
/obj/item/ammo_casing/c38
diff --git a/code/modules/projectiles/ammunition/ballistic/rifle.dm b/code/modules/projectiles/ammunition/ballistic/rifle.dm
index 63c8340e99bd..a615fc97d2fa 100644
--- a/code/modules/projectiles/ammunition/ballistic/rifle.dm
+++ b/code/modules/projectiles/ammunition/ballistic/rifle.dm
@@ -1,11 +1,11 @@
-// 7.62x54mmR (Illestren Hunting Rifle)
+// 8x50mmR (Illestren Hunting Rifle)
-/obj/item/ammo_casing/a762_54
- name = "7.62x54mmR bullet casing"
- desc = "A 7.62x54mmR bullet casing."
+/obj/item/ammo_casing/a8_50r
+ name = "8x50mmR bullet casing"
+ desc = "A 8x50mmR bullet casing."
icon_state = "rifle-brass"
- caliber = "7.62x54mmR"
- projectile_type = /obj/projectile/bullet/a762_54
+ caliber = "8x50mmR"
+ projectile_type = /obj/projectile/bullet/a8_50r
// 8x58mm Caseless (SSG-669C)
@@ -21,7 +21,7 @@
/obj/item/ammo_casing/a300
name = ".300 Magnum bullet casing"
desc = "A .300 Magnum bullet casing."
- icon_state = "rifle-brass"
+ icon_state = "rifle-steel"
caliber = "a300"
projectile_type = /obj/projectile/bullet/a300
@@ -78,14 +78,14 @@
caliber = ".300 BLK"
projectile_type = /obj/projectile/bullet/aac_300blk
-//.308 Winchester (M514 EBR & CM-GAL-S)
+//.308 (M514 EBR & CM-GAL-S)
-/obj/item/ammo_casing/win308
- name = ".308 Winchester bullet casing"
- desc = "A .308 Winchester bullet casing."
- icon_state = "rifle-steel"
- caliber = ".308 Winchester"
- projectile_type = /obj/projectile/bullet/win308
+/obj/item/ammo_casing/a308
+ name = ".308 bullet casing"
+ desc = "A .308 bullet casing."
+ icon_state = "rifle-brass"
+ caliber = ".308"
+ projectile_type = /obj/projectile/bullet/a308
/obj/item/ammo_casing/caseless/c299
name = ".229 Eoehoma caseless bullet casing"
diff --git a/code/modules/projectiles/ammunition/energy/laser.dm b/code/modules/projectiles/ammunition/energy/laser.dm
index dd68cd2e5619..401fab165957 100644
--- a/code/modules/projectiles/ammunition/energy/laser.dm
+++ b/code/modules/projectiles/ammunition/energy/laser.dm
@@ -31,7 +31,7 @@
projectile_type = /obj/projectile/beam/laser/weak/negative_ap
e_cost = 799 //12 shots with a normal power cell, 25 with an upgraded
select_name = "kill"
- delay = 0.2 SECONDS
+ delay = 0.1 SECONDS
/obj/item/ammo_casing/energy/lasergun/old
projectile_type = /obj/projectile/beam/laser
diff --git a/code/modules/projectiles/ammunition/energy/stun.dm b/code/modules/projectiles/ammunition/energy/stun.dm
index c47a88b38830..917e1c8c8189 100644
--- a/code/modules/projectiles/ammunition/energy/stun.dm
+++ b/code/modules/projectiles/ammunition/energy/stun.dm
@@ -46,4 +46,4 @@
/obj/item/ammo_casing/energy/disabler/smg
projectile_type = /obj/projectile/beam/disabler/weak/negative_ap
e_cost = 330
- delay = 0.2 SECONDS
+ delay = 0.1 SECONDS
diff --git a/code/modules/projectiles/boxes_magazines/_box_magazine.dm b/code/modules/projectiles/boxes_magazines/_box_magazine.dm
index c3989e7a4952..6b04646697e2 100644
--- a/code/modules/projectiles/boxes_magazines/_box_magazine.dm
+++ b/code/modules/projectiles/boxes_magazines/_box_magazine.dm
@@ -94,14 +94,14 @@
if(istype(A, /obj/item/ammo_box))
var/obj/item/ammo_box/AM = A
for(var/obj/item/ammo_casing/AC in AM.stored_ammo)
- if(!((instant_load && AM.instant_load) || do_after_mob(user, list(AM), 1 SECONDS,)))
+ if(!((instant_load && AM.instant_load) || (stored_ammo.len >= max_ammo) || do_after_mob(user, list(AM), 1 SECONDS,)))
break
var/did_load = give_round(AC, replace_spent)
if(!did_load)
break
AM.stored_ammo -= AC
if(!silent)
- playsound(AM, 'sound/weapons/gun/general/mag_bullet_insert.ogg', 60, TRUE) //src is nullspaced, which means internal magazines won't properly play sound, thus we use AM
+ playsound(get_turf(AM), 'sound/weapons/gun/general/mag_bullet_insert.ogg', 60, TRUE) //src is nullspaced, which means internal magazines won't properly play sound, thus we use AM
num_loaded++
A.update_appearance()
update_appearance()
@@ -173,6 +173,11 @@
if(!(caliber || istype(src, /obj/item/ammo_box/magazine) || instant_load))
. += "Alt-click on [src] while it in a pocket or your off-hand to take out a round while it is there."
+/obj/item/ammo_box/fire_act(exposed_temperature, exposed_volume)
+ . = ..()
+ for(var/obj/item/ammo_casing/bullet2pop in stored_ammo)
+ bullet2pop.fire_act()
+
/obj/item/ammo_box/magazine
w_class = WEIGHT_CLASS_SMALL //Default magazine weight, only differs for tiny mags and drums
@@ -201,3 +206,4 @@
/obj/item/ammo_box/magazine/handle_atom_del(atom/A)
stored_ammo -= A
update_ammo_count()
+
diff --git a/code/modules/projectiles/boxes_magazines/ammo_boxes.dm b/code/modules/projectiles/boxes_magazines/ammo_boxes.dm
index e8c47f60f85b..ab8e65c069bf 100644
--- a/code/modules/projectiles/boxes_magazines/ammo_boxes.dm
+++ b/code/modules/projectiles/boxes_magazines/ammo_boxes.dm
@@ -24,44 +24,30 @@
// .45-70 Ammo Holders (Hunting Revolver)
/obj/item/ammo_box/a4570
- name = "ammo holder (.45-70)"
- desc = "A 6-round ammo holder for .45-70 revolvers. These rounds do significant damage with average performance against armor."
+ name = "ammo box (.45-70)"
+ desc = "A box of top grade .45-70 ammo. These rounds do significant damage with average performance against armor."
icon_state = "4570"
ammo_type = /obj/item/ammo_casing/a4570
- max_ammo = 6
- multiple_sprites = AMMO_BOX_PER_BULLET
- item_flags = NO_MAT_REDEMPTION
- w_class = WEIGHT_CLASS_TINY
- instant_load = TRUE
+ max_ammo = 12
/obj/item/ammo_box/a4570/match
name = "ammo holder (.45-70 match)"
desc = "A 6-round ammo holder for .45-70 revolvers. These match rounds travel faster, perform better against armor, and can ricochet off targets."
+ icon_state = "4570-match"
ammo_type = /obj/item/ammo_casing/a4570/match
/obj/item/ammo_box/a4570/hp
name = "ammo holder (.45-70 hollow point)"
desc = "A 6-round ammo holder for .45-70 revolvers. These hollow point rounds do legendary damage against soft targets, but are nearly ineffective against armored ones."
+ icon_state = "4570-hp"
ammo_type = /obj/item/ammo_casing/a357/hp
/obj/item/ammo_box/a4570/explosive
name = "ammo holder (.45-70 explosive)"
desc = "A 6-round ammo holder for .45-70 revolvers. These explosive rounds contain a small explosive charge that detonates on impact, creating large wounds and potentially removing limbs."
+ icon_state = "4570-explosive"
ammo_type = /obj/item/ammo_casing/a4570/explosive
-// 7.62x38mmR Ammo Holders (Nagant Revolver)
-
-/obj/item/ammo_box/n762_clip
- name = "ammo holder (7.62x38mmR)"
- desc = "A 7-round ammo holder for the Nagant revolver. These rounds do good damage, but struggle against armor."
- icon_state = "n762"
- ammo_type = /obj/item/ammo_casing/n762_38
- max_ammo = 7
- multiple_sprites = AMMO_BOX_PER_BULLET
- item_flags = NO_MAT_REDEMPTION
- w_class = WEIGHT_CLASS_TINY
- instant_load = TRUE
-
// .38 special Speed Loaders (Colt Detective Special)
/obj/item/ammo_box/c38
@@ -105,34 +91,48 @@
desc = "A 6-round speed loader for quickly reloading .38 special revolvers. These iceblox bullets contain a cryogenic payload that chills targets."
ammo_type = /obj/item/ammo_casing/c38/iceblox
-// 7.62x54mmR Stripper Clip (Illestren Hunting Rifle)
+// 8x58mm Stripper Clip (SSG-669C)
+
+/obj/item/ammo_box/a858
+ name = "stripper clip (8x58mm)"
+ desc = "A 5-round stripper clip for the SSG-669C rifle. These rounds do good damage with significant armor penetration."
+ icon_state = "858"
+ ammo_type = /obj/item/ammo_casing/caseless/a858
+ max_ammo = 5
+ multiple_sprites = AMMO_BOX_PER_BULLET
+ instant_load = TRUE
+
+// .308 Stripper Clip (Vickland)
-/obj/item/ammo_box/a762
- name = "stripper clip (7.62x54mmR)"
- desc = "A 5-round stripper clip for the Illestren Hunting Rifle. These rounds do good damage with significant armor penetration."
- icon_state = "762"
- ammo_type = /obj/item/ammo_casing/a762_54
+/obj/item/ammo_box/vickland_a308
+ name = "stripper clip (.308)"
+ desc = "A 5-round stripper clip for the Vickland Battle Rifle. The Vickland itself has a 10 round capacity, so keep in mind two of these are needed to fully reload it. These rounds do good damage with significant armor penetration."
+ icon_state = "308"
+ ammo_type = /obj/item/ammo_casing/a308
max_ammo = 5
multiple_sprites = AMMO_BOX_PER_BULLET
w_class = WEIGHT_CLASS_TINY
instant_load = TRUE
-// 8x58mm Stripper Clip (SSG-669C)
-/obj/item/ammo_box/a858
- name = "stripper clip (8x58mm)"
- desc = "A 5-round stripper clip for the SSG-669C rifle. These rounds do good damage with significant armor penetration."
- icon_state = "762"
- ammo_type = /obj/item/ammo_casing/caseless/a858
+// .300 Magnum Stripper Clip (Scout)
+
+/obj/item/ammo_box/a300
+ name = "stripper clip (.300 Magnum)"
+ desc = "A 5-round stripper clip for the Scout Rifle. These rounds do great damage with significant armor penetration."
+ icon_state = "300m"
+ ammo_type = /obj/item/ammo_casing/a300
max_ammo = 5
multiple_sprites = AMMO_BOX_PER_BULLET
+ w_class = WEIGHT_CLASS_TINY
+ instant_load = TRUE
// .300 Blackout Stripper Clip (Polymer Survivor Rifle)
/obj/item/ammo_box/aac_300blk_stripper
name = "stripper clip (.300 BLK)"
desc = "A 5-round stripper clip for makeshift bolt-action rifles. These rounds do good damage with good armor penetration."
- icon_state = "762"
+ icon_state = "300m"
ammo_type = /obj/item/ammo_casing/aac_300blk
caliber = ".300 BLK"
max_ammo = 5
@@ -336,13 +336,6 @@
multiple_sprites = AMMO_BOX_PER_BULLET
w_class = WEIGHT_CLASS_NORMAL
-/obj/item/ammo_box/n762
- name = "ammo box (7.62x38mmR)"
- icon_state = "n762box"
- desc = "A box of unusual revolver ammunition with the bullet seated below the mouth of the cartridge."
- ammo_type = /obj/item/ammo_casing/n762_38
- max_ammo = 28
-
/obj/item/ammo_box/a762_39
name = "ammo box (7.62x39mm)"
icon_state = "a762_39box"
@@ -352,9 +345,12 @@
/obj/item/ammo_box/a308
name = "ammo box (.308)"
icon_state = "a308box"
- ammo_type = /obj/item/ammo_casing/win308
+ ammo_type = /obj/item/ammo_casing/a308
max_ammo = 30
+/obj/item/ammo_box/a308/hunterspride //just an alternative graphic for srm ships
+ icon_state = "a308box-HP"
+
/obj/item/ammo_box/foambox
name = "ammo box (Foam Darts)"
icon = 'icons/obj/guns/toy.dmi'
diff --git a/code/modules/projectiles/boxes_magazines/external/lmg.dm b/code/modules/projectiles/boxes_magazines/external/lmg.dm
index 402db1502853..fdf1b7985b29 100644
--- a/code/modules/projectiles/boxes_magazines/external/lmg.dm
+++ b/code/modules/projectiles/boxes_magazines/external/lmg.dm
@@ -1,7 +1,7 @@
/obj/item/ammo_box/magazine/mm712x82
name = "box magazine (7.12x82mm)"
desc = "A 50-round box magazine for the L6 SAW machine gun. These rounds do moderate damage with significant armor penetration."
- icon_state = "a762-50"
+ icon_state = "a762-100"
base_icon_state = "a762"
ammo_type = /obj/item/ammo_casing/mm712x82
caliber = "7.12x82mm"
diff --git a/code/modules/projectiles/boxes_magazines/external/pistol.dm b/code/modules/projectiles/boxes_magazines/external/pistol.dm
index 0c25c8a2282e..e96d8d434ddb 100644
--- a/code/modules/projectiles/boxes_magazines/external/pistol.dm
+++ b/code/modules/projectiles/boxes_magazines/external/pistol.dm
@@ -33,7 +33,7 @@
/obj/item/ammo_box/magazine/m45
name = "pistol magazine (.45)"
- desc = "An 8-round single-stack magazine for the M1911 pistol. These rounds do moderate damage, but struggle against armor."
+ desc = "An 8-round single-stack magazine for the Candor pistol. These rounds do moderate damage, but struggle against armor."
icon_state = "45-8"
base_icon_state = "45"
ammo_type = /obj/item/ammo_casing/c45
@@ -42,22 +42,22 @@
/obj/item/ammo_box/magazine/m45/inc
name = "pistol magazine (.45 incendiary)"
- desc = "An 8-round single-stack magazine for the M1911 pistol. These incendiary rounds deal mediocre damage, but leave flaming trails which set targets ablaze."
+ desc = "An 8-round single-stack magazine for the Candor pistol. These incendiary rounds deal mediocre damage, but leave flaming trails which set targets ablaze."
ammo_type = /obj/item/ammo_casing/c45/inc
/obj/item/ammo_box/magazine/m45/hp
name = "pistol magazine (.45 HP)"
- desc= "An 8-round single-stack magazine for the M1911 pistol. These hollow point rounds do incredible damage against soft targets, but are nearly ineffective against armored ones."
+ desc= "An 8-round single-stack magazine for the Candor pistol. These hollow point rounds do incredible damage against soft targets, but are nearly ineffective against armored ones."
ammo_type = /obj/item/ammo_casing/c45/hp
/obj/item/ammo_box/magazine/m45/ap
name = "pistol magazine (.45 AP)"
- desc= "An 8-round single-stack magazine for the M1911 pistol. These armor-piercing rounds are okay at piercing protective equipment, but lose some stopping power."
+ desc= "An 8-round single-stack magazine for the Candor pistol. These armor-piercing rounds are okay at piercing protective equipment, but lose some stopping power."
ammo_type = /obj/item/ammo_casing/c45/ap
/obj/item/ammo_box/magazine/m45/rubber
name = "pistol magazine (.45 rubber)"
- desc = "An 8-round single-stack magazine for the M1911 pistol. These rubber rounds trade lethality for a heavy impact which can incapacitate targets. Performs even worse against armor."
+ desc = "An 8-round single-stack magazine for the Candor pistol. These rubber rounds trade lethality for a heavy impact which can incapacitate targets. Performs even worse against armor."
ammo_type = /obj/item/ammo_casing/c45/rubber
/obj/item/ammo_box/magazine/m45/update_icon_state()
@@ -123,9 +123,9 @@
name = "part of a disposable gun"
desc = "You ripped out part of the gun, somehow, rendering it unusuable. I hope you're happy."
icon_state = "45-8"
- ammo_type = /obj/item/ammo_casing/c38
- caliber = ".38"
- max_ammo = 3
+ ammo_type = /obj/item/ammo_casing/c22lr
+ caliber = ".22lr"
+ max_ammo = 10
w_class = WEIGHT_CLASS_TINY
/obj/item/ammo_box/magazine/zip_ammo_9mm
diff --git a/code/modules/projectiles/boxes_magazines/external/rifle.dm b/code/modules/projectiles/boxes_magazines/external/rifle.dm
index 786bf8e9dfb6..980272313c1a 100644
--- a/code/modules/projectiles/boxes_magazines/external/rifle.dm
+++ b/code/modules/projectiles/boxes_magazines/external/rifle.dm
@@ -64,18 +64,18 @@
icon_state = "ak47_mag"
ammo_type = /obj/item/ammo_casing/a762_39
caliber = "7.62x39mm"
- max_ammo = 30
+ max_ammo = 20
/obj/item/ammo_box/magazine/ak47/update_icon_state()
. = ..()
icon_state = "ak47_mag-[!!ammo_count()]"
/obj/item/ammo_box/magazine/ebr
- name = "battle rifle magazine (.308 Winchester)"
+ name = "battle rifle magazine (.308)"
desc = "A small, 10-round steel magazine for the M514 EBR. These rounds do good damage with significant armor penetration."
icon_state = "ebr_mag"
- ammo_type = /obj/item/ammo_casing/win308
- caliber = ".308 Winchester"
+ ammo_type = /obj/item/ammo_casing/a308
+ caliber = ".308"
max_ammo = 10
/obj/item/ammo_box/magazine/ebr/update_icon_state()
@@ -83,11 +83,11 @@
icon_state = "ebr_mag-[!!ammo_count()]"
/obj/item/ammo_box/magazine/gal
- name = "\improper GAL Magazine (.308 Winchester)"
+ name = "\improper GAL Magazine (.308)"
desc = "A standard 10-round magazine for GAL platform DMRs. These rounds do good damage with significant armor penetration."
icon_state = "ebr_mag"
- ammo_type = /obj/item/ammo_casing/win308
- caliber = ".308 Winchester"
+ ammo_type = /obj/item/ammo_casing/a308
+ caliber = ".308"
max_ammo = 10
/obj/item/ammo_box/magazine/gal/update_icon_state()
@@ -128,3 +128,14 @@
/obj/item/ammo_box/magazine/e40/update_icon_state()
. = ..()
icon_state = "e40_mag-[!!ammo_count()]"
+
+// 8x50mmR En Bloc Clip (Illestren Hunting Rifle)
+
+/obj/item/ammo_box/magazine/illestren_a850r //this is a magazine codewise do nothing breaks
+ name = "en bloc clip (8x50mmR)"
+ desc = "A 5-round en bloc clip for the Illestren Hunting Rifle. These rounds do good damage with significant armor penetration."
+ icon_state = "enbloc_858"
+ ammo_type = /obj/item/ammo_casing/a8_50r
+ max_ammo = 5
+ multiple_sprites = AMMO_BOX_PER_BULLET
+ w_class = WEIGHT_CLASS_TINY
diff --git a/code/modules/projectiles/boxes_magazines/external/smg.dm b/code/modules/projectiles/boxes_magazines/external/smg.dm
index 587718e5caad..7e5f418ec7b2 100644
--- a/code/modules/projectiles/boxes_magazines/external/smg.dm
+++ b/code/modules/projectiles/boxes_magazines/external/smg.dm
@@ -97,16 +97,29 @@
. = ..()
icon_state = "c20r45-[round(ammo_count(),2)]"
-/obj/item/ammo_box/magazine/smgm45/drum
- name = "drum magazine (.45)"
- desc = "A bulky, 50-round drum magazine for .45 submachine guns. These rounds do moderate damage, but struggle against armor."
- icon_state = "drum45"
+/obj/item/ammo_box/magazine/c45_firestorm_mag
+ name = "stick magazine (.45)"
+ desc = "A 28-round stick magazine for the toploading Firestorm submachine gun. These rounds do moderate damage, but struggle against armor."
+ icon_state = "firestorm_mag"
+ base_icon_state = "firestorm_mag"
+ ammo_type = /obj/item/ammo_casing/c45
+ caliber = ".45"
+ max_ammo = 28
+
+/obj/item/ammo_box/magazine/c45_firestorm_mag/update_icon_state()
+ . = ..()
+ icon_state = "firestorm_mag-[!!ammo_count()]"
+
+/obj/item/ammo_box/magazine/c45_firestorm_mag/pan
+ name = "pan magazine (.45)"
+ desc = "A bulky, 50-round pan magazine for the toploading Firestorm submachine gun. These rounds struggle against armor, but with this many you could cut anyone down regardless."
+ icon_state = "firestorm_pan"
max_ammo = 50
w_class = WEIGHT_CLASS_NORMAL
-/obj/item/ammo_box/magazine/smgm45/drum/update_icon_state() //Causes the mag to NOT inherit the parent's update_icon oooh the misery
+/obj/item/ammo_box/magazine/c45_firestorm_mag/pan/update_icon_state() //Causes the mag to NOT inherit the parent's update_icon oooh the misery
. = ..()
- icon_state = "drum45"
+ icon_state = "firestorm_pan"
/obj/item/ammo_box/magazine/pistol556mm
name = "handgun magazine (5.56mm HITP caseless)"
diff --git a/code/modules/projectiles/boxes_magazines/external/toy.dm b/code/modules/projectiles/boxes_magazines/external/toy.dm
index 7ed352a1941a..ab9656cdf111 100644
--- a/code/modules/projectiles/boxes_magazines/external/toy.dm
+++ b/code/modules/projectiles/boxes_magazines/external/toy.dm
@@ -49,8 +49,8 @@
/obj/item/ammo_box/magazine/toy/m762
name = "donksoft box magazine"
desc = "A huge toy LMG magazine designed to fit vast quantities of harmless foam darts."
- icon_state = "a762-toy"
- base_icon_state = "a762"
+ icon_state = "a850r-toy"
+ base_icon_state = "a850r"
caliber = "foam_force"
ammo_type = /obj/item/ammo_casing/caseless/foam_dart
max_ammo = 50
@@ -62,5 +62,5 @@
/obj/item/ammo_box/magazine/toy/m762/riot
desc = "A huge toy LMG magazine designed to fit vast quantities of legally-harmless riot control darts."
- icon_state = "a762-riot"
+ icon_state = "a850r-riot"
ammo_type = /obj/item/ammo_casing/caseless/foam_dart/riot
diff --git a/code/modules/projectiles/boxes_magazines/internal/revolver.dm b/code/modules/projectiles/boxes_magazines/internal/revolver.dm
index 7715d31b1323..0c3bdac1be36 100644
--- a/code/modules/projectiles/boxes_magazines/internal/revolver.dm
+++ b/code/modules/projectiles/boxes_magazines/internal/revolver.dm
@@ -5,12 +5,9 @@
max_ammo = 6
instant_load = TRUE
-/obj/item/ammo_box/magazine/internal/cylinder/rev762
- name = "\improper Nagant revolver cylinder"
- ammo_type = /obj/item/ammo_casing/n762_38
- caliber = "7.62x38mmR"
+/obj/item/ammo_box/magazine/internal/cylinder/rev38/big
+ name = "\improper Montagne cylinder"
max_ammo = 7
- instant_load = FALSE
/obj/item/ammo_box/magazine/internal/cylinder/rev4570
name = "hunting revolver cylinder"
diff --git a/code/modules/projectiles/boxes_magazines/internal/rifle.dm b/code/modules/projectiles/boxes_magazines/internal/rifle.dm
index b85b223c254b..921ff98293a1 100644
--- a/code/modules/projectiles/boxes_magazines/internal/rifle.dm
+++ b/code/modules/projectiles/boxes_magazines/internal/rifle.dm
@@ -1,14 +1,14 @@
/obj/item/ammo_box/magazine/internal/boltaction
name = "bolt action rifle internal magazine"
desc = "Oh god, this shouldn't be here"
- ammo_type = /obj/item/ammo_casing/a762_54
- caliber = "7.62x54mmR"
+ ammo_type = /obj/item/ammo_casing/a8_50r
+ caliber = "8x50mmR"
max_ammo = 5
instant_load = TRUE
/obj/item/ammo_box/magazine/internal/boltaction/enchanted
max_ammo = 1
- ammo_type = /obj/item/ammo_casing/a762_54
+ ammo_type = /obj/item/ammo_casing/a8_50r
/obj/item/ammo_box/magazine/internal/boltaction/enchanted/arcane_barrage
ammo_type = /obj/item/ammo_casing/magic/arcane_barrage
@@ -32,3 +32,10 @@
ammo_type = /obj/item/ammo_casing/aac_300blk
caliber = ".300 BLK"
max_ammo = 5
+
+/obj/item/ammo_box/magazine/internal/vickland
+ name = "Vickland battle rifle internal magazine"
+ ammo_type = /obj/item/ammo_casing/a308
+ caliber = ".308"
+ max_ammo = 10
+ instant_load = TRUE
diff --git a/code/modules/projectiles/boxes_magazines/internal/shotgun.dm b/code/modules/projectiles/boxes_magazines/internal/shotgun.dm
index 2b3adeea371d..38c99aec9372 100644
--- a/code/modules/projectiles/boxes_magazines/internal/shotgun.dm
+++ b/code/modules/projectiles/boxes_magazines/internal/shotgun.dm
@@ -35,8 +35,8 @@
/obj/item/ammo_box/magazine/internal/shot/riot
name = "riot shotgun internal magazine"
- ammo_type = /obj/item/ammo_casing/shotgun/rubbershot
- max_ammo = 6
+ ammo_type = /obj/item/ammo_casing/shotgun/buckshot
+ max_ammo = 7
/obj/item/ammo_box/magazine/internal/shot/bounty
name = "triple-barrel shotgun internal magazine"
@@ -47,13 +47,10 @@
name = "winchester internal magazine"
ammo_type = /obj/item/ammo_casing/c38
caliber = ".38"
- max_ammo = 7
-
-/obj/item/ammo_box/magazine/internal/shot/winchester/lethal
- ammo_type = /obj/item/ammo_casing/c38
+ max_ammo = 12
-/obj/item/ammo_box/magazine/internal/shot/contender
- name = "contender internal magazine"
+/obj/item/ammo_box/magazine/internal/shot/beacon
+ name = "beacon internal magazine"
ammo_type = /obj/item/ammo_casing/a4570
caliber = ".45-70"
max_ammo = 1
diff --git a/code/modules/projectiles/guns/ballistic.dm b/code/modules/projectiles/guns/ballistic.dm
index 642fcdf0c0b0..b640390ebfe4 100644
--- a/code/modules/projectiles/guns/ballistic.dm
+++ b/code/modules/projectiles/guns/ballistic.dm
@@ -60,6 +60,8 @@
var/empty_indicator = FALSE
///Whether the gun alarms when empty or not.
var/empty_alarm = FALSE
+ ///Do we eject the magazine upon runing out of ammo?
+ var/empty_autoeject = FALSE
///Whether the gun supports multiple special mag types
var/special_mags = FALSE
///The bolt type of the gun, affects quite a bit of functionality, see combat.dm defines for bolt types: BOLT_TYPE_STANDARD; BOLT_TYPE_LOCKING; BOLT_TYPE_OPEN; BOLT_TYPE_NO_BOLT
@@ -240,8 +242,8 @@
else
to_chat(user, "Your reload was interupted! ")
return
-
- user.put_in_hands(old_mag)
+ if(user)
+ user.put_in_hands(old_mag)
update_appearance()
/obj/item/gun/ballistic/can_shoot()
@@ -338,6 +340,9 @@
if (empty_alarm && last_shot_succeeded)
playsound(src, empty_alarm_sound, empty_alarm_volume, empty_alarm_vary)
update_appearance()
+ if (empty_autoeject && last_shot_succeeded && !internal_magazine)
+ eject_magazine(display_message = FALSE)
+ update_appearance()
if (last_shot_succeeded && bolt_type == BOLT_TYPE_LOCKING)
bolt_locked = TRUE
update_appearance()
@@ -403,6 +408,7 @@
. += "The [bolt_wording] is locked back and needs to be released before firing."
if (suppressed)
. += "It has a suppressor attached that can be removed with alt+click ."
+ . += "You can [bolt_wording] [src] by pressing the unqiue action key. By default, this is space "
///Gets the number of bullets in the gun
/obj/item/gun/ballistic/proc/get_ammo(countchambered = TRUE)
diff --git a/code/modules/projectiles/guns/ballistic/assault.dm b/code/modules/projectiles/guns/ballistic/assault.dm
index ab54f3dd247c..576a914cce01 100644
--- a/code/modules/projectiles/guns/ballistic/assault.dm
+++ b/code/modules/projectiles/guns/ballistic/assault.dm
@@ -128,22 +128,6 @@
icon_state = "cm16"
item_state = "cm16"
-/obj/item/gun/ballistic/automatic/assault/ar
- name = "\improper NT-ARG 'Boarder'"
- desc = "A burst-fire 5.56mm carbine occasionally found in the hands of Nanotrasen marines."
- fire_sound = 'sound/weapons/gun/rifle/shot_alt2.ogg'
- icon_state = "arg"
- item_state = "arg"
- slot_flags = 0
- mag_type = /obj/item/ammo_box/magazine/p16
- can_suppress = FALSE
- burst_size = 3
- fire_delay = 1
-
-/obj/item/gun/ballistic/automatic/assault/ar/ComponentInitialize()
- . = ..()
- AddComponent(/datum/component/automatic_fire, 0.2 SECONDS)
-
/obj/item/gun/ballistic/automatic/assault/swiss_cheese
name = "\improper Swiss Cheese"
desc = "An ancient longarm famous for its boxy, modular design. The DMA on this unit is, sadly, broken. Uses 5.56mm ammunition for Matter mode."
@@ -319,3 +303,28 @@
w_class = WEIGHT_CLASS_NORMAL
ammo_type = list(/obj/item/ammo_casing/energy/laser/assault)
fire_delay = 2
+
+//techinically a battle rifle, i'm putting it here for organisation sake
+
+/obj/item/gun/ballistic/automatic/vickland //weapon designed by Apogee-dev
+ name = "\improper Vickland"
+ desc = "The pride of the Saint-Roumain Militia, the Vickland is a rare semi-automatic battle rifle produced by Hunter's Pride exclusively for SRM use. It is unusual in its class for its internal rotary magazine, which must be reloaded using stripper clips. Chambered in .308."
+ icon = 'icons/obj/guns/48x32guns.dmi'
+ fire_sound = 'sound/weapons/gun/rifle/vickland.ogg'
+ icon_state = "vickland"
+ item_state = "vickland"
+ weapon_weight = WEAPON_MEDIUM
+ w_class = WEIGHT_CLASS_BULKY
+ internal_magazine = TRUE
+ mag_type = /obj/item/ammo_box/magazine/internal/vickland
+ fire_sound = 'sound/weapons/gun/rifle/vickland.ogg'
+ burst_size = 0
+ actions_types = list()
+ manufacturer = MANUFACTURER_HUNTERSPRIDE
+
+ rack_sound = 'sound/weapons/gun/rifle/ar_cock.ogg'
+
+ spread_unwielded = 25
+ recoil = 0
+ recoil_unwielded = 4
+ wield_slowdown = 0.75
diff --git a/code/modules/projectiles/guns/ballistic/automatic.dm b/code/modules/projectiles/guns/ballistic/automatic.dm
index 841e36927cb5..7cbd8574ba86 100644
--- a/code/modules/projectiles/guns/ballistic/automatic.dm
+++ b/code/modules/projectiles/guns/ballistic/automatic.dm
@@ -128,7 +128,7 @@
/obj/item/gun/ballistic/automatic/ebr
name = "\improper M514 EBR"
- desc = "A reliable, high-powered battle rifle often found in the hands of Syndicate personnel and remnants, chambered in .308 Winchester. Effective against personnel and armor alike."
+ desc = "A reliable, high-powered battle rifle often found in the hands of Syndicate personnel and remnants, chambered in .308. Effective against personnel and armor alike."
icon = 'icons/obj/guns/48x32guns.dmi'
lefthand_file = 'icons/mob/inhands/weapons/64x_guns_left.dmi'
righthand_file = 'icons/mob/inhands/weapons/64x_guns_right.dmi'
diff --git a/code/modules/projectiles/guns/ballistic/gauss.dm b/code/modules/projectiles/guns/ballistic/gauss.dm
index b8b8e36e04b7..8fce353d8b22 100644
--- a/code/modules/projectiles/guns/ballistic/gauss.dm
+++ b/code/modules/projectiles/guns/ballistic/gauss.dm
@@ -28,7 +28,7 @@
/obj/item/gun/ballistic/automatic/powered/gauss/modelh
name = "Model H"
- desc = "Standard-issue pistol of the Solarian Confederation. Fires slow ferromagnetic slugs at a high energy cost, though they rend flesh with ease."
+ desc = "A standard-issue pistol exported from the Solarian Confederation. It fires slow flesh-rending ferromagnetic slugs at a high energy cost, however they are ineffective on any armor."
mag_type = /obj/item/ammo_box/magazine/modelh
icon_state = "model-h"
item_state = "model-h"
@@ -42,10 +42,15 @@
empty_indicator = FALSE
manufacturer = MANUFACTURER_SOLARARMORIES
recoil = 1
- recoil_unwielded = 2
+ recoil_unwielded = 4
spread = 3
- spread_unwielded = 6
+ spread_unwielded = 12
+/obj/item/gun/ballistic/automatic/powered/gauss/modelh/suns
+ desc = "A standard-issue pistol exported from the Solarian Confederation. It fires slow flesh-rending ferromagnetic slugs at a high energy cost, however they are ineffective on any armor. It is painted in the colors of SUNS."
+ mag_type = /obj/item/ammo_box/magazine/modelh
+ icon_state = "model-h_suns"
+ item_state = "model-h_suns"
/obj/item/gun/ballistic/automatic/powered/gauss/claris
name = "Claris"
@@ -65,9 +70,14 @@
empty_indicator = FALSE
manufacturer = MANUFACTURER_SOLARARMORIES
+/obj/item/gun/ballistic/automatic/powered/gauss/claris/suns
+ desc = "An antiquated Solarian rifle. Chambered in ferromagnetic pellets, just as the founding Solarians intended. Evidently, SUNS' founders echo the sentiment, as it appears to be painted in their colors."
+ icon_state = "claris_suns"
+ item_state = "claris_suns"
+
/obj/item/gun/ballistic/automatic/powered/gauss/gar
- name = "Solar 'GAR' Assault Rifle"
- desc = "A Solarian assault rifle, unusually modern for its producers. Launches ferromagnetic lances at alarming speeds."
+ name = "Solar 'GAR' Carbine"
+ desc = "A Solarian carbine, unusually modern for its producers. Launches ferromagnetic lances at alarming speeds."
mag_type = /obj/item/ammo_box/magazine/gar
icon = 'icons/obj/guns/48x32guns.dmi'
icon_state = "gar"
@@ -76,14 +86,18 @@
load_sound = 'sound/weapons/gun/gauss/rifle_reload.ogg'
cell_type = /obj/item/stock_parts/cell/gun/solgov
burst_size = 2
- fire_delay = 2
+ fire_delay = 1
actions_types = list()
empty_indicator = FALSE
manufacturer = MANUFACTURER_SOLARARMORIES
wield_delay = 0.7 SECONDS
- fire_delay = 1
/obj/item/gun/ballistic/automatic/powered/gauss/gar/ComponentInitialize()
. = ..()
- AddComponent(/datum/component/automatic_fire, 0.2 SECONDS) //setiting this to 0.1 breaks auotfire, not sure why, so we use the standard fire rate but in 2 shot bursts to shoot 'faster'
+ AddComponent(/datum/component/automatic_fire, 0.2 SECONDS)
+
+/obj/item/gun/ballistic/automatic/powered/gauss/gar/suns
+ desc = "A Solarian carbine, unusually modern for its producers. It's just modern enough for SUNS, however, who have painted the weapon in their colors. Launches ferromagnetic lances at alarming speeds."
+ icon_state = "gar_suns"
+ item_state = "gar_suns"
diff --git a/code/modules/projectiles/guns/ballistic/pistol.dm b/code/modules/projectiles/guns/ballistic/pistol.dm
index 97974ff341fb..1cb86fec256d 100644
--- a/code/modules/projectiles/guns/ballistic/pistol.dm
+++ b/code/modules/projectiles/guns/ballistic/pistol.dm
@@ -28,8 +28,8 @@
manufacturer = MANUFACTURER_SCARBOROUGH
wield_delay = 0.2 SECONDS
- spread = -2
- spread_unwielded = 4
+ spread = 2
+ spread_unwielded = 5
wield_slowdown = 0.15
muzzleflash_iconstate = "muzzle_flash_light"
@@ -42,25 +42,41 @@
var/obj/item/suppressor/S = new(src)
install_suppressor(S)
-/obj/item/gun/ballistic/automatic/pistol/m1911
- name = "\improper M1911A8"
- desc = "A classic .45 handgun. An engraving on the slide marks it as a product of Hunter's Pride."
- icon_state = "m1911"
+/obj/item/gun/ballistic/automatic/pistol/suns
+ desc = "A small, easily concealable 10mm handgun that bears Scarborough Arms stamps. It is painted in the colors of SUNS."
+ icon_state = "pistol_suns"
+
+/obj/item/gun/ballistic/automatic/pistol/candor
+ name = "\improper Candor"
+ desc = "A classic semi-automatic handgun, widely popular throughout the Frontier. An engraving on the slide marks it as a product of Hunter's Pride. Chambered in .45."
+ icon_state = "candor"
+ item_state = "hp_generic"
w_class = WEIGHT_CLASS_NORMAL
mag_type = /obj/item/ammo_box/magazine/m45
can_suppress = FALSE
- fire_sound = 'sound/weapons/gun/pistol/m1911.ogg'
- rack_sound = 'sound/weapons/gun/pistol/m1911_cocked.ogg'
+ fire_sound = 'sound/weapons/gun/pistol/candor.ogg'
+ rack_sound = 'sound/weapons/gun/pistol/candor_cocked.ogg'
lock_back_sound = 'sound/weapons/gun/pistol/slide_lock.ogg'
bolt_drop_sound = 'sound/weapons/gun/pistol/slide_drop.ogg'
manufacturer = MANUFACTURER_HUNTERSPRIDE
- load_sound = 'sound/weapons/gun/pistol/m1911_reload.ogg'
- load_empty_sound = 'sound/weapons/gun/pistol/m1911_reload.ogg'
- eject_sound = 'sound/weapons/gun/pistol/m1911_unload.ogg'
- eject_empty_sound = 'sound/weapons/gun/pistol/m1911_unload.ogg'
+ load_sound = 'sound/weapons/gun/pistol/candor_reload.ogg'
+ load_empty_sound = 'sound/weapons/gun/pistol/candor_reload.ogg'
+ eject_sound = 'sound/weapons/gun/pistol/candor_unload.ogg'
+ eject_empty_sound = 'sound/weapons/gun/pistol/candor_unload.ogg'
recoil = -2
-/obj/item/gun/ballistic/automatic/pistol/m1911/no_mag
+/obj/item/gun/ballistic/automatic/pistol/candor/no_mag
+ spawnwithmagazine = FALSE
+
+/obj/item/gun/ballistic/automatic/pistol/candor/factory //also give this to the srm, their candors should probably look factory fresh from how well taken care of they are
+ desc = "A classic semi-automatic handgun, widely popular throughout the Frontier. An engraving on the slide marks it as a product of Hunter's Pride. This example has been kept in especially good shape, and may as well be fresh out of the workshop. Chambered in .45."
+ item_state = "hp_generic_fresh"
+
+/obj/item/gun/ballistic/automatic/pistol/candor/factory/update_overlays()
+ . = ..()
+ . += "[initial(icon_state)]_factory"
+
+/obj/item/gun/ballistic/automatic/pistol/candor/factory/no_mag
spawnwithmagazine = FALSE
/obj/item/gun/ballistic/automatic/pistol/deagle
@@ -238,26 +254,17 @@
/obj/item/gun/ballistic/automatic/pistol/disposable
name = "disposable gun"
desc = "An exceedingly flimsy plastic gun that is extremely cheap to produce. You get what you pay for."
- icon_state = "disposable"
+ fire_sound = 'sound/weapons/gun/pistol/himehabu.ogg'
+ icon_state = "disposable" //credit to discord user any% for the sprite
w_class = WEIGHT_CLASS_NORMAL
mag_type = /obj/item/ammo_box/magazine/disposable
custom_materials = list(/datum/material/plastic=2000)
can_suppress = FALSE
- var/random_icon = TRUE
manufacturer = MANUFACTURER_NONE
-
has_safety = FALSE //thing barely costs anything, why would it have a safety?
safety = FALSE
-/obj/item/gun/ballistic/automatic/pistol/disposable/Initialize()
- . = ..()
- var/picked = pick("none","red","purple","yellow","green","dark")
- if(random_icon)
- if(picked == "none")
- return
- icon_state = "disposable_[picked]"
-
-/obj/item/gun/ballistic/automatic/pistol/disposable/eject_magazine(mob/user)
+/obj/item/gun/ballistic/automatic/pistol/disposable/eject_magazine(mob/user, display_message = TRUE)
to_chat(user, "Theres no magazine to eject! ")
return
@@ -269,7 +276,6 @@
name = "pizza disposable gun"
desc = "How horrible. Whoever you point at with this won't be very cheesed to meet you." //this is a warcrime against italians // IF YOU'RE GOING TO DO US DIRTY SPELL IT RIGHT
icon_state = "disposable_pizza"
- random_icon = FALSE
custom_materials = list(/datum/material/pizza=2000)
//not technically a pistol but whatever
diff --git a/code/modules/projectiles/guns/ballistic/revolver.dm b/code/modules/projectiles/guns/ballistic/revolver.dm
index 454a790728d2..4047f54590bb 100644
--- a/code/modules/projectiles/guns/ballistic/revolver.dm
+++ b/code/modules/projectiles/guns/ballistic/revolver.dm
@@ -117,16 +117,13 @@
. += "It can be spun with alt+click "
/obj/item/gun/ballistic/revolver/detective
- name = "\improper Hunter's Pride Detective Special"
- desc = "A compact and ridiculously old-fashioned law enforcement firearm. Uses .38 special rounds."
+ name = "\improper HP Detective Special"
+ desc = "A small law enforcement firearm. Originally commissioned by Nanotrasen for their Private Investigation division, it has become extremely popular among independent civilians as a cheap, compact sidearm. Uses .38 Special rounds."
fire_sound = 'sound/weapons/gun/revolver/shot_light.ogg'
icon_state = "detective"
mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rev38
obj_flags = UNIQUE_RENAME
unique_reskin = list("Default" = "detective",
- "Fitz Special" = "detective_fitz",
- "Police Positive Special" = "detective_police",
- "Blued Steel" = "detective_blued",
"Stainless Steel" = "detective_stainless",
"Gold Trim" = "detective_gold",
"Leopard Spots" = "detective_leopard",
@@ -200,25 +197,26 @@
pin = /obj/item/firing_pin
manufacturer = MANUFACTURER_NONE
-/obj/item/gun/ballistic/revolver/nagant
- name = "\improper Nagant revolver"
- desc = "An ancient model of revolver with notoriously poor ergonomics, chambered in 7.62x38mmR. Uniquely able to be suppressed."
- icon_state = "nagant"
- can_suppress = TRUE
- manufacturer = MANUFACTURER_NONE
+/obj/item/gun/ballistic/revolver/montagne
+ name = "\improper HP Montagne"
+ desc = "An ornate break-open revolver issued to high-ranking members of the Saint-Roumain Militia. Chambered in .38 Special."
+ icon = 'icons/obj/guns/48x32guns.dmi'
+ icon_state = "montagne"
+ manufacturer = MANUFACTURER_HUNTERSPRIDE
spread_unwielded = 12
recoil = 0
- recoil_unwielded = 0
- mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rev762
+ mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rev38/big
-/obj/item/gun/ballistic/revolver/hunting
- name = "hunting revolver"
- desc = "A massive, long-barreled revolver designed for the most dangerous game. Can only be reloaded one cartridge at a time due to its reinforced frame. Uses .45-70 ammo."
- icon_state = "hunting"
+/obj/item/gun/ballistic/revolver/ashhand
+ name = "HP Ashhand"
+ desc = "A massive, long-barreled revolver often used by the Saint-Roumain Militia as protection against big game. Can only be reloaded one cartridge at a time due to its reinforced frame. Uses .45-70 ammo."
+ icon = 'icons/obj/guns/48x32guns.dmi'
+ icon_state = "ashhand"
mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rev4570
fire_sound = 'sound/weapons/gun/revolver/shot_hunting.ogg'
+ manufacturer = MANUFACTURER_HUNTERSPRIDE
wield_slowdown = 0.5
spread_unwielded = 5
spread = 2
@@ -329,15 +327,11 @@
user.drop_all_held_items()
user.Paralyze(80)
-/obj/item/gun/ballistic/revolver/srm
- name = "SRM Standard Issue .357 Revolver" //should have used the pepperbox...
- desc = "A sturdy, powerful, and reliable revolver utilized by the Saint-Roumain Militia."
- manufacturer = MANUFACTURER_HUNTERSPRIDE
-
-/obj/item/gun/ballistic/revolver/pepperbox
- name = "\improper pepperbox pistol"
+/obj/item/gun/ballistic/revolver/firebrand
+ name = "\improper HP Firebrand"
desc = "An archaic precursor to revolver-type firearms, this gun was rendered completely obsolete millennia ago. While fast to fire, it is extremely inaccurate. Uses .357 ammo."
icon_state = "pepperbox"
+ item_state = "hp_generic_fresh"
mag_type = /obj/item/ammo_box/magazine/internal/cylinder/pepperbox
spread = 20
manufacturer = MANUFACTURER_HUNTERSPRIDE
@@ -345,17 +339,18 @@
fire_delay = 0
semi_auto = TRUE
-/obj/item/gun/ballistic/revolver/cattleman
- name = "\improper Cattleman"
- desc = "A strangely ancient revolver. Despite the age, it is a favorite of fast drawing spacers and officers in various militaries, but sometimes very rarely used in small colonial police units. Uses .45 ACP."
+/obj/item/gun/ballistic/revolver/shadow
+ name = "\improper HP Shadow"
+ desc = "A mid-size revolver. Despite the antiquated design, it is cheap, reliable, and stylish, making it a favorite among fast-drawing spacers and the officers of various militaries, as well as small-time police units. Chambered in .45."
fire_sound = 'sound/weapons/gun/revolver/cattleman.ogg'
icon = 'icons/obj/guns/48x32guns.dmi'
- icon_state = "cattleman"
+ icon_state = "shadow"
mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rev45
+ manufacturer = MANUFACTURER_HUNTERSPRIDE
obj_flags = UNIQUE_RENAME
- unique_reskin = list("Default" = "cattleman",
- "Army" = "cattleman_army",
- "General" = "cattleman_general"
+ unique_reskin = list("Default" = "shadow",
+ "Army" = "shadow_army",
+ "General" = "shadow_general"
)
recoil = 0 //weaker than normal revovler, no recoil
diff --git a/code/modules/projectiles/guns/ballistic/rifle.dm b/code/modules/projectiles/guns/ballistic/rifle.dm
index 6506edc4bb1d..60aa20ab3a50 100644
--- a/code/modules/projectiles/guns/ballistic/rifle.dm
+++ b/code/modules/projectiles/guns/ballistic/rifle.dm
@@ -1,10 +1,15 @@
/obj/item/gun/ballistic/rifle
name = "Bolt Rifle"
desc = "Some kind of bolt-action rifle. You get the feeling you shouldn't have this."
+ icon = 'icons/obj/guns/48x32guns.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/back.dmi'
icon_state = "hunting"
item_state = "hunting"
mag_type = /obj/item/ammo_box/magazine/internal/boltaction
bolt_wording = "bolt"
+ w_class = WEIGHT_CLASS_BULKY
+ weapon_weight = WEAPON_HEAVY
+ slot_flags = ITEM_SLOT_BACK
bolt_type = BOLT_TYPE_STANDARD
semi_auto = FALSE
internal_magazine = TRUE
@@ -35,9 +40,18 @@
process_chamber(FALSE, FALSE, FALSE)
bolt_locked = TRUE
update_appearance()
+ if (magazine && !magazine?.ammo_count() && empty_autoeject && !internal_magazine)
+ eject_magazine(display_message = FALSE)
+ update_appearance()
return
drop_bolt(user)
+/obj/item/gun/ballistic/rifle/eject_magazine(mob/user, display_message = TRUE, obj/item/ammo_box/magazine/tac_load = null)
+ if (!bolt_locked && empty_autoeject)
+ to_chat(user, "The bolt is closed! ")
+ return
+ return ..()
+
/obj/item/gun/ballistic/rifle/can_shoot()
if (bolt_locked)
return FALSE
@@ -57,38 +71,49 @@
// BOLT ACTION RIFLE //
///////////////////////
-/obj/item/gun/ballistic/rifle/boltaction
- name = "\improper Illestren Hunting Rifle"
- desc = "One of Hunter's Pride most successful firearms. The bolt-action is popular among colonists, pirates, snipers, and countless more. Chambered in 7.62x54."
- sawn_desc = "An extremely sawn-off Illestren, generally known as an \"obrez\". There was probably a reason it wasn't made this short to begin with."
- w_class = WEIGHT_CLASS_BULKY
- weapon_weight = WEAPON_HEAVY
- icon = 'icons/obj/guns/48x32guns.dmi'
- mob_overlay_icon = 'icons/mob/clothing/back.dmi'
- icon_state = "hunting"
- item_state = "hunting"
- slot_flags = ITEM_SLOT_BACK
- mag_type = /obj/item/ammo_box/magazine/internal/boltaction
- can_bayonet = TRUE
- knife_x_offset = 27
- knife_y_offset = 13
+/obj/item/gun/ballistic/rifle/illestren
+ name = "\improper HP Illestren"
+ desc = "A sturdy and conventional bolt-action rifle. One of Hunter's Pride's most successful firearms, the Illestren is popular among colonists, pirates, snipers, and countless others. Chambered in 8x50mmR."
+ sawn_desc = "An Illestren rifle sawn down to a ridiculously small size. There was probably a reason it wasn't made this short to begin with, but it still packs a punch."
+ eject_sound = 'sound/weapons/gun/rifle/vickland_unload.ogg'
+ eject_empty_sound = 'sound/weapons/gun/rifle/vickland_unload.ogg'
+ icon_state = "illestren"
+ item_state = "illestren"
+ internal_magazine = FALSE
+ mag_type = /obj/item/ammo_box/magazine/illestren_a850r
+ empty_autoeject = TRUE
+ eject_sound_vary = FALSE
can_be_sawn_off = TRUE
manufacturer = MANUFACTURER_HUNTERSPRIDE
-/obj/item/gun/ballistic/rifle/boltaction/sawoff(mob/user)
+/obj/item/gun/ballistic/rifle/illestren/sawoff(mob/user)
. = ..()
if(.)
spread = 36
+ spread_unwielded = 108
can_bayonet = FALSE
- item_state = "hunting_sawn"
+ item_state = "illestren_sawn"
+ mob_overlay_state = item_state
+ weapon_weight = WEAPON_MEDIUM //you can fire it onehanded, makes it worse than worse than useless onehanded, but you can
-/obj/item/gun/ballistic/rifle/boltaction/blow_up(mob/user)
+/obj/item/gun/ballistic/rifle/illestren/blow_up(mob/user)
. = 0
if(chambered && chambered.BB)
process_fire(user, user, FALSE)
. = 1
-/obj/item/gun/ballistic/rifle/boltaction/solgov
+/obj/item/gun/ballistic/rifle/illestren/factory
+ desc = "A sturdy and conventional bolt-action rifle. One of Hunter's Pride's most successful firearms, this example has been kept in excellent shape and may as well be fresh out of the workshop. Chambered in 8x50mmR."
+ icon_state = "illestren_factory"
+ item_state = "illestren_factory"
+
+/obj/item/gun/ballistic/rifle/illestren/sawoff(mob/user)
+ . = ..()
+ if(.)
+ item_state = "illestren_factory_sawn"
+ mob_overlay_state = item_state
+
+/obj/item/gun/ballistic/rifle/solgov
name = "SSG-669C"
desc = "A bolt-action sniper rifle used by Solarian troops. Beloved for its rotary design and accuracy. Chambered in 8x58mm Caseless."
mag_type = /obj/item/ammo_box/magazine/internal/boltaction/solgov
@@ -109,17 +134,25 @@
wield_slowdown = 1
wield_delay = 1.3 SECONDS
-/obj/item/gun/ballistic/rifle/boltaction/roumain
- name = "standard-issue 'Smile' rifle"
- desc = "A bolt-action rifle usually given to mercenary hunters of the Saint-Roumain Militia. Chambered in .300 Magnum."
+/obj/item/gun/ballistic/rifle/scout
+ name = "HP Scout"
+ desc = "A powerful bolt-action rifle usually given to mercenary hunters of the Saint-Roumain Militia, equally suited for taking down big game or two-legged game. Chambered in .300 Magnum."
mag_type = /obj/item/ammo_box/magazine/internal/boltaction/smile
- icon_state = "roma"
- item_state = "roma"
+ fire_sound = 'sound/weapons/gun/rifle/scout.ogg'
+
+ rack_sound = 'sound/weapons/gun/rifle/scout_bolt_out.ogg'
+ bolt_drop_sound = 'sound/weapons/gun/rifle/scout_bolt_in.ogg'
+ icon_state = "scout"
+ item_state = "scout"
can_be_sawn_off = FALSE
+ zoomable = TRUE
+ zoom_amt = 10 //Long range, enough to see in front of you, but no tiles behind you.
+ zoom_out_amt = 5
+
manufacturer = MANUFACTURER_HUNTERSPRIDE
-/obj/item/gun/ballistic/rifle/boltaction/enchanted
+/obj/item/gun/ballistic/rifle/illestren/enchanted
name = "enchanted bolt-action rifle"
desc = "Careful not to lose your head."
var/guns_left = 30
@@ -127,7 +160,7 @@
can_be_sawn_off = FALSE
manufacturer = MANUFACTURER_NONE
-/obj/item/gun/ballistic/rifle/boltaction/enchanted/arcane_barrage
+/obj/item/gun/ballistic/rifle/illestren/enchanted/arcane_barrage
name = "arcane barrage"
desc = "Pew Pew Pew."
fire_sound = 'sound/weapons/emitter.ogg'
@@ -145,25 +178,25 @@
mag_type = /obj/item/ammo_box/magazine/internal/boltaction/enchanted/arcane_barrage
-/obj/item/gun/ballistic/rifle/boltaction/enchanted/dropped()
+/obj/item/gun/ballistic/rifle/illestren/enchanted/dropped()
. = ..()
guns_left = 0
-/obj/item/gun/ballistic/rifle/boltaction/enchanted/proc/discard_gun(mob/living/user)
+/obj/item/gun/ballistic/rifle/illestren/enchanted/proc/discard_gun(mob/living/user)
user.throw_item(pick(oview(7,get_turf(user))))
-/obj/item/gun/ballistic/rifle/boltaction/enchanted/arcane_barrage/discard_gun(mob/living/user)
+/obj/item/gun/ballistic/rifle/illestren/enchanted/arcane_barrage/discard_gun(mob/living/user)
qdel(src)
-/obj/item/gun/ballistic/rifle/boltaction/enchanted/attack_self()
+/obj/item/gun/ballistic/rifle/illestren/enchanted/attack_self()
return
-/obj/item/gun/ballistic/rifle/boltaction/enchanted/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0)
+/obj/item/gun/ballistic/rifle/illestren/enchanted/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0)
. = ..()
if(!.)
return
if(guns_left)
- var/obj/item/gun/ballistic/rifle/boltaction/enchanted/gun = new type
+ var/obj/item/gun/ballistic/rifle/illestren/enchanted/gun = new type
gun.guns_left = guns_left - 1
discard_gun(user)
user.swap_hand()
@@ -171,7 +204,7 @@
else
user.dropItemToGround(src, TRUE)
-/obj/item/gun/ballistic/rifle/boltaction/polymer
+/obj/item/gun/ballistic/rifle/polymer
name = "polymer survivor rifle"
desc = "A bolt-action rifle made of scrap, desperation, and luck. Likely to shatter at any moment. Chambered in .300 Blackout."
icon = 'icons/obj/guns/projectile.dmi'
diff --git a/code/modules/projectiles/guns/ballistic/shotgun.dm b/code/modules/projectiles/guns/ballistic/shotgun.dm
index 8d4390398075..6e5a8d4d42b8 100644
--- a/code/modules/projectiles/guns/ballistic/shotgun.dm
+++ b/code/modules/projectiles/guns/ballistic/shotgun.dm
@@ -1,12 +1,6 @@
/obj/item/gun/ballistic/shotgun
name = "shotgun"
- desc = "A traditional shotgun with wood furniture and a four-shell capacity underneath."
- icon_state = "shotgun"
- lefthand_file = 'icons/mob/inhands/weapons/64x_guns_left.dmi'
- righthand_file = 'icons/mob/inhands/weapons/64x_guns_right.dmi'
item_state = "shotgun"
- inhand_x_dimension = 64
- inhand_y_dimension = 64
fire_sound = 'sound/weapons/gun/shotgun/shot.ogg'
vary_fire_sound = FALSE
fire_sound_volume = 90
@@ -29,39 +23,80 @@
manufacturer = MANUFACTURER_HUNTERSPRIDE
wield_slowdown = 0.45
- wield_delay = 0.6 SECONDS //Shotguns are really easy to put up to fire, since they are designed for CQC (at least compared to a rifle)
+ wield_delay = 0.8 SECONDS
spread = 4
spread_unwielded = 10
- recoil = 2
+ recoil = 1
recoil_unwielded = 4
/obj/item/gun/ballistic/shotgun/blow_up(mob/user)
- . = 0
if(chambered && chambered.BB)
process_fire(user, user, FALSE)
- . = 1
+ return TRUE
+ for(var/obj/item/ammo_casing/ammo in magazine.stored_ammo)
+ if(ammo.BB)
+ process_chamber(FALSE, FALSE)
+ process_fire(user, user, FALSE)
+ return TRUE
+ return FALSE
+
+// BRIMSTONE SHOTGUN //
+
+/obj/item/gun/ballistic/shotgun/brimstone
+ name = "HP Brimstone"
+ desc = "A simple and sturdy pump-action shotgun sporting a 5-round capacity, manufactured by Hunter's Pride. Found widely throughout the Frontier in the hands of hunters, pirates, police, and countless others. Chambered in 12g."
+ sawn_desc = "A stockless and shortened pump-action shotgun. The worsened recoil and accuracy make it a poor sidearm anywhere beyond punching distance."
+ fire_sound = 'sound/weapons/gun/shotgun/brimstone.ogg'
+ icon = 'icons/obj/guns/48x32guns.dmi'
+ icon_state = "brimstone"
+ item_state = "brimstone"
-/obj/item/gun/ballistic/shotgun/lethal
mag_type = /obj/item/ammo_box/magazine/internal/shot/lethal
+ manufacturer = MANUFACTURER_HUNTERSPRIDE
+ fire_delay = 1
+
+ can_be_sawn_off = TRUE
+
+
+/obj/item/gun/ballistic/shotgun/brimstone/ComponentInitialize()
+ . = ..()
+ AddComponent(/datum/component/automatic_fire, 0.1 SECONDS)
+
+/obj/item/gun/ballistic/shotgun/brimstone/sawoff(mob/user)
+ . = ..()
+ if(.)
+ weapon_weight = WEAPON_MEDIUM
+ wield_slowdown = 0.25
+ wield_delay = 0.3 SECONDS //OP? maybe
+
+ spread = 18
+ spread_unwielded = 25
+ recoil = 5 //your punishment for sawing off an short shotgun
+ recoil_unwielded = 8
+ item_state = "illestren_factory_sawn" // i couldnt care about making another sprite, looks close enough
+ mob_overlay_state = item_state
-// RIOT SHOTGUN //
+// HELLFIRE SHOTGUN //
-/obj/item/gun/ballistic/shotgun/riot //for spawn in the armory
- name = "riot shotgun"
- desc = "A sturdy shotgun with a six-shell tube and a fixed wooden stock designed for non-lethal riot control."
+/obj/item/gun/ballistic/shotgun/hellfire
+ name = "HP Hellfire"
+ desc = "A hefty pump-action riot shotgun with a seven-round tube, manufactured by Hunter's Pride. Especially popular among the Frontier's police forces. Chambered in 12g."
icon = 'icons/obj/guns/48x32guns.dmi'
- icon_state = "riotshotgun"
- item_state = "shotgun"
+ icon_state = "hellfire"
+ item_state = "hellfire"
mag_type = /obj/item/ammo_box/magazine/internal/shot/riot
sawn_desc = "Come with me if you want to live."
can_be_sawn_off = TRUE
rack_sound = 'sound/weapons/gun/shotgun/rack_alt.ogg'
fire_delay = 1
-/obj/item/gun/ballistic/shotgun/riot/sawoff(mob/user)
+/obj/item/gun/ballistic/shotgun/hellfire/sawoff(mob/user)
. = ..()
if(.)
+ var/obj/item/ammo_box/magazine/internal/tube = magazine
+ tube.max_ammo = 5 //this makes the gun so much worse
+
weapon_weight = WEAPON_MEDIUM
wield_slowdown = 0.25
wield_delay = 0.3 SECONDS //OP? maybe
@@ -70,6 +105,8 @@
spread_unwielded = 15
recoil = 3 //or not
recoil_unwielded = 5
+ item_state = "dshotgun_sawn" // ditto
+ mob_overlay_state = item_state
// Automatic Shotguns//
/obj/item/gun/ballistic/shotgun/automatic
@@ -86,6 +123,8 @@
..()
rack()
+//im not sure what to do with the combat shotgun, as it's functionally the same as the semi auto shotguns except it automattically racks instead of being semi-auto
+
/obj/item/gun/ballistic/shotgun/automatic/combat
name = "combat shotgun"
desc = "A semi-automatic shotgun with tactical furniture and six-shell capacity underneath."
@@ -161,14 +200,12 @@
righthand_file = 'icons/mob/inhands/weapons/guns_righthand.dmi'
inhand_x_dimension = 32
inhand_y_dimension = 32
- w_class = WEIGHT_CLASS_NORMAL
weapon_weight = WEAPON_MEDIUM
mag_type = /obj/item/ammo_box/magazine/m12g
can_suppress = FALSE
burst_size = 1
fire_delay = 0
- pin = /obj/item/firing_pin/implant/pindicate
- fire_sound = 'sound/weapons/gun/shotgun/shot.ogg'
+ fire_sound = 'sound/weapons/gun/shotgun/bulldog.ogg'
actions_types = list()
mag_display = TRUE
empty_indicator = TRUE
@@ -200,7 +237,13 @@
pin = /obj/item/firing_pin
manufacturer = MANUFACTURER_INTEQ
-/obj/item/gun/ballistic/shotgun/bulldog/minutemen
+/obj/item/gun/ballistic/shotgun/bulldog/suns
+ name = "\improper Bulldog-C Shotgun"
+ desc = "A variation of the Bulldog manufactured by Scarborough Arms for SUNS. Its shorter barrel is intended to provide additional maneuverability in personal defense scenarios."
+ icon_state = "bulldog_suns"
+ item_state = "bulldog_suns"
+
+/obj/item/gun/ballistic/shotgun/bulldog/minutemen //TODO: REPATH
name = "\improper CM-15"
desc = "A standard-issue shotgun of the Colonial Minutemen, most often used by boarding crews. Only compatible with specialized 8-round magazines."
icon = 'icons/obj/guns/48x32guns.dmi'
@@ -219,34 +262,87 @@
/obj/item/gun/ballistic/shotgun/doublebarrel
name = "double-barreled shotgun"
- desc = "A true classic. Both barrels can be fired in quick succession."
+ desc = "A classic break action shotgun, hand-made in a Hunter's Pride workshop. Both barrels can be fired in quick succession or even simultaneously. Guns like this have been popular with hunters, sporters, and criminals for millennia. Chambered in 12g."
+ sawn_desc = "A break action shotgun cut down to the size of a sidearm. While the recoil is even harsher, it offers a lot of power in a very small package. Chambered in 12g."
+
+
+ icon = 'icons/obj/guns/48x32guns.dmi'
+ base_icon_state = "dshotgun"
+
icon_state = "dshotgun"
- item_state = "shotgun_db"
+ item_state = "dshotgun"
+
+ rack_sound = 'sound/weapons/gun/shotgun/dbshotgun_break.ogg'
+ bolt_drop_sound = 'sound/weapons/gun/shotgun/dbshotgun_close.ogg'
+
w_class = WEIGHT_CLASS_BULKY
weapon_weight = WEAPON_MEDIUM
force = 10
flags_1 = CONDUCT_1
slot_flags = ITEM_SLOT_BACK
mag_type = /obj/item/ammo_box/magazine/internal/shot/dual
- sawn_desc = "Omar's coming!"
+
obj_flags = UNIQUE_RENAME
- rack_sound_volume = 0
unique_reskin = list("Default" = "dshotgun",
- "Dark Red Finish" = "dshotgun_d",
- "Ash" = "dshotgun_f",
- "Faded Grey" = "dshotgun_g",
- "Maple" = "dshotgun_l",
- "Rosewood" = "dshotgun_p"
+ "Stainless Steel" = "dshotgun_white",
+ "Stained Green" = "dshotgun_green"
)
semi_auto = TRUE
- bolt_type = BOLT_TYPE_NO_BOLT
can_be_sawn_off = TRUE
+ bolt_type = BOLT_TYPE_NO_BOLT
pb_knockback = 3 // it's a super shotgun!
manufacturer = MANUFACTURER_HUNTERSPRIDE
+ bolt_wording = "barrel"
+
+/obj/item/gun/ballistic/shotgun/doublebarrel/unique_action(mob/living/user)
+ if (bolt_locked == FALSE)
+ to_chat(user, "You snap open the [bolt_wording] of \the [src]. ")
+ playsound(src, rack_sound, rack_sound_volume, rack_sound_vary)
+ chambered = null
+ var/num_unloaded = 0
+ for(var/obj/item/ammo_casing/casing_bullet in get_ammo_list(FALSE, TRUE))
+ casing_bullet.forceMove(drop_location())
+ casing_bullet.bounce_away(FALSE, NONE)
+ num_unloaded++
+ SSblackbox.record_feedback("tally", "station_mess_created", 1, casing_bullet.name)
+ if (num_unloaded)
+ playsound(user, eject_sound, eject_sound_volume, eject_sound_vary)
+ update_appearance()
+ bolt_locked = TRUE
+ update_appearance()
+ return
+ drop_bolt(user)
+
+/obj/item/gun/ballistic/shotgun/doublebarrel/drop_bolt(mob/user = null)
+ playsound(src, bolt_drop_sound, bolt_drop_sound_volume, FALSE)
+ if (user)
+ to_chat(user, "You snap the [bolt_wording] of \the [src] closed. ")
+ chamber_round()
+ bolt_locked = FALSE
+ update_appearance()
+
+/obj/item/gun/ballistic/shotgun/doublebarrel/can_shoot()
+ if (bolt_locked)
+ return FALSE
+ return ..()
+
+/obj/item/gun/ballistic/shotgun/doublebarrel/attackby(obj/item/A, mob/user, params)
+ if (!bolt_locked)
+ to_chat(user, "The [bolt_wording] is shut closed! ")
+ return
+ return ..()
+
+/obj/item/gun/ballistic/shotgun/doublebarrel/update_icon_state()
+ . = ..()
+ if(current_skin)
+ icon_state = "[unique_reskin[current_skin]][sawn_off ? "_sawn" : ""][bolt_locked ? "_open" : ""]"
+ else
+ icon_state = "[base_icon_state || initial(icon_state)][sawn_off ? "_sawn" : ""][bolt_locked ? "_open" : ""]"
+
/obj/item/gun/ballistic/shotgun/doublebarrel/AltClick(mob/user)
. = ..()
- if(unique_reskin && !current_skin && user.canUseTopic(src, BE_CLOSE, NO_DEXTERITY))
+ if(unique_reskin && !current_skin && user.canUseTopic(src, BE_CLOSE, NO_DEXTERITY) && (!bolt_locked))
reskin_obj(user)
/obj/item/gun/ballistic/shotgun/doublebarrel/sawoff(mob/user)
@@ -260,12 +356,30 @@
spread_unwielded = 15
recoil = 3 //or not
recoil_unwielded = 5
+ item_state = "dshotgun_sawn"
+ mob_overlay_state = item_state
+
+/obj/item/gun/ballistic/shotgun/doublebarrel/roumain
+ name = "HP antique double-barreled shotgun"
+ desc = "A special-edition shotgun hand-made by Hunter's Pride with a high-quality walnut stock inlaid with brass scrollwork. Shotguns like this are very rare outside of the Saint-Roumain Militia's ranks. Otherwise functionally identical to a common double-barreled shotgun. Chambered in 12g."
+ sawn_desc = "A special-edition Hunter's Pride shotgun, cut down to the size of a sidearm by some barbarian. The brass inlay on the stock and engravings on the barrel have been obliterated in the process, destroying any value beyond its use as a crude sidearm."
+ base_icon_state = "dshotgun_srm"
+ icon_state = "dshotgun_srm"
+ item_state = "dshotgun_srm"
+ unique_reskin = null
+
+/obj/item/gun/ballistic/shotgun/doublebarrel/roumain/sawoff(mob/user)
+ . = ..()
+ if(.)
+ item_state = "dshotgun_srm_sawn"
// IMPROVISED SHOTGUN //
/obj/item/gun/ballistic/shotgun/doublebarrel/improvised
name = "improvised shotgun"
desc = "A length of pipe and miscellaneous bits of scrap fashioned into a rudimentary single-shot shotgun."
+ icon = 'icons/obj/guns/projectile.dmi'
+ base_icon_state = "ishotgun"
icon_state = "ishotgun"
item_state = "ishotgun"
w_class = WEIGHT_CLASS_BULKY
@@ -414,6 +528,7 @@
/obj/item/gun/ballistic/shotgun/doublebarrel/brazil
name = "six-barreled \"TRABUCO\" shotgun"
desc = "Dear fucking god, what the fuck even is this!? The recoil caused by the sheer act of firing this thing would probably kill you, if the gun itself doesn't explode in your face first! Theres a green flag with a blue circle and a yellow diamond around it. Some text in the circle says: \"ORDEM E PROGRESSO.\""
+ base_icon_state = "shotgun_brazil"
icon_state = "shotgun_brazil"
icon = 'icons/obj/guns/48x32guns.dmi'
lefthand_file = 'icons/mob/inhands/weapons/64x_guns_left.dmi'
@@ -424,10 +539,11 @@
attack_verb = list("bludgeoned", "smashed")
mag_type = /obj/item/ammo_box/magazine/internal/shot/sex
burst_size = 6
- fire_delay = 0.1
+ fire_delay = 0.8
pb_knockback = 12
unique_reskin = null
recoil = 10
+ recoil_unwielded = 30
weapon_weight = WEAPON_LIGHT
fire_sound = 'sound/weapons/gun/shotgun/quadfire.ogg'
rack_sound = 'sound/weapons/gun/shotgun/quadrack.ogg'
@@ -453,19 +569,24 @@
/obj/item/gun/ballistic/shotgun/doublebarrel/brazil/death
name = "Force of Nature"
desc = "So you have chosen death."
+ base_icon_state = "shotgun_e"
icon_state = "shotgun_e"
burst_size = 100
+ fire_delay = 0.1
pb_knockback = 40
recoil = 100
+ recoil_unwielded = 200
fire_sound_volume = 100
mag_type = /obj/item/ammo_box/magazine/internal/shot/hundred
//Lever-Action Rifles
-/obj/item/gun/ballistic/shotgun/winchester
- name = "Winchester MK.2"
- desc = "A sturdy lever-action rifle with hand-stamped Hunter's Pride marks on the receiver. Modern and sleek."
- icon_state = "winchester"
- item_state = "winchester"
+/obj/item/gun/ballistic/shotgun/flamingarrow
+ name = "HP Flaming Arrow"
+ desc = "A sturdy and lightweight lever-action rifle with hand-stamped Hunter's Pride marks on the receiver. A popular choice among Frontier homesteaders for hunting small game and rudimentary self-defense. Chambered in .38."
+ sawn_desc = "A lever-action rifle that has been sawed down and modified for extra portability. While surprisingly effective as a sidearm, the more important benefit is how much cooler it looks."
+ base_icon_state = "flamingarrow"
+ icon_state = "flamingarrow"
+ item_state = "flamingarrow"
icon = 'icons/obj/guns/48x32guns.dmi'
mob_overlay_icon = 'icons/mob/clothing/back.dmi'
lefthand_file = 'icons/mob/inhands/weapons/guns_lefthand.dmi'
@@ -473,39 +594,76 @@
inhand_x_dimension = 32
inhand_y_dimension = 32
mag_type = /obj/item/ammo_box/magazine/internal/shot/winchester
- fire_sound = 'sound/weapons/gun/rifle/shot.ogg'
+ fire_sound = 'sound/weapons/gun/rifle/flamingarrow.ogg'
rack_sound = 'sound/weapons/gun/rifle/ak47_cocked.ogg'
bolt_wording = "lever"
cartridge_wording = "bullet"
+ can_be_sawn_off = TRUE
+
+ wield_slowdown = 0.5
+ wield_delay = 0.65 SECONDS
spread = -5
spread_unwielded = 7
+
recoil = 0
recoil_unwielded = 2
- wield_slowdown = 0.5
-/obj/item/gun/ballistic/shotgun/winchester/rack(mob/user = null)
+//sawn off
+ weapon_weight = WEAPON_MEDIUM
+
+ wield_slowdown = 0.25
+ wield_delay = 0.2 SECONDS //THE COWBOY RIFLE
+
+ spread = 4
+ spread_unwielded = 12
+
+ recoil = 1
+ recoil_unwielded = 2
+
+/obj/item/gun/ballistic/shotgun/flamingarrow/update_icon_state()
+ . = ..()
+ if(current_skin)
+ icon_state = "[unique_reskin[current_skin]][sawn_off ? "_sawn" : ""]"
+ else
+ icon_state = "[base_icon_state || initial(icon_state)][sawn_off ? "_sawn" : ""]"
+
+
+/obj/item/gun/ballistic/shotgun/flamingarrow/factory
+ desc = "A sturdy and lightweight lever-action rifle with hand-stamped Hunter's Pride marks on the receiver. This example has been kept in excellent shape and may as well be fresh out of the workshop. Chambered in .38."
+ icon_state = "flamingarrow_factory"
+ base_icon_state = "flamingarrow_factory"
+ item_state = "flamingarrow_factory"
+
+/obj/item/gun/ballistic/shotgun/flamingarrow/factory/sawoff(mob/user)
. = ..()
- if(!wielded)
- SpinAnimation(7,1)
+ if(.)
+ item_state = "flamingarrow_factory_sawn"
+
+/obj/item/gun/ballistic/shotgun/flamingarrow/bolt
+ name = "HP Flaming Bolt"
+ desc = "A sturdy, excellently-made lever-action rifle. This one appears to be a genuine antique, kept in incredibly good condition despite its advanced age. Chambered in .38."
+ base_icon_state = "flamingbolt"
+ icon_state = "flamingbolt"
+ item_state = "flamingbolt"
-/obj/item/gun/ballistic/shotgun/winchester/mk1
- name = "Winchester MK.1"
- desc = "A sturdy lever-action rifle. This antique pattern appears to be in excellent condition despite its age."
- icon_state = "winchestermk1"
- item_state = "winchestermk1"
+/obj/item/gun/ballistic/shotgun/flamingarrow/bolt/sawoff(mob/user)
+ . = ..()
+ if(.)
+ item_state = "flamingbolt_sawn"
//Elephant Gun
/obj/item/gun/ballistic/shotgun/doublebarrel/twobore
- name = "two-bore rifle"
- desc = "Take this, elephant! If you want an intact trophy, don't aim for the head. Chambered in two-bore."
+ name = "HP Huntsman"
+ desc = "A comically huge double-barreled rifle replete with brass inlays depicting flames and naturalistic scenes, clearly meant for the nastiest monsters the Frontier has to offer. If you want an intact trophy, don't aim for the head. Chambered in two-bore."
icon = 'icons/obj/guns/48x32guns.dmi'
lefthand_file = 'icons/mob/inhands/weapons/guns_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/guns_righthand.dmi'
inhand_x_dimension = 32
inhand_y_dimension = 32
- icon_state = "twobore"
- item_state = "twobore"
+ base_icon_state = "huntsman"
+ icon_state = "huntsman"
+ item_state = "huntsman"
unique_reskin = null
attack_verb = list("bludgeoned", "smashed")
mag_type = /obj/item/ammo_box/magazine/internal/shot/twobore
@@ -523,30 +681,27 @@
manufacturer = MANUFACTURER_HUNTERSPRIDE
//Break-Action Rifle
-/obj/item/gun/ballistic/shotgun/contender
- name = "Contender"
- desc = "A single-shot break-action rifle made by Hunter's Pride. Boasts excellent accuracy and stopping power. Uses .45-70 ammo."
- icon_state = "contender"
- item_state = "contender"
+/obj/item/gun/ballistic/shotgun/doublebarrel/beacon
+ name = "HP Beacon"
+ desc = "A single-shot break-action rifle made by Hunter's Pride and sold to civilian hunters. Boasts excellent accuracy and stopping power. Uses .45-70 ammo."
+ sawn_desc= "A single-shot break-action pistol chambered in .45-70. A bit difficult to aim."
+ base_icon_state = "beacon"
+ icon_state = "beacon"
+ item_state = "beacon"
icon = 'icons/obj/guns/48x32guns.dmi'
mob_overlay_icon = 'icons/mob/clothing/back.dmi'
- lefthand_file = 'icons/mob/inhands/weapons/64x_guns_left.dmi'
- righthand_file = 'icons/mob/inhands/weapons/64x_guns_right.dmi'
inhand_x_dimension = 32
inhand_y_dimension = 32
- mag_type = /obj/item/ammo_box/magazine/internal/shot/contender
+ mag_type = /obj/item/ammo_box/magazine/internal/shot/beacon
fire_sound = 'sound/weapons/gun/revolver/shot_hunting.ogg'
can_be_sawn_off=TRUE
- sawn_desc= "A single-shot pistol. It's hard to aim without a front sight."
w_class = WEIGHT_CLASS_BULKY
weapon_weight = WEAPON_MEDIUM
force = 10
flags_1 = CONDUCT_1
slot_flags = ITEM_SLOT_BACK
obj_flags = UNIQUE_RENAME
- rack_sound_volume = 0
semi_auto = TRUE
- bolt_type = BOLT_TYPE_NO_BOLT
can_be_sawn_off = TRUE
pb_knockback = 3
wield_slowdown = 0.7
@@ -555,12 +710,11 @@
recoil = 0
recoil_unwielded = 5
-
-
-/obj/item/gun/ballistic/shotgun/contender/sawoff(mob/user)
+/obj/item/gun/ballistic/shotgun/doublebarrel/beacon/sawoff(mob/user)
. = ..()
if(.)
- item_state = "contender_sawn"
+ item_state = "beacon_sawn"
+ mob_overlay_state = item_state
wield_slowdown = 0.5
wield_delay = 0.5 SECONDS
@@ -568,3 +722,16 @@
spread = 2
recoil = 2
recoil_unwielded = 3
+
+/obj/item/gun/ballistic/shotgun/doublebarrel/beacon/factory
+ desc = "A single-shot break-action rifle made by Hunter's Pride and sold to civilian hunters. This example has been kept in excellent shape and may as well be fresh out of the workshop. Uses .45-70 ammo."
+ sawn_desc= "A single-shot break-action pistol chambered in .45-70. A bit difficult to aim."
+ base_icon_state = "beacon_factory"
+ icon_state = "beacon_factory"
+ item_state = "beacon_factory"
+
+/obj/item/gun/ballistic/shotgun/doublebarrel/beacon/factory/sawoff(mob/user)
+ . = ..()
+ if(.)
+ item_state = "beacon_factory_sawn"
+ mob_overlay_state = item_state
diff --git a/code/modules/projectiles/guns/ballistic/smg.dm b/code/modules/projectiles/guns/ballistic/smg.dm
index 7efd0a579925..23d853753f9b 100644
--- a/code/modules/projectiles/guns/ballistic/smg.dm
+++ b/code/modules/projectiles/guns/ballistic/smg.dm
@@ -5,7 +5,7 @@
spread = 4
spread_unwielded = 10
wield_slowdown = 0.35
- recoil_unwielded = 0.5
+ recoil_unwielded = 4
load_sound = 'sound/weapons/gun/smg/smg_reload.ogg'
load_empty_sound = 'sound/weapons/gun/smg/smg_reload.ogg'
@@ -25,14 +25,14 @@
/obj/item/gun/ballistic/automatic/smg/proto/ComponentInitialize()
. = ..()
- AddComponent(/datum/component/automatic_fire, 0.15 SECONDS)
+ AddComponent(/datum/component/automatic_fire, 0.13 SECONDS)
/obj/item/gun/ballistic/automatic/smg/proto/unrestricted
pin = /obj/item/firing_pin
/obj/item/gun/ballistic/automatic/smg/c20r
name = "\improper C-20r SMG"
- desc = "A bullpup .45 SMG, designated 'C-20r'. Has a 'Scarborough Arms - Per falcis, per pravitas' buttstamp."
+ desc = "A bullpup .45 SMG designated 'C-20r.' Its buttstamp reads 'Scarborough Arms - Per falcis, per pravitas.'"
icon_state = "c20r"
item_state = "c20r"
mag_type = /obj/item/ammo_box/magazine/smgm45
@@ -47,7 +47,7 @@
/obj/item/gun/ballistic/automatic/smg/c20r/ComponentInitialize()
. = ..()
- AddComponent(/datum/component/automatic_fire, 0.15 SECONDS)
+ AddComponent(/datum/component/automatic_fire, 0.13 SECONDS)
/obj/item/gun/ballistic/automatic/smg/c20r/unrestricted
pin = /obj/item/firing_pin
@@ -63,6 +63,11 @@
icon_state = "cobra20"
item_state = "cobra20"
+/obj/item/gun/ballistic/automatic/smg/c20r/suns
+ desc = "A bullpup .45 SMG designated 'C-20r.' Its buttstamp reads 'Scarborough Arms - Per falcis, per pravitas.' This one is painted in SUNS' colors."
+ icon_state = "c20r_suns"
+ item_state = "c20r_suns"
+
/obj/item/gun/ballistic/automatic/smg/inteq
name = "\improper SkM-44(k)"
desc = "An extreme modification of an obsolete assault rifle, converted into a compact submachine gun by IRMG. Chambered in 10mm."
@@ -80,7 +85,7 @@
/obj/item/gun/ballistic/automatic/smg/inteq/ComponentInitialize()
. = ..()
- AddComponent(/datum/component/automatic_fire, 0.15 SECONDS)
+ AddComponent(/datum/component/automatic_fire, 0.13 SECONDS)
/obj/item/gun/ballistic/automatic/smg/wt550
name = "\improper WT-550 Automatic Rifle"
@@ -88,7 +93,6 @@
icon_state = "wt550"
item_state = "arg"
mag_type = /obj/item/ammo_box/magazine/wt550m9
- fire_delay = 2
can_suppress = FALSE
burst_size = 1
actions_types = list()
@@ -103,7 +107,7 @@
/obj/item/gun/ballistic/automatic/smg/wt550/ComponentInitialize()
. = ..()
- AddComponent(/datum/component/automatic_fire, 0.15 SECONDS)
+ AddComponent(/datum/component/automatic_fire, 0.13 SECONDS)
/obj/item/gun/ballistic/automatic/smg/mini_uzi
name = "\improper Type U3 Uzi"
@@ -143,7 +147,7 @@
/obj/item/gun/ballistic/automatic/smg/vector/ComponentInitialize()
. = ..()
- AddComponent(/datum/component/automatic_fire, 0.15 SECONDS)
+ AddComponent(/datum/component/automatic_fire, 0.13 SECONDS)
/obj/item/gun/ballistic/automatic/smg/m90
name = "\improper M-90gl Carbine"
@@ -223,29 +227,34 @@
update_appearance()
return
-/obj/item/gun/ballistic/automatic/smg/thompson
- name = "\improper Thompson"
- desc = "A old submachinegun design. Chambered in .45."
- icon_state = "tommygun"
- item_state = "tommygun"
+/obj/item/gun/ballistic/automatic/smg/firestorm //weapon designed by Apogee-dev
+ name = "HP Firestorm"
+ desc = "An unconventional submachinegun, rarely issued to Saint-Roumain Militia mercenary hunters for outstanding situations where normal hunting weapons fall short. Chambered in .45."
icon = 'icons/obj/guns/48x32guns.dmi'
- slot_flags = 0
- mag_type = /obj/item/ammo_box/magazine/smgm45
+ icon_state = "firestorm"
+ item_state = "firestorm"
+ mag_type = /obj/item/ammo_box/magazine/c45_firestorm_mag
can_suppress = FALSE
burst_size = 1
actions_types = list()
fire_delay = 1
- bolt_type = BOLT_TYPE_OPEN
+ rack_sound = 'sound/weapons/gun/smg/uzi_cocked.ogg'
+ fire_sound = 'sound/weapons/gun/smg/firestorm.ogg'
+
+ manufacturer = MANUFACTURER_HUNTERSPRIDE
wield_slowdown = 0.4
-/obj/item/gun/ballistic/automatic/smg/thompson/Initialize()
+/obj/item/gun/ballistic/automatic/smg/firestorm/Initialize()
. = ..()
- AddComponent(/datum/component/automatic_fire, 0.15 SECONDS)
+ AddComponent(/datum/component/automatic_fire, 0.13 SECONDS)
+
+/obj/item/gun/ballistic/automatic/smg/firestorm/pan //spawns with pan magazine, can take sticks instead of just drums, not sure where this would be used, maybe erts?
+ spawnwithmagazine = FALSE
-/obj/item/gun/ballistic/automatic/smg/thompson/drum
- name = "\improper Chicago Typewriter"
- desc = "A gun for good fellas. Chambered in .45."
- mag_type = /obj/item/ammo_box/magazine/smgm45/drum
+/obj/item/gun/ballistic/automatic/smg/firestorm/pan/Initialize()
+ . = ..()
+ magazine = new /obj/item/ammo_box/magazine/c45_firestorm_mag/pan(src)
+ chamber_round()
/obj/item/gun/ballistic/automatic/smg/cm5
name = "\improper CM-5"
@@ -259,7 +268,7 @@
/obj/item/gun/ballistic/automatic/smg/cm5/ComponentInitialize()
. = ..()
- AddComponent(/datum/component/automatic_fire, 0.15 SECONDS)
+ AddComponent(/datum/component/automatic_fire, 0.13 SECONDS)
/obj/item/gun/ballistic/automatic/smg/cm5/no_mag
spawnwithmagazine = FALSE
@@ -278,4 +287,4 @@
/obj/item/gun/ballistic/automatic/smg/aks74u/ComponentInitialize()
. = ..()
- AddComponent(/datum/component/automatic_fire, 0.15 SECONDS) //last autofire system made the fire rate REALLY fucking fast, but because of how poor it was, it was normal speed.
+ AddComponent(/datum/component/automatic_fire, 0.13 SECONDS) //last autofire system made the fire rate REALLY fucking fast, but because of how poor it was, it was normal speed.
diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm
index 229d49c4a8c6..a6be53e82ea2 100644
--- a/code/modules/projectiles/guns/energy.dm
+++ b/code/modules/projectiles/guns/energy.dm
@@ -299,3 +299,9 @@
playsound(user, BB.hitsound_non_living, 50, TRUE)
cell.use(E.e_cost)
. = "[user] casually lights their [A.name] with [src]. Damn. "
+
+
+/obj/item/gun/energy/examine(mob/user)
+ . = ..()
+ if(ammo_type.len > 1)
+ . += "You can switch firemodes by pressing the unqiue action key. By default, this is space "
diff --git a/code/modules/projectiles/guns/energy/energy_gun.dm b/code/modules/projectiles/guns/energy/energy_gun.dm
index 223cdc09e157..5c7153727646 100644
--- a/code/modules/projectiles/guns/energy/energy_gun.dm
+++ b/code/modules/projectiles/guns/energy/energy_gun.dm
@@ -217,7 +217,7 @@
/obj/item/gun/energy/e_gun/smg/Initialize()
. = ..()
- AddComponent(/datum/component/automatic_fire, 0.2 SECONDS)
+ AddComponent(/datum/component/automatic_fire, 0.13 SECONDS)
/obj/item/gun/energy/e_gun/iot
name = "\improper E-SG 500 Second Edition"
diff --git a/code/modules/projectiles/guns/energy/pulse.dm b/code/modules/projectiles/guns/energy/pulse.dm
index f5efacbf96c3..9ed110dfa041 100644
--- a/code/modules/projectiles/guns/energy/pulse.dm
+++ b/code/modules/projectiles/guns/energy/pulse.dm
@@ -89,7 +89,7 @@
to_chat(user, "[src.name] has three settings, and they are all DESTROY. ")
/obj/item/gun/energy/pulse/pistol/m1911
- name = "\improper M1911-P"
+ name = "\improper Candor-P"
desc = "A compact pulse core in a classic handgun frame for Nanotrasen officers. It's not the size of the gun, it's the size of the hole it puts through people."
icon_state = "m1911"
item_state = "gun"
diff --git a/code/modules/projectiles/projectile/bullets/pistol.dm b/code/modules/projectiles/projectile/bullets/pistol.dm
index 6a1323e481dc..a04fc2995c26 100644
--- a/code/modules/projectiles/projectile/bullets/pistol.dm
+++ b/code/modules/projectiles/projectile/bullets/pistol.dm
@@ -64,7 +64,7 @@
stamina = 38
armour_penetration = -40
-// .45 (M1911, C20r, Thompson)
+// .45 (Candor, C20r, Thompson)
/obj/projectile/bullet/c45
name = ".45 bullet"
diff --git a/code/modules/projectiles/projectile/bullets/revolver.dm b/code/modules/projectiles/projectile/bullets/revolver.dm
index ecd8b5abbbb9..ec210c410dc4 100644
--- a/code/modules/projectiles/projectile/bullets/revolver.dm
+++ b/code/modules/projectiles/projectile/bullets/revolver.dm
@@ -1,10 +1,3 @@
-// 7.62x38mmR (Nagant Revolver)
-
-/obj/projectile/bullet/n762
- name = "7.62x38mmR bullet"
- damage = 30
- armour_penetration = -20
-
// .50 AE (Desert Eagle)
/obj/projectile/bullet/a50AE
@@ -155,4 +148,4 @@
damage = 20
armour_penetration = -45
ricochet_incidence_leeway = 20
- ricochet_chance = 45
+ ricochet_chance = 65
diff --git a/code/modules/projectiles/projectile/bullets/rifle.dm b/code/modules/projectiles/projectile/bullets/rifle.dm
index f72ecfdfbcd4..551a63cc512f 100644
--- a/code/modules/projectiles/projectile/bullets/rifle.dm
+++ b/code/modules/projectiles/projectile/bullets/rifle.dm
@@ -5,12 +5,12 @@
damage = 25
armour_penetration = 20
-// 7.62x54mmR (Illestren Rifle)
+// 8x50mmR (Illestren Rifle)
-/obj/projectile/bullet/a762_54
- name = "7.62x54mmR bullet"
+/obj/projectile/bullet/a8_50r
+ name = "8x50mmR bullet"
speed = 0.3
- damage = 30
+ damage = 35
armour_penetration = 40
// .300 Magnum (Smile Rifle)
@@ -18,14 +18,14 @@
/obj/projectile/bullet/a300
name = ".300 Magnum bullet"
speed = 0.3
- damage = 40
+ damage = 45
stamina = 10
armour_penetration = 40
// Bloat evil wizard stupid shit
/obj/projectile/bullet/a762_enchanted
- name = "enchanted 7.62x54mmR bullet"
+ name = "enchanted 8x50mmR bullet"
damage = 20
stamina = 80
@@ -52,8 +52,8 @@
//.308 WIN (M514 & GAL DMRs)
-/obj/projectile/bullet/win308
- name = ".308 Winchester"
+/obj/projectile/bullet/a308
+ name = ".308"
speed = 0.3
damage = 30
armour_penetration = 40
@@ -63,7 +63,7 @@
/obj/projectile/bullet/a858
name = "8x58mm caseless bullet"
speed = 0.3
- damage = 30
+ damage = 35
armour_penetration = 40
diff --git a/code/modules/projectiles/projectile/bullets/shotgun.dm b/code/modules/projectiles/projectile/bullets/shotgun.dm
index 0979a268ee16..e102c4c3b48f 100644
--- a/code/modules/projectiles/projectile/bullets/shotgun.dm
+++ b/code/modules/projectiles/projectile/bullets/shotgun.dm
@@ -8,7 +8,7 @@
name = "beanbag slug"
damage = 10
stamina = 60
- armour_penetration = -20
+ armour_penetration = -45
/obj/projectile/bullet/incendiary/shotgun
name = "incendiary slug"
@@ -73,8 +73,7 @@
/obj/projectile/bullet/pellet/buckshot
name = "buckshot pellet"
- damage = 20
- armour_penetration = -10
+ damage = 13
/obj/projectile/bullet/pellet/rubbershot
name = "rubbershot pellet"
@@ -101,6 +100,7 @@
/obj/projectile/bullet/pellet/improvised
damage = 6
+ armour_penetration = -35
tile_dropoff = 0.6
// Mech Scattershot
diff --git a/code/modules/research/designs.dm b/code/modules/research/designs.dm
index c3e9a29c7bfd..59e1ab844544 100644
--- a/code/modules/research/designs.dm
+++ b/code/modules/research/designs.dm
@@ -137,13 +137,6 @@ other types of metals and chemistry for reagents).
. = ..()
blueprints[1] = new /datum/design/c10mm()
-/obj/item/disk/design_disk/ammo_n762
- name = "Design Disk - 7.62x38mmR Ammo"
- desc = "A design disk containing the pattern for an ammo holder of 7.62x38mmR ammo, used in Nagant revolvers. It's a wonder anybody still makes these."
-
-/obj/item/disk/design_disk/ammo_n762/Initialize()
- . = ..()
- blueprints[1] = new /datum/design/n762()
/obj/item/disk/design_disk/adv/disposable_gun
name = "design disk - disposable gun"
diff --git a/code/modules/research/designs/comp_board_designs.dm b/code/modules/research/designs/comp_board_designs.dm
index 22a815dfa5ac..9b167598d026 100644
--- a/code/modules/research/designs/comp_board_designs.dm
+++ b/code/modules/research/designs/comp_board_designs.dm
@@ -88,22 +88,6 @@
category = list("Computer Boards")
departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
-/datum/design/board/scan_console
- name = "Computer Design (DNA Machine)"
- desc = "Allows for the construction of circuit boards used to build a new DNA scanning console."
- id = "scan_console"
- build_path = /obj/item/circuitboard/computer/scan_consolenew
- category = list("Computer Boards")
- departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE
-
-/datum/design/board/cloning
- name = "Computer Design (Cloning Console)"
- desc = "Used to clone people and manage DNA."
- id = "cloning"
- build_path = /obj/item/circuitboard/computer/cloning
- category = list("Computer Boards")
- departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE
-
/datum/design/board/comconsole
name = "Computer Design (Communications)"
desc = "Allows for the construction of circuit boards used to build a communications console."
diff --git a/code/modules/research/designs/machine_designs.dm b/code/modules/research/designs/machine_designs.dm
index 0ed2e97f39b9..3cf848089652 100644
--- a/code/modules/research/designs/machine_designs.dm
+++ b/code/modules/research/designs/machine_designs.dm
@@ -183,23 +183,6 @@
build_path = /obj/item/circuitboard/machine/reagentgrinder
category = list ("Medical Machinery")
-
-/datum/design/board/dnascanner
- name = "Machine Design (DNA Scanner)"
- desc = "Allows for the construction of circuit boards used to build a Cloning Scanner."
- id = "dnascanner"
- departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE
- build_path = /obj/item/circuitboard/machine/dnascanner
- category = list("Medical Machinery")
-
-/datum/design/board/clonepod
- name = "Machine Design (Cloning Pod)"
- desc = "An electronically-lockable pod for growing organic tissue."
- id = "clonepod"
- departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE
- build_path = /obj/item/circuitboard/machine/clonepod
- category = list("Medical Machinery")
-
/datum/design/board/hypnochair
name = "Machine Design (Enhanced Interrogation Chamber)"
desc = "Allows for the construction of circuit boards used to build an Enhanced Interrogation Chamber."
diff --git a/code/modules/research/designs/medical_designs.dm b/code/modules/research/designs/medical_designs.dm
index e590e118c035..6e4a1b61d06f 100644
--- a/code/modules/research/designs/medical_designs.dm
+++ b/code/modules/research/designs/medical_designs.dm
@@ -80,16 +80,6 @@
category = list("Medical Designs")
departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE
-/datum/design/dna_disk
- name = "Genetic Data Disk"
- desc = "Produce additional disks for storing genetic data."
- id = "dna_disk"
- build_type = PROTOLATHE
- materials = list(/datum/material/iron = 300, /datum/material/glass = 100, /datum/material/silver = 50)
- build_path = /obj/item/disk/data
- category = list("Medical Designs")
- departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE
-
/datum/design/piercesyringe
name = "Piercing Syringe"
desc = "A diamond-tipped syringe that pierces armor when launched at high velocity. It can hold up to 10 units."
@@ -181,16 +171,6 @@
category = list("Medical Designs")
departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
-/datum/design/genescanner
- name = "Genetic Sequence Scanner"
- desc = "A convenient hand-held scanner for quickly determining mutations and collecting the target's full genetic sequence."
- id = "genescanner"
- build_path = /obj/item/sequence_scanner
- build_type = PROTOLATHE
- materials = list(/datum/material/iron = 1000, /datum/material/glass = 500)
- category = list("Medical Designs")
- departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE
-
/datum/design/healthanalyzer_advanced
name = "Advanced Health Analyzer"
desc = "A hand-held body scanner able to distinguish vital signs of the subject with high accuracy."
diff --git a/code/modules/research/designs/weapon_designs.dm b/code/modules/research/designs/weapon_designs.dm
index 2ac4359e2bf8..c0b4757e2548 100644
--- a/code/modules/research/designs/weapon_designs.dm
+++ b/code/modules/research/designs/weapon_designs.dm
@@ -280,7 +280,7 @@
/datum/design/commanderammo
name = "Commander magazine (9mm)"
- desc = "A single stack M1911 reproduction magazine, modified to chamber 9mm and fit into Commander sidearms."
+ desc = "A single stack magazine chambered in 9mm for Commander sidearms."
id = "commanderammo"
build_type = PROTOLATHE
materials = list(/datum/material/iron = 15000)
@@ -298,10 +298,10 @@
category = list("Ammo")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
-/datum/design/m1911ammo
- name = "M1911 magazine (.45)"
- desc = "A single stack M1911 magazine, faithfully designed to chamber .45 and fit into the popular M1911 sidearms."
- id = "m1911ammo"
+/datum/design/candorammo
+ name = "Candor magazine (.45)"
+ desc = "A single stack Candor magazine, faithfully designed to chamber .45 and fit into the popular Candor sidearms."
+ id = "candorammo"
build_type = PROTOLATHE
materials = list(/datum/material/iron = 15000)
build_path = /obj/item/ammo_box/magazine/m45
@@ -663,14 +663,6 @@
build_path = /obj/item/ammo_box/magazine/m45
category = list("Imported")
-/datum/design/n762
- name = "Ammo Holder (7.62x38mmR)"
- id = "n762"
- build_type = AUTOLATHE
- materials = list(/datum/material/iron = 20000)
- build_path = /obj/item/ammo_box/n762
- category = list("Imported")
-
/datum/design/disposable_gun
name = "Disposable Gun"
id = "disposable"
@@ -698,13 +690,13 @@
category = list("Weapons")
departmental_flags = DEPARTMENTAL_FLAG_BALLISTICS
-/datum/design/m1911
- name = "M1911 Pistol"
+/datum/design/Candor
+ name = "Candor Pistol"
desc = "A classic pistol."
- id = "m1911"
+ id = "candor"
build_type = PROTOLATHE
materials = list(/datum/material/iron = 8000, /datum/material/silver = 3000, /datum/material/titanium = 2000)
- build_path = /obj/item/gun/ballistic/automatic/pistol/m1911/no_mag
+ build_path = /obj/item/gun/ballistic/automatic/pistol/candor/factory/no_mag
category = list("Weapons")
departmental_flags = DEPARTMENTAL_FLAG_BALLISTICS
@@ -719,22 +711,12 @@
departmental_flags = DEPARTMENTAL_FLAG_BALLISTICS
/datum/design/winchestermk2
- name = "Winchester Mk2 Rifle"
- desc = "A newer model of Winchester Rifle, sturdy and lever action."
+ name = "Flaming Arrow Lever-action Rifle"
+ desc = "A Flaming Arrow, sturdy and lever action."
id = "winchmk2"
build_type = PROTOLATHE
materials = list(/datum/material/iron = 10000, /datum/material/glass = 3000, /datum/material/silver = 4000, /datum/material/gold = 500)
- build_path = /obj/item/gun/ballistic/shotgun/winchester
- category = list("Weapons")
- departmental_flags = DEPARTMENTAL_FLAG_BALLISTICS
-
-/datum/design/srmrevolver
- name = "SRM Standard Issue .357 Revolver"
- desc = "A trusty revolver common amongst hunters and Montagnes."
- id = "srmrevolver"
- build_type = PROTOLATHE
- materials = list(/datum/material/iron = 9000, /datum/material/glass = 1000, /datum/material/silver = 1000, /datum/material/uranium = 1000)
- build_path = /obj/item/gun/ballistic/revolver/srm
+ build_path = /obj/item/gun/ballistic/shotgun/flamingarrow
category = list("Weapons")
departmental_flags = DEPARTMENTAL_FLAG_BALLISTICS
@@ -744,27 +726,27 @@
id = "pepperbox"
build_type = PROTOLATHE
materials = list(/datum/material/iron = 7000, /datum/material/glass = 1000)
- build_path = /obj/item/gun/ballistic/revolver/pepperbox
+ build_path = /obj/item/gun/ballistic/revolver/firebrand
category = list("Weapons")
departmental_flags = DEPARTMENTAL_FLAG_BALLISTICS
-/datum/design/nagantrevolver
- name = "Nagant Revolver"
- desc = "An old model of revolver. Uses 7.62."
- id = "nagantrevolver"
+/datum/design/montagne
+ name = "Montagne Revolver"
+ desc = "The revolver of choice of Hunger Montagnes all over. Uses .38."
+ id = "montagne"
build_type = PROTOLATHE
materials = list(/datum/material/iron = 90000, /datum/material/glass = 1500, /datum/material/silver = 1500)
- build_path = /obj/item/gun/ballistic/revolver/nagant
+ build_path = /obj/item/gun/ballistic/revolver/montagne
category = list("Weapons")
departmental_flags = DEPARTMENTAL_FLAG_BALLISTICS
/datum/design/stripper762
- name = "7.62x54mm Stripperclip"
- desc = "A stripperclip of 7.62x54mm."
+ name = "8x50mmR Stripperclip"
+ desc = "A stripperclip of 8x50mmR."
id = "stripper762"
build_type = PROTOLATHE
materials = list(/datum/material/iron = 10000)
- build_path = /obj/item/ammo_box/a762
+ build_path = /obj/item/ammo_box/magazine/illestren_a850r
category = list("Ammo")
departmental_flags = DEPARTMENTAL_FLAG_BALLISTICS
@@ -778,13 +760,13 @@
category = list("Ammo")
departmental_flags = DEPARTMENTAL_FLAG_BALLISTICS
-/datum/design/nagantrifle
- name = "Nagant Rifle"
- desc = "An old model of rifle. Uses 7.62."
- id = "nagantrifle"
+/datum/design/illestren
+ name = "Illestren Rifle"
+ desc = "The pride of Hunter's Pride. Uses 8x50mmR."
+ id = "illestren"
build_type = PROTOLATHE
materials = list(/datum/material/iron = 85000, /datum/material/glass = 1500, /datum/material/silver = 1500)
- build_path = /obj/item/gun/ballistic/rifle/boltaction
+ build_path = /obj/item/gun/ballistic/rifle/illestren/factory
category = list("Weapons")
departmental_flags = DEPARTMENTAL_FLAG_BALLISTICS
diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm
index 79009ed1fdf6..28de68605681 100644
--- a/code/modules/research/techweb/all_nodes.dm
+++ b/code/modules/research/techweb/all_nodes.dm
@@ -19,7 +19,7 @@
// Security Stuff
"sec_rshot", "sec_beanbag_slug", "sec_slug", "sec_Islug", "sec_dart", "sec_38", "buckshot_shell", "beanbag_slug", "rubber_shot",
//Handgun Ammo (Security)
- "commanderammo", "stechkinammo", "m1911ammo", "m9cammo", "c9mm", "c10mm", "c45", "c556mmHITP", "rubbershot9mm", "rubbershot10mm", "rubbershot45", "rubbershot556mmHITP",
+ "commanderammo", "stechkinammo", "candorammo", "m9cammo", "c9mm", "c10mm", "c45", "c556mmHITP", "rubbershot9mm", "rubbershot10mm", "rubbershot45", "rubbershot556mmHITP",
// Construction Materials
"rglass", "plasteel", "plastitanium", "plasmaglass", "plasmareinforcedglass", "titaniumglass", "plastitaniumglass",
// You People Are Animals
@@ -78,7 +78,7 @@
display_name = "Biological Technology"
description = "What makes us tick." //the MC, silly!
prereq_ids = list("base")
- design_ids = list("sleeper", "chem_heater", "chem_master", "pandemic", "defibrillator", "defibmount", "operating", "soda_dispenser", "beer_dispenser", "healthanalyzer", "medigel","genescanner", "med_spray_bottle", "chem_pack", "blood_pack", "medical_kiosk", "crewpinpointerprox", "medipen_refiller", "prosthetic_l_arm", "prosthetic_r_arm", "prosthetic_l_leg", "prosthetic_r_leg", "kprosthetic_l_arm", "kprosthetic_r_arm", "kprosthetic_l_leg", "kprosthetic_r_leg", "vprosthetic_l_arm", "vprosthetic_r_arm", "vprosthetic_l_leg", "vprosthetic_r_leg", "lprosthetic_l_arm", "lprosthetic_r_arm", "lprosthetic_l_leg", "lprosthetic_r_leg")
+ design_ids = list("sleeper", "chem_heater", "chem_master", "pandemic", "defibrillator", "defibmount", "operating", "soda_dispenser", "beer_dispenser", "healthanalyzer", "medigel", "med_spray_bottle", "chem_pack", "blood_pack", "medical_kiosk", "crewpinpointerprox", "medipen_refiller", "prosthetic_l_arm", "prosthetic_r_arm", "prosthetic_l_leg", "prosthetic_r_leg", "kprosthetic_l_arm", "kprosthetic_r_arm", "kprosthetic_l_leg", "kprosthetic_r_leg", "vprosthetic_l_arm", "vprosthetic_r_arm", "vprosthetic_l_leg", "vprosthetic_r_leg", "lprosthetic_l_arm", "lprosthetic_r_arm", "lprosthetic_l_leg", "lprosthetic_r_leg")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
export_price = 5000
@@ -480,15 +480,6 @@
export_price = 5000
////////////////////////Medical////////////////////////
-/datum/techweb_node/genetics
- id = "genetics"
- display_name = "Genetic Engineering"
- description = "The truest of mad sciences."
- prereq_ids = list("biotech")
- design_ids = list("dnascanner", "scan_console", "dna_disk")
- research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 1500)
- export_price = 1500
-
/datum/techweb_node/cryotech
id = "cryotech"
display_name = "Cryostasis Technology"
@@ -766,7 +757,7 @@
display_name = "Saint-Roumain Pistols"
description = "Pistols normally manufactured by the Saint-Roumain Militia."
prereq_ids = list("adv_ballistics")
- design_ids = list("pepperbox", "nagantrevolver", "derringer", "speedload357")
+ design_ids = list("pepperbox", "montagne", "derringer", "speedload357")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 5000)
export_price = 5000
@@ -775,7 +766,7 @@
display_name = "Saint-Roumain Specialty Ballistics"
description = "Specialty ballistics normally manufactured by the Saint-Roumain Militia."
prereq_ids = list("srm_ballistics", "srm_pistols")
- design_ids = list("srmrevolver", "m1911", "stripper762", "nagantrifle")
+ design_ids = list("candor", "stripper762", "illestren")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 12000)
export_price = 5000
diff --git a/code/modules/research/xenobiology/crossbreeding/_clothing.dm b/code/modules/research/xenobiology/crossbreeding/_clothing.dm
index 0af67016116f..cab30f0219ef 100644
--- a/code/modules/research/xenobiology/crossbreeding/_clothing.dm
+++ b/code/modules/research/xenobiology/crossbreeding/_clothing.dm
@@ -102,7 +102,6 @@ Slimecrossing Armor
item_state = "peaceflower"
slot_flags = ITEM_SLOT_HEAD
body_parts_covered = NONE
- dynamic_hair_suffix = ""
force = 0
throwforce = 0
w_class = WEIGHT_CLASS_TINY
diff --git a/code/modules/spells/spell_types/infinite_guns.dm b/code/modules/spells/spell_types/infinite_guns.dm
index d3361284814a..3f400a8fb4bc 100644
--- a/code/modules/spells/spell_types/infinite_guns.dm
+++ b/code/modules/spells/spell_types/infinite_guns.dm
@@ -10,7 +10,7 @@
clothes_req = TRUE
cooldown_min = 10 //Gun wizard
action_icon_state = "bolt_action"
- var/summon_path = /obj/item/gun/ballistic/rifle/boltaction/enchanted
+ var/summon_path = /obj/item/gun/ballistic/rifle/illestren/enchanted
/obj/effect/proc_holder/spell/targeted/infinite_guns/cast(list/targets, mob/user = usr)
for(var/mob/living/carbon/C in targets)
@@ -24,4 +24,4 @@
name = "Arcane Barrage"
desc = "Fire a torrent of arcane energy at your foes with this (powerful) spell. Deals much more damage than Lesser Summon Guns, but won't knock targets down. Requires both hands free to use. Learning this spell makes you unable to learn Lesser Summon Gun."
action_icon_state = "arcane_barrage"
- summon_path = /obj/item/gun/ballistic/rifle/boltaction/enchanted/arcane_barrage
+ summon_path = /obj/item/gun/ballistic/rifle/illestren/enchanted/arcane_barrage
diff --git a/code/modules/spells/spell_types/rightandwrong.dm b/code/modules/spells/spell_types/rightandwrong.dm
index ee40b2782574..aae206d6fb0a 100644
--- a/code/modules/spells/spell_types/rightandwrong.dm
+++ b/code/modules/spells/spell_types/rightandwrong.dm
@@ -3,6 +3,7 @@
// 1 in 50 chance of getting something really special.
#define SPECIALIST_MAGIC_PROB 2
+// todo: this probably neds to be reorganized sometime
GLOBAL_LIST_INIT(summoned_guns, list(
/obj/item/gun/energy/disabler,
/obj/item/gun/energy/e_gun,
@@ -17,9 +18,9 @@ GLOBAL_LIST_INIT(summoned_guns, list(
/obj/item/gun/ballistic/shotgun/doublebarrel,
/obj/item/gun/ballistic/shotgun,
/obj/item/gun/ballistic/shotgun/automatic/combat,
- /obj/item/gun/ballistic/automatic/assault/ar,
+ /obj/item/gun/ballistic/automatic/assault/p16,
/obj/item/gun/ballistic/revolver/mateba,
- /obj/item/gun/ballistic/rifle/boltaction,
+ /obj/item/gun/ballistic/rifle/illestren,
/obj/item/pneumatic_cannon/speargun,
/obj/item/gun/ballistic/automatic/smg/mini_uzi,
/obj/item/gun/energy/lasercannon,
diff --git a/code/modules/surgery/organs/augments_chest.dm b/code/modules/surgery/organs/augments_chest.dm
index dc95ab97cece..2cbdf9823eb6 100644
--- a/code/modules/surgery/organs/augments_chest.dm
+++ b/code/modules/surgery/organs/augments_chest.dm
@@ -214,9 +214,8 @@
return TRUE
// Priority 3: use internals tank.
- var/obj/item/tank/I = owner.internal
- if(I && I.air_contents && I.air_contents.total_moles() >= num)
- T.assume_air_moles(I.air_contents, num)
+ if(owner.internal?.air_contents?.total_moles() >= num)
+ T.assume_air_moles(owner.internal.air_contents, num)
toggle(silent = TRUE)
return FALSE
diff --git a/code/modules/surgery/organs/eyes.dm b/code/modules/surgery/organs/eyes.dm
index de0ebac6eddb..0c200df9f6b1 100644
--- a/code/modules/surgery/organs/eyes.dm
+++ b/code/modules/surgery/organs/eyes.dm
@@ -141,6 +141,7 @@
/obj/item/organ/eyes/robotic
name = "robotic eyes"
icon_state = "robotic_eyes"
+ eye_icon_state = "eyes_synth" // i feel like this should be here
desc = "A very basic set of optical sensors with no extra vision modes or functions."
status = ORGAN_ROBOTIC
organ_flags = ORGAN_SYNTHETIC
diff --git a/code/modules/surgery/organs/stomach.dm b/code/modules/surgery/organs/stomach.dm
index 2e2403db14c6..bf9346b5dcd9 100644
--- a/code/modules/surgery/organs/stomach.dm
+++ b/code/modules/surgery/organs/stomach.dm
@@ -107,16 +107,22 @@
..()
adjust_charge(-ETHEREAL_CHARGE_FACTOR)
-/obj/item/organ/stomach/ethereal/Insert(mob/living/carbon/M, special = 0)
+/obj/item/organ/stomach/ethereal/Insert(mob/living/carbon/organ_owner, special = 0)
..()
- RegisterSignal(owner, COMSIG_PROCESS_BORGCHARGER_OCCUPANT, PROC_REF(charge))
- RegisterSignal(owner, COMSIG_LIVING_ELECTROCUTE_ACT, PROC_REF(on_electrocute))
-
-/obj/item/organ/stomach/ethereal/Remove(mob/living/carbon/M, special = 0)
- UnregisterSignal(owner, COMSIG_PROCESS_BORGCHARGER_OCCUPANT)
- UnregisterSignal(owner, COMSIG_LIVING_ELECTROCUTE_ACT)
+ RegisterSignal(organ_owner, COMSIG_PROCESS_BORGCHARGER_OCCUPANT, PROC_REF(charge))
+ RegisterSignal(organ_owner, COMSIG_LIVING_ELECTROCUTE_ACT, PROC_REF(on_electrocute))
+ RegisterSignal(organ_owner, COMSIG_MOB_GET_STATUS_TAB_ITEMS, PROC_REF(get_status_tab_item))
+
+/obj/item/organ/stomach/ethereal/Remove(mob/living/carbon/organ_owner, special = 0)
+ UnregisterSignal(organ_owner, COMSIG_PROCESS_BORGCHARGER_OCCUPANT)
+ UnregisterSignal(organ_owner, COMSIG_LIVING_ELECTROCUTE_ACT)
+ UnregisterSignal(organ_owner, COMSIG_MOB_GET_STATUS_TAB_ITEMS)
..()
+/obj/item/organ/stomach/ethereal/proc/get_status_tab_item(mob/living/carbon/source, list/items)
+ SIGNAL_HANDLER
+ items += "Crystal Charge: [round((crystal_charge / ETHEREAL_CHARGE_SCALING_MULTIPLIER), 0.1)]%"
+
/obj/item/organ/stomach/ethereal/proc/charge(datum/source, amount, repairs)
adjust_charge((amount * ETHEREAL_CHARGE_SCALING_MULTIPLIER) / 70) //WS Edit -- Ethereal Charge Scaling
diff --git a/code/modules/tgui/tgui.dm b/code/modules/tgui/tgui.dm
index a79966f69ba1..95875473133b 100644
--- a/code/modules/tgui/tgui.dm
+++ b/code/modules/tgui/tgui.dm
@@ -92,8 +92,9 @@
window.acquire_lock(src)
if(!window.is_ready())
window.initialize(
+ strict_mode = TRUE,
fancy = user.client.prefs.tgui_fancy,
- inline_assets = list(
+ assets = list(
get_asset_datum(/datum/asset/simple/tgui_common),
get_asset_datum(/datum/asset/simple/tgui),
))
diff --git a/code/modules/tgui/tgui_window.dm b/code/modules/tgui/tgui_window.dm
index 62574cb1aacd..844ba6239a0f 100644
--- a/code/modules/tgui/tgui_window.dm
+++ b/code/modules/tgui/tgui_window.dm
@@ -18,8 +18,12 @@
var/message_queue
var/sent_assets = list()
// Vars passed to initialize proc (and saved for later)
- var/inline_assets
- var/fancy
+ var/initial_strict_mode
+ var/initial_fancy
+ var/initial_assets
+ var/initial_inline_html
+ var/initial_inline_js
+ var/initial_inline_css
var/mouse_event_macro_set = FALSE
/**
@@ -45,21 +49,30 @@
* state. You can begin sending messages right after initializing. Messages
* will be put into the queue until the window finishes loading.
*
- * optional inline_assets list List of assets to inline into the html.
- * optional inline_html string Custom HTML to inject.
- * optional fancy bool If TRUE, will hide the window titlebar.
+ * optional strict_mode bool - Enables strict error handling and BSOD.
+ * optional fancy bool - If TRUE and if this is NOT a panel, will hide the window titlebar.
+ * optional assets list - List of assets to load during initialization.
+ * optional inline_html string - Custom HTML to inject.
+ * optional inline_js string - Custom JS to inject.
+ * optional inline_css string - Custom CSS to inject.
*/
/datum/tgui_window/proc/initialize(
- inline_assets = list(),
+ strict_mode = FALSE,
+ fancy = FALSE,
+ assets = list(),
inline_html = "",
- fancy = FALSE)
+ inline_js = "",
+ inline_css = "")
log_tgui(client,
context = "[id]/initialize",
window = src)
if(!client)
return
- src.inline_assets = inline_assets
- src.fancy = fancy
+ src.initial_fancy = fancy
+ src.initial_assets = assets
+ src.initial_inline_html = inline_html
+ src.initial_inline_js = inline_js
+ src.initial_inline_css = inline_css
status = TGUI_WINDOW_LOADING
fatally_errored = FALSE
// Build window options
@@ -72,9 +85,10 @@
// Generate page html
var/html = SStgui.basehtml
html = replacetextEx(html, "\[tgui:windowId]", id)
- // Inject inline assets
+ html = replacetextEx(html, "\[tgui:strictMode]", strict_mode)
+ // Inject assets
var/inline_assets_str = ""
- for(var/datum/asset/asset in inline_assets)
+ for(var/datum/asset/asset in assets)
var/mappings = asset.get_url_mappings()
for(var/name in mappings)
var/url = mappings[name]
@@ -87,8 +101,17 @@
if(length(inline_assets_str))
inline_assets_str = "\n"
html = replacetextEx(html, "\n", inline_assets_str)
- // Inject custom HTML
- html = replacetextEx(html, "\n", inline_html)
+ // Inject inline HTML
+ if (inline_html)
+ html = replacetextEx(html, "", inline_html)
+ // Inject inline JS
+ if (inline_js)
+ inline_js = ""
+ html = replacetextEx(html, "", inline_js)
+ // Inject inline CSS
+ if (inline_css)
+ inline_css = ""
+ html = replacetextEx(html, "", inline_css)
// Open the window
client << browse(html, "window=[id];[options]")
// Detect whether the control is a browser
@@ -97,6 +120,20 @@
if(!is_browser)
winset(client, id, "on-close=\"uiclose [id]\"")
+/**
+ * public
+ *
+ * Reinitializes the panel with previous data used for initialization.
+ */
+/datum/tgui_window/proc/reinitialize()
+ initialize(
+ strict_mode = initial_strict_mode,
+ fancy = initial_fancy,
+ assets = initial_assets,
+ inline_html = initial_inline_html,
+ inline_js = initial_inline_js,
+ inline_css = initial_inline_css)
+
/**
* public
*
@@ -320,7 +357,7 @@
client << link(href_list["url"])
if("cacheReloaded")
// Reinitialize
- initialize(inline_assets = inline_assets, fancy = fancy)
+ reinitialize()
// Resend the assets
for(var/asset in sent_assets)
send_asset(asset)
diff --git a/code/modules/tgui_panel/tgui_panel.dm b/code/modules/tgui_panel/tgui_panel.dm
index fdd74389c837..44fbffd917ce 100644
--- a/code/modules/tgui_panel/tgui_panel.dm
+++ b/code/modules/tgui_panel/tgui_panel.dm
@@ -13,9 +13,9 @@
var/broken = FALSE
var/initialized_at
-/datum/tgui_panel/New(client/client)
+/datum/tgui_panel/New(client/client, id)
src.client = client
- window = new(client, "browseroutput")
+ window = new(client, id)
window.subscribe(src, PROC_REF(on_message))
/datum/tgui_panel/Del()
@@ -42,10 +42,12 @@
sleep(1)
initialized_at = world.time
// Perform a clean initialization
- window.initialize(inline_assets = list(
- get_asset_datum(/datum/asset/simple/tgui_common),
- get_asset_datum(/datum/asset/simple/tgui_panel),
- ))
+ window.initialize(
+ strict_mode = TRUE,
+ assets = list(
+ get_asset_datum(/datum/asset/simple/tgui_common),
+ get_asset_datum(/datum/asset/simple/tgui_panel),
+ ))
window.send_asset(get_asset_datum(/datum/asset/simple/namespaced/fontawesome))
window.send_asset(get_asset_datum(/datum/asset/spritesheet/chat))
request_telemetry()
diff --git a/code/modules/unit_tests/_unit_tests.dm b/code/modules/unit_tests/_unit_tests.dm
index d4bfa21201be..afb4beecae14 100644
--- a/code/modules/unit_tests/_unit_tests.dm
+++ b/code/modules/unit_tests/_unit_tests.dm
@@ -76,6 +76,7 @@
#include "keybinding_init.dm"
#include "machine_disassembly.dm"
#include "open_air.dm"
+#include "outfit_names.dm"
#include "outfit_sanity.dm"
#include "overmap.dm"
#include "pills.dm"
diff --git a/code/modules/unit_tests/outfit_names.dm b/code/modules/unit_tests/outfit_names.dm
new file mode 100644
index 000000000000..b381bfeb7bf5
--- /dev/null
+++ b/code/modules/unit_tests/outfit_names.dm
@@ -0,0 +1,12 @@
+/datum/unit_test/outfit_names/Run()
+ var/list/outfit_names = list()
+
+ for(var/datum/outfit/outfit_type as anything in subtypesof(/datum/outfit))
+ var/name = initial(outfit_type.name)
+
+ if(name in outfit_names)
+ TEST_FAIL("Outfit name [name] is not unique: [outfit_type], [outfit_names[name]]")
+
+ outfit_names[name] = outfit_type
+
+
diff --git a/code/modules/uplink/uplink_items.dm b/code/modules/uplink/uplink_items.dm
index 53b49ab30f0b..48c79382444e 100644
--- a/code/modules/uplink/uplink_items.dm
+++ b/code/modules/uplink/uplink_items.dm
@@ -517,7 +517,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
/datum/uplink_item/dangerous/bolt_action
name = "Surplus Rifle"
desc = "A horribly outdated bolt action weapon. You've got to be desperate to use this."
- item = /obj/item/gun/ballistic/rifle/boltaction
+ item = /obj/item/gun/ballistic/rifle/illestren
cost = 1
include_modes = list(/datum/game_mode/nuclear)
@@ -948,7 +948,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
/datum/uplink_item/ammo/bolt_action
name = "Surplus Rifle Clip"
desc = "A stripper clip used to quickly load bolt action rifles. Contains 5 rounds."
- item = /obj/item/ammo_box/a762
+ item = /obj/item/ammo_box/magazine/illestren_a850r
cost = 1
include_modes = list(/datum/game_mode/nuclear)
diff --git a/code/modules/vehicles/motorized_wheelchair.dm b/code/modules/vehicles/motorized_wheelchair.dm
index add121e6a061..c9e990372374 100644
--- a/code/modules/vehicles/motorized_wheelchair.dm
+++ b/code/modules/vehicles/motorized_wheelchair.dm
@@ -1,6 +1,7 @@
/obj/vehicle/ridden/wheelchair/motorized
name = "motorized wheelchair"
desc = "A chair with big wheels. It seems to have a motor in it."
+ foldabletype = null
max_integrity = 150
var/speed = 2
var/power_efficiency = 1
diff --git a/code/modules/vehicles/wheelchair.dm b/code/modules/vehicles/wheelchair.dm
index 1f6c96bc0c01..a22b68c5a1c8 100644
--- a/code/modules/vehicles/wheelchair.dm
+++ b/code/modules/vehicles/wheelchair.dm
@@ -11,6 +11,8 @@
density = FALSE //Thought I couldn't fix this one easily, phew
// Run speed delay is multiplied with this for vehicle move delay.
var/delay_multiplier = 6.7
+ ///Determines the typepath of what the object folds into
+ var/foldabletype = /obj/item/wheelchair
/obj/vehicle/ridden/wheelchair/Initialize()
. = ..()
@@ -108,8 +110,38 @@
return TRUE
return FALSE
-/obj/vehicle/ridden/wheelchair/the_whip/driver_move(mob/living/user, direction)
- if(istype(user))
- var/datum/component/riding/D = GetComponent(/datum/component/riding)
- D.vehicle_move_delay = round(CONFIG_GET(number/movedelay/run_delay) * 6.7) / max(user.usable_hands, 1)
- return ..()
+/obj/item/wheelchair
+ name = "wheelchair"
+ desc = "A collapsed wheelchair that can be carried around."
+ icon = 'icons/obj/vehicles.dmi'
+ icon_state = "wheelchair_folded"
+ base_icon_state = "wheelchair_folded"
+ lefthand_file = 'icons/mob/inhands/items_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/items_righthand.dmi'
+ w_class = WEIGHT_CLASS_BULKY
+ force = 8 //Force is same as a chair
+ var/unfolded_type = /obj/vehicle/ridden/wheelchair
+
+/obj/vehicle/ridden/wheelchair/MouseDrop(over_object, src_location, over_location) //Lets you collapse wheelchair
+ . = ..()
+ if(over_object != usr || !Adjacent(usr) || !foldabletype || !ishuman(usr) || has_buckled_mobs())
+ return FALSE
+ usr.visible_message("[usr] begins to collapse [src]. ", "You begin to collapse [src]. ")
+ if(!do_after(usr, 3 SECONDS, target = src))
+ return FALSE
+ usr.visible_message("[usr] collapses [src]. ", "You collapse [src]. ")
+ var/obj/vehicle/ridden/wheelchair/wheelchair_folded = new foldabletype(get_turf(src))
+ usr.put_in_hands(wheelchair_folded)
+ qdel(src)
+
+/obj/item/wheelchair/attack_self(mob/user) //Deploys wheelchair on in-hand use
+ deploy_wheelchair(user, user.loc)
+
+/obj/item/wheelchair/proc/deploy_wheelchair(mob/user, atom/location)
+ usr.visible_message("[usr] begins to unfold [src]. ", "You begin to unfold [src]. ")
+ if(!do_after(usr, 3 SECONDS, target = src))
+ return FALSE
+ usr.visible_message("[usr] deploys [src]. ", "You deploy [src]. ")
+ var/obj/vehicle/ridden/wheelchair/wheelchair_unfolded = new unfolded_type(location)
+ wheelchair_unfolded.add_fingerprint(user)
+ qdel(src)
diff --git a/code/modules/vending/boozeomat.dm b/code/modules/vending/boozeomat.dm
index 6a9b3627dfb7..9c7b8622d536 100644
--- a/code/modules/vending/boozeomat.dm
+++ b/code/modules/vending/boozeomat.dm
@@ -67,28 +67,6 @@
desc = "A technological marvel, supposedly able to mix just the mixture you'd like to drink the moment you ask for one. This model appears to have no access restrictions."
req_access = null
-/obj/machinery/vending/boozeomat/pubby_maint //abandoned bar on Pubbystation
- products = list(/obj/item/reagent_containers/food/drinks/bottle/whiskey = 1,
- /obj/item/reagent_containers/food/drinks/bottle/absinthe = 1,
- /obj/item/reagent_containers/food/drinks/bottle/limejuice = 1,
- /obj/item/reagent_containers/food/drinks/bottle/cream = 1,
- /obj/item/reagent_containers/food/drinks/soda_cans/tonic = 1,
- /obj/item/reagent_containers/food/drinks/drinkingglass = 10,
- /obj/item/reagent_containers/food/drinks/ice = 3,
- /obj/item/reagent_containers/food/drinks/drinkingglass/shotglass = 6,
- /obj/item/reagent_containers/food/drinks/flask = 1)
- req_access = null
- age_restrictions = FALSE
-
-/obj/machinery/vending/boozeomat/pubby_captain //Captain's quarters on Pubbystation
- products = list(/obj/item/reagent_containers/food/drinks/bottle/rum = 1,
- /obj/item/reagent_containers/food/drinks/bottle/wine = 1,
- /obj/item/reagent_containers/food/drinks/ale = 1,
- /obj/item/reagent_containers/food/drinks/drinkingglass = 6,
- /obj/item/reagent_containers/food/drinks/ice = 1,
- /obj/item/reagent_containers/food/drinks/drinkingglass/shotglass = 4);
- req_access = list(ACCESS_CAPTAIN)
-
/obj/machinery/vending/boozeomat/syndicate_access
req_access = list(ACCESS_SYNDICATE)
age_restrictions = FALSE
diff --git a/code/modules/vending/coffee.dm b/code/modules/vending/coffee.dm
index d67a41d54aee..67b9878744be 100644
--- a/code/modules/vending/coffee.dm
+++ b/code/modules/vending/coffee.dm
@@ -8,6 +8,9 @@
/obj/item/reagent_containers/food/drinks/coffee = 6,
/obj/item/reagent_containers/food/drinks/mug/tea = 6,
/obj/item/reagent_containers/food/drinks/mug/coco = 3)
+ premium = list(
+ /obj/item/reagent_containers/food/drinks/cafelatte = 3,
+ /obj/item/reagent_containers/food/drinks/soylatte = 3)
contraband = list(/obj/item/reagent_containers/food/drinks/ice = 12)
refill_canister = /obj/item/vending_refill/coffee
default_price = 45
diff --git a/code/modules/vending/liberation.dm b/code/modules/vending/liberation.dm
index d2fb11bfef4b..015bbdc2c340 100644
--- a/code/modules/vending/liberation.dm
+++ b/code/modules/vending/liberation.dm
@@ -12,12 +12,11 @@
/obj/item/reagent_containers/food/drinks/beer/light = 10, //O'er the ramparts we watched, were so gallantly streaming?
/obj/item/gun/ballistic/automatic/pistol/deagle/gold = 2,
/obj/item/gun/ballistic/automatic/pistol/deagle/camo = 2,
- /obj/item/gun/ballistic/automatic/pistol/m1911 = 2,
+ /obj/item/gun/ballistic/automatic/pistol/candor = 2,
/obj/item/gun/ballistic/automatic/smg/proto/unrestricted = 2,
/obj/item/gun/ballistic/shotgun/automatic/combat = 2,
/obj/item/gun/ballistic/automatic/gyropistol = 1,
- /obj/item/gun/ballistic/shotgun = 2,
- /obj/item/gun/ballistic/automatic/assault/ar = 2)
+ /obj/item/gun/ballistic/shotgun = 2)
premium = list(
/obj/item/ammo_box/magazine/smgm9mm = 2,
/obj/item/ammo_box/magazine/m50 = 4,
diff --git a/code/modules/vending/magivend.dm b/code/modules/vending/magivend.dm
deleted file mode 100644
index 49fec066b703..000000000000
--- a/code/modules/vending/magivend.dm
+++ /dev/null
@@ -1,23 +0,0 @@
-/obj/machinery/vending/magivend
- name = "\improper MagiVend"
- desc = "A magic vending machine."
- icon_state = "MagiVend"
- product_slogans = "Sling spells the proper way with MagiVend!;Be your own Houdini! Use MagiVend!"
- vend_reply = "Have an enchanted evening!"
- product_ads = "FJKLFJSD;AJKFLBJAKL;1234 LOONIES LOL!;>MFW;Kill them fuckers!;GET DAT FUKKEN DISK;HONK!;EI NATH;Burn it all!;Admin conspiracies since forever!;Space-time bending hardware!"
- products = list(
- /obj/item/clothing/head/wizard = 1,
- /obj/item/clothing/suit/wizrobe = 1,
- /obj/item/clothing/head/wizard/red = 1,
- /obj/item/clothing/suit/wizrobe/red = 1,
- /obj/item/clothing/head/wizard/yellow = 1,
- /obj/item/clothing/suit/wizrobe/yellow = 1,
- /obj/item/clothing/shoes/sandal/magic = 1,
- /obj/item/staff = 2)
- contraband = list(/obj/item/reagent_containers/glass/bottle/wizarditis = 1) //No one can get to the machine to hack it anyways; for the lulz - Microwave
- armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
- resistance_flags = FIRE_PROOF
- default_price = 250
- extra_price = 500
- payment_department = ACCOUNT_SRV
- light_mask = "magivend-light-mask"
diff --git a/code/modules/vending/medical.dm b/code/modules/vending/medical.dm
index 21d2fa18badb..e4489b0a23d8 100644
--- a/code/modules/vending/medical.dm
+++ b/code/modules/vending/medical.dm
@@ -6,46 +6,36 @@
product_ads = "Go save some lives!;The best stuff for your medbay.;Only the finest tools.;Natural chemicals!;This stuff saves lives.;Don't you want some?;Ping!"
req_access = list(ACCESS_MEDICAL)
products = list(
- /obj/item/stack/medical/gauze = 8,
- /obj/item/reagent_containers/syringe = 12,
- /obj/item/reagent_containers/dropper = 3,
- /obj/item/healthanalyzer = 4,
+ /obj/item/stack/medical/gauze = 5,
+ /obj/item/stack/medical/splint = 5,
+ /obj/item/reagent_containers/syringe = 5,
+ /obj/item/reagent_containers/dropper = 2,
+ /obj/item/healthanalyzer = 2,
/obj/item/reagent_containers/pill/patch/styptic = 5,
/obj/item/reagent_containers/pill/patch/silver_sulf = 5,
+ /obj/item/reagent_containers/hypospray/medipen = 3,
/obj/item/reagent_containers/syringe/perfluorodecalin = 2,
- /obj/item/reagent_containers/pill/insulin = 5,
- /obj/item/reagent_containers/glass/bottle/charcoal = 4,
+ /obj/item/reagent_containers/syringe/antiviral = 1,
+ /obj/item/reagent_containers/glass/bottle/charcoal = 3,
/obj/item/reagent_containers/glass/bottle/epinephrine = 3,
- /obj/item/reagent_containers/glass/bottle/morphine = 4,
+ /obj/item/reagent_containers/glass/bottle/morphine = 1,
/obj/item/reagent_containers/glass/bottle/potass_iodide = 1,
/obj/item/reagent_containers/glass/bottle/salglu_solution = 3,
- /obj/item/reagent_containers/glass/bottle/toxin = 3,
- /obj/item/reagent_containers/syringe/antiviral = 6,
- /obj/item/reagent_containers/medigel/styptic = 2,
- /obj/item/reagent_containers/medigel/silver_sulf = 2,
+ /obj/item/reagent_containers/medigel/styptic = 1,
+ /obj/item/reagent_containers/medigel/silver_sulf = 1,
+ /obj/item/reagent_containers/medigel/synthflesh = 1,
/obj/item/reagent_containers/medigel/sterilizine = 1,
- /obj/item/reagent_containers/pill/morphine = 4,
- /obj/item/storage/box/gum/happiness = 3,
- /obj/item/sensor_device = 2,
- /obj/item/pinpointer/crew = 2,
- /obj/item/reagent_containers/glass/bottle/vial/small = 5,
- /obj/item/stack/medical/splint = 10)
+ /obj/item/sensor_device = 1,
+ /obj/item/pinpointer/crew = 1)
contraband = list(
- /obj/item/reagent_containers/pill/tox = 3,
- /obj/item/reagent_containers/pill/morphine = 4,
- /obj/item/reagent_containers/pill/charcoal = 6,
+ /obj/item/reagent_containers/pill/tox = 2,
+ /obj/item/reagent_containers/pill/morphine = 2,
+ /obj/item/reagent_containers/pill/charcoal = 4,
/obj/item/storage/box/hug/medical = 1)
premium = list(
- /obj/item/reagent_containers/medigel/synthflesh = 2,
- /obj/item/storage/pill_bottle/psicodine = 2,
- /obj/item/reagent_containers/hypospray/medipen = 3,
- /obj/item/clothing/glasses/hud/health = 2,
+ /obj/item/clothing/glasses/hud/health = 1,
/obj/item/clothing/glasses/hud/health/prescription = 1,
- /obj/item/hypospray/mkii = 1,
- /obj/item/storage/belt/medical = 3,
- /obj/item/storage/firstaid/advanced = 2,
- /obj/item/shears = 1,
- /obj/item/plunger/reinforced = 2)
+ /obj/item/shears = 1)
armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
resistance_flags = FIRE_PROOF
refill_canister = /obj/item/vending_refill/medical
diff --git a/code/modules/vending/medical_wall.dm b/code/modules/vending/medical_wall.dm
index 3378a1d0deca..7ba19c75d617 100644
--- a/code/modules/vending/medical_wall.dm
+++ b/code/modules/vending/medical_wall.dm
@@ -5,17 +5,17 @@
icon_deny = "wallmed-deny"
density = FALSE
products = list(
- /obj/item/reagent_containers/syringe = 3,
- /obj/item/reagent_containers/pill/patch/styptic = 5,
- /obj/item/reagent_containers/pill/patch/silver_sulf = 5,
- /obj/item/reagent_containers/pill/charcoal = 2,
- /obj/item/reagent_containers/medigel/styptic = 2,
- /obj/item/reagent_containers/medigel/silver_sulf = 2,
+ /obj/item/reagent_containers/syringe = 1,
+ /obj/item/reagent_containers/pill/patch/styptic = 3,
+ /obj/item/reagent_containers/pill/patch/silver_sulf = 3,
+ /obj/item/reagent_containers/pill/charcoal = 1,
+ /obj/item/reagent_containers/medigel/styptic = 1,
+ /obj/item/reagent_containers/medigel/silver_sulf = 1,
/obj/item/reagent_containers/medigel/sterilizine = 1
)
contraband = list(
- /obj/item/reagent_containers/pill/tox = 2,
- /obj/item/reagent_containers/pill/morphine = 2,
+ /obj/item/reagent_containers/pill/tox = 1,
+ /obj/item/reagent_containers/pill/morphine = 1,
/obj/item/storage/box/gum/happiness = 1
)
armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
@@ -30,11 +30,3 @@
/obj/item/vending_refill/wallmed
machine_name = "NanoMed"
icon_state = "refill_medical"
-
-/obj/machinery/vending/wallmed/pubby
- products = list(
- /obj/item/reagent_containers/syringe = 3,
- /obj/item/reagent_containers/pill/patch/styptic = 1,
- /obj/item/reagent_containers/pill/patch/silver_sulf = 1,
- /obj/item/reagent_containers/medigel/sterilizine = 1
- )
diff --git a/code/modules/vending/security.dm b/code/modules/vending/security.dm
index d71dcae5ab41..e4e9d303ae0e 100644
--- a/code/modules/vending/security.dm
+++ b/code/modules/vending/security.dm
@@ -93,7 +93,7 @@
light_mask = "marine-mask"
req_access = list(ACCESS_SYNDICATE)
products = list(
- /obj/item/screwdriver/nuke = 5,
+ /obj/item/screwdriver = 5,
/obj/item/restraints/handcuffs = 10,
/obj/item/assembly/flash/handheld = 10,
/obj/item/flashlight/seclite = 10,
@@ -104,7 +104,6 @@
/obj/item/grenade/c4 = 5,
/obj/item/grenade/frag = 5,
- /obj/item/melee/transforming/energy/sword/saber/green = 1,
)
contraband = list()
premium = list()
@@ -131,7 +130,6 @@
/obj/item/ammo_box/magazine/ebr = 5,
/obj/item/grenade/c4 = 1,
/obj/item/grenade/frag = 1,
- /obj/item/melee/transforming/energy/sword/saber/red = 1,
)
voucher_items = list(
"M-90gl Carbine" = /obj/item/gun/ballistic/automatic/smg/m90/unrestricted,
@@ -150,19 +148,21 @@
/obj/item/assembly/flash/handheld = 10,
/obj/item/flashlight/seclite = 10,
- /obj/item/ammo_box/magazine/aknt = 10,
- /obj/item/storage/box/lethalshot = 5,
+ /obj/item/screwdriver = 5,
+ /obj/item/stock_parts/cell/gun = 10,
+ /obj/item/stock_parts/cell/gun/upgraded = 5,
/obj/item/grenade/c4 = 5,
/obj/item/grenade/frag = 5,
/obj/item/grenade/flashbang = 5,
/obj/item/grenade/barrier = 10,
- /obj/item/melee/transforming/energy/sword/saber/blue = 1
)
voucher_items = list(
- "NT-AK" = /obj/item/gun/ballistic/automatic/assault/ak47/nt) //if im being honest, theres no point in addiing other options when this is clearly the best
-
+ "SL AL-655 Energy Rifle" = /obj/item/gun/energy/e_gun/hades,
+ "NT-E-Rifle" = /obj/item/gun/energy/e_gun,
+ "E-TAR SMG" = /obj/item/gun/energy/e_gun/smg,
+ "E-SG 500" = /obj/item/gun/energy/e_gun/iot)
/obj/item/gun_voucher
name = "security weapon voucher"
desc = "A token used to redeem guns from the SecTech vendor."
diff --git a/code/modules/vending/youtool.dm b/code/modules/vending/youtool.dm
index 25097cab76a8..aadb3c6a5b37 100644
--- a/code/modules/vending/youtool.dm
+++ b/code/modules/vending/youtool.dm
@@ -4,23 +4,23 @@
icon_state = "tool"
icon_deny = "tool-deny"
light_mask = "tool-light-mask"
- products = list(/obj/item/stack/cable_coil/random = 10, //WS Edit - Random added from Smartwire Revert
- /obj/item/crowbar = 5,
+ products = list(/obj/item/stack/cable_coil/random = 5, //WS Edit - Random added from Smartwire Revert
+ /obj/item/crowbar = 3,
/obj/item/weldingtool = 3,
- /obj/item/wirecutters = 5,
- /obj/item/wrench = 5,
- /obj/item/analyzer = 5,
- /obj/item/t_scanner = 5,
- /obj/item/screwdriver = 5,
+ /obj/item/wirecutters = 3,
+ /obj/item/wrench = 3,
+ /obj/item/analyzer = 3,
+ /obj/item/t_scanner = 3,
+ /obj/item/screwdriver = 3,
/obj/item/flashlight/glowstick = 3,
/obj/item/flashlight/glowstick/red = 3,
- /obj/item/flashlight = 5,
+ /obj/item/flashlight = 3,
/obj/item/clothing/ears/earmuffs = 1)
contraband = list(/obj/item/clothing/gloves/color/fyellow = 2)
premium = list(/obj/item/storage/belt/utility = 2,
/obj/item/multitool = 2,
- /obj/item/weldingtool/hugetank = 2,
- /obj/item/clothing/head/welding = 2,
+ /obj/item/weldingtool/hugetank = 1,
+ /obj/item/clothing/head/welding = 1,
/obj/item/clothing/gloves/color/yellow = 1)
armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 70)
resistance_flags = FIRE_PROOF
diff --git a/config/config.txt b/config/config.txt
index 7a579123028b..7a348b2c9cc0 100644
--- a/config/config.txt
+++ b/config/config.txt
@@ -186,11 +186,8 @@ ID_CONSOLE_JOBSLOT_DELAY 30
## allow players to initiate a restart vote
#ALLOW_VOTE_RESTART
-## allow players to initiate a mode-change vote
-#ALLOW_VOTE_MODE
-
-## allow players to initiate a map-change vote
-#ALLOW_VOTE_MAP
+## allow players to initiate a transfer vote
+#ALLOW_VOTE_TRANSFER
## min delay (deciseconds) between voting sessions (default 10 minutes)
VOTE_DELAY 6000
diff --git a/html/changelogs/AutoChangeLog-pr-2652.yml b/html/changelogs/AutoChangeLog-pr-2652.yml
deleted file mode 100644
index 3ddf68b95b08..000000000000
--- a/html/changelogs/AutoChangeLog-pr-2652.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: Luftkommando
-changes:
- - {rscadd: Added new ShipTest faction specific stamps}
-delete-after: true
diff --git a/html/changelogs/AutoChangeLog-pr-2691.yml b/html/changelogs/AutoChangeLog-pr-2691.yml
deleted file mode 100644
index 5d1661e77b25..000000000000
--- a/html/changelogs/AutoChangeLog-pr-2691.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: Cadunkus
-changes:
- - {spellcheck: Fixed a single typo in the description of the Corvus-class Response
- Vessel.}
-delete-after: true
diff --git a/html/changelogs/archive/2024-02.yml b/html/changelogs/archive/2024-02.yml
index ea97b634f96f..a2e2ef9987d3 100644
--- a/html/changelogs/archive/2024-02.yml
+++ b/html/changelogs/archive/2024-02.yml
@@ -41,3 +41,166 @@
- rscadd: Added two flashes, a recharger, a stamp, two commanders, ammo for them
and a wideband to the Ranger bridge.
- rscdel: The Ranger's ORM.
+2024-02-05:
+ Cadunkus:
+ - spellcheck: Fixed a single typo in the description of the Corvus-class Response
+ Vessel.
+ Luftkommando:
+ - rscadd: Added new ShipTest faction specific stamps
+ Skies-Of-Blue:
+ - tweak: non-motorized wheelchairs can now be folded
+ - imageadd: a few sprites to support the above
+ meemofcourse:
+ - rscadd: Valor-Class Field Care Crusier
+ - rscadd: Haste-Class Ambulance
+2024-02-06:
+ Draggeru, Cre:
+ - rscadd: adds all of the clothing intended for SUNS, including uniforms for the
+ captain, xo, cmo, scientists, miners, engineers, and doctors
+ - rscadd: several job outfits to support future SUNS content
+ FalloutFalcon:
+ - bugfix: fixed licor popsicle overlay
+ MarkSuckerberg:
+ - bugfix: Fixes a lot of duplicated outfits and such
+ SomeguyManperson:
+ - tweak: rachnid cocoon spinning no longer spends nutrition when activated, only
+ on successful cocooning
+ retlaw34, FleetingExpertise, Apogee-dev, Valorium,:
+ - rscadd: Resprites almost every single hunter's pride weapon
+ - rscadd: Added the Vickland, SRM equivlent to the ARs except it's an battle rifle
+ - rscadd: The Illestren is now an en-bloc rifle and uses 8x50mmR. Functionally it's
+ the exact same to aquire the ammo, just with a different name
+ - rscadd: You are able to saw off many more guns than before, just be sure to actually
+ empty it before doing so!
+ - rscadd: Many Hunter's pride weapons have been renamed to something befitting the
+ lore
+ - rscadd: Break action weapons
+ - bugfix: Traubuco should work correctly again
+ - bugfix: Some broken gun onmobs should now show up
+ - tweak: guns tell you how to rack them or switching firing modes
+ - balance: smgs fire 0.02 seconds faster and now have standard pistol recoil onehanded
+ - balance: disposable guns are now less shit, they now have 10 rounds! The downside
+ is they are now chambered in 22lr, the worst caliber in the game
+ - balance: Shotguns have been nerfed to not do an insane amount of damage point
+ blank and in general
+2024-02-10:
+ Apogee-dev:
+ - rscdel: Removed the Luxembourg.
+ Martinpachu:
+ - rscadd: Ammo boxes to the outpost market.
+ - spellcheck: Changed AK mentions to SVG.
+ - tweak: Changed shotgun ammo boxes bought from the outpost to the ammo_box version.
+ - bugfix: Changed SVG mag size to 20.
+ - rscadd: IRMG Vanguard peaked caps to IRMVs.
+ Skies-Of-Blue:
+ - rscadd: new pair of prescription glasses, now available in loadouts!
+ - imageadd: new transparent sprites for all prescription glasses
+ - imageadd: new transparent sprites for all prescription HUDs
+ - imageadd: new transparent sprite for the orange sunglasses
+ Skrem7:
+ - balance: Peacekeeper visors have real armor now (especially against bullet)
+ - balance: SUNS armored coats now cover all body parts instead of just chest
+ SomeguyManperson:
+ - bugfix: bulletproof armor crates are no longer stated to carry one more armor
+ set than they actually do
+2024-02-11:
+ BarteG44:
+ - tweak: resprited the medical and utility belts
+ Couls, Kylerace, Magatsuchi, LemonInTheDark, Fikou, Mothblocks, Stylemistake, Mark Suckerberg:
+ - admin: Reduces MC tab update time, this can be adjusted with a preference in OOC
+ settings
+ GenericDM:
+ - code_imp: params var is now passed to mousedrop_t() from mousedrop()
+ Halcyon, retlaw34, thgvr:
+ - rscadd: Added the Sprinter IPC Chassis
+ - rscadd: Added the PGF MECHANICS IPC Chassis
+ - rscadd: Adds IPC tails
+ - tweak: Robotic eyes now use the synth eye sprite.
+ Luftkommando:
+ - bugfix: Fixed the accidental wall-window combination on the Talos-class burn chamber
+ view window.
+ Zevotech:
+ - rscadd: Reworked the paracelsus kitchen layout to be more user friendly and have
+ more ingredients to cook with.
+ - rscadd: Adds two bookcases and two extra shark plushies to the dorms.
+ - rscadd: Adds ship viewscreens to the paracelsus
+ - rscadd: Moves the autolathe on the paracelsus to the ghettochem room
+ - bugfix: The firearms locker on the paracelsus no longer lacks a lock to prevent
+ patients from accessing the firearms
+ - rscdel: Some vendors now have far less stock and a smaller variety of items to
+ compensate for being free and not on a station
+ - rscdel: Removed Magivend vendor
+ - rscdel: Removed Mining points cards and mining access cards
+ - rscdel: Removed Unused Pubbystation vendors
+ - rscdel: Removed eswords from marine vendors
+ - rscadd: NT marine vendor now gives energy guns for coupons and stocks energy gun
+ cells
+ - rscadd: Cafe and Soy Lattes are now available in the coffee vendor
+ - bugfix: Dutch Hot Coco is now Pearl Hot Chocolate to be lore compliant
+ meemofcourse:
+ - tweak: Changed the content and details of a few Wikibooks
+ - bugfix: Certain wikibooks not working
+ retlaw34:
+ - rscadd: SUNS's swords! Now you can duel over petty matters and potentially die,
+ just like your forefathers!
+ - rscadd: SUNS's guns! Now you can fight over serious matters and potentially die,
+ just like your syndicate comrades!
+2024-02-12:
+ Apogee-dev:
+ - tweak: Tweaked Syndicate Grunt/Captain clothing descriptions for lore compliance
+ - refactor: changed paths for ACLF Grunt and 2nd Battlegroup outfit parts
+ - bugfix: 2nd Battlegroup captain jacket can now hold firearms
+ MarkSuckerberg:
+ - admin: Ships should now be categorised by faction in the shuttle manipulator
+ meemofcourse:
+ - rscadd: Syndicate Cryopod.
+ - tweak: The Twinkleshine has gotten a facelift.
+ - tweak: The Syndicate has started assigning Flotilla Admirals and Redshield Officers
+ to Twinkleshines.
+ - tweak: Crew on the Twinkleshine now have to get their stuff from their lockers.
+ - tweak: Modified the starting text to reflect the lack of telecomms on most ships.
+ - bugfix: Access on the Twinkleshine.
+ - bugfix: Syndicate jobs should show up properly on SecHUDs.
+ - rscadd: Crux-Class Dropship
+ - rscadd: Ancon-Class Internship Ship
+ - rscadd: Runner-Class Ambulance
+ - rscadd: Anvil-Class Dropship
+ - bugfix: ERTs can now actually spawn at outposts
+ phoaly:
+ - rscadd: Added the Elder-class
+ - rscdel: Removed the Glaive-class
+ retlaw34:
+ - tweak: all CMM ships are aspawn now
+ - rscdel: Corvus-Class
+2024-02-13:
+ ryerice, thgvr:
+ - imageadd: 'New hair sprites, including: Tribun, Half-shave, Ruby, Sidecut, Very
+ Long Fringe, Long Hair 2, Gloomy, Gloomy (Long)'
+ thgvr:
+ - rscadd: PGF flag wall mount and item
+2024-02-16:
+ Apogee-dev:
+ - balance: Slightly increased damage on bolt action rifles
+ - rscdel: Removed maid outfits from loadouts and faction ships
+ FleetingExpertise:
+ - rscadd: New bone dagger sprite!
+ Martinpachu:
+ - rscadd: Adds the Cobra-20 as buyable from the outpost alongside it's magazines.
+ - spellcheck: fixes the stechkin being from the gorlex marauders and returns it
+ to it's rightful home of scaraborough arms
+ - balance: Slightly improves engineering Loss Prevention hardsuits against radiation.
+ MrMelbert, san7890, lessthnthree, ZephyrTFA, MarkSuckerberg:
+ - admin: You can now create a custom approval-type vote
+ - admin: You can now manually start a transfer vote in the vote menu
+ - config: Removes the player mode voting setting as we don't use modes
+ SomeguyManperson:
+ - tweak: missions outside of the fishing missions have had their time limits doubled
+ - rscdel: genetics is no longer researchable, designs related to genetics no longer
+ exist
+ Zevotech:
+ - bugfix: Osprey airlocks no longer have firelocks that stop them from functioning.
+ retlaw34:
+ - bugfix: fixes invisble pipe shotguns
+ thgvr:
+ - bugfix: Wigs no longer hide Sarathi horns
+ - rscdel: Removes space adaptation.
diff --git a/html/statbrowser.css b/html/statbrowser.css
new file mode 100644
index 000000000000..dc693f42f756
--- /dev/null
+++ b/html/statbrowser.css
@@ -0,0 +1,227 @@
+body {
+ font-family: Verdana, Geneva, Tahoma, sans-serif;
+ font-size: 12px !important;
+ margin: 0 !important;
+ padding: 0 !important;
+ overflow-x: hidden;
+ overflow-y: scroll;
+}
+
+body.dark {
+ background-color: #131313;
+ color: #b2c4dd;
+ scrollbar-base-color: #1c1c1c;
+ scrollbar-face-color: #3b3b3b;
+ scrollbar-3dlight-color: #252525;
+ scrollbar-highlight-color: #252525;
+ scrollbar-track-color: #1c1c1c;
+ scrollbar-arrow-color: #929292;
+ scrollbar-shadow-color: #3b3b3b;
+}
+
+#menu {
+ background-color: #F0F0F0;
+ position: fixed;
+ width: 100%;
+ z-index: 100;
+}
+
+.dark #menu {
+ background-color: #202020;
+}
+
+#statcontent {
+ padding: 7px 7px 7px 7px;
+}
+
+a {
+ color: black;
+ text-decoration: none
+}
+
+.dark a {
+ color: #b2c4dd;
+}
+
+a:hover,
+.dark a:hover {
+ text-decoration: underline;
+}
+
+ul {
+ list-style-type: none;
+ margin: 0;
+ padding: 0;
+ background-color: #333;
+}
+
+li {
+ float: left;
+}
+
+li a {
+ display: block;
+ color: white;
+ text-align: center;
+ padding: 14px 16px;
+ text-decoration: none;
+}
+
+li a:hover:not(.active) {
+ background-color: #111;
+}
+
+.button-container {
+ display: inline-flex;
+ flex-wrap: wrap-reverse;
+ flex-direction: row;
+ align-items: flex-start;
+ overflow-x: hidden;
+ white-space: pre-wrap;
+ padding: 0 4px;
+}
+
+.button {
+ background-color: #dfdfdf;
+ border: 1px solid #cecece;
+ border-bottom-width: 2px;
+ color: rgba(0, 0, 0, 0.7);
+ padding: 6px 4px 4px;
+ text-align: center;
+ text-decoration: none;
+ font-size: 12px;
+ margin: 0;
+ cursor: pointer;
+ transition-duration: 100ms;
+ order: 3;
+ min-width: 40px;
+}
+
+.dark button {
+ background-color: #222222;
+ border-color: #343434;
+ color: rgba(255, 255, 255, 0.5);
+}
+
+.button:hover {
+ background-color: #ececec;
+ transition-duration: 0;
+}
+
+.dark button:hover {
+ background-color: #2e2e2e;
+}
+
+.button:active,
+.button.active {
+ background-color: #ffffff;
+ color: black;
+ border-top-color: #cecece;
+ border-left-color: #cecece;
+ border-right-color: #cecece;
+ border-bottom-color: #ffffff;
+}
+
+.dark .button:active,
+.dark .button.active {
+ background-color: #444444;
+ color: white;
+ border-top-color: #343434;
+ border-left-color: #343434;
+ border-right-color: #343434;
+ border-bottom-color: #ffffff;
+}
+
+.grid-container {
+ margin: -2px;
+ margin-right: -15px;
+}
+
+.grid-item {
+ position: relative;
+ display: inline-block;
+ width: 100%;
+ box-sizing: border-box;
+ overflow: visible;
+ padding: 3px 2px;
+ text-decoration: none;
+}
+
+@media only screen and (min-width: 300px) {
+ .grid-item {
+ width: 50%;
+ }
+}
+
+@media only screen and (min-width: 430px) {
+ .grid-item {
+ width: 33%;
+ }
+}
+
+@media only screen and (min-width: 560px) {
+ .grid-item {
+ width: 25%;
+ }
+}
+
+@media only screen and (min-width: 770px) {
+ .grid-item {
+ width: 20%;
+ }
+}
+
+.grid-item:hover {
+ z-index: 1;
+}
+
+.grid-item:hover .grid-item-text {
+ width: auto;
+ text-decoration: underline;
+}
+
+.grid-item-text {
+ display: inline-block;
+ width: 100%;
+ background-color: #ffffff;
+ margin: 0 -6px;
+ padding: 0 6px;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ pointer-events: none;
+}
+
+.dark .grid-item-text {
+ background-color: #131313;
+}
+
+.link {
+ display: inline;
+ background: none;
+ border: none;
+ padding: 7px 14px;
+ color: black;
+ text-decoration: none;
+ cursor: pointer;
+ font-size: 13px;
+ margin: 2px 2px;
+}
+
+.dark .link {
+ color: #abc6ec;
+}
+
+.link:hover {
+ text-decoration: underline;
+}
+
+img {
+ -ms-interpolation-mode: nearest-neighbor;
+ image-rendering: pixelated;
+}
+
+.interview_panel_controls,
+.interview_panel_stats {
+ margin-bottom: 10px;
+}
diff --git a/html/statbrowser.html b/html/statbrowser.html
index 2bb7f8259afb..1aea8811d58a 100644
--- a/html/statbrowser.html
+++ b/html/statbrowser.html
@@ -1,1280 +1,3 @@
-
-
-
- Stat Browser
-
-
-
-
+
+
+
diff --git a/html/statbrowser.js b/html/statbrowser.js
new file mode 100644
index 000000000000..d024d50b8c3d
--- /dev/null
+++ b/html/statbrowser.js
@@ -0,0 +1,1003 @@
+// Polyfills and compatibility ------------------------------------------------
+var decoder = decodeURIComponent || unescape;
+if (!Array.prototype.includes) {
+ Array.prototype.includes = function (thing) {
+ for (var i = 0; i < this.length; i++) {
+ if (this[i] == thing) return true;
+ }
+ return false;
+ }
+}
+if (!String.prototype.trim) {
+ String.prototype.trim = function () {
+ return this.replace(/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g, '');
+ };
+}
+
+// Status panel implementation ------------------------------------------------
+var status_tab_parts = ["Loading..."];
+var current_tab = null;
+var mc_tab_parts = [["Loading...", ""]];
+var href_token = null;
+var spells = [];
+var spell_tabs = [];
+var verb_tabs = [];
+var verbs = [["", ""]]; // list with a list inside
+var tickets = [];
+var interviewManager = { status: "", interviews: [] };
+var sdql2 = [];
+var permanent_tabs = []; // tabs that won't be cleared by wipes
+var turfcontents = [];
+var turfname = "";
+var imageRetryDelay = 500;
+var imageRetryLimit = 50;
+var menu = document.getElementById('menu');
+var under_menu = document.getElementById('under_menu');
+var statcontentdiv = document.getElementById('statcontent');
+var storedimages = [];
+var split_admin_tabs = false;
+
+// Any BYOND commands that could result in the client's focus changing go through this
+// to ensure that when we relinquish our focus, we don't do it after the result of
+// a command has already taken focus for itself.
+function run_after_focus(callback) {
+ setTimeout(callback, 0);
+}
+
+function createStatusTab(name) {
+ if (name.indexOf(".") != -1) {
+ var splitName = name.split(".");
+ if (split_admin_tabs && splitName[0] === "Admin")
+ name = splitName[1];
+ else
+ name = splitName[0];
+ }
+ if (document.getElementById(name) || name.trim() == "") {
+ return;
+ }
+ if (!verb_tabs.includes(name) && !permanent_tabs.includes(name)) {
+ return;
+ }
+ var B = document.createElement("BUTTON");
+ B.onclick = function () {
+ tab_change(name);
+ this.blur();
+ };
+ B.id = name;
+ B.textContent = name;
+ B.className = "button";
+ //ORDERING ALPHABETICALLY
+ B.style.order = name.charCodeAt(0);
+ if (name == "Status" || name == "MC") {
+ B.style.order = name == "Status" ? 1 : 2;
+ }
+ //END ORDERING
+ menu.appendChild(B);
+ SendTabToByond(name);
+ under_menu.style.height = menu.clientHeight + 'px';
+}
+
+function removeStatusTab(name) {
+ if (!document.getElementById(name) || permanent_tabs.includes(name)) {
+ return;
+ }
+ for (var i = verb_tabs.length - 1; i >= 0; --i) {
+ if (verb_tabs[i] == name) {
+ verb_tabs.splice(i, 1);
+ }
+ }
+ menu.removeChild(document.getElementById(name));
+ TakeTabFromByond(name);
+ under_menu.style.height = menu.clientHeight + 'px';
+}
+
+function sortVerbs() {
+ verbs.sort(function (a, b) {
+ var selector = a[0] == b[0] ? 1 : 0;
+ if (a[selector].toUpperCase() < b[selector].toUpperCase()) {
+ return 1;
+ }
+ else if (a[selector].toUpperCase() > b[selector].toUpperCase()) {
+ return -1;
+ }
+ return 0;
+ })
+}
+
+window.onresize = function () {
+ under_menu.style.height = menu.clientHeight + 'px';
+}
+
+function addPermanentTab(name) {
+ if (!permanent_tabs.includes(name)) {
+ permanent_tabs.push(name);
+ }
+ createStatusTab(name);
+}
+
+function removePermanentTab(name) {
+ for (var i = permanent_tabs.length - 1; i >= 0; --i) {
+ if (permanent_tabs[i] == name) {
+ permanent_tabs.splice(i, 1);
+ }
+ }
+ removeStatusTab(name);
+}
+
+function checkStatusTab() {
+ for (var i = 0; i < menu.children.length; i++) {
+ if (!verb_tabs.includes(menu.children[i].id) && !permanent_tabs.includes(menu.children[i].id)) {
+ menu.removeChild(menu.children[i]);
+ }
+ }
+}
+
+function remove_verb(v) {
+ var verb_to_remove = v; // to_remove = [verb:category, verb:name]
+ for (var i = verbs.length - 1; i >= 0; i--) {
+ var part_to_remove = verbs[i];
+ if (part_to_remove[1] == verb_to_remove[1]) {
+ verbs.splice(i, 1)
+ }
+ }
+}
+
+function check_verbs() {
+ for (var v = verb_tabs.length - 1; v >= 0; v--) {
+ verbs_cat_check(verb_tabs[v]);
+ }
+}
+
+function verbs_cat_check(cat) {
+ var tabCat = cat;
+ if (cat.indexOf(".") != -1) {
+ var splitName = cat.split(".");
+ if (split_admin_tabs && splitName[0] === "Admin")
+ tabCat = splitName[1];
+ else
+ tabCat = splitName[0];
+ }
+ var verbs_in_cat = 0;
+ var verbcat = "";
+ if (!verb_tabs.includes(tabCat)) {
+ removeStatusTab(tabCat);
+ return;
+ }
+ for (var v = 0; v < verbs.length; v++) {
+ var part = verbs[v];
+ verbcat = part[0];
+ if (verbcat.indexOf(".") != -1) {
+ var splitName = verbcat.split(".");
+ if (split_admin_tabs && splitName[0] === "Admin")
+ verbcat = splitName[1];
+ else
+ verbcat = splitName[0];
+ }
+ if (verbcat != tabCat || verbcat.trim() == "") {
+ continue;
+ }
+ else {
+ verbs_in_cat = 1;
+ break; // we only need one
+ }
+ }
+ if (verbs_in_cat != 1) {
+ removeStatusTab(tabCat);
+ if (current_tab == tabCat)
+ tab_change("Status");
+ }
+}
+
+function findVerbindex(name, verblist) {
+ for (var i = 0; i < verblist.length; i++) {
+ var part = verblist[i];
+ if (part[1] == name)
+ return i;
+ }
+}
+function wipe_verbs() {
+ verbs = [["", ""]];
+ verb_tabs = [];
+ checkStatusTab(); // remove all empty verb tabs
+}
+
+function update_verbs() {
+ wipe_verbs();
+ Byond.sendMessage("Update-Verbs");
+}
+
+function SendTabsToByond() {
+ var tabstosend = [];
+ tabstosend = tabstosend.concat(permanent_tabs, verb_tabs);
+ for (var i = 0; i < tabstosend.length; i++) {
+ SendTabToByond(tabstosend[i]);
+ }
+}
+
+function SendTabToByond(tab) {
+ Byond.sendMessage("Send-Tabs", {tab: tab});
+}
+
+//Byond can't have this tab anymore since we're removing it
+function TakeTabFromByond(tab) {
+ Byond.sendMessage("Remove-Tabs", {tab: tab});
+}
+
+function spell_cat_check(cat) {
+ var spells_in_cat = 0;
+ var spellcat = "";
+ for (var s = 0; s < spells.length; s++) {
+ var spell = spells[s];
+ spellcat = spell[0];
+ if (spellcat == cat) {
+ spells_in_cat++;
+ }
+ }
+ if (spells_in_cat < 1) {
+ removeStatusTab(cat);
+ }
+}
+
+function tab_change(tab) {
+ if (tab == current_tab) return;
+ if (document.getElementById(current_tab))
+ document.getElementById(current_tab).className = "button"; // disable active on last button
+ current_tab = tab;
+ set_byond_tab(tab);
+ if (document.getElementById(tab))
+ document.getElementById(tab).className = "button active"; // make current button active
+ var spell_tabs_thingy = (spell_tabs.includes(tab));
+ var verb_tabs_thingy = (verb_tabs.includes(tab));
+ if (tab == "Status") {
+ draw_status();
+ } else if (tab == "MC") {
+ draw_mc();
+ } else if (spell_tabs_thingy) {
+ draw_spells(tab);
+ } else if (verb_tabs_thingy) {
+ draw_verbs(tab);
+ } else if (tab == "Debug Stat Panel") {
+ draw_debug();
+ } else if (tab == "Tickets") {
+ draw_tickets();
+ draw_interviews();
+ } else if (tab == "SDQL2") {
+ draw_sdql2();
+ } else if (tab == turfname) {
+ draw_listedturf();
+ } else {
+ statcontentdiv.textContext = "Loading...";
+ }
+ Byond.winset(Byond.windowId, {
+ 'is-visible': true,
+ });
+}
+
+function set_byond_tab(tab) {
+ Byond.sendMessage("Set-Tab", {tab: tab});
+}
+
+function draw_debug() {
+ statcontentdiv.textContent = "";
+ var wipeverbstabs = document.createElement("div");
+ var link = document.createElement("a");
+ link.onclick = function () { wipe_verbs() };
+ link.textContent = "Wipe All Verbs";
+ wipeverbstabs.appendChild(link);
+ document.getElementById("statcontent").appendChild(wipeverbstabs);
+ var wipeUpdateVerbsTabs = document.createElement("div");
+ var updateLink = document.createElement("a");
+ updateLink.onclick = function () { update_verbs() };
+ updateLink.textContent = "Wipe and Update All Verbs";
+ wipeUpdateVerbsTabs.appendChild(updateLink);
+ document.getElementById("statcontent").appendChild(wipeUpdateVerbsTabs);
+ var text = document.createElement("div");
+ text.textContent = "Verb Tabs:";
+ document.getElementById("statcontent").appendChild(text);
+ var table1 = document.createElement("table");
+ for (var i = 0; i < verb_tabs.length; i++) {
+ var part = verb_tabs[i];
+ // Hide subgroups except admin subgroups if they are split
+ if (verb_tabs[i].lastIndexOf(".") != -1) {
+ var splitName = verb_tabs[i].split(".");
+ if (split_admin_tabs && splitName[0] === "Admin")
+ part = splitName[1];
+ else
+ continue;
+ }
+ var tr = document.createElement("tr");
+ var td1 = document.createElement("td");
+ td1.textContent = part;
+ var a = document.createElement("a");
+ a.onclick = function (part) {
+ return function () { removeStatusTab(part) };
+ }(part);
+ a.textContent = " Delete Tab " + part;
+ td1.appendChild(a);
+ tr.appendChild(td1);
+ table1.appendChild(tr);
+ }
+ document.getElementById("statcontent").appendChild(table1);
+ var header2 = document.createElement("div");
+ header2.textContent = "Verbs:";
+ document.getElementById("statcontent").appendChild(header2);
+ var table2 = document.createElement("table");
+ for (var v = 0; v < verbs.length; v++) {
+ var part2 = verbs[v];
+ var trr = document.createElement("tr");
+ var tdd1 = document.createElement("td");
+ tdd1.textContent = part2[0];
+ var tdd2 = document.createElement("td");
+ tdd2.textContent = part2[1];
+ trr.appendChild(tdd1);
+ trr.appendChild(tdd2);
+ table2.appendChild(trr);
+ }
+ document.getElementById("statcontent").appendChild(table2);
+ var text3 = document.createElement("div");
+ text3.textContent = "Permanent Tabs:";
+ document.getElementById("statcontent").appendChild(text3);
+ var table3 = document.createElement("table");
+ for (var i = 0; i < permanent_tabs.length; i++) {
+ var part3 = permanent_tabs[i];
+ var trrr = document.createElement("tr");
+ var tddd1 = document.createElement("td");
+ tddd1.textContent = part3;
+ trrr.appendChild(tddd1);
+ table3.appendChild(trrr);
+ }
+ document.getElementById("statcontent").appendChild(table3);
+
+}
+function draw_status() {
+ if (!document.getElementById("Status")) {
+ createStatusTab("Status");
+ current_tab = "Status";
+ }
+ statcontentdiv.textContent = '';
+ for (var i = 0; i < status_tab_parts.length; i++) {
+ if (status_tab_parts[i].trim() == "") {
+ document.getElementById("statcontent").appendChild(document.createElement("br"));
+ } else {
+ var div = document.createElement("div");
+ div.textContent = status_tab_parts[i];
+ document.getElementById("statcontent").appendChild(div);
+ }
+ }
+ if (verb_tabs.length == 0 || !verbs) {
+ Byond.command("Fix-Stat-Panel");
+ }
+}
+
+function draw_mc() {
+ statcontentdiv.textContent = "";
+ var table = document.createElement("table");
+ for (var i = 0; i < mc_tab_parts.length; i++) {
+ var part = mc_tab_parts[i];
+ var tr = document.createElement("tr");
+ var td1 = document.createElement("td");
+ td1.textContent = part[0];
+ var td2 = document.createElement("td");
+ if (part[2]) {
+ var a = document.createElement("a");
+ a.href = "?_src_=vars;admin_token=" + href_token + ";Vars=" + part[2];
+ a.textContent = part[1];
+ td2.appendChild(a);
+ } else {
+ td2.textContent = part[1];
+ }
+ tr.appendChild(td1);
+ tr.appendChild(td2);
+ table.appendChild(tr);
+ }
+ document.getElementById("statcontent").appendChild(table);
+}
+
+function remove_tickets() {
+ if (tickets) {
+ tickets = [];
+ removePermanentTab("Tickets");
+ if (current_tab == "Tickets")
+ tab_change("Status");
+ }
+ checkStatusTab();
+}
+
+function remove_sdql2() {
+ if (sdql2) {
+ sdql2 = [];
+ removePermanentTab("SDQL2");
+ if (current_tab == "SDQL2")
+ tab_change("Status");
+ }
+ checkStatusTab();
+}
+
+function remove_interviews() {
+ if (tickets) {
+ tickets = [];
+ }
+ checkStatusTab();
+}
+
+function iconError(e) {
+ if(current_tab != turfname) {
+ return;
+ }
+ setTimeout(function () {
+ var node = e.target;
+ var current_attempts = Number(node.getAttribute("data-attempts")) || 0
+ if (current_attempts > imageRetryLimit) {
+ return;
+ }
+ var src = node.src;
+ node.src = null;
+ node.src = src + '#' + current_attempts;
+ node.setAttribute("data-attempts", current_attempts + 1)
+ draw_listedturf();
+ }, imageRetryDelay);
+}
+
+function draw_listedturf() {
+ statcontentdiv.textContent = "";
+ var table = document.createElement("table");
+ for (var i = 0; i < turfcontents.length; i++) {
+ var part = turfcontents[i];
+ if (storedimages[part[1]] == null && part[2]) {
+ var img = document.createElement("img");
+ img.src = part[2];
+ img.id = part[1];
+ storedimages[part[1]] = part[2];
+ img.onerror = iconError;
+ table.appendChild(img);
+ } else {
+ var img = document.createElement("img");
+ img.onerror = iconError;
+ img.src = storedimages[part[1]];
+ img.id = part[1];
+ table.appendChild(img);
+ }
+ var b = document.createElement("div");
+ var clickcatcher = "";
+ b.className = "link";
+ b.onmousedown = function (part) {
+ // The outer function is used to close over a fresh "part" variable,
+ // rather than every onmousedown getting the "part" of the last entry.
+ return function (e) {
+ e.preventDefault();
+ clickcatcher = "?src=" + part[1];
+ switch (e.button) {
+ case 1:
+ clickcatcher += ";statpanel_item_click=middle"
+ break;
+ case 2:
+ clickcatcher += ";statpanel_item_click=right"
+ break;
+ default:
+ clickcatcher += ";statpanel_item_click=left"
+ }
+ if (e.shiftKey) {
+ clickcatcher += ";statpanel_item_shiftclick=1";
+ }
+ if (e.ctrlKey) {
+ clickcatcher += ";statpanel_item_ctrlclick=1";
+ }
+ if (e.altKey) {
+ clickcatcher += ";statpanel_item_altclick=1";
+ }
+ window.location.href = clickcatcher;
+ }
+ }(part);
+ b.textContent = part[0];
+ table.appendChild(b);
+ table.appendChild(document.createElement("br"));
+ }
+ document.getElementById("statcontent").appendChild(table);
+}
+
+function remove_listedturf() {
+ removePermanentTab(turfname);
+ checkStatusTab();
+ if (current_tab == turfname) {
+ tab_change("Status");
+ }
+}
+
+function remove_mc() {
+ removeStatusTab("MC");
+ if (current_tab == "MC") {
+ tab_change("Status");
+ }
+};
+
+function draw_sdql2() {
+ statcontentdiv.textContent = "";
+ var table = document.createElement("table");
+ for (var i = 0; i < sdql2.length; i++) {
+ var part = sdql2[i];
+ var tr = document.createElement("tr");
+ var td1 = document.createElement("td");
+ td1.textContent = part[0];
+ var td2 = document.createElement("td");
+ if (part[2]) {
+ var a = document.createElement("a");
+ a.href = "?src=" + part[2] + ";statpanel_item_click=left";
+ a.textContent = part[1];
+ td2.appendChild(a);
+ } else {
+ td2.textContent = part[1];
+ }
+ tr.appendChild(td1);
+ tr.appendChild(td2);
+ table.appendChild(tr);
+ }
+ document.getElementById("statcontent").appendChild(table);
+}
+
+function draw_tickets() {
+ statcontentdiv.textContent = "";
+ var table = document.createElement("table");
+ if (!tickets) {
+ return;
+ }
+ for (var i = 0; i < tickets.length; i++) {
+ var part = tickets[i];
+ var tr = document.createElement("tr");
+ var td1 = document.createElement("td");
+ td1.textContent = part[0];
+ var td2 = document.createElement("td");
+ if (part[2]) {
+ var a = document.createElement("a");
+ a.href = "?_src_=holder;admin_token=" + href_token + ";ahelp=" + part[2] + ";ahelp_action=ticket;statpanel_item_click=left;action=ticket";
+ a.textContent = part[1];
+ td2.appendChild(a);
+ } else if (part[3]) {
+ var a = document.createElement("a");
+ a.href = "?src=" + part[3] + ";statpanel_item_click=left";
+ a.textContent = part[1];
+ td2.appendChild(a);
+ } else {
+ td2.textContent = part[1];
+ }
+ tr.appendChild(td1);
+ tr.appendChild(td2);
+ table.appendChild(tr);
+ }
+ document.getElementById("statcontent").appendChild(table);
+}
+
+function draw_interviews() {
+ var body = document.createElement("div");
+ var header = document.createElement("h3");
+ header.textContent = "Interviews";
+ body.appendChild(header);
+ var manDiv = document.createElement("div");
+ manDiv.className = "interview_panel_controls"
+ var manLink = document.createElement("a");
+ manLink.textContent = "Open Interview Manager Panel";
+ manLink.href = "?_src_=holder;admin_token=" + href_token + ";interview_man=1;statpanel_item_click=left";
+ manDiv.appendChild(manLink);
+ body.appendChild(manDiv);
+
+ // List interview stats
+ var statsDiv = document.createElement("table");
+ statsDiv.className = "interview_panel_stats";
+ for (var key in interviewManager.status) {
+ var d = document.createElement("div");
+ var tr = document.createElement("tr");
+ var stat_name = document.createElement("td");
+ var stat_text = document.createElement("td");
+ stat_name.textContent = key;
+ stat_text.textContent = interviewManager.status[key];
+ tr.appendChild(stat_name);
+ tr.appendChild(stat_text);
+ statsDiv.appendChild(tr);
+ }
+ body.appendChild(statsDiv);
+ document.getElementById("statcontent").appendChild(body);
+
+ // List interviews if any are open
+ var table = document.createElement("table");
+ table.className = "interview_panel_table";
+ if (!interviewManager) {
+ return;
+ }
+ for (var i = 0; i < interviewManager.interviews.length; i++) {
+ var part = interviewManager.interviews[i];
+ var tr = document.createElement("tr");
+ var td = document.createElement("td");
+ var a = document.createElement("a");
+ a.textContent = part["status"];
+ a.href = "?_src_=holder;admin_token=" + href_token + ";interview=" + part["ref"] + ";statpanel_item_click=left";
+ td.appendChild(a);
+ tr.appendChild(td);
+ table.appendChild(tr);
+ }
+ document.getElementById("statcontent").appendChild(table);
+}
+
+function draw_spells(cat) {
+ statcontentdiv.textContent = "";
+ var table = document.createElement("table");
+ for (var i = 0; i < spells.length; i++) {
+ var part = spells[i];
+ if (part[0] != cat) continue;
+ var tr = document.createElement("tr");
+ var td1 = document.createElement("td");
+ td1.textContent = part[1];
+ var td2 = document.createElement("td");
+ if (part[3]) {
+ var a = document.createElement("a");
+ a.href = "?src=" + part[3] + ";statpanel_item_click=left";
+ a.textContent = part[2];
+ td2.appendChild(a);
+ } else {
+ td2.textContent = part[2];
+ }
+ tr.appendChild(td1);
+ tr.appendChild(td2);
+ table.appendChild(tr);
+ }
+ document.getElementById("statcontent").appendChild(table);
+}
+
+function make_verb_onclick(command) {
+ return function () {
+ run_after_focus(function () {
+ Byond.command(command);
+ });
+ };
+}
+
+function draw_verbs(cat) {
+ statcontentdiv.textContent = "";
+ var table = document.createElement("div");
+ var additions = {}; // additional sub-categories to be rendered
+ table.className = "grid-container";
+ sortVerbs();
+ if (split_admin_tabs && cat.lastIndexOf(".") != -1) {
+ var splitName = cat.split(".");
+ if (splitName[0] === "Admin")
+ cat = splitName[1];
+ }
+ verbs.reverse(); // sort verbs backwards before we draw
+ for (var i = 0; i < verbs.length; ++i) {
+ var part = verbs[i];
+ var name = part[0];
+ if (split_admin_tabs && name.lastIndexOf(".") != -1) {
+ var splitName = name.split(".");
+ if (splitName[0] === "Admin")
+ name = splitName[1];
+ }
+ var command = part[1];
+
+ if (command && name.lastIndexOf(cat, 0) != -1 && (name.length == cat.length || name.charAt(cat.length) == ".")) {
+ var subCat = name.lastIndexOf(".") != -1 ? name.split(".")[1] : null;
+ if (subCat && !additions[subCat]) {
+ var newTable = document.createElement("div");
+ newTable.className = "grid-container";
+ additions[subCat] = newTable;
+ }
+
+ var a = document.createElement("a");
+ a.href = "#";
+ a.onclick = make_verb_onclick(command.replace(/\s/g, "-"));
+ a.className = "grid-item";
+ var t = document.createElement("span");
+ t.textContent = command;
+ t.className = "grid-item-text";
+ a.appendChild(t);
+ (subCat ? additions[subCat] : table).appendChild(a);
+ }
+ }
+
+ // Append base table to view
+ var content = document.getElementById("statcontent");
+ content.appendChild(table);
+
+ // Append additional sub-categories if relevant
+ for (var cat in additions) {
+ if (additions.hasOwnProperty(cat)) {
+ // do addition here
+ var header = document.createElement("h3");
+ header.textContent = cat;
+ content.appendChild(header);
+ content.appendChild(additions[cat]);
+ }
+ }
+}
+
+function set_theme(which) {
+ if (which == "light") {
+ document.body.className = "";
+ set_style_sheet("browserOutput_white");
+ } else if (which == "dark") {
+ document.body.className = "dark";
+ set_style_sheet("browserOutput");
+ }
+}
+
+function set_style_sheet(sheet) {
+ if (document.getElementById("goonStyle")) {
+ var currentSheet = document.getElementById("goonStyle");
+ currentSheet.parentElement.removeChild(currentSheet);
+ }
+ var head = document.getElementsByTagName('head')[0];
+ var sheetElement = document.createElement("link");
+ sheetElement.id = "goonStyle";
+ sheetElement.rel = "stylesheet";
+ sheetElement.type = "text/css";
+ sheetElement.href = sheet + ".css";
+ sheetElement.media = 'all';
+ head.appendChild(sheetElement);
+}
+
+function restoreFocus() {
+ run_after_focus(function () {
+ Byond.winset('map', {
+ focus: true,
+ });
+ });
+}
+
+function getCookie(cname) {
+ var name = cname + '=';
+ var ca = document.cookie.split(';');
+ for (var i = 0; i < ca.length; i++) {
+ var c = ca[i];
+ while (c.charAt(0) == ' ') c = c.substring(1);
+ if (c.indexOf(name) === 0) {
+ return decoder(c.substring(name.length, c.length));
+ }
+ }
+ return '';
+}
+
+function add_verb_list(payload) {
+ var to_add = payload; // list of a list with category and verb inside it
+ to_add.sort(); // sort what we're adding
+ for (var i = 0; i < to_add.length; i++) {
+ var part = to_add[i];
+ if (!part[0])
+ continue;
+ var category = part[0];
+ if (category.indexOf(".") != -1) {
+ var splitName = category.split(".");
+ if (split_admin_tabs && splitName[0] === "Admin")
+ category = splitName[1];
+ else
+ category = splitName[0];
+ }
+ if (findVerbindex(part[1], verbs))
+ continue;
+ if (verb_tabs.includes(category)) {
+ verbs.push(part);
+ if (current_tab == category) {
+ draw_verbs(category); // redraw if we added a verb to the tab we're currently in
+ }
+ } else if (category) {
+ verb_tabs.push(category);
+ verbs.push(part);
+ createStatusTab(category);
+ }
+ }
+};
+
+function init_spells() {
+ var cat = "";
+ for (var i = 0; i < spell_tabs.length; i++) {
+ cat = spell_tabs[i];
+ if (cat.length > 0) {
+ verb_tabs.push(cat);
+ createStatusTab(cat);
+ }
+ }
+}
+
+document.addEventListener("mouseup", restoreFocus);
+document.addEventListener("keyup", restoreFocus);
+
+if (!current_tab) {
+ addPermanentTab("Status");
+ tab_change("Status");
+}
+
+window.onload = function () {
+ Byond.command("Update-Verbs");
+};
+
+Byond.subscribeTo('update_spells', function (payload) {
+ spell_tabs = payload.spell_tabs;
+ var do_update = false;
+ if (spell_tabs.includes(current_tab)) {
+ do_update = true;
+ }
+ init_spells();
+ if (payload.verblist) {
+ spells = payload.verblist;
+ if (do_update) {
+ draw_spells(current_tab);
+ }
+ } else {
+ remove_spells();
+ }
+});
+
+Byond.subscribeTo('remove_verb_list', function (v) {
+ var to_remove = v;
+ for (var i = 0; i < to_remove.length; i++) {
+ remove_verb(to_remove[i]);
+ }
+ check_verbs();
+ sortVerbs();
+ if (verb_tabs.includes(current_tab))
+ draw_verbs(current_tab);
+});
+
+// passes a 2D list of (verbcategory, verbname) creates tabs and adds verbs to respective list
+// example (IC, Say)
+Byond.subscribeTo('init_verbs', function (payload) {
+ wipe_verbs(); // remove all verb categories so we can replace them
+ checkStatusTab(); // remove all status tabs
+ verb_tabs = payload.panel_tabs;
+ verb_tabs.sort(); // sort it
+ var do_update = false;
+ var cat = "";
+ for (var i = 0; i < verb_tabs.length; i++) {
+ cat = verb_tabs[i];
+ createStatusTab(cat); // create a category if the verb doesn't exist yet
+ }
+ if (verb_tabs.includes(current_tab)) {
+ do_update = true;
+ }
+ if (payload.verblist) {
+ add_verb_list(payload.verblist);
+ sortVerbs(); // sort them
+ if (do_update) {
+ draw_verbs(current_tab);
+ }
+ }
+ SendTabsToByond();
+});
+
+Byond.subscribeTo('update_stat', function (payload) {
+ status_tab_parts = [payload.ping_str];
+ var parsed = payload.global_data;
+
+ for (var i = 0; i < parsed.length; i++) if (parsed[i] != null) status_tab_parts.push(parsed[i]);
+
+ parsed = payload.other_str;
+
+ for (var i = 0; i < parsed.length; i++) if (parsed[i] != null) status_tab_parts.push(parsed[i]);
+
+ if (current_tab == "Status") {
+ draw_status();
+ } else if (current_tab == "Debug Stat Panel") {
+ draw_debug();
+ }
+});
+
+Byond.subscribeTo('update_mc', function (payload) {
+ mc_tab_parts = payload.mc_data;
+ mc_tab_parts.splice(0, 0, ["Location:", payload.coord_entry]);
+
+ if (!verb_tabs.includes("MC")) {
+ verb_tabs.push("MC");
+ }
+
+ createStatusTab("MC");
+
+ if (current_tab == "MC") {
+ draw_mc();
+ }
+});
+
+Byond.subscribeTo('remove_spells', function () {
+ for (var s = 0; s < spell_tabs.length; s++) {
+ removeStatusTab(spell_tabs[s]);
+ }
+});
+
+Byond.subscribeTo('init_spells', function () {
+ var cat = "";
+ for (var i = 0; i < spell_tabs.length; i++) {
+ cat = spell_tabs[i];
+ if (cat.length > 0) {
+ verb_tabs.push(cat);
+ createStatusTab(cat);
+ }
+ }
+});
+
+Byond.subscribeTo('check_spells', function () {
+ for (var v = 0; v < spell_tabs.length; v++) {
+ spell_cat_check(spell_tabs[v]);
+ }
+});
+
+Byond.subscribeTo('create_debug', function () {
+ if (!document.getElementById("Debug Stat Panel")) {
+ addPermanentTab("Debug Stat Panel");
+ } else {
+ removePermanentTab("Debug Stat Panel");
+ }
+});
+
+Byond.subscribeTo('create_listedturf', function (TN) {
+ remove_listedturf(); // remove the last one if we had one
+ turfname = TN;
+ addPermanentTab(turfname);
+ tab_change(turfname);
+});
+
+Byond.subscribeTo('remove_admin_tabs', function () {
+ href_token = null;
+ remove_mc();
+ remove_tickets();
+ remove_sdql2();
+ remove_interviews();
+});
+
+Byond.subscribeTo('update_listedturf', function (TC) {
+ turfcontents = TC;
+ if (current_tab == turfname) {
+ draw_listedturf();
+ }
+});
+
+Byond.subscribeTo('update_interviews', function (I) {
+ interviewManager = I;
+ if (current_tab == "Tickets") {
+ draw_interviews();
+ }
+});
+
+Byond.subscribeTo('update_split_admin_tabs', function (status) {
+ status = (status == true);
+
+ if (split_admin_tabs !== status) {
+ if (split_admin_tabs === true) {
+ removeStatusTab("Events");
+ removeStatusTab("Fun");
+ removeStatusTab("Game");
+ }
+ update_verbs();
+ }
+ split_admin_tabs = status;
+});
+
+Byond.subscribeTo('add_admin_tabs', function (ht) {
+ href_token = ht;
+ addPermanentTab("MC");
+ addPermanentTab("Tickets");
+});
+
+Byond.subscribeTo('update_sdql2', function (S) {
+ sdql2 = S;
+ if (sdql2.length > 0 && !verb_tabs.includes("SDQL2")) {
+ verb_tabs.push("SDQL2");
+ addPermanentTab("SDQL2");
+ }
+ if (current_tab == "SDQL2") {
+ draw_sdql2();
+ }
+});
+
+Byond.subscribeTo('update_tickets', function (T) {
+ tickets = T;
+ if (!verb_tabs.includes("Tickets")) {
+ verb_tabs.push("Tickets");
+ addPermanentTab("Tickets");
+ }
+ if (current_tab == "Tickets") {
+ draw_tickets();
+ }
+});
+
+Byond.subscribeTo('remove_listedturf', remove_listedturf);
+
+Byond.subscribeTo('remove_sdql2', remove_sdql2);
+
+Byond.subscribeTo('remove_mc', remove_mc);
+
+Byond.subscribeTo('add_verb_list', add_verb_list);
diff --git a/icons/effects/genetics.dmi b/icons/effects/genetics.dmi
index 373a9de623b7..fff43639c43d 100644
Binary files a/icons/effects/genetics.dmi and b/icons/effects/genetics.dmi differ
diff --git a/icons/mob/clothing/accessories.dmi b/icons/mob/clothing/accessories.dmi
index bfde13162237..aef500b67da9 100644
Binary files a/icons/mob/clothing/accessories.dmi and b/icons/mob/clothing/accessories.dmi differ
diff --git a/icons/mob/clothing/back.dmi b/icons/mob/clothing/back.dmi
index 13baacb46614..151cc5c1b2ea 100644
Binary files a/icons/mob/clothing/back.dmi and b/icons/mob/clothing/back.dmi differ
diff --git a/icons/mob/clothing/belt.dmi b/icons/mob/clothing/belt.dmi
index 7feb4662b2ec..78b8033a2e35 100644
Binary files a/icons/mob/clothing/belt.dmi and b/icons/mob/clothing/belt.dmi differ
diff --git a/icons/mob/clothing/belt_mirror.dmi b/icons/mob/clothing/belt_mirror.dmi
index 3440e0b3e663..b7574c4afb0e 100644
Binary files a/icons/mob/clothing/belt_mirror.dmi and b/icons/mob/clothing/belt_mirror.dmi differ
diff --git a/icons/mob/clothing/eyes.dmi b/icons/mob/clothing/eyes.dmi
index 9af8d7dc8bba..5f7fa454a218 100644
Binary files a/icons/mob/clothing/eyes.dmi and b/icons/mob/clothing/eyes.dmi differ
diff --git a/icons/mob/clothing/faction/gezena/suits.dmi b/icons/mob/clothing/faction/gezena/suits.dmi
index c76b3368c644..a5a6e864dddf 100644
Binary files a/icons/mob/clothing/faction/gezena/suits.dmi and b/icons/mob/clothing/faction/gezena/suits.dmi differ
diff --git a/icons/mob/clothing/faction/suns/accessory.dmi b/icons/mob/clothing/faction/suns/accessory.dmi
new file mode 100644
index 000000000000..00e868d303fd
Binary files /dev/null and b/icons/mob/clothing/faction/suns/accessory.dmi differ
diff --git a/icons/mob/clothing/faction/suns/belt.dmi b/icons/mob/clothing/faction/suns/belt.dmi
new file mode 100644
index 000000000000..dde9fb4bfa42
Binary files /dev/null and b/icons/mob/clothing/faction/suns/belt.dmi differ
diff --git a/icons/mob/clothing/faction/suns/eyes.dmi b/icons/mob/clothing/faction/suns/eyes.dmi
new file mode 100644
index 000000000000..0dd74b201876
Binary files /dev/null and b/icons/mob/clothing/faction/suns/eyes.dmi differ
diff --git a/icons/mob/clothing/faction/suns/feet.dmi b/icons/mob/clothing/faction/suns/feet.dmi
new file mode 100644
index 000000000000..0c665a29cda6
Binary files /dev/null and b/icons/mob/clothing/faction/suns/feet.dmi differ
diff --git a/icons/mob/clothing/faction/suns/hands.dmi b/icons/mob/clothing/faction/suns/hands.dmi
new file mode 100644
index 000000000000..c84e17e76662
Binary files /dev/null and b/icons/mob/clothing/faction/suns/hands.dmi differ
diff --git a/icons/mob/clothing/faction/suns/head.dmi b/icons/mob/clothing/faction/suns/head.dmi
new file mode 100644
index 000000000000..22eb273e8041
Binary files /dev/null and b/icons/mob/clothing/faction/suns/head.dmi differ
diff --git a/icons/mob/clothing/faction/suns/mask.dmi b/icons/mob/clothing/faction/suns/mask.dmi
new file mode 100644
index 000000000000..373ae5b94052
Binary files /dev/null and b/icons/mob/clothing/faction/suns/mask.dmi differ
diff --git a/icons/mob/clothing/faction/suns/neck.dmi b/icons/mob/clothing/faction/suns/neck.dmi
new file mode 100644
index 000000000000..0c8243bbb09b
Binary files /dev/null and b/icons/mob/clothing/faction/suns/neck.dmi differ
diff --git a/icons/mob/clothing/faction/suns/suits.dmi b/icons/mob/clothing/faction/suns/suits.dmi
new file mode 100644
index 000000000000..11d1b5142b99
Binary files /dev/null and b/icons/mob/clothing/faction/suns/suits.dmi differ
diff --git a/icons/mob/clothing/faction/suns/uniforms.dmi b/icons/mob/clothing/faction/suns/uniforms.dmi
new file mode 100644
index 000000000000..a354f10437f5
Binary files /dev/null and b/icons/mob/clothing/faction/suns/uniforms.dmi differ
diff --git a/icons/mob/clothing/feet.dmi b/icons/mob/clothing/feet.dmi
index e9e6444a4795..6b974d5a8199 100644
Binary files a/icons/mob/clothing/feet.dmi and b/icons/mob/clothing/feet.dmi differ
diff --git a/icons/mob/clothing/head.dmi b/icons/mob/clothing/head.dmi
index f370aa665669..e6dd95288038 100644
Binary files a/icons/mob/clothing/head.dmi and b/icons/mob/clothing/head.dmi differ
diff --git a/icons/mob/clothing/suit.dmi b/icons/mob/clothing/suit.dmi
index a832ae961c56..138650d4fb27 100644
Binary files a/icons/mob/clothing/suit.dmi and b/icons/mob/clothing/suit.dmi differ
diff --git a/icons/mob/clothing/suits/armor.dmi b/icons/mob/clothing/suits/armor.dmi
index bc8daf14abd6..43440753b4f7 100644
Binary files a/icons/mob/clothing/suits/armor.dmi and b/icons/mob/clothing/suits/armor.dmi differ
diff --git a/icons/mob/clothing/suits/hooded.dmi b/icons/mob/clothing/suits/hooded.dmi
index 5988b39e8a6a..a4be6f11f793 100644
Binary files a/icons/mob/clothing/suits/hooded.dmi and b/icons/mob/clothing/suits/hooded.dmi differ
diff --git a/icons/mob/clothing/under/syndicate.dmi b/icons/mob/clothing/under/syndicate.dmi
index 7168514ee697..b8293f7cb440 100644
Binary files a/icons/mob/clothing/under/syndicate.dmi and b/icons/mob/clothing/under/syndicate.dmi differ
diff --git a/icons/mob/hair_extensions.dmi b/icons/mob/hair_extensions.dmi
deleted file mode 100644
index cafc9fab781c..000000000000
Binary files a/icons/mob/hair_extensions.dmi and /dev/null differ
diff --git a/icons/mob/human_face.dmi b/icons/mob/human_face.dmi
index d130ba2cf2e3..a819dd3ca780 100644
Binary files a/icons/mob/human_face.dmi and b/icons/mob/human_face.dmi differ
diff --git a/icons/mob/inhands/faction/suns/suns_lefthand.dmi b/icons/mob/inhands/faction/suns/suns_lefthand.dmi
new file mode 100644
index 000000000000..68eaf2a408f3
Binary files /dev/null and b/icons/mob/inhands/faction/suns/suns_lefthand.dmi differ
diff --git a/icons/mob/inhands/faction/suns/suns_righthand.dmi b/icons/mob/inhands/faction/suns/suns_righthand.dmi
new file mode 100644
index 000000000000..67743f04a454
Binary files /dev/null and b/icons/mob/inhands/faction/suns/suns_righthand.dmi differ
diff --git a/icons/mob/inhands/items_lefthand.dmi b/icons/mob/inhands/items_lefthand.dmi
index c2f7d7c53334..f5f95c211298 100644
Binary files a/icons/mob/inhands/items_lefthand.dmi and b/icons/mob/inhands/items_lefthand.dmi differ
diff --git a/icons/mob/inhands/items_righthand.dmi b/icons/mob/inhands/items_righthand.dmi
index 6ede1edc7747..f626c077ced5 100644
Binary files a/icons/mob/inhands/items_righthand.dmi and b/icons/mob/inhands/items_righthand.dmi differ
diff --git a/icons/mob/inhands/weapons/guns_lefthand.dmi b/icons/mob/inhands/weapons/guns_lefthand.dmi
index 7b15fb84a247..811173593681 100644
Binary files a/icons/mob/inhands/weapons/guns_lefthand.dmi and b/icons/mob/inhands/weapons/guns_lefthand.dmi differ
diff --git a/icons/mob/inhands/weapons/guns_righthand.dmi b/icons/mob/inhands/weapons/guns_righthand.dmi
index 0354d2352120..4976bd2e2e00 100644
Binary files a/icons/mob/inhands/weapons/guns_righthand.dmi and b/icons/mob/inhands/weapons/guns_righthand.dmi differ
diff --git a/icons/mob/inhands/weapons/swords_lefthand.dmi b/icons/mob/inhands/weapons/swords_lefthand.dmi
index 8037796c590a..41093fde051e 100644
Binary files a/icons/mob/inhands/weapons/swords_lefthand.dmi and b/icons/mob/inhands/weapons/swords_lefthand.dmi differ
diff --git a/icons/mob/inhands/weapons/swords_righthand.dmi b/icons/mob/inhands/weapons/swords_righthand.dmi
index 6231276ec7c4..a8559339cd26 100644
Binary files a/icons/mob/inhands/weapons/swords_righthand.dmi and b/icons/mob/inhands/weapons/swords_righthand.dmi differ
diff --git a/icons/mob/ipc_accessories.dmi b/icons/mob/ipc_accessories.dmi
index 86311ca3172e..e9fb262aa319 100644
Binary files a/icons/mob/ipc_accessories.dmi and b/icons/mob/ipc_accessories.dmi differ
diff --git a/icons/mob/pai.dmi b/icons/mob/pai.dmi
index 1c609686be11..4e46503e87c7 100644
Binary files a/icons/mob/pai.dmi and b/icons/mob/pai.dmi differ
diff --git a/icons/mob/pai_item_head.dmi b/icons/mob/pai_item_head.dmi
index 337e22254ea8..38db9379be12 100644
Binary files a/icons/mob/pai_item_head.dmi and b/icons/mob/pai_item_head.dmi differ
diff --git a/icons/mob/pai_item_lh.dmi b/icons/mob/pai_item_lh.dmi
index fb9c77f5abae..49cd390f8d2f 100644
Binary files a/icons/mob/pai_item_lh.dmi and b/icons/mob/pai_item_lh.dmi differ
diff --git a/icons/mob/pai_item_rh.dmi b/icons/mob/pai_item_rh.dmi
index ced27446a451..de7bc143b9c3 100644
Binary files a/icons/mob/pai_item_rh.dmi and b/icons/mob/pai_item_rh.dmi differ
diff --git a/icons/mob/species/ipc/bodyparts.dmi b/icons/mob/species/ipc/bodyparts.dmi
index f5c348617b56..1b4b568dcc78 100644
Binary files a/icons/mob/species/ipc/bodyparts.dmi and b/icons/mob/species/ipc/bodyparts.dmi differ
diff --git a/icons/mob/species/misc/digitigrade.dmi b/icons/mob/species/misc/digitigrade.dmi
index 7c6aca4107b1..b937694ec240 100644
Binary files a/icons/mob/species/misc/digitigrade.dmi and b/icons/mob/species/misc/digitigrade.dmi differ
diff --git a/icons/obj/aicards.dmi b/icons/obj/aicards.dmi
index 5698962eb9fb..a0b0ecba5be7 100644
Binary files a/icons/obj/aicards.dmi and b/icons/obj/aicards.dmi differ
diff --git a/icons/obj/aicardsradial.dmi b/icons/obj/aicardsradial.dmi
new file mode 100644
index 000000000000..ad5b874b221c
Binary files /dev/null and b/icons/obj/aicardsradial.dmi differ
diff --git a/icons/obj/ammo.dmi b/icons/obj/ammo.dmi
index 038ad37895ca..aaddd3b8de70 100644
Binary files a/icons/obj/ammo.dmi and b/icons/obj/ammo.dmi differ
diff --git a/icons/obj/clothing/accessories.dmi b/icons/obj/clothing/accessories.dmi
index dff8070e67e4..0b48ccfaf785 100644
Binary files a/icons/obj/clothing/accessories.dmi and b/icons/obj/clothing/accessories.dmi differ
diff --git a/icons/obj/clothing/belts.dmi b/icons/obj/clothing/belts.dmi
index 16b813111187..24cdcaed7839 100644
Binary files a/icons/obj/clothing/belts.dmi and b/icons/obj/clothing/belts.dmi differ
diff --git a/icons/obj/clothing/faction/gezena/suits.dmi b/icons/obj/clothing/faction/gezena/suits.dmi
index 09e00adf3289..f115778221f7 100644
Binary files a/icons/obj/clothing/faction/gezena/suits.dmi and b/icons/obj/clothing/faction/gezena/suits.dmi differ
diff --git a/icons/obj/clothing/faction/suns/accessory.dmi b/icons/obj/clothing/faction/suns/accessory.dmi
new file mode 100644
index 000000000000..fed96f7c2ee2
Binary files /dev/null and b/icons/obj/clothing/faction/suns/accessory.dmi differ
diff --git a/icons/obj/clothing/faction/suns/belt.dmi b/icons/obj/clothing/faction/suns/belt.dmi
new file mode 100644
index 000000000000..84c5fd0b1b64
Binary files /dev/null and b/icons/obj/clothing/faction/suns/belt.dmi differ
diff --git a/icons/obj/clothing/faction/suns/eyes.dmi b/icons/obj/clothing/faction/suns/eyes.dmi
new file mode 100644
index 000000000000..5695d1868d4d
Binary files /dev/null and b/icons/obj/clothing/faction/suns/eyes.dmi differ
diff --git a/icons/obj/clothing/faction/suns/feet.dmi b/icons/obj/clothing/faction/suns/feet.dmi
new file mode 100644
index 000000000000..478e4d9110a5
Binary files /dev/null and b/icons/obj/clothing/faction/suns/feet.dmi differ
diff --git a/icons/obj/clothing/faction/suns/hands.dmi b/icons/obj/clothing/faction/suns/hands.dmi
new file mode 100644
index 000000000000..6c7f9455773a
Binary files /dev/null and b/icons/obj/clothing/faction/suns/hands.dmi differ
diff --git a/icons/obj/clothing/faction/suns/head.dmi b/icons/obj/clothing/faction/suns/head.dmi
new file mode 100644
index 000000000000..71855c39bdc3
Binary files /dev/null and b/icons/obj/clothing/faction/suns/head.dmi differ
diff --git a/icons/obj/clothing/faction/suns/mask.dmi b/icons/obj/clothing/faction/suns/mask.dmi
new file mode 100644
index 000000000000..4554e2013dd8
Binary files /dev/null and b/icons/obj/clothing/faction/suns/mask.dmi differ
diff --git a/icons/obj/clothing/faction/suns/neck.dmi b/icons/obj/clothing/faction/suns/neck.dmi
new file mode 100644
index 000000000000..617118e56be5
Binary files /dev/null and b/icons/obj/clothing/faction/suns/neck.dmi differ
diff --git a/icons/obj/clothing/faction/suns/suits.dmi b/icons/obj/clothing/faction/suns/suits.dmi
new file mode 100644
index 000000000000..03a003703f73
Binary files /dev/null and b/icons/obj/clothing/faction/suns/suits.dmi differ
diff --git a/icons/obj/clothing/faction/suns/uniforms.dmi b/icons/obj/clothing/faction/suns/uniforms.dmi
new file mode 100644
index 000000000000..69908b5e7988
Binary files /dev/null and b/icons/obj/clothing/faction/suns/uniforms.dmi differ
diff --git a/icons/obj/clothing/glasses.dmi b/icons/obj/clothing/glasses.dmi
index 45d868f69692..10e7be38f19f 100644
Binary files a/icons/obj/clothing/glasses.dmi and b/icons/obj/clothing/glasses.dmi differ
diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi
index 3a77a2e55885..a96fa819bc3e 100644
Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ
diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi
index e0a755c5ca83..b596b5f3241e 100644
Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ
diff --git a/icons/obj/clothing/suits/hooded.dmi b/icons/obj/clothing/suits/hooded.dmi
index 366b69d85139..06d98acf2358 100644
Binary files a/icons/obj/clothing/suits/hooded.dmi and b/icons/obj/clothing/suits/hooded.dmi differ
diff --git a/icons/obj/decals.dmi b/icons/obj/decals.dmi
index b0d9bd53a345..ef671bc9c0d9 100644
Binary files a/icons/obj/decals.dmi and b/icons/obj/decals.dmi differ
diff --git a/icons/obj/deskflags.dmi b/icons/obj/deskflags.dmi
new file mode 100644
index 000000000000..cf1eaacf5bb3
Binary files /dev/null and b/icons/obj/deskflags.dmi differ
diff --git a/icons/obj/flags.dmi b/icons/obj/flags.dmi
deleted file mode 100644
index 71681940bbb7..000000000000
Binary files a/icons/obj/flags.dmi and /dev/null differ
diff --git a/icons/obj/guns/48x32guns.dmi b/icons/obj/guns/48x32guns.dmi
index 89bacfc64afd..fa7eba30f13a 100644
Binary files a/icons/obj/guns/48x32guns.dmi and b/icons/obj/guns/48x32guns.dmi differ
diff --git a/icons/obj/guns/projectile.dmi b/icons/obj/guns/projectile.dmi
index 02e7d3812dcb..b89094f953f3 100644
Binary files a/icons/obj/guns/projectile.dmi and b/icons/obj/guns/projectile.dmi differ
diff --git a/icons/obj/items_and_weapons.dmi b/icons/obj/items_and_weapons.dmi
index 7a20a687e055..81c1e3ff9b12 100644
Binary files a/icons/obj/items_and_weapons.dmi and b/icons/obj/items_and_weapons.dmi differ
diff --git a/icons/obj/kitchen.dmi b/icons/obj/kitchen.dmi
index 63b535e896df..a0bbca6bff9e 100644
Binary files a/icons/obj/kitchen.dmi and b/icons/obj/kitchen.dmi differ
diff --git a/icons/obj/monitors.dmi b/icons/obj/monitors.dmi
index d6921658546f..1d4b0e63d10e 100644
Binary files a/icons/obj/monitors.dmi and b/icons/obj/monitors.dmi differ
diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi
index 250f7220713d..26b4ebd8a83f 100644
Binary files a/icons/obj/storage.dmi and b/icons/obj/storage.dmi differ
diff --git a/icons/obj/structures/signs/directions.dmi b/icons/obj/structures/signs/directions.dmi
new file mode 100644
index 000000000000..f95cc15bbf87
Binary files /dev/null and b/icons/obj/structures/signs/directions.dmi differ
diff --git a/icons/obj/structures/signs/sign.dmi b/icons/obj/structures/signs/sign.dmi
new file mode 100644
index 000000000000..c7038f2d4121
Binary files /dev/null and b/icons/obj/structures/signs/sign.dmi differ
diff --git a/icons/obj/structures/signs/wallflags.dmi b/icons/obj/structures/signs/wallflags.dmi
new file mode 100644
index 000000000000..4b4696ad9623
Binary files /dev/null and b/icons/obj/structures/signs/wallflags.dmi differ
diff --git a/icons/obj/transforming_energy.dmi b/icons/obj/transforming_energy.dmi
index 4037a51d2ffa..ff2f99832d1c 100644
Binary files a/icons/obj/transforming_energy.dmi and b/icons/obj/transforming_energy.dmi differ
diff --git a/icons/obj/vehicles.dmi b/icons/obj/vehicles.dmi
index cb38fecefcfa..87cef669faf0 100644
Binary files a/icons/obj/vehicles.dmi and b/icons/obj/vehicles.dmi differ
diff --git a/shiptest.dme b/shiptest.dme
index f3744f6aef57..18cb8e3ca1ea 100644
--- a/shiptest.dme
+++ b/shiptest.dme
@@ -377,6 +377,7 @@
#include "code\controllers\subsystem\processing\nanites.dm"
#include "code\controllers\subsystem\processing\networks.dm"
#include "code\controllers\subsystem\processing\obj.dm"
+#include "code\controllers\subsystem\processing\obj_tab_items.dm"
#include "code\controllers\subsystem\processing\processing.dm"
#include "code\controllers\subsystem\processing\projectiles.dm"
#include "code\controllers\subsystem\processing\quirks.dm"
@@ -460,6 +461,7 @@
#include "code\datums\components\chasm.dm"
#include "code\datums\components\connect_containers.dm"
#include "code\datums\components\connect_loc_behalf.dm"
+#include "code\datums\components\connect_mob_behalf.dm"
#include "code\datums\components\connect_range.dm"
#include "code\datums\components\construction.dm"
#include "code\datums\components\creamed.dm"
@@ -711,7 +713,6 @@
#include "code\datums\mutations\hulk.dm"
#include "code\datums\mutations\radioactive.dm"
#include "code\datums\mutations\sight.dm"
-#include "code\datums\mutations\space_adaptation.dm"
#include "code\datums\mutations\speech.dm"
#include "code\datums\mutations\telekinesis.dm"
#include "code\datums\mutations\touch.dm"
@@ -743,7 +744,11 @@
#include "code\datums\traits\good.dm"
#include "code\datums\traits\negative.dm"
#include "code\datums\traits\neutral.dm"
+#include "code\datums\votes\_vote_datum.dm"
+#include "code\datums\votes\custom_vote.dm"
+#include "code\datums\votes\restart_vote.dm"
#include "code\datums\weather\weather.dm"
+#include "code\datums\votes\transfer_vote.dm"
#include "code\datums\weather\weather_controller.dm"
#include "code\datums\weather\weather_types\acid_rain.dm"
#include "code\datums\weather\weather_types\ash_storm.dm"
@@ -977,7 +982,7 @@
#include "code\game\MapData\shuttles\misc.dm"
#include "code\game\MapData\shuttles\nanotrasen_mimir.dm"
#include "code\game\MapData\shuttles\nanotrasen_ranger.dm"
-#include "code\game\MapData\shuttles\srm_glaive.dm"
+#include "code\game\MapData\shuttles\srm_elder.dm"
#include "code\game\mecha\mech_bay.dm"
#include "code\game\mecha\mech_fabricator.dm"
#include "code\game\mecha\mecha.dm"
@@ -1926,6 +1931,7 @@
#include "code\modules\clothing\towels.dm"
#include "code\modules\clothing\ears\_ears.dm"
#include "code\modules\clothing\factions\gezena.dm"
+#include "code\modules\clothing\factions\suns.dm"
#include "code\modules\clothing\glasses\_glasses.dm"
#include "code\modules\clothing\glasses\engine_goggles.dm"
#include "code\modules\clothing\glasses\hud.dm"
@@ -3450,7 +3456,6 @@
#include "code\modules\vending\games.dm"
#include "code\modules\vending\liberation.dm"
#include "code\modules\vending\liberation_toy.dm"
-#include "code\modules\vending\magivend.dm"
#include "code\modules\vending\medical.dm"
#include "code\modules\vending\medical_wall.dm"
#include "code\modules\vending\megaseed.dm"
diff --git a/sound/weapons/gun/pistol/m1911.ogg b/sound/weapons/gun/pistol/candor.ogg
similarity index 100%
rename from sound/weapons/gun/pistol/m1911.ogg
rename to sound/weapons/gun/pistol/candor.ogg
diff --git a/sound/weapons/gun/pistol/m1911_cocked.ogg b/sound/weapons/gun/pistol/candor_cocked.ogg
similarity index 100%
rename from sound/weapons/gun/pistol/m1911_cocked.ogg
rename to sound/weapons/gun/pistol/candor_cocked.ogg
diff --git a/sound/weapons/gun/pistol/m1911_reload.ogg b/sound/weapons/gun/pistol/candor_reload.ogg
similarity index 100%
rename from sound/weapons/gun/pistol/m1911_reload.ogg
rename to sound/weapons/gun/pistol/candor_reload.ogg
diff --git a/sound/weapons/gun/pistol/m1911_unload.ogg b/sound/weapons/gun/pistol/candor_unload.ogg
similarity index 100%
rename from sound/weapons/gun/pistol/m1911_unload.ogg
rename to sound/weapons/gun/pistol/candor_unload.ogg
diff --git a/sound/weapons/gun/rifle/flamingarrow.ogg b/sound/weapons/gun/rifle/flamingarrow.ogg
new file mode 100644
index 000000000000..0362cf72013f
Binary files /dev/null and b/sound/weapons/gun/rifle/flamingarrow.ogg differ
diff --git a/sound/weapons/gun/rifle/m16.ogg b/sound/weapons/gun/rifle/m16.ogg
index d7f5b22067bb..b81834891201 100644
Binary files a/sound/weapons/gun/rifle/m16.ogg and b/sound/weapons/gun/rifle/m16.ogg differ
diff --git a/sound/weapons/gun/rifle/scout.ogg b/sound/weapons/gun/rifle/scout.ogg
new file mode 100644
index 000000000000..8c4227a44871
Binary files /dev/null and b/sound/weapons/gun/rifle/scout.ogg differ
diff --git a/sound/weapons/gun/rifle/scout_bolt_in.ogg b/sound/weapons/gun/rifle/scout_bolt_in.ogg
new file mode 100644
index 000000000000..13a854b3b1d4
Binary files /dev/null and b/sound/weapons/gun/rifle/scout_bolt_in.ogg differ
diff --git a/sound/weapons/gun/rifle/scout_bolt_out.ogg b/sound/weapons/gun/rifle/scout_bolt_out.ogg
new file mode 100644
index 000000000000..4e1107079a13
Binary files /dev/null and b/sound/weapons/gun/rifle/scout_bolt_out.ogg differ
diff --git a/sound/weapons/gun/rifle/vickland.ogg b/sound/weapons/gun/rifle/vickland.ogg
new file mode 100644
index 000000000000..d6f46cbc610b
Binary files /dev/null and b/sound/weapons/gun/rifle/vickland.ogg differ
diff --git a/sound/weapons/gun/rifle/vickland_unload.ogg b/sound/weapons/gun/rifle/vickland_unload.ogg
new file mode 100644
index 000000000000..b251d7b70095
Binary files /dev/null and b/sound/weapons/gun/rifle/vickland_unload.ogg differ
diff --git a/sound/weapons/gun/rifle/winchester_cocked.ogg b/sound/weapons/gun/rifle/winchester_cocked.ogg
deleted file mode 100644
index 5f2d32e31eaf..000000000000
Binary files a/sound/weapons/gun/rifle/winchester_cocked.ogg and /dev/null differ
diff --git a/sound/weapons/gun/shotgun/brimstone.ogg b/sound/weapons/gun/shotgun/brimstone.ogg
new file mode 100644
index 000000000000..432a690f9ec3
Binary files /dev/null and b/sound/weapons/gun/shotgun/brimstone.ogg differ
diff --git a/sound/weapons/gun/shotgun/bulldog.ogg b/sound/weapons/gun/shotgun/bulldog.ogg
new file mode 100644
index 000000000000..090e5a81a88e
Binary files /dev/null and b/sound/weapons/gun/shotgun/bulldog.ogg differ
diff --git a/sound/weapons/gun/shotgun/dbshotgun_break.ogg b/sound/weapons/gun/shotgun/dbshotgun_break.ogg
new file mode 100644
index 000000000000..33196c3ac386
Binary files /dev/null and b/sound/weapons/gun/shotgun/dbshotgun_break.ogg differ
diff --git a/sound/weapons/gun/shotgun/dbshotgun_close.ogg b/sound/weapons/gun/shotgun/dbshotgun_close.ogg
new file mode 100644
index 000000000000..c6f4a26bc56b
Binary files /dev/null and b/sound/weapons/gun/shotgun/dbshotgun_close.ogg differ
diff --git a/sound/weapons/gun/smg/firestorm.ogg b/sound/weapons/gun/smg/firestorm.ogg
new file mode 100644
index 000000000000..2ff8319777de
Binary files /dev/null and b/sound/weapons/gun/smg/firestorm.ogg differ
diff --git a/tgui/packages/tgui/interfaces/NtosRoboControl.js b/tgui/packages/tgui/interfaces/NtosRoboControl.js
index f6bdb42bd86c..b206018c4e2e 100644
--- a/tgui/packages/tgui/interfaces/NtosRoboControl.js
+++ b/tgui/packages/tgui/interfaces/NtosRoboControl.js
@@ -83,7 +83,7 @@ const RobotInfo = (props, context) => {
act('home', {
robot: mule.mule_ref,
diff --git a/tgui/packages/tgui/interfaces/Orbit.js b/tgui/packages/tgui/interfaces/Orbit.js
index 7a10011672c9..91bf9d1f7929 100644
--- a/tgui/packages/tgui/interfaces/Orbit.js
+++ b/tgui/packages/tgui/interfaces/Orbit.js
@@ -158,7 +158,7 @@ export const Orbit = (props, context) => {
color="transparent"
tooltip={multiline`Toggle Auto-Observe. When active, you'll
see the UI / full inventory of whoever you're orbiting. Neat!`}
- tooltipPosition="bottom-left"
+ tooltipPosition="bottom-start"
selected={auto_observe}
icon={auto_observe ? 'toggle-on' : 'toggle-off'}
onClick={() => act('toggle_observe')}
@@ -167,7 +167,7 @@ export const Orbit = (props, context) => {
inline
color="transparent"
tooltip="Refresh"
- tooltipPosition="bottom-left"
+ tooltipPosition="bottom-start"
icon="sync-alt"
onClick={() => act('refresh')}
/>
diff --git a/tgui/packages/tgui/interfaces/OutfitEditor.js b/tgui/packages/tgui/interfaces/OutfitEditor.js
index f722449be347..d4c2a9b44597 100644
--- a/tgui/packages/tgui/interfaces/OutfitEditor.js
+++ b/tgui/packages/tgui/interfaces/OutfitEditor.js
@@ -46,12 +46,12 @@ export const OutfitEditor = (props, context) => {
color="transparent"
icon="info"
tooltip="Ctrl-click a button to select *any* item instead of what will probably fit in that slot."
- tooltipPosition="bottom-left"
+ tooltipPosition="bottom-start"
/>
act('vv')}
/>
{
? 'Save this outfit to the custom outfit list'
: 'Remove this outfit from the custom outfit list'
}
- tooltipPosition="bottom-left"
+ tooltipPosition="bottom-start"
onClick={() => act(saveable ? 'save' : 'delete')}
/>
diff --git a/tgui/packages/tgui/interfaces/VotePanel.tsx b/tgui/packages/tgui/interfaces/VotePanel.tsx
new file mode 100644
index 000000000000..eda355382768
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/VotePanel.tsx
@@ -0,0 +1,291 @@
+import { BooleanLike } from 'common/react';
+import {
+ Box,
+ Icon,
+ Stack,
+ Button,
+ Section,
+ NoticeBox,
+ LabeledList,
+ Collapsible,
+} from '../components';
+import { Window } from '../layouts';
+import { useBackend } from '../backend';
+
+enum VoteConfig {
+ None = -1,
+ Disabled = 0,
+ Enabled = 1,
+}
+
+type Vote = {
+ name: string;
+ canBeInitiated: BooleanLike;
+ config: VoteConfig;
+ message: string;
+};
+
+type Option = {
+ name: string;
+ votes: number;
+};
+
+type ActiveVote = {
+ vote: Vote;
+ question: string | null;
+ timeRemaining: number;
+ choices: Option[];
+ countMethod: number;
+};
+
+type UserData = {
+ ckey: string;
+ isLowerAdmin: BooleanLike;
+ isUpperAdmin: BooleanLike;
+ singleSelection: string | null;
+ multiSelection: string[] | null;
+ countMethod: VoteSystem;
+};
+
+enum VoteSystem {
+ VOTE_SINGLE = 1,
+ VOTE_MULTI = 2,
+}
+
+type Data = {
+ currentVote: ActiveVote;
+ possibleVotes: Vote[];
+ user: UserData;
+ voting: string[];
+};
+
+export const VotePanel = (props, context) => {
+ const { data } = useBackend(context);
+ const { currentVote, user } = data;
+
+ /**
+ * Adds the voting type to title if there is an ongoing vote.
+ */
+ let windowTitle = 'Vote';
+ if (currentVote) {
+ windowTitle +=
+ ': ' +
+ (currentVote.question || currentVote.vote.name).replace(/^\w/, (c) =>
+ c.toUpperCase()
+ );
+ }
+
+ return (
+
+
+
+
+
+
+
+
+ );
+};
+
+/**
+ * The create vote options menu. Only upper admins can disable voting.
+ * @returns A section visible to everyone with vote options.
+ */
+const VoteOptions = (props, context) => {
+ const { act, data } = useBackend(context);
+ const { possibleVotes, user } = data;
+
+ return (
+
+
+
+ {possibleVotes.map((option) => (
+
+ {!!user.isLowerAdmin && option.config !== VoteConfig.None && (
+
+ act('toggleVote', {
+ voteName: option.name,
+ })
+ }
+ />
+ )}
+
+ act('callVote', {
+ voteName: option.name,
+ })
+ }
+ />
+
+ ))}
+
+
+
+ );
+};
+
+/**
+ * View Voters by ckey. Admin only.
+ * @returns A collapsible list of voters
+ */
+const VotersList = (props, context) => {
+ const { data } = useBackend(context);
+
+ return (
+
+
+
+ {data.voting.map((voter) => {
+ return {voter} ;
+ })}
+
+
+
+ );
+};
+
+/**
+ * The choices panel which displays all options in the list.
+ * @returns A section visible to all users.
+ */
+const ChoicesPanel = (props, context) => {
+ const { act, data } = useBackend(context);
+ const { currentVote, user } = data;
+
+ return (
+
+
+ {currentVote && currentVote.countMethod === VoteSystem.VOTE_SINGLE ? (
+ Select one option
+ ) : null}
+ {currentVote &&
+ currentVote.choices.length !== 0 &&
+ currentVote.countMethod === VoteSystem.VOTE_SINGLE ? (
+
+ {currentVote.choices.map((choice) => (
+
+ c.toUpperCase())}
+ textAlign="right"
+ buttons={
+ {
+ act('voteSingle', { voteOption: choice.name });
+ }}
+ >
+ Vote
+
+ }
+ >
+ {user.singleSelection &&
+ choice.name === user.singleSelection && (
+
+
+ ))}
+
+ ) : null}
+ {currentVote && currentVote.countMethod === VoteSystem.VOTE_MULTI ? (
+ Select any number of options
+ ) : null}
+ {currentVote &&
+ currentVote.choices.length !== 0 &&
+ currentVote.countMethod === VoteSystem.VOTE_MULTI ? (
+
+ {currentVote.choices.map((choice) => (
+
+ c.toUpperCase())}
+ textAlign="right"
+ buttons={
+ {
+ act('voteMulti', { voteOption: choice.name });
+ }}
+ >
+ Vote
+
+ }
+ >
+ {user.multiSelection &&
+ user.multiSelection[user.ckey.concat(choice.name)] === 1 ? (
+
+
+ ))}
+
+ ) : null}
+ {currentVote ? null : No vote active! }
+
+
+ );
+};
+
+/**
+ * Countdown timer at the bottom. Includes a cancel vote option for admins.
+ * @returns A section visible to everyone.
+ */
+const TimePanel = (props, context) => {
+ const { act, data } = useBackend(context);
+ const { currentVote, user } = data;
+
+ return (
+
+
+
+
+ Time Remaining:
+ {currentVote?.timeRemaining || 0}s
+
+ {!!user.isLowerAdmin && (
+ act('cancel')}
+ >
+ Cancel Vote
+
+ )}
+
+
+
+ );
+};