diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index 1b5b2645fad..5126ecf8d27 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -28,7 +28,7 @@ While normally provided, Heads of Staff and Maintainers are not obligated to pub
All Pull Requests are expected to be tested prior to submission. If a submitted Pull Request fails to pass CI checks, the likelihood of it being merged will be significantly lower. If you can't take the time to compile/test your Pull Request, do not expect a warm reception.
-It is expected that contributors discuss larger design changes on the forums prior to coding a Pull Request. The amount of time spent on any given Pull Request is not relevant. Maintainers are not responsible for contributors wasting their time creating features nobody asked for.
+It is expected that contributors discuss larger changes on the forums prior to coding a Pull Request. The amount of time spent on any given Pull Request is not relevant. Maintainers are not responsible for contributors wasting their time creating features nobody asked for.
Barring highly specific circumstances (such as single line changes, submissions from advanced users, or changes to repo documentation), we will not accept Pull Requests utilising the web editor.
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index 47efb667433..37caea366cd 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -384,9 +384,6 @@
/turf/simulated/floor/plating,
/area/shuttle/pod_2)
"acw" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
},
@@ -510,7 +507,6 @@
/area/security/permabrig)
"acO" = (
/obj/machinery/door/poddoor{
- icon_state = "pdoor1";
id_tag = "SecJusticeChamber";
name = "Justice Vent"
},
@@ -934,7 +930,7 @@
},
/obj/machinery/alarm{
dir = 4;
- pixel_x = -24
+ pixel_x = -23
},
/turf/simulated/floor/plating,
/area/security/permabrig)
@@ -1056,7 +1052,7 @@
},
/area/security/permabrig)
"adU" = (
-/obj/machinery/vending/coffee,
+/obj/machinery/vending/coffee/free,
/turf/simulated/floor/plasteel{
icon_state = "floorgrime"
},
@@ -1100,6 +1096,10 @@
},
/area/security/podbay)
"aea" = (
+/obj/machinery/camera{
+ c_tag = "Prisoner Education Chamber";
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 10;
icon_state = "warndark"
@@ -1239,8 +1239,8 @@
opacity = 0
},
/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "darkredfull"
+ dir = 9;
+ icon_state = "warndark"
},
/area/security/permabrig)
"aey" = (
@@ -1284,8 +1284,8 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "darkredfull"
+ dir = 9;
+ icon_state = "warndark"
},
/area/security/permabrig)
"aeA" = (
@@ -1455,13 +1455,8 @@
pixel_y = 2
},
/obj/machinery/alarm{
- desc = "This particular atmos control unit appears to have no access restrictions.";
dir = 4;
- locked = 0;
- name = "all-access air alarm";
- pixel_x = -24;
- req_access = "0";
- req_one_access = "0"
+ pixel_x = -22
},
/obj/machinery/door_control{
id = "SecJusticeChamber";
@@ -1485,12 +1480,11 @@
pixel_y = 36;
req_access_txt = "1"
},
-/obj/machinery/ignition_switch{
+/obj/machinery/flasher_button{
id = "justiceflash";
name = "Justice Flash Control";
pixel_x = -38;
- pixel_y = 36;
- req_access_txt = "1"
+ pixel_y = 36
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -1518,7 +1512,7 @@
"aeZ" = (
/obj/machinery/power/apc{
dir = 1;
- name = "north bump";
+ name = "Prisoner Education Chamber APC";
pixel_y = 24
},
/obj/structure/cable/yellow{
@@ -1577,7 +1571,6 @@
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 4
},
-/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/quartermaster/storage)
"afo" = (
@@ -1725,7 +1718,7 @@
},
/obj/machinery/alarm{
dir = 4;
- pixel_x = -24
+ pixel_x = -23
},
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
@@ -2107,10 +2100,6 @@
},
/area/security/permabrig)
"agr" = (
-/obj/structure/cable/yellow{
- d2 = 2;
- icon_state = "0-2"
- },
/obj/structure/cable/yellow{
d2 = 8;
icon_state = "0-8"
@@ -2123,6 +2112,11 @@
opacity = 0
},
/obj/effect/spawner/window/reinforced,
+/obj/structure/cable/yellow{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
+ },
/turf/simulated/floor/plating,
/area/security/hos)
"ags" = (
@@ -2207,9 +2201,13 @@
/turf/simulated/wall/r_wall,
/area/security/hos)
"agD" = (
-/obj/item/radio/intercom/department/security,
-/turf/simulated/wall/r_wall,
-/area/security/hos)
+/obj/docking_port/stationary/whiteship{
+ dir = 8;
+ id = "whiteship_cerebron";
+ name = "North of Cerebron"
+ },
+/turf/space,
+/area/space)
"agE" = (
/obj/machinery/light{
dir = 4
@@ -2228,10 +2226,6 @@
/area/security/hos)
"agF" = (
/obj/effect/spawner/window/reinforced,
-/obj/structure/cable/yellow{
- d2 = 4;
- icon_state = "0-4"
- },
/obj/structure/cable/yellow{
d2 = 2;
icon_state = "0-2"
@@ -2243,6 +2237,11 @@
name = "privacy shutters";
opacity = 0
},
+/obj/structure/cable/yellow{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
/turf/simulated/floor/plating,
/area/security/hos)
"agG" = (
@@ -2258,10 +2257,6 @@
/area/solar/auxstarboard)
"agL" = (
/obj/effect/spawner/window/reinforced,
-/obj/structure/cable/yellow{
- d2 = 8;
- icon_state = "0-8"
- },
/obj/structure/cable/yellow{
d2 = 2;
icon_state = "0-2"
@@ -2273,6 +2268,11 @@
name = "privacy shutters";
opacity = 0
},
+/obj/structure/cable/yellow{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
+ },
/turf/simulated/floor/plating,
/area/security/hos)
"agM" = (
@@ -2457,7 +2457,9 @@
},
/area/security/hos)
"ahb" = (
-/obj/machinery/computer/security,
+/obj/machinery/computer/security{
+ network = list("SS13","Research Outpost","Mining Outpost")
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -2516,7 +2518,7 @@
/area/security/armoury)
"ahf" = (
/obj/machinery/alarm{
- pixel_y = 24
+ pixel_y = 28
},
/obj/structure/rack,
/obj/item/gun/energy/ionrifle,
@@ -2861,8 +2863,10 @@
/area/security/permabrig)
"ahO" = (
/obj/machinery/power/apc{
+ cell_type = 5000;
dir = 1;
- name = "north bump";
+ name = "Prison Wing APC";
+ pixel_x = 1;
pixel_y = 24
},
/obj/structure/cable/yellow{
@@ -2972,14 +2976,15 @@
/area/security/permabrig)
"ahT" = (
/obj/effect/spawner/window/reinforced,
-/obj/structure/cable/yellow{
- d2 = 8;
- icon_state = "0-8"
- },
/obj/structure/cable/yellow{
d2 = 2;
icon_state = "0-2"
},
+/obj/structure/cable/yellow{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
+ },
/turf/simulated/floor/plating,
/area/security/permabrig)
"ahU" = (
@@ -3007,7 +3012,7 @@
},
/obj/machinery/alarm{
dir = 4;
- pixel_x = -24
+ pixel_x = -22
},
/obj/item/radio/intercom{
name = "Station Intercom (General)";
@@ -3035,6 +3040,9 @@
/area/security/hos)
"ahZ" = (
/obj/structure/chair/comfy/black,
+/obj/effect/landmark/start{
+ name = "Head of Security"
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -3189,6 +3197,7 @@
/obj/item/grenade/barrier,
/obj/item/grenade/barrier,
/obj/item/grenade/barrier,
+/obj/structure/rack,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "vault"
@@ -3253,9 +3262,8 @@
/area/security/permabrig)
"aiA" = (
/obj/structure/table/wood,
-/obj/item/paper_bin{
- pixel_x = -4;
- pixel_y = 10
+/obj/item/paper_bin/nanotrasen{
+ pixel_y = 8
},
/obj/structure/cable/yellow{
d1 = 4;
@@ -3323,7 +3331,7 @@
"aiG" = (
/obj/machinery/alarm{
dir = 1;
- pixel_y = -24
+ pixel_y = -22
},
/turf/simulated/floor/plasteel{
dir = 1;
@@ -3331,17 +3339,15 @@
},
/area/security/permabrig)
"aiH" = (
-/obj/machinery/light,
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
+/obj/machinery/door_control{
+ id = "armoryshutter";
+ name = "Armory Shutter";
+ pixel_x = -7;
+ pixel_y = 8;
+ req_access_txt = "3"
},
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "redcorner"
- },
-/area/security/permabrig)
+/turf/simulated/wall/r_wall,
+/area/security/armoury)
"aiI" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
@@ -3354,6 +3360,7 @@
"aiJ" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/light,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "redcorner"
@@ -3598,7 +3605,6 @@
pixel_x = -26
},
/obj/structure/rack,
-/obj/item/storage/fancy,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "vault"
@@ -3709,7 +3715,6 @@
},
/area/security/permabrig)
"ajx" = (
-/obj/machinery/disposal,
/obj/machinery/firealarm{
dir = 8;
pixel_x = -24
@@ -3718,9 +3723,6 @@
pixel_x = -24;
pixel_y = -20
},
-/obj/structure/disposalpipe/trunk{
- dir = 4
- },
/obj/machinery/computer/security/telescreen{
desc = "Used for watching certain areas.";
dir = 1;
@@ -3728,6 +3730,10 @@
network = list("Prison","MiniSat","tcomm");
pixel_y = -30
},
+/obj/machinery/disposal,
+/obj/structure/disposalpipe/trunk{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "vault"
},
@@ -4002,9 +4008,6 @@
/obj/structure/chair{
dir = 1
},
-/obj/effect/landmark/start{
- name = "Head of Security"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
@@ -4061,7 +4064,9 @@
/area/security/permabrig)
"akg" = (
/obj/machinery/power/apc{
- name = "south bump";
+ cell_type = 5000;
+ name = "Armory APC";
+ pixel_x = 1;
pixel_y = -24
},
/obj/machinery/light,
@@ -4248,15 +4253,15 @@
},
/area/security/armoury)
"akB" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/mob/living/simple_animal/hostile/retaliate/araneus,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/carpet,
/area/security/hos)
"akC" = (
@@ -4266,9 +4271,6 @@
},
/obj/item/clothing/head/beret/sec,
/obj/item/clothing/suit/jacket/pilot,
-/obj/machinery/alarm{
- pixel_y = 24
- },
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
},
@@ -4340,7 +4342,9 @@
/turf/simulated/floor/plating,
/area/maintenance/disposal)
"akJ" = (
-/obj/machinery/computer/security,
+/obj/machinery/computer/security{
+ network = list("SS13","Research Outpost","Mining Outpost")
+ },
/obj/machinery/computer/security/telescreen{
desc = "Used for watching Prison Wing holding areas.";
name = "Prison Monitor";
@@ -4400,11 +4404,13 @@
pixel_x = -26;
pixel_y = 28
},
-/obj/structure/cable/yellow{
- d1 = 2;
- d2 = 4;
- icon_state = "2-4"
+/obj/machinery/alarm{
+ dir = 4;
+ pixel_x = -22
},
+/obj/structure/table/reinforced,
+/obj/item/radio,
+/obj/item/flashlight,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -4418,14 +4424,14 @@
/turf/simulated/floor/plasteel,
/area/engine/equipmentstorage)
"akQ" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable/yellow{
d1 = 1;
d2 = 4;
icon_state = "1-4"
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "vault"
},
@@ -4451,15 +4457,15 @@
d2 = 4;
icon_state = "2-4"
},
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
- },
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
+/obj/structure/disposalpipe/segment{
+ dir = 2;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/carpet,
/area/security/hos)
"akT" = (
@@ -4855,15 +4861,15 @@
},
/area/security/main)
"alE" = (
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+ dir = 8
+ },
/obj/machinery/light_switch{
name = "light switch ";
pixel_y = -22
},
/obj/structure/table/reinforced,
/obj/item/book/manual/security_space_law,
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
- dir = 8
- },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -4884,24 +4890,41 @@
},
/area/security/main)
"alH" = (
-/obj/machinery/vending/secdrobe,
+/obj/structure/closet/wardrobe/red,
/turf/simulated/floor/plasteel{
icon_state = "showroomfloor"
},
/area/security/main)
"alI" = (
-/obj/effect/spawner/window/reinforced,
+/obj/machinery/door/airlock/security/glass{
+ name = "Security Pods";
+ req_access_txt = "71"
+ },
+/obj/machinery/door/firedoor,
/obj/structure/cable/yellow{
- d2 = 2;
- icon_state = "0-2"
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
},
/turf/simulated/floor/plating,
/area/security/podbay)
"alK" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -4962,7 +4985,6 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/structure/disposalpipe/segment,
/obj/machinery/door/airlock/command{
name = "Head of Security's Office";
req_access = null;
@@ -4978,6 +5000,7 @@
d2 = 8;
icon_state = "2-8"
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/carpet,
/area/security/hos)
"alS" = (
@@ -5136,14 +5159,6 @@
},
/turf/simulated/floor/plating,
/area/maintenance/disposal)
-"amo" = (
-/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance{
- lootcount = 2;
- name = "2maintenance loot spawner"
- },
-/turf/simulated/floor/plating,
-/area/maintenance/fore)
"amq" = (
/obj/structure/table,
/obj/item/restraints/handcuffs,
@@ -5284,13 +5299,10 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "red"
@@ -5306,9 +5318,6 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
@@ -5342,17 +5351,13 @@
dir = 1
},
/obj/machinery/alarm{
- pixel_y = 24
+ pixel_y = 28
},
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
@@ -5365,47 +5370,32 @@
},
/area/security/main)
"amI" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/security/glass{
- name = "Security Pods";
- req_access_txt = "71"
- },
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 8;
- icon_state = "1-8"
- },
+/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
+/obj/machinery/light/small{
+ dir = 1
},
-/area/security/podbay)
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/fore)
"amJ" = (
/obj/structure/cable/yellow{
d1 = 1;
d2 = 8;
icon_state = "1-8"
},
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
+ dir = 9
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
+ dir = 9
},
/turf/simulated/floor/plasteel{
dir = 5;
@@ -5421,21 +5411,18 @@
/turf/simulated/floor/plating,
/area/security/warden)
"amL" = (
+/obj/effect/spawner/window/reinforced,
/obj/structure/cable/yellow{
- d1 = 1;
+ d2 = 4;
+ icon_state = "0-4"
+ },
+/obj/structure/cable/yellow{
+ d1 = 4;
d2 = 8;
- icon_state = "1-8"
+ icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/security/podbay)
+/turf/simulated/floor/plating,
+/area/security/brig)
"amM" = (
/obj/machinery/computer/secure_data,
/obj/structure/cable/yellow{
@@ -5458,9 +5445,9 @@
d2 = 8;
icon_state = "1-8"
},
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/crew_quarters/fitness{
name = "\improper Recreation Area"
@@ -5496,14 +5483,20 @@
},
/area/security/main)
"amV" = (
-/obj/structure/table/reinforced,
-/obj/item/spacepod_key{
- id = 100000
+/obj/effect/spawner/window/reinforced,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable/yellow{
+ d2 = 8;
+ icon_state = "0-8"
},
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
},
-/area/security/podbay)
+/turf/simulated/floor/plating,
+/area/security/brig)
"amW" = (
/obj/machinery/light{
dir = 1
@@ -5525,16 +5518,17 @@
name = "\improper Recreation Area"
})
"amX" = (
-/obj/structure/table/reinforced,
-/obj/item/paper_bin{
- pixel_x = -4;
- pixel_y = 10
+/obj/structure/rack,
+/obj/effect/spawner/lootdrop/maintenance{
+ lootcount = 3;
+ name = "3maintenance loot spawner"
},
-/obj/item/pen,
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
+/obj/effect/spawner/lootdrop/maintenance{
+ lootcount = 2;
+ name = "2maintenance loot spawner"
},
-/area/security/podbay)
+/turf/simulated/floor/plating,
+/area/maintenance/fore)
"amZ" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
@@ -5777,6 +5771,10 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 6
},
+/obj/structure/disposalpipe/segment{
+ dir = 4;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plating,
/area/maintenance/fore)
"anI" = (
@@ -5878,7 +5876,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
},
-/obj/structure/closet/secure_closet/security,
/turf/simulated/floor/plasteel{
icon_state = "showroomfloor"
},
@@ -5950,7 +5947,6 @@
},
/area/security/main)
"anW" = (
-/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "red"
@@ -5995,6 +5991,16 @@
d2 = 2;
icon_state = "1-2"
},
+/obj/structure/cable/yellow{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
+/obj/structure/cable/yellow{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
+ },
/turf/simulated/floor/plasteel{
icon_state = "showroomfloor"
},
@@ -6024,6 +6030,10 @@
/area/security/main)
"aof" = (
/obj/effect/spawner/window/reinforced,
+/obj/structure/cable/yellow{
+ d2 = 4;
+ icon_state = "0-4"
+ },
/turf/simulated/floor/plating,
/area/security/main)
"aog" = (
@@ -6055,7 +6065,6 @@
pixel_y = 10
},
/obj/item/pen,
-/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/security/main)
"aoj" = (
@@ -6101,15 +6110,14 @@
},
/area/security/armoury)
"aoo" = (
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
- },
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/security/brig)
"aop" = (
@@ -6133,9 +6141,6 @@
c_tag = "Brig - Infirmary";
dir = 1
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
@@ -6151,6 +6156,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 6;
icon_state = "whitered"
@@ -6248,6 +6256,7 @@
/area/maintenance/starboard)
"aoH" = (
/obj/machinery/hologram/holopad,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "redfull"
},
@@ -6284,7 +6293,6 @@
pixel_y = 5
},
/obj/item/stack/packageWrap,
-/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/security/main)
"aoM" = (
@@ -6310,9 +6318,6 @@
/turf/simulated/floor/plating,
/area/maintenance/disposal)
"aoT" = (
-/obj/machinery/disposal/deliveryChute{
- dir = 4
- },
/obj/structure/window/reinforced,
/obj/structure/window/reinforced{
dir = 8
@@ -6326,6 +6331,9 @@
layer = 3
},
/obj/effect/decal/warning_stripes/east,
+/obj/machinery/disposal/deliveryChute{
+ dir = 4
+ },
/obj/structure/disposalpipe/trunk,
/turf/simulated/floor/plating,
/area/maintenance/disposal)
@@ -6471,6 +6479,7 @@
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "redcorner"
@@ -6548,7 +6557,6 @@
},
/area/security/brig)
"apr" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
@@ -6618,7 +6626,6 @@
pixel_y = 5
},
/obj/item/storage/box/donkpockets,
-/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/security/main)
"apA" = (
@@ -6636,6 +6643,7 @@
},
/area/security/main)
"apB" = (
+/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "red"
@@ -6656,6 +6664,7 @@
/obj/effect/landmark/start{
name = "Head of Security"
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/security/main)
"apF" = (
@@ -6885,9 +6894,6 @@
},
/area/engine/gravitygenerator)
"aqj" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
@@ -6899,6 +6905,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "red"
},
@@ -6958,10 +6967,6 @@
/turf/simulated/floor/plating,
/area/maintenance/starboard)
"aqu" = (
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
- },
/obj/structure/cable/yellow{
d1 = 2;
d2 = 4;
@@ -6978,6 +6983,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plating,
/area/maintenance/fore)
"aqw" = (
@@ -6996,6 +7004,8 @@
/obj/machinery/light/small{
dir = 8
},
+/obj/item/storage/box/evidence,
+/obj/item/hand_labeler,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "vault"
@@ -7100,7 +7110,6 @@
/area/security/brig)
"aqM" = (
/obj/machinery/hologram/holopad,
-/obj/structure/disposalpipe/segment,
/obj/structure/cable/yellow{
d1 = 2;
d2 = 4;
@@ -7155,6 +7164,7 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 8
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "redcorner"
@@ -7253,7 +7263,10 @@
/obj/effect/landmark/start{
name = "Security Officer"
},
-/obj/structure/disposalpipe/segment,
+/obj/structure/disposalpipe/segment{
+ dir = 2;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel{
icon_state = "red"
},
@@ -7285,6 +7298,7 @@
"arb" = (
/obj/structure/table/reinforced,
/obj/item/paper,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/security/main)
"arc" = (
@@ -7430,13 +7444,13 @@
/turf/simulated/floor/plating,
/area/maintenance/starboard)
"ars" = (
+/obj/machinery/conveyor/east{
+ id = "garbage"
+ },
/obj/structure/disposalpipe/segment{
dir = 2;
icon_state = "pipe-c"
},
-/obj/machinery/conveyor/east{
- id = "garbage"
- },
/turf/simulated/floor/plating,
/area/maintenance/disposal)
"arw" = (
@@ -7462,13 +7476,13 @@
/turf/simulated/floor/plating,
/area/maintenance/auxsolarstarboard)
"arD" = (
+/obj/effect/decal/warning_stripes/east,
/obj/structure/disposalpipe/trunk{
dir = 4
},
/obj/structure/disposaloutlet{
dir = 4
},
-/obj/effect/decal/warning_stripes/east,
/turf/simulated/floor/plating,
/area/maintenance/disposal)
"arE" = (
@@ -7496,9 +7510,6 @@
/turf/simulated/floor/plating,
/area/maintenance/disposal)
"arH" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
@@ -7511,6 +7522,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plating,
/area/maintenance/fore)
"arI" = (
@@ -7560,9 +7574,6 @@
/turf/simulated/floor/plating,
/area/maintenance/disposal)
"arP" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
@@ -7579,21 +7590,19 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plating,
/area/maintenance/fore)
"arQ" = (
-/obj/structure/table,
-/obj/item/storage/box/evidence,
-/obj/item/hand_labeler,
+/obj/machinery/photocopier,
/turf/simulated/floor/plasteel{
dir = 6;
icon_state = "vault"
},
/area/security/warden)
"arR" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/effect/decal/warning_stripes/west,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -7601,6 +7610,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plating,
/area/maintenance/fore)
"arS" = (
@@ -7640,10 +7652,6 @@
},
/area/security/warden)
"arW" = (
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
- },
/obj/structure/cable/yellow{
d1 = 1;
d2 = 8;
@@ -7663,7 +7671,6 @@
},
/area/security/brig)
"arY" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
@@ -7740,9 +7747,6 @@
/turf/simulated/floor/plating,
/area/engine/gravitygenerator)
"ash" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable/yellow{
d1 = 1;
d2 = 4;
@@ -7751,6 +7755,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "red"
},
@@ -7784,9 +7791,6 @@
},
/area/security/main)
"asm" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/firealarm{
dir = 1;
pixel_y = -24
@@ -7799,14 +7803,14 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "red"
},
/area/security/main)
"asn" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
@@ -7815,6 +7819,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "red"
},
@@ -7826,9 +7833,6 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable/yellow{
d1 = 2;
d2 = 8;
@@ -7837,6 +7841,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "red"
},
@@ -7867,9 +7874,6 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
@@ -7888,12 +7892,12 @@
d2 = 8;
icon_state = "2-8"
},
-/obj/structure/disposalpipe/sortjunction{
- dir = 4;
- sortType = 21
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
+/obj/structure/disposalpipe/segment{
+ dir = 2;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel{
icon_state = "red"
},
@@ -7909,10 +7913,6 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 9
},
@@ -7930,6 +7930,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plating,
/area/crew_quarters/fitness{
name = "\improper Recreation Area"
@@ -7945,14 +7948,10 @@
d2 = 8;
icon_state = "2-8"
},
-/obj/structure/disposalpipe/sortjunction{
- dir = 4;
- icon_state = "pipe-j2s";
- sortType = 8
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "red"
},
@@ -8004,10 +8003,6 @@
name = "\improper Recreation Area"
})
"asA" = (
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
- },
/obj/effect/decal/warning_stripes/east,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -8015,6 +8010,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plating,
/area/maintenance/fore)
"asB" = (
@@ -8027,6 +8025,9 @@
dir = 4
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/crew_quarters/fitness{
name = "\improper Recreation Area"
@@ -8043,6 +8044,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralcorner"
@@ -8196,10 +8200,10 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/machinery/photocopier,
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 8
},
+/obj/machinery/vending/security,
/turf/simulated/floor/plasteel{
icon_state = "showroomfloor"
},
@@ -8311,10 +8315,6 @@
name = "Port Maintenance"
})
"atl" = (
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
- },
/obj/structure/cable/yellow{
d1 = 2;
d2 = 4;
@@ -8322,13 +8322,10 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/maintenance/fore)
"atm" = (
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
- },
/obj/structure/cable/yellow{
d1 = 1;
d2 = 8;
@@ -8340,6 +8337,10 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 9
},
+/obj/structure/disposalpipe/segment{
+ dir = 8;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plating,
/area/maintenance/fore)
"ato" = (
@@ -8369,17 +8370,6 @@
icon_state = "showroomfloor"
},
/area/security/brig)
-"atq" = (
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/plasteel,
-/area/security/brig)
"atr" = (
/turf/simulated/floor/plasteel{
dir = 4;
@@ -8404,7 +8394,6 @@
},
/area/security/brig)
"atv" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
@@ -8414,6 +8403,7 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/security/brig)
"atw" = (
@@ -8426,6 +8416,7 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "redcorner"
@@ -8447,7 +8438,6 @@
/area/security/main)
"atz" = (
/obj/machinery/door/firedoor,
-/obj/structure/disposalpipe/segment,
/obj/machinery/door/airlock/security/glass{
name = "Security Office";
req_one_access_txt = "1;4"
@@ -8459,29 +8449,24 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/security/main)
-"atA" = (
-/obj/structure/disposalpipe/segment,
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
+"atB" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/plating,
-/area/maintenance/starboard)
-"atB" = (
-/obj/effect/spawner/window/reinforced,
-/obj/structure/cable/yellow,
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/plating,
-/area/security/main)
+/obj/structure/disposalpipe/segment{
+ dir = 2;
+ icon_state = "pipe-c"
+ },
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "redcorner"
+ },
+/area/security/brig)
"atC" = (
/obj/structure/table,
-/obj/item/folder/red,
-/obj/item/storage/fancy/cigarettes,
+/obj/item/storage/fancy/donut_box,
/turf/simulated/floor/plasteel,
/area/security/main)
"atD" = (
@@ -8497,7 +8482,16 @@
/turf/simulated/floor/plasteel,
/area/security/main)
"atF" = (
-/turf/simulated/wall/r_wall,
+/obj/structure/rack,
+/obj/effect/spawner/lootdrop/maintenance{
+ lootcount = 2;
+ name = "2maintenance loot spawner"
+ },
+/obj/effect/spawner/lootdrop/maintenance{
+ lootcount = 2;
+ name = "2maintenance loot spawner"
+ },
+/turf/simulated/floor/plating,
/area/maintenance/fore)
"atG" = (
/obj/structure/table,
@@ -8605,9 +8599,9 @@
name = "\improper Recreation Area"
})
"atR" = (
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/junction{
+ dir = 2;
+ icon_state = "pipe-j2"
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -8789,9 +8783,6 @@
name = "Brig Emergency Storage";
req_access_txt = "63"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
@@ -8803,6 +8794,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plating,
/area/security/brig)
"aup" = (
@@ -8856,11 +8850,11 @@
/turf/space,
/area/maintenance/auxsolarstarboard)
"auw" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/light/small{
dir = 8
},
/obj/effect/decal/warning_stripes/north,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/maintenance/fpmaint2{
name = "Port Maintenance"
@@ -9014,17 +9008,17 @@
},
/area/security/warden)
"auP" = (
-/obj/machinery/disposal,
/obj/machinery/light_switch{
pixel_y = -26
},
-/obj/structure/disposalpipe/trunk{
- dir = 8
- },
/obj/machinery/camera{
c_tag = "Fitness Room - Aft";
dir = 1
},
+/obj/machinery/disposal,
+/obj/structure/disposalpipe/trunk{
+ dir = 8
+ },
/turf/simulated/floor/plasteel{
icon_state = "vault"
},
@@ -9084,10 +9078,6 @@
},
/area/security/brig)
"auV" = (
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
- },
/obj/structure/cable/yellow{
d1 = 1;
d2 = 4;
@@ -9132,10 +9122,6 @@
/turf/simulated/floor/plasteel,
/area/security/brig)
"auZ" = (
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
- },
/obj/structure/cable/yellow{
d1 = 2;
d2 = 8;
@@ -9143,6 +9129,7 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "redcorner"
@@ -9173,7 +9160,9 @@
},
/area/security/brig)
"avd" = (
-/obj/machinery/computer/security,
+/obj/machinery/computer/security{
+ network = list("SS13","Research Outpost","Mining Outpost")
+ },
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
@@ -9212,9 +9201,6 @@
name = "Security Delivery";
req_access_txt = "1"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/effect/decal/warning_stripes/yellow,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -9222,6 +9208,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/security/processing)
"avh" = (
@@ -9289,10 +9278,6 @@
},
/area/security/main)
"avo" = (
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
- },
/obj/structure/cable/yellow{
d1 = 2;
d2 = 4;
@@ -9305,6 +9290,10 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 6
},
+/obj/structure/disposalpipe/segment{
+ dir = 4;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plating,
/area/maintenance/fore)
"avr" = (
@@ -9321,13 +9310,16 @@
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 8
},
+/obj/structure/disposalpipe/segment{
+ dir = 2;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "red"
},
/area/security/processing)
"avu" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
@@ -9337,6 +9329,10 @@
dir = 8
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/disposalpipe/segment{
+ dir = 1;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "red"
@@ -9347,7 +9343,6 @@
/area/crew_quarters/sleep)
"avw" = (
/obj/item/storage/box/evidence,
-/obj/structure/disposalpipe/segment,
/obj/structure/table,
/turf/simulated/floor/plasteel{
dir = 1;
@@ -9597,6 +9592,9 @@
})
"avY" = (
/mob/living/simple_animal/mouse,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plating,
/area/maintenance/fpmaint2{
name = "Port Maintenance"
@@ -9605,6 +9603,7 @@
/obj/structure/chair{
dir = 4
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "red"
@@ -9662,7 +9661,6 @@
name = "Brig Maintenance";
req_one_access_txt = "63;12"
},
-/obj/structure/disposalpipe/segment,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
@@ -9670,6 +9668,7 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/maintenance/fore)
"awi" = (
@@ -9699,19 +9698,6 @@
icon_state = "dark"
},
/area/security/brig)
-"awl" = (
-/obj/structure/table,
-/obj/machinery/light/small{
- dir = 8
- },
-/obj/effect/spawner/lootdrop/maintenance,
-/turf/simulated/floor/plating,
-/area/maintenance/fore)
-"awm" = (
-/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
-/turf/simulated/floor/plating,
-/area/maintenance/fore)
"awn" = (
/obj/structure/cable{
d1 = 1;
@@ -9734,8 +9720,7 @@
/turf/simulated/floor/wood,
/area/crew_quarters/mrchangs)
"awp" = (
-/obj/effect/spawner/lootdrop/maintenance,
-/turf/simulated/floor/plating,
+/turf/simulated/wall/r_wall,
/area/maintenance/fore)
"awq" = (
/obj/structure/cable/yellow{
@@ -9756,9 +9741,6 @@
name = "\improper Recreation Area"
})
"awr" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
@@ -9771,14 +9753,14 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "whitered"
},
/area/security/brig)
"aws" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
@@ -9795,16 +9777,15 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "redcorner"
},
/area/security/brig)
"awt" = (
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
- },
/obj/structure/cable/yellow{
d1 = 2;
d2 = 8;
@@ -9816,6 +9797,10 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 2;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel,
/area/security/brig)
"awu" = (
@@ -9831,6 +9816,10 @@
d2 = 2;
icon_state = "1-2"
},
+/obj/machinery/alarm{
+ dir = 4;
+ pixel_x = -22
+ },
/turf/simulated/floor/plasteel{
icon_state = "showroomfloor"
},
@@ -9960,9 +9949,6 @@
/obj/structure/plasticflaps{
opacity = 1
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/effect/decal/warning_stripes/yellow/hollow,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -9970,11 +9956,14 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/security/processing)
"awK" = (
-/obj/structure/disposalpipe/segment,
/obj/effect/decal/warning_stripes/west,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/maintenance/fpmaint2{
name = "Port Maintenance"
@@ -10086,9 +10075,6 @@
name = "Port Maintenance"
})
"awX" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
@@ -10101,6 +10087,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plating,
/area/maintenance/fore)
"awZ" = (
@@ -10109,9 +10098,6 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/effect/decal/warning_stripes/north,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -10119,6 +10105,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plating,
/area/maintenance/fore)
"axb" = (
@@ -10178,6 +10167,16 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 1;
+ icon_state = "pipe-c"
+ },
+/obj/structure/disposalpipe/sortjunction{
+ dir = 4;
+ icon_state = "pipe-j2s";
+ name = "Security Junction";
+ sortType = 8
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "red"
@@ -10219,7 +10218,6 @@
},
/area/security/warden)
"axj" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
@@ -10231,6 +10229,10 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 8
},
+/obj/structure/disposalpipe/segment{
+ dir = 4;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel{
dir = 9;
icon_state = "red"
@@ -10299,9 +10301,6 @@
/turf/simulated/floor/plating,
/area/maintenance/fore)
"axt" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable/yellow{
d1 = 2;
d2 = 4;
@@ -10318,6 +10317,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 6
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plating,
/area/maintenance/fore)
"axu" = (
@@ -10326,10 +10328,6 @@
d2 = 8;
icon_state = "1-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
- },
/obj/effect/decal/warning_stripes/north,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 9
@@ -10337,6 +10335,10 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 9
},
+/obj/structure/disposalpipe/segment{
+ dir = 8;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plating,
/area/maintenance/fore)
"axv" = (
@@ -10345,9 +10347,6 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/door/airlock/maintenance{
req_one_access_txt = "12;63"
},
@@ -10357,6 +10356,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plating,
/area/maintenance/fore)
"axw" = (
@@ -10380,15 +10382,15 @@
d2 = 8;
icon_state = "2-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plating,
/area/maintenance/fore)
"axy" = (
@@ -10397,15 +10399,15 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plating,
/area/maintenance/fore)
"axz" = (
@@ -10414,9 +10416,6 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/effect/spawner/lootdrop{
loot = list(/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes);
name = "maint grille or trash spawner"
@@ -10427,6 +10426,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plating,
/area/maintenance/fore)
"axA" = (
@@ -10454,15 +10456,15 @@
d2 = 4;
icon_state = "2-4"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plating,
/area/maintenance/fore)
"axC" = (
@@ -10487,10 +10489,6 @@
},
/area/security/brig)
"axH" = (
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
- },
/obj/structure/chair/stool,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -10498,6 +10496,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "red"
@@ -10524,15 +10525,15 @@
/turf/simulated/floor/plasteel,
/area/engine/gravitygenerator)
"axN" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "red"
@@ -10593,6 +10594,9 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 1
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/crew_quarters/fitness{
name = "\improper Recreation Area"
@@ -10623,6 +10627,9 @@
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/crew_quarters/fitness{
name = "\improper Recreation Area"
@@ -10642,7 +10649,6 @@
pixel_x = 6
},
/obj/effect/decal/warning_stripes/west,
-/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/quartermaster/storage)
"axY" = (
@@ -10659,9 +10665,6 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/effect/decal/warning_stripes/west,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -10669,6 +10672,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plating,
/area/maintenance/fore)
"aya" = (
@@ -10685,13 +10691,13 @@
/turf/simulated/floor/wood,
/area/crew_quarters/mrchangs)
"ayc" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "neutralcorner"
@@ -10797,10 +10803,6 @@
/turf/simulated/floor/plasteel,
/area/security/warden)
"ayr" = (
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
- },
/obj/structure/cable/yellow{
d1 = 2;
d2 = 4;
@@ -10813,6 +10815,10 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 6
},
+/obj/structure/disposalpipe/segment{
+ dir = 4;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plating,
/area/maintenance/starboard)
"ays" = (
@@ -10865,13 +10871,23 @@
name = "Gear Room";
req_one_access_txt = "1;4"
},
-/obj/structure/disposalpipe/segment,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/effect/decal/warning_stripes/yellow,
+/obj/structure/cable/yellow{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
+ },
+/obj/structure/cable/yellow{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/security/brig)
"ayx" = (
@@ -10942,8 +10958,10 @@
/area/maintenance/fore)
"ayG" = (
/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/plating,
-/area/maintenance/fore)
+/turf/simulated/floor/plasteel{
+ icon_state = "redfull"
+ },
+/area/security/main)
"ayH" = (
/obj/structure/cable/yellow{
d1 = 1;
@@ -10954,9 +10972,6 @@
/turf/simulated/floor/plating,
/area/maintenance/fore)
"ayI" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
@@ -10970,6 +10985,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/engine/gravitygenerator)
"ayK" = (
@@ -10991,10 +11009,14 @@
/turf/simulated/floor/plasteel,
/area/engine/gravitygenerator)
"ayP" = (
-/obj/structure/disposalpipe/segment,
-/obj/effect/spawner/window/reinforced,
-/turf/simulated/floor/plating,
-/area/storage/primary)
+/obj/structure/disposalpipe/segment{
+ dir = 1;
+ icon_state = "pipe-c"
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "redfull"
+ },
+/area/security/main)
"ayQ" = (
/obj/machinery/camera{
c_tag = "Gravity Generator Foyer"
@@ -11020,9 +11042,9 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/structure/disposalpipe/junction,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/security/brig)
"ayT" = (
@@ -11069,10 +11091,6 @@
/obj/machinery/camera{
c_tag = "Warden's Office"
},
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
- },
/obj/structure/table,
/obj/item/paper_bin{
pixel_x = -4;
@@ -11086,7 +11104,12 @@
id = "armoryshutter";
name = "Armory Shutter";
pixel_x = 5;
- pixel_y = -3
+ pixel_y = -3;
+ req_access_txt = "3"
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 2;
+ icon_state = "pipe-c"
},
/turf/simulated/floor/plasteel{
icon_state = "showroomfloor"
@@ -11105,7 +11128,6 @@
},
/area/security/processing)
"aza" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
@@ -11113,15 +11135,13 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "red"
},
/area/security/processing)
"azc" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
@@ -11133,6 +11153,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 10;
icon_state = "whitered"
@@ -11210,10 +11233,6 @@
/turf/simulated/floor/plating,
/area/maintenance/starboard)
"azq" = (
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
- },
/obj/structure/cable/yellow{
d1 = 1;
d2 = 4;
@@ -11231,6 +11250,10 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 2;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel,
/area/engine/gravitygenerator)
"azr" = (
@@ -11240,9 +11263,6 @@
/turf/simulated/floor/plating,
/area/maintenance/starboard)
"azs" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
@@ -11257,6 +11277,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plating,
/area/maintenance/starboard)
"azt" = (
@@ -11303,10 +11326,6 @@
/turf/simulated/floor/plating,
/area/maintenance/starboard)
"azA" = (
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
- },
/obj/structure/sign/securearea{
desc = "A warning sign which reads 'EXTERNAL AIRLOCK'";
icon_state = "space";
@@ -11328,6 +11347,10 @@
/obj/effect/landmark{
name = "blobstart"
},
+/obj/structure/disposalpipe/segment{
+ dir = 1;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plating,
/area/maintenance/fpmaint2{
name = "Port Maintenance"
@@ -11434,32 +11457,27 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable/yellow{
d1 = 1;
d2 = 8;
icon_state = "1-8"
},
/obj/effect/decal/warning_stripes/east,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5
},
+/obj/structure/disposalpipe/segment{
+ dir = 4;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plating,
/area/maintenance/fpmaint2{
name = "Port Maintenance"
})
"azL" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -11467,18 +11485,18 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plating,
/area/maintenance/fore)
"azN" = (
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
- },
/obj/structure/cable/yellow{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/maintenance/fpmaint2{
name = "Port Maintenance"
@@ -11490,15 +11508,15 @@
icon_state = "2-4"
},
/obj/effect/decal/warning_stripes/south,
-/obj/structure/disposalpipe/segment,
+/obj/structure/disposalpipe/segment{
+ dir = 4;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plating,
/area/maintenance/fpmaint2{
name = "Port Maintenance"
})
"azP" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
@@ -11510,17 +11528,16 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/obj/structure/disposalpipe/segment{
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/simulated/floor/plating,
/area/maintenance/fore)
"azQ" = (
/obj/item/stack/sheet/cardboard,
-/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/maintenance/fpmaint2{
name = "Port Maintenance"
@@ -11530,7 +11547,6 @@
name = "Cargo Bay Warehouse Maintenance";
req_one_access_txt = "48;50"
},
-/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/quartermaster/sorting{
name = "\improper Warehouse"
@@ -11548,6 +11564,7 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/quartermaster/miningdock{
name = "\improper Mining Office"
@@ -11572,7 +11589,6 @@
},
/area/security/brig)
"azZ" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/light/small{
dir = 8
},
@@ -11580,13 +11596,17 @@
dir = 8;
pixel_x = -26
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "neutralcorner"
},
/area/crew_quarters/sleep)
"aAa" = (
-/obj/structure/disposalpipe/segment,
+/obj/structure/disposalpipe/segment{
+ dir = 4;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "redcorner"
@@ -11603,16 +11623,16 @@
d2 = 4;
icon_state = "2-4"
},
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
- },
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 8
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 8
},
+/obj/structure/disposalpipe/junction{
+ dir = 4;
+ icon_state = "pipe-j2"
+ },
/turf/simulated/floor/plasteel,
/area/security/brig)
"aAc" = (
@@ -11621,15 +11641,15 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/security/brig)
"aAd" = (
@@ -11638,13 +11658,13 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 1
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/security/brig)
"aAe" = (
@@ -11687,12 +11707,12 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment,
/obj/structure/cable/yellow{
d1 = 2;
d2 = 8;
icon_state = "2-8"
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "showroomfloor"
},
@@ -11712,9 +11732,6 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable/yellow{
d1 = 2;
d2 = 8;
@@ -11729,6 +11746,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/security/brig)
"aAn" = (
@@ -11784,7 +11804,6 @@
d2 = 8;
icon_state = "2-8"
},
-/obj/structure/disposalpipe/segment,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
@@ -11792,6 +11811,7 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 10;
icon_state = "red"
@@ -11887,9 +11907,6 @@
},
/area/crew_quarters/sleep)
"aAI" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
@@ -11912,6 +11929,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plating,
/area/maintenance/starboard)
"aAJ" = (
@@ -11960,6 +11980,16 @@
name = "Holding Cell";
req_access_txt = "2"
},
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
/turf/simulated/floor/plasteel{
icon_state = "red"
},
@@ -11996,10 +12026,19 @@
name = "Port Maintenance"
})
"aAV" = (
-/obj/structure/disposalpipe/segment,
-/obj/effect/decal/warning_stripes/south,
-/turf/simulated/floor/plating,
-/area/maintenance/fore)
+/obj/structure/chair{
+ dir = 1
+ },
+/obj/effect/landmark/start{
+ name = "Security Officer"
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "red"
+ },
+/area/security/main)
"aAW" = (
/obj/structure/chair/office/dark{
dir = 4
@@ -12012,6 +12051,10 @@
"aAX" = (
/obj/structure/closet/crate,
/obj/item/coin/silver,
+/obj/structure/disposalpipe/segment{
+ dir = 8;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plating,
/area/maintenance/fpmaint2{
name = "Port Maintenance"
@@ -12035,11 +12078,14 @@
name = "Port Maintenance"
})
"aBa" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/plasteel,
-/area/quartermaster/miningdock{
- name = "\improper Mining Office"
- })
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "redcorner"
+ },
+/area/security/brig)
"aBb" = (
/turf/simulated/wall/r_wall,
/area/security/nuke_storage)
@@ -12136,10 +12182,10 @@
/area/security/brig)
"aBy" = (
/obj/machinery/door/firedoor,
-/obj/structure/disposalpipe/segment,
/obj/machinery/door/airlock/public/glass{
name = "Recreation Area"
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "neutralcorner"
@@ -12243,17 +12289,11 @@
/turf/simulated/floor/wood,
/area/crew_quarters/mrchangs)
"aBM" = (
+/obj/effect/spawner/window/reinforced,
+/obj/structure/cable/yellow,
/obj/structure/disposalpipe/segment,
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "neutralcorner"
- },
-/area/crew_quarters/sleep)
+/turf/simulated/floor/plating,
+/area/security/main)
"aBN" = (
/obj/machinery/door/airlock/public/glass{
name = "Fore Primary Hallway"
@@ -12337,16 +12377,16 @@
d2 = 4;
icon_state = "2-4"
},
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 6
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 6
},
+/obj/structure/disposalpipe/segment{
+ dir = 4;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plating,
/area/maintenance/starboard)
"aBV" = (
@@ -12370,9 +12410,6 @@
/turf/simulated/floor/plating,
/area/bridge)
"aBX" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
@@ -12385,6 +12422,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plating,
/area/maintenance/starboard)
"aBY" = (
@@ -12408,9 +12448,6 @@
/turf/simulated/floor/plating,
/area/bridge)
"aBZ" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
@@ -12426,13 +12463,12 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plating,
/area/maintenance/starboard)
"aCa" = (
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
- },
/obj/structure/cable/yellow{
d1 = 1;
d2 = 8;
@@ -12444,6 +12480,10 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 9
},
+/obj/structure/disposalpipe/segment{
+ dir = 8;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plating,
/area/maintenance/starboard)
"aCb" = (
@@ -12578,7 +12618,6 @@
icon_state = "1-2"
},
/obj/structure/disposalpipe/segment,
-/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/quartermaster/miningdock{
name = "\improper Mining Office"
@@ -12678,9 +12717,6 @@
/obj/machinery/alarm{
pixel_y = 24
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/turf/simulated/floor/plasteel{
icon_state = "floorgrime"
},
@@ -12845,10 +12881,6 @@
/turf/simulated/floor/plating,
/area/engine/equipmentstorage)
"aCN" = (
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
- },
/turf/simulated/floor/plasteel{
icon_state = "floorgrime"
},
@@ -12889,9 +12921,6 @@
/turf/simulated/wall,
/area/security/detectives_office)
"aCT" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
@@ -12904,6 +12933,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "whitered"
},
@@ -12940,32 +12972,33 @@
/turf/simulated/floor/plating,
/area/bridge)
"aCW" = (
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
- },
/obj/structure/sign/chinese{
pixel_x = -32
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "neutralcorner"
},
/area/crew_quarters/sleep)
"aCX" = (
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
},
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/plasteel,
-/area/crew_quarters/sleep)
+/obj/structure/disposalpipe/sortjunction{
+ dir = 4;
+ icon_state = "pipe-j2s";
+ name = "HoS Junction";
+ sortType = 7
+ },
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "red"
+ },
+/area/security/processing)
"aCY" = (
/obj/machinery/light/small{
dir = 4
@@ -12983,9 +13016,9 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/maintenance/starboard)
"aDa" = (
@@ -12993,7 +13026,6 @@
/turf/simulated/floor/plating,
/area/maintenance/starboard)
"aDb" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/door/airlock/highsecurity{
name = "Gravity Generator Foyer";
req_access_txt = "10"
@@ -13001,22 +13033,39 @@
/obj/effect/decal/warning_stripes/yellow,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/engine/gravitygenerator)
"aDc" = (
-/obj/structure/disposalpipe/segment,
/obj/effect/decal/warning_stripes/north,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/engine/engineering)
"aDd" = (
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
},
-/turf/simulated/floor/plating,
-/area/maintenance/fore)
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/structure/disposalpipe/junction{
+ dir = 2;
+ icon_state = "pipe-y"
+ },
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "neutralcorner"
+ },
+/area/crew_quarters/fitness{
+ name = "\improper Recreation Area"
+ })
"aDe" = (
/obj/structure/closet,
/obj/item/poster/random_contraband,
@@ -13111,10 +13160,7 @@
d2 = 8;
icon_state = "1-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
- },
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "brown"
@@ -13144,10 +13190,6 @@
pixel_x = -3;
pixel_y = 6
},
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
- },
/turf/simulated/floor/plasteel{
icon_state = "floorgrime"
},
@@ -13155,9 +13197,6 @@
name = "\improper Warehouse"
})
"aDA" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/light_switch{
pixel_y = 28
},
@@ -13168,9 +13207,6 @@
name = "\improper Warehouse"
})
"aDB" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/sink/kitchen{
desc = "A sink used for washing one's hands and face. It looks rusty and home-made";
name = "old sink";
@@ -13515,19 +13551,18 @@
/turf/simulated/floor/carpet,
/area/security/detectives_office)
"aEf" = (
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
- },
/obj/effect/decal/cleanable/cobweb,
/turf/simulated/floor/plating,
/area/maintenance/fore)
"aEg" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
},
-/turf/simulated/floor/plating,
-/area/maintenance/fore)
+/obj/structure/disposalpipe/segment,
+/turf/simulated/floor/plasteel,
+/area/security/brig)
"aEh" = (
/obj/effect/spawner/window/reinforced,
/obj/structure/cable/yellow{
@@ -13583,9 +13618,9 @@
},
/area/engine/engineering)
"aEo" = (
-/obj/structure/disposalpipe/segment{
+/obj/structure/disposalpipe/junction{
dir = 4;
- icon_state = "pipe-c"
+ icon_state = "pipe-y"
},
/turf/simulated/floor/plasteel{
dir = 1;
@@ -13603,16 +13638,15 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/structure/disposalpipe/junction{
- dir = 4;
- icon_state = "pipe-j2"
- },
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 8
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 8
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/crew_quarters/sleep)
"aEq" = (
@@ -13621,15 +13655,15 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "neutralcorner"
},
@@ -13643,15 +13677,15 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plating,
/area/maintenance/starboard)
"aEs" = (
@@ -13681,32 +13715,12 @@
/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
/area/bridge)
-"aEu" = (
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/turf/simulated/floor/plating,
-/area/maintenance/starboard)
"aEv" = (
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/effect/spawner/lootdrop{
loot = list(/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes);
name = "maint grille or trash spawner"
@@ -13717,13 +13731,12 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plating,
/area/maintenance/starboard)
"aEw" = (
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
- },
/obj/structure/cable/yellow{
d1 = 1;
d2 = 8;
@@ -13740,6 +13753,10 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 9
},
+/obj/structure/disposalpipe/segment{
+ dir = 8;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plating,
/area/maintenance/starboard)
"aEx" = (
@@ -13814,9 +13831,6 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/effect/decal/warning_stripes/west,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -13824,13 +13838,16 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/turf/simulated/floor/plating,
-/area/maintenance/starboard)
-"aEE" = (
/obj/structure/disposalpipe/segment{
dir = 4
},
+/turf/simulated/floor/plating,
+/area/maintenance/starboard)
+"aEE" = (
/obj/effect/decal/warning_stripes/west,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/engine/engineering)
"aEH" = (
@@ -13902,6 +13919,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 6
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/quartermaster/miningdock{
name = "\improper Mining Office"
@@ -13973,12 +13991,12 @@
name = "Port Maintenance"
})
"aEV" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "showroomfloor"
},
@@ -14148,7 +14166,7 @@
"aFq" = (
/obj/machinery/alarm{
dir = 1;
- pixel_y = -24
+ pixel_y = -22
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -14227,12 +14245,12 @@
},
/area/security/brig)
"aFB" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "red"
},
@@ -14274,10 +14292,6 @@
/obj/machinery/light_switch{
pixel_y = 38
},
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
- },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "brown"
@@ -14357,8 +14371,18 @@
},
/area/crew_quarters/sleep)
"aFM" = (
+/obj/structure/rack{
+ dir = 8;
+ layer = 2.9
+ },
+/obj/item/clothing/gloves/color/yellow,
+/obj/item/clothing/gloves/color/yellow,
+/obj/item/clothing/gloves/color/yellow,
+/obj/item/clothing/suit/storage/hazardvest,
+/obj/item/clothing/suit/storage/hazardvest,
+/obj/item/tank/internals/emergency_oxygen/engi,
+/obj/item/tank/internals/emergency_oxygen/engi,
/obj/effect/decal/warning_stripes/yellow,
-/obj/machinery/vending/engidrobe,
/turf/simulated/floor/plasteel,
/area/engine/engineering)
"aFO" = (
@@ -14390,7 +14414,6 @@
/turf/simulated/floor/plating,
/area/engine/chiefs_office)
"aFQ" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/door_control{
id = "qm_mine_warehouse";
name = "Warehouse Door Control";
@@ -14463,18 +14486,7 @@
/obj/machinery/camera{
c_tag = "Engineering - Fore"
},
-/obj/effect/decal/warning_stripes/yellow,
-/obj/structure/rack{
- dir = 8;
- layer = 2.9
- },
-/obj/item/clothing/gloves/color/yellow,
-/obj/item/clothing/gloves/color/yellow,
-/obj/item/clothing/gloves/color/yellow,
-/obj/item/clothing/suit/storage/hazardvest,
-/obj/item/clothing/suit/storage/hazardvest,
-/obj/item/tank/internals/emergency_oxygen/engi,
-/obj/item/tank/internals/emergency_oxygen/engi,
+/obj/effect/decal/warning_stripes/northwest,
/turf/simulated/floor/plasteel,
/area/engine/engineering)
"aGc" = (
@@ -14487,7 +14499,6 @@
/area/engine/engineering)
"aGf" = (
/obj/machinery/hologram/holopad,
-/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/quartermaster/miningdock{
name = "\improper Mining Office"
@@ -14502,6 +14513,7 @@
/obj/effect/landmark/start{
name = "Shaft Miner"
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/quartermaster/miningdock{
name = "\improper Mining Office"
@@ -14525,7 +14537,6 @@
name = "\improper Mining Office"
})
"aGi" = (
-/obj/structure/disposalpipe/segment,
/obj/item/storage/box/donkpockets,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel{
@@ -14736,9 +14747,9 @@
},
/area/security/brig)
"aGC" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/engine/engineering)
"aGD" = (
@@ -14788,11 +14799,11 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 8
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "red"
},
@@ -14829,25 +14840,24 @@
},
/area/crew_quarters/sleep)
"aGN" = (
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
+/obj/effect/spawner/lootdrop{
+ loot = list(/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes);
+ name = "maint grille or trash spawner"
},
-/turf/simulated/floor/plasteel,
-/area/crew_quarters/sleep)
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/fpmaint2{
+ name = "Port Maintenance"
+ })
"aGO" = (
/obj/structure/chair/stool{
pixel_y = 8
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/turf/simulated/floor/plasteel,
/area/crew_quarters/sleep)
"aGP" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/hologram/holopad,
/obj/structure/chair/stool{
pixel_y = 8
@@ -14855,10 +14865,7 @@
/turf/simulated/floor/plasteel,
/area/crew_quarters/sleep)
"aGQ" = (
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
- },
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "floorgrime"
},
@@ -15069,7 +15076,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/quartermaster/miningdock{
name = "\improper Mining Office"
@@ -15088,7 +15094,6 @@
name = "\improper Mining Office"
})
"aHu" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/unary/vent_pump/on,
/turf/simulated/floor/plasteel{
@@ -15102,6 +15107,10 @@
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 2;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plating,
/area/maintenance/fpmaint2{
name = "Port Maintenance"
@@ -15398,11 +15407,8 @@
name = "Port Maintenance"
})
"aHY" = (
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
- },
/obj/effect/decal/cleanable/dirt,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/maintenance/fpmaint2{
name = "Port Maintenance"
@@ -15430,7 +15436,18 @@
},
/area/crew_quarters/sleep)
"aIa" = (
-/obj/machinery/vending/detdrobe,
+/obj/structure/rack{
+ dir = 8;
+ layer = 2.9
+ },
+/obj/item/storage/briefcase{
+ pixel_x = -3;
+ pixel_y = 2
+ },
+/obj/item/storage/secure/briefcase{
+ pixel_x = 2;
+ pixel_y = -2
+ },
/turf/simulated/floor/plasteel{
icon_state = "grimy"
},
@@ -15485,10 +15502,6 @@
/turf/simulated/floor/plating,
/area/maintenance/fore)
"aIi" = (
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
- },
/obj/effect/decal/warning_stripes/south,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 9
@@ -15496,6 +15509,10 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 9
},
+/obj/structure/disposalpipe/segment{
+ dir = 8;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel,
/area/engine/engineering)
"aIk" = (
@@ -15516,7 +15533,6 @@
/obj/structure/chair/stool{
pixel_y = 8
},
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/unary/vent_pump/on,
/turf/simulated/floor/plasteel,
/area/crew_quarters/sleep)
@@ -15795,6 +15811,7 @@
/obj/effect/landmark/start{
name = "Shaft Miner"
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/quartermaster/miningdock{
name = "\improper Mining Office"
@@ -16150,7 +16167,6 @@
name = "Brig Control";
req_access_txt = "3"
},
-/obj/structure/disposalpipe/segment,
/obj/structure/cable/yellow{
d1 = 2;
d2 = 4;
@@ -16166,6 +16182,7 @@
d2 = 2;
icon_state = "1-2"
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/security/warden)
"aJz" = (
@@ -16249,7 +16266,6 @@
},
/area/crew_quarters/sleep)
"aJD" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 1
},
@@ -16265,6 +16281,7 @@
/obj/structure/chair/stool{
pixel_y = 8
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/crew_quarters/sleep)
"aJG" = (
@@ -16351,7 +16368,6 @@
/turf/simulated/floor/plasteel,
/area/engine/equipmentstorage)
"aJS" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable/yellow{
d1 = 2;
d2 = 4;
@@ -16434,7 +16450,6 @@
/obj/item/shovel{
pixel_x = -5
},
-/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "brown"
},
@@ -16452,6 +16467,7 @@
/obj/effect/landmark/start{
name = "Shaft Miner"
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "brown"
},
@@ -16952,12 +16968,15 @@
},
/area/crew_quarters/sleep)
"aLe" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel,
/area/crew_quarters/sleep)
"aLf" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel{
icon_state = "neutralcorner"
},
@@ -16968,6 +16987,9 @@
dir = 1;
pixel_y = -24
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "neutralcorner"
},
@@ -17035,7 +17057,6 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/structure/disposalpipe/segment,
/obj/effect/decal/warning_stripes/yellow,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -17265,7 +17286,6 @@
/turf/simulated/floor/engine,
/area/engine/engineering)
"aLP" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
@@ -17368,9 +17388,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
@@ -17440,7 +17457,6 @@
/turf/simulated/wall,
/area/lawoffice)
"aMo" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/security/glass{
id_tag = "Brig";
@@ -17454,6 +17470,7 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "redfull"
},
@@ -17582,11 +17599,6 @@
/turf/simulated/floor/wood,
/area/crew_quarters/sleep)
"aMD" = (
-/obj/structure/disposalpipe/sortjunction{
- dir = 1;
- icon_state = "pipe-j2s";
- sortType = 1
- },
/obj/structure/cable/yellow{
d1 = 1;
d2 = 8;
@@ -17597,12 +17609,13 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 8;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plating,
/area/maintenance/fore)
"aME" = (
@@ -17722,6 +17735,10 @@
dir = 8
},
/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
+/obj/structure/disposalpipe/segment{
+ dir = 1;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel,
/area/quartermaster/storage)
"aMT" = (
@@ -17741,7 +17758,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/obj/machinery/vending/cargodrobe,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/quartermaster/storage)
"aMU" = (
@@ -17762,20 +17781,19 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 2;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel,
/area/quartermaster/storage)
"aMX" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable/yellow{
d1 = 2;
d2 = 8;
@@ -17788,6 +17806,7 @@
},
/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/engine/engineering)
"aMY" = (
@@ -17810,6 +17829,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/quartermaster/storage)
"aMZ" = (
@@ -17846,12 +17868,11 @@
d2 = 4;
icon_state = "1-4"
},
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
- },
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/quartermaster/storage)
"aNc" = (
@@ -18036,16 +18057,22 @@
d2 = 8;
icon_state = "0-8"
},
+/obj/structure/disposalpipe/junction{
+ dir = 4;
+ icon_state = "pipe-j2"
+ },
/turf/simulated/floor/plating,
/area/maintenance/fpmaint2{
name = "Port Maintenance"
})
"aNn" = (
-/obj/effect/spawner/window/reinforced,
-/obj/structure/disposalpipe/segment,
+/obj/structure/disposalpipe/segment{
+ dir = 2;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plating,
-/area/quartermaster/miningdock{
- name = "\improper Mining Office"
+/area/maintenance/fpmaint2{
+ name = "Port Maintenance"
})
"aNo" = (
/turf/simulated/wall,
@@ -18494,8 +18521,10 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/turf/simulated/floor/plasteel,
-/area/quartermaster/storage)
+/turf/simulated/floor/plating,
+/area/maintenance/fpmaint2{
+ name = "Port Maintenance"
+ })
"aOy" = (
/obj/structure/cable/yellow{
d1 = 1;
@@ -18632,11 +18661,21 @@
/turf/simulated/floor/wood,
/area/lawoffice)
"aOW" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
},
-/turf/simulated/floor/plasteel,
-/area/quartermaster/storage)
+/obj/structure/disposalpipe/sortjunction{
+ dir = 4;
+ icon_state = "pipe-j2s";
+ name = "Disposals Junction";
+ sortType = 1
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/fpmaint2{
+ name = "Port Maintenance"
+ })
"aOX" = (
/obj/structure/extinguisher_cabinet{
pixel_x = -27
@@ -18645,12 +18684,12 @@
/turf/simulated/floor/plasteel,
/area/engine/engineering)
"aOY" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "neutralcorner"
},
@@ -18680,7 +18719,6 @@
/turf/simulated/floor/engine,
/area/engine/engineering)
"aPb" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
@@ -18688,6 +18726,7 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "neutralcorner"
},
@@ -18777,9 +18816,9 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/engine/engineering)
"aPq" = (
@@ -19373,15 +19412,20 @@
d2 = 2;
icon_state = "1-2"
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "neutralcorner"
},
/area/crew_quarters/locker)
"aQK" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "floorgrime"
},
@@ -19390,6 +19434,10 @@
/obj/machinery/light/small{
dir = 4
},
+/obj/structure/disposalpipe/junction{
+ dir = 1;
+ icon_state = "pipe-j2"
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "neutralcorner"
@@ -19479,22 +19527,19 @@
/area/engine/engineering)
"aQV" = (
/obj/structure/disposalpipe/segment{
- dir = 4
+ dir = 8;
+ icon_state = "pipe-c"
},
/turf/simulated/floor/plasteel{
- dir = 1;
icon_state = "neutralcorner"
},
-/area/crew_quarters/locker)
+/area/crew_quarters/sleep)
"aQW" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
- dir = 4;
icon_state = "neutralcorner"
},
-/area/crew_quarters/locker)
+/area/crew_quarters/sleep)
"aQX" = (
/obj/structure/cable/yellow{
d1 = 4;
@@ -19856,11 +19901,11 @@
},
/area/security/brig)
"aRQ" = (
+/mob/living/simple_animal/mouse,
+/obj/machinery/atmospherics/binary/valve,
/obj/structure/disposalpipe/segment{
dir = 4
},
-/mob/living/simple_animal/mouse,
-/obj/machinery/atmospherics/binary/valve,
/turf/simulated/floor/plasteel{
icon_state = "floorgrime"
},
@@ -19898,15 +19943,16 @@
},
/area/crew_quarters/courtroom)
"aRV" = (
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/obj/structure/disposalpipe/junction{
- dir = 4;
- icon_state = "pipe-j2"
+ dir = 8
},
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "neutralcorner"
- },
-/area/crew_quarters/locker)
+/turf/simulated/floor/plasteel,
+/area/storage/primary)
"aRW" = (
/obj/structure/table/wood,
/obj/item/book/manual/security_space_law,
@@ -19922,10 +19968,6 @@
/turf/simulated/floor/wood,
/area/lawoffice)
"aRX" = (
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel,
@@ -19935,6 +19977,7 @@
codes_txt = "patrol;next_patrol=14.5-Recreation";
location = "14.3-Lockers-Dorms"
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "neutralcorner"
@@ -20043,7 +20086,6 @@
/area/quartermaster/storage)
"aSm" = (
/obj/effect/decal/warning_stripes/west,
-/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/quartermaster/storage)
"aSn" = (
@@ -20138,7 +20180,6 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/structure/disposalpipe/segment,
/obj/structure/cable/yellow{
d1 = 2;
d2 = 4;
@@ -20146,6 +20187,7 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/engine/engineering)
"aSF" = (
@@ -20518,10 +20560,6 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
- },
/obj/machinery/atmospherics/unary/vent_scrubber/on,
/turf/simulated/floor/plasteel,
/area/crew_quarters/locker)
@@ -20531,22 +20569,20 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel,
/area/crew_quarters/locker)
"aTz" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
+/obj/structure/disposalpipe/segment{
+ dir = 1;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "neutralcorner"
@@ -20559,12 +20595,12 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/door/airlock{
name = "Garden"
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/hallway/secondary/construction{
name = "\improper Garden"
@@ -20606,10 +20642,10 @@
d2 = 8;
icon_state = "4-8"
},
+/obj/machinery/hologram/holopad,
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel,
/area/hallway/secondary/construction{
name = "\improper Garden"
@@ -20620,10 +20656,10 @@
d2 = 8;
icon_state = "4-8"
},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "neutral"
@@ -20642,11 +20678,11 @@
d2 = 8;
icon_state = "0-8"
},
-/obj/machinery/disposal,
/obj/machinery/camera{
c_tag = "Garden";
dir = 8
},
+/obj/machinery/disposal,
/obj/structure/disposalpipe/trunk{
dir = 8
},
@@ -20685,8 +20721,8 @@
/turf/simulated/floor/engine,
/area/engine/supermatter)
"aTL" = (
-/obj/structure/disposalpipe/segment,
/obj/effect/decal/warning_stripes/yellow/hollow,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/quartermaster/storage)
"aTP" = (
@@ -20742,9 +20778,6 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/mining/glass{
name = "Quartermaster";
@@ -20761,6 +20794,9 @@
id_tag = "qmshutter";
name = "Quartermaster's privacy shutter"
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/quartermaster/qm)
"aTX" = (
@@ -20769,24 +20805,21 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 8
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "brown"
},
/area/quartermaster/qm)
"aTY" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable/yellow{
d1 = 1;
d2 = 8;
@@ -20795,22 +20828,25 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/quartermaster/qm)
"aTZ" = (
/obj/effect/landmark/start{
name = "Quartermaster"
},
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
- },
/obj/structure/chair/office/dark{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 2;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel,
/area/quartermaster/qm)
"aUa" = (
@@ -20832,10 +20868,10 @@
d2 = 8;
icon_state = "4-8"
},
+/obj/effect/decal/warning_stripes/west,
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/effect/decal/warning_stripes/west,
/turf/simulated/floor/plasteel,
/area/hallway/secondary/construction{
name = "\improper Garden"
@@ -21222,7 +21258,6 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/structure/disposalpipe/segment,
/obj/structure/cable/yellow{
d1 = 2;
d2 = 8;
@@ -21230,6 +21265,7 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/engine/engineering)
"aUT" = (
@@ -21286,16 +21322,15 @@
/turf/simulated/floor/plasteel,
/area/construction)
"aVa" = (
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/quartermaster/storage)
"aVb" = (
@@ -21324,15 +21359,15 @@
d2 = 4;
icon_state = "1-4"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/quartermaster/storage)
"aVe" = (
@@ -21426,8 +21461,6 @@
name = "Port Maintenance"
})
"aVr" = (
-/obj/machinery/disposal,
-/obj/structure/disposalpipe/trunk,
/obj/machinery/camera{
c_tag = "Locker Room Starboard"
},
@@ -21435,6 +21468,10 @@
pixel_y = 30
},
/obj/effect/decal/warning_stripes/yellow,
+/obj/machinery/disposal,
+/obj/structure/disposalpipe/trunk{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "vault"
},
@@ -21605,9 +21642,6 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/structure/disposalpipe/junction{
- dir = 4
- },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "neutralcorner"
@@ -21885,16 +21919,15 @@
/turf/simulated/floor/wood,
/area/lawoffice)
"aWm" = (
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
- },
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/effect/decal/warning_stripes/northwestcorner,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/engine/engineering)
"aWn" = (
@@ -21999,15 +22032,15 @@
name = "Station Intercom (General)";
pixel_y = 21
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/table,
/obj/machinery/cell_charger,
/obj/item/stock_parts/cell/high{
charge = 100;
maxcharge = 15000
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "yellow"
@@ -22106,7 +22139,6 @@
/turf/simulated/floor/plating,
/area/quartermaster/storage)
"aWM" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/chair/office/dark{
dir = 4
},
@@ -22186,26 +22218,33 @@
/turf/simulated/floor/plasteel,
/area/quartermaster/storage)
"aWT" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/simulated/floor/plasteel,
-/area/storage/primary)
-"aWU" = (
-/obj/structure/disposalpipe/junction{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/plasteel,
-/area/storage/primary)
-"aWV" = (
/obj/structure/disposalpipe/segment{
dir = 2;
icon_state = "pipe-c"
},
/turf/simulated/floor/plasteel,
/area/storage/primary)
+"aWU" = (
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel,
+/area/storage/primary)
+"aWV" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment,
+/turf/simulated/floor/plasteel,
+/area/quartermaster/storage)
"aWW" = (
/turf/simulated/floor/plasteel{
dir = 4;
@@ -22415,23 +22454,13 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 1
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/engine/engineering)
"aXz" = (
/obj/structure/disposalpipe/segment,
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/turf/simulated/floor/plasteel,
-/area/engine/engineering)
+/turf/simulated/wall,
+/area/quartermaster/office)
"aXB" = (
/obj/structure/table,
/obj/item/clipboard,
@@ -22673,9 +22702,9 @@
name = "Arrivals"
})
"aYh" = (
-/obj/structure/disposalpipe/segment,
/obj/effect/spawner/lootdrop/maintenance,
/obj/effect/decal/warning_stripes/yellow/hollow,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/quartermaster/storage)
"aYi" = (
@@ -22694,23 +22723,17 @@
},
/area/storage/primary)
"aYk" = (
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/sortjunction{
+ dir = 1;
+ sortType = 2
},
/turf/simulated/floor/plating,
/area/maintenance/fpmaint2{
name = "Port Maintenance"
})
"aYl" = (
-/obj/structure/disposalpipe/sortjunction{
- dir = 1;
- sortType = 2
+/obj/structure/disposalpipe/segment{
+ dir = 4
},
/turf/simulated/floor/plasteel,
/area/quartermaster/storage)
@@ -22738,7 +22761,6 @@
pixel_x = 6
},
/obj/effect/decal/warning_stripes/west,
-/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/quartermaster/storage)
"aYp" = (
@@ -22751,6 +22773,9 @@
d2 = 8;
icon_state = "4-8"
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plating,
/area/maintenance/fpmaint2{
name = "Port Maintenance"
@@ -22766,6 +22791,9 @@
d2 = 4;
icon_state = "2-4"
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "brown"
@@ -22780,7 +22808,6 @@
/turf/simulated/floor/plasteel,
/area/storage/primary)
"aYs" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
@@ -22788,17 +22815,18 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment{
+ dir = 2;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel,
/area/storage/primary)
"aYt" = (
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/plasteel,
-/area/storage/primary)
+/turf/simulated/wall,
+/area/maintenance/fpmaint2{
+ name = "Port Maintenance"
+ })
"aYv" = (
/obj/structure/cable/yellow{
d1 = 2;
@@ -22964,6 +22992,10 @@
icon_state = "4-8"
},
/obj/effect/decal/warning_stripes/north,
+/obj/structure/disposalpipe/segment{
+ dir = 4;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel,
/area/engine/engineering)
"aYO" = (
@@ -23005,9 +23037,6 @@
/turf/simulated/floor/plasteel,
/area/engine/engineering)
"aYS" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable{
d1 = 4;
d2 = 8;
@@ -23016,6 +23045,9 @@
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/engine/engineering)
"aYT" = (
@@ -23088,15 +23120,15 @@
icon_state = "1-2"
},
/obj/effect/decal/warning_stripes/east,
+/obj/structure/disposalpipe/segment{
+ dir = 4;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plating,
/area/maintenance/fpmaint2{
name = "Port Maintenance"
})
"aYY" = (
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
- },
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
@@ -23105,6 +23137,7 @@
/obj/effect/decal/warning_stripes/south,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/engine/engineering)
"aYZ" = (
@@ -23127,11 +23160,11 @@
d2 = 4;
icon_state = "2-4"
},
+/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
/turf/simulated/floor/plasteel,
/area/security/brig)
"aZb" = (
@@ -23140,10 +23173,6 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/junction{
- dir = 4;
- icon_state = "pipe-j2"
- },
/obj/structure/cable/yellow{
d1 = 1;
d2 = 4;
@@ -23155,6 +23184,10 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/junction{
+ dir = 4;
+ icon_state = "pipe-j2"
+ },
/turf/simulated/floor/plasteel,
/area/security/brig)
"aZc" = (
@@ -23163,9 +23196,6 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/structure/disposalpipe/sortjunction{
- sortType = 5
- },
/obj/structure/cable{
d1 = 4;
d2 = 8;
@@ -23177,6 +23207,10 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/sortjunction{
+ name = "CE's Junction";
+ sortType = 5
+ },
/turf/simulated/floor/plasteel,
/area/engine/engineering)
"aZd" = (
@@ -23297,12 +23331,11 @@
/area/quartermaster/storage)
"aZw" = (
/obj/structure/disposalpipe/segment{
- dir = 8;
+ dir = 4;
icon_state = "pipe-c"
},
-/obj/effect/decal/warning_stripes/south,
/turf/simulated/floor/plasteel,
-/area/engine/engineering)
+/area/hallway/primary/port)
"aZx" = (
/obj/machinery/flasher{
id = "AI";
@@ -23370,19 +23403,18 @@
},
/area/storage/primary)
"aZE" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/disposal,
/obj/structure/disposalpipe/trunk{
dir = 1
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel{
icon_state = "brown"
},
/area/storage/primary)
"aZF" = (
/obj/structure/reagent_dispensers/fueltank,
-/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "brown"
},
@@ -23679,22 +23711,22 @@
dir = 1;
pixel_y = 2
},
-/obj/machinery/disposal/deliveryChute{
- dir = 4;
- name = "Crate Disposal Chute";
- pixel_x = -5;
- pixel_y = 2
- },
/obj/machinery/door/window/westleft{
base_state = "right";
dir = 4;
icon_state = "right";
name = "Crate Disposal Chute"
},
+/obj/effect/decal/warning_stripes/yellow,
+/obj/machinery/disposal/deliveryChute{
+ dir = 4;
+ name = "Crate Disposal Chute";
+ pixel_x = -5;
+ pixel_y = 2
+ },
/obj/structure/disposalpipe/trunk{
dir = 4
},
-/obj/effect/decal/warning_stripes/yellow,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "brown"
@@ -23732,9 +23764,6 @@
d2 = 4;
icon_state = "2-4"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable/yellow{
d1 = 1;
d2 = 4;
@@ -23746,16 +23775,21 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 1
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/security/brig)
"bas" = (
/obj/structure/closet/crate,
-/obj/structure/disposalpipe/segment,
/obj/effect/spawner/lootdrop/maintenance{
lootcount = 3;
name = "3maintenance loot spawner"
},
/obj/effect/decal/warning_stripes/yellow/hollow,
+/obj/structure/disposalpipe/junction{
+ dir = 1
+ },
/turf/simulated/floor/plasteel,
/area/quartermaster/storage)
"bau" = (
@@ -23770,7 +23804,6 @@
/turf/simulated/floor/plasteel,
/area/construction)
"baw" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
@@ -23788,6 +23821,7 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 8
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/engine/engineering)
"bay" = (
@@ -23846,13 +23880,13 @@
d2 = 2;
icon_state = "1-2"
},
+/obj/machinery/status_display{
+ pixel_x = 32
+ },
/obj/machinery/disposal,
/obj/structure/disposalpipe/trunk{
dir = 8
},
-/obj/machinery/status_display{
- pixel_x = 32
- },
/turf/simulated/floor/plasteel,
/area/quartermaster/storage)
"baG" = (
@@ -23964,7 +23998,6 @@
/turf/simulated/floor/plasteel,
/area/quartermaster/storage)
"baU" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
@@ -23973,6 +24006,7 @@
/obj/effect/decal/warning_stripes/yellow/hollow,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/engine/engineering{
dir = 8
@@ -24074,9 +24108,6 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable/yellow{
d1 = 2;
d2 = 4;
@@ -24087,6 +24118,9 @@
d2 = 4;
icon_state = "1-4"
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/engine/break_room)
"bbg" = (
@@ -24695,12 +24729,12 @@
/turf/simulated/floor/plasteel,
/area/quartermaster/storage)
"bcv" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/quartermaster/storage)
"bcy" = (
@@ -24770,7 +24804,7 @@
},
/obj/item/trash/popcorn,
/obj/structure/disposalpipe/segment{
- dir = 4;
+ dir = 2;
icon_state = "pipe-c"
},
/turf/simulated/floor/plating,
@@ -24783,9 +24817,6 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/door/airlock/maintenance{
req_one_access_txt = "12;63;48;50"
},
@@ -24799,9 +24830,6 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "neutralcorner"
@@ -24813,10 +24841,6 @@
d2 = 8;
icon_state = "2-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel{
@@ -24825,11 +24849,15 @@
},
/area/hallway/primary/central)
"bcK" = (
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "neutralcorner"
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
},
+/obj/machinery/door/firedoor,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/floor/plasteel,
/area/hallway/primary/central)
"bcL" = (
/obj/machinery/firealarm{
@@ -24921,6 +24949,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "neutralcorner"
@@ -24959,7 +24990,6 @@
/area/maintenance/starboard)
"bdm" = (
/obj/effect/decal/warning_stripes/northwestcorner,
-/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/quartermaster/storage)
"bdp" = (
@@ -24969,20 +24999,6 @@
},
/turf/space,
/area/space/nearstation)
-"bdq" = (
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/effect/decal/warning_stripes/east,
-/turf/simulated/floor/plating,
-/area/maintenance/fpmaint2{
- name = "Port Maintenance"
- })
"bdr" = (
/obj/structure/cable/yellow{
d1 = 2;
@@ -25157,7 +25173,6 @@
/area/quartermaster/storage)
"bdD" = (
/obj/machinery/door/firedoor,
-/obj/structure/disposalpipe/segment,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
@@ -25170,6 +25185,7 @@
/obj/effect/decal/warning_stripes/yellow/hollow,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/engine/chiefs_office)
"bdE" = (
@@ -25376,17 +25392,11 @@
d2 = 8;
icon_state = "2-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/turf/simulated/floor/plasteel,
/area/quartermaster/storage)
"beb" = (
/obj/effect/decal/warning_stripes/southeastcorner,
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
- },
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/quartermaster/storage)
"bec" = (
@@ -25422,10 +25432,10 @@
/turf/simulated/floor/plating,
/area/maintenance/starboard)
"beg" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/door/airlock/maintenance{
req_one_access_txt = "12;63;48;50"
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/maintenance/fpmaint2{
name = "Port Maintenance"
@@ -25441,9 +25451,6 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/structure/disposalpipe/junction{
- dir = 1
- },
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 8
},
@@ -25453,22 +25460,11 @@
/turf/simulated/floor/plasteel,
/area/hallway/primary/central)
"bej" = (
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
+/obj/machinery/door/firedoor,
+/obj/structure/disposalpipe/segment,
+/turf/simulated/floor/plasteel{
+ icon_state = "neutralcorner"
},
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/turf/simulated/floor/plasteel,
/area/hallway/primary/central)
"bek" = (
/obj/structure/cable/yellow{
@@ -25639,7 +25635,6 @@
d2 = 8;
icon_state = "2-8"
},
-/obj/structure/disposalpipe/segment,
/obj/structure/cable/yellow{
d1 = 2;
d2 = 4;
@@ -25651,6 +25646,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/hallway/primary/central)
"bey" = (
@@ -25805,8 +25801,8 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "vault"
@@ -25869,15 +25865,15 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/security/brig)
"beW" = (
@@ -26033,9 +26029,6 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable/yellow{
d1 = 1;
d2 = 8;
@@ -26043,10 +26036,12 @@
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/security/brig)
"bfn" = (
-/obj/structure/disposalpipe/segment,
/obj/effect/decal/warning_stripes/south,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
@@ -26061,16 +26056,8 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/turf/simulated/floor/plating,
/area/quartermaster/storage)
-"bfp" = (
-/obj/structure/disposalpipe/segment,
-/obj/effect/decal/warning_stripes/south,
-/turf/simulated/floor/plasteel,
-/area/quartermaster/storage)
"bfq" = (
/obj/machinery/camera{
c_tag = "Cargo Bay - Aft";
@@ -26119,6 +26106,7 @@
"bfv" = (
/obj/structure/closet/secure_closet/cargotech,
/obj/effect/decal/warning_stripes/southeast,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/quartermaster/storage)
"bfw" = (
@@ -26182,9 +26170,6 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable/yellow{
d1 = 1;
d2 = 8;
@@ -26192,6 +26177,9 @@
},
/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/security/brig)
"bfG" = (
@@ -26214,9 +26202,9 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/hallway/primary/central)
"bfJ" = (
@@ -26237,14 +26225,11 @@
},
/area/hallway/primary/central)
"bfM" = (
-/obj/machinery/door/firedoor,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- icon_state = "neutralcorner"
- },
-/area/hallway/primary/central)
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
+/turf/simulated/floor/plasteel,
+/area/engine/break_room)
"bfN" = (
/obj/structure/cable{
d1 = 2;
@@ -26258,23 +26243,6 @@
dir = 1;
pixel_y = -24
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- icon_state = "neutralcorner"
- },
-/area/hallway/primary/central)
-"bfQ" = (
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
- },
/turf/simulated/floor/plasteel{
icon_state = "neutralcorner"
},
@@ -26671,10 +26639,6 @@
icon_state = "4-8"
},
/obj/effect/decal/warning_stripes/east,
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
- },
/turf/simulated/floor/plating,
/area/maintenance/fpmaint2{
name = "Port Maintenance"
@@ -26682,9 +26646,6 @@
"bgC" = (
/obj/effect/decal/warning_stripes/south,
/obj/machinery/telepad_cargo,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/turf/simulated/floor/plasteel,
/area/quartermaster/storage)
"bgF" = (
@@ -26708,10 +26669,6 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
- },
/obj/structure/cable/yellow{
d1 = 1;
d2 = 8;
@@ -26719,6 +26676,10 @@
},
/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
+/obj/structure/disposalpipe/segment{
+ dir = 8;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel,
/area/security/brig)
"bgK" = (
@@ -26732,9 +26693,6 @@
icon_state = "1-8"
},
/obj/effect/decal/warning_stripes/southwest,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/turf/simulated/floor/plasteel,
/area/quartermaster/storage)
"bgL" = (
@@ -26863,7 +26821,6 @@
/obj/effect/decal/warning_stripes/south,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/quartermaster/storage)
"bgW" = (
@@ -26908,9 +26865,6 @@
d2 = 4;
icon_state = "1-4"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/carpet,
/area/crew_quarters/theatre)
@@ -26922,15 +26876,22 @@
name = "Arrivals"
})
"bhc" = (
-/obj/machinery/conveyor{
- dir = 4;
- id = "packageSort2"
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
},
/obj/structure/disposalpipe/segment{
dir = 4
},
-/turf/simulated/floor/plating,
-/area/quartermaster/office)
+/turf/simulated/floor/plasteel,
+/area/hallway/primary/central)
"bhd" = (
/obj/structure/table,
/obj/item/flashlight{
@@ -26966,7 +26927,6 @@
},
/area/quartermaster/office)
"bhf" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/power/apc{
dir = 4;
name = "CE Office APC";
@@ -26985,6 +26945,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 9
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "vault"
@@ -27029,10 +26990,10 @@
/turf/simulated/floor/plasteel,
/area/hallway/primary/port)
"bhm" = (
-/obj/structure/disposalpipe/segment,
/obj/effect/landmark{
name = "lightsout"
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/hallway/primary/port)
"bhn" = (
@@ -27084,6 +27045,7 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/janitor)
"bht" = (
@@ -27093,7 +27055,6 @@
/obj/machinery/door/airlock{
name = "Central Emergency Storage"
},
-/obj/structure/disposalpipe/segment,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
@@ -27102,10 +27063,10 @@
/turf/simulated/floor/plating,
/area/maintenance/maintcentral)
"bhv" = (
+/obj/machinery/atmospherics/pipe/simple/visible,
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/visible,
/turf/simulated/floor/plasteel{
icon_state = "floorgrime"
},
@@ -27209,6 +27170,10 @@
/obj/structure/reagent_dispensers/spacecleanertank{
pixel_y = 30
},
+/obj/structure/disposalpipe/segment{
+ dir = 2;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel,
/area/janitor)
"bhL" = (
@@ -27297,7 +27262,6 @@
name = "Arrivals"
})
"bhX" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/mining{
name = "Cargo Bay";
@@ -27424,7 +27388,6 @@
/obj/effect/landmark{
name = "lightsout"
},
-/obj/structure/disposalpipe/segment,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
@@ -27437,6 +27400,7 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 8
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/engine/engineering)
"bil" = (
@@ -27519,7 +27483,9 @@
name = "Station Intercom (General)";
pixel_y = 20
},
-/obj/machinery/computer/security,
+/obj/machinery/computer/security{
+ network = list("SS13","Research Outpost","Mining Outpost","Telecomms")
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "red"
@@ -27549,9 +27515,8 @@
})
"biz" = (
/obj/effect/decal/warning_stripes/southwest,
-/obj/structure/rack,
+/obj/structure/closet/wardrobe/atmospherics_yellow,
/obj/item/flashlight,
-/obj/item/painter,
/turf/simulated/floor/plasteel,
/area/atmos)
"biA" = (
@@ -27560,9 +27525,8 @@
pixel_y = 28
},
/obj/effect/decal/warning_stripes/southeast,
-/obj/structure/rack,
+/obj/structure/closet/wardrobe/atmospherics_yellow,
/obj/item/flashlight,
-/obj/item/painter,
/turf/simulated/floor/plasteel,
/area/atmos)
"biB" = (
@@ -27577,9 +27541,9 @@
},
/obj/machinery/space_heater,
/obj/structure/disposalpipe/segment{
- dir = 4
+ dir = 4;
+ icon_state = "pipe-c"
},
-/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/maintenance/fpmaint2{
name = "Port Maintenance"
@@ -27591,13 +27555,13 @@
/turf/simulated/wall,
/area/quartermaster/office)
"biE" = (
-/obj/structure/disposalpipe/trunk{
- dir = 8
- },
/obj/machinery/conveyor{
dir = 4;
id = "packageSort2"
},
+/obj/structure/disposalpipe/trunk{
+ dir = 8
+ },
/obj/structure/disposaloutlet{
dir = 4
},
@@ -27624,9 +27588,6 @@
id = "packageSort2"
},
/obj/structure/plasticflaps,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/turf/simulated/floor/plating,
/area/quartermaster/office)
"biI" = (
@@ -27660,29 +27621,24 @@
},
/area/atmos)
"biK" = (
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/simulated/floor/plasteel,
-/area/quartermaster/office)
-"biL" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/simulated/floor/plasteel,
-/area/quartermaster/office)
-"biM" = (
-/obj/structure/disposalpipe/segment{
- dir = 2;
+ dir = 8;
icon_state = "pipe-c"
},
-/turf/simulated/floor/plasteel,
-/area/quartermaster/office)
+/turf/simulated/floor/plasteel{
+ icon_state = "neutralcorner"
+ },
+/area/hallway/primary/central)
+"biL" = (
+/obj/structure/disposalpipe/segment,
+/turf/simulated/floor/plasteel{
+ icon_state = "bar"
+ },
+/area/crew_quarters/bar)
+"biM" = (
+/obj/structure/disposalpipe/segment,
+/turf/simulated/floor/carpet,
+/area/crew_quarters/theatre)
"biN" = (
/obj/machinery/computer/supplycomp,
/turf/simulated/floor/plasteel{
@@ -27745,28 +27701,18 @@
},
/area/hallway/primary/central)
"biW" = (
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
+/obj/structure/chair/stool/bar,
+/obj/structure/disposalpipe/segment,
+/turf/simulated/floor/plasteel{
+ icon_state = "bar"
},
-/obj/structure/disposalpipe/sortjunction{
- dir = 1;
- sortType = 22
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/plasteel,
-/area/hallway/primary/central)
+/area/crew_quarters/bar)
"biX" = (
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
- },
/obj/machinery/firealarm{
dir = 4;
pixel_x = 24
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "neutralcorner"
},
@@ -27784,6 +27730,10 @@
"biZ" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment{
+ dir = 1;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel{
icon_state = "floorgrime"
},
@@ -27793,6 +27743,9 @@
/obj/machinery/alarm{
pixel_y = 24
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "floorgrime"
},
@@ -27893,11 +27846,11 @@
/obj/machinery/ai_status_display{
pixel_y = 32
},
+/obj/machinery/atmospherics/unary/vent_pump/on,
/obj/structure/disposalpipe/segment{
dir = 4;
icon_state = "pipe-c"
},
-/obj/machinery/atmospherics/unary/vent_pump/on,
/turf/simulated/floor/carpet,
/area/crew_quarters/captain{
name = "\improper Captain's Quarters"
@@ -27945,18 +27898,6 @@
icon_state = "neutralcorner"
},
/area/hallway/primary/central)
-"bjn" = (
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/obj/structure/disposalpipe/segment,
-/obj/machinery/door/firedoor,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/plasteel,
-/area/hallway/primary/central)
"bjp" = (
/obj/structure/table,
/obj/item/storage/toolbox/emergency,
@@ -28077,9 +28018,6 @@
/area/storage/tech)
"bjA" = (
/obj/machinery/light,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/extinguisher_cabinet{
pixel_y = -30
},
@@ -28154,7 +28092,6 @@
/obj/machinery/light{
dir = 4
},
-/obj/structure/disposalpipe/segment,
/obj/machinery/computer/security/telescreen{
desc = "A telescreen that connects to the engine's camera network.";
dir = 8;
@@ -28164,6 +28101,7 @@
pixel_x = 30
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "vault"
@@ -28545,9 +28483,6 @@
name = "Mailroom Maintenance";
req_access_txt = "50"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/turf/simulated/floor/plating,
/area/quartermaster/office)
"bkv" = (
@@ -28562,7 +28497,6 @@
/turf/simulated/floor/plasteel,
/area/engine/engineering)
"bkw" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
@@ -28571,10 +28505,10 @@
/obj/effect/decal/warning_stripes/south,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/engine/engineering)
"bkx" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/light_switch{
pixel_x = -25
},
@@ -28622,9 +28556,20 @@
/turf/simulated/floor/plasteel,
/area/quartermaster/office)
"bkC" = (
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/plasteel,
-/area/quartermaster/office)
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 8;
+ icon_state = "pipe-c"
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "bar"
+ },
+/area/crew_quarters/bar)
"bkD" = (
/obj/structure/filingcabinet/filingcabinet,
/obj/machinery/atmospherics/unary/vent_scrubber/on,
@@ -28697,10 +28642,7 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
- },
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "floorgrime"
},
@@ -28710,9 +28652,6 @@
name = "Custodial Maintenance";
req_access_txt = "26"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
@@ -28721,9 +28660,6 @@
/turf/simulated/floor/plating,
/area/janitor)
"bkP" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
@@ -28736,10 +28672,6 @@
pixel_x = 1;
pixel_y = 5
},
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
- },
/obj/structure/cable/yellow{
d1 = 1;
d2 = 8;
@@ -28790,13 +28722,13 @@
name = "\improper Warehouse"
})
"bkY" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 8;
icon_state = "1-8"
},
/obj/machinery/atmospherics/binary/valve,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "floorgrime"
},
@@ -28828,8 +28760,8 @@
name = "\improper Captain's Quarters"
})
"blc" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/carpet,
/area/crew_quarters/captain{
name = "\improper Captain's Quarters"
@@ -28942,7 +28874,6 @@
/turf/simulated/floor/plating,
/area/maintenance/incinerator)
"blt" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
@@ -28951,13 +28882,16 @@
/obj/effect/decal/warning_stripes/yellow/hollow,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/engine/engineering)
"blx" = (
-/obj/effect/spawner/window/reinforced,
/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/plating,
-/area/quartermaster/office)
+/turf/simulated/floor/plasteel{
+ dir = 5;
+ icon_state = "cafeteria"
+ },
+/area/crew_quarters/kitchen)
"bly" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 1
@@ -29301,23 +29235,31 @@
name = "Customs"
})
"bmd" = (
+/obj/effect/decal/warning_stripes/east,
/obj/structure/disposalpipe/trunk{
- dir = 8
+ dir = 1
},
/obj/machinery/disposal/deliveryChute{
dir = 8
},
-/obj/effect/decal/warning_stripes/east,
/turf/simulated/floor/plating,
/area/quartermaster/office)
"bme" = (
-/obj/effect/decal/warning_stripes/north,
-/obj/structure/disposalpipe/segment{
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/sortjunction{
dir = 2;
- icon_state = "pipe-c"
+ icon_state = "pipe-j2s";
+ name = "Kitchen Junction";
+ sortType = 20
},
/turf/simulated/floor/plasteel,
-/area/quartermaster/office)
+/area/hallway/primary/central)
"bmf" = (
/obj/machinery/door/poddoor{
density = 0;
@@ -29344,12 +29286,6 @@
/turf/simulated/floor/plating,
/area/bridge)
"bmg" = (
-/obj/structure/disposaloutlet{
- dir = 4
- },
-/obj/structure/disposalpipe/trunk{
- dir = 1
- },
/obj/structure/window/reinforced{
dir = 1
},
@@ -29357,10 +29293,15 @@
/obj/structure/window/reinforced{
dir = 8
},
+/obj/structure/disposaloutlet{
+ dir = 4
+ },
+/obj/structure/disposalpipe/trunk{
+ dir = 8
+ },
/turf/simulated/floor/plating,
/area/quartermaster/office)
"bmh" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/engineering{
name = "Engine Room";
@@ -29374,6 +29315,7 @@
/obj/effect/decal/warning_stripes/yellow/hollow,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/engine/engineering)
"bmi" = (
@@ -29501,7 +29443,6 @@
/turf/simulated/floor/plasteel,
/area/quartermaster/office)
"bms" = (
-/obj/structure/disposalpipe/segment,
/obj/effect/landmark/start{
name = "Cargo Technician"
},
@@ -29519,10 +29460,6 @@
/turf/simulated/floor/plasteel,
/area/quartermaster/office)
"bmt" = (
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
- },
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
@@ -29532,6 +29469,10 @@
dir = 4
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
+/obj/structure/disposalpipe/segment{
+ dir = 4;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "brown"
@@ -29549,9 +29490,6 @@
/turf/simulated/floor/plasteel,
/area/engine/break_room)
"bmv" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
@@ -29563,15 +29501,15 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 9
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "brown"
},
/area/hallway/primary/port)
"bmw" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
@@ -29580,6 +29518,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/hallway/primary/port)
"bmy" = (
@@ -29588,12 +29529,12 @@
d2 = 8;
icon_state = "2-8"
},
-/obj/structure/disposalpipe/junction{
- dir = 2
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/junction{
+ dir = 2
+ },
/turf/simulated/floor/plasteel,
/area/hallway/primary/port)
"bmz" = (
@@ -29650,10 +29591,6 @@
},
/area/janitor)
"bmE" = (
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
- },
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
@@ -29665,6 +29602,10 @@
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 1
},
+/obj/structure/disposalpipe/segment{
+ dir = 8;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "vault"
@@ -29760,15 +29701,19 @@
},
/area/engine/chiefs_office)
"bmO" = (
-/obj/structure/disposalpipe/segment,
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
+/obj/machinery/door/poddoor{
+ density = 0;
+ icon_state = "open";
+ id_tag = "kitchenwindow";
+ name = "kitchen shutters";
+ opacity = 0
+ },
+/obj/effect/spawner/window/reinforced,
+/obj/structure/disposalpipe/segment{
+ dir = 4
},
-/obj/effect/decal/warning_stripes/north,
/turf/simulated/floor/plating,
-/area/maintenance/maintcentral)
+/area/crew_quarters/kitchen)
"bmP" = (
/obj/machinery/light_switch{
pixel_x = 27
@@ -29894,24 +29839,17 @@
codes_txt = "patrol;next_patrol=14.2-Central-CrewQuarters";
location = "14-Starboard-Central"
},
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/hallway/primary/central)
"bnc" = (
/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
+ dir = 4
},
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "yellowcorner"
- },
-/area/hallway/primary/central)
+/turf/simulated/floor/wood,
+/area/crew_quarters/theatre)
"bnd" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/public/glass{
@@ -29973,25 +29911,24 @@
},
/area/hallway/primary/starboard)
"bnl" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "neutralcorner"
+ },
+/area/hallway/primary/central)
+"bnm" = (
/obj/structure/disposalpipe/segment{
dir = 4;
icon_state = "pipe-c"
},
/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "yellowcorner"
+ dir = 8;
+ icon_state = "neutralcorner"
},
-/area/hallway/primary/starboard)
-"bnm" = (
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
- },
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "yellowcorner"
- },
-/area/hallway/primary/starboard)
+/area/hallway/primary/central)
"bnn" = (
/obj/machinery/alarm{
pixel_y = 24
@@ -30014,10 +29951,6 @@
},
/area/hallway/primary/starboard)
"bnq" = (
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
- },
/obj/structure/extinguisher_cabinet{
pixel_x = -27
},
@@ -30106,14 +30039,14 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/structure/disposalpipe/junction{
- dir = 2;
- icon_state = "pipe-j2"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/junction{
+ dir = 2;
+ icon_state = "pipe-j2"
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "yellow"
@@ -30231,14 +30164,14 @@
},
/area/maintenance/starboard)
"bnM" = (
-/obj/machinery/disposal,
-/obj/structure/disposalpipe/trunk{
- dir = 1
- },
/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -28
},
+/obj/machinery/disposal,
+/obj/structure/disposalpipe/trunk{
+ dir = 1
+ },
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "vault"
@@ -30395,10 +30328,7 @@
name = "blobstart"
},
/obj/effect/decal/warning_stripes/east,
-/obj/structure/disposalpipe/junction{
- dir = 4;
- icon_state = "pipe-j2"
- },
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/maintenance/fpmaint2{
name = "Port Maintenance"
@@ -30412,7 +30342,6 @@
/obj/machinery/door/airlock/maintenance{
req_one_access_txt = "12;48;50;1"
},
-/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/maintenance/fpmaint2{
name = "Port Maintenance"
@@ -30445,7 +30374,6 @@
name = "Engineering Security Doors";
opacity = 0
},
-/obj/structure/disposalpipe/segment,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
@@ -30454,6 +30382,7 @@
/obj/effect/decal/warning_stripes/yellow,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/engine/break_room)
"bog" = (
@@ -30537,12 +30466,15 @@
},
/area/bridge)
"bos" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
+/obj/structure/disposalpipe/segment{
+ dir = 8;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel,
/area/hallway/primary/port)
"bot" = (
@@ -30763,37 +30695,17 @@
d2 = 4;
icon_state = "2-4"
},
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
- },
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 8
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 8
},
-/turf/simulated/floor/plasteel,
-/area/hallway/primary/central)
-"boP" = (
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/obj/structure/disposalpipe/junction{
- dir = 4;
+ dir = 2;
icon_state = "pipe-j2"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- icon_state = "neutralcorner"
- },
+/turf/simulated/floor/plasteel,
/area/hallway/primary/central)
"boQ" = (
/obj/structure/cable/yellow{
@@ -30805,34 +30717,15 @@
/obj/machinery/door/airlock/public/glass{
name = "Starboard Primary Hallway"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/turf/simulated/floor/plasteel{
- icon_state = "neutralcorner"
- },
-/area/hallway/primary/starboard)
-"boR" = (
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
/turf/simulated/floor/plasteel{
icon_state = "neutralcorner"
},
@@ -30843,9 +30736,6 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable/yellow{
d1 = 2;
d2 = 8;
@@ -30857,6 +30747,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "neutralcorner"
},
@@ -30867,9 +30760,6 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable/yellow{
d1 = 1;
d2 = 4;
@@ -30881,26 +30771,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/turf/simulated/floor/plasteel{
- icon_state = "neutralcorner"
- },
-/area/hallway/primary/starboard)
-"boW" = (
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/machinery/door/firedoor,
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
/turf/simulated/floor/plasteel{
icon_state = "neutralcorner"
},
@@ -30911,15 +30784,16 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/junction{
- dir = 2
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/junction{
+ dir = 8;
+ icon_state = "pipe-j2"
+ },
/turf/simulated/floor/plasteel{
icon_state = "neutralcorner"
},
@@ -30930,16 +30804,15 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "neutralcorner"
},
@@ -30950,9 +30823,6 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -30960,6 +30830,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "neutralcorner"
},
@@ -30970,9 +30843,6 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable/yellow{
d1 = 2;
d2 = 4;
@@ -30984,15 +30854,14 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "neutralcorner"
},
/area/hallway/primary/starboard)
"bpf" = (
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
- },
/obj/structure/cable/yellow{
d1 = 2;
d2 = 8;
@@ -31004,6 +30873,10 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
},
+/obj/structure/disposalpipe/segment{
+ dir = 2;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel{
icon_state = "neutralcorner"
},
@@ -31038,22 +30911,11 @@
/turf/simulated/floor/plasteel,
/area/engine/break_room)
"bpj" = (
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
- },
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/turf/simulated/floor/plasteel,
-/area/engine/break_room)
+/obj/structure/closet/emcloset,
+/obj/structure/disposalpipe/segment,
+/turf/simulated/floor/plating,
+/area/maintenance/starboard)
"bpk" = (
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
- },
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
@@ -31066,6 +30928,7 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/engine/break_room)
"bpm" = (
@@ -31227,10 +31090,6 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
- },
/turf/simulated/floor/plasteel{
dir = 9;
icon_state = "neutral"
@@ -31242,10 +31101,7 @@
icon_state = "map-left-MS";
pixel_y = 32
},
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
- },
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "neutral"
@@ -31258,6 +31114,7 @@
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 8
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "neutralcorner"
},
@@ -31385,11 +31242,11 @@
},
/obj/item/reagent_containers/glass/bucket,
/obj/item/mop,
-/obj/structure/disposalpipe/segment,
/obj/machinery/firealarm{
dir = 4;
pixel_x = 24
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "floorgrime"
},
@@ -31406,7 +31263,6 @@
},
/area/quartermaster/office)
"bpT" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel{
icon_state = "brown"
@@ -31438,15 +31294,12 @@
},
/area/hallway/primary/port)
"bpX" = (
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
- },
/obj/structure/cable/yellow{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "browncorner"
},
@@ -31560,7 +31413,6 @@
icon_state = "1-2"
},
/obj/effect/decal/warning_stripes/south,
-/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/maintenance/fpmaint2{
name = "Port Maintenance"
@@ -31635,9 +31487,9 @@
name = "\improper Captain's Quarters"
})
"bqq" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/wood,
/area/crew_quarters/captain{
name = "\improper Captain's Quarters"
@@ -31669,9 +31521,9 @@
codes_txt = "patrol;next_patrol=13.1-Engineering-Enter";
location = "12-Central-Starboard"
},
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/hallway/primary/central)
"bqv" = (
@@ -31796,9 +31648,9 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "neutralcorner"
},
@@ -31818,19 +31670,28 @@
/turf/simulated/floor/plasteel,
/area/engine/break_room)
"bqQ" = (
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
},
-/turf/simulated/floor/plasteel,
-/area/engine/break_room)
+/obj/effect/decal/warning_stripes/east,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/fpmaint2{
+ name = "Port Maintenance"
+ })
"bqR" = (
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/junction{
+ dir = 2;
+ icon_state = "pipe-y"
},
-/turf/simulated/floor/plasteel,
-/area/engine/break_room)
+/turf/simulated/floor/plasteel{
+ icon_state = "neutralcorner"
+ },
+/area/hallway/primary/central)
"bqS" = (
/obj/structure/chair/stool{
pixel_y = 8
@@ -31868,9 +31729,6 @@
/turf/simulated/floor/plating,
/area/maintenance/starboard)
"bqW" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/mining/glass{
name = "Cargo Office";
@@ -31888,6 +31746,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/quartermaster/office)
"bqX" = (
@@ -32242,13 +32103,13 @@
d2 = 8;
icon_state = "2-8"
},
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralcorner"
@@ -32319,13 +32180,13 @@
},
/area/hallway/primary/port)
"brM" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/machinery/door/firedoor,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "brown"
@@ -32351,6 +32212,7 @@
dir = 8;
pixel_x = 24
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "neutralcorner"
},
@@ -32419,9 +32281,9 @@
},
/area/hallway/primary/port)
"brW" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/insulated,
/obj/machinery/meter,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/maintenance/incinerator)
"brX" = (
@@ -32562,9 +32424,9 @@
req_access = null;
req_access_txt = "20"
},
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/carpet,
/area/crew_quarters/captain{
name = "\improper Captain's Quarters"
@@ -32622,29 +32484,26 @@
req_access_txt = "12"
},
/obj/structure/disposalpipe/segment,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/maintenance/starboard)
"bss" = (
-/obj/machinery/disposal,
-/obj/structure/disposalpipe/trunk{
- dir = 1
- },
/obj/machinery/light_switch{
pixel_x = 27
},
/obj/machinery/light/small{
dir = 4
},
+/obj/machinery/disposal,
+/obj/structure/disposalpipe/trunk{
+ dir = 1
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "brown"
},
/area/quartermaster/office)
"bsv" = (
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
- },
/obj/structure/cable/yellow{
d1 = 1;
d2 = 4;
@@ -32657,6 +32516,10 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment{
+ dir = 1;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel{
icon_state = "neutralcorner"
},
@@ -32670,6 +32533,7 @@
/obj/structure/disposalpipe/sortjunction{
dir = 8;
icon_state = "pipe-j2s";
+ name = "Atmospherics Junction";
sortType = 6
},
/turf/simulated/floor/plasteel{
@@ -32683,10 +32547,10 @@
d2 = 8;
icon_state = "1-8"
},
+/obj/machinery/atmospherics/unary/vent_scrubber/on,
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/atmospherics/unary/vent_scrubber/on,
/turf/simulated/floor/plasteel,
/area/engine/break_room)
"bsz" = (
@@ -32724,13 +32588,16 @@
/turf/simulated/floor/plating,
/area/janitor)
"bsF" = (
-/obj/structure/disposalpipe/sortjunction,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 8
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 8
},
+/obj/structure/disposalpipe/sortjunction{
+ name = "Engineering Junction";
+ sortType = 4
+ },
/turf/simulated/floor/plasteel,
/area/engine/engineering)
"bsG" = (
@@ -32754,7 +32621,6 @@
dir = 1;
pixel_y = 2
},
-/obj/structure/disposalpipe/segment,
/obj/item/bikehorn/rubberducky,
/obj/machinery/light_switch{
pixel_x = -28
@@ -32762,6 +32628,7 @@
/obj/item/card/id/captains_spare,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/unary/vent_scrubber/on,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/wood,
/area/crew_quarters/captain{
name = "\improper Captain's Quarters"
@@ -33064,8 +32931,8 @@
name = "Privacy Shutters";
opacity = 0
},
-/obj/structure/disposalpipe/segment,
/obj/structure/cable/yellow,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/blueshield)
"btm" = (
@@ -33121,11 +32988,11 @@
d2 = 2;
icon_state = "1-2"
},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/disposalpipe/junction{
dir = 1
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutral"
@@ -33192,14 +33059,14 @@
},
/area/hallway/primary/port)
"btC" = (
-/obj/structure/disposalpipe/junction{
- dir = 1
+/obj/structure/disposalpipe/segment{
+ dir = 8;
+ icon_state = "pipe-c"
},
/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "neutralcorner"
+ icon_state = "greencorner"
},
-/area/hallway/primary/port)
+/area/hallway/primary/central)
"btD" = (
/obj/item/radio/intercom{
name = "Station Intercom (General)";
@@ -33223,12 +33090,12 @@
},
/area/hallway/primary/port)
"btG" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "browncorner"
@@ -33254,7 +33121,6 @@
codes_txt = "patrol;next_patrol=4-Customs";
location = "3-Central-Port"
},
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel,
@@ -33340,10 +33206,6 @@
},
/area/quartermaster/office)
"btS" = (
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
- },
/obj/structure/cable/yellow{
d1 = 1;
d2 = 8;
@@ -33551,13 +33413,13 @@
name = "\improper Captain's Quarters"
})
"bug" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 9
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 9
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/wood,
/area/crew_quarters/captain{
name = "\improper Captain's Quarters"
@@ -33796,10 +33658,6 @@
},
/area/bridge)
"buF" = (
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
- },
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
@@ -33816,24 +33674,21 @@
},
/area/hallway/primary/starboard)
"buG" = (
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "cautioncorner"
},
/area/hallway/primary/starboard)
"buH" = (
-/obj/structure/disposalpipe/segment,
/obj/effect/decal/warning_stripes/north,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/maintenance/starboard)
"buI" = (
@@ -34389,7 +34244,6 @@
})
"bvy" = (
/obj/effect/spawner/window/reinforced,
-/obj/structure/disposalpipe/segment,
/obj/machinery/door/poddoor/shutters{
density = 0;
dir = 2;
@@ -34399,6 +34253,7 @@
opacity = 0
},
/obj/structure/cable/yellow,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/ntrep)
"bvz" = (
@@ -34461,7 +34316,6 @@
d2 = 4;
icon_state = "1-4"
},
-/obj/structure/disposalpipe/segment,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
@@ -34473,6 +34327,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutral"
@@ -34484,32 +34339,15 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
- },
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 1
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 1
},
-/turf/simulated/floor/plasteel,
-/area/hallway/primary/port)
-"bvH" = (
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
+ dir = 1;
+ icon_state = "pipe-c"
},
/turf/simulated/floor/plasteel,
/area/hallway/primary/port)
@@ -34524,15 +34362,15 @@
d2 = 4;
icon_state = "2-4"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/hallway/primary/port)
"bvL" = (
@@ -34541,9 +34379,6 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -34551,6 +34386,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/hallway/primary/port)
"bvM" = (
@@ -34564,15 +34402,15 @@
d2 = 4;
icon_state = "1-4"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/hallway/primary/port)
"bvN" = (
@@ -34581,13 +34419,13 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 1
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/hallway/primary/port)
"bvO" = (
@@ -34596,17 +34434,15 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/sortjunction{
- dir = 8;
- name = "Quartermasters Office";
- sortType = 3
- },
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 1
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 1
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/hallway/primary/port)
"bvQ" = (
@@ -34620,29 +34456,14 @@
d2 = 4;
icon_state = "1-4"
},
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/turf/simulated/floor/plasteel,
-/area/hallway/primary/port)
-"bvR" = (
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
+/obj/structure/disposalpipe/junction{
+ dir = 8
},
/turf/simulated/floor/plasteel,
/area/hallway/primary/port)
@@ -34662,6 +34483,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/hallway/primary/port)
"bvU" = (
@@ -34675,13 +34499,16 @@
d2 = 8;
icon_state = "1-8"
},
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 4
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 2;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel,
/area/hallway/primary/central)
"bvW" = (
@@ -35039,18 +34866,20 @@
/turf/simulated/floor/wood,
/area/crew_quarters/bar)
"bwD" = (
+/obj/structure/grille,
/obj/structure/disposalpipe/segment{
- dir = 4;
+ dir = 1;
icon_state = "pipe-c"
},
-/turf/simulated/floor/wood,
-/area/crew_quarters/bar)
+/turf/simulated/floor/plating,
+/area/maintenance/starboard)
"bwE" = (
+/obj/structure/grille,
/obj/structure/disposalpipe/segment{
dir = 4
},
-/turf/simulated/floor/wood,
-/area/crew_quarters/bar)
+/turf/simulated/floor/plating,
+/area/maintenance/starboard)
"bwF" = (
/obj/structure/transit_tube{
icon_state = "E-SW-NW"
@@ -35069,9 +34898,6 @@
name = "Bar Maintenance";
req_access_txt = "25"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/turf/simulated/floor/plating,
/area/crew_quarters/bar)
"bwH" = (
@@ -35083,11 +34909,10 @@
/turf/simulated/floor/plasteel,
/area/engine/break_room)
"bwI" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
+/obj/effect/decal/warning_stripes/north,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
-/area/maintenance/starboard)
+/area/maintenance/aft)
"bwL" = (
/obj/structure/transit_tube,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -35129,23 +34954,18 @@
/turf/simulated/floor/plating,
/area/maintenance/starboard)
"bwP" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/effect/decal/warning_stripes/west,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
-/area/maintenance/starboard)
+/area/maintenance/aft)
"bwR" = (
/obj/structure/cable/yellow{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
-/obj/structure/disposalpipe/sortjunction{
- dir = 2;
- sortType = 19
- },
/obj/effect/decal/warning_stripes/east,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/maintenance/starboard)
"bwS" = (
@@ -35162,7 +34982,6 @@
/turf/simulated/floor/plating,
/area/maintenance/starboard)
"bwT" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
@@ -35732,12 +35551,12 @@
},
/area/hallway/primary/port)
"bxQ" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutral"
@@ -35886,9 +35705,14 @@
codes_txt = "patrol;next_patrol=7-Command-Starboard";
location = "6-Port-Central"
},
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
+/obj/structure/disposalpipe/sortjunction{
+ dir = 1;
+ name = "Custodial Junction";
+ sortType = 22
+ },
/turf/simulated/floor/plasteel,
/area/hallway/primary/central)
"byi" = (
@@ -36116,8 +35940,8 @@
name = "Captain's Desk";
req_access_txt = "20"
},
-/obj/structure/disposalpipe/segment,
/obj/item/stamp/captain,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/wood,
/area/crew_quarters/captain{
name = "\improper Captain's Quarters"
@@ -36151,28 +35975,14 @@
})
"byD" = (
/obj/structure/table/wood,
-/obj/item/paper_bin{
- pixel_x = -4;
- pixel_y = 10
- },
+/obj/item/paper_bin/nanotrasen,
/obj/item/pen{
pixel_x = -3;
pixel_y = 5
},
-/obj/item/storage/briefcase{
- pixel_x = -3;
- pixel_y = 2
- },
-/obj/item/storage/secure/briefcase{
- pixel_x = 2;
- pixel_y = -2
- },
/turf/simulated/floor/carpet,
/area/security/detectives_office)
"byE" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
@@ -36181,17 +35991,20 @@
/obj/machinery/door/airlock/maintenance{
req_one_access_txt = "20;12"
},
-/turf/simulated/floor/plating,
-/area/maintenance/maintcentral)
-"byF" = (
/obj/structure/disposalpipe/segment{
dir = 4
},
+/turf/simulated/floor/plating,
+/area/maintenance/maintcentral)
+"byF" = (
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralcorner"
@@ -36203,10 +36016,6 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
- },
/obj/structure/cable/yellow{
d1 = 1;
d2 = 8;
@@ -36214,6 +36023,10 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/sortjunction{
+ name = "Captain's Junction";
+ sortType = 18
+ },
/turf/simulated/floor/plasteel,
/area/hallway/primary/central)
"byH" = (
@@ -36266,30 +36079,26 @@
name = "xeno_spawn";
pixel_x = -1
},
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/turf/simulated/floor/wood,
/area/crew_quarters/bar)
"byM" = (
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/turf/simulated/floor/wood,
/area/crew_quarters/bar)
"byN" = (
+/obj/structure/closet/gmcloset{
+ desc = "It's a storage unit.";
+ name = "spare gear"
+ },
+/obj/item/wrench,
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 8
},
-/obj/machinery/vending/bardrobe,
/turf/simulated/floor/wood,
/area/crew_quarters/bar)
"byO" = (
@@ -36361,9 +36170,6 @@
/area/engine/break_room)
"byY" = (
/obj/machinery/light/small,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -30
@@ -36395,6 +36201,7 @@
/obj/structure/sign/securearea{
pixel_x = 32
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "blackcorner"
},
@@ -36724,28 +36531,28 @@
},
/area/hallway/primary/port)
"bzD" = (
-/obj/machinery/disposal,
-/obj/structure/disposalpipe/trunk{
- dir = 4
- },
/obj/machinery/camera{
c_tag = "Port Primary Hallway - Port";
dir = 4
},
+/obj/machinery/disposal,
+/obj/structure/disposalpipe/trunk{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
/area/hallway/primary/port)
"bzE" = (
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
- },
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
+/obj/structure/disposalpipe/segment{
+ dir = 8;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutral"
@@ -36830,10 +36637,6 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/structure/disposalpipe/sortjunction{
- dir = 1;
- sortType = 15
- },
/obj/structure/cable/yellow{
d1 = 2;
d2 = 4;
@@ -36845,6 +36648,11 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 8
},
+/obj/structure/disposalpipe/sortjunction{
+ dir = 1;
+ name = "HoP Junction";
+ sortType = 15
+ },
/turf/simulated/floor/plasteel,
/area/hallway/primary/central)
"bzR" = (
@@ -36853,15 +36661,15 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "neutralcorner"
},
@@ -36878,15 +36686,15 @@
req_access = null;
req_access_txt = "57"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/wood,
/area/crew_quarters/heads)
"bzT" = (
@@ -36895,16 +36703,16 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 2;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/carpet,
/area/crew_quarters/heads)
"bzU" = (
@@ -37139,7 +36947,6 @@
name = "Bar Storage";
req_access_txt = "25"
},
-/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "wood"
},
@@ -37160,12 +36967,14 @@
/turf/simulated/floor/carpet,
/area/crew_quarters/bar)
"bAy" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
+/obj/structure/disposalpipe/junction{
+ dir = 1
+ },
/turf/simulated/floor/wood,
/area/crew_quarters/bar)
"bAz" = (
@@ -37173,7 +36982,9 @@
pixel_x = 2;
pixel_y = 2
},
-/obj/structure/disposalpipe/trunk,
+/obj/structure/disposalpipe/trunk{
+ dir = 8
+ },
/turf/simulated/floor/wood,
/area/crew_quarters/bar)
"bAA" = (
@@ -37747,13 +37558,13 @@
/turf/simulated/floor/carpet,
/area/bridge)
"bBV" = (
+/obj/machinery/light_switch{
+ pixel_y = -24
+ },
/obj/machinery/disposal,
/obj/structure/disposalpipe/trunk{
dir = 1
},
-/obj/machinery/light_switch{
- pixel_y = -24
- },
/turf/simulated/floor/wood,
/area/crew_quarters/heads)
"bBW" = (
@@ -37880,16 +37691,16 @@
},
/area/bridge)
"bCi" = (
-/obj/structure/disposalpipe/junction{
- dir = 8;
- icon_state = "pipe-j2"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/junction{
+ dir = 8;
+ icon_state = "pipe-j2"
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "neutralcorner"
@@ -37898,13 +37709,13 @@
name = "\improper Command Hallway"
})
"bCj" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 8
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/engine/engineering)
"bCk" = (
@@ -37975,13 +37786,13 @@
d2 = 8;
icon_state = "4-8"
},
+/obj/structure/chair/comfy/brown{
+ dir = 8
+ },
/obj/structure/disposalpipe/segment{
dir = 1;
icon_state = "pipe-c"
},
-/obj/structure/chair/comfy/brown{
- dir = 8
- },
/turf/simulated/floor/carpet,
/area/crew_quarters/captain{
name = "\improper Captain's Quarters"
@@ -38048,13 +37859,12 @@
/area/crew_quarters/bar)
"bCz" = (
/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
+ dir = 4
},
/turf/simulated/floor/plasteel{
- icon_state = "bar"
+ icon_state = "purplecorner"
},
-/area/crew_quarters/bar)
+/area/hallway/primary/aft)
"bCA" = (
/obj/structure/cable/yellow{
d1 = 1;
@@ -38111,9 +37921,15 @@
/turf/simulated/floor/wood,
/area/crew_quarters/bar)
"bCG" = (
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/wood,
-/area/crew_quarters/bar)
+/obj/machinery/door/firedoor,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "whitehall"
+ },
+/area/medical/research)
"bCH" = (
/obj/structure/chair/stool{
pixel_y = 8
@@ -38350,10 +38166,6 @@
},
/area/tcommsat/computer)
"bDk" = (
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
- },
/obj/structure/cable/yellow{
d1 = 2;
d2 = 8;
@@ -38365,6 +38177,10 @@
icon_state = "1-2"
},
/obj/effect/decal/warning_stripes/west,
+/obj/structure/disposalpipe/segment{
+ dir = 8;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plating,
/area/maintenance/maintcentral)
"bDl" = (
@@ -39027,26 +38843,18 @@
name = "\improper Command Hallway"
})
"bEy" = (
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
- },
/obj/structure/chair/stool{
pixel_y = 8
},
-/turf/simulated/floor/wood,
-/area/crew_quarters/bar)
-"bEz" = (
-/obj/structure/disposalpipe/junction{
- dir = 4;
- icon_state = "pipe-j2"
+/obj/structure/disposalpipe/segment{
+ dir = 1;
+ icon_state = "pipe-c"
},
/turf/simulated/floor/wood,
/area/crew_quarters/bar)
"bEA" = (
/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
+ dir = 4
},
/turf/simulated/floor/wood,
/area/crew_quarters/bar)
@@ -39058,18 +38866,28 @@
/obj/structure/window/reinforced{
dir = 8
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/carpet,
/area/crew_quarters/theatre)
"bEC" = (
/obj/structure/chair/wood/wings{
dir = 8
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/carpet,
/area/crew_quarters/theatre)
"bED" = (
/obj/machinery/light/small{
dir = 1
},
+/obj/structure/disposalpipe/segment{
+ dir = 2;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/carpet,
/area/crew_quarters/theatre)
"bEE" = (
@@ -39079,13 +38897,13 @@
name = "Mr. Deempisi portrait";
pixel_y = 28
},
-/obj/structure/disposalpipe/trunk{
- dir = 8
- },
-/obj/machinery/disposal,
/obj/machinery/light_switch{
pixel_x = 25
},
+/obj/machinery/disposal,
+/obj/structure/disposalpipe/trunk{
+ dir = 2
+ },
/turf/simulated/floor/plasteel{
icon_state = "bar"
},
@@ -39316,6 +39134,7 @@
/obj/machinery/light{
dir = 4
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "caution"
@@ -39899,12 +39718,13 @@
/turf/simulated/floor/plating,
/area/bridge)
"bGl" = (
-/obj/structure/disposalpipe/segment,
-/obj/structure/chair/stool{
- pixel_y = 8
+/obj/structure/disposalpipe/segment{
+ dir = 4
},
-/turf/simulated/floor/wood,
-/area/crew_quarters/bar)
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/medical/research)
"bGp" = (
/obj/structure/cable/yellow{
d1 = 1;
@@ -39949,7 +39769,6 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/manifold/hidden/purple,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel{
@@ -39957,6 +39776,7 @@
},
/area/hallway/primary/starboard)
"bGt" = (
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "caution"
@@ -39981,6 +39801,7 @@
/obj/machinery/atm{
pixel_x = 32
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "caution"
@@ -40511,12 +40332,8 @@
/area/bridge)
"bHE" = (
/obj/structure/disposalpipe/segment,
-/obj/item/toy/cards/deck{
- pixel_y = 4
- },
-/obj/structure/table/wood/poker,
-/turf/simulated/floor/wood,
-/area/crew_quarters/bar)
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
"bHG" = (
/obj/effect/spawner/window/reinforced,
/obj/machinery/atmospherics/pipe/simple/visible/yellow{
@@ -40533,7 +40350,6 @@
name = "\improper Captain's Quarters"
})
"bHI" = (
-/obj/structure/disposalpipe/segment,
/obj/item/clothing/mask/cigarette/cigar,
/obj/structure/table/wood/poker,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -40585,6 +40401,7 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/hallway/primary/central)
"bHN" = (
@@ -40670,6 +40487,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/purple{
dir = 4
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "caution"
@@ -40732,16 +40550,16 @@
},
/area/atmos)
"bIh" = (
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
},
-/obj/item/toy/cards/deck{
- pixel_y = 4
+/obj/structure/disposalpipe/segment,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
},
-/obj/structure/table/wood/poker,
-/turf/simulated/floor/wood,
-/area/crew_quarters/bar)
+/area/medical/reception)
"bIi" = (
/obj/structure/table,
/obj/item/storage/belt/utility,
@@ -40907,6 +40725,7 @@
/obj/item/reagent_containers/food/condiment/peppermill{
pixel_x = 3
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "bar"
},
@@ -41044,27 +40863,27 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/structure/disposalpipe/junction{
- dir = 1
- },
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 8
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 8
},
+/obj/structure/disposalpipe/junction{
+ dir = 1
+ },
/turf/simulated/floor/plasteel,
/area/hallway/primary/central)
"bJd" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "neutralcorner"
@@ -41072,9 +40891,6 @@
/area/hallway/primary/central)
"bJe" = (
/obj/machinery/door/firedoor,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/door/airlock/public/glass{
name = "Command Hallway"
},
@@ -41084,6 +40900,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "neutralcorner"
@@ -41092,15 +40911,15 @@
name = "\improper Command Hallway"
})
"bJf" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "neutralcorner"
@@ -41109,15 +40928,15 @@
name = "\improper Command Hallway"
})
"bJg" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 1
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "neutralcorner"
@@ -41126,9 +40945,6 @@
name = "\improper Command Hallway"
})
"bJh" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/effect/landmark{
name = "lightsout"
},
@@ -41138,6 +40954,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "neutralcorner"
@@ -41151,15 +40970,15 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "neutralcorner"
@@ -41168,15 +40987,15 @@
name = "\improper Command Hallway"
})
"bJj" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 1
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "neutralcorner"
@@ -41215,15 +41034,15 @@
},
/area/tcommsat/computer)
"bJn" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "neutral"
@@ -41232,15 +41051,15 @@
name = "\improper Command Hallway"
})
"bJp" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "neutralcorner"
@@ -41254,11 +41073,11 @@
d2 = 2;
icon_state = "1-2"
},
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "neutral"
@@ -41267,16 +41086,16 @@
name = "\improper Command Hallway"
})
"bJr" = (
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 2;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "neutral"
@@ -41461,6 +41280,12 @@
},
/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
+/obj/structure/disposalpipe/sortjunction{
+ dir = 2;
+ icon_state = "pipe-j2s";
+ name = "Bar Junction";
+ sortType = 19
+ },
/turf/simulated/floor/plasteel,
/area/hallway/primary/central)
"bJG" = (
@@ -41474,6 +41299,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/crew_quarters/bar)
"bJH" = (
@@ -41481,6 +41309,9 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 1
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "bar"
},
@@ -41495,6 +41326,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "bar"
},
@@ -41506,6 +41340,12 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "bar"
},
@@ -41595,7 +41435,6 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/purple{
dir = 10
},
@@ -41777,11 +41616,6 @@
"bKl" = (
/turf/simulated/wall/r_wall,
/area/tcommsat/server)
-"bKm" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/carpet,
-/area/crew_quarters/theatre)
"bKn" = (
/obj/machinery/hologram/holopad,
/obj/structure/cable/yellow{
@@ -41904,8 +41738,8 @@
/area/library)
"bKx" = (
/obj/structure/lattice,
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/insulated,
+/obj/structure/disposalpipe/segment,
/turf/space,
/area/space/nearstation)
"bKy" = (
@@ -41973,7 +41807,6 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/structure/disposalpipe/segment,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 4;
@@ -41985,6 +41818,7 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/hallway/primary/central)
"bKM" = (
@@ -42276,16 +42110,16 @@
layer = 4;
pixel_y = 32
},
-/obj/structure/disposalpipe/junction{
- dir = 8;
- icon_state = "pipe-j2"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/junction{
+ dir = 8;
+ icon_state = "pipe-j2"
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "neutralcorner"
@@ -42381,6 +42215,7 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/hallway/primary/central)
"bLv" = (
@@ -42484,21 +42319,18 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/structure/window/reinforced{
- dir = 8
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
},
-/turf/simulated/floor/carpet,
-/area/crew_quarters/theatre)
+/area/medical/chemistry)
"bLI" = (
/obj/structure/chair/wood/wings,
/turf/simulated/floor/carpet,
/area/crew_quarters/theatre)
"bLJ" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/carpet,
/area/crew_quarters/theatre)
"bLK" = (
@@ -42514,9 +42346,6 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/turf/simulated/floor/wood,
/area/crew_quarters/theatre)
"bLM" = (
@@ -42530,9 +42359,6 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/turf/simulated/floor/plating,
/area/crew_quarters/theatre)
"bLO" = (
@@ -42555,10 +42381,6 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
- },
/obj/machinery/atmospherics/pipe/manifold/hidden/cyan,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel{
@@ -42566,12 +42388,13 @@
},
/area/hallway/primary/starboard)
"bLQ" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 1;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "caution"
@@ -42597,15 +42420,15 @@
name = "Station Intercom (General)";
pixel_y = 21
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "neutralcorner"
@@ -42614,36 +42437,36 @@
name = "\improper Command Hallway"
})
"bLT" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
dir = 4
},
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "neutralcorner"
},
/area/atmos)
"bLU" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/binary/volume_pump/on{
dir = 8;
name = "Air to External"
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "neutralcorner"
},
/area/atmos)
"bLV" = (
-/obj/structure/disposalpipe/segment{
+/obj/machinery/atmospherics/pipe/simple/visible/cyan{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/visible/cyan{
+/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/simulated/floor/plasteel{
@@ -42651,10 +42474,6 @@
},
/area/atmos)
"bLW" = (
-/obj/machinery/disposal,
-/obj/structure/disposalpipe/trunk{
- dir = 8
- },
/obj/machinery/firealarm{
dir = 1;
pixel_y = -24
@@ -42669,6 +42488,10 @@
/obj/machinery/atmospherics/pipe/simple/visible/cyan{
dir = 4
},
+/obj/machinery/disposal,
+/obj/structure/disposalpipe/trunk{
+ dir = 8
+ },
/turf/simulated/floor/plasteel{
dir = 6;
icon_state = "caution"
@@ -43290,37 +43113,19 @@
name = "\improper Teleporter Room"
})
"bNx" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable/yellow{
d1 = 1;
- d2 = 8;
- icon_state = "1-8"
+ d2 = 2;
+ icon_state = "1-2"
},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
- dir = 5;
- icon_state = "cafeteria"
+ icon_state = "white"
},
-/area/crew_quarters/kitchen)
-"bNz" = (
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- dir = 5;
- icon_state = "cafeteria"
- },
-/area/crew_quarters/kitchen)
+/area/medical/medbay3)
"bNA" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -29
@@ -43341,9 +43146,6 @@
name = "Kitchen Cold Room";
req_access_txt = "28"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
@@ -43355,9 +43157,6 @@
},
/area/crew_quarters/kitchen)
"bNC" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/light_switch{
pixel_y = -26
},
@@ -43370,9 +43169,6 @@
},
/area/crew_quarters/kitchen)
"bND" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/alarm{
dir = 1;
pixel_y = -24
@@ -43400,12 +43196,12 @@
/turf/simulated/floor/wood,
/area/crew_quarters/theatre)
"bNF" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/maintenance/starboard)
"bNG" = (
@@ -43444,9 +43240,6 @@
},
/area/hallway/primary/starboard)
"bNK" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/plasticflaps{
opacity = 1
},
@@ -43466,12 +43259,12 @@
/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
dir = 4
},
-/turf/simulated/floor/plasteel,
-/area/atmos)
-"bNL" = (
/obj/structure/disposalpipe/segment{
dir = 4
},
+/turf/simulated/floor/plasteel,
+/area/atmos)
+"bNL" = (
/obj/machinery/door/window/northleft{
dir = 4;
name = "Inner Pipe Access";
@@ -43491,6 +43284,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/atmos)
"bNM" = (
@@ -43635,8 +43431,8 @@
name = "Teleport Access";
req_one_access_txt = "17;19"
},
-/obj/structure/disposalpipe/segment,
/obj/effect/decal/warning_stripes/yellow,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/teleporter{
name = "\improper Teleporter Room"
@@ -43826,10 +43622,6 @@
d2 = 8;
icon_state = "2-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
- },
/obj/effect/decal/warning_stripes/west,
/turf/simulated/floor/plating,
/area/maintenance/starboard)
@@ -44057,6 +43849,7 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/hallway/primary/central)
"bOX" = (
@@ -44232,8 +44025,8 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/structure/disposalpipe/segment,
/obj/effect/decal/warning_stripes/yellow,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/teleporter{
name = "\improper Teleporter Room"
@@ -44445,10 +44238,6 @@
},
/area/security/podbay)
"bPO" = (
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
- },
/obj/structure/foodcart,
/turf/simulated/floor/plasteel{
icon_state = "showroomfloor"
@@ -44781,6 +44570,7 @@
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/hallway/primary/central)
"bQI" = (
@@ -44908,6 +44698,7 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/wood,
/area/crew_quarters/theatre)
"bQV" = (
@@ -45460,8 +45251,8 @@
d2 = 4;
icon_state = "1-4"
},
-/obj/structure/disposalpipe/segment,
/obj/effect/decal/warning_stripes/yellow,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/teleporter{
name = "\improper Teleporter Room"
@@ -45653,32 +45444,26 @@
},
/area/crew_quarters/kitchen)
"bSv" = (
-/obj/machinery/disposal,
-/obj/structure/disposalpipe/trunk{
- dir = 4
- },
/obj/machinery/light{
dir = 1
},
+/obj/machinery/disposal,
+/obj/structure/disposalpipe/trunk{
+ dir = 2
+ },
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "cafeteria"
},
/area/crew_quarters/kitchen)
"bSw" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
- dir = 5;
- icon_state = "cafeteria"
+ dir = 8;
+ icon_state = "whiteblue"
},
-/area/crew_quarters/kitchen)
+/area/medical/medbay3)
"bSx" = (
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
- },
/obj/structure/sink/kitchen{
pixel_y = 28
},
@@ -45725,18 +45510,15 @@
/turf/simulated/floor/wood,
/area/crew_quarters/theatre)
"bSC" = (
-/obj/structure/disposalpipe/segment,
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
+/obj/structure/disposalpipe/segment{
+ dir = 1;
+ icon_state = "pipe-c"
},
-/obj/effect/spawner/lootdrop{
- loot = list(/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes);
- name = "maint grille or trash spawner"
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "whiteblue"
},
-/turf/simulated/floor/plating,
-/area/maintenance/starboard)
+/area/medical/medbay3)
"bSD" = (
/obj/machinery/door/poddoor{
density = 0;
@@ -45887,6 +45669,7 @@
name = "Disposals Chute";
pixel_x = -1
},
+/obj/effect/decal/warning_stripes/yellow/hollow,
/obj/machinery/disposal/deliveryChute{
dir = 8;
name = "disposals chute";
@@ -45895,7 +45678,6 @@
/obj/structure/disposalpipe/trunk{
dir = 8
},
-/obj/effect/decal/warning_stripes/yellow/hollow,
/turf/simulated/floor/plasteel,
/area/teleporter{
name = "\improper Teleporter Room"
@@ -45946,25 +45728,6 @@
icon_state = "dark"
},
/area/medical/morgue)
-"bSY" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/medical{
- name = "Morgue";
- req_access_txt = "6"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/medical/morgue)
"bSZ" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/medical{
@@ -45977,6 +45740,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -46000,9 +45766,6 @@
},
/area/medical/morgue)
"bTc" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
@@ -46024,9 +45787,6 @@
/obj/structure/chair/wood/wings{
dir = 1
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/turf/simulated/floor/carpet,
/area/crew_quarters/theatre)
"bTe" = (
@@ -46045,12 +45805,11 @@
},
/area/medical/paramedic)
"bTf" = (
-/obj/structure/table/reinforced,
-/obj/item/flashlight,
-/obj/item/radio,
-/obj/machinery/camera{
- c_tag = "Engineering Equipment East";
- dir = 8
+/obj/machinery/computer/security{
+ network = list("SS13","Research Outpost","Mining Outpost")
+ },
+/obj/machinery/light{
+ dir = 4
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -46062,6 +45821,12 @@
d2 = 8;
icon_state = "1-8"
},
+/obj/effect/landmark/start{
+ name = "Security Pod Pilot"
+ },
+/obj/structure/chair/office/dark{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -46086,14 +45851,14 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
- },
/obj/effect/decal/warning_stripes/northeast,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
},
+/obj/structure/disposalpipe/segment{
+ dir = 1;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel,
/area/teleporter{
name = "\improper Teleporter Room"
@@ -46428,6 +46193,7 @@
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/wood,
/area/crew_quarters/theatre)
"bTR" = (
@@ -46504,7 +46270,6 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "cafeteria"
@@ -46580,6 +46345,7 @@
/area/maintenance/starboard)
"bUq" = (
/obj/vehicle/ambulance,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "whiteblue"
@@ -46615,15 +46381,21 @@
},
/area/atmos)
"bUu" = (
-/obj/structure/disposalpipe/segment{
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/disposalpipe/sortjunction{
dir = 2;
- icon_state = "pipe-c"
+ icon_state = "pipe-j2s";
+ name = "Robotics Junction";
+ sortType = 14
},
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "neutralcorner"
- },
-/area/hallway/primary/port)
+/turf/simulated/floor/plasteel,
+/area/hallway/primary/aft)
"bUv" = (
/obj/machinery/atmospherics/binary/pump{
dir = 0;
@@ -46703,9 +46475,6 @@
name = "Arrivals"
})
"bUC" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 9
},
@@ -47049,7 +46818,6 @@
/turf/simulated/floor/plasteel,
/area/gateway)
"bVi" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/door/airlock/maintenance{
req_one_access_txt = "1;4;38;12"
},
@@ -47122,6 +46890,7 @@
/obj/machinery/door/airlock/public/glass{
name = "Dormitories"
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "neutralcorner"
@@ -47140,6 +46909,9 @@
/obj/effect/landmark/start{
name = "Cook"
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "cafeteria"
},
@@ -47153,8 +46925,8 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/structure/disposalpipe/segment,
/obj/item/cigbutt,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/maintenance/aft)
"bVs" = (
@@ -47177,6 +46949,9 @@
/area/crew_quarters/kitchen)
"bVt" = (
/obj/machinery/kitchen_machine/candy_maker,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "cafeteria"
@@ -47258,6 +47033,10 @@
dir = 8
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment{
+ dir = 1;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/wood,
/area/crew_quarters/theatre)
"bVC" = (
@@ -47273,9 +47052,9 @@
},
/area/medical/research)
"bVD" = (
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/junction{
+ dir = 8;
+ icon_state = "pipe-j2"
},
/turf/simulated/floor/wood,
/area/crew_quarters/theatre)
@@ -47444,17 +47223,15 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/sortjunction{
- dir = 8;
- name = "Cargo warehouse";
- sortType = 2
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/hallway/primary/port)
"bVX" = (
@@ -47602,7 +47379,6 @@
name = "Port Maintenance"
})
"bWp" = (
-/obj/structure/disposalpipe/segment,
/obj/effect/spawner/window/reinforced,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -47865,11 +47641,11 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/structure/disposalpipe/sortjunction{
- dir = 2;
- sortType = 18
- },
/obj/effect/decal/warning_stripes/west,
+/obj/structure/disposalpipe/segment{
+ dir = 2;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plating,
/area/maintenance/starboard)
"bWU" = (
@@ -47971,6 +47747,9 @@
/obj/item/reagent_containers/glass/beaker{
pixel_x = 5
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "cafeteria"
@@ -47978,11 +47757,13 @@
/area/crew_quarters/kitchen)
"bXi" = (
/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
+ dir = 4
},
-/turf/simulated/floor/plating,
-/area/maintenance/starboard)
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "purple"
+ },
+/area/hallway/primary/aft)
"bXj" = (
/obj/machinery/atmospherics/pipe/simple/visible/green,
/obj/machinery/atmospherics/binary/pump{
@@ -48275,10 +48056,10 @@
network = list("Turbine")
},
/obj/structure/lattice,
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/insulated{
dir = 5
},
+/obj/structure/disposalpipe/segment,
/turf/space,
/area/space/nearstation)
"bXP" = (
@@ -48291,11 +48072,15 @@
},
/area/hallway/primary/central)
"bXQ" = (
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/plasteel{
- icon_state = "vault"
+/obj/structure/disposalpipe/segment{
+ dir = 8;
+ icon_state = "pipe-c"
},
-/area/crew_quarters/locker)
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "whiteblue"
+ },
+/area/medical/medbay3)
"bXR" = (
/obj/item/taperecorder,
/obj/item/camera,
@@ -48550,6 +48335,10 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 8;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "cafeteria"
@@ -48565,6 +48354,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "cafeteria"
@@ -48613,21 +48405,15 @@
name = "Port Maintenance"
})
"bYy" = (
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
- },
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/turf/simulated/floor/plating,
-/area/maintenance/starboard)
-"bYA" = (
+/obj/effect/decal/warning_stripes/north,
/obj/structure/disposalpipe/segment{
dir = 4
},
+/turf/simulated/floor/plasteel,
+/area/hallway/secondary/exit{
+ name = "\improper Departure Lounge"
+ })
+"bYA" = (
/obj/structure/cable/yellow{
d1 = 2;
d2 = 8;
@@ -48638,9 +48424,6 @@
},
/area/hydroponics)
"bYB" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
@@ -48652,9 +48435,6 @@
},
/area/hydroponics)
"bYC" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
@@ -48678,16 +48458,6 @@
icon_state = "cafeteria"
},
/area/crew_quarters/kitchen)
-"bYF" = (
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
- },
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "neutralcorner"
- },
-/area/crew_quarters/locker)
"bYG" = (
/obj/machinery/portable_atmospherics/canister,
/turf/simulated/floor/plating,
@@ -48959,13 +48729,13 @@
/turf/simulated/floor/wood,
/area/library)
"bZg" = (
-/obj/machinery/disposal,
-/obj/structure/disposalpipe/trunk,
/obj/item/radio/intercom{
dir = 4;
name = "Station Intercom (General)";
pixel_x = 27
},
+/obj/machinery/disposal,
+/obj/structure/disposalpipe/trunk,
/turf/simulated/floor/wood,
/area/library)
"bZh" = (
@@ -49116,9 +48886,6 @@
name = "\improper Teleporter Room"
})
"bZB" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 9
},
@@ -49130,9 +48897,6 @@
},
/area/hydroponics)
"bZC" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
@@ -49155,18 +48919,6 @@
/obj/effect/decal/warning_stripes/south,
/turf/simulated/floor/plasteel,
/area/gateway)
-"bZF" = (
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
- },
-/obj/structure/cable/yellow{
- d1 = 2;
- d2 = 4;
- icon_state = "2-4"
- },
-/turf/simulated/floor/plating,
-/area/maintenance/starboard)
"bZG" = (
/obj/machinery/alarm{
dir = 4;
@@ -49310,15 +49062,15 @@
/turf/simulated/floor/wood,
/area/library)
"cac" = (
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
- },
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
+/obj/structure/disposalpipe/segment{
+ dir = 1;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/wood,
/area/library)
"cad" = (
@@ -49326,14 +49078,14 @@
name = "Library Maintenance";
req_one_access_txt = "12;37"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plating,
/area/maintenance/fpmaint2{
name = "Port Maintenance"
@@ -49402,11 +49154,6 @@
/area/maintenance/fpmaint2{
name = "Port Maintenance"
})
-"cal" = (
-/obj/structure/disposalpipe/segment,
-/obj/effect/decal/warning_stripes/north,
-/turf/simulated/floor/plasteel,
-/area/crew_quarters/kitchen)
"can" = (
/obj/machinery/firealarm{
pixel_y = 28
@@ -49421,10 +49168,6 @@
/turf/simulated/floor/plasteel,
/area/crew_quarters/kitchen)
"cap" = (
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
- },
/obj/effect/landmark{
name = "blobstart"
},
@@ -49508,6 +49251,10 @@
/obj/machinery/newscaster{
pixel_x = -30
},
+/obj/structure/disposalpipe/segment{
+ dir = 4;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -49518,13 +49265,16 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/structure/disposalpipe/segment,
/obj/machinery/navbeacon{
codes_txt = "patrol;next_patrol=11-Command-Port";
location = "10.2-Aft-Port-Corner"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/junction{
+ dir = 1;
+ icon_state = "pipe-j2"
+ },
/turf/simulated/floor/plasteel,
/area/hallway/primary/central)
"caD" = (
@@ -49613,11 +49363,11 @@
d2 = 8;
icon_state = "2-8"
},
+/obj/effect/decal/warning_stripes/west,
/obj/structure/disposalpipe/segment{
dir = 2;
icon_state = "pipe-c"
},
-/obj/effect/decal/warning_stripes/west,
/turf/simulated/floor/plating,
/area/maintenance/fpmaint2{
name = "Port Maintenance"
@@ -49687,10 +49437,6 @@
},
/area/hallway/primary/central)
"caS" = (
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
- },
/obj/machinery/door/window/eastright{
dir = 1;
name = "Kitchen Delivery";
@@ -49700,11 +49446,16 @@
/turf/simulated/floor/plasteel,
/area/crew_quarters/kitchen)
"caT" = (
+/obj/structure/closet{
+ name = "spare parts locker"
+ },
+/obj/item/rack_parts,
+/obj/item/rack_parts,
+/obj/item/wrench,
/obj/structure/window/reinforced{
dir = 4
},
/obj/effect/decal/warning_stripes/yellow,
-/obj/machinery/vending/chefdrobe,
/turf/simulated/floor/plasteel,
/area/crew_quarters/kitchen)
"caU" = (
@@ -49716,27 +49467,11 @@
/obj/structure/plasticflaps{
opacity = 1
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/effect/decal/warning_stripes/yellow/hollow,
/turf/simulated/floor/plasteel,
/area/crew_quarters/kitchen)
-"caV" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/door/airlock/maintenance{
- name = "Hydroponics Maintenance";
- req_access_txt = "35"
- },
-/turf/simulated/floor/plating,
-/area/hydroponics)
"caW" = (
/obj/item/trash/candy,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/item/clothing/accessory/stethoscope,
/turf/simulated/floor/plating,
/area/maintenance/aft)
@@ -49751,9 +49486,6 @@
d2 = 4;
icon_state = "1-4"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/turf/simulated/floor/plating,
/area/maintenance/starboard)
"caY" = (
@@ -49775,6 +49507,7 @@
/area/crew_quarters/hor)
"caZ" = (
/mob/living/simple_animal/mouse,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/maintenance/starboard)
"cba" = (
@@ -49889,8 +49622,12 @@
/turf/simulated/floor/engine/co2,
/area/atmos)
"cbn" = (
+/obj/structure/table/glass,
+/obj/item/book/manual/sop_service{
+ pixel_x = 2;
+ pixel_y = 5
+ },
/obj/effect/decal/warning_stripes/south,
-/obj/machinery/vending/hydrodrobe,
/turf/simulated/floor/plasteel,
/area/hydroponics)
"cbo" = (
@@ -49965,7 +49702,9 @@
/area/maintenance/aft)
"cbx" = (
/obj/machinery/disposal,
-/obj/structure/disposalpipe/trunk,
+/obj/structure/disposalpipe/trunk{
+ dir = 1
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -49981,13 +49720,19 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
},
+/obj/structure/disposalpipe/segment,
+/obj/structure/disposalpipe/sortjunction{
+ dir = 1;
+ icon_state = "pipe-j2s";
+ name = "Library Junction";
+ sortType = 16
+ },
/turf/simulated/floor/plasteel,
/area/hallway/primary/central)
"cbC" = (
@@ -50096,6 +49841,10 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 2;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "green"
@@ -50367,6 +50116,12 @@
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
+/obj/structure/disposalpipe/sortjunction{
+ dir = 2;
+ icon_state = "pipe-j2s";
+ name = "Hydroponics Junction";
+ sortType = 21
+ },
/turf/simulated/floor/plasteel,
/area/hallway/primary/central)
"ccs" = (
@@ -50427,7 +50182,6 @@
/turf/simulated/floor/plating,
/area/maintenance/aft)
"ccz" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
@@ -50444,27 +50198,10 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/engine/engineering)
-"ccA" = (
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/simulated/floor/plating,
-/area/maintenance/fpmaint2{
- name = "Port Maintenance"
- })
"ccB" = (
-/obj/structure/disposalpipe/sortjunction{
- dir = 4;
- icon_state = "pipe-j2s";
- sortType = 16
- },
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
@@ -50475,6 +50212,10 @@
d2 = 4;
icon_state = "1-4"
},
+/obj/structure/disposalpipe/segment{
+ dir = 1;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plating,
/area/maintenance/fpmaint2{
name = "Port Maintenance"
@@ -50485,12 +50226,12 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/door/airlock/maintenance{
req_one_access_txt = "12;5;39;37;25;28"
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plating,
/area/maintenance/fpmaint2{
name = "Port Maintenance"
@@ -50501,9 +50242,8 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/junction{
- dir = 4;
- icon_state = "pipe-j2"
+/obj/structure/disposalpipe/segment{
+ dir = 4
},
/turf/simulated/floor/plasteel{
icon_state = "vault"
@@ -50516,7 +50256,8 @@
icon_state = "4-8"
},
/obj/structure/disposalpipe/segment{
- dir = 4
+ dir = 8;
+ icon_state = "pipe-c"
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -50529,14 +50270,14 @@
d2 = 8;
icon_state = "1-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
- },
/obj/machinery/camera{
c_tag = "Central Primary Hallway - Aft-Port Corner";
dir = 1
},
+/obj/structure/disposalpipe/segment{
+ dir = 1;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralcorner"
@@ -50550,6 +50291,9 @@
dir = 1;
pixel_y = -24
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralcorner"
@@ -50569,19 +50313,6 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
- },
-/turf/simulated/floor/plasteel{
- icon_state = "neutralcorner"
- },
-/area/hallway/primary/central)
-"ccS" = (
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
- },
/turf/simulated/floor/plasteel{
icon_state = "neutralcorner"
},
@@ -50607,6 +50338,9 @@
dir = 1;
pixel_y = -24
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "neutralcorner"
},
@@ -50617,6 +50351,7 @@
d2 = 2;
icon_state = "1-2"
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 6;
icon_state = "green"
@@ -50675,10 +50410,6 @@
/turf/simulated/floor/plasteel,
/area/hydroponics)
"cdi" = (
-/obj/structure/disposalpipe/sortjunction{
- dir = 2;
- sortType = 20
- },
/obj/structure/cable/yellow{
d1 = 2;
d2 = 4;
@@ -50716,6 +50447,10 @@
/obj/effect/decal/warning_stripes/arrow{
dir = 1
},
+/obj/structure/disposalpipe/segment{
+ dir = 2;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralcorner"
@@ -50728,8 +50463,7 @@
icon_state = "2-4"
},
/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
+ dir = 4
},
/turf/simulated/floor/plating,
/area/maintenance/starboard)
@@ -50746,9 +50480,6 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable/yellow{
d1 = 2;
d2 = 4;
@@ -50757,17 +50488,21 @@
/obj/machinery/atmospherics/pipe/simple/visible/yellow{
dir = 6
},
-/turf/simulated/floor/plating,
-/area/maintenance/starboard)
-"cdq" = (
/obj/structure/disposalpipe/segment{
dir = 4
},
+/turf/simulated/floor/plating,
+/area/maintenance/starboard)
+"cdq" = (
/obj/structure/cable/yellow{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
+/obj/structure/disposalpipe/segment{
+ dir = 4;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -50798,10 +50533,10 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment{
+/obj/machinery/atmospherics/pipe/simple/visible/yellow{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/visible/yellow{
+/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/simulated/floor/plating,
@@ -50812,13 +50547,13 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/visible/purple,
/obj/machinery/atmospherics/pipe/simple/visible/yellow{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "caution"
@@ -50830,10 +50565,10 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment{
+/obj/machinery/atmospherics/pipe/simple/visible/yellow{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/visible/yellow{
+/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/simulated/floor/plasteel,
@@ -50844,13 +50579,13 @@
d2 = 8;
icon_state = "4-8"
},
+/obj/machinery/atmospherics/pipe/simple/visible/yellow{
+ dir = 4
+ },
/obj/structure/disposalpipe/segment{
dir = 8;
icon_state = "pipe-c"
},
-/obj/machinery/atmospherics/pipe/simple/visible/yellow{
- dir = 4
- },
/turf/simulated/floor/plasteel,
/area/atmos)
"cdw" = (
@@ -50947,6 +50682,9 @@
c_tag = "Central Primary Hallway - Aft-Starboard Corner";
dir = 1
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "neutralcorner"
},
@@ -50979,6 +50717,7 @@
/obj/structure/extinguisher_cabinet{
pixel_x = -27
},
+/obj/item/storage/backpack/satchel_hyd,
/turf/simulated/floor/plasteel{
icon_state = "hydrofloor"
},
@@ -51061,15 +50800,17 @@
name = "Medbay Storage"
})
"cdU" = (
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
- },
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
+/obj/structure/disposalpipe/sortjunction{
+ dir = 4;
+ icon_state = "pipe-j2s";
+ name = "Medbay Junction";
+ sortType = 9
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "whiteblue"
@@ -51148,7 +50889,6 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "purplecorner"
},
@@ -51167,13 +50907,13 @@
},
/area/hallway/primary/central)
"cej" = (
+/obj/machinery/newscaster{
+ pixel_y = -29
+ },
/obj/structure/disposalpipe/trunk{
dir = 1
},
/obj/machinery/disposal,
-/obj/machinery/newscaster{
- pixel_y = -29
- },
/turf/simulated/floor/plasteel{
icon_state = "vault"
},
@@ -51182,6 +50922,7 @@
/obj/machinery/door/airlock/maintenance{
req_one_access_txt = "12;7;35;8;47"
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/maintenance/aft)
"cel" = (
@@ -51196,6 +50937,9 @@
d2 = 8;
icon_state = "4-8"
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -51280,6 +51024,7 @@
/area/maintenance/aft)
"cev" = (
/obj/structure/closet/secure_closet/hydroponics,
+/obj/item/storage/backpack/satchel_hyd,
/turf/simulated/floor/plasteel{
icon_state = "hydrofloor"
},
@@ -51311,37 +51056,6 @@
d2 = 4;
icon_state = "1-4"
},
-/obj/structure/disposalpipe/junction{
- dir = 2;
- icon_state = "pipe-j2"
- },
-/turf/simulated/floor/plating,
-/area/maintenance/starboard)
-"cez" = (
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/effect/spawner/lootdrop{
- loot = list(/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes);
- name = "maint grille or trash spawner"
- },
-/turf/simulated/floor/plating,
-/area/maintenance/starboard)
-"ceA" = (
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 8;
- icon_state = "1-8"
- },
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
- },
/turf/simulated/floor/plating,
/area/maintenance/starboard)
"ceD" = (
@@ -51401,6 +51115,9 @@
d2 = 8;
icon_state = "1-8"
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "whiteblue"
@@ -51447,9 +51164,6 @@
/obj/structure/plasticflaps{
opacity = 1
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/door/window/northleft{
dir = 8;
name = "MuleBot Access";
@@ -51466,17 +51180,21 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/effect/decal/warning_stripes/east,
/obj/machinery/atmospherics/pipe/simple/visible/yellow{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plating,
/area/maintenance/starboard)
"ceS" = (
/obj/structure/bed/amb_trolley,
+/obj/structure/disposalpipe/segment{
+ dir = 8;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -51546,7 +51264,6 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/structure/disposalpipe/segment,
/obj/machinery/door/airlock/maintenance{
req_one_access_txt = "12;5;39;25;28"
},
@@ -51787,7 +51504,6 @@
icon_state = "1-2"
},
/obj/machinery/door/firedoor,
-/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "whitehall"
},
@@ -51809,13 +51525,13 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/effect/decal/warning_stripes/north,
/obj/machinery/atmospherics/pipe/simple/visible/yellow{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plating,
/area/maintenance/starboard)
"cfz" = (
@@ -51826,7 +51542,7 @@
name = "Station Intercom (Medbay)";
pixel_y = 30
},
-/obj/machinery/vending/medidrobe,
+/obj/structure/closet/wardrobe/medical_white,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "whiteblue"
@@ -51840,6 +51556,7 @@
d2 = 2;
icon_state = "1-2"
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "hydrofloor"
},
@@ -51988,6 +51705,7 @@
/obj/machinery/light_switch{
pixel_x = -26
},
+/obj/item/storage/backpack/satchel_hyd,
/turf/simulated/floor/plasteel{
icon_state = "hydrofloor"
},
@@ -52028,16 +51746,6 @@
"cfW" = (
/turf/simulated/floor/bluegrid,
/area/maintenance/aft)
-"cfX" = (
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/obj/structure/disposalpipe/segment,
-/obj/effect/decal/warning_stripes/south,
-/turf/simulated/floor/plating,
-/area/maintenance/aft)
"cfY" = (
/obj/structure/closet/firecloset,
/turf/simulated/floor/plating,
@@ -52071,9 +51779,6 @@
/turf/simulated/floor/plasteel,
/area/atmos)
"cgd" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock{
name = "Hydroponics Backroom";
@@ -52088,37 +51793,16 @@
},
/turf/simulated/floor/plasteel,
/area/hydroponics)
-"cge" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "whiteblue"
- },
-/area/medical/medbay2{
- name = "Medbay Storage"
- })
-"cgf" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- icon_state = "white"
- },
-/area/medical/medbay2{
- name = "Medbay Storage"
- })
"cgh" = (
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
- },
/obj/structure/cable/yellow{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
+/obj/structure/disposalpipe/segment{
+ dir = 4;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plating,
/area/maintenance/maintcentral)
"cgi" = (
@@ -52147,9 +51831,6 @@
/turf/simulated/floor/plating/airless,
/area/maintenance/portsolar)
"cgl" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/effect/decal/warning_stripes/yellow/hollow,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -52419,6 +52100,10 @@
d2 = 4;
icon_state = "1-4"
},
+/obj/structure/disposalpipe/segment{
+ dir = 1;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel{
icon_state = "hydrofloor"
},
@@ -52429,6 +52114,9 @@
d2 = 8;
icon_state = "4-8"
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "hydrofloor"
},
@@ -52444,29 +52132,29 @@
name = "Hydroponics";
req_access_txt = "35"
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "hydrofloor"
},
/area/hydroponics)
"cgQ" = (
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
- },
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
+/obj/structure/disposalpipe/segment{
+ dir = 2;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel{
dir = 10;
icon_state = "green"
},
/area/hydroponics)
"cgR" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
@@ -52478,9 +52166,6 @@
},
/area/hydroponics)
"cgS" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
@@ -52492,9 +52177,6 @@
},
/area/hydroponics)
"cgT" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
@@ -52530,10 +52212,10 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/machinery/disposal,
/obj/structure/sign/deathsposal{
pixel_y = 32
},
+/obj/machinery/disposal,
/obj/structure/disposalpipe/trunk,
/turf/simulated/floor/plating,
/area/maintenance/incinerator)
@@ -52660,24 +52342,6 @@
d2 = 4;
icon_state = "2-4"
},
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
- },
-/turf/simulated/floor/plating,
-/area/maintenance/fpmaint2{
- name = "Port Maintenance"
- })
-"chp" = (
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
/area/maintenance/fpmaint2{
name = "Port Maintenance"
@@ -52739,7 +52403,6 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/structure/disposalpipe/segment,
/obj/effect/decal/warning_stripes/north,
/turf/simulated/floor/plating,
/area/maintenance/aft)
@@ -52760,48 +52423,17 @@
/obj/effect/spawner/lootdrop/maintenance,
/turf/simulated/floor/plating,
/area/maintenance/aft)
-"chA" = (
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/obj/structure/disposalpipe/sortjunction{
- dir = 1;
- sortType = 9
- },
-/turf/simulated/floor/plating,
-/area/maintenance/aft)
"chB" = (
/obj/item/cigbutt,
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
- },
/obj/effect/decal/warning_stripes/east,
/turf/simulated/floor/plating,
/area/maintenance/aft)
"chC" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/door/airlock/maintenance{
req_one_access_txt = "12;5"
},
/turf/simulated/floor/plating,
/area/maintenance/aft)
-"chD" = (
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/obj/structure/disposalpipe/sortjunction{
- sortType = 21
- },
-/obj/effect/decal/warning_stripes/west,
-/turf/simulated/floor/plating,
-/area/maintenance/starboard)
"chE" = (
/obj/machinery/door/airlock/research/glass{
autoclose = 0;
@@ -52852,6 +52484,7 @@
d2 = 2;
icon_state = "1-2"
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -52867,6 +52500,7 @@
id_tag = "paramedic";
name = "Paramedic Garage"
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/medical/paramedic)
"chO" = (
@@ -52880,6 +52514,7 @@
name = "Hydroponics Storage";
req_access_txt = "35"
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "hydrofloor"
},
@@ -52981,12 +52616,12 @@
},
/area/medical/paramedic)
"chX" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "floorgrime"
},
@@ -53034,6 +52669,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -53045,7 +52683,6 @@
icon_state = "1-2"
},
/obj/machinery/hologram/holopad,
-/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -53061,6 +52698,7 @@
d2 = 2;
icon_state = "1-2"
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -53094,6 +52732,7 @@
loot = list(/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes);
name = "maint grille or trash spawner"
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/maintenance/aft)
"cio" = (
@@ -53173,10 +52812,10 @@
},
/area/atmos)
"ciw" = (
+/obj/effect/decal/warning_stripes/east,
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/effect/decal/warning_stripes/east,
/turf/simulated/floor/plating,
/area/maintenance/aft)
"ciy" = (
@@ -53189,10 +52828,6 @@
name = "\improper Warehouse"
})
"ciz" = (
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/universal{
dir = 4
},
@@ -53519,6 +53154,10 @@
name = "Medbay Storage"
})
"ciZ" = (
+/obj/machinery/light_switch{
+ pixel_y = -28
+ },
+/obj/effect/decal/warning_stripes/northeast,
/obj/machinery/disposal{
pixel_x = -2;
pixel_y = -2
@@ -53526,10 +53165,6 @@
/obj/structure/disposalpipe/trunk{
dir = 1
},
-/obj/machinery/light_switch{
- pixel_y = -28
- },
-/obj/effect/decal/warning_stripes/northeast,
/turf/simulated/floor/plasteel,
/area/hydroponics)
"cja" = (
@@ -53748,6 +53383,7 @@
d2 = 2;
icon_state = "1-2"
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "whiteblue"
},
@@ -53756,15 +53392,15 @@
})
"cjB" = (
/obj/machinery/meter,
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
- },
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
+/obj/structure/disposalpipe/segment{
+ dir = 8;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel{
icon_state = "floorgrime"
},
@@ -53844,12 +53480,12 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/disposalpipe/junction{
+ dir = 2;
+ icon_state = "pipe-y"
+ },
/turf/simulated/floor/plasteel,
/area/hallway/primary/aft)
"cjL" = (
@@ -53858,13 +53494,13 @@
d2 = 4;
icon_state = "1-4"
},
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 2;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -53875,10 +53511,6 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
@@ -53974,10 +53606,6 @@
},
/area/maintenance/incinerator)
"ckc" = (
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
- },
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
@@ -53986,6 +53614,10 @@
/obj/machinery/atmospherics/pipe/simple/visible{
dir = 9
},
+/obj/structure/disposalpipe/segment{
+ dir = 4;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel{
icon_state = "floorgrime"
},
@@ -54117,7 +53749,6 @@
/turf/space,
/area/solar/port)
"cks" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/door/poddoor{
density = 0;
icon_state = "open";
@@ -54221,27 +53852,11 @@
icon_state = "white"
},
/area/medical/reception)
-"ckC" = (
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/obj/structure/disposalpipe/segment,
-/obj/effect/spawner/lootdrop{
- loot = list(/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes);
- name = "maint grille or trash spawner"
- },
-/turf/simulated/floor/plating,
-/area/maintenance/aft)
"ckD" = (
/obj/structure/grille,
/turf/simulated/floor/plating,
/area/maintenance/aft)
"ckE" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -30
@@ -54468,17 +54083,13 @@
"cla" = (
/obj/machinery/disposal,
/obj/structure/disposalpipe/trunk{
- dir = 4
+ dir = 1
},
/turf/simulated/floor/plasteel{
icon_state = "whitepurple"
},
/area/medical/research)
"clb" = (
-/obj/structure/disposalpipe/junction{
- dir = 4;
- icon_state = "pipe-j2"
- },
/turf/simulated/floor/plasteel{
icon_state = "whitepurple"
},
@@ -54502,10 +54113,6 @@
},
/area/medical/research)
"cld" = (
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel{
@@ -54582,25 +54189,12 @@
/area/quartermaster/sorting{
name = "\improper Warehouse"
})
-"clj" = (
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/simulated/floor/plating,
-/area/maintenance/aft)
"cll" = (
/obj/item/wrench,
+/obj/item/clothing/suit/apron,
+/obj/item/clothing/accessory/armband/hydro,
/obj/structure/table/glass,
/obj/effect/decal/warning_stripes/northwest,
-/obj/item/book/manual/sop_service{
- pixel_x = 2;
- pixel_y = 5
- },
/turf/simulated/floor/plasteel,
/area/hydroponics)
"clm" = (
@@ -54628,21 +54222,6 @@
/obj/effect/decal/cleanable/cobweb,
/turf/simulated/floor/plating,
/area/maintenance/aft)
-"clo" = (
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/effect/spawner/lootdrop{
- loot = list(/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes);
- name = "maint grille or trash spawner"
- },
-/turf/simulated/floor/plating,
-/area/maintenance/aft)
"clp" = (
/obj/structure/cable/yellow,
/obj/effect/spawner/window/reinforced,
@@ -54654,24 +54233,9 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/structure/disposalpipe/segment,
/obj/effect/decal/warning_stripes/west,
/turf/simulated/floor/plating,
/area/maintenance/starboard)
-"clr" = (
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/door/airlock/maintenance{
- req_access_txt = "12"
- },
-/turf/simulated/floor/plating,
-/area/maintenance/starboard)
"cls" = (
/obj/item/storage/firstaid/regular{
pixel_x = 3;
@@ -54721,7 +54285,6 @@
},
/area/maintenance/incinerator)
"clz" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
@@ -54730,6 +54293,7 @@
/obj/machinery/atmospherics/pipe/simple/visible/purple{
dir = 6
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "floorgrime"
},
@@ -55209,9 +54773,6 @@
/area/medical/exam_room)
"cmJ" = (
/obj/item/storage/box/lights/mixed,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 6
},
@@ -55268,7 +54829,6 @@
/turf/simulated/floor/plating,
/area/atmos)
"cmR" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/research{
id_tag = "ResearchFoyer";
@@ -55283,18 +54843,6 @@
icon_state = "whitepurple"
},
/area/medical/research)
-"cmS" = (
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/effect/decal/warning_stripes/north,
-/turf/simulated/floor/plating,
-/area/maintenance/aft)
"cmT" = (
/obj/structure/disposalpipe/segment{
dir = 1;
@@ -55304,11 +54852,6 @@
icon_state = "white"
},
/area/medical/reception)
-"cmU" = (
-/obj/structure/disposalpipe/segment,
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plating,
-/area/maintenance/fore)
"cmX" = (
/turf/simulated/wall,
/area/medical/exam_room)
@@ -55329,9 +54872,6 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/effect/decal/warning_stripes/south,
/turf/simulated/floor/plating,
/area/maintenance/aft)
@@ -55359,9 +54899,6 @@
},
/area/medical/morgue)
"cnc" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/effect/landmark/start{
name = "Coroner"
},
@@ -55372,6 +54909,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -55539,9 +55079,9 @@
d2 = 4;
icon_state = "2-4"
},
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/hallway/primary/aft)
"cnu" = (
@@ -55646,6 +55186,9 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 1
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -55754,24 +55297,9 @@
d2 = 8;
icon_state = "2-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/effect/decal/warning_stripes/east,
/turf/simulated/floor/plating,
/area/maintenance/aft)
-"cnP" = (
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/effect/decal/warning_stripes/west,
-/turf/simulated/floor/plating,
-/area/maintenance/starboard)
"cnQ" = (
/obj/effect/decal/warning_stripes/east,
/turf/simulated/floor/plating,
@@ -55887,7 +55415,6 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plating,
@@ -55922,29 +55449,6 @@
},
/turf/simulated/floor/plating,
/area/maintenance/aft)
-"cog" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/turf/simulated/floor/plating,
-/area/maintenance/aft)
-"coh" = (
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 8;
- icon_state = "1-8"
- },
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
- },
-/turf/simulated/floor/plating,
-/area/maintenance/aft)
"coi" = (
/obj/machinery/bodyscanner{
dir = 4
@@ -55990,9 +55494,6 @@
/area/medical/morgue)
"com" = (
/obj/machinery/light/small,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/morgue,
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -56036,9 +55537,6 @@
name = "Medbay Storage"
})
"coq" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
},
@@ -56058,25 +55556,14 @@
icon_state = "floorgrime"
},
/area/maintenance/incinerator)
-"cos" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/structure/morgue{
- dir = 8
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/medical/morgue)
"cot" = (
/obj/machinery/light_switch{
pixel_x = 23
},
-/obj/structure/disposalpipe/trunk{
- dir = 8
- },
/obj/machinery/disposal,
+/obj/structure/disposalpipe/trunk{
+ dir = 1
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -56260,20 +55747,11 @@
/obj/effect/decal/warning_stripes/north,
/turf/simulated/floor/plating,
/area/maintenance/starboard)
-"coJ" = (
+"coK" = (
/obj/structure/disposalpipe/segment{
dir = 4;
icon_state = "pipe-c"
},
-/obj/effect/decal/warning_stripes/west,
-/turf/simulated/floor/plasteel{
- icon_state = "white"
- },
-/area/toxins/lab)
-"coK" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -56397,7 +55875,6 @@
name = "\improper Command Hallway"
})
"cpd" = (
-/obj/structure/disposalpipe/segment,
/obj/effect/decal/warning_stripes/west,
/turf/simulated/floor/plasteel{
icon_state = "white"
@@ -56631,15 +56108,15 @@
/turf/simulated/floor/plating,
/area/maintenance/aft)
"cpC" = (
+/obj/structure/extinguisher_cabinet{
+ pixel_x = 24
+ },
/obj/machinery/disposal{
pixel_x = 5
},
/obj/structure/disposalpipe/trunk{
dir = 8
},
-/obj/structure/extinguisher_cabinet{
- pixel_x = 24
- },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "whitepurple"
@@ -56657,6 +56134,7 @@
d2 = 2;
icon_state = "1-2"
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "whitebluefull"
},
@@ -56959,6 +56437,7 @@
name = "Scientist"
},
/obj/effect/decal/warning_stripes/east,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -56975,7 +56454,6 @@
},
/area/toxins/lab)
"cqi" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/shower{
dir = 4
},
@@ -57049,8 +56527,8 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/structure/disposalpipe/segment,
/obj/item/flashlight,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/maintenance/aft)
"cqr" = (
@@ -57253,8 +56731,8 @@
/area/maintenance/incinerator)
"cqQ" = (
/obj/structure/lattice,
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/binary/pump/on,
+/obj/structure/disposalpipe/segment,
/turf/space,
/area/space/nearstation)
"cqR" = (
@@ -57405,6 +56883,7 @@
d2 = 2;
icon_state = "1-2"
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "whiteblue"
@@ -57591,7 +57070,6 @@
},
/area/hallway/primary/aft)
"crJ" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/sink{
dir = 8;
pixel_x = -12;
@@ -57606,6 +57084,7 @@
"crK" = (
/obj/machinery/hologram/holopad,
/obj/effect/decal/warning_stripes/east,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -57618,7 +57097,6 @@
},
/area/toxins/lab)
"crM" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/chair/stool,
/turf/simulated/floor/plasteel{
icon_state = "white"
@@ -57626,6 +57104,7 @@
/area/toxins/lab)
"crN" = (
/obj/effect/decal/warning_stripes/east,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -57737,24 +57216,24 @@
},
/area/medical/research)
"crY" = (
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 6
},
+/obj/structure/disposalpipe/segment{
+ dir = 4;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "cafeteria"
},
/area/medical/research)
"crZ" = (
-/obj/structure/disposalpipe/segment{
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/simulated/floor/plasteel{
@@ -57763,9 +57242,6 @@
},
/area/medical/research)
"csa" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/noticeboard{
pixel_y = -32
},
@@ -57778,6 +57254,9 @@
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 8
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "cafeteria"
@@ -58024,7 +57503,6 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/structure/disposalpipe/segment,
/obj/effect/spawner/lootdrop{
loot = list(/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes);
name = "maint grille or trash spawner"
@@ -58357,6 +57835,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -58425,7 +57904,6 @@
},
/area/medical/chemistry)
"csY" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/research{
id_tag = "";
@@ -58480,7 +57958,6 @@
/area/medical/research)
"ctc" = (
/obj/machinery/door/firedoor,
-/obj/structure/disposalpipe/segment,
/obj/machinery/door/airlock/research{
id_tag = "";
name = "Research Break Room";
@@ -58488,6 +57965,7 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "cafeteria"
@@ -58497,7 +57975,6 @@
/turf/simulated/wall,
/area/toxins/explab)
"ctf" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/shower{
dir = 4
},
@@ -58530,9 +58007,9 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/structure/disposalpipe/segment,
/obj/item/storage/box/lights/mixed,
/obj/effect/decal/warning_stripes/south,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/maintenance/aft)
"ctl" = (
@@ -58855,11 +58332,12 @@
},
/area/medical/exam_room)
"cui" = (
+/obj/structure/closet/wardrobe/chemistry_white,
+/obj/item/storage/backpack/satchel_chem,
/obj/effect/decal/warning_stripes/south,
/obj/structure/disaster_counter/chemistry{
pixel_y = 32
},
-/obj/machinery/vending/chemdrobe,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -58888,10 +58366,6 @@
},
/area/medical/exam_room)
"cul" = (
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel{
@@ -58905,24 +58379,11 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "whitepurple"
},
/area/medical/research)
-"cun" = (
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
- },
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "whitepurplecorner"
- },
-/area/medical/research)
"cuo" = (
/obj/structure/sign/nosmoking_2{
pixel_y = 32
@@ -58945,7 +58406,6 @@
/area/medical/research)
"cuq" = (
/obj/structure/table,
-/obj/structure/disposalpipe/segment,
/obj/item/folder/white,
/obj/item/disk/tech_disk,
/obj/item/disk/tech_disk,
@@ -58986,9 +58446,9 @@
},
/area/medical/research)
"cuu" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "whitepurple"
@@ -59019,9 +58479,9 @@
name = "Science Requests Console";
pixel_y = 30
},
+/obj/effect/decal/warning_stripes/south,
/obj/machinery/disposal,
/obj/structure/disposalpipe/trunk,
-/obj/effect/decal/warning_stripes/south,
/turf/simulated/floor/plasteel,
/area/toxins/explab)
"cuy" = (
@@ -59288,6 +58748,7 @@
d2 = 2;
icon_state = "1-2"
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -59373,10 +58834,6 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
@@ -59393,15 +58850,16 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 1;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -59412,16 +58870,16 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 2;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "whitepurple"
@@ -59483,23 +58941,6 @@
icon_state = "white"
},
/area/medical/research)
-"cvx" = (
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- icon_state = "white"
- },
-/area/medical/research)
"cvy" = (
/obj/structure/cable/yellow{
d1 = 4;
@@ -59569,35 +59010,16 @@
d2 = 8;
icon_state = "1-8"
},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
/obj/structure/disposalpipe/junction{
dir = 2;
icon_state = "pipe-j2"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- icon_state = "white"
- },
-/area/medical/research)
-"cvD" = (
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -59608,9 +59030,6 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/effect/landmark{
name = "lightsout"
},
@@ -59620,6 +59039,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -59630,19 +59052,16 @@
d2 = 8;
icon_state = "4-8"
},
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/obj/structure/disposalpipe/junction{
dir = 8
},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
/area/medical/research)
"cvH" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
@@ -59654,6 +59073,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -59669,16 +59091,16 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/junction{
- dir = 8;
- icon_state = "pipe-j2"
- },
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 1
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 1
},
+/obj/structure/disposalpipe/junction{
+ dir = 8;
+ icon_state = "pipe-j2"
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "whitepurple"
@@ -59686,9 +59108,6 @@
/area/medical/research)
"cvJ" = (
/obj/machinery/door/firedoor,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
@@ -59704,16 +59123,15 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "whitepurplefull"
},
/area/toxins/explab)
"cvK" = (
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
- },
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
@@ -59725,6 +59143,10 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 8;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "whitepurple"
@@ -60134,12 +59556,6 @@
icon_state = "white"
},
/area/medical/research)
-"cwM" = (
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/plasteel{
- icon_state = "white"
- },
-/area/medical/research)
"cwO" = (
/obj/structure/disposalpipe/segment{
dir = 4;
@@ -60150,25 +59566,25 @@
},
/area/medical/research)
"cwP" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
/area/medical/research)
"cwQ" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -60209,9 +59625,9 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 6;
icon_state = "whitepurple"
@@ -60380,11 +59796,11 @@
},
/area/medical/chemistry)
"cxB" = (
-/obj/machinery/disposal,
-/obj/structure/disposalpipe/trunk,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/machinery/disposal,
+/obj/structure/disposalpipe/trunk,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -60486,9 +59902,9 @@
d2 = 4;
icon_state = "1-4"
},
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/disposalpipe/junction,
/turf/simulated/floor/plasteel,
/area/hallway/primary/aft)
"cxL" = (
@@ -60507,7 +59923,6 @@
icon_state = "1-2"
},
/obj/machinery/door/firedoor,
-/obj/structure/disposalpipe/segment,
/obj/machinery/door/poddoor/shutters/preopen{
dir = 2;
id_tag = "toxins_blastdoor";
@@ -60520,6 +59935,7 @@
/obj/effect/decal/warning_stripes/yellow,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/toxins/storage)
"cxN" = (
@@ -60544,7 +59960,6 @@
/turf/simulated/floor/plasteel,
/area/toxins/lab)
"cxO" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/door/firedoor,
/turf/simulated/floor/plasteel{
dir = 5;
@@ -60565,8 +59980,8 @@
},
/area/medical/research)
"cxQ" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/door/firedoor,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -60679,8 +60094,8 @@
/turf/simulated/floor/plasteel,
/area/toxins/lab)
"cya" = (
-/obj/structure/disposalpipe/segment,
/obj/effect/decal/warning_stripes/north,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/toxins/lab)
"cyb" = (
@@ -60742,12 +60157,12 @@
/turf/simulated/floor/plating,
/area/maintenance/aft)
"cyk" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/door/airlock/maintenance{
name = "Research Lab Maintenance";
req_access_txt = "7"
},
/obj/effect/decal/warning_stripes/north,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/toxins/lab)
"cym" = (
@@ -60756,7 +60171,6 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/structure/disposalpipe/segment,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -60820,10 +60234,6 @@
/turf/simulated/floor/plating,
/area/medical/cmo)
"cyt" = (
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
- },
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
@@ -60834,6 +60244,11 @@
d2 = 4;
icon_state = "1-4"
},
+/obj/structure/disposalpipe/sortjunction{
+ dir = 1;
+ name = "Chemistry Junction";
+ sortType = 11
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -60843,42 +60258,41 @@
/turf/simulated/wall/r_wall,
/area/maintenance/incinerator)
"cyv" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "whitebluefull"
},
/area/medical/medbay3)
"cyw" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "whiteblue"
},
/area/medical/medbay3)
"cyx" = (
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
- },
/obj/structure/cable/yellow{
d1 = 2;
d2 = 8;
icon_state = "2-8"
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -60890,21 +60304,24 @@
name = "Chemistry Lab";
req_access_txt = "5; 33"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
/area/medical/chemistry)
"cyz" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/hologram/holopad,
+/obj/structure/disposalpipe/segment{
+ dir = 8;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -60961,11 +60378,12 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/structure/disposalpipe/junction{
- dir = 8
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/disposalpipe/junction{
+ dir = 2;
+ icon_state = "pipe-j2"
+ },
/turf/simulated/floor/plasteel,
/area/hallway/primary/aft)
"cyM" = (
@@ -60977,12 +60395,12 @@
},
/area/hallway/primary/aft)
"cyN" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/door/airlock{
name = "Aft Emergency Storage"
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plating,
/area/maintenance/aft)
"cyO" = (
@@ -60996,12 +60414,12 @@
/turf/simulated/floor/plasteel,
/area/toxins/explab)
"cyQ" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/door/airlock/maintenance{
req_one_access_txt = "7;47;29;12"
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plating,
/area/maintenance/aft)
"cyR" = (
@@ -61028,18 +60446,18 @@
/turf/simulated/floor/plating,
/area/maintenance/aft)
"cyV" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/door/airlock/maintenance{
name = "Research Maintenance";
req_one_access_txt = "7;47;29"
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plating,
/area/medical/research)
"cyW" = (
-/obj/structure/disposalpipe/junction{
- dir = 8
+/obj/structure/disposalpipe/segment{
+ dir = 4
},
/turf/simulated/floor/plasteel{
dir = 4;
@@ -61052,13 +60470,14 @@
d2 = 2;
icon_state = "1-2"
},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/disposalpipe/sortjunction{
dir = 8;
icon_state = "pipe-j2s";
+ name = "RD Junction";
sortType = 13
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -61104,9 +60523,6 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/effect/decal/warning_stripes/east,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -61135,9 +60551,6 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/chair{
dir = 1
},
@@ -61155,9 +60568,6 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/effect/decal/warning_stripes/southeastcorner,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -61216,15 +60626,14 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
/area/medical/surgeryobs)
"czo" = (
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
- },
/obj/structure/chair{
dir = 1
},
@@ -61245,6 +60654,10 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 1;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -61404,15 +60817,14 @@
/turf/simulated/wall,
/area/medical/genetics)
"czD" = (
-/obj/structure/disposalpipe/junction{
- dir = 2;
- icon_state = "pipe-j2"
- },
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
+/obj/structure/disposalpipe/junction{
+ dir = 1
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -61481,17 +60893,6 @@
icon_state = "whitehall"
},
/area/medical/research)
-"czP" = (
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/plasteel{
- icon_state = "white"
- },
-/area/medical/research)
"czR" = (
/obj/machinery/door_control{
id = "xeno_blastdoor";
@@ -61556,17 +60957,19 @@
d2 = 8;
icon_state = "2-8"
},
+/obj/structure/disposalpipe/segment{
+ dir = 2;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
/area/medical/surgeryobs)
"czV" = (
-/obj/structure/disposalpipe/sortjunction{
- dir = 8;
- icon_state = "pipe-j2s";
- sortType = 14
- },
/obj/effect/decal/warning_stripes/west,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plating,
/area/maintenance/aft)
"czX" = (
@@ -61580,18 +60983,19 @@
/turf/simulated/floor/plasteel,
/area/toxins/storage)
"czY" = (
+/obj/effect/decal/warning_stripes/north,
/obj/structure/disposalpipe/sortjunction{
dir = 8;
+ name = "Research Junction";
sortType = 12
},
-/obj/effect/decal/warning_stripes/north,
/turf/simulated/floor/plating,
/area/maintenance/aft)
"czZ" = (
+/obj/effect/decal/warning_stripes/northwest,
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/effect/decal/warning_stripes/northwest,
/turf/simulated/floor/plating,
/area/maintenance/aft)
"cAa" = (
@@ -61682,10 +61086,6 @@
},
/area/medical/medbay3)
"cAi" = (
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
- },
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
@@ -61702,10 +61102,6 @@
/obj/item/folder/white{
pixel_y = 2
},
-/obj/structure/disposalpipe/sortjunction{
- dir = 8;
- sortType = 23
- },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "whiteyellowfull"
@@ -61718,26 +61114,12 @@
/obj/effect/landmark/start{
name = "Chemist"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "whiteyellow"
},
/area/medical/chemistry)
-"cAm" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- icon_state = "white"
- },
-/area/medical/chemistry)
"cAn" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
},
@@ -61759,18 +61141,12 @@
pixel_x = -3;
pixel_y = 5
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "whiteyellowfull"
},
/area/medical/chemistry)
"cAp" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 8
},
@@ -61794,9 +61170,9 @@
},
/area/medical/genetics)
"cAs" = (
-/obj/structure/disposalpipe/junction{
- dir = 8;
- icon_state = "pipe-j2"
+/obj/structure/disposalpipe/segment{
+ dir = 4;
+ icon_state = "pipe-c"
},
/turf/simulated/floor/plasteel{
icon_state = "white"
@@ -61820,16 +61196,6 @@
icon_state = "vault"
},
/area/medical/genetics)
-"cAv" = (
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
- },
-/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "bluecorner"
- },
-/area/hallway/primary/aft)
"cAw" = (
/obj/structure/cable/yellow{
d1 = 1;
@@ -61841,9 +61207,6 @@
d2 = 4;
icon_state = "1-4"
},
-/obj/structure/disposalpipe/junction{
- dir = 1
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
},
@@ -61867,30 +61230,27 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/turf/simulated/floor/plating,
/area/medical/surgeryobs)
"cAy" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/effect/spawner/lootdrop{
loot = list(/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes);
name = "maint grille or trash spawner"
},
/obj/effect/decal/warning_stripes/east,
-/turf/simulated/floor/plating,
-/area/maintenance/aft)
-"cAz" = (
/obj/structure/disposalpipe/segment{
dir = 4
},
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
+"cAz" = (
/obj/effect/decal/warning_stripes/south,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plating,
/area/maintenance/aft)
"cAA" = (
@@ -61958,10 +61318,10 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/structure/disposalpipe/segment,
/obj/effect/decal/warning_stripes/northwest,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/toxins/storage)
"cAI" = (
@@ -62061,6 +61421,10 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/junction{
+ dir = 4;
+ icon_state = "pipe-y"
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -62194,10 +61558,6 @@
d2 = 4;
icon_state = "1-4"
},
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
- },
/obj/effect/decal/warning_stripes/west,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5
@@ -62205,6 +61565,10 @@
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
},
+/obj/structure/disposalpipe/segment{
+ dir = 1;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel,
/area/toxins/storage)
"cBl" = (
@@ -62220,14 +61584,14 @@
icon_state = "4-8"
},
/obj/structure/chair/stool,
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
- },
/obj/effect/decal/warning_stripes/east,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
},
+/obj/structure/disposalpipe/segment{
+ dir = 2;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel,
/area/toxins/storage)
"cBo" = (
@@ -62246,39 +61610,18 @@
name = "Chief Medical Officer's Office";
req_access_txt = "40"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "barber"
},
/area/medical/cmo)
-"cBq" = (
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "whiteblue"
- },
-/area/medical/medbay3)
"cBs" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "barber"
},
/area/medical/cmo)
"cBt" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/effect/landmark/start{
name = "Chief Medical Officer"
},
@@ -62288,9 +61631,6 @@
},
/area/medical/cmo)
"cBu" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel{
dir = 8;
@@ -62425,7 +61765,6 @@
name = "Mech Bay Maintenance";
req_access_txt = "29"
},
-/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/assembly/chargebay)
"cBL" = (
@@ -62472,16 +61811,16 @@
d2 = 4;
icon_state = "1-4"
},
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
- },
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 8
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 8
},
+/obj/structure/disposalpipe/segment{
+ dir = 1;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -62492,15 +61831,15 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "whiteblue"
@@ -62512,9 +61851,6 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/command{
name = "Research Director's Office";
@@ -62526,6 +61862,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "cafeteria"
@@ -62537,40 +61876,40 @@
d2 = 8;
icon_state = "2-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "cafeteria"
},
/area/crew_quarters/hor)
"cBT" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 8
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "cafeteria"
},
/area/crew_quarters/hor)
"cBU" = (
-/obj/structure/disposalpipe/segment{
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/simulated/floor/plasteel{
@@ -62579,13 +61918,13 @@
},
/area/crew_quarters/hor)
"cBV" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
/obj/structure/disposalpipe/segment{
dir = 2;
icon_state = "pipe-c"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "cafeteria"
@@ -62605,9 +61944,6 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/effect/decal/warning_stripes/east,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -62629,12 +61965,10 @@
/turf/simulated/floor/plasteel,
/area/toxins/storage)
"cCa" = (
-/obj/machinery/disposal{
- pixel_x = 5
- },
/obj/structure/disposalpipe/trunk{
dir = 1
},
+/obj/machinery/disposal,
/turf/simulated/floor/plasteel{
icon_state = "whitebluefull"
},
@@ -62645,9 +61979,6 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/chair,
/obj/effect/decal/warning_stripes/north,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -62704,16 +62035,16 @@
},
/area/medical/chemistry)
"cCh" = (
-/obj/machinery/disposal,
-/obj/structure/disposalpipe/trunk{
- dir = 1
- },
/obj/machinery/power/apc{
dir = 4;
name = "CMO's Office APC";
pixel_x = 26
},
/obj/structure/cable/yellow,
+/obj/machinery/disposal,
+/obj/structure/disposalpipe/trunk{
+ dir = 1
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "barber"
@@ -62786,14 +62117,14 @@
},
/area/medical/reception)
"cCo" = (
-/obj/structure/disposalpipe/trunk{
- dir = 1
- },
-/obj/machinery/disposal,
/obj/machinery/firealarm{
dir = 1;
pixel_y = -24
},
+/obj/structure/disposalpipe/trunk{
+ dir = 1
+ },
+/obj/machinery/disposal,
/turf/simulated/floor/plasteel{
icon_state = "whiteblue"
},
@@ -62803,10 +62134,6 @@
name = "Station Intercom (General)";
pixel_x = -29
},
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
- },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "bluecorner"
@@ -62832,9 +62159,6 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/effect/decal/warning_stripes/northeastcorner,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -62885,6 +62209,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -62906,6 +62233,9 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -62927,6 +62257,10 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 2;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -62948,6 +62282,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -62984,7 +62321,6 @@
},
/area/medical/genetics)
"cCE" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable/yellow{
d1 = 2;
d2 = 8;
@@ -63069,16 +62405,16 @@
d2 = 8;
icon_state = "2-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
- },
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -63090,6 +62426,10 @@
d2 = 8;
icon_state = "1-8"
},
+/obj/structure/disposalpipe/segment{
+ dir = 8;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -63262,6 +62602,7 @@
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "whiteblue"
@@ -63274,8 +62615,9 @@
/obj/machinery/light_switch{
pixel_y = 28
},
+/obj/structure/rack,
/obj/effect/decal/warning_stripes/south,
-/obj/machinery/vending/atmosdrobe,
+/obj/item/painter,
/turf/simulated/floor/plasteel,
/area/atmos)
"cDe" = (
@@ -63284,6 +62626,7 @@
d2 = 2;
icon_state = "1-2"
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -63304,8 +62647,8 @@
/obj/machinery/atmospherics/pipe/simple/visible/purple{
dir = 4
},
-/obj/structure/disposalpipe/trunk,
/obj/machinery/disposal,
+/obj/structure/disposalpipe/trunk,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "caution"
@@ -63322,9 +62665,6 @@
d2 = 4;
icon_state = "2-4"
},
-/obj/structure/disposalpipe/junction{
- dir = 1
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5
},
@@ -63359,7 +62699,6 @@
/turf/simulated/floor/engine/vacuum,
/area/space/nearstation)
"cDo" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 5
},
@@ -63376,12 +62715,12 @@
name = "\improper Research Testing Range"
})
"cDr" = (
-/obj/machinery/disposal,
-/obj/structure/disposalpipe/trunk,
/obj/machinery/status_display{
layer = 4;
pixel_y = 32
},
+/obj/machinery/disposal,
+/obj/structure/disposalpipe/trunk,
/turf/simulated/floor/plasteel{
icon_state = "whitehall"
},
@@ -63433,7 +62772,6 @@
},
/area/medical/medbay3)
"cDx" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
@@ -63460,6 +62798,7 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/hallway/primary/aft)
"cDA" = (
@@ -63491,7 +62830,6 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/assembly/chargebay)
"cDD" = (
@@ -63535,7 +62873,6 @@
d2 = 4;
icon_state = "2-4"
},
-/obj/structure/disposalpipe/segment,
/obj/structure/sign/nosmoking_2{
pixel_x = -28
},
@@ -63617,13 +62954,13 @@
},
/area/medical/cmo)
"cDP" = (
+/obj/machinery/computer/security/telescreen/entertainment{
+ pixel_y = -32
+ },
/obj/machinery/disposal,
/obj/structure/disposalpipe/trunk{
dir = 1
},
-/obj/machinery/computer/security/telescreen/entertainment{
- pixel_y = -32
- },
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "cafeteria"
@@ -63633,9 +62970,9 @@
/obj/effect/landmark/start{
name = "Scientist"
},
-/obj/structure/disposalpipe/segment,
/obj/effect/decal/warning_stripes/east,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/toxins/storage)
"cDS" = (
@@ -63643,10 +62980,6 @@
/turf/simulated/wall,
/area/medical/reception)
"cDT" = (
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
- },
/obj/structure/cable/yellow{
d1 = 2;
d2 = 8;
@@ -63781,7 +63114,6 @@
},
/area/medical/surgeryobs)
"cEk" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
@@ -63812,6 +63144,7 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -63888,9 +63221,9 @@
},
/area/medical/cryo)
"cEA" = (
-/obj/structure/disposalpipe/segment,
/obj/effect/decal/warning_stripes/east,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/toxins/storage)
"cEB" = (
@@ -63943,18 +63276,18 @@
/turf/simulated/floor/plasteel,
/area/toxins/storage)
"cEI" = (
-/obj/structure/disposalpipe/segment,
/obj/effect/decal/warning_stripes/yellow,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/toxins/mixing{
name = "\improper Toxins Lab"
})
"cEJ" = (
-/obj/structure/disposalpipe/segment,
/obj/effect/decal/warning_stripes/southeast,
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 1
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/toxins/storage)
"cEK" = (
@@ -64250,7 +63583,6 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/assembly/chargebay)
"cFn" = (
@@ -64585,7 +63917,6 @@
d2 = 8;
icon_state = "1-8"
},
-/obj/structure/disposalpipe/segment,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
@@ -64726,10 +64057,6 @@
d2 = 4;
icon_state = "1-4"
},
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
- },
/turf/simulated/floor/plasteel,
/area/assembly/chargebay)
"cGu" = (
@@ -64738,9 +64065,6 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/turf/simulated/floor/plasteel,
/area/assembly/chargebay)
"cGv" = (
@@ -64754,10 +64078,6 @@
d2 = 4;
icon_state = "2-4"
},
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel,
/area/assembly/chargebay)
@@ -64798,11 +64118,11 @@
name = "\improper Toxins Lab"
})
"cGz" = (
+/obj/structure/closet/secure_closet/scientist,
/obj/structure/window/reinforced{
dir = 4
},
/obj/effect/decal/warning_stripes/south,
-/obj/machinery/vending/scidrobe,
/turf/simulated/floor/plasteel,
/area/toxins/mixing{
name = "\improper Toxins Lab"
@@ -64908,37 +64228,12 @@
/area/toxins/mixing{
name = "\improper Toxins Lab"
})
-"cGK" = (
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- icon_state = "white"
- },
-/area/toxins/mixing{
- name = "\improper Toxins Lab"
- })
"cGL" = (
/obj/structure/cable/yellow{
d1 = 2;
d2 = 8;
icon_state = "2-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
@@ -64956,9 +64251,6 @@
/obj/effect/landmark/start{
name = "Scientist"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
},
@@ -64971,17 +64263,6 @@
/area/toxins/mixing{
name = "\improper Toxins Lab"
})
-"cGN" = (
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
- },
-/turf/simulated/floor/plasteel{
- icon_state = "white"
- },
-/area/toxins/mixing{
- name = "\improper Toxins Lab"
- })
"cGO" = (
/obj/machinery/bodyscanner,
/turf/simulated/floor/plasteel{
@@ -65097,7 +64378,6 @@
/turf/simulated/floor/plasteel,
/area/medical/cryo)
"cGZ" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
@@ -65110,9 +64390,6 @@
/turf/simulated/floor/plating,
/area/maintenance/aft)
"cHa" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
@@ -65130,15 +64407,14 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
/area/medical/medbreak)
"cHb" = (
-/obj/structure/disposalpipe/junction{
- dir = 2;
- icon_state = "pipe-j2"
- },
/obj/structure/cable/yellow{
d1 = 1;
d2 = 4;
@@ -65150,16 +64426,15 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 8
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "whiteblue"
},
/area/medical/medbay3)
"cHc" = (
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
- },
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
@@ -65168,15 +64443,16 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/junction{
+ dir = 4;
+ icon_state = "pipe-j2"
+ },
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "cafeteria"
},
/area/medical/medbreak)
"cHd" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
@@ -65193,6 +64469,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "cafeteria"
@@ -65211,6 +64490,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "cafeteria"
@@ -65228,6 +64510,9 @@
name = "Staff Room";
req_access_txt = "5"
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -65245,6 +64530,9 @@
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 8
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "cafeteria"
@@ -65280,21 +64568,14 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 8
},
+/obj/structure/disposalpipe/junction{
+ dir = 1;
+ icon_state = "pipe-j2"
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
/area/medical/medbay3)
-"cHl" = (
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "whiteblue"
- },
-/area/medical/medbay3)
"cHm" = (
/obj/machinery/door/firedoor,
/obj/structure/cable/yellow{
@@ -65331,7 +64612,6 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/structure/disposalpipe/segment,
/obj/effect/decal/warning_stripes/yellow/hollow,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/unary/vent_scrubber/on,
@@ -65495,6 +64775,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -65793,21 +65074,18 @@
},
/obj/effect/decal/warning_stripes/west,
/obj/effect/decal/cleanable/dirt,
-/obj/structure/disposalpipe/wrapsortjunction{
- dir = 1
- },
/turf/simulated/floor/plating,
/area/maintenance/fpmaint2{
name = "Port Maintenance"
})
"cIj" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/effect/decal/cleanable/dirt,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/maintenance/maintcentral)
"cIk" = (
@@ -65913,7 +65191,6 @@
name = "Robotics Lab";
req_access_txt = "29"
},
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel,
@@ -66020,6 +65297,9 @@
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -66038,6 +65318,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -66053,6 +65336,10 @@
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 8
},
+/obj/structure/disposalpipe/segment{
+ dir = 8;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -66184,7 +65471,6 @@
},
/area/medical/medbay3)
"cIW" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel{
@@ -66334,7 +65620,6 @@
},
/area/assembly/robotics)
"cJl" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
@@ -66531,14 +65816,14 @@
/turf/simulated/floor/plating/airless,
/area/toxins/test_area)
"cJF" = (
+/obj/effect/decal/warning_stripes/northeast,
/obj/machinery/disposal{
pixel_x = -2;
pixel_y = -2
},
/obj/structure/disposalpipe/trunk{
- dir = 1
+ dir = 4
},
-/obj/effect/decal/warning_stripes/northeast,
/turf/simulated/floor/plasteel,
/area/toxins/mixing{
name = "\improper Toxins Lab"
@@ -66628,10 +65913,6 @@
},
/area/medical/patient_b)
"cJR" = (
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
- },
/obj/structure/cable/yellow{
d1 = 1;
d2 = 4;
@@ -66763,12 +66044,15 @@
},
/area/medical/genetics_cloning)
"cKo" = (
-/obj/machinery/vending/genedrobe,
+/obj/structure/closet/wardrobe/black,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
/area/medical/genetics)
"cKp" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "purplefull"
},
@@ -67007,8 +66291,7 @@
"cKP" = (
/obj/effect/spawner/window/reinforced,
/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
+ dir = 4
},
/turf/simulated/floor/plating,
/area/medical/virology)
@@ -67094,12 +66377,12 @@
/obj/machinery/door/airlock/maintenance{
req_one_access_txt = "12;5;39;6"
},
-/obj/structure/disposalpipe/segment,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/maintenance/aft)
"cKW" = (
@@ -67111,7 +66394,6 @@
/area/medical/medbay3)
"cKX" = (
/obj/machinery/door/firedoor,
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel{
@@ -67242,15 +66524,6 @@
icon_state = "white"
},
/area/medical/surgery2)
-"cLk" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "whiteblue"
- },
-/area/medical/medbay3)
"cLl" = (
/obj/structure/table,
/obj/item/crowbar,
@@ -67349,10 +66622,6 @@
},
/area/medical/research)
"cLv" = (
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel{
@@ -67361,9 +66630,6 @@
},
/area/medical/medbay3)
"cLw" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/unary/vent_pump/on,
/turf/simulated/floor/plasteel{
dir = 1;
@@ -67389,9 +66655,6 @@
name = "\improper Toxins Lab"
})
"cLz" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
@@ -67408,6 +66671,9 @@
dir = 8
},
/obj/effect/decal/warning_stripes/northwest,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/assembly/robotics)
"cLB" = (
@@ -67603,10 +66869,6 @@
/turf/simulated/floor/plating,
/area/maintenance/aft)
"cLX" = (
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
- },
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
@@ -67617,19 +66879,11 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
/area/medical/medbay3)
-"cLY" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "whitebluecorner"
- },
-/area/medical/medbay3)
"cLZ" = (
/obj/structure/table,
/obj/item/assembly/igniter{
@@ -67744,10 +66998,6 @@
},
/area/assembly/robotics)
"cMm" = (
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
- },
/obj/structure/cable/yellow{
d1 = 1;
d2 = 4;
@@ -67756,6 +67006,9 @@
/obj/effect/decal/warning_stripes/north,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/assembly/robotics)
"cMn" = (
@@ -67832,10 +67085,6 @@
},
/area/medical/genetics)
"cMt" = (
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
- },
/obj/structure/cable/yellow{
d1 = 2;
d2 = 8;
@@ -67847,6 +67096,10 @@
icon_state = "1-2"
},
/obj/effect/decal/warning_stripes/northeast,
+/obj/structure/disposalpipe/segment{
+ dir = 2;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel,
/area/assembly/robotics)
"cMu" = (
@@ -68007,13 +67260,13 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "whitegreen"
@@ -68160,30 +67413,29 @@
name = "Chief Medical Officer's Office";
req_access_txt = "40"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "barber"
},
/area/medical/cmo)
"cMQ" = (
-/obj/structure/disposalpipe/sortjunction{
- dir = 8;
- icon_state = "pipe-j2s";
- sortType = 10
- },
/obj/structure/cable/yellow{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
+/obj/structure/disposalpipe/segment{
+ dir = 4;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "barber"
@@ -68274,7 +67526,6 @@
},
/area/assembly/robotics)
"cMY" = (
-/obj/structure/disposalpipe/segment,
/obj/effect/spawner/lootdrop{
loot = list(/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes);
name = "maint grille or trash spawner"
@@ -68343,14 +67594,14 @@
name = "\improper Toxins Lab"
})
"cNe" = (
-/obj/structure/disposalpipe/trunk{
- dir = 8
- },
-/obj/machinery/disposal,
/obj/machinery/light_switch{
pixel_x = 27
},
/obj/effect/decal/warning_stripes/yellow,
+/obj/structure/disposalpipe/trunk{
+ dir = 8
+ },
+/obj/machinery/disposal,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -68370,13 +67621,13 @@
},
/area/assembly/robotics)
"cNg" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/effect/decal/warning_stripes/east,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/assembly/robotics)
"cNi" = (
@@ -68518,10 +67769,6 @@
},
/area/medical/virology)
"cNF" = (
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
- },
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
@@ -68532,19 +67779,25 @@
d2 = 8;
icon_state = "1-8"
},
+/obj/structure/disposalpipe/sortjunction{
+ dir = 1;
+ icon_state = "pipe-j2s";
+ name = "CMO's Junction";
+ sortType = 10
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
/area/medical/medbay3)
"cNG" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "whiteblue"
@@ -68634,10 +67887,6 @@
},
/area/assembly/robotics)
"cNR" = (
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
- },
/obj/structure/cable/yellow{
d1 = 2;
d2 = 4;
@@ -68655,7 +67904,6 @@
},
/area/hallway/primary/aft)
"cNU" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
@@ -68667,6 +67915,7 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -68706,6 +67955,7 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/hallway/primary/aft)
"cNY" = (
@@ -68744,13 +67994,13 @@
},
/area/assembly/robotics)
"cNZ" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/effect/decal/warning_stripes/south,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/maintenance/aft)
"cOa" = (
@@ -68758,16 +68008,16 @@
/turf/simulated/floor/plasteel,
/area/assembly/robotics)
"cOb" = (
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
- },
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/effect/decal/warning_stripes/east,
+/obj/structure/disposalpipe/segment{
+ dir = 1;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel,
/area/assembly/robotics)
"cOc" = (
@@ -69049,11 +68299,11 @@
},
/area/medical/virology)
"cOB" = (
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
+/obj/structure/chair/stool,
+/obj/structure/disposalpipe/segment,
+/turf/simulated/floor/plasteel{
+ icon_state = "whitegreen"
},
-/turf/simulated/wall,
/area/medical/virology)
"cOC" = (
/obj/structure/closet/crate/freezer,
@@ -69079,16 +68329,20 @@
/obj/item/reagent_containers/iv_bag/blood/random,
/obj/item/reagent_containers/iv_bag/blood/random,
/obj/item/reagent_containers/iv_bag/blood/random,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "vault"
},
/area/medical/virology)
"cOD" = (
+/obj/structure/closet/wardrobe/virology_white,
+/obj/item/storage/backpack/satchel_vir,
/obj/structure/disposalpipe/segment{
- dir = 8;
+ dir = 1;
icon_state = "pipe-c"
},
-/obj/machinery/vending/virodrobe,
/turf/simulated/floor/plasteel{
icon_state = "vault"
},
@@ -69096,6 +68350,10 @@
"cOE" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment{
+ dir = 2;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel{
icon_state = "vault"
},
@@ -69185,12 +68443,15 @@
},
/area/medical/patient_b)
"cOM" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
+/obj/structure/disposalpipe/segment{
+ dir = 4;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plating,
/area/maintenance/aft)
"cON" = (
@@ -69206,6 +68467,7 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "escape"
},
@@ -69475,10 +68737,6 @@
icon_state = "freezerfloor"
},
/area/medical/virology)
-"cPs" = (
-/obj/structure/disposalpipe/segment,
-/turf/simulated/wall,
-/area/medical/virology)
"cPt" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/medical{
@@ -69487,6 +68745,7 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "whitegreenfull"
},
@@ -69527,7 +68786,6 @@
},
/area/medical/virology)
"cPA" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
@@ -69536,6 +68794,7 @@
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -69686,6 +68945,7 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/hallway/secondary/exit{
name = "\improper Departure Lounge"
@@ -69767,11 +69027,13 @@
/turf/space,
/area/space/nearstation)
"cPV" = (
+/obj/structure/closet/wardrobe/robotics_black{
+ pixel_x = 2
+ },
/obj/structure/window/reinforced{
dir = 8
},
/obj/effect/decal/warning_stripes/yellow,
-/obj/machinery/vending/robodrobe,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -69927,10 +69189,6 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
- },
/obj/structure/cable/yellow{
d1 = 1;
d2 = 8;
@@ -70019,6 +69277,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 9
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "whitegreen"
@@ -70078,19 +69337,6 @@
},
/turf/simulated/floor/plating,
/area/maintenance/aft)
-"cQy" = (
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/turf/simulated/floor/plating,
-/area/maintenance/aft)
"cQz" = (
/obj/machinery/power/apc{
dir = 8;
@@ -70307,18 +69553,6 @@
/obj/item/storage/box/lights/mixed,
/turf/simulated/floor/plating,
/area/maintenance/aft)
-"cQV" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plating,
-/area/maintenance/aft)
"cQW" = (
/turf/simulated/wall/r_wall,
/area/maintenance/starboardsolar)
@@ -70377,6 +69611,7 @@
/area/medical/virology)
"cRe" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -70417,7 +69652,6 @@
overlays_file = 'icons/obj/doors/airlocks/station/overlays.dmi';
req_access_txt = "27"
},
-/obj/structure/disposalpipe/segment,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
@@ -70425,13 +69659,10 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/maintenance/aft)
"cRl" = (
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
- },
/obj/structure/cable/yellow{
d1 = 2;
d2 = 8;
@@ -70440,26 +69671,12 @@
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
/area/maintenance/aft)
-"cRm" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/turf/simulated/floor/plating,
-/area/maintenance/aft)
"cRn" = (
-/obj/structure/disposalpipe/segment,
/obj/effect/decal/warning_stripes/north,
+/obj/structure/disposalpipe/segment{
+ dir = 1;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel,
/area/hallway/secondary/exit{
name = "\improper Departure Lounge"
@@ -70476,6 +69693,10 @@
/obj/machinery/light{
dir = 8
},
+/obj/structure/disposalpipe/segment{
+ dir = 4;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "whiteblue"
@@ -70486,6 +69707,9 @@
pixel_y = 32
},
/obj/effect/decal/warning_stripes/north,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/hallway/secondary/exit{
name = "\improper Departure Lounge"
@@ -70527,29 +69751,6 @@
d2 = 4;
icon_state = "1-4"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/turf/simulated/floor/plasteel,
-/area/hallway/secondary/exit{
- name = "\improper Departure Lounge"
- })
-"cRw" = (
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
@@ -70607,6 +69808,10 @@
/obj/effect/decal/warning_stripes/north,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/disposalpipe/segment{
+ dir = 8;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel,
/area/hallway/secondary/exit{
name = "\improper Departure Lounge"
@@ -70867,11 +70072,11 @@
},
/area/chapel/office)
"cSc" = (
-/obj/machinery/disposal,
-/obj/structure/disposalpipe/trunk,
/obj/machinery/newscaster{
pixel_y = 32
},
+/obj/machinery/disposal,
+/obj/structure/disposalpipe/trunk,
/turf/simulated/floor/plasteel{
icon_state = "vault"
},
@@ -70884,22 +70089,18 @@
departmentType = 2;
pixel_y = 30
},
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 4
+ },
/obj/structure/disposalpipe/segment{
dir = 4;
icon_state = "pipe-c"
},
-/obj/machinery/atmospherics/unary/vent_pump/on{
- dir = 4
- },
/turf/simulated/floor/plasteel{
icon_state = "grimy"
},
/area/chapel/office)
"cSe" = (
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
- },
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
@@ -70909,6 +70110,10 @@
dir = 9
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment{
+ dir = 8;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel{
icon_state = "grimy"
},
@@ -70957,7 +70162,6 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/maintenance/aft)
"cSj" = (
@@ -70971,7 +70175,6 @@
/turf/simulated/floor/plating,
/area/maintenance/aft)
"cSk" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel,
@@ -70979,11 +70182,6 @@
name = "\improper Departure Lounge"
})
"cSl" = (
-/obj/structure/disposalpipe/sortjunction{
- dir = 8;
- icon_state = "pipe-j2s";
- sortType = 17
- },
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
@@ -70996,6 +70194,7 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 1
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/maintenance/aft)
"cSn" = (
@@ -71009,10 +70208,6 @@
d2 = 4;
icon_state = "2-4"
},
-/obj/structure/disposalpipe/junction{
- dir = 8;
- icon_state = "pipe-j2"
- },
/obj/effect/decal/warning_stripes/south,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -71029,10 +70224,6 @@
name = "\improper Departure Lounge"
})
"cSq" = (
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
- },
/obj/structure/cable/yellow{
d1 = 1;
d2 = 8;
@@ -71155,6 +70346,9 @@
/obj/machinery/atmospherics/unary/tank/air{
dir = 1
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "vault"
},
@@ -71165,6 +70359,9 @@
name = "virology air connector port"
},
/obj/machinery/portable_atmospherics/canister/air,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "vault"
},
@@ -71172,6 +70369,10 @@
"cSF" = (
/obj/item/trash/popcorn,
/obj/structure/table/glass,
+/obj/structure/disposalpipe/segment{
+ dir = 8;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel{
icon_state = "vault"
},
@@ -71275,7 +70476,6 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "vault"
},
@@ -71449,10 +70649,6 @@
},
/area/medical/virology)
"cTg" = (
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
- },
/obj/machinery/navbeacon{
codes_txt = "patrol;next_patrol=10-Aft-To-Central";
location = "9.4-Escape-4"
@@ -71625,6 +70821,9 @@
name = "Robotics Desk";
req_access_txt = "29"
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plating,
/area/assembly/robotics)
"cTx" = (
@@ -71666,8 +70865,8 @@
},
/area/chapel/office)
"cTB" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/table/wood,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "grimy"
},
@@ -71725,10 +70924,6 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 6
},
@@ -71738,9 +70933,6 @@
/turf/simulated/floor/carpet,
/area/chapel/main)
"cTK" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
@@ -71755,9 +70947,6 @@
name = "Chapel";
opacity = 1
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
@@ -71784,28 +70973,10 @@
},
/obj/effect/decal/warning_stripes/west,
/turf/simulated/floor/plasteel,
-/area/hallway/secondary/exit{
- name = "\improper Departure Lounge"
- })
-"cTP" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/turf/simulated/floor/plasteel,
/area/hallway/secondary/exit{
name = "\improper Departure Lounge"
})
"cTQ" = (
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
- },
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 4
},
@@ -71923,6 +71094,9 @@
name = "Medbay Maintenance";
req_access_txt = "5"
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plating,
/area/medical/medbay3)
"cUb" = (
@@ -71956,10 +71130,6 @@
/turf/simulated/floor/plating,
/area/maintenance/starboardsolar)
"cUe" = (
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
- },
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
@@ -71977,6 +71147,10 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 8
},
+/obj/structure/disposalpipe/segment{
+ dir = 1;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -72069,9 +71243,6 @@
},
/area/chapel/office)
"cUp" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
@@ -72081,14 +71252,14 @@
dir = 4
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
/area/medical/medbay3)
"cUq" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
@@ -72100,14 +71271,14 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
/area/medical/medbay3)
"cUr" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable/yellow{
d1 = 1;
d2 = 8;
@@ -72120,6 +71291,9 @@
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -72251,9 +71425,6 @@
name = "\improper Departure Lounge"
})
"cUF" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable/yellow{
d1 = 1;
d2 = 8;
@@ -72261,6 +71432,9 @@
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -72363,15 +71537,15 @@
},
/area/chapel/office)
"cUV" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "whiteblue"
@@ -72403,15 +71577,15 @@
},
/area/chapel/main)
"cVb" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -72479,15 +71653,15 @@
})
"cVl" = (
/obj/structure/morgue,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -72496,13 +71670,13 @@
/obj/structure/window/reinforced{
dir = 4
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 1
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -72547,9 +71721,6 @@
/turf/simulated/floor/plating,
/area/maintenance/starboardsolar)
"cVs" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/effect/decal/warning_stripes/northwest,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -72562,10 +71733,6 @@
name = "\improper Departure Lounge"
})
"cVu" = (
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
- },
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
@@ -72577,6 +71744,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -72588,6 +71758,10 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/junction{
+ dir = 8;
+ icon_state = "pipe-j2"
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -72623,9 +71797,6 @@
name = "\improper Departure Lounge"
})
"cVD" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/effect/decal/warning_stripes/northwestcorner,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -72874,6 +72045,10 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/junction{
+ dir = 8;
+ icon_state = "pipe-y"
+ },
/turf/simulated/floor/plasteel,
/area/hallway/primary/aft)
"cWm" = (
@@ -73035,6 +72210,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "neutralcorner"
},
@@ -73488,13 +72666,13 @@
/obj/effect/landmark/start{
name = "Civilian"
},
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 4
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 8
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/crew_quarters/fitness{
name = "\improper Recreation Area"
@@ -73728,9 +72906,9 @@
/obj/structure/window/reinforced{
dir = 1
},
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -73738,7 +72916,6 @@
name = "\improper Recreation Area"
})
"cYa" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
@@ -73747,15 +72924,16 @@
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 8
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "barber"
},
/area/medical/cmo)
"cYb" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "vault"
@@ -73773,9 +72951,9 @@
})
"cYe" = (
/obj/structure/window/reinforced,
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -73904,11 +73082,11 @@
/obj/structure/chair{
dir = 1
},
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 8
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/crew_quarters/fitness{
name = "\improper Recreation Area"
@@ -73923,13 +73101,16 @@
codes_txt = "patrol;next_patrol=14.8-Dorms-Lockers";
location = "14.5-Recreation"
},
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 4
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 8;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel,
/area/crew_quarters/fitness{
name = "\improper Recreation Area"
@@ -73974,20 +73155,16 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/structure/disposalpipe/junction{
- dir = 8
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/crew_quarters/fitness{
name = "\improper Recreation Area"
})
"cYI" = (
-/obj/structure/disposalpipe/junction{
- dir = 2;
- icon_state = "pipe-j2"
- },
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
@@ -74113,7 +73290,6 @@
name = "Morgue Maintenance";
req_access_txt = "6"
},
-/obj/structure/disposalpipe/segment,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
@@ -74242,12 +73418,12 @@
d2 = 2;
icon_state = "1-2"
},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/disposalpipe/segment{
dir = 2;
icon_state = "pipe-c"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/carpet/arcade,
/area/crew_quarters/fitness{
name = "\improper Arcade"
@@ -74264,12 +73440,12 @@
/turf/space,
/area/space)
"cZq" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "whitegreen"
@@ -74362,9 +73538,9 @@
/obj/machinery/door/airlock/public/glass{
name = "Arcade"
},
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/carpet/arcade,
/area/crew_quarters/fitness{
name = "\improper Arcade"
@@ -74752,7 +73928,6 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 8;
@@ -74766,6 +73941,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "whitegreen"
@@ -75077,12 +74253,12 @@
/obj/structure/sign/biohazard{
pixel_x = -32
},
-/obj/structure/disposalpipe/segment,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "whitegreen"
@@ -76093,19 +75269,9 @@
/obj/machinery/door/airlock/maintenance{
req_one_access_txt = "12;5;39;6"
},
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
- },
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/maintenance/aft)
-"deh" = (
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
- },
-/turf/simulated/wall,
-/area/maintenance/aft)
"dei" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on,
/turf/simulated/floor/wood,
@@ -76122,9 +75288,6 @@
name = "\improper Secure Lab"
})
"dek" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable/yellow{
d1 = 1;
d2 = 4;
@@ -76217,10 +75380,6 @@
/area/toxins/xenobiology{
name = "\improper Secure Lab"
})
-"deu" = (
-/obj/structure/disposalpipe/segment,
-/turf/simulated/wall/r_wall,
-/area/medical/virology)
"dez" = (
/obj/structure/disposalpipe/segment{
dir = 8;
@@ -76253,7 +75412,16 @@
name = "\improper Secure Lab"
})
"deC" = (
-/obj/machinery/computer/security,
+/obj/structure/table/reinforced,
+/obj/item/paper_bin{
+ pixel_x = -4;
+ pixel_y = 10
+ },
+/obj/item/pen,
+/obj/machinery/camera{
+ c_tag = "Engineering Equipment East";
+ dir = 8
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -76299,11 +75467,9 @@
/turf/simulated/wall,
/area/maintenance/maintcentral)
"deG" = (
-/obj/structure/chair/office/dark{
- dir = 4
- },
-/obj/effect/landmark/start{
- name = "Security Pod Pilot"
+/obj/structure/table/reinforced,
+/obj/item/spacepod_key{
+ id = 100000
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -76390,6 +75556,17 @@
d2 = 2;
icon_state = "1-2"
},
+/obj/structure/cable/yellow{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 6
+ },
/turf/simulated/floor/plasteel{
icon_state = "redfull"
},
@@ -77093,9 +76270,6 @@
name = "Arrivals"
})
"dgE" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
@@ -77110,6 +76284,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plating,
/area/maintenance/starboard)
"dgG" = (
@@ -77176,9 +76353,6 @@
name = "\improper Secure Lab"
})
"dhf" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/effect/decal/warning_stripes/west,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
@@ -77249,16 +76423,13 @@
/turf/space,
/area/chapel/main)
"dhq" = (
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
- },
/obj/structure/cable/yellow{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
/obj/effect/decal/cleanable/dirt,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/maintenance/aft)
"dhr" = (
@@ -77267,10 +76438,6 @@
d2 = 4;
icon_state = "2-4"
},
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
- },
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
@@ -77412,6 +76579,9 @@
dir = 4
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -77575,15 +76745,15 @@
},
/area/medical/research)
"dFD" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plating,
/area/maintenance/fore)
"dGT" = (
@@ -77603,9 +76773,6 @@
name = "\improper Departure Lounge"
})
"dHr" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
@@ -77617,6 +76784,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plating,
/area/maintenance/starboard)
"dKL" = (
@@ -77671,13 +76841,13 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 8
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 8
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/hallway/primary/aft)
"dTK" = (
@@ -77794,9 +76964,6 @@
/turf/simulated/floor/engine,
/area/engine/supermatter)
"edg" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5
},
@@ -78083,7 +77250,6 @@
},
/area/hallway/primary/starboard)
"fhH" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
@@ -78095,6 +77261,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/security/brig)
"fhW" = (
@@ -78153,15 +77320,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel,
/area/engine/break_room)
-"frX" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/plating,
-/area/maintenance/fpmaint2{
- name = "Port Maintenance"
- })
"fsY" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 8
@@ -78308,6 +77466,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/crew_quarters/sleep)
"fWW" = (
@@ -78363,9 +77522,6 @@
/turf/simulated/floor/bluegrid,
/area/tcommsat/server)
"gaa" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
@@ -78388,7 +77544,6 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
dir = 10
},
@@ -78398,7 +77553,6 @@
},
/area/hallway/primary/starboard)
"gdd" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
@@ -78461,9 +77615,6 @@
/turf/simulated/floor/engine,
/area/engine/engineering)
"gip" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
@@ -78475,6 +77626,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plating,
/area/maintenance/starboard)
"gkU" = (
@@ -78504,12 +77658,14 @@
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
/area/medical/research)
"gnZ" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 4
@@ -78601,6 +77757,7 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 1
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/carpet,
/area/crew_quarters/theatre)
"gKb" = (
@@ -78615,9 +77772,6 @@
},
/area/security/brig)
"gMS" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
@@ -78649,10 +77803,10 @@
/turf/simulated/floor/plasteel,
/area/hallway/primary/fore)
"gQu" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "neutralcorner"
@@ -78873,6 +78027,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "bar"
},
@@ -79076,6 +78233,7 @@
/obj/effect/landmark/start{
name = "Shaft Miner"
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/quartermaster/miningdock{
name = "\improper Mining Office"
@@ -79088,20 +78246,6 @@
},
/turf/simulated/wall/r_wall,
/area/engine/supermatter)
-"hXk" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/effect/decal/warning_stripes/south,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/effect/decal/warning_stripes/northwestcorner,
-/turf/simulated/floor/plasteel,
-/area/engine/engineering)
"hYq" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -79297,9 +78441,6 @@
},
/area/hallway/primary/port)
"iof" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/effect/decal/warning_stripes/south,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -79307,6 +78448,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/engine/engineering)
"isf" = (
@@ -79460,13 +78604,13 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 1
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "neutralcorner"
},
@@ -79564,7 +78708,6 @@
name = "\improper Secure Lab"
})
"jlB" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
@@ -79594,16 +78737,6 @@
icon_state = "bluecorner"
},
/area/hallway/primary/aft)
-"jzm" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/unary/vent_scrubber/on,
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "whiteblue"
- },
-/area/medical/medbay3)
"jCi" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -79657,6 +78790,9 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "red"
},
@@ -79686,16 +78822,16 @@
/area/turret_protected/ai)
"jPv" = (
/obj/effect/decal/warning_stripes/north,
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 6
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 6
},
+/obj/structure/disposalpipe/segment{
+ dir = 4;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel,
/area/engine/engineering)
"jQZ" = (
@@ -79755,10 +78891,6 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
- },
/turf/simulated/floor/plasteel,
/area/quartermaster/storage)
"kgV" = (
@@ -79871,9 +79003,6 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
@@ -79884,9 +79013,7 @@
/turf/simulated/floor/bluegrid,
/area/tcommsat/server)
"kxf" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
+/obj/effect/decal/warning_stripes/northwestcorner,
/obj/effect/decal/warning_stripes/southeastcorner,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -79894,7 +79021,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/obj/effect/decal/warning_stripes/north,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/engine/engineering)
"kzH" = (
@@ -80160,15 +79289,15 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/security/brig)
"lid" = (
@@ -80254,6 +79383,9 @@
"lFH" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "bar"
},
@@ -80359,15 +79491,6 @@
},
/turf/simulated/floor/plasteel,
/area/security/brig)
-"mcn" = (
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/plating,
-/area/maintenance/starboard)
"mcP" = (
/obj/structure/window/reinforced{
dir = 8
@@ -80494,14 +79617,10 @@
name = "\improper MiniSat Exterior"
})
"msg" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 9
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/security/podbay)
+/obj/structure/rack,
+/obj/effect/spawner/lootdrop/maintenance,
+/turf/simulated/floor/plating,
+/area/maintenance/fore)
"myY" = (
/obj/effect/decal/warning_stripes/north,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
@@ -80556,6 +79675,10 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment{
+ dir = 8;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel,
/area/engine/break_room)
"mFx" = (
@@ -80621,6 +79744,7 @@
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 4
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "whitebluecorner"
@@ -80750,10 +79874,6 @@
/area/crew_quarters/theatre)
"nig" = (
/obj/effect/decal/warning_stripes/south,
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
- },
/turf/simulated/floor/plasteel,
/area/quartermaster/storage)
"niH" = (
@@ -80873,10 +79993,6 @@
/obj/effect/spawner/lootdrop/maintenance,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
- },
/turf/simulated/floor/plating,
/area/quartermaster/office)
"nIZ" = (
@@ -80936,11 +80052,11 @@
d2 = 8;
icon_state = "4-8"
},
+/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
+/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
-/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
/turf/simulated/floor/plasteel,
/area/security/brig)
"nVg" = (
@@ -80998,15 +80114,12 @@
/turf/simulated/floor/carpet,
/area/security/vacantoffice)
"ofz" = (
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
- },
/obj/structure/cable/yellow{
d1 = 1;
d2 = 8;
icon_state = "1-8"
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/maintenance/starboard)
"ogE" = (
@@ -81101,7 +80214,6 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 8
},
@@ -81290,15 +80402,15 @@
},
/area/engine/gravitygenerator)
"pkf" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/effect/decal/warning_stripes/north,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/assembly/robotics)
"pkq" = (
@@ -81591,6 +80703,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -81628,15 +80743,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plating,
/area/toxins/explab)
-"qaM" = (
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/plasteel,
-/area/quartermaster/storage)
"qbl" = (
/obj/effect/spawner/airlock,
/turf/simulated/wall,
@@ -81662,7 +80768,6 @@
/turf/simulated/floor/plating,
/area/construction)
"qee" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
@@ -81670,6 +80775,12 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/sortjunction{
+ dir = 1;
+ icon_state = "pipe-j2s";
+ name = "Chapel Junction";
+ sortType = 17
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -81680,11 +80791,11 @@
d2 = 8;
icon_state = "4-8"
},
+/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
/turf/simulated/floor/plasteel{
icon_state = "neutralcorner"
},
@@ -81710,9 +80821,9 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -81856,9 +80967,6 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 8
@@ -81869,9 +80977,6 @@
},
/area/security/main)
"qQy" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
@@ -81879,6 +80984,9 @@
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plating,
/area/maintenance/starboard)
"qSf" = (
@@ -81917,6 +81025,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/crew_quarters/fitness{
name = "\improper Recreation Area"
@@ -82180,6 +81291,7 @@
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/hallway/primary/aft)
"rFa" = (
@@ -82329,9 +81441,6 @@
/turf/space,
/area/space)
"rUJ" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
@@ -82472,9 +81581,6 @@
/turf/simulated/floor/carpet,
/area/library)
"srJ" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
@@ -82493,9 +81599,6 @@
/turf/simulated/floor/plating,
/area/engine/engineering)
"svF" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
@@ -82526,19 +81629,15 @@
/obj/effect/spawner/window/reinforced,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable/yellow{
+ d2 = 8;
+ icon_state = "0-8"
+ },
/turf/simulated/floor/plating,
/area/security/brig)
"sBY" = (
/turf/simulated/floor/plating,
/area/storage/secure)
-"sDC" = (
-/obj/docking_port/stationary/whiteship{
- dir = 8;
- id = "whiteship_cerebron";
- name = "North of Cerebron"
- },
-/turf/space,
-/area/space)
"sFz" = (
/obj/effect/spawner/window/reinforced,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -82646,13 +81745,17 @@
/turf/simulated/floor/plasteel,
/area/engine/equipmentstorage)
"tca" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/sortjunction{
+ dir = 1;
+ name = "Quartermaster Junction";
+ sortType = 3
+ },
/turf/simulated/floor/plasteel,
/area/quartermaster/storage)
"teE" = (
@@ -82779,15 +81882,6 @@
},
/turf/simulated/floor/plating,
/area/maintenance/disposal)
-"twD" = (
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
- },
-/turf/simulated/floor/plating,
-/area/maintenance/fpmaint2{
- name = "Port Maintenance"
- })
"tAk" = (
/obj/structure/closet/secure_closet/security,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -82825,6 +81919,10 @@
/obj/effect/spawner/window/reinforced,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable/yellow{
+ d2 = 8;
+ icon_state = "0-8"
+ },
/turf/simulated/floor/plating,
/area/security/main)
"tEL" = (
@@ -82838,11 +81936,12 @@
/turf/simulated/floor/plasteel,
/area/hallway/primary/aft)
"tFb" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment{
+ dir = 2;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel{
icon_state = "neutralcorner"
},
@@ -82867,9 +81966,9 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/hallway/primary/aft)
"tSj" = (
@@ -82915,16 +82014,6 @@
/obj/effect/spawner/airlock/e_to_w,
/turf/simulated/floor/plating,
/area/maintenance/aft)
-"tYS" = (
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/plating,
-/area/maintenance/aft)
"tYX" = (
/obj/machinery/door/poddoor{
density = 0;
@@ -83085,6 +82174,7 @@
/area/maintenance/aft)
"uBN" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/wood,
/area/crew_quarters/theatre)
"uDi" = (
@@ -83145,6 +82235,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -83283,7 +82374,6 @@
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
},
-/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/quartermaster/storage)
"vjL" = (
@@ -83669,7 +82759,6 @@
/obj/effect/spawner/window/reinforced,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/quartermaster/office)
"wxE" = (
@@ -83765,13 +82854,13 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 4
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 8
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/hallway/primary/aft)
"wHZ" = (
@@ -83850,8 +82939,15 @@
name = "Medbay Storage"
})
"xbe" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 9
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -83862,9 +82958,6 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable/yellow{
d1 = 1;
d2 = 4;
@@ -83872,6 +82965,9 @@
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "neutralcorner"
},
@@ -83942,13 +83038,13 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 4
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/hallway/primary/aft)
"xxA" = (
@@ -84062,13 +83158,13 @@
},
/area/chapel/main)
"xXW" = (
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable/yellow{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -100232,7 +99328,7 @@ abq
apf
cHr
bgY
-aYk
+bgY
cIi
bqk
bod
@@ -100491,8 +99587,8 @@ bgB
azQ
biC
boc
-apd
-apf
+aYk
+aYt
bpH
brE
bts
@@ -100748,7 +99844,7 @@ bfo
bfw
biD
bku
-bfw
+biD
bfw
btL
brF
@@ -100811,11 +99907,11 @@ cKM
cFv
cME
cFv
-cOB
-cPs
-cPs
-cPs
-deu
+cKM
+cKM
+cKM
+cKM
+cHZ
cKP
cHZ
abq
@@ -101004,13 +100100,13 @@ bfh
bgK
bfw
biE
-bme
+bpm
bmg
bfw
bfw
bfw
btu
-bvH
+bVW
bxS
bfG
bBK
@@ -101267,7 +100363,7 @@ brH
bpJ
brG
btv
-bvH
+bVW
bxT
bzG
bBK
@@ -101305,10 +100401,10 @@ cod
cym
cym
cAw
-tYS
+cPj
cDj
-cjl
-cjl
+ckJ
+ckJ
cGg
cJR
bZU
@@ -101496,12 +100592,12 @@ apf
apf
aCs
aFF
-aBa
+aEK
aGf
aHs
-aBa
+aEK
aKd
-aNn
+ayK
afl
axX
aSm
@@ -101514,7 +100610,7 @@ aYo
aSm
vjp
bdm
-qaM
+bdZ
nig
bkE
biG
@@ -101524,7 +100620,7 @@ brK
bpK
aXi
btv
-bvH
+bVW
bxT
bzH
bBK
@@ -101551,7 +100647,7 @@ bZU
ckH
cEL
bZU
-cog
+bgZ
coD
cFQ
cLU
@@ -101568,11 +100664,11 @@ cFT
ckD
cIb
cDT
-cOM
+ckJ
cGZ
-cOM
-cOM
-cOM
+ckJ
+ckJ
+ckJ
cJR
bZU
aaa
@@ -101586,7 +100682,7 @@ cOE
cPt
cQs
cRe
-cYM
+cOB
cSF
cHZ
aaa
@@ -101746,10 +100842,10 @@ aqq
arE
aug
aoX
-twD
-frX
-jap
-jap
+axn
+axn
+apd
+apd
azO
aCt
aDx
@@ -101781,7 +100877,7 @@ boh
bpL
buu
btv
-bvH
+bVW
bxT
bzH
bBK
@@ -101830,7 +100926,7 @@ cEY
cEY
cEY
cEY
-cog
+bgZ
bZU
aaa
cFv
@@ -102007,7 +101103,7 @@ avY
axn
aoX
aoX
-avU
+aOx
aCs
aDy
aEQ
@@ -102028,17 +101124,17 @@ aSb
aRo
nYP
aRo
-aOx
+bdZ
bjd
bfw
-bhc
+biG
bpy
bmk
boh
bpM
aXi
btv
-bvH
+bVW
bBp
bfG
bBK
@@ -102065,7 +101161,7 @@ cjs
ckJ
clT
bZU
-cog
+bgZ
coC
cpU
crG
@@ -102087,7 +101183,7 @@ cKz
cLh
cMW
cEY
-cog
+bgZ
bZU
aaa
cHZ
@@ -102260,11 +101356,11 @@ aqk
atd
akt
auz
-avX
-axn
-cgo
-cgo
-avU
+aGN
+aNn
+aHY
+aHY
+aOW
aCs
aCs
aFO
@@ -102295,7 +101391,7 @@ boh
bpN
bfw
btz
-bvH
+bVW
bxX
apf
arK
@@ -102322,7 +101418,7 @@ cjr
chy
ckA
bZU
-clj
+bgZ
coC
coy
crE
@@ -102344,7 +101440,7 @@ cGo
cGo
cMV
cEY
-cog
+bgZ
bZU
abq
cHZ
@@ -102517,11 +101613,11 @@ akt
akt
akt
apf
-apd
axn
+apd
aoX
aoX
-avU
+aOx
aCu
aDz
aFQ
@@ -102542,10 +101638,10 @@ baT
aRo
bdC
bfx
-aOW
+aRo
bju
bfw
-bhc
+biG
bfw
bpF
bok
@@ -102579,7 +101675,7 @@ dgG
cuV
clU
bZU
-clj
+bgZ
coC
cpW
crH
@@ -102601,7 +101697,7 @@ cKD
cLi
cNc
cEY
-cog
+bgZ
bZU
aaa
aaa
@@ -102797,11 +101893,11 @@ aYh
aOu
bas
aOu
-tca
+aWV
bcv
beb
bfv
-bfw
+aXz
bmd
bfw
bmn
@@ -102836,7 +101932,7 @@ cju
cjk
bZU
bZU
-clj
+bgZ
coC
cpV
tSj
@@ -102858,7 +101954,7 @@ cKA
dxa
cKL
cEY
-clj
+bgZ
bZU
abq
aaa
@@ -103049,10 +102145,10 @@ aRo
aRo
aSz
aRo
-nYP
-aRo
+aVa
aRo
aRo
+aYl
iZz
baV
bdZ
@@ -103093,7 +102189,7 @@ bZU
bZU
bZU
bZU
-clo
+hLt
coC
cpY
crE
@@ -103115,7 +102211,7 @@ cGo
cGo
cNs
cEY
-cog
+bgZ
bZU
abq
abq
@@ -103307,13 +102403,13 @@ aQG
aQG
aUd
aVa
-aOu
+aRo
aWM
aYl
-aOu
-tca
-qaM
-bfp
+aRo
+nYP
+bdZ
+nig
bhX
bkx
bnq
@@ -103344,13 +102440,13 @@ bZW
bFw
bzK
cho
-cfX
+cQL
ceZ
chw
-chA
-cjl
-ckC
-coh
+ckJ
+ckJ
+cGZ
+clT
coC
cpX
crV
@@ -103372,7 +102468,7 @@ cKH
cLj
cNi
cEY
-cog
+bgZ
bZU
abq
aaa
@@ -103573,14 +102669,14 @@ bgz
bee
biP
bhe
-biK
+bkA
bkA
bmq
bon
bpR
aXi
btv
-bvH
+bVW
bxT
bai
bBP
@@ -103600,11 +102696,11 @@ jrE
bZc
bZZ
bzK
-ccA
+avU
chz
bZU
cfY
-ciw
+cem
ciK
cmX
cmX
@@ -103629,7 +102725,7 @@ cEY
cEY
cEY
cEY
-cQV
+tfV
bZU
aaa
aaa
@@ -103830,14 +102926,14 @@ bfw
bfw
bfw
bkK
-biL
+boh
bkB
bmr
boh
bpS
brJ
btv
-bvH
+bVW
bxT
bzM
bBQ
@@ -103857,7 +102953,7 @@ bXN
cgv
caa
bzK
-ccA
+avU
chx
bZU
bZU
@@ -103877,16 +102973,16 @@ czv
cYO
cCx
mRP
-cxp
+bSw
cDc
-cxp
+bSC
cIV
cxp
cKW
cxp
cNI
cPy
-cog
+bgZ
bZU
bZU
cHZ
@@ -104087,13 +103183,13 @@ bbP
bfw
bjf
bhg
-biM
-bkC
+boh
+boh
bms
-bkC
+boh
bpT
-blx
-btC
+aXi
+btv
bvO
byb
bzN
@@ -104114,7 +103210,7 @@ ehr
bZe
cab
bzK
-ccA
+avU
aoX
bZU
cfZ
@@ -104131,7 +103227,7 @@ dio
cxr
uQo
cxy
-cBq
+cxy
cCE
cDx
cEk
@@ -104143,7 +103239,7 @@ cKX
cLv
cNK
cPy
-cog
+bgZ
coD
cWI
cHZ
@@ -104350,7 +103446,7 @@ bmt
bss
btR
bfw
-bUu
+btv
bVW
bxT
bai
@@ -104371,7 +103467,7 @@ esf
bHr
bHr
bzK
-ccA
+avU
auy
bZU
cga
@@ -104397,10 +103493,10 @@ cHa
cFd
cKe
cFd
-cLk
+cwj
cNJ
cPy
-cog
+bgZ
cuV
chy
cHZ
@@ -104608,7 +103704,7 @@ bfw
bfw
bfw
bwb
-bvH
+bVW
byc
bzK
bzK
@@ -104628,7 +103724,7 @@ dDw
bZf
tNG
bzK
-chp
+cEg
auJ
bZU
cgb
@@ -104654,7 +103750,7 @@ cHd
cIY
cIA
cFd
-cLk
+cwj
cNM
bSD
cLz
@@ -104865,7 +103961,7 @@ brX
bsi
aAM
bkG
-bvH
+bVW
byd
bzK
bBT
@@ -104885,7 +103981,7 @@ bYv
bZg
cac
bzK
-ccA
+avU
auC
bZU
chB
@@ -104914,7 +104010,7 @@ cFd
cLw
cNL
cPy
-clj
+bgZ
chy
chy
cHZ
@@ -105122,7 +104218,7 @@ bhl
bpW
brL
btF
-bvH
+bVW
bxT
bzK
bDw
@@ -105142,7 +104238,7 @@ bzK
bzK
cad
bzK
-ccA
+avU
cdT
cdT
ceQ
@@ -105168,18 +104264,18 @@ cHg
cJa
cKj
cKe
-cLk
+cwj
cNM
cPy
-clj
+bgZ
coD
chy
bZU
cZv
day
cZv
-deh
-cQy
+bZU
+cQx
bZU
cSd
cSL
@@ -105366,8 +104462,8 @@ aVk
aVq
bgY
aYX
-bgY
-bgY
+axq
+axq
azB
apf
bfD
@@ -105375,7 +104471,7 @@ bhl
bhl
bhl
bmw
-bhl
+aZw
bpX
brM
btG
@@ -105402,7 +104498,7 @@ axq
ccB
cdT
cfa
-cge
+chI
chI
ciP
cmX
@@ -105425,7 +104521,7 @@ cHg
cIZ
cIB
cFd
-jzm
+gSK
wEZ
cPy
cRl
@@ -105636,7 +104732,7 @@ bos
btS
aAM
btF
-bvR
+bVW
bxT
bzK
bBT
@@ -105656,10 +104752,10 @@ bXR
bzK
ayB
aoX
-bdq
+bqQ
cdT
chT
-cgf
+cjt
oRr
clY
cmX
@@ -105682,11 +104778,11 @@ cHi
cGm
cKk
cFd
-cLk
+cwj
cNM
cPy
cRo
-chy
+cyE
chy
bZU
cZw
@@ -105882,7 +104978,7 @@ ban
aYq
bbV
aOA
-bdq
+bgB
apf
ceY
bhn
@@ -105893,7 +104989,7 @@ bot
bpZ
aAM
btv
-bvR
+bVW
bxT
bzK
bDw
@@ -105916,7 +105012,7 @@ apf
ccC
cdT
cfs
-cgf
+cjt
chK
clX
ckF
@@ -105939,7 +105035,7 @@ cHh
cFd
cKe
cFd
-cLk
+cwj
cKQ
cPy
cPy
@@ -106136,7 +105232,7 @@ aRu
aRu
aRu
aWT
-aYr
+aRV
aZC
aOA
bcH
@@ -106173,7 +105269,7 @@ cbx
ccD
cdT
chU
-cgf
+cjt
cjt
cjt
cjt
@@ -106192,15 +105288,15 @@ ekd
cpH
cCH
cIV
-cHl
+cNG
cxp
cxp
cKY
-cLY
+cYO
mFx
cKW
cRp
-cxp
+bXQ
cxp
cYO
cZI
@@ -106392,8 +105488,8 @@ aRu
aRu
hBM
aRu
-aWT
-aYr
+aRu
+aWU
aZD
avx
bcI
@@ -106407,7 +105503,7 @@ bkI
bQF
bNp
bNp
-bek
+bhc
bfV
bfV
bfV
@@ -106425,8 +105521,8 @@ bjm
bfV
bsV
bZh
-bfV
-bfV
+bnl
+bnm
ccE
cdT
cfz
@@ -106438,7 +105534,7 @@ cjA
cpD
crj
csQ
-ckd
+bIh
cvh
cDe
cDe
@@ -106446,13 +105542,13 @@ cyt
czD
cNF
uMx
-cFj
+bNx
cEl
-cFj
+bNx
cHk
-cFj
-cFj
-cFj
+bNx
+bNx
+bNx
cLX
cNU
cPA
@@ -106649,20 +105745,20 @@ aUg
aUg
atJ
bmK
-aWU
+aUg
aYs
aZE
pvu
bcJ
bei
-bfI
-bfI
-biW
-bfI
+mOc
+mOc
+mOc
+mOc
oJQ
-bfI
-bjn
-bfI
+mOc
+bcK
+mOc
btK
bvU
byh
@@ -106670,7 +105766,7 @@ bzQ
bfI
bfI
bfI
-oJQ
+bOV
bJc
bKL
bfI
@@ -106678,10 +105774,10 @@ bfI
bfI
bfI
bfI
-bjn
+bQG
bfI
bfI
-oJQ
+bOV
caC
cby
ccF
@@ -106906,23 +106002,23 @@ aRu
aRu
bmJ
aVt
-aWV
-aYt
+aRu
+aYr
aZF
-ayP
-bcK
-bej
+avx
+bNp
+bek
bfJ
bhp
biX
-bdb
+bhp
bpI
-bdb
-bqb
+bhp
+bej
brO
-bdb
-bdb
-bdb
+bhp
+bhp
+biK
bzR
bdb
bdb
@@ -106941,7 +106037,7 @@ bXT
oWL
bMR
bek
-bfV
+bnl
chM
chM
cel
@@ -107727,8 +106823,8 @@ crW
cmj
cnq
hCM
+bLH
cpZ
-cAm
cAF
cDf
cDm
@@ -107940,7 +107036,7 @@ aOF
aOF
bQF
ben
-bfM
+bqb
bhq
bja
bkM
@@ -108242,7 +107338,7 @@ cvj
cui
hCM
cpZ
-cAm
+cpZ
cBd
cDf
dbl
@@ -108263,7 +107359,7 @@ dak
dbf
deq
cRU
-cRm
+dVK
bZU
cST
rUJ
@@ -108513,14 +107609,14 @@ cIm
cIm
cIm
cIm
-bSY
+bSZ
cIm
cRU
cRU
cRU
cRU
cRU
-cRm
+dVK
bZU
cSU
cTK
@@ -108619,7 +107715,7 @@ aaa
aaa
aaa
aaa
-aaa
+agD
aaa
aaa
aaa
@@ -108774,9 +107870,9 @@ cVb
cnE
cIm
cNR
-cOM
-cOM
-cOM
+ckJ
+ckJ
+ckJ
cSq
bZU
cSO
@@ -108925,7 +108021,7 @@ afB
agx
acN
ahP
-aiH
+aiB
ajf
ajT
akG
@@ -108968,9 +108064,9 @@ aZL
aZL
bdF
bep
-bfQ
+ccP
bhu
-bmO
+bQg
bkQ
bpU
boz
@@ -109030,7 +108126,7 @@ cIo
cnc
cpJ
cIm
-clj
+bgZ
bZU
bZU
bZU
@@ -109197,10 +108293,10 @@ qiC
ats
qiC
awt
-atq
-atq
-atq
-atq
+ayR
+ayR
+ayR
+ayR
ayR
aAb
rDS
@@ -109287,7 +108383,7 @@ cmu
cVm
col
cIm
-clj
+bgZ
bZU
cPH
cSN
@@ -109527,7 +108623,7 @@ coo
coo
cxE
cmq
-aac
+cmq
cCl
cDh
cBv
@@ -109544,14 +108640,14 @@ cIo
cVl
cIn
cIm
-clo
+hLt
bZU
cPI
cQM
pue
cRt
cVc
-cTP
+pue
cRt
cRt
nej
@@ -109784,7 +108880,7 @@ cuF
coo
cxH
cyI
-aac
+cmq
cCl
czC
cAq
@@ -110041,7 +109137,7 @@ cvM
cia
cxG
cmq
-aac
+cmq
gtu
czC
cCi
@@ -110319,7 +109415,7 @@ bgZ
bZU
cSc
cRn
-cRw
+cRx
cTs
cTW
cTW
@@ -110570,12 +109666,12 @@ cIn
cIn
cna
pUh
-cos
+cQA
cIm
bgZ
bZU
cPL
-cQM
+bYy
cRx
cTr
cUz
@@ -110832,7 +109928,7 @@ cIm
clu
bZU
cPM
-cQM
+bYy
cRx
cTt
cUv
@@ -110984,7 +110080,7 @@ ahU
aiM
ajK
ajZ
-agA
+aiH
akL
alU
aln
@@ -111242,7 +110338,7 @@ aiP
ajM
akg
agA
-alH
+alC
alX
anN
aof
@@ -111326,7 +110422,7 @@ ctQ
cgw
cgw
cgw
-cAv
+cjH
cCp
czF
cns
@@ -111346,7 +110442,7 @@ cNS
cNW
cON
cPN
-cQM
+bYy
cRx
cRt
nej
@@ -111513,7 +110609,7 @@ crz
awz
aqJ
aFz
-amE
+alM
aqJ
lgv
jZd
@@ -111586,20 +110682,20 @@ tPc
cxK
cyL
rEw
-cgx
-cgx
-cgx
+tPc
+tPc
+tPc
cDz
-cgx
-cgx
-cgx
+tPc
+tPc
+tPc
rEw
-cgx
-cgx
-cgx
+tPc
+tPc
+bUu
cWl
cDz
-cgx
+tPc
cNX
cOO
cPO
@@ -111760,15 +110856,15 @@ aks
alY
anO
tCC
-dKL
+atB
api
aqP
-dKL
+aBa
atw
auZ
atv
fhH
-arY
+aEg
aFB
ayw
aOY
@@ -111829,7 +110925,7 @@ cee
cfq
cgy
cgy
-cgy
+bCz
cgy
cmm
cnu
@@ -111853,7 +110949,7 @@ cmm
czH
cIt
cuc
-cuc
+bXi
cWH
lHZ
cmm
@@ -112086,7 +111182,7 @@ ced
cfr
cft
cib
-cib
+bCG
cOm
cmn
cmo
@@ -112343,7 +111439,7 @@ cee
cOm
cgz
cic
-cic
+bGl
bXF
cmo
coH
@@ -113059,7 +112155,7 @@ aKc
aBl
lgv
aFA
-amE
+alM
aDU
aGr
amx
@@ -113118,7 +112214,7 @@ cie
ckZ
cmo
cng
-coJ
+cpd
cpd
crM
cuq
@@ -113316,7 +112412,7 @@ amx
alF
lgv
vDc
-amE
+amL
aDX
aFo
fZC
@@ -113369,7 +112465,7 @@ cbG
ccP
ceh
cfv
-czP
+rZk
cig
cjL
cla
@@ -113623,7 +112719,7 @@ bYD
bNh
cay
bek
-bfK
+bdb
cee
cOm
cgE
@@ -113830,7 +112926,7 @@ aKB
aRP
bfF
hYq
-sxA
+amV
hio
aFq
amx
@@ -113880,7 +112976,7 @@ bZk
bNh
caz
bek
-bfK
+bdb
cee
cft
cgF
@@ -114087,7 +113183,7 @@ aKc
aBn
lgv
aFz
-amE
+aKc
aDY
aDO
aGB
@@ -114137,7 +113233,7 @@ bYP
bNh
cbb
bek
-bfK
+bdb
cei
cOm
cgG
@@ -114394,7 +113490,7 @@ bNU
bNh
cbi
ben
-bfM
+bqb
bZu
cfw
cgu
@@ -114588,8 +113684,8 @@ amB
apE
arb
aoH
-apC
-apC
+ayG
+ayP
aso
axL
avs
@@ -114664,9 +113760,9 @@ bVk
cqB
crO
cfw
-cun
-cvx
-cwM
+cuv
+cvz
+cic
cxO
cyW
czO
@@ -114908,7 +114004,7 @@ tST
vtR
pyX
vNb
-bfK
+bdb
bbi
bZU
cfE
@@ -115103,7 +114199,7 @@ apC
apC
apC
apy
-aqV
+aAV
asr
aty
avt
@@ -115165,7 +114261,7 @@ bZD
bZX
caM
bek
-bfK
+bdb
bbi
bZU
bVI
@@ -115362,9 +114458,9 @@ aoL
apz
aqX
asw
-axL
+aBM
avZ
-axf
+aCX
azd
aAv
aHf
@@ -115422,7 +114518,7 @@ bNh
bNh
cbj
bek
-ccS
+bfJ
cej
bZU
bVX
@@ -115604,7 +114700,7 @@ aaa
aaa
abq
aaa
-agD
+aaa
agC
agC
agL
@@ -115619,7 +114715,7 @@ aoh
aoh
aqW
ast
-atB
+axL
avw
axH
azx
@@ -115936,15 +115032,15 @@ bht
deF
bNp
bek
-bdb
+bqR
cek
-ceE
-cuV
+bwI
+bwP
cin
-chy
+bHE
dhq
cjl
-cOM
+cjl
bVr
cqq
ctj
@@ -116105,7 +115201,7 @@ aaa
aaa
aaa
aaa
-sDC
+aaa
aaa
aaa
aaa
@@ -116126,7 +115222,7 @@ aid
aid
aid
alI
-amI
+aid
aid
atK
atK
@@ -116199,7 +115295,7 @@ bZu
bZu
bZu
bZu
-clj
+bgZ
bZO
cqo
cfY
@@ -116207,7 +115303,7 @@ csn
ctE
cmz
cus
-cvD
+cvH
cic
cxU
czc
@@ -116383,14 +115479,14 @@ afr
akC
akO
alK
-amL
aid
alq
alq
alq
alq
alq
-atK
+alq
+alq
awd
awJ
atK
@@ -116402,16 +115498,16 @@ aBE
aAw
akD
aEf
-ayG
-ayG
-ayG
-cmU
-cmU
-ayG
-aAV
+alW
+alW
+alW
+caj
+caj
+alW
+aFT
bVi
-bXQ
-bYF
+bad
+aQC
aTm
aWy
leu
@@ -116423,40 +115519,40 @@ bdi
bex
bfI
bfI
-bjn
+bQG
bfI
bnb
boO
bqu
-oJQ
+bOV
bfI
bfI
byG
-mOc
-mOc
-mOc
-mOc
+bfI
+bfI
+bfI
+bfI
bHM
bJF
bLt
-mOc
+bfI
bOV
bQG
-mOc
-mOc
-mOc
-mOc
-mOc
-mOc
-mOc
+bfI
+bfI
+bme
+bfI
+bfI
+bfI
+bfI
ccr
-bZt
+btC
aYx
cfG
cgM
cio
bZu
-clj
+bgZ
cmz
cmz
cmz
@@ -116640,15 +115736,15 @@ mcY
poJ
xXW
xbe
-msg
aid
alq
alq
alq
alq
alq
-atF
-awl
+alq
+alq
+awp
arR
amO
avl
@@ -116658,7 +115754,7 @@ aze
aAx
aCA
akD
-aEg
+amX
alW
ajg
aBI
@@ -116668,7 +115764,7 @@ aBI
aBI
aBI
aQz
-aQV
+aQC
aTo
aTr
cbe
@@ -116682,8 +115778,8 @@ bgd
bMR
bUM
blg
-bnc
-boP
+blg
+bzR
bqv
bsl
bMR
@@ -116701,7 +115797,7 @@ bfS
bqb
bdb
bdb
-bdb
+bfK
bdb
bdb
bZt
@@ -116713,7 +115809,7 @@ cfA
cgN
cip
bZu
-clj
+bgZ
cmz
cnh
cpT
@@ -116721,7 +115817,7 @@ cqs
crX
cfw
cut
-cvD
+cvH
cwS
cxU
cze
@@ -116896,7 +115992,6 @@ xOM
agj
azE
bPL
-azE
alE
aid
alq
@@ -116904,9 +115999,10 @@ alq
alq
alq
alq
-atF
-alW
-azL
+alq
+alq
+awp
+amI
amO
avm
awG
@@ -116915,7 +116011,7 @@ aze
aBG
aAy
akD
-aEg
+atF
caj
ajg
aKW
@@ -116925,7 +116021,7 @@ aBI
aSJ
aBI
aQA
-aQV
+aQC
udB
eRU
aVO
@@ -116958,7 +116054,7 @@ bsp
bQI
bQI
aUX
-aUX
+bmO
aUX
bQI
bZu
@@ -116970,7 +116066,7 @@ cfB
cgO
ciq
bZu
-clj
+bgZ
cmz
cnG
coS
@@ -117154,15 +116250,15 @@ afr
aBK
bTg
deG
-amV
aid
alq
alq
alq
alq
alq
-atF
-amo
+alq
+alq
+awp
azL
amO
avn
@@ -117172,7 +116268,7 @@ aze
aAz
aze
akD
-aEg
+msg
alW
ajg
aId
@@ -117182,7 +116278,7 @@ aBI
aNK
aBI
aQB
-aQV
+aQC
aTp
ygK
aTu
@@ -117197,7 +116293,7 @@ blM
bjp
bez
bne
-boR
+boY
bqx
blC
ded
@@ -117227,7 +116323,7 @@ baj
cgP
baj
bZv
-clj
+bgZ
cmz
cny
cnI
@@ -117235,7 +116331,7 @@ cnI
crZ
cOm
cuv
-cvD
+cvH
cwL
cxV
cxV
@@ -117246,8 +116342,8 @@ cxV
cxV
cGS
cFC
-cGK
-cHF
+cGH
+cHA
cJF
cJs
cKB
@@ -117411,14 +116507,14 @@ aid
ays
bTf
deC
-amX
aid
alq
alq
alq
alq
alq
-atF
+alq
+alq
awp
dFD
amO
@@ -117429,7 +116525,7 @@ akD
akD
akD
akD
-aEg
+alW
aFT
aFy
aJw
@@ -117439,7 +116535,7 @@ aMp
aJw
aOZ
aQC
-aQV
+aQC
aTq
aUy
aVP
@@ -117669,24 +116765,24 @@ aid
aid
aid
aid
-aid
alq
alq
alq
alq
alq
-atF
-awm
+alq
+alq
+awp
asA
-ayG
-ayG
-ayG
-ayG
-ayG
-ayG
-ayG
-ayG
-aDd
+alW
+alW
+alW
+alW
+alW
+alW
+alW
+alW
+alW
alW
aWv
aGJ
@@ -117696,7 +116792,7 @@ aPS
aPS
aOZ
aQD
-aQW
+aQD
aTo
ygK
aVQ
@@ -117741,7 +116837,7 @@ cbO
cgR
ciC
cjV
-cmS
+cLz
cmz
cnF
coV
@@ -117953,7 +117049,7 @@ aBI
aBI
aBI
aRn
-aQW
+aQD
aTs
spj
aVR
@@ -117968,7 +117064,7 @@ bhD
bjs
bkk
bne
-boR
+boY
bqz
bsm
bsm
@@ -117998,7 +117094,7 @@ uzt
cgS
cjf
bZv
-clj
+bgZ
cmB
cmB
cmB
@@ -118017,7 +117113,7 @@ cEJ
cDI
cEI
cHF
-cGN
+cHF
cHI
cII
cLl
@@ -118210,7 +117306,7 @@ aMr
aTg
aBI
aQI
-aQW
+aQD
aTt
wsx
aTq
@@ -118242,7 +117338,7 @@ bCy
bPa
bQL
bSv
-bSt
+blx
bYs
mAt
cba
@@ -118255,7 +117351,7 @@ cdh
cgT
cjf
bZv
-clj
+bgZ
cmB
cnK
cnK
@@ -118467,7 +117563,7 @@ aBI
aBI
aBI
aVp
-aQV
+aQC
aTu
ygK
aVT
@@ -118482,14 +117578,14 @@ bez
bez
bez
bni
-boR
+boY
bqA
bsp
buq
bwC
byL
bAv
-bCz
+bCy
bEt
bGd
bHQ
@@ -118498,7 +117594,7 @@ bLA
ycU
bHO
bRU
-bSw
+bSt
bSt
bVu
mAt
@@ -118512,7 +117608,7 @@ cdh
bYA
chm
bZv
-clj
+bgZ
cmB
cnK
coW
@@ -118724,7 +117820,7 @@ aMs
aNM
aBI
aVm
-aQV
+aQC
aTu
ygK
aVU
@@ -118739,23 +117835,23 @@ bhF
aoG
bll
bne
-boR
+boY
bqx
bsp
bwp
-bwD
+bEv
byM
bsp
bEE
-bCy
+biL
bIE
-bHO
-hwe
+biW
+bkC
bLw
bCy
bPb
bQK
-bSw
+bSt
bSt
keY
vfe
@@ -118769,7 +117865,7 @@ cde
edg
cjf
bZv
-clo
+hLt
cmB
cnK
cnK
@@ -118981,7 +118077,7 @@ aBI
aBI
aBI
aVr
-aRV
+aQC
aTu
jCi
aVV
@@ -118996,11 +118092,11 @@ asJ
aoG
blm
bne
-boR
+boY
bqx
bsp
bus
-bwE
+bEv
byN
bsp
bsp
@@ -119015,8 +118111,8 @@ bQI
bSx
bUe
bUe
-bNx
-bNz
+bSy
+gMS
bZy
cbW
cbN
@@ -119026,7 +118122,7 @@ cfD
bYC
cjZ
bZv
-clj
+bgZ
cmB
cnL
coY
@@ -119253,7 +118349,7 @@ buC
aoG
aoG
bne
-boR
+boY
buV
bsp
bxe
@@ -119283,7 +118379,7 @@ cdh
bYB
cjf
bZv
-clj
+bgZ
cmB
cnM
cnK
@@ -119487,7 +118583,7 @@ aPW
avr
aFK
aFG
-aGN
+aJE
aIl
aJD
aLe
@@ -119540,7 +118636,7 @@ cdh
bYB
ckS
bZv
-clj
+bgZ
cmB
cnN
cnK
@@ -119748,8 +118844,8 @@ aGO
aIp
qTK
aLf
-aLf
-aLf
+aQW
+aQW
bVo
aQL
aRY
@@ -119767,11 +118863,11 @@ ape
aoG
aoG
bne
-boR
+boY
bqx
aoG
buv
-bwP
+cnR
aoG
bAx
bCC
@@ -119797,7 +118893,7 @@ imQ
gaa
cku
bZv
-clj
+bgZ
cmB
cnK
cnK
@@ -120024,11 +119120,11 @@ aaa
aaa
blo
bnk
-boW
+bpb
bqC
aoG
bxI
-bwI
+asJ
aoG
bsp
bEP
@@ -120054,7 +119150,7 @@ cfM
cgl
cll
bZv
-clj
+bgZ
cmB
cmB
cmB
@@ -120247,21 +119343,21 @@ amc
amc
apW
arm
-asC
+aDd
atR
aBy
gQu
ayc
azZ
awR
-aBM
+aFI
aCW
aEo
aFI
aGQ
aJF
fUI
-aLf
+aQV
aMy
aNQ
aUf
@@ -120280,7 +119376,7 @@ beC
aZK
beC
beC
-bnl
+bne
boX
bqD
bsq
@@ -120512,7 +119608,7 @@ ayd
azj
azj
aBO
-aCX
+azj
aEp
aFJ
aGR
@@ -120537,7 +119633,7 @@ bgm
bhI
bjv
beC
-bnm
+bne
boY
bqx
aoG
@@ -120545,8 +119641,8 @@ aoG
bbE
aoG
bAz
-bCG
-bEz
+bEv
+bEA
bEv
bCH
bJM
@@ -120568,7 +119664,7 @@ cfS
bZC
chr
bZv
-clr
+bqV
aoG
aoG
aoG
@@ -120795,7 +119891,7 @@ bhJ
bjw
beC
bnn
-boR
+boY
bqE
aoG
buy
@@ -120804,10 +119900,10 @@ aoG
bCJ
bCH
bEA
-bGl
-bHE
+bCH
+bvz
bHI
-bIh
+bvz
bCH
bEv
bQT
@@ -120816,7 +119912,7 @@ bUj
bUj
bXn
bPO
-cal
+cao
caS
bQI
cdk
@@ -120825,7 +119921,7 @@ cfR
bZB
cgV
bZv
-cnP
+bwZ
asJ
coI
aoG
@@ -121052,7 +120148,7 @@ bbx
beC
beC
bne
-boR
+boY
buV
aoG
buz
@@ -121064,7 +120160,7 @@ bEB
bHU
bHU
nhP
-bLH
+bHU
bHU
bPd
bEG
@@ -121079,10 +120175,10 @@ bQI
bZv
bZv
bZv
-caV
+cjV
ciA
bZv
-kUj
+azy
asJ
asI
aoG
@@ -121309,7 +120405,7 @@ bhL
bjx
bbH
bne
-boR
+boY
bqx
aoG
arr
@@ -121332,14 +120428,14 @@ bXo
bEG
cap
cdi
-mcn
-mcn
+aGW
+aGW
cex
-mcn
-chD
+aGW
clq
-mcn
-ceA
+clq
+aGW
+bal
asJ
coM
aoG
@@ -121541,7 +120637,7 @@ avv
aAJ
aBR
avv
-aEu
+gip
avv
aIc
aIs
@@ -121575,23 +120671,23 @@ bCe
bAB
aoG
bED
-bHW
-bHW
+biM
+biM
gIN
bLJ
-bKm
-bKm
+bLJ
+bLJ
bQU
bTQ
uBN
bVB
bXp
bEG
-bXi
-bYy
+asJ
+azy
asJ
asJ
-kUj
+azy
asJ
asJ
asJ
@@ -121798,7 +120894,7 @@ avv
aCi
aBS
avv
-aEu
+gip
avv
aIm
aIt
@@ -121841,14 +120937,14 @@ bPg
bEG
bTP
bUl
-bUl
+bnc
bXq
bEG
caI
caX
asI
asI
-cez
+bak
bxI
asI
aoG
@@ -122080,7 +121176,7 @@ bhJ
bnJ
bbH
bne
-boR
+boY
bqx
aoG
aoG
@@ -122102,10 +121198,10 @@ bVD
bXr
bEG
asJ
-kUj
+azy
arr
asI
-kUj
+azy
asJ
cis
buC
@@ -122358,11 +121454,11 @@ bEG
bVE
bEG
bEG
-bZF
-ofz
+bah
+bal
bdl
asI
-kUj
+azy
asJ
cir
buC
@@ -122607,19 +121703,19 @@ aGW
aGW
aGW
bOy
-bNF
-bNF
-bNF
-bSC
-bNF
+aGW
+aGW
+aGW
+aNR
+aGW
bWT
bNF
bNF
ofz
caZ
-cbX
-asI
-kUj
+bpj
+bwD
+azy
asJ
cfK
cfK
@@ -122875,8 +121971,8 @@ aoG
aoG
aoG
asI
-asI
-kUj
+bwE
+azy
asJ
cfK
ciD
@@ -123108,7 +122204,7 @@ bmm
bnM
bam
bne
-boR
+boY
bqK
bqx
bwo
@@ -123133,7 +122229,7 @@ bVL
aoG
cbX
cdm
-ceA
+bal
asJ
cfK
chs
@@ -124639,8 +123735,8 @@ aIA
aWn
aIA
aWm
-aXz
-aZw
+aIB
+aJO
bcr
bam
bam
@@ -124651,8 +123747,8 @@ bam
bam
bnw
bpi
-bqQ
-bqR
+bpn
+bsz
dqh
bAs
bjN
@@ -124907,9 +124003,9 @@ bkT
aFR
bmu
bnx
-bpj
-bqR
+bpi
bpn
+bsz
dqh
bAr
bjN
@@ -125136,7 +124232,7 @@ avC
awL
aAL
ayr
-atA
+aCZ
aCa
aCg
aFM
@@ -125165,7 +124261,7 @@ bmh
bof
bny
bpk
-foM
+bfM
mDj
buJ
bzv
@@ -125653,8 +124749,8 @@ azs
aCg
aEy
aEz
-aHa
-hXk
+aHg
+iof
aCg
vRY
aJZ
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm
index f14c68812b4..11f658476d3 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm
@@ -3395,16 +3395,12 @@
/area/ruin/space/ancientstation/rnd)
"hU" = (
/obj/effect/decal/cleanable/dirt,
-/obj/machinery/particle_accelerator/control_box{
- icon = 'icons/obj/machines/particle_accelerator3.dmi'
- },
+/obj/machinery/particle_accelerator/control_box,
/turf/simulated/floor/plating,
/area/ruin/space/ancientstation/thetacorridor)
"hV" = (
/obj/effect/decal/cleanable/dirt,
-/obj/structure/particle_accelerator/particle_emitter/right{
- icon = 'icons/obj/machines/particle_accelerator3.dmi'
- },
+/obj/structure/particle_accelerator/particle_emitter/right,
/turf/simulated/floor/plating,
/area/ruin/space/ancientstation/thetacorridor)
"hW" = (
@@ -4029,9 +4025,7 @@
/area/ruin/space/ancientstation/thetacorridor)
"jm" = (
/obj/effect/decal/cleanable/dirt,
-/obj/structure/particle_accelerator/particle_emitter/center{
- icon = 'icons/obj/machines/particle_accelerator3.dmi'
- },
+/obj/structure/particle_accelerator/particle_emitter/center,
/turf/simulated/floor/plating,
/area/ruin/space/ancientstation/thetacorridor)
"jn" = (
@@ -4747,23 +4741,17 @@
/area/ruin/space/ancientstation/thetacorridor)
"kT" = (
/obj/effect/decal/cleanable/dirt,
-/obj/structure/particle_accelerator/particle_emitter/left{
- icon = 'icons/obj/machines/particle_accelerator3.dmi'
- },
+/obj/structure/particle_accelerator/particle_emitter/left,
/turf/simulated/floor/plating,
/area/ruin/space/ancientstation/thetacorridor)
"kU" = (
/obj/effect/decal/cleanable/dirt,
-/obj/structure/particle_accelerator/fuel_chamber{
- icon = 'icons/obj/machines/particle_accelerator3.dmi'
- },
+/obj/structure/particle_accelerator/fuel_chamber,
/turf/simulated/floor/plating,
/area/ruin/space/ancientstation/thetacorridor)
"kV" = (
/obj/effect/decal/cleanable/dirt,
-/obj/structure/particle_accelerator/end_cap{
- icon = 'icons/obj/machines/particle_accelerator3.dmi'
- },
+/obj/structure/particle_accelerator/end_cap,
/turf/simulated/floor/plating,
/area/ruin/space/ancientstation/thetacorridor)
"kW" = (
@@ -4785,9 +4773,7 @@
/area/ruin/space/ancientstation/rnd)
"kY" = (
/obj/effect/decal/cleanable/dirt,
-/obj/structure/particle_accelerator/power_box{
- icon = 'icons/obj/machines/particle_accelerator3.dmi'
- },
+/obj/structure/particle_accelerator/power_box,
/turf/simulated/floor/plating,
/area/ruin/space/ancientstation/thetacorridor)
"kZ" = (
diff --git a/code/__DEFINES/MC.dm b/code/__DEFINES/MC.dm
index e2068cecb89..bf1b7426288 100644
--- a/code/__DEFINES/MC.dm
+++ b/code/__DEFINES/MC.dm
@@ -66,6 +66,7 @@
/datum/controller/subsystem/##X/New(){\
NEW_SS_GLOBAL(SS##X);\
PreInit();\
+ ss_id=#X;\
}\
/datum/controller/subsystem/##X
@@ -73,5 +74,6 @@
/datum/controller/subsystem/processing/##X/New(){\
NEW_SS_GLOBAL(SS##X);\
PreInit();\
+ ss_id="processing_[#X]";\
}\
/datum/controller/subsystem/processing/##X
diff --git a/code/__DEFINES/layers.dm b/code/__DEFINES/layers.dm
index d9b98c7724f..4950beb7e74 100644
--- a/code/__DEFINES/layers.dm
+++ b/code/__DEFINES/layers.dm
@@ -118,5 +118,8 @@
#define SPLASHSCREEN_LAYER 23
#define SPLASHSCREEN_PLANE 23
+// This should always be on top.
+#define HUD_PLANE_BUILDMODE 30
+
///Plane master controller keys
#define PLANE_MASTERS_GAME "plane_masters_game"
diff --git a/code/__DEFINES/subsystems.dm b/code/__DEFINES/subsystems.dm
index ed76f6fd3ff..ac0972850ea 100644
--- a/code/__DEFINES/subsystems.dm
+++ b/code/__DEFINES/subsystems.dm
@@ -45,7 +45,8 @@
// Subsystems shutdown in the reverse of the order they initialize in
// The numbers just define the ordering, they are meaningless otherwise.
#define INIT_ORDER_PROFILER 101
-#define INIT_ORDER_TITLE 100 // Load this quickly so people dont see a blank lobby screen
+#define INIT_ORDER_QUEUE 100 // Load this quickly so people cant queue skip
+#define INIT_ORDER_TITLE 99 // Load this quickly so people dont see a blank lobby screen
#define INIT_ORDER_GARBAGE 21
#define INIT_ORDER_DBCORE 20
#define INIT_ORDER_BLACKBOX 19
diff --git a/code/__HELPERS/time.dm b/code/__HELPERS/time.dm
index 5f6e01e93ed..a4b9d572154 100644
--- a/code/__HELPERS/time.dm
+++ b/code/__HELPERS/time.dm
@@ -203,5 +203,6 @@ GLOBAL_VAR_INIT(midnight_rollovers, 0)
GLOBAL_VAR_INIT(rollovercheck_last_timeofday, 0)
/proc/update_midnight_rollover()
if(world.timeofday < GLOB.rollovercheck_last_timeofday) //TIME IS GOING BACKWARDS!
- return GLOB.midnight_rollovers++
+ GLOB.midnight_rollovers++
+ GLOB.rollovercheck_last_timeofday = world.timeofday
return GLOB.midnight_rollovers
diff --git a/code/_globalvars/lists/reagents.dm b/code/_globalvars/lists/reagents.dm
index 0684be758cd..9477c91fd04 100644
--- a/code/_globalvars/lists/reagents.dm
+++ b/code/_globalvars/lists/reagents.dm
@@ -44,7 +44,8 @@ GLOBAL_LIST_INIT(drinks, list("beer2","hot_coco","orangejuice","tomatojuice","li
"vodkatonic","ginfizz","bahama_mama","singulo","sbiten","devilskiss","red_mead",
"mead","iced_beer","grog","aloe","andalusia","alliescocktail","soy_latte",
"cafe_latte","acidspit","amasec","neurotoxin","hippiesdelight","bananahonk",
- "silencer","changelingsting","irishcarbomb","syndicatebomb","erikasurprise","driestmartini", "flamingmoe"))
+ "silencer","changelingsting","irishcarbomb","syndicatebomb","erikasurprise","driestmartini", "flamingmoe",
+ "arnold_palmer","gimlet","sidecar","whiskeysour","mintjulep","pinacolada"))
//Liver Toxins list
GLOBAL_LIST_INIT(liver_toxins, list("toxin", "plasma", "sacid", "facid", "cyanide","amanitin", "carpotoxin"))
diff --git a/code/_globalvars/misc.dm b/code/_globalvars/misc.dm
index 40dfb374170..49bef9c90cd 100644
--- a/code/_globalvars/misc.dm
+++ b/code/_globalvars/misc.dm
@@ -50,8 +50,6 @@ GLOBAL_VAR_INIT(copier_items_printed_logged, FALSE)
GLOBAL_DATUM_INIT(data_core, /datum/datacore, new) // Station datacore, manifest, etc
-GLOBAL_VAR_INIT(panic_bunker_enabled, FALSE) // Is the panic bunker enabled
-
GLOBAL_LIST_EMPTY(ability_verbs) // Create-level abilities
GLOBAL_LIST_INIT(pipe_colors, list("grey" = PIPE_COLOR_GREY, "red" = PIPE_COLOR_RED, "blue" = PIPE_COLOR_BLUE, "cyan" = PIPE_COLOR_CYAN, "green" = PIPE_COLOR_GREEN, "yellow" = PIPE_COLOR_YELLOW, "purple" = PIPE_COLOR_PURPLE))
diff --git a/code/_onclick/ai.dm b/code/_onclick/ai.dm
index b023aaa4dd0..74453f47c62 100644
--- a/code/_onclick/ai.dm
+++ b/code/_onclick/ai.dm
@@ -67,6 +67,9 @@
if(modifiers["shift"] && modifiers["alt"])
AltShiftClickOn(A)
return
+ if(modifiers["shift"] && modifiers["middle"])
+ ShiftMiddleClickOn(A)
+ return
if(modifiers["middle"])
MiddleClickOn(A)
if(controlled_mech) //Are we piloting a mech? Placed here so the modifiers are not overridden.
@@ -128,6 +131,8 @@
A.AICtrlShiftClick(src)
/mob/living/silicon/ai/AltShiftClickOn(atom/A)
A.AIAltShiftClick(src)
+/mob/living/silicon/ai/ShiftMiddleClickOn(atom/A)
+ A.AIShiftMiddleClick(src)
/mob/living/silicon/ai/ShiftClickOn(atom/A)
A.AIShiftClick(src)
/mob/living/silicon/ai/CtrlClickOn(atom/A)
@@ -148,6 +153,9 @@
/atom/proc/AIAltShiftClick()
return
+/atom/proc/AIShiftMiddleClick()
+ return
+
/atom/proc/AIShiftClick(mob/living/user) // borgs use this too
if(user.client)
user.examinate(src)
@@ -215,3 +223,8 @@
if(!ai_control_check(user))
return
toggle_light(user)
+
+/obj/machinery/door/airlock/AIShiftMiddleClick(mob/user) // Toggles door timings.
+ if(!ai_control_check(user))
+ return
+ toggle_speed(user)
diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm
index 77a4ae192f1..cb483601e26 100644
--- a/code/_onclick/click.dm
+++ b/code/_onclick/click.dm
@@ -363,9 +363,11 @@
A.AltShiftClick(src)
return
-/atom/proc/AltShiftClick(mob/user)
+/mob/proc/ShiftMiddleClickOn(atom/A)
return
+/atom/proc/AltShiftClick(mob/user)
+ return
/*
Misc helpers
diff --git a/code/_onclick/cyborg.dm b/code/_onclick/cyborg.dm
index 40fcfc82671..706c9304e20 100644
--- a/code/_onclick/cyborg.dm
+++ b/code/_onclick/cyborg.dm
@@ -30,6 +30,9 @@
if(modifiers["middle"] && modifiers["ctrl"])
CtrlMiddleClickOn(A)
return
+ if(modifiers["shift"] && modifiers["middle"])
+ ShiftMiddleClickOn(A)
+ return
if(modifiers["middle"])
MiddleClickOn(A)
return
@@ -126,7 +129,8 @@
A.BorgCtrlShiftClick(src)
/mob/living/silicon/robot/AltShiftClickOn(atom/A)
A.BorgAltShiftClick(src)
-
+/mob/living/silicon/robot/ShiftMiddleClickOn(atom/A)
+ A.BorgShiftMiddleClick(src)
/atom/proc/BorgShiftClick(mob/user)
if(user.client && user.client.eye == user)
@@ -148,6 +152,8 @@
/atom/proc/BorgAltShiftClick()
return
+/atom/proc/BorgShiftMiddleClick()
+ return
// AIRLOCKS
@@ -163,6 +169,8 @@
/obj/machinery/door/airlock/BorgAltShiftClick(mob/living/silicon/robot/user) // Enables emergency override on doors! Forwards to AI code.
AIAltShiftClick(user)
+/obj/machinery/door/airlock/BorgShiftMiddleClick(mob/living/silicon/robot/user) //Toggles door timing. Forwards to AI code.
+ AIShiftMiddleClick(user)
// APC
diff --git a/code/_onclick/hud/_defines.dm b/code/_onclick/hud/_defines.dm
index 91fe0c99bf7..57401e9dde1 100644
--- a/code/_onclick/hud/_defines.dm
+++ b/code/_onclick/hud/_defines.dm
@@ -176,8 +176,3 @@
//1 = standard hud
//2 = reduced hud (just hands and intent switcher)
//3 = no hud (for screenshots)
-
-
-#define HUD_LAYER_SCREEN 20
-
-#define HUD_LAYER_BUILDMODE 30
diff --git a/code/controllers/configuration/configuration_core.dm b/code/controllers/configuration/configuration_core.dm
index c4938d3efc6..d9494c31652 100644
--- a/code/controllers/configuration/configuration_core.dm
+++ b/code/controllers/configuration/configuration_core.dm
@@ -32,7 +32,9 @@ GLOBAL_DATUM_INIT(configuration, /datum/server_configuration, new())
var/datum/configuration_section/logging_configuration/logging
/// Holder for the MC configuration datum
var/datum/configuration_section/mc_configuration/mc
- /// Holder for the MC configuration datum
+ /// Holder for the metrics configuration datum
+ var/datum/configuration_section/metrics_configuration/metrics
+ /// Holder for the movement configuration datum
var/datum/configuration_section/movement_configuration/movement
/// Holder for the overflow configuration datum
var/datum/configuration_section/overflow_configuration/overflow
@@ -71,6 +73,7 @@ GLOBAL_DATUM_INIT(configuration, /datum/server_configuration, new())
jobs = new()
logging = new()
mc = new()
+ metrics = new()
movement = new()
overflow = new()
ruins = new()
@@ -99,6 +102,7 @@ GLOBAL_DATUM_INIT(configuration, /datum/server_configuration, new())
jobs.load_data(raw_config_data["job_configuration"])
logging.load_data(raw_config_data["logging_configuration"])
mc.load_data(raw_config_data["mc_configuration"])
+ metrics.load_data(raw_config_data["metrics_configuration"])
movement.load_data(raw_config_data["movement_configuration"])
overflow.load_data(raw_config_data["overflow_configuration"])
ruins.load_data(raw_config_data["ruin_configuration"])
diff --git a/code/controllers/configuration/sections/general_configuration.dm b/code/controllers/configuration/sections/general_configuration.dm
index 296304c28b7..816775fa6d9 100644
--- a/code/controllers/configuration/sections/general_configuration.dm
+++ b/code/controllers/configuration/sections/general_configuration.dm
@@ -14,8 +14,6 @@
var/lobby_time = 240
/// Ban all Guest BYOND accounts
var/guest_ban = TRUE
- /// Player threshold to automatically enable panic bunker
- var/panic_bunker_threshold = 150
/// Allow players to use AntagHUD?
var/allow_antag_hud = TRUE
/// Forbid players from rejoining if they use AntagHUD?
@@ -121,7 +119,6 @@
// Numbers
CONFIG_LOAD_NUM(lobby_time, data["lobby_time"])
- CONFIG_LOAD_NUM(panic_bunker_threshold, data["panic_bunker_threshold"])
CONFIG_LOAD_NUM(base_loadout_points, data["base_loadout_points"])
CONFIG_LOAD_NUM(cryo_penalty_period, data["cryo_penalty_period"])
CONFIG_LOAD_NUM(minimum_client_build, data["minimum_client_build"])
diff --git a/code/controllers/configuration/sections/metrics_configuration.dm b/code/controllers/configuration/sections/metrics_configuration.dm
new file mode 100644
index 00000000000..e35e0c7a74c
--- /dev/null
+++ b/code/controllers/configuration/sections/metrics_configuration.dm
@@ -0,0 +1,17 @@
+/// Config holder for stuff relating to metrics management
+/datum/configuration_section/metrics_configuration
+ // NO EDITS OR READS TO THIS EVER
+ protection_state = PROTECTION_PRIVATE
+ /// Are metrics enabled or disabled
+ var/enable_metrics = FALSE
+ /// Endpoint to send metrics to, including protocol
+ var/metrics_endpoint = null
+ /// Endpoint authorisation API key
+ var/metrics_api_token = null
+
+/datum/configuration_section/metrics_configuration/load_data(list/data)
+ // Use the load wrappers here. That way the default isnt made 'null' if you comment out the config line
+ CONFIG_LOAD_BOOL(enable_metrics, data["enable_metrics"])
+
+ CONFIG_LOAD_STR(metrics_endpoint, data["metrics_endpoint"])
+ CONFIG_LOAD_STR(metrics_api_token, data["metrics_api_token"])
diff --git a/code/controllers/subsystem.dm b/code/controllers/subsystem.dm
index f187fb7a9b9..58216c38233 100644
--- a/code/controllers/subsystem.dm
+++ b/code/controllers/subsystem.dm
@@ -2,6 +2,8 @@
/datum/controller/subsystem
// Metadata; you should define these.
name = "fire codertrain" //name of the subsystem
+ /// Subsystem ID. Used for when we need a technical name for the SS
+ var/ss_id = "fire_codertrain_again"
var/init_order = INIT_ORDER_DEFAULT //order of initialization. Higher numbers are initialized first, lower numbers later. Use defines in __DEFINES/subsystems.dm for easy understanding of order.
var/wait = 20 //time to wait (in deciseconds) between each call to fire(). Must be a positive integer.
var/priority = FIRE_PRIORITY_DEFAULT //When mutiple subsystems need to run in the same tick, higher priority subsystems will run first and be given a higher share of the tick before MC_TICK_CHECK triggers a sleep
@@ -227,3 +229,17 @@
if("queued_priority") //editing this breaks things.
return 0
. = ..()
+
+/**
+ * Returns the metrics for the subsystem.
+ *
+ * This can be overriden on subtypes for variables that could affect tick usage
+ * Example: ATs on SSair
+ */
+/datum/controller/subsystem/proc/get_metrics()
+ SHOULD_CALL_PARENT(TRUE)
+ var/list/out = list()
+ out["cost"] = cost
+ out["tick_usage"] = tick_usage
+ out["custom"] = list() // Override as needed on child
+ return out
diff --git a/code/controllers/subsystem/acid.dm b/code/controllers/subsystem/acid.dm
index 119d82113d7..3dbea1c3c15 100644
--- a/code/controllers/subsystem/acid.dm
+++ b/code/controllers/subsystem/acid.dm
@@ -11,6 +11,11 @@ SUBSYSTEM_DEF(acid)
/datum/controller/subsystem/acid/stat_entry()
..("P:[processing.len]")
+/datum/controller/subsystem/acid/get_metrics()
+ . = ..()
+ var/list/cust = list()
+ cust["processing"] = length(processing)
+ .["custom"] = cust
/datum/controller/subsystem/acid/fire(resumed = 0)
if(!resumed)
diff --git a/code/controllers/subsystem/air.dm b/code/controllers/subsystem/air.dm
index 324df11b8d1..6df1d4a1ba4 100644
--- a/code/controllers/subsystem/air.dm
+++ b/code/controllers/subsystem/air.dm
@@ -66,6 +66,12 @@ SUBSYSTEM_DEF(air)
msg += "AT/MS:[round((cost ? active_turfs.len/cost : 0),0.1)]"
..(msg)
+/datum/controller/subsystem/air/get_metrics()
+ . = ..()
+ var/list/cust = list()
+ cust["active_turfs"] = length(active_turfs)
+ cust["hotspots"] = length(hotspots)
+ .["custom"] = cust
/datum/controller/subsystem/air/Initialize(timeofday)
setup_overlays() // Assign icons and such for gas-turf-overlays
diff --git a/code/controllers/subsystem/fires.dm b/code/controllers/subsystem/fires.dm
index 65adebb6639..2481891000c 100644
--- a/code/controllers/subsystem/fires.dm
+++ b/code/controllers/subsystem/fires.dm
@@ -12,6 +12,12 @@ SUBSYSTEM_DEF(fires)
..("P:[processing.len]")
+/datum/controller/subsystem/fires/get_metrics()
+ . = ..()
+ var/list/cust = list()
+ cust["processing"] = length(processing)
+ .["custom"] = cust
+
/datum/controller/subsystem/fires/fire(resumed = 0)
if(!resumed)
src.currentrun = processing.Copy()
diff --git a/code/controllers/subsystem/garbage.dm b/code/controllers/subsystem/garbage.dm
index e66b93b6eda..03f630148e0 100644
--- a/code/controllers/subsystem/garbage.dm
+++ b/code/controllers/subsystem/garbage.dm
@@ -61,6 +61,22 @@ SUBSYSTEM_DEF(garbage)
msg += " | Fail:[fail_counts.Join(",")]"
..(msg)
+/datum/controller/subsystem/garbage/get_metrics()
+ . = ..()
+ var/list/cust = list()
+ if((delslasttick + gcedlasttick) == 0) // Account for DIV0
+ cust["gcr"] = 0
+ else
+ cust["gcr"] = (gcedlasttick / (delslasttick + gcedlasttick))
+ cust["total_harddels"] = totaldels
+ cust["total_softdels"] = totalgcs
+ var/i = 0
+ for(var/list/L in queues)
+ i++
+ cust["queue_[i]"] = length(L)
+
+ .["custom"] = cust
+
/datum/controller/subsystem/garbage/Shutdown()
//Adds the del() log to the qdel log file
var/list/dellog = list()
diff --git a/code/controllers/subsystem/lighting.dm b/code/controllers/subsystem/lighting.dm
index e12c6be07df..f197fbc735e 100644
--- a/code/controllers/subsystem/lighting.dm
+++ b/code/controllers/subsystem/lighting.dm
@@ -11,6 +11,14 @@ SUBSYSTEM_DEF(lighting)
/datum/controller/subsystem/lighting/stat_entry()
..("L:[length(sources_queue)]|C:[length(corners_queue)]|O:[length(objects_queue)]")
+/datum/controller/subsystem/lighting/get_metrics()
+ . = ..()
+ var/list/cust = list()
+ cust["sources_queue"] = length(sources_queue)
+ cust["corners_queue"] = length(corners_queue)
+ cust["objects_queue"] = length(objects_queue)
+ .["custom"] = cust
+
/datum/controller/subsystem/lighting/Initialize(timeofday)
if(!initialized)
if(GLOB.configuration.general.starlight)
diff --git a/code/controllers/subsystem/machinery.dm b/code/controllers/subsystem/machinery.dm
index cebc6a5f768..96eac799ae0 100644
--- a/code/controllers/subsystem/machinery.dm
+++ b/code/controllers/subsystem/machinery.dm
@@ -20,6 +20,12 @@ SUBSYSTEM_DEF(machines)
fire()
return ..()
+/datum/controller/subsystem/machines/get_metrics()
+ . = ..()
+ var/list/cust = list()
+ cust["processing"] = length(processing)
+ .["custom"] = cust
+
/datum/controller/subsystem/machines/proc/makepowernets()
for(var/datum/powernet/PN in powernets)
qdel(PN)
diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm
index 014b247ba9e..c6e3562bd97 100644
--- a/code/controllers/subsystem/mapping.dm
+++ b/code/controllers/subsystem/mapping.dm
@@ -62,7 +62,7 @@ SUBSYSTEM_DEF(mapping)
log_startup_progress("Populating lavaland...")
var/lavaland_setup_timer = start_watch()
seedRuins(list(level_name_to_num(MINING)), GLOB.configuration.ruins.lavaland_ruin_budget, /area/lavaland/surface/outdoors/unexplored, GLOB.lava_ruins_templates)
- spawn_rivers(list(level_name_to_num(MINING)))
+ spawn_rivers(level_name_to_num(MINING))
log_startup_progress("Successfully populated lavaland in [stop_watch(lavaland_setup_timer)]s.")
// Now we make a list of areas for teleport locs
diff --git a/code/controllers/subsystem/metrics.dm b/code/controllers/subsystem/metrics.dm
new file mode 100644
index 00000000000..7ebaadfae77
--- /dev/null
+++ b/code/controllers/subsystem/metrics.dm
@@ -0,0 +1,47 @@
+SUBSYSTEM_DEF(metrics)
+ name = "Metrics"
+ wait = 30 SECONDS
+ offline_implications = "Server metrics will no longer be ingested into monitoring systems. No immediate action is needed."
+ runlevels = RUNLEVEL_LOBBY | RUNLEVEL_SETUP | RUNLEVEL_GAME | RUNLEVEL_POSTGAME // ALL THE LEVELS
+ flags = SS_KEEP_TIMING // This needs to ingest every 30 IRL seconds, not ingame seconds.
+ /// The real time of day the server started. Used to calculate time drift
+ var/world_init_time = 0 // Not set in here. Set in world/New()
+
+/datum/controller/subsystem/metrics/Initialize(start_timeofday)
+ if(!GLOB.configuration.metrics.enable_metrics)
+ flags |= SS_NO_FIRE // Disable firing to save CPU
+ return ..()
+
+
+/datum/controller/subsystem/metrics/fire(resumed)
+ SShttp.create_async_request(RUSTG_HTTP_METHOD_POST, GLOB.configuration.metrics.metrics_endpoint, get_metrics_json(), list(
+ "Authorization" = "ApiKey [GLOB.configuration.metrics.metrics_api_token]",
+ "Content-Type" = "application/json"
+ ))
+
+/datum/controller/subsystem/metrics/proc/get_metrics_json()
+ var/list/out = list()
+ out["@timestamp"] = time_stamp() // This is required by ElasticSearch, complete with this name. DO NOT REMOVE THIS.
+ out["cpu"] = world.cpu
+ // out["maptick"] = world.map_cpu // TODO: 514
+ out["elapsed_processed"] = world.time
+ out["elapsed_real"] = (REALTIMEOFDAY - world_init_time)
+ out["client_count"] = length(GLOB.clients)
+ out["round_id"] = text2num(GLOB.round_id) // This is so we can filter the metrics by a single round ID
+
+ // Funnel in all SS metrics
+ var/list/ss_data = list()
+ for(var/datum/controller/subsystem/SS in Master.subsystems)
+ ss_data[SS.ss_id] = SS.get_metrics()
+
+ out["subsystems"] = ss_data
+ // And send it all
+ return json_encode(out)
+
+/*
+
+// Uncomment this if you add new metrics to verify how the JSON formats
+
+/client/verb/debugmetricts()
+ usr << browse(SSmetrics.get_metrics_json(), "window=aadebug")
+*/
diff --git a/code/controllers/subsystem/mobs.dm b/code/controllers/subsystem/mobs.dm
index e024a1f3d4e..def8a807853 100644
--- a/code/controllers/subsystem/mobs.dm
+++ b/code/controllers/subsystem/mobs.dm
@@ -12,6 +12,12 @@ SUBSYSTEM_DEF(mobs)
/// The amount of giant spiders that exist in the world. Used for mob capping.
var/giant_spiders = 0
+/datum/controller/subsystem/mobs/get_metrics()
+ . = ..()
+ var/list/cust = list()
+ cust["processing"] = length(GLOB.mob_living_list)
+ .["custom"] = cust
+
/datum/controller/subsystem/mobs/stat_entry()
..("P:[GLOB.mob_living_list.len]")
diff --git a/code/controllers/subsystem/processing/processing.dm b/code/controllers/subsystem/processing/processing.dm
index 5302314589d..b08aae88a23 100644
--- a/code/controllers/subsystem/processing/processing.dm
+++ b/code/controllers/subsystem/processing/processing.dm
@@ -14,6 +14,12 @@ SUBSYSTEM_DEF(processing)
/datum/controller/subsystem/processing/stat_entry()
..("[stat_tag]:[processing.len]")
+/datum/controller/subsystem/processing/get_metrics()
+ . = ..()
+ var/list/cust = list()
+ cust["processing"] = length(processing)
+ .["custom"] = cust
+
/datum/controller/subsystem/processing/fire(resumed = 0)
if(!resumed)
currentrun = processing.Copy()
diff --git a/code/controllers/subsystem/server_queue.dm b/code/controllers/subsystem/server_queue.dm
new file mode 100644
index 00000000000..7855c870918
--- /dev/null
+++ b/code/controllers/subsystem/server_queue.dm
@@ -0,0 +1,45 @@
+#define QUEUE_DATA_FILE "data/queue_data.json"
+// These are defines for the sake of making sure we get the right keys
+#define QUEUE_DATA_FILE_THRESHOLD_KEY "threshold"
+#define QUEUE_DATA_FILE_ENABLED_KEY "enabled"
+#define QUEUE_DATA_FILE_PERSISTENT_KEY "persistent"
+
+SUBSYSTEM_DEF(queue)
+ name = "Server Queue"
+ init_order = INIT_ORDER_QUEUE // 100
+ flags = SS_NO_FIRE
+ /// Threshold of players to queue new people
+ var/queue_threshold = 0
+ /// Whether the queue is enabled or not
+ var/queue_enabled = FALSE
+ /// Whether to persist these settings over multiple rounds
+ var/persist_queue = FALSE
+ /// List of ckeys allowed to bypass queue this round
+ var/list/queue_bypass_list = list()
+ /// Last world.time we let a ckey in. 3 second delay between each letin to avoid a mass bubble
+ var/last_letin_time = 0
+
+/datum/controller/subsystem/queue/Initialize(start_timeofday)
+ if(fexists(QUEUE_DATA_FILE))
+ try
+ var/F = file2text(QUEUE_DATA_FILE)
+ var/list/data = json_decode(F)
+ queue_threshold = data[QUEUE_DATA_FILE_THRESHOLD_KEY]
+ queue_enabled = data[QUEUE_DATA_FILE_ENABLED_KEY]
+ persist_queue = data[QUEUE_DATA_FILE_PERSISTENT_KEY]
+ catch
+ stack_trace("Failed to load [QUEUE_DATA_FILE] from disk due to malformed JSON. You may need to setup the queue again.")
+
+ return ..()
+
+/datum/controller/subsystem/queue/Shutdown()
+ // Save if persistent
+ if(persist_queue)
+ if(fexists(QUEUE_DATA_FILE))
+ fdel(QUEUE_DATA_FILE)
+ var/data = list()
+ data[QUEUE_DATA_FILE_THRESHOLD_KEY] = queue_threshold
+ data[QUEUE_DATA_FILE_ENABLED_KEY] = queue_enabled
+ data[QUEUE_DATA_FILE_PERSISTENT_KEY] = persist_queue
+ var/json_data = json_encode(data)
+ text2file(json_data, QUEUE_DATA_FILE)
diff --git a/code/controllers/subsystem/spacedrift.dm b/code/controllers/subsystem/spacedrift.dm
index d9c46f9c9d7..8dd64dced5f 100644
--- a/code/controllers/subsystem/spacedrift.dm
+++ b/code/controllers/subsystem/spacedrift.dm
@@ -12,6 +12,11 @@ SUBSYSTEM_DEF(spacedrift)
/datum/controller/subsystem/spacedrift/stat_entry()
..("P:[processing.len]")
+/datum/controller/subsystem/spacedrift/get_metrics()
+ . = ..()
+ var/list/cust = list()
+ cust["processing"] = length(processing)
+ .["custom"] = cust
/datum/controller/subsystem/spacedrift/fire(resumed = 0)
if(!resumed)
diff --git a/code/controllers/subsystem/tgui.dm b/code/controllers/subsystem/tgui.dm
index 47094b7def7..5eb4d09aa3a 100644
--- a/code/controllers/subsystem/tgui.dm
+++ b/code/controllers/subsystem/tgui.dm
@@ -27,6 +27,13 @@ SUBSYSTEM_DEF(tgui)
/datum/controller/subsystem/tgui/stat_entry()
..("P:[processing_uis.len]")
+/datum/controller/subsystem/tgui/get_metrics()
+ . = ..()
+ var/list/cust = list()
+ cust["processing"] = length(processing_uis)
+ .["custom"] = cust
+
+
/datum/controller/subsystem/tgui/fire(resumed = 0)
if (!resumed)
src.currentrun = processing_uis.Copy()
diff --git a/code/controllers/subsystem/throwing.dm b/code/controllers/subsystem/throwing.dm
index 04ddf40f442..be2d62e09e9 100644
--- a/code/controllers/subsystem/throwing.dm
+++ b/code/controllers/subsystem/throwing.dm
@@ -15,6 +15,12 @@ SUBSYSTEM_DEF(throwing)
/datum/controller/subsystem/throwing/stat_entry()
..("P:[processing.len]")
+/datum/controller/subsystem/throwing/get_metrics()
+ . = ..()
+ var/list/cust = list()
+ cust["processing"] = length(processing)
+ .["custom"] = cust
+
/datum/controller/subsystem/throwing/fire(resumed = 0)
if(!resumed)
src.currentrun = processing.Copy()
diff --git a/code/controllers/subsystem/tickets/mentor_tickets.dm b/code/controllers/subsystem/tickets/mentor_tickets.dm
index 706a498aa64..63e8e33069a 100644
--- a/code/controllers/subsystem/tickets/mentor_tickets.dm
+++ b/code/controllers/subsystem/tickets/mentor_tickets.dm
@@ -3,6 +3,7 @@ GLOBAL_REAL(SSmentor_tickets, /datum/controller/subsystem/tickets/mentor_tickets
/datum/controller/subsystem/tickets/mentor_tickets/New()
NEW_SS_GLOBAL(SSmentor_tickets)
PreInit()
+ ss_id = "mentor_tickets"
/datum/controller/subsystem/tickets/mentor_tickets
name = "Mentor Tickets"
diff --git a/code/controllers/subsystem/tickets/tickets.dm b/code/controllers/subsystem/tickets/tickets.dm
index d5eb31117e2..0954c39a032 100644
--- a/code/controllers/subsystem/tickets/tickets.dm
+++ b/code/controllers/subsystem/tickets/tickets.dm
@@ -41,6 +41,12 @@ SUBSYSTEM_DEF(tickets)
var/ticketCounter = 1
+/datum/controller/subsystem/tickets/get_metrics()
+ . = ..()
+ var/list/cust = list()
+ cust["tickets"] = length(allTickets) // Not a perf metric but I want to see a graph where SSair usage spikes and 20 tickets come in
+ .["custom"] = cust
+
/datum/controller/subsystem/tickets/Initialize()
if(!close_messages)
close_messages = list("- [ticket_name] Rejected! -",
diff --git a/code/controllers/subsystem/timer.dm b/code/controllers/subsystem/timer.dm
index 53d77e8fad6..0a0eade55d7 100644
--- a/code/controllers/subsystem/timer.dm
+++ b/code/controllers/subsystem/timer.dm
@@ -37,6 +37,12 @@ SUBSYSTEM_DEF(timer)
/datum/controller/subsystem/timer/stat_entry(msg)
..("B:[bucket_count] P:[length(second_queue)] H:[length(hashes)] C:[length(clienttime_timers)] S:[length(timer_id_dict)]")
+/datum/controller/subsystem/timer/get_metrics()
+ . = ..()
+ var/list/cust = list()
+ cust["bucket_count"] = bucket_count
+ .["custom"] = cust
+
/datum/controller/subsystem/timer/fire(resumed = FALSE)
var/lit = last_invoke_tick
var/last_check = world.time - TICKS2DS(BUCKET_LEN*1.5)
diff --git a/code/controllers/subsystem/weather.dm b/code/controllers/subsystem/weather.dm
index 30186f80ad1..5a0a82f8e54 100644
--- a/code/controllers/subsystem/weather.dm
+++ b/code/controllers/subsystem/weather.dm
@@ -9,11 +9,17 @@ SUBSYSTEM_DEF(weather)
flags = SS_BACKGROUND
wait = 10
runlevels = RUNLEVEL_GAME
- offline_implications = "Ash storms will no longer trigger. No immediate action is needed."
+ offline_implications = "Ash storms will no longer trigger. No immediate action is needed."
var/list/processing = list()
var/list/eligible_zlevels = list()
var/list/next_hit_by_zlevel = list() //Used by barometers to know when the next storm is coming
+/datum/controller/subsystem/weather/get_metrics()
+ . = ..()
+ var/list/cust = list()
+ cust["processing"] = length(processing)
+ .["custom"] = cust
+
/datum/controller/subsystem/weather/fire()
// process active weather
for(var/V in processing)
diff --git a/code/datums/datacore.dm b/code/datums/datacore.dm
index a79eb2105ae..87aabb95445 100644
--- a/code/datums/datacore.dm
+++ b/code/datums/datacore.dm
@@ -356,159 +356,159 @@ GLOBAL_VAR_INIT(record_id_num, 1001)
job_clothes = H.mind.assigned_role
switch(job_clothes)
if("Head of Personnel")
- clothes_s = new /icon('icons/mob/uniform.dmi', "hop_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
+ clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "hop_s")
+ clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "brown"), ICON_UNDERLAY)
if("Nanotrasen Representative")
- clothes_s = new /icon('icons/mob/uniform.dmi', "officer_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "laceups"), ICON_UNDERLAY)
+ clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "officer_s")
+ clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "laceups"), ICON_UNDERLAY)
if("Blueshield")
- clothes_s = new /icon('icons/mob/uniform.dmi', "officer_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/hands.dmi', "swat_gl"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "blueshield"), ICON_OVERLAY)
+ clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "officer_s")
+ clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "jackboots"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/hands.dmi', "swat_gl"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "blueshield"), ICON_OVERLAY)
if("Magistrate")
- clothes_s = new /icon('icons/mob/uniform.dmi', "really_black_suit_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "laceups"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "judge"), ICON_OVERLAY)
+ clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "really_black_suit_s")
+ clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "laceups"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "judge"), ICON_OVERLAY)
if("Bartender")
- clothes_s = new /icon('icons/mob/uniform.dmi', "ba_suit_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+ clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "ba_suit_s")
+ clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY)
if("Botanist")
- clothes_s = new /icon('icons/mob/uniform.dmi', "hydroponics_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+ clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "hydroponics_s")
+ clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY)
if("Chef")
- clothes_s = new /icon('icons/mob/uniform.dmi', "chef_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+ clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "chef_s")
+ clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY)
if("Janitor")
- clothes_s = new /icon('icons/mob/uniform.dmi', "janitor_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+ clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "janitor_s")
+ clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY)
if("Librarian")
- clothes_s = new /icon('icons/mob/uniform.dmi', "red_suit_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+ clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "red_suit_s")
+ clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY)
if("Barber")
- clothes_s = new /icon('icons/mob/uniform.dmi', "barber_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+ clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "barber_s")
+ clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY)
if("Clown")
- clothes_s = new /icon('icons/mob/uniform.dmi', "clown_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "clown"), ICON_UNDERLAY)
+ clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "clown_s")
+ clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "clown"), ICON_UNDERLAY)
if("Mime")
- clothes_s = new /icon('icons/mob/uniform.dmi', "mime_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+ clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "mime_s")
+ clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY)
if("Quartermaster")
- clothes_s = new /icon('icons/mob/uniform.dmi', "qm_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
+ clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "qm_s")
+ clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "brown"), ICON_UNDERLAY)
if("Cargo Technician")
- clothes_s = new /icon('icons/mob/uniform.dmi', "cargotech_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+ clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "cargotech_s")
+ clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY)
if("Shaft Miner")
- clothes_s = new /icon('icons/mob/uniform.dmi', "explorer_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "explorer"), ICON_UNDERLAY)
+ clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "explorer_s")
+ clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "explorer"), ICON_UNDERLAY)
if("Lawyer")
- clothes_s = new /icon('icons/mob/uniform.dmi', "internalaffairs_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
+ clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "internalaffairs_s")
+ clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "brown"), ICON_UNDERLAY)
if("Chaplain")
- clothes_s = new /icon('icons/mob/uniform.dmi', "chapblack_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+ clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "chapblack_s")
+ clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY)
if("Research Director")
- clothes_s = new /icon('icons/mob/uniform.dmi', "director_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_open"), ICON_OVERLAY)
+ clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "director_s")
+ clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "brown"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "labcoat_open"), ICON_OVERLAY)
if("Scientist")
- clothes_s = new /icon('icons/mob/uniform.dmi', "toxinswhite_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_tox_open"), ICON_OVERLAY)
+ clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "toxinswhite_s")
+ clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "white"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "labcoat_tox_open"), ICON_OVERLAY)
if("Chemist")
- clothes_s = new /icon('icons/mob/uniform.dmi', "chemistrywhite_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_chem_open"), ICON_OVERLAY)
+ clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "chemistrywhite_s")
+ clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "white"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "labcoat_chem_open"), ICON_OVERLAY)
if("Chief Medical Officer")
- clothes_s = new /icon('icons/mob/uniform.dmi', "cmo_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_cmo_open"), ICON_OVERLAY)
+ clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "cmo_s")
+ clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "brown"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "labcoat_cmo_open"), ICON_OVERLAY)
if("Medical Doctor")
- clothes_s = new /icon('icons/mob/uniform.dmi', "medical_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_open"), ICON_OVERLAY)
+ clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "medical_s")
+ clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "white"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "labcoat_open"), ICON_OVERLAY)
if("Coroner")
- clothes_s = new /icon('icons/mob/uniform.dmi', "scrubsblack_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_mort_open"), ICON_OVERLAY)
+ clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "scrubsblack_s")
+ clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "white"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "labcoat_mort_open"), ICON_OVERLAY)
if("Geneticist")
- clothes_s = new /icon('icons/mob/uniform.dmi', "geneticswhite_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_gen_open"), ICON_OVERLAY)
+ clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "geneticswhite_s")
+ clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "white"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "labcoat_gen_open"), ICON_OVERLAY)
if("Virologist")
- clothes_s = new /icon('icons/mob/uniform.dmi', "virologywhite_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_vir_open"), ICON_OVERLAY)
+ clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "virologywhite_s")
+ clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "white"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "labcoat_vir_open"), ICON_OVERLAY)
if("Psychiatrist")
- clothes_s = new /icon('icons/mob/uniform.dmi', "psych_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "laceups"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_open"), ICON_UNDERLAY)
+ clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "psych_s")
+ clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "laceups"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "labcoat_open"), ICON_UNDERLAY)
if("Paramedic")
- clothes_s = new /icon('icons/mob/uniform.dmi', "paramedic_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+ clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "paramedic_s")
+ clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY)
if("Captain")
- clothes_s = new /icon('icons/mob/uniform.dmi', "captain_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
+ clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "captain_s")
+ clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "brown"), ICON_UNDERLAY)
if("Head of Security")
- clothes_s = new /icon('icons/mob/uniform.dmi', "hosred_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY)
+ clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "hosred_s")
+ clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "jackboots"), ICON_UNDERLAY)
if("Warden")
- clothes_s = new /icon('icons/mob/uniform.dmi', "warden_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY)
+ clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "warden_s")
+ clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "jackboots"), ICON_UNDERLAY)
if("Detective")
- clothes_s = new /icon('icons/mob/uniform.dmi', "detective_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "detective"), ICON_OVERLAY)
+ clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "detective_s")
+ clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "brown"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "detective"), ICON_OVERLAY)
if("Security Pod Pilot")
- clothes_s = new /icon('icons/mob/uniform.dmi', "secred_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "bomber"), ICON_OVERLAY)
+ clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "secred_s")
+ clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "jackboots"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "bomber"), ICON_OVERLAY)
if("Brig Physician")
- clothes_s = new /icon('icons/mob/uniform.dmi', "medical_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "fr_jacket_open"), ICON_OVERLAY)
+ clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "medical_s")
+ clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "white"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "fr_jacket_open"), ICON_OVERLAY)
if("Security Officer")
- clothes_s = new /icon('icons/mob/uniform.dmi', "secred_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY)
+ clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "secred_s")
+ clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "jackboots"), ICON_UNDERLAY)
if("Chief Engineer")
- clothes_s = new /icon('icons/mob/uniform.dmi', "chief_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/belt.dmi', "utility"), ICON_OVERLAY)
+ clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "chief_s")
+ clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "brown"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/belt.dmi', "utility"), ICON_OVERLAY)
if("Station Engineer")
- clothes_s = new /icon('icons/mob/uniform.dmi', "engine_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "orange"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/belt.dmi', "utility"), ICON_OVERLAY)
+ clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "engine_s")
+ clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "orange"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/belt.dmi', "utility"), ICON_OVERLAY)
if("Life Support Specialist")
- clothes_s = new /icon('icons/mob/uniform.dmi', "atmos_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/belt.dmi', "utility"), ICON_OVERLAY)
+ clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "atmos_s")
+ clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/belt.dmi', "utility"), ICON_OVERLAY)
if("Mechanic")
- clothes_s = new /icon('icons/mob/uniform.dmi', "mechanic_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "orange"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/belt.dmi', "utility"), ICON_OVERLAY)
+ clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "mechanic_s")
+ clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "orange"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/belt.dmi', "utility"), ICON_OVERLAY)
if("Roboticist")
- clothes_s = new /icon('icons/mob/uniform.dmi', "robotics_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_open"), ICON_OVERLAY)
+ clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "robotics_s")
+ clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "labcoat_open"), ICON_OVERLAY)
if("Syndicate Agent")
- clothes_s = new /icon('icons/mob/uniform.dmi', "syndicate_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+ clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "syndicate_s")
+ clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY)
if("Syndicate Officer")
- clothes_s = new /icon('icons/mob/uniform.dmi', "syndicate_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/hands.dmi', "swat_gl"), ICON_UNDERLAY)
+ clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "syndicate_s")
+ clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "jackboots"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/hands.dmi', "swat_gl"), ICON_UNDERLAY)
if("Syndicate Nuclear Operative")
- clothes_s = new /icon('icons/mob/uniform.dmi', "syndicate_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/hands.dmi', "swat_gl"), ICON_UNDERLAY)
+ clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "syndicate_s")
+ clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "jackboots"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/hands.dmi', "swat_gl"), ICON_UNDERLAY)
else if(H.mind && (H.mind.assigned_role in get_all_centcom_jobs()))
- clothes_s = new /icon('icons/mob/uniform.dmi', "officer_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "laceups"), ICON_UNDERLAY)
+ clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "officer_s")
+ clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "laceups"), ICON_UNDERLAY)
else
- clothes_s = new /icon('icons/mob/uniform.dmi', "grey_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+ clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "grey_s")
+ clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY)
preview_icon.Blend(face_s, ICON_OVERLAY) // Why do we do this twice
if(clothes_s)
diff --git a/code/datums/datumvars.dm b/code/datums/datumvars.dm
index 503389eb769..75f03f3c3d8 100644
--- a/code/datums/datumvars.dm
+++ b/code/datums/datumvars.dm
@@ -78,7 +78,7 @@
/client/proc/debug_variables(datum/D in world)
set category = "Debug"
- set name = "View Variables"
+ set name = "\[Admin\] View Variables"
var/static/cookieoffset = rand(1, 9999) //to force cookies to reset after the round.
diff --git a/code/datums/diseases/anxiety.dm b/code/datums/diseases/anxiety.dm
index 4d9716e44da..c9768534760 100644
--- a/code/datums/diseases/anxiety.dm
+++ b/code/datums/diseases/anxiety.dm
@@ -36,6 +36,14 @@
if(prob(2))
affected_mob.visible_message("[affected_mob] coughs up butterflies!", \
"You cough up butterflies!")
- new /mob/living/simple_animal/butterfly(affected_mob.loc)
- new /mob/living/simple_animal/butterfly(affected_mob.loc)
- return
+ for(var/i in 1 to 2)
+ var/mob/living/simple_animal/butterfly/B = new(affected_mob.loc)
+ addtimer(CALLBACK(B, /mob/living/simple_animal/butterfly/.proc/decompose), rand(5, 25) SECONDS)
+
+/**
+ * Made so severe anxiety does not overload the SSmob while keeping it's effect
+ */
+/mob/living/simple_animal/butterfly/proc/decompose()
+ visible_message("[src] decomposes due to being outside of its original habitat for too long!",
+ "You decompose for being too long out of your habitat!")
+ melt()
diff --git a/code/datums/dog_fashion.dm b/code/datums/dog_fashion.dm
index af1e3376687..1cfaf3d24bf 100644
--- a/code/datums/dog_fashion.dm
+++ b/code/datums/dog_fashion.dm
@@ -49,6 +49,18 @@
..()
D.set_light(4)
+/datum/dog_fashion/head/hardhat
+ name = "Engineer REAL_NAME"
+ desc = "Trust him, he's an engineer."
+
+/datum/dog_fashion/head/hardhat/white
+ name = "Chief engineer REAL_NAME"
+ desc = "Hasn't delamed the engine once."
+
+/datum/dog_fashion/head/hardhat/red
+ name = "Fire chief REAL_NAME"
+ desc = "Some days you're the dog, some days you're the hydrant."
+
/datum/dog_fashion/head/helmet
name = "Sergeant REAL_NAME"
desc = "The ever-loyal, the ever-vigilant."
diff --git a/code/datums/spell.dm b/code/datums/spell.dm
index 9fdfb68bbea..23b2241da03 100644
--- a/code/datums/spell.dm
+++ b/code/datums/spell.dm
@@ -558,11 +558,12 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell))
if(((!user.mind) || !(src in user.mind.spell_list)) && !(src in user.mob_spell_list))
if(show_message)
to_chat(user, "You shouldn't have this spell! Something's wrong.")
- return 0
+ return FALSE
- var/turf/T = get_turf(user)
- if(is_admin_level(T.z) && !centcom_cancast) //Certain spells are not allowed on the centcom zlevel
- return 0
+ if(!centcom_cancast) //Certain spells are not allowed on the centcom zlevel
+ var/turf/T = get_turf(user)
+ if(T && is_admin_level(T.z))
+ return FALSE
if(!holy_area_cancast && user.holy_check())
return FALSE
@@ -573,21 +574,21 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell))
if(charge_counter < charge_max)
if(show_message)
to_chat(user, still_recharging_msg)
- return 0
+ return FALSE
if("charges")
if(!charge_counter)
if(show_message)
to_chat(user, "[name] has no charges left.")
- return 0
+ return FALSE
if(!ghost)
if(user.stat && !stat_allowed)
if(show_message)
to_chat(user, "You can't cast this spell while incapacitated.")
- return 0
+ return FALSE
if(ishuman(user) && (invocation_type == "whisper" || invocation_type == "shout") && user.is_muzzled())
if(show_message)
to_chat(user, "Mmmf mrrfff!")
- return 0
+ return FALSE
if(ishuman(user))
var/mob/living/carbon/human/H = user
diff --git a/code/datums/spells/ethereal_jaunt.dm b/code/datums/spells/ethereal_jaunt.dm
index f7d7a9bfb8d..4c7c6b76b36 100644
--- a/code/datums/spells/ethereal_jaunt.dm
+++ b/code/datums/spells/ethereal_jaunt.dm
@@ -56,8 +56,7 @@
qdel(holder)
if(!QDELETED(target))
if(mobloc.density)
- for(var/direction in GLOB.alldirs)
- var/turf/T = get_step(mobloc, direction)
+ for(var/turf/T in orange(7))
if(T)
if(target.Move(T))
break
diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm
index a566c5148bb..aa1e74a911e 100644
--- a/code/datums/uplink_item.dm
+++ b/code/datums/uplink_item.dm
@@ -787,6 +787,14 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
reference = "50M"
item = /obj/item/ammo_box/magazine/sniper_rounds
+/datum/uplink_item/ammo/sniper/antimatter
+ name = "Sniper - .50 Antimatter Magazine"
+ desc = "A 6-round magazine of antimatter ammo for use with .50 sniper rifles. \
+ Able to heavily damage objects, and delimb people."
+ reference = "50A"
+ item = /obj/item/ammo_box/magazine/sniper_rounds/antimatter
+ cost = 5
+
/datum/uplink_item/ammo/sniper/soporific
name = "Sniper - .50 Soporific Magazine"
desc = "A 3-round magazine of soporific ammo designed for use with .50 sniper rifles. Put your enemies to sleep today!"
diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm
index b3ae451aa35..c9d650271e2 100644
--- a/code/game/area/areas.dm
+++ b/code/game/area/areas.dm
@@ -346,7 +346,7 @@
var/obj/machinery/firealarm/F = alarm
F.update_fire_light(fire)
for(var/obj/machinery/light/L in src)
- L.update()
+ L.update(TRUE, TRUE, FALSE)
/**
* unset the fire alarm visual affects in an area
@@ -360,7 +360,7 @@
var/obj/machinery/firealarm/F = alarm
F.update_fire_light(fire)
for(var/obj/machinery/light/L in src)
- L.update()
+ L.update(TRUE, TRUE, FALSE)
/area/proc/updateicon()
var/weather_icon
diff --git a/code/game/gamemodes/changeling/powers/mutations.dm b/code/game/gamemodes/changeling/powers/mutations.dm
index 792665a52f3..28437dd9022 100644
--- a/code/game/gamemodes/changeling/powers/mutations.dm
+++ b/code/game/gamemodes/changeling/powers/mutations.dm
@@ -191,6 +191,7 @@
/obj/item/gun/magic/tentacle
name = "tentacle"
desc = "A fleshy tentacle that can stretch out and grab things or people."
+ icon = 'icons/obj/items.dmi'
icon_state = "tentacle"
item_state = "tentacle"
flags = ABSTRACT | NODROP | NOBLUDGEON | DROPDEL
diff --git a/code/game/gamemodes/cult/cult_items.dm b/code/game/gamemodes/cult/cult_items.dm
index 4b43c992347..9b890787d7f 100644
--- a/code/game/gamemodes/cult/cult_items.dm
+++ b/code/game/gamemodes/cult/cult_items.dm
@@ -23,7 +23,7 @@
sharp = TRUE
hitsound = 'sound/weapons/bladeslice.ogg'
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
- sprite_sheets_inhand = list("Skrell" = 'icons/mob/species/skrell/held.dmi') // To stop skrell stabbing themselves in the head
+ sprite_sheets_inhand = list("Skrell" = 'icons/mob/clothing/species/skrell/held.dmi') // To stop skrell stabbing themselves in the head
/obj/item/melee/cultblade/New()
if(SSticker.mode)
@@ -187,9 +187,9 @@
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
armor = list("melee" = -50, "bullet" = -50, "laser" = -50,"energy" = -50, "bomb" = -50, "bio" = -50, "rad" = -50, "fire" = 0, "acid" = 0)
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/suit.dmi',
- "Drask" = 'icons/mob/species/drask/suit.dmi',
- "Grey" = 'icons/mob/species/grey/suit.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
+ "Drask" = 'icons/mob/clothing/species/drask/suit.dmi',
+ "Grey" = 'icons/mob/clothing/species/grey/suit.dmi'
)
hoodtype = /obj/item/clothing/head/hooded/flagellant_hood
@@ -220,9 +220,9 @@
flags_cover = HEADCOVERSEYES
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/head.dmi',
- "Drask" = 'icons/mob/species/drask/head.dmi',
- "Grey" = 'icons/mob/species/grey/head.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/head.dmi',
+ "Drask" = 'icons/mob/clothing/species/drask/head.dmi',
+ "Grey" = 'icons/mob/clothing/species/grey/head.dmi'
)
/obj/item/whetstone/cult
diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm
index b3c3aacad02..1f03e634a8c 100644
--- a/code/game/gamemodes/cult/runes.dm
+++ b/code/game/gamemodes/cult/runes.dm
@@ -948,11 +948,7 @@ structure_check() searches for nearby cultist structures required for the invoca
V.Grant(ghost)
//GM.Grant(ghost)
while(!QDELETED(user))
- if(!(user in T))
- user.visible_message("A spectral tendril wraps around [user] and pulls [user.p_them()] back to the rune!")
- Beam(user, icon_state = "drainbeam", time = 2)
- user.forceMove(get_turf(src)) //NO ESCAPE :^)
- if(user.key)
+ if(user.key || QDELETED(src))
user.visible_message("[user] slowly relaxes, the glow around [user.p_them()] dimming.",
"You are re-united with your physical form. [src] releases its hold over you.")
user.Weaken(3)
@@ -960,12 +956,16 @@ structure_check() searches for nearby cultist structures required for the invoca
if(user.health <= 10)
to_chat(ghost, "Your body can no longer sustain the connection!")
break
+ if(!(user in T))
+ user.visible_message("A spectral tendril wraps around [user] and pulls [user.p_them()] back to the rune!")
+ Beam(user, icon_state = "drainbeam", time = 2)
+ user.forceMove(get_turf(src)) //NO ESCAPE :^)
sleep(5)
- CM.Remove(ghost)
- V.Remove(ghost)
- //GM.Remove(ghost)
+ if(user.grab_ghost())
+ CM.Remove(ghost)
+ V.Remove(ghost)
+ //GM.Remove(ghost)
user.remove_atom_colour(ADMIN_COLOUR_PRIORITY, RUNE_COLOR_DARKRED)
- user.grab_ghost()
user = null
rune_in_use = FALSE
diff --git a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm
index a0519fcbe56..08dbec69279 100644
--- a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm
+++ b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm
@@ -358,6 +358,7 @@
item_state = "alienpistol"
origin_tech = "combat=4;magnets=7;powerstorage=3;abductor=3"
trigger_guard = TRIGGER_GUARD_ALLOW_ALL
+ can_holster = TRUE
/obj/item/paper/abductor
name = "Dissection Guide"
diff --git a/code/game/gamemodes/shadowling/shadowling.dm b/code/game/gamemodes/shadowling/shadowling.dm
index 60c9f74b207..2e2230fc419 100644
--- a/code/game/gamemodes/shadowling/shadowling.dm
+++ b/code/game/gamemodes/shadowling/shadowling.dm
@@ -123,7 +123,7 @@ Made by Xhuis
..()
/datum/game_mode/proc/greet_shadow(datum/mind/shadow)
- to_chat(shadow.current, "Currently, you are disguised as an employee aboard [world.name].")
+ to_chat(shadow.current, "Currently, you are disguised as an employee aboard [station_name()].")
to_chat(shadow.current, "In your limited state, you have two abilities: Hatch and Shadowling Hivemind (:8).")
to_chat(shadow.current, "Any other shadowlings are your allies. You must assist them as they shall assist you.")
to_chat(shadow.current, "For more information, check the wiki page: ([GLOB.configuration.url.wiki_url]/index.php/Shadowling)")
diff --git a/code/game/gamemodes/steal_items.dm b/code/game/gamemodes/steal_items.dm
index 62dfcc37eaa..77e775939fc 100644
--- a/code/game/gamemodes/steal_items.dm
+++ b/code/game/gamemodes/steal_items.dm
@@ -145,8 +145,8 @@
/datum/theft_objective/supermatter_sliver
name = "a supermatter sliver"
typepath = /obj/item/nuke_core/supermatter_sliver
- protected_jobs = list("Chief Engineer", "Engineer", "Atmospheric Technician") //Unlike other steal objectives, all jobs in the department have easy access, and would not be noticed at all stealing this
- location_override = "Engineering. You can use the box and instructions provided to harvest the sliver"
+ protected_jobs = list("Chief Engineer", "Station Engineer", "Life Support Specialist") //Unlike other steal objectives, all jobs in the department have easy access, and would not be noticed at all stealing this
+ location_override = "Engineering. You can use the box and instructions provided to harvest the sliver."
special_equipment = /obj/item/storage/box/syndie_kit/supermatter
job_possession = FALSE //The CE / engineers / atmos techs do not carry around supermater slivers.
diff --git a/code/game/gamemodes/vampire/vampire_powers.dm b/code/game/gamemodes/vampire/vampire_powers.dm
index 36a24113dc9..002280ef81b 100644
--- a/code/game/gamemodes/vampire/vampire_powers.dm
+++ b/code/game/gamemodes/vampire/vampire_powers.dm
@@ -218,9 +218,13 @@
/obj/effect/proc_holder/spell/vampire/mob_aoe/glare/cast(list/targets, mob/user = usr)
user.visible_message("[user]'s eyes emit a blinding flash!")
- if(istype(user:glasses, /obj/item/clothing/glasses/sunglasses/blindfold))
- to_chat(user, "You're blindfolded!")
- return
+ if(ishuman(user))
+ var/mob/living/carbon/human/H = user
+ if(istype(H.glasses, /obj/item/clothing/glasses/sunglasses/blindfold))
+ var/obj/item/clothing/glasses/sunglasses/blindfold/B = H.glasses
+ if(B.tint)
+ to_chat(user, "You're blindfolded!")
+ return
for(var/mob/living/target in targets)
if(!affects(target))
continue
@@ -453,8 +457,7 @@
flick("mist_reappear", animation)
sleep(5)
if(!user.Move(mobloc))
- for(var/direction in list(1,2,4,8,5,6,9,10))
- var/turf/T = get_step(mobloc, direction)
+ for(var/turf/T in orange(7, mobloc))
if(T)
if(user.Move(T))
break
diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm
index 58ff6388c2d..26e88657fa7 100644
--- a/code/game/machinery/computer/camera.dm
+++ b/code/game/machinery/computer/camera.dm
@@ -9,7 +9,7 @@
var/mapping = 0 // For the overview file (overview.dm), not used on this page
- var/list/network = list()
+ var/list/network = list("SS13","Mining Outpost")
var/obj/machinery/camera/active_camera
var/list/watchers = list()
diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
index 12eca7544bd..7b2890d97da 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -814,12 +814,7 @@ About the new airlock wires panel:
safe = 1
to_chat(usr, "The door safeties have been enabled.")
if("speed-toggle")
- if(wires.is_cut(WIRE_SPEED))
- to_chat(usr, "The timing wire is cut - Cannot alter timing.")
- else if(normalspeed)
- normalspeed = 0
- else
- normalspeed = 1
+ toggle_speed(usr)
if("open-close")
open_close(usr)
else
@@ -851,10 +846,16 @@ About the new airlock wires panel:
/obj/machinery/door/airlock/proc/toggle_bolt(mob/user)
if(wires.is_cut(WIRE_DOOR_BOLTS))
to_chat(user, "The door bolt control wire has been cut - Door bolts permanently dropped.")
- else if(lock())
- to_chat(user, "The door bolts have been dropped.")
- else if(unlock())
+ return
+
+ if(unlock()) // Trying to unbolt
to_chat(user, "The door bolts have been raised.")
+ return
+
+ if(lock()) // Trying to bolt
+ to_chat(user, "The door bolts have been dropped.")
+ user.create_log(MISC_LOG, "Bolted", src)
+ add_hiddenprint(user)
/obj/machinery/door/airlock/proc/toggle_emergency_status(mob/user)
emergency = !emergency
@@ -864,6 +865,17 @@ About the new airlock wires panel:
to_chat(user, "Emergency access has been disabled.")
update_icon()
+/obj/machinery/door/airlock/proc/toggle_speed(mob/user)
+ if(wires.is_cut(WIRE_SPEED))
+ to_chat(user, "The timing wire has been cut - Cannot alter timing.")
+ return
+ normalspeed = !normalspeed
+
+ if(normalspeed)
+ to_chat(user, "The door is now in normal mode.")
+ else
+ to_chat(user, "The door is now in fast mode.")
+
/obj/machinery/door/airlock/attackby(obj/item/C, mob/user, params)
add_fingerprint(user)
if(!headbutt_shock_check(user))
diff --git a/code/game/machinery/lightswitch.dm b/code/game/machinery/lightswitch.dm
index ae3520af45b..8096f0655f0 100644
--- a/code/game/machinery/lightswitch.dm
+++ b/code/game/machinery/lightswitch.dm
@@ -77,6 +77,7 @@
/obj/machinery/light_switch/attack_hand(mob/user)
on = !on
+ playsound(src, 'sound/machines/lightswitch.ogg', 10, TRUE)
updateicon()
if(light_connect)
diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm
index 11f22adee40..12272549f74 100644
--- a/code/game/machinery/vending.dm
+++ b/code/game/machinery/vending.dm
@@ -16,9 +16,10 @@
desc = "A generic vending machine."
icon = 'icons/obj/vending.dmi'
icon_state = "generic"
- layer = 2.9
- anchored = 1
- density = 1
+ layer = BELOW_OBJ_LAYER
+ anchored = TRUE
+ density = TRUE
+ face_while_pulling = TRUE
max_integrity = 300
integrity_failure = 100
armor = list(melee = 20, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 70)
@@ -1002,6 +1003,7 @@
products = list(/obj/item/reagent_containers/food/snacks/candy/candybar = 6,/obj/item/reagent_containers/food/drinks/dry_ramen = 6,/obj/item/reagent_containers/food/snacks/chips =6,
/obj/item/reagent_containers/food/snacks/sosjerky = 6,/obj/item/reagent_containers/food/snacks/no_raisin = 6,/obj/item/reagent_containers/food/snacks/pistachios =6,
/obj/item/reagent_containers/food/snacks/spacetwinkie = 6,/obj/item/reagent_containers/food/snacks/cheesiehonkers = 6,/obj/item/reagent_containers/food/snacks/tastybread = 6)
+ premium = list(/obj/item/reagent_containers/food/snacks/stroopwafel = 2)
contraband = list(/obj/item/reagent_containers/food/snacks/syndicake = 6)
prices = list(/obj/item/reagent_containers/food/snacks/candy/candybar = 20,/obj/item/reagent_containers/food/drinks/dry_ramen = 30,
/obj/item/reagent_containers/food/snacks/chips =25,/obj/item/reagent_containers/food/snacks/sosjerky = 30,/obj/item/reagent_containers/food/snacks/no_raisin = 20,
diff --git a/code/game/objects/items/devices/lightreplacer.dm b/code/game/objects/items/devices/lightreplacer.dm
index 85e650412f6..de7b769957e 100644
--- a/code/game/objects/items/devices/lightreplacer.dm
+++ b/code/game/objects/items/devices/lightreplacer.dm
@@ -195,23 +195,16 @@
if(target.status != LIGHT_EMPTY)
AddShards(1, U)
target.status = LIGHT_EMPTY
- target.update()
- var/obj/item/light/L2 = new target.light_type()
-
- target.status = L2.status
- target.switchcount = L2.switchcount
+ var/obj/item/light/replacement = target.light_type
+ target.status = LIGHT_OK
+ target.switchcount = 0
target.rigged = emagged
- target.brightness_range = L2.brightness_range
- target.brightness_power = L2.brightness_power
- target.brightness_color = L2.brightness_color
+ target.brightness_range = initial(replacement.brightness_range)
+ target.brightness_power = initial(replacement.brightness_power)
+ target.brightness_color = initial(replacement.brightness_color)
target.on = target.has_power()
- target.update()
- qdel(L2)
-
- if(target.on && target.rigged)
- target.explode()
- return
+ target.update(TRUE, TRUE, FALSE)
else
to_chat(U, "[src]'s refill light blinks red.")
diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm
index 79f49b39c94..03d89af52af 100644
--- a/code/game/objects/items/devices/radio/headset.dm
+++ b/code/game/objects/items/devices/radio/headset.dm
@@ -5,8 +5,8 @@
icon_state = "headset"
item_state = "headset"
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/ears.dmi',
- "Vox Armalis" = 'icons/mob/species/armalis/ears.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/ears.dmi',
+ "Vox Armalis" = 'icons/mob/clothing/species/armalis/ears.dmi'
) //We read you loud and skree-er.
materials = list(MAT_METAL=75)
canhear_range = 0 // can't hear headsets from very far away
diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm
index bc0211e5871..c617860643e 100644
--- a/code/game/objects/items/stacks/sheets/sheet_types.dm
+++ b/code/game/objects/items/stacks/sheets/sheet_types.dm
@@ -16,12 +16,21 @@
GLOBAL_LIST_INIT(metal_recipes, list(
new /datum/stack_recipe("stool", /obj/structure/chair/stool, one_per_turf = 1, on_floor = 1),
new /datum/stack_recipe("barstool", /obj/structure/chair/stool/bar, one_per_turf = 1, on_floor = 1),
- new /datum/stack_recipe("chair", /obj/structure/chair, one_per_turf = 1, on_floor = 1),
+ new /datum/stack_recipe("chair (dark)", /obj/structure/chair, one_per_turf = 1, on_floor = 1),
+ new /datum/stack_recipe("chair (light)", /obj/structure/chair/light, one_per_turf = 1, on_floor = 1),
new /datum/stack_recipe("shuttle seat", /obj/structure/chair/comfy/shuttle, 2, one_per_turf = 1, on_floor = 1),
- new /datum/stack_recipe("sofa (middle)", /obj/structure/chair/sofa, one_per_turf = 1, on_floor = 1),
- new /datum/stack_recipe("sofa (left)", /obj/structure/chair/sofa/left, one_per_turf = 1, on_floor = 1),
- new /datum/stack_recipe("sofa (right)", /obj/structure/chair/sofa/right, one_per_turf = 1, on_floor = 1),
- new /datum/stack_recipe("sofa (corner)", /obj/structure/chair/sofa/corner, one_per_turf = 1, on_floor = 1),
+ new /datum/stack_recipe_list("sofas", list(
+ new /datum/stack_recipe("sofa (middle)", /obj/structure/chair/sofa, 1, one_per_turf = TRUE, on_floor = TRUE),
+ new /datum/stack_recipe("sofa (left)", /obj/structure/chair/sofa/left, 1, one_per_turf = TRUE, on_floor = TRUE),
+ new /datum/stack_recipe("sofa (right)", /obj/structure/chair/sofa/right, 1, one_per_turf = TRUE, on_floor = TRUE),
+ new /datum/stack_recipe("sofa (corner)", /obj/structure/chair/sofa/corner, 1, one_per_turf = TRUE, on_floor = TRUE)
+ )), \
+ new /datum/stack_recipe_list("corporate sofas", list( \
+ new /datum/stack_recipe("sofa (middle)", /obj/structure/chair/sofa/corp, 1, one_per_turf = TRUE, on_floor = TRUE), \
+ new /datum/stack_recipe("sofa (left)", /obj/structure/chair/sofa/corp/left, 1, one_per_turf = TRUE, on_floor = TRUE), \
+ new /datum/stack_recipe("sofa (right)", /obj/structure/chair/sofa/corp/right, 1, one_per_turf = TRUE, on_floor = TRUE), \
+ new /datum/stack_recipe("sofa (corner)", /obj/structure/chair/sofa/corp/corner, 1, one_per_turf = TRUE, on_floor = TRUE), \
+ )), \
new /datum/stack_recipe("barber chair", /obj/structure/chair/barber, one_per_turf = 1, on_floor = 1),
new /datum/stack_recipe("wheelchair", /obj/structure/chair/wheelchair, 15, one_per_turf = 1, on_floor = 1),
new /datum/stack_recipe("bed", /obj/structure/bed, 2, one_per_turf = 1, on_floor = 1),
@@ -176,6 +185,11 @@ GLOBAL_LIST_INIT(wood_recipes, list(
new /datum/stack_recipe("wood floor tile", /obj/item/stack/tile/wood, 1, 4, 20),
new /datum/stack_recipe("wood table frame", /obj/structure/table_frame/wood, 2, time = 10), \
new /datum/stack_recipe("wooden chair", /obj/structure/chair/wood, 3, time = 10, one_per_turf = 1, on_floor = 1),
+ new /datum/stack_recipe_list("pews", list(
+ new /datum/stack_recipe("pew (middle)", /obj/structure/chair/sofa/pew, 1, one_per_turf = TRUE, on_floor = TRUE),
+ new /datum/stack_recipe("pew (left)", /obj/structure/chair/sofa/pew/left, 1, one_per_turf = TRUE, on_floor = TRUE),
+ new /datum/stack_recipe("pew (right)", /obj/structure/chair/sofa/pew/right, 1, one_per_turf = TRUE, on_floor = TRUE),
+ )), \
new /datum/stack_recipe("wooden barricade", /obj/structure/barricade/wooden, 5, time = 50, one_per_turf = 1, on_floor = 1),
new /datum/stack_recipe("bookcase", /obj/structure/bookcase, 5, time = 50, one_per_turf = 1, on_floor = 1),
new /datum/stack_recipe("dresser", /obj/structure/dresser, 30, time = 50, one_per_turf = 1, on_floor = 1),
@@ -241,6 +255,7 @@ GLOBAL_LIST_INIT(cloth_recipes, list ( \
new/datum/stack_recipe("white beanie", /obj/item/clothing/head/beanie, 2), \
null, \
new/datum/stack_recipe("blindfold", /obj/item/clothing/glasses/sunglasses/blindfold, 3), \
+ new/datum/stack_recipe("tattered blindfold", /obj/item/clothing/glasses/sunglasses/blindfold/fake, 2), \
))
/obj/item/stack/sheet/cloth
diff --git a/code/game/objects/items/theft_items.dm b/code/game/objects/items/theft_items.dm
index 0a32cf90df7..4b8d9e4b51a 100644
--- a/code/game/objects/items/theft_items.dm
+++ b/code/game/objects/items/theft_items.dm
@@ -12,7 +12,6 @@
item_state = "plutoniumcore"
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
flags_2 = RAD_NO_CONTAMINATE_2 //Don't have the item itself become irradiated when it makes radiation.
- var/pulse = 0
var/cooldown = 0
var/pulseicon = "plutonium_core_pulse"
@@ -49,14 +48,42 @@
icon = 'icons/obj/nuke_tools.dmi'
icon_state = "core_container_empty"
item_state = "metal"
+ resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF //Don't want people trying to break it open with acid, then destroying the core.
var/obj/item/nuke_core/plutonium/core
+ var/dented = FALSE
+ var/cracked = FALSE
/obj/item/nuke_core_container/Destroy()
QDEL_NULL(core)
return ..()
+/obj/item/nuke_core_container/ex_act(severity)
+ switch(severity)
+ if(EXPLODE_DEVASTATE)
+ if(!cracked)
+ crack_open()
+ if(EXPLODE_HEAVY)
+ if(!dented)
+ dented = TRUE
+
+/obj/item/nuke_core_container/examine(mob/user)
+ . = ..()
+ if(cracked) // Cracked open.
+ . += "It is broken, and can no longer store objects safely."
+ else if(dented) // Not cracked, but dented.
+ . += "[src] looks dented. Perhaps a bigger explosion may break it."
+ else // Not cracked or dented.
+ . += "Fine print on the box reads \"Cybersun Industries secure container, guaranteed thermite proof, assistant proof, and explosive resistant.\""
+
+/obj/item/nuke_core_container/attack_hand(mob/user)
+ if(cracked && core)
+ unload(user)
+ else
+ return ..()
+
+
/obj/item/nuke_core_container/proc/load(obj/item/nuke_core/plutonium/new_core, mob/user)
- if(core || !istype(new_core))
+ if(core || !istype(new_core) || cracked)
return
new_core.forceMove(src)
core = new_core
@@ -64,6 +91,12 @@
to_chat(user, "Container is sealing...")
addtimer(CALLBACK(src, .proc/seal), 10 SECONDS)
+/obj/item/nuke_core_container/proc/unload(mob/user)
+ core.add_fingerprint(user)
+ user.put_in_active_hand(core)
+ core = null
+ icon_state = "core_container_cracked_empty"
+
/obj/item/nuke_core_container/proc/seal()
if(!QDELETED(core))
STOP_PROCESSING(SSobj, core)
@@ -73,7 +106,7 @@
to_chat(loc, "[src] is permanently sealed, [core]'s radiation is contained.")
/obj/item/nuke_core_container/attackby(obj/item/nuke_core/plutonium/core, mob/user)
- if(!istype(core))
+ if(!istype(core) || cracked)
return ..()
if(!user.drop_item())
@@ -82,9 +115,20 @@
else
load(core, user)
+/obj/item/nuke_core_container/proc/crack_open()
+ visible_message("[src] bursts open!")
+ if(core)
+ START_PROCESSING(SSobj, core)
+ icon_state = "core_container_cracked_loaded"
+ else
+ icon_state = "core_container_cracked_empty"
+ name = "broken nuke core container"
+ cracked = TRUE
+
/obj/item/paper/guides/antag/nuke_instructions
info = "How to break into a Nanotrasen nuclear device and remove its plutonium core:
\
\
+ - Acquire some clothing that protects you from radiation, due to the radioactivity of the core.
\
- Use a screwdriver with a very thin tip (provided) to unscrew the terminal's front panel.
\
- Dislodge and remove the front panel with a crowbar.
\
- Cut the inner metal plate with a welding tool.
\
@@ -99,7 +143,7 @@
/obj/item/paper/guides/antag/supermatter_sliver
info = "How to safely extract a supermatter sliver:
\
\
- - Approach an active supermatter crystal with radiation shielded personal protective equipment. DO NOT MAKE PHYSICAL CONTACT.
\
+ - Approach an active supermatter crystal with radiation shielded personal protective equipment, and active magboots. DO NOT MAKE PHYSICAL CONTACT.
\
- Use a supermatter scalpel (provided) to slice off a sliver of the crystal.
\
- Use supermatter extraction tongs (also provided) to safely pick up the sliver you sliced off.
\
- Physical contact of any object with the sliver will dust the object, as well as yourself.
\
@@ -183,7 +227,7 @@
return ..()
/obj/item/nuke_core_container/supermatter/load(obj/item/retractor/supermatter/I, mob/user)
- if(!istype(I) || !I.sliver)
+ if(!istype(I) || !I.sliver || sliver)
return
I.sliver.forceMove(src)
sliver = I.sliver
@@ -202,13 +246,56 @@
if(ismob(loc))
to_chat(loc, "[src] is permanently sealed, [sliver] is safely contained.")
+/obj/item/nuke_core_container/supermatter/unload(obj/item/retractor/supermatter/I, mob/user)
+ if(!istype(I) || I.sliver)
+ return
+ sliver.forceMove(I)
+ I.sliver = sliver
+ sliver = null
+ I.icon_state = "supermatter_tongs_loaded"
+ I.item_state = "supermatter_tongs_loaded"
+ icon_state = "core_container_cracked_empty"
+ to_chat(user, "You carefully pick up [I.sliver] with [I].")
+
/obj/item/nuke_core_container/supermatter/attackby(obj/item/retractor/supermatter/tongs, mob/user)
if(istype(tongs))
- //try to load shard into core
- load(tongs, user)
+ if(cracked)
+ //lets take that shard out
+ unload(tongs, user)
+ else
+ //try to load shard into core
+ load(tongs, user)
else
return ..()
+/obj/item/nuke_core_container/supermatter/attack_hand(mob/user)
+ if(cracked && sliver) //What did we say about touching the shard...
+ if(!isliving(user) || user.status_flags & GODMODE)
+ return FALSE
+ user.visible_message("[user] reaches out and tries to pick up [sliver]. [user.p_their()] body starts to glow and bursts into flames before flashing into dust!",
+ "You reach for [sliver] with your hands. That was dumb.",
+ "Everything suddenly goes silent.")
+ radiation_pulse(user, 500, 2)
+ playsound(src, 'sound/effects/supermatter.ogg', 50, TRUE)
+ message_admins("[sliver] has consumed [key_name_admin(user)] [ADMIN_JMP(src)].")
+ investigate_log("has consumed [key_name(user)].", "supermatter")
+ user.dust()
+ icon_state = "core_container_cracked_empty"
+ qdel(sliver)
+
+ else
+ return ..()
+
+/obj/item/nuke_core_container/supermatter/crack_open()
+ visible_message("[src] bursts open!")
+ if(sliver)
+ START_PROCESSING(SSobj, sliver)
+ icon_state = "supermatter_container_cracked_loaded"
+ else
+ icon_state = "core_container_cracked_empty"
+ name = "broken supermatter bin"
+ cracked = TRUE
+
/obj/item/scalpel/supermatter
name = "supermatter scalpel"
desc = "A scalpel with a fragile tip of condensed hyper-noblium gas, searingly cold to the touch, that can safely shave a sliver off a supermatter crystal."
@@ -267,6 +354,8 @@
investigate_log("has irradiated [key_name(victim)].", "supermatter")
else if(istype(AM, /obj/singularity))
return
+ else if(istype(AM, /obj/item/nuke_core_container))
+ return
else
investigate_log("has consumed [AM].", "supermatter")
qdel(AM)
diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm
index c2ff3879968..051e936ea9c 100644
--- a/code/game/objects/items/trash.dm
+++ b/code/game/objects/items/trash.dm
@@ -67,9 +67,9 @@
slot_flags = SLOT_HEAD
dog_fashion = /datum/dog_fashion/head/fried_vox_empty
sprite_sheets = list(
- "Skrell" = 'icons/mob/species/skrell/head.dmi',
- "Drask" = 'icons/mob/species/drask/head.dmi',
- "Kidan" = 'icons/mob/species/kidan/head.dmi'
+ "Skrell" = 'icons/mob/clothing/species/skrell/head.dmi',
+ "Drask" = 'icons/mob/clothing/species/drask/head.dmi',
+ "Kidan" = 'icons/mob/clothing/species/kidan/head.dmi'
)
/obj/item/trash/pistachios
diff --git a/code/game/objects/items/weapons/cigs.dm b/code/game/objects/items/weapons/cigs.dm
index 5d3ca5fc919..cf19a910647 100644
--- a/code/game/objects/items/weapons/cigs.dm
+++ b/code/game/objects/items/weapons/cigs.dm
@@ -33,11 +33,11 @@ LIGHTERS ARE IN LIGHTERS.DM
var/list/list_reagents = list("nicotine" = 40)
var/first_puff = TRUE // the first puff is a bit more reagents ingested
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/mask.dmi',
- "Unathi" = 'icons/mob/species/unathi/mask.dmi',
- "Tajaran" = 'icons/mob/species/tajaran/mask.dmi',
- "Vulpkanin" = 'icons/mob/species/vulpkanin/mask.dmi',
- "Grey" = 'icons/mob/species/grey/mask.dmi')
+ "Vox" = 'icons/mob/clothing/species/vox/mask.dmi',
+ "Unathi" = 'icons/mob/clothing/species/unathi/mask.dmi',
+ "Tajaran" = 'icons/mob/clothing/species/tajaran/mask.dmi',
+ "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/mask.dmi',
+ "Grey" = 'icons/mob/clothing/species/grey/mask.dmi')
/obj/item/clothing/mask/cigarette/New()
diff --git a/code/game/objects/items/weapons/defib.dm b/code/game/objects/items/weapons/defib.dm
index 6f2f6e1ff0f..e76207ae85c 100644
--- a/code/game/objects/items/weapons/defib.dm
+++ b/code/game/objects/items/weapons/defib.dm
@@ -13,7 +13,7 @@
actions_types = list(/datum/action/item_action/toggle_paddles)
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/back.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/back.dmi'
)
var/paddles_on_defib = TRUE //if the paddles are on the defib (TRUE)
diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm
index f5a47c31b0a..cd0997481b6 100644
--- a/code/game/objects/items/weapons/storage/backpack.dm
+++ b/code/game/objects/items/weapons/storage/backpack.dm
@@ -18,9 +18,9 @@
resistance_flags = NONE
max_integrity = 300
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/back.dmi',
- "Vox Armalis" = 'icons/mob/species/armalis/back.dmi',
- "Grey" = 'icons/mob/species/grey/back.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/back.dmi',
+ "Vox Armalis" = 'icons/mob/clothing/species/armalis/back.dmi',
+ "Grey" = 'icons/mob/clothing/species/grey/back.dmi'
) //For Armalis anything but this and the nitrogen tank will use the default backpack icon.
/obj/item/storage/backpack/attackby(obj/item/W as obj, mob/user as mob, params)
diff --git a/code/game/objects/items/weapons/storage/bible.dm b/code/game/objects/items/weapons/storage/bible.dm
index 9200a58d65a..d5d4a636599 100644
--- a/code/game/objects/items/weapons/storage/bible.dm
+++ b/code/game/objects/items/weapons/storage/bible.dm
@@ -97,9 +97,8 @@
"May the power of [deity_name] compel you to be healed!")
playsound(loc, "punch", 25, 1, -1)
else
- if(!istype(H.head, /obj/item/clothing/head/helmet))
- M.adjustBrainLoss(10)
- to_chat(M, "You feel dumber.")
+ M.adjustBrainLoss(10)
+ to_chat(M, "You feel dumber.")
H.visible_message("[user] beats [H == user ? "[user.p_them()]self" : "[H]"] over the head with [src]!")
playsound(src.loc, "punch", 25, 1, -1)
else
diff --git a/code/game/objects/items/weapons/storage/firstaid.dm b/code/game/objects/items/weapons/storage/firstaid.dm
index ec00a0c4c08..a1fa336212e 100644
--- a/code/game/objects/items/weapons/storage/firstaid.dm
+++ b/code/game/objects/items/weapons/storage/firstaid.dm
@@ -84,7 +84,7 @@
/obj/item/storage/firstaid/toxin/Initialize(mapload)
. = ..()
- icon_state = pick("antitoxin", "antitoxfirstaid", "antitoxfirstaid2", "antitoxfirstaid3")
+ icon_state = pick("antitoxin", "antitoxfirstaid", "antitoxfirstaid2")
/obj/item/storage/firstaid/toxin/populate_contents()
for(var/I in 1 to 3)
diff --git a/code/game/objects/items/weapons/tanks/tank_types.dm b/code/game/objects/items/weapons/tanks/tank_types.dm
index 2964c960501..825bc70699e 100644
--- a/code/game/objects/items/weapons/tanks/tank_types.dm
+++ b/code/game/objects/items/weapons/tanks/tank_types.dm
@@ -170,7 +170,7 @@
name = "nitrogen tank"
desc = "A tank of nitrogen."
icon_state = "oxygen_fr"
- sprite_sheets = list("Vox Armalis" = 'icons/mob/species/armalis/back.dmi') //Do it for Big Bird.
+ sprite_sheets = list("Vox Armalis" = 'icons/mob/clothing/species/armalis/back.dmi') //Do it for Big Bird.
distribute_pressure = TANK_DEFAULT_RELEASE_PRESSURE
/obj/item/tank/internals/nitrogen/populate_gas()
@@ -188,7 +188,7 @@
name = "vox specialized nitrogen tank"
desc = "A high-tech nitrogen tank designed specifically for Vox."
icon_state = "emergency_vox"
- sprite_sheets = list("Vox Armalis" = 'icons/mob/species/armalis/belt.dmi') //Do it for Big Bird.
+ sprite_sheets = list("Vox Armalis" = 'icons/mob/clothing/species/armalis/belt.dmi') //Do it for Big Bird.
volume = 35
/obj/item/tank/internals/emergency_oxygen/double/vox/populate_gas()
diff --git a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm
index 1318be1d310..43dad2c7ccd 100644
--- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm
+++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm
@@ -137,6 +137,12 @@
rotate()
// Chair types
+/obj/structure/chair/light
+ name = "chair"
+ icon_state = "chair_greyscale"
+ resistance_flags = FLAMMABLE
+ item_chair = /obj/item/chair/light
+
/obj/structure/chair/wood
name = "wooden chair"
desc = "Old is never too old to not be in fashion."
@@ -268,6 +274,33 @@
anchored = TRUE
item_chair = null
buildstackamount = 1
+ var/image/armrest = null
+
+/obj/structure/chair/sofa/Initialize(mapload)
+ armrest = GetArmrest()
+ armrest.layer = ABOVE_MOB_LAYER
+ return ..()
+
+/obj/structure/chair/sofa/proc/GetArmrest()
+ return mutable_appearance('icons/obj/chairs.dmi', "[icon_state]_armrest")
+
+/obj/structure/chair/sofa/Destroy()
+ QDEL_NULL(armrest)
+ return ..()
+
+/obj/structure/chair/sofa/post_buckle_mob(mob/living/M)
+ . = ..()
+ update_armrest()
+
+/obj/structure/chair/sofa/post_unbuckle_mob(mob/living/M)
+ . = ..()
+ update_armrest()
+
+/obj/structure/chair/sofa/proc/update_armrest()
+ if(has_buckled_mobs())
+ add_overlay(armrest)
+ else
+ cut_overlay(armrest)
/obj/structure/chair/sofa/left
icon_state = "sofaend_left"
@@ -278,6 +311,32 @@
/obj/structure/chair/sofa/corner
icon_state = "sofacorner"
+/obj/structure/chair/sofa/corp
+ name = "sofa"
+ desc = "Soft and cushy."
+ icon_state = "corp_sofamiddle"
+
+/obj/structure/chair/sofa/corp/left
+ icon_state = "corp_sofaend_left"
+
+/obj/structure/chair/sofa/corp/right
+ icon_state = "corp_sofaend_right"
+
+/obj/structure/chair/sofa/corp/corner
+ icon_state = "corp_sofacorner"
+
+/obj/structure/chair/sofa/pew
+ name = "pew"
+ desc = "Rigid and uncomfortable, perfect for keeping you awake and alert."
+ icon_state = "pewmiddle"
+ buildstacktype = /obj/item/stack/sheet/wood
+
+/obj/structure/chair/sofa/pew/left
+ icon_state = "pewend_left"
+
+/obj/structure/chair/sofa/pew/right
+ icon_state = "pewend_right"
+
/obj/structure/chair/stool
name = "stool"
desc = "Apply butt."
@@ -309,6 +368,10 @@
var/break_chance = 5 //Likely hood of smashing the chair.
var/obj/structure/chair/origin_type = /obj/structure/chair
+/obj/item/chair/light
+ icon_state = "chair_greyscale_toppled"
+ origin_type = /obj/structure/chair/light
+
/obj/item/chair/stool
name = "stool"
icon = 'icons/obj/chairs.dmi'
diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm
index 63db6501f74..f6562d44c1f 100644
--- a/code/game/objects/structures/tables_racks.dm
+++ b/code/game/objects/structures/tables_racks.dm
@@ -408,6 +408,10 @@
return
if(!isliving(AM))
return
+ var/mob/living/L = AM
+ if(L.incorporeal_move || L.flying || L.floating)
+ return
+
// Don't break if they're just flying past
if(AM.throwing)
addtimer(CALLBACK(src, .proc/throw_check, AM), 5)
diff --git a/code/game/world.dm b/code/game/world.dm
index a5ccc80fe7b..a2c5dfa746a 100644
--- a/code/game/world.dm
+++ b/code/game/world.dm
@@ -8,6 +8,8 @@ GLOBAL_LIST_INIT(map_transition_config, list(CC_TRANSITION_CONFIG))
// Right off the bat
enable_auxtools_debugger()
+ SSmetrics.world_init_time = REALTIMEOFDAY
+
// Do sanity checks to ensure RUST actually exists
if(!fexists(RUST_G))
DIRECT_OUTPUT(world.log, "ERROR: RUSTG was not found and is required for the game to function. Server will now exit.")
diff --git a/code/modules/admin/IsBanned.dm b/code/modules/admin/IsBanned.dm
index 15decbb6848..aadb658470f 100644
--- a/code/modules/admin/IsBanned.dm
+++ b/code/modules/admin/IsBanned.dm
@@ -97,10 +97,9 @@
qdel(exist_query)
else
if(!exist_query.NextRow()) // If there isnt a row, they aint been seen before
- if(GLOB.panic_bunker_enabled)
+ if(SSqueue?.queue_enabled && (length(GLOB.clients) > SSqueue.queue_threshold) && !(ckey in SSqueue.queue_bypass_list))
qdel(exist_query)
- var/threshold = GLOB.configuration.general.panic_bunker_threshold
- return list("reason" = "panic bunker", "desc" = "Server is not accepting connections from never-before-seen players until player count is less than [threshold]. Please try again later.")
+ return list("reason" = "server queue", "desc" = "You seem to have managed to skip the server queue, possibly due to connecting during a restart. Please reconnect in 10 minutes. If you still cannot connect, please inform the server host.")
qdel(exist_query)
diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index 20db0335102..85d4be92516 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -72,7 +72,7 @@ GLOBAL_VAR_INIT(nologevent, 0)
/datum/admins/proc/show_player_panel(mob/M in GLOB.mob_list)
set category = null
- set name = "Show Player Panel"
+ set name = "\[Admin\] Show Player Panel"
set desc="Edit player (respawn, ban, heal, etc)"
if(!M)
@@ -766,7 +766,7 @@ GLOBAL_VAR_INIT(nologevent, 0)
message_admins("[key_name_admin(usr)] checked the AI laws")
/client/proc/update_mob_sprite(mob/living/carbon/human/H as mob)
- set name = "Update Mob Sprite"
+ set name = "\[Admin\] Update Mob Sprite"
set desc = "Should fix any mob sprite update errors."
set category = null
diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm
index 598705668ae..de44ccd4788 100644
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -137,7 +137,9 @@ GLOBAL_LIST_INIT(admin_verbs_server, list(
/client/proc/toggle_antagHUD_restrictions,
/client/proc/set_ooc,
/client/proc/reset_ooc,
- /client/proc/set_next_map
+ /client/proc/set_next_map,
+ /client/proc/manage_queue,
+ /client/proc/add_queue_server_bypass
))
GLOBAL_LIST_INIT(admin_verbs_debug, list(
/client/proc/cmd_admin_list_open_jobs,
@@ -611,7 +613,7 @@ GLOBAL_LIST_INIT(admin_verbs_ticket, list(
/client/proc/make_sound(obj/O in view()) // -- TLE
set category = "Event"
- set name = "Make Sound"
+ set name = "\[Admin\] Make Sound"
set desc = "Display a message to everyone who can hear the target"
if(!check_rights(R_EVENT))
@@ -797,7 +799,7 @@ GLOBAL_LIST_INIT(admin_verbs_ticket, list(
SSblackbox.record_feedback("tally", "admin_verb", 1, "Manage Silicon Laws") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/change_human_appearance_admin(mob/living/carbon/human/H in GLOB.mob_list)
- set name = "C.M.A. - Admin"
+ set name = "\[Admin\] C.M.A. - Admin"
set desc = "Allows you to change the mob appearance"
set category = null
@@ -823,7 +825,7 @@ GLOBAL_LIST_INIT(admin_verbs_ticket, list(
SSblackbox.record_feedback("tally", "admin_verb", 1, "CMA - Admin") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/change_human_appearance_self(mob/living/carbon/human/H in GLOB.mob_list)
- set name = "C.M.A. - Self"
+ set name = "\[Admin\] C.M.A. - Self"
set desc = "Allows the mob to change its appearance"
set category = null
@@ -963,7 +965,7 @@ GLOBAL_LIST_INIT(admin_verbs_ticket, list(
/client/proc/man_up(mob/T as mob in GLOB.player_list)
set category = null
- set name = "Man Up"
+ set name = "\[Admin\] Man Up"
set desc = "Tells mob to man up and deal with it."
if(!check_rights(R_ADMIN))
diff --git a/code/modules/admin/machine_upgrade.dm b/code/modules/admin/machine_upgrade.dm
index c3b27406858..f85c4426481 100644
--- a/code/modules/admin/machine_upgrade.dm
+++ b/code/modules/admin/machine_upgrade.dm
@@ -1,5 +1,5 @@
/proc/machine_upgrade(obj/machinery/M in world)
- set name = "Tweak Component Ratings"
+ set name = "\[Admin\] Tweak Component Ratings"
set category = null
if(!check_rights(R_DEBUG))
diff --git a/code/modules/admin/verbs/adminjump.dm b/code/modules/admin/verbs/adminjump.dm
index ed2aff985f1..70463a2a5ec 100644
--- a/code/modules/admin/verbs/adminjump.dm
+++ b/code/modules/admin/verbs/adminjump.dm
@@ -66,7 +66,7 @@
SSblackbox.record_feedback("tally", "admin_verb", 1, "Jump To Area") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/jumptoturf(turf/T in world)
- set name = "Jump to Turf"
+ set name = "\[Admin\] Jump to Turf"
set category = null
if(!check_rights(R_ADMIN))
@@ -135,7 +135,7 @@
/client/proc/Getmob(mob/M in GLOB.mob_list)
set category = null
- set name = "Get Mob"
+ set name = "\[Admin\] Get Mob"
set desc = "Mob to teleport"
if(!check_rights(R_ADMIN))
@@ -152,7 +152,7 @@
/client/proc/Getkey()
set category = null
- set name = "Get Key"
+ set name = "\[Admin\] Get Key"
set desc = "Key to teleport"
if(!check_rights(R_ADMIN))
diff --git a/code/modules/admin/verbs/adminpm.dm b/code/modules/admin/verbs/adminpm.dm
index d03344da2a1..7186406e7fa 100644
--- a/code/modules/admin/verbs/adminpm.dm
+++ b/code/modules/admin/verbs/adminpm.dm
@@ -1,7 +1,7 @@
//allows right clicking mobs to send an admin PM to their client, forwards the selected mob's client to cmd_admin_pm
/client/proc/cmd_admin_pm_context(mob/M as mob in GLOB.mob_list)
set category = null
- set name = "Admin PM Mob"
+ set name = "\[Admin\] Admin PM Mob"
if(!check_rights(R_ADMIN|R_MENTOR))
return
if(!ismob(M) || !M.client)
diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm
index 8ff8739d3b9..fd8a7eaa00e 100644
--- a/code/modules/admin/verbs/debug.dm
+++ b/code/modules/admin/verbs/debug.dm
@@ -173,7 +173,7 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention)
/client/proc/callproc_datum(A as null|area|mob|obj|turf)
set category = null
- set name = "Atom ProcCall"
+ set name = "\[Admin\] Atom ProcCall"
if(!check_rights(R_PROCCALL))
return
@@ -630,7 +630,7 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention)
/client/proc/cmd_admin_dress(mob/living/carbon/human/M in GLOB.human_list)
set category = "Event"
- set name = "Select equipment"
+ set name = "\[Admin\] Select equipment"
if(!check_rights(R_EVENT))
return
diff --git a/code/modules/admin/verbs/freeze.dm b/code/modules/admin/verbs/freeze.dm
index 0f52680acea..9d7bc424f38 100644
--- a/code/modules/admin/verbs/freeze.dm
+++ b/code/modules/admin/verbs/freeze.dm
@@ -9,7 +9,7 @@
GLOBAL_LIST_EMPTY(frozen_atom_list) // A list of admin-frozen atoms.
/client/proc/freeze(atom/movable/M)
- set name = "Freeze"
+ set name = "\[Admin\] Freeze"
set category = null
if(!check_rights(R_ADMIN))
diff --git a/code/modules/admin/verbs/manage_queue.dm b/code/modules/admin/verbs/manage_queue.dm
new file mode 100644
index 00000000000..09d40c9dde2
--- /dev/null
+++ b/code/modules/admin/verbs/manage_queue.dm
@@ -0,0 +1,61 @@
+/client/proc/manage_queue()
+ set name = "Manage Queue Server"
+ set desc = "Manage the queue server and its settings"
+ set category = "Server"
+
+ if(!check_rights(R_SERVER))
+ return
+
+ var/list/choices = list("Show Status", "Toggle Queue Server", "Set Threshold", "Toggle Setting Persistence")
+ var/choice = input(usr, "Please, select an option", "Queue Server Manipulation") as null|anything in choices
+
+ switch(choice)
+ if("Show Status")
+ to_chat(usr, "Queue Server Status")
+ to_chat(usr, "Enabled: [SSqueue.queue_enabled ? "Yes" : "No"]")
+ to_chat(usr, "Queue Threshold: [SSqueue.queue_threshold]")
+ to_chat(usr, "Setting Persistence: [SSqueue.persist_queue ? "Yes" : "No"]")
+ if("Toggle Queue Server")
+ SSqueue.queue_enabled = !SSqueue.queue_enabled
+ to_chat(usr, "Queue server is now [SSqueue.queue_enabled ? "Enabled" : "Disabled"]")
+ message_admins("[key_name_admin(usr)] has [SSqueue.queue_enabled ? "enabled" : "disabled"] the server queue.")
+ log_admin("[key_name(usr)] has [SSqueue.queue_enabled ? "enabled" : "disabled"] the server queue.")
+ SSdiscord.send2discord_simple(DISCORD_WEBHOOK_ADMIN, "**\[Queue Server]** `[usr.ckey]` has now **[SSqueue.queue_enabled ? "enabled" : "disabled"]** the queue server.")
+ if("Set Threshold")
+ var/new_threshold = input(usr, "Enter new threshold", "Queue Server Manipulation", SSqueue.queue_threshold) as num|null
+ if(!new_threshold)
+ return
+ SSqueue.queue_threshold = new_threshold
+ to_chat(usr, "Queue threshold is now [SSqueue.queue_threshold]")
+ message_admins("[key_name_admin(usr)] has set the queue threshold to [SSqueue.queue_threshold].")
+ log_admin("[key_name(usr)] has set the queue threshold to [SSqueue.queue_threshold].")
+ SSdiscord.send2discord_simple(DISCORD_WEBHOOK_ADMIN, "**\[Queue Server]** `[usr.ckey]` has set the queue threshold to **[SSqueue.queue_threshold]**.")
+ if("Toggle Setting Persistence")
+ SSqueue.persist_queue = !SSqueue.persist_queue
+ to_chat(usr, "Queue server setting persistence is now [SSqueue.persist_queue ? "Enabled" : "Disabled"]")
+ message_admins("[key_name_admin(usr)] has [SSqueue.persist_queue ? "enabled" : "disabled"] the server queue settings persistence.")
+ log_admin("[key_name(usr)] has [SSqueue.persist_queue ? "enabled" : "disabled"] the server queue settings persistence.")
+ SSdiscord.send2discord_simple(DISCORD_WEBHOOK_ADMIN, "**\[Queue Server]** `[usr.ckey]` has now **[SSqueue.persist_queue ? "enabled" : "disabled"]** server queue settings persistence.")
+
+/client/proc/add_queue_server_bypass()
+ set name = "Add Queue Server Bypass"
+ set desc = "Allow a ckey to bypass the server queue"
+ set category = "Server"
+
+ if(!check_rights(R_SERVER))
+ return
+
+ var/bypass_ckey = input(usr, "Please, enter a ckey", "Queue Server Bypass")
+
+ if(!bypass_ckey)
+ return
+
+ var/clean_ckey = ckey(bypass_ckey)
+
+ if(!clean_ckey)
+ to_chat(usr, "Invalid ckey supplied")
+ return
+
+ SSqueue.queue_bypass_list.Add(clean_ckey)
+ message_admins("[key_name_admin(usr)] has added the ckey [clean_ckey] to the queue bypass list.")
+ log_admin("[key_name(usr)] has added the ckey [clean_ckey] to the queue bypass list.")
diff --git a/code/modules/admin/verbs/possess.dm b/code/modules/admin/verbs/possess.dm
index 45e93ce8c47..b0c246bb027 100644
--- a/code/modules/admin/verbs/possess.dm
+++ b/code/modules/admin/verbs/possess.dm
@@ -1,5 +1,5 @@
/proc/possess(obj/O as obj in world)
- set name = "Possess Obj"
+ set name = "\[Admin\] Possess Obj"
set category = null
if(!check_rights(R_POSSESS))
@@ -34,7 +34,7 @@
SSblackbox.record_feedback("tally", "admin_verb", 1, "Possess Object") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/proc/release(obj/O as obj in world)
- set name = "Release Obj"
+ set name = "\[Admin\] Release Obj"
set category = null
//usr.loc = get_turf(usr)
diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm
index 53615c3d2f7..81be8843152 100644
--- a/code/modules/admin/verbs/randomverbs.dm
+++ b/code/modules/admin/verbs/randomverbs.dm
@@ -1,6 +1,6 @@
/client/proc/cmd_admin_drop_everything(mob/M as mob in GLOB.mob_list)
set category = null
- set name = "Drop Everything"
+ set name = "\[Admin\] Drop Everything"
if(!check_rights(R_DEBUG|R_ADMIN))
return
@@ -46,7 +46,7 @@
/client/proc/cmd_admin_subtle_message(mob/M as mob in GLOB.mob_list)
set category = "Event"
- set name = "Subtle Message"
+ set name = "\[Admin\] Subtle Message"
if(!ismob(M))
return
@@ -124,7 +124,7 @@
/client/proc/cmd_admin_direct_narrate(mob/M) // Targetted narrate -- TLE
set category = null
- set name = "Direct Narrate"
+ set name = "\[Admin\] Direct Narrate"
if(!check_rights(R_SERVER|R_EVENT))
return
@@ -151,7 +151,7 @@
/client/proc/cmd_admin_headset_message(mob/M in GLOB.mob_list)
set category = "Event"
- set name = "Headset Message"
+ set name = "\[Admin\] Headset Message"
admin_headset_message(M)
@@ -575,7 +575,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
/client/proc/cmd_admin_rejuvenate(mob/living/M as mob in GLOB.mob_list)
set category = null
- set name = "Rejuvenate"
+ set name = "\[Admin\] Rejuvenate"
if(!check_rights(R_REJUVINATE))
return
@@ -641,7 +641,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
/client/proc/cmd_admin_delete(atom/A as obj|mob|turf in view())
set category = null
- set name = "Delete"
+ set name = "\[Admin\] Delete"
if(!check_rights(R_ADMIN))
return
@@ -780,7 +780,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
SSblackbox.record_feedback("tally", "admin_verb", 1, "Gibself") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/cmd_admin_check_contents(mob/living/M as mob in GLOB.mob_list)
- set name = "Check Contents"
+ set name = "\[Admin\] Check Contents"
set category = null
if(!check_rights(R_ADMIN))
diff --git a/code/modules/antagonists/traitor/contractor/datums/contractor_hub_ui.dm b/code/modules/antagonists/traitor/contractor/datums/contractor_hub_ui.dm
index f0c705f6523..cc7b733c743 100644
--- a/code/modules/antagonists/traitor/contractor/datums/contractor_hub_ui.dm
+++ b/code/modules/antagonists/traitor/contractor/datums/contractor_hub_ui.dm
@@ -65,7 +65,6 @@
switch(page)
if(HUB_PAGE_CONTRACTS)
- var/contract_target
var/list/contracts_out = list()
data["contracts"] = contracts_out
for(var/c in contracts)
@@ -100,7 +99,6 @@
contract_data["fail_reason"] = C.fail_reason
if(C.contract.extraction_zone)
- contract_target = C.contract.target?.current
var/area/A = get_area(user)
contract_data["objective"] = list(
extraction_name = C.contract.extraction_zone.map_name,
@@ -114,9 +112,7 @@
)
contracts_out += list(contract_data)
- data["can_extract"] = FALSE
- if(contract_target)
- data["can_extract"] = current_contract?.contract.can_start_extraction_process(user, contract_target)
+ data["can_extract"] = current_contract?.contract.can_start_extraction_process(user) || FALSE
if(HUB_PAGE_SHOP)
var/list/buyables = list()
diff --git a/code/modules/antagonists/traitor/contractor/datums/objective_contract.dm b/code/modules/antagonists/traitor/contractor/datums/objective_contract.dm
index d2bd6de7567..171c1662cf9 100644
--- a/code/modules/antagonists/traitor/contractor/datums/objective_contract.dm
+++ b/code/modules/antagonists/traitor/contractor/datums/objective_contract.dm
@@ -237,8 +237,7 @@
* Returns whether the extraction process can be started.
*
* Arguments:
- * * M - The contractor.
- * * target - The target.
+ * * caller - The person trying to call the extraction.
*/
-/datum/objective/contract/proc/can_start_extraction_process(mob/living/carbon/human/M, mob/living/carbon/human/target)
- return get_area(M) == extraction_zone && get_area(target) == extraction_zone
+/datum/objective/contract/proc/can_start_extraction_process(mob/living/carbon/human/caller)
+ return get_area(caller) == extraction_zone && get_area(target.current) == extraction_zone
diff --git a/code/modules/buildmode/buttons.dm b/code/modules/buildmode/buttons.dm
index 2bec31f8650..9f74ac9aeff 100644
--- a/code/modules/buildmode/buttons.dm
+++ b/code/modules/buildmode/buttons.dm
@@ -1,7 +1,7 @@
/obj/screen/buildmode
icon = 'icons/misc/buildmode.dmi'
var/datum/click_intercept/buildmode/bd
- layer = HUD_LAYER_BUILDMODE
+ plane = HUD_PLANE_BUILDMODE
/obj/screen/buildmode/New(bld)
bd = bld
diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm
index 073e74caf26..8c7dc4963f6 100644
--- a/code/modules/client/client_procs.dm
+++ b/code/modules/client/client_procs.dm
@@ -379,23 +379,15 @@
if(M.client)
playercount += 1
- // Update the state of the panic bunker based on current playercount
- var/threshold = GLOB.configuration.general.panic_bunker_threshold
-
- if((playercount > threshold) && (GLOB.panic_bunker_enabled == FALSE))
- GLOB.panic_bunker_enabled = TRUE
- message_admins("Panic bunker has been automatically enabled due to playercount rising above [threshold]")
-
- if((playercount < threshold) && (GLOB.panic_bunker_enabled == TRUE))
- GLOB.panic_bunker_enabled = FALSE
- message_admins("Panic bunker has been automatically disabled due to playercount dropping below [threshold]")
-
// Tell clients about active testmerges
if(world.TgsAvailable() && length(GLOB.revision_info.testmerges))
to_chat(src, GLOB.revision_info.get_testmerge_chatmessage(TRUE))
INVOKE_ASYNC(src, .proc/cid_count_check)
+ if(check_rights(R_ADMIN, FALSE, mob)) // Mob is required. Dont even try without it.
+ to_chat(src, "The queue server is currently [SSqueue.queue_enabled ? "enabled" : "disabled"], with a threshold of [SSqueue.queue_threshold]. This [SSqueue.persist_queue ? "will" : "will not"] persist through rounds.")
+
/client/proc/is_connecting_from_localhost()
var/localhost_addresses = list("127.0.0.1", "::1") // Adresses
diff --git a/code/modules/clothing/chameleon.dm b/code/modules/clothing/chameleon.dm
index 5e872075da7..c873c76e1a5 100644
--- a/code/modules/clothing/chameleon.dm
+++ b/code/modules/clothing/chameleon.dm
@@ -232,7 +232,7 @@
armor = list("melee" = 10, "bullet" = 10, "laser" = 10, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/suit.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
var/datum/action/item_action/chameleon/change/chameleon_action
@@ -267,9 +267,9 @@
armor = list("melee" = 10, "bullet" = 10, "laser" = 10, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/eyes.dmi',
- "Drask" = 'icons/mob/species/drask/eyes.dmi',
- "Grey" = 'icons/mob/species/grey/eyes.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi',
+ "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi',
+ "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi'
)
var/datum/action/item_action/chameleon/change/chameleon_action
@@ -367,7 +367,7 @@
armor = list("melee" = 5, "bullet" = 5, "laser" = 5, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/head.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/head.dmi'
)
var/datum/action/item_action/chameleon/change/chameleon_action
@@ -406,12 +406,12 @@
flags_cover = MASKCOVERSEYES | MASKCOVERSMOUTH
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/mask.dmi',
- "Unathi" = 'icons/mob/species/unathi/mask.dmi',
- "Tajaran" = 'icons/mob/species/tajaran/mask.dmi',
- "Vulpkanin" = 'icons/mob/species/vulpkanin/mask.dmi',
- "Drask" = 'icons/mob/species/drask/mask.dmi',
- "Grey" = 'icons/mob/species/grey/mask.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/mask.dmi',
+ "Unathi" = 'icons/mob/clothing/species/unathi/mask.dmi',
+ "Tajaran" = 'icons/mob/clothing/species/tajaran/mask.dmi',
+ "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/mask.dmi',
+ "Drask" = 'icons/mob/clothing/species/drask/mask.dmi',
+ "Grey" = 'icons/mob/clothing/species/grey/mask.dmi'
)
var/obj/item/voice_changer/voice_changer
@@ -484,7 +484,7 @@
name = "backpack"
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/back.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/back.dmi'
)
var/datum/action/item_action/chameleon/change/chameleon_action
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index e42c616f12e..cc5710d14d6 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -134,8 +134,8 @@
slot_flags = SLOT_EARS
resistance_flags = NONE
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/ears.dmi',
- "Vox Armalis" = 'icons/mob/species/armalis/ears.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/ears.dmi',
+ "Vox Armalis" = 'icons/mob/clothing/species/armalis/ears.dmi'
) //We read you loud and skree-er.
/obj/item/clothing/ears/attack_hand(mob/user)
@@ -262,8 +262,8 @@ BLIND // can't see anything
put_on_delay = 40
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/gloves.dmi',
- "Drask" = 'icons/mob/species/drask/gloves.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/gloves.dmi',
+ "Drask" = 'icons/mob/clothing/species/drask/gloves.dmi'
)
// Called just before an attack_hand(), in mob/UnarmedAttack()
@@ -447,8 +447,8 @@ BLIND // can't see anything
slowdown = SHOES_SLOWDOWN
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/shoes.dmi',
- "Drask" = 'icons/mob/species/drask/shoes.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/shoes.dmi',
+ "Drask" = 'icons/mob/clothing/species/drask/shoes.dmi'
)
/obj/item/clothing/shoes/attackby(obj/item/I, mob/user, params)
@@ -617,7 +617,7 @@ BLIND // can't see anything
hide_tail_by_species = null
species_restricted = list("exclude","Wryn")
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/suit.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
//Under clothing
@@ -633,9 +633,9 @@ BLIND // can't see anything
pickup_sound = 'sound/items/handling/cloth_pickup.ogg'
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/uniform.dmi',
- "Drask" = 'icons/mob/species/drask/uniform.dmi',
- "Grey" = 'icons/mob/species/grey/uniform.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/uniform.dmi',
+ "Drask" = 'icons/mob/clothing/species/drask/uniform.dmi',
+ "Grey" = 'icons/mob/clothing/species/grey/uniform.dmi'
)
var/has_sensor = TRUE//For the crew computer 2 = unable to change mode
@@ -728,7 +728,7 @@ BLIND // can't see anything
if(!usr.incapacitated())
if(copytext(item_color,-2) != "_d")
basecolor = item_color
- if((basecolor + "_d_s") in icon_states('icons/mob/uniform.dmi'))
+ if((basecolor + "_d_s") in icon_states('icons/mob/clothing/uniform.dmi'))
item_color = item_color == "[basecolor]" ? "[basecolor]_d" : "[basecolor]"
usr.update_inv_w_uniform()
else
diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm
index 2f3fcca395f..00dcd32547e 100644
--- a/code/modules/clothing/glasses/glasses.dm
+++ b/code/modules/clothing/glasses/glasses.dm
@@ -71,10 +71,10 @@
prescription_upgradable = 1
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/eyes.dmi',
- "Drask" = 'icons/mob/species/drask/eyes.dmi',
- "Grey" = 'icons/mob/species/grey/eyes.dmi',
- "Drask" = 'icons/mob/species/drask/eyes.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi',
+ "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi',
+ "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi',
+ "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi'
)
/obj/item/clothing/glasses/meson/night
@@ -121,9 +121,9 @@
resistance_flags = ACID_PROOF
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 100)
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/eyes.dmi',
- "Grey" = 'icons/mob/species/grey/eyes.dmi',
- "Drask" = 'icons/mob/species/drask/eyes.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi',
+ "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi',
+ "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi'
)
actions_types = list(/datum/action/item_action/toggle_research_scanner)
@@ -147,7 +147,7 @@
item_state = "glasses"
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/eyes.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi'
)
/obj/item/clothing/glasses/night
@@ -160,9 +160,9 @@
lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE //don't render darkness while wearing these
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/eyes.dmi',
- "Drask" = 'icons/mob/species/drask/eyes.dmi',
- "Grey" = 'icons/mob/species/grey/eyes.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi',
+ "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi',
+ "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi'
)
/obj/item/clothing/glasses/eyepatch
@@ -172,9 +172,9 @@
item_state = "eyepatch"
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/eyes.dmi',
- "Grey" = 'icons/mob/species/grey/eyes.dmi',
- "Drask" = 'icons/mob/species/drask/eyes.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi',
+ "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi',
+ "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi'
)
/obj/item/clothing/glasses/monocle
@@ -185,9 +185,9 @@
prescription_upgradable = 1
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/eyes.dmi',
- "Drask" = 'icons/mob/species/drask/eyes.dmi',
- "Grey" = 'icons/mob/species/grey/eyes.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi',
+ "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi',
+ "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi'
)
/obj/item/clothing/glasses/material
@@ -199,9 +199,9 @@
vision_flags = SEE_OBJS
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/eyes.dmi',
- "Drask" = 'icons/mob/species/drask/eyes.dmi',
- "Grey" = 'icons/mob/species/grey/eyes.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi',
+ "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi',
+ "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi'
)
/obj/item/clothing/glasses/material/cyber
@@ -229,9 +229,9 @@
prescription = 1
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/eyes.dmi',
- "Grey" = 'icons/mob/species/grey/eyes.dmi',
- "Drask" = 'icons/mob/species/drask/eyes.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi',
+ "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi',
+ "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi'
)
/obj/item/clothing/glasses/regular/hipster
@@ -247,9 +247,9 @@
item_state = "3d"
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/eyes.dmi',
- "Grey" = 'icons/mob/species/grey/eyes.dmi',
- "Drask" = 'icons/mob/species/drask/eyes.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi',
+ "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi',
+ "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi'
)
/obj/item/clothing/glasses/gglasses
@@ -259,9 +259,9 @@
item_state = "gglasses"
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/eyes.dmi',
- "Grey" = 'icons/mob/species/grey/eyes.dmi',
- "Drask" = 'icons/mob/species/drask/eyes.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi',
+ "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi',
+ "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi'
)
prescription_upgradable = 1
@@ -276,9 +276,9 @@
prescription_upgradable = 1
dog_fashion = /datum/dog_fashion/head
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/eyes.dmi',
- "Drask" = 'icons/mob/species/drask/eyes.dmi',
- "Grey" = 'icons/mob/species/grey/eyes.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi',
+ "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi',
+ "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi'
)
/obj/item/clothing/glasses/sunglasses_fake
@@ -290,9 +290,9 @@
flash_protect = 0
tint = 0
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/eyes.dmi',
- "Drask" = 'icons/mob/species/drask/eyes.dmi',
- "Grey" = 'icons/mob/species/grey/eyes.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi',
+ "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi',
+ "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi'
)
/obj/item/clothing/glasses/sunglasses/noir
@@ -344,9 +344,9 @@
tint = 1
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/eyes.dmi',
- "Drask" = 'icons/mob/species/drask/eyes.dmi',
- "Grey" = 'icons/mob/species/grey/eyes.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi',
+ "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi',
+ "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi'
)
/obj/item/clothing/glasses/sunglasses/lasers
@@ -370,9 +370,9 @@
tint = 2
visor_vars_to_toggle = VISOR_FLASHPROTECT | VISOR_TINT
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/eyes.dmi',
- "Drask" = 'icons/mob/species/drask/eyes.dmi',
- "Grey" = 'icons/mob/species/grey/eyes.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi',
+ "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi',
+ "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi'
)
/obj/item/clothing/glasses/welding/attack_self(mob/user)
@@ -395,6 +395,12 @@
tint = 3 //to make them blind
prescription_upgradable = 0
+/obj/item/clothing/glasses/sunglasses/blindfold/fake
+ name = "tattered blindfold"
+ desc = "A see-through blindfold perfect for cheating at games like pin the stunbaton on the clown."
+ flash_protect = 0
+ tint = 0
+
/obj/item/clothing/glasses/sunglasses/prescription
prescription = 1
@@ -414,9 +420,9 @@
flash_protect = -1
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/eyes.dmi',
- "Grey" = 'icons/mob/species/grey/eyes.dmi',
- "Drask" = 'icons/mob/species/drask/eyes.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi',
+ "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi',
+ "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi'
)
/obj/item/clothing/glasses/thermal/emp_act(severity)
@@ -463,9 +469,9 @@
lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
resistance_flags = LAVA_PROOF | FIRE_PROOF
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/eyes.dmi',
- "Grey" = 'icons/mob/species/grey/eyes.dmi',
- "Drask" = 'icons/mob/species/drask/eyes.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi',
+ "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi',
+ "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi'
)
/obj/item/clothing/glasses/godeye/attackby(obj/item/W as obj, mob/user as mob, params)
@@ -493,9 +499,9 @@
tint = 0
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/eyes.dmi',
- "Grey" = 'icons/mob/species/grey/eyes.dmi',
- "Drask" = 'icons/mob/species/drask/eyes.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi',
+ "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi',
+ "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi'
)
/obj/item/clothing/glasses/tajblind/eng
diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm
index 9f4b4f4c834..2a03c6f0a60 100644
--- a/code/modules/clothing/glasses/hud.dm
+++ b/code/modules/clothing/glasses/hud.dm
@@ -36,9 +36,9 @@
examine_extensions = list(EXAMINE_HUD_MEDICAL)
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/eyes.dmi',
- "Drask" = 'icons/mob/species/drask/eyes.dmi',
- "Grey" = 'icons/mob/species/grey/eyes.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi',
+ "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi',
+ "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi'
)
/obj/item/clothing/glasses/hud/health/night
@@ -67,9 +67,9 @@
HUDType = DATA_HUD_DIAGNOSTIC
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/eyes.dmi',
- "Drask" = 'icons/mob/species/drask/eyes.dmi',
- "Grey" = 'icons/mob/species/grey/eyes.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi',
+ "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi',
+ "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi'
)
/obj/item/clothing/glasses/hud/diagnostic/night
@@ -100,9 +100,9 @@
examine_extensions = list(EXAMINE_HUD_SECURITY_READ, EXAMINE_HUD_SECURITY_WRITE)
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/eyes.dmi',
- "Drask" = 'icons/mob/species/drask/eyes.dmi',
- "Grey" = 'icons/mob/species/grey/eyes.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi',
+ "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi',
+ "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi'
)
@@ -137,9 +137,9 @@
prescription_upgradable = 1
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/eyes.dmi',
- "Drask" = 'icons/mob/species/drask/eyes.dmi',
- "Grey" = 'icons/mob/species/grey/eyes.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi',
+ "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi',
+ "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi'
)
/obj/item/clothing/glasses/hud/security/sunglasses/prescription
@@ -152,9 +152,9 @@
HUDType = DATA_HUD_HYDROPONIC
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/eyes.dmi',
- "Drask" = 'icons/mob/species/drask/eyes.dmi',
- "Grey" = 'icons/mob/species/grey/eyes.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi',
+ "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi',
+ "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi'
)
/obj/item/clothing/glasses/hud/hydroponic/night
@@ -177,7 +177,7 @@
up = 0
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/eyes.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi'
)
/obj/item/clothing/glasses/hud/security/tajblind/attack_self()
@@ -193,9 +193,9 @@
up = 0
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/eyes.dmi',
- "Grey" = 'icons/mob/species/grey/eyes.dmi',
- "Drask" = 'icons/mob/species/drask/eyes.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi',
+ "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi',
+ "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi'
)
/obj/item/clothing/glasses/hud/health/tajblind/attack_self()
@@ -209,9 +209,9 @@
HUDType = DATA_HUD_SECURITY_BASIC
examine_extensions = list(EXAMINE_HUD_SKILLS)
sprite_sheets = list(
- "Drask" = 'icons/mob/species/drask/eyes.dmi',
- "Grey" = 'icons/mob/species/grey/eyes.dmi',
- "Vox" = 'icons/mob/species/vox/eyes.dmi'
+ "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi',
+ "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi',
+ "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi'
)
/obj/item/clothing/glasses/hud/skills/sunglasses
@@ -223,7 +223,7 @@
tint = 1
prescription_upgradable = TRUE
sprite_sheets = list(
- "Drask" = 'icons/mob/species/drask/eyes.dmi',
- "Grey" = 'icons/mob/species/grey/eyes.dmi',
- "Vox" = 'icons/mob/species/vox/eyes.dmi'
+ "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi',
+ "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi',
+ "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi'
)
diff --git a/code/modules/clothing/head/beanie.dm b/code/modules/clothing/head/beanie.dm
index 5e6ce69f252..61767d23fe0 100644
--- a/code/modules/clothing/head/beanie.dm
+++ b/code/modules/clothing/head/beanie.dm
@@ -9,7 +9,7 @@
icon_state = "beanie" //Default white
item_color = "beanie"
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/head.dmi',
+ "Vox" = 'icons/mob/clothing/species/vox/head.dmi',
)
/obj/item/clothing/head/beanie/black
diff --git a/code/modules/clothing/head/collectable.dm b/code/modules/clothing/head/collectable.dm
index 501ec562441..46bcdcc246d 100644
--- a/code/modules/clothing/head/collectable.dm
+++ b/code/modules/clothing/head/collectable.dm
@@ -66,10 +66,10 @@
item_state = "welding"
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/helmet.dmi',
- "Unathi" = 'icons/mob/species/unathi/mask.dmi',
- "Tajaran" = 'icons/mob/species/tajaran/mask.dmi',
- "Vulpkanin" = 'icons/mob/species/vulpkanin/mask.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/helmet.dmi',
+ "Unathi" = 'icons/mob/clothing/species/unathi/mask.dmi',
+ "Tajaran" = 'icons/mob/clothing/species/tajaran/mask.dmi',
+ "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/mask.dmi'
)
/obj/item/clothing/head/collectable/slime
@@ -116,7 +116,7 @@
desc = "WARNING! Offers no real protection, or luminosity, but it is damn fancy!"
icon_state = "hardhat0_yellow"
item_state = "hardhat0_yellow"
- dog_fashion = /datum/dog_fashion/head
+ dog_fashion = /datum/dog_fashion/head/hardhat
/obj/item/clothing/head/collectable/HoS
name = "collectable HoS hat"
@@ -142,5 +142,5 @@
item_state = "swat"
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/helmet.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/helmet.dmi'
)
diff --git a/code/modules/clothing/head/hardhat.dm b/code/modules/clothing/head/hardhat.dm
index a0e4e374aee..501ed9cdd61 100644
--- a/code/modules/clothing/head/hardhat.dm
+++ b/code/modules/clothing/head/hardhat.dm
@@ -13,7 +13,7 @@
resistance_flags = FIRE_PROOF
dog_fashion = /datum/dog_fashion/head/hardhat
sprite_sheets = list(
- "Grey" = 'icons/mob/species/grey/head.dmi'
+ "Grey" = 'icons/mob/clothing/species/grey/head.dmi'
)
/obj/item/clothing/head/hardhat/attack_self(mob/living/user)
@@ -67,6 +67,7 @@
max_heat_protection_temperature = FIRE_HELM_MAX_TEMP_PROTECT
cold_protection = HEAD
min_cold_protection_temperature = FIRE_HELM_MIN_TEMP_PROTECT
+ dog_fashion = /datum/dog_fashion/head/hardhat/red
/obj/item/clothing/head/hardhat/white
name = "white hard hat"
@@ -78,7 +79,7 @@
max_heat_protection_temperature = FIRE_HELM_MAX_TEMP_PROTECT
cold_protection = HEAD
min_cold_protection_temperature = FIRE_HELM_MIN_TEMP_PROTECT
- dog_fashion = /datum/dog_fashion/head/hardhat
+ dog_fashion = /datum/dog_fashion/head/hardhat/white
/obj/item/clothing/head/hardhat/dblue
name = "blue hard hat"
@@ -100,5 +101,5 @@
min_cold_protection_temperature = FIRE_HELM_MIN_TEMP_PROTECT
dog_fashion = null
sprite_sheets = list(
- "Grey" = 'icons/mob/species/grey/helmet.dmi'
+ "Grey" = 'icons/mob/clothing/species/grey/helmet.dmi'
)
diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm
index e8ce88dba1e..552f0677827 100644
--- a/code/modules/clothing/head/helmet.dm
+++ b/code/modules/clothing/head/helmet.dm
@@ -15,9 +15,9 @@
strip_delay = 60
dog_fashion = /datum/dog_fashion/head/helmet
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/helmet.dmi',
- "Drask" = 'icons/mob/species/drask/helmet.dmi',
- "Grey" = 'icons/mob/species/grey/helmet.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/helmet.dmi',
+ "Drask" = 'icons/mob/clothing/species/drask/helmet.dmi',
+ "Grey" = 'icons/mob/clothing/species/grey/helmet.dmi'
)
/obj/item/clothing/head/helmet/attack_self(mob/user)
@@ -224,7 +224,7 @@
flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/helmet.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/helmet.dmi'
)
/obj/item/clothing/head/helmet/riot/knight/blue
diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm
index 650664e3f9b..28e89708b6b 100644
--- a/code/modules/clothing/head/jobs.dm
+++ b/code/modules/clothing/head/jobs.dm
@@ -82,7 +82,7 @@
dog_fashion = /datum/dog_fashion/head/detective
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/head.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/head.dmi'
)
//Mime
@@ -176,7 +176,7 @@
icon_state = "surgcap_blue"
flags = BLOCKHEADHAIR
sprite_sheets = list(
- "Drask" = 'icons/mob/species/drask/head.dmi'
+ "Drask" = 'icons/mob/clothing/species/drask/head.dmi'
)
/obj/item/clothing/head/surgery/purple
diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm
index 388fa0374ed..85d6080f642 100644
--- a/code/modules/clothing/head/misc.dm
+++ b/code/modules/clothing/head/misc.dm
@@ -81,7 +81,7 @@
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE
sprite_sheets = list(
- "Grey" = 'icons/mob/species/grey/helmet.dmi'
+ "Grey" = 'icons/mob/clothing/species/grey/helmet.dmi'
)
@@ -95,7 +95,7 @@
flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
sprite_sheets = list(
- "Grey" = 'icons/mob/species/grey/head.dmi'
+ "Grey" = 'icons/mob/clothing/species/grey/head.dmi'
)
/obj/item/clothing/head/snowman
@@ -108,7 +108,7 @@
flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
sprite_sheets = list(
- "Grey" = 'icons/mob/species/grey/head.dmi'
+ "Grey" = 'icons/mob/clothing/species/grey/head.dmi'
)
/obj/item/clothing/head/that
@@ -273,7 +273,7 @@
flags = BLOCKHAIR
sprite_sheets = list(
- "Grey" = 'icons/mob/species/grey/head.dmi'
+ "Grey" = 'icons/mob/clothing/species/grey/head.dmi'
)
/obj/item/clothing/head/corgi
@@ -313,7 +313,7 @@
icon_state = "fedora"
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/head.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/head.dmi'
)
/obj/item/clothing/head/fedora/whitefedora
@@ -321,7 +321,7 @@
icon_state = "wfedora"
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/head.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/head.dmi'
)
/obj/item/clothing/head/fedora/brownfedora
@@ -329,7 +329,7 @@
icon_state = "bfedora"
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/head.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/head.dmi'
)
/obj/item/clothing/head/stalhelm //Why do these exist
@@ -436,7 +436,7 @@
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE
sprite_sheets = list(
- "Grey" = 'icons/mob/species/grey/head.dmi'
+ "Grey" = 'icons/mob/clothing/species/grey/head.dmi'
)
actions_types = list(/datum/action/item_action/caw)
@@ -469,7 +469,7 @@
flags_inv = HIDEFACE|HIDEEARS
sprite_sheets = list(
- "Grey" = 'icons/mob/species/grey/head.dmi'
+ "Grey" = 'icons/mob/clothing/species/grey/head.dmi'
)
/obj/item/clothing/head/papersack/smiley
@@ -480,7 +480,7 @@
flags_inv = HIDEFACE|HIDEEARS
sprite_sheets = list(
- "Grey" = 'icons/mob/species/grey/head.dmi'
+ "Grey" = 'icons/mob/clothing/species/grey/head.dmi'
)
/obj/item/clothing/head/crown
diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm
index 28dd6f4cb55..b78360a34dc 100644
--- a/code/modules/clothing/head/misc_special.dm
+++ b/code/modules/clothing/head/misc_special.dm
@@ -28,11 +28,11 @@
resistance_flags = FIRE_PROOF
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/head.dmi',
- "Unathi" = 'icons/mob/species/unathi/helmet.dmi',
- "Tajaran" = 'icons/mob/species/tajaran/helmet.dmi',
- "Vulpkanin" = 'icons/mob/species/vulpkanin/helmet.dmi',
- "Grey" = 'icons/mob/species/grey/helmet.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/head.dmi',
+ "Unathi" = 'icons/mob/clothing/species/unathi/helmet.dmi',
+ "Tajaran" = 'icons/mob/clothing/species/tajaran/helmet.dmi',
+ "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/helmet.dmi',
+ "Grey" = 'icons/mob/clothing/species/grey/helmet.dmi'
)
/obj/item/clothing/head/welding/attack_self(mob/user)
@@ -141,7 +141,7 @@
min_cold_protection_temperature = FIRE_HELM_MIN_TEMP_PROTECT
dog_fashion = /datum/dog_fashion/head/ushanka
sprite_sheets = list(
- "Grey" = 'icons/mob/species/grey/head.dmi'
+ "Grey" = 'icons/mob/clothing/species/grey/head.dmi'
)
/obj/item/clothing/head/ushanka/attack_self(mob/user as mob)
@@ -166,10 +166,10 @@
flags = BLOCKHAIR
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE
flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
-
+ dog_fashion = null
sprite_sheets = list(
- "Grey" = 'icons/mob/species/grey/head.dmi'
+ "Grey" = 'icons/mob/clothing/species/grey/head.dmi'
)
armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
@@ -202,10 +202,10 @@
if(!istype(user)) return
var/obj/item/organ/external/head/head_organ = user.get_organ("head")
- mob = new/icon("icon" = 'icons/mob/head.dmi', "icon_state" = "kitty")
+ mob = new/icon("icon" = 'icons/mob/clothing/head.dmi', "icon_state" = "kitty")
mob.Blend(head_organ.hair_colour, ICON_ADD)
- var/icon/earbit = new/icon("icon" = 'icons/mob/head.dmi', "icon_state" = "kittyinner")
+ var/icon/earbit = new/icon("icon" = 'icons/mob/clothing/head.dmi', "icon_state" = "kittyinner")
mob.Blend(earbit, ICON_OVERLAY)
icon_override = mob
@@ -224,10 +224,10 @@
/obj/item/clothing/head/kitty/mouse/update_icon(mob/living/carbon/human/user)
if(!istype(user)) return
var/obj/item/organ/external/head/head_organ = user.get_organ("head")
- mob = new/icon("icon" = 'icons/mob/head.dmi', "icon_state" = "mousey")
+ mob = new/icon("icon" = 'icons/mob/clothing/head.dmi', "icon_state" = "mousey")
mob.Blend(head_organ.hair_colour, ICON_ADD)
- var/icon/earbit = new/icon("icon" = 'icons/mob/head.dmi', "icon_state" = "mouseyinner")
+ var/icon/earbit = new/icon("icon" = 'icons/mob/clothing/head.dmi', "icon_state" = "mouseyinner")
mob.Blend(earbit, ICON_OVERLAY)
icon_override = mob
@@ -242,7 +242,7 @@
species_disguise = "High-tech robot"
dog_fashion = /datum/dog_fashion/head/cardborg
sprite_sheets = list(
- "Grey" = 'icons/mob/species/grey/head.dmi'
+ "Grey" = 'icons/mob/clothing/species/grey/head.dmi'
)
@@ -268,8 +268,8 @@
item_state = "head_mirror"
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/head.dmi',
- "Drask" = 'icons/mob/species/drask/head.dmi',
- "Grey" = 'icons/mob/species/grey/head.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/head.dmi',
+ "Drask" = 'icons/mob/clothing/species/drask/head.dmi',
+ "Grey" = 'icons/mob/clothing/species/grey/head.dmi'
)
diff --git a/code/modules/clothing/head/soft_caps.dm b/code/modules/clothing/head/soft_caps.dm
index f55be1d578e..774b560a858 100644
--- a/code/modules/clothing/head/soft_caps.dm
+++ b/code/modules/clothing/head/soft_caps.dm
@@ -8,7 +8,7 @@
actions_types = list(/datum/action/item_action/flip_cap)
dog_fashion = /datum/dog_fashion/head/cargo_tech
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/head.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/head.dmi'
)
/obj/item/clothing/head/soft/dropped()
diff --git a/code/modules/clothing/masks/boxing.dm b/code/modules/clothing/masks/boxing.dm
index 090011ce47d..ce9e2756cef 100644
--- a/code/modules/clothing/masks/boxing.dm
+++ b/code/modules/clothing/masks/boxing.dm
@@ -10,12 +10,12 @@
adjusted_flags = SLOT_HEAD
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/mask.dmi',
- "Unathi" = 'icons/mob/species/unathi/mask.dmi',
- "Tajaran" = 'icons/mob/species/tajaran/mask.dmi',
- "Vulpkanin" = 'icons/mob/species/vulpkanin/mask.dmi',
- "Grey" = 'icons/mob/species/grey/mask.dmi',
- "Drask" = 'icons/mob/species/drask/mask.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/mask.dmi',
+ "Unathi" = 'icons/mob/clothing/species/unathi/mask.dmi',
+ "Tajaran" = 'icons/mob/clothing/species/tajaran/mask.dmi',
+ "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/mask.dmi',
+ "Grey" = 'icons/mob/clothing/species/grey/mask.dmi',
+ "Drask" = 'icons/mob/clothing/species/drask/mask.dmi'
)
/obj/item/clothing/mask/balaclava/attack_self(mob/user)
@@ -31,12 +31,12 @@
w_class = WEIGHT_CLASS_SMALL
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/mask.dmi',
- "Unathi" = 'icons/mob/species/unathi/mask.dmi',
- "Tajaran" = 'icons/mob/species/tajaran/mask.dmi',
- "Vulpkanin" = 'icons/mob/species/vulpkanin/mask.dmi',
- "Grey" = 'icons/mob/species/grey/mask.dmi',
- "Drask" = 'icons/mob/species/drask/mask.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/mask.dmi',
+ "Unathi" = 'icons/mob/clothing/species/unathi/mask.dmi',
+ "Tajaran" = 'icons/mob/clothing/species/tajaran/mask.dmi',
+ "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/mask.dmi',
+ "Grey" = 'icons/mob/clothing/species/grey/mask.dmi',
+ "Drask" = 'icons/mob/clothing/species/drask/mask.dmi'
)
/obj/item/clothing/mask/luchador/tecnicos
diff --git a/code/modules/clothing/masks/breath.dm b/code/modules/clothing/masks/breath.dm
index 28a0dad852d..895b0214f71 100644
--- a/code/modules/clothing/masks/breath.dm
+++ b/code/modules/clothing/masks/breath.dm
@@ -11,14 +11,14 @@
actions_types = list(/datum/action/item_action/adjust)
resistance_flags = NONE
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/mask.dmi',
- "Vox Armalis" = 'icons/mob/species/armalis/mask.dmi',
- "Unathi" = 'icons/mob/species/unathi/mask.dmi',
- "Tajaran" = 'icons/mob/species/tajaran/mask.dmi',
- "Vulpkanin" = 'icons/mob/species/vulpkanin/mask.dmi',
- "Grey" = 'icons/mob/species/grey/mask.dmi',
- "Drask" = 'icons/mob/species/drask/mask.dmi',
- "Plasmaman" = 'icons/mob/species/plasmaman/mask.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/mask.dmi',
+ "Vox Armalis" = 'icons/mob/clothing/species/armalis/mask.dmi',
+ "Unathi" = 'icons/mob/clothing/species/unathi/mask.dmi',
+ "Tajaran" = 'icons/mob/clothing/species/tajaran/mask.dmi',
+ "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/mask.dmi',
+ "Grey" = 'icons/mob/clothing/species/grey/mask.dmi',
+ "Drask" = 'icons/mob/clothing/species/drask/mask.dmi',
+ "Plasmaman" = 'icons/mob/clothing/species/plasmaman/mask.dmi'
)
/obj/item/clothing/mask/breath/attack_self(mob/user)
diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm
index d8cba5290b7..14dd7f3653e 100644
--- a/code/modules/clothing/masks/gasmask.dm
+++ b/code/modules/clothing/masks/gasmask.dm
@@ -11,13 +11,13 @@
permeability_coefficient = 0.01
resistance_flags = NONE
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/mask.dmi',
- "Unathi" = 'icons/mob/species/unathi/mask.dmi',
- "Tajaran" = 'icons/mob/species/tajaran/mask.dmi',
- "Vulpkanin" = 'icons/mob/species/vulpkanin/mask.dmi',
- "Drask" = 'icons/mob/species/drask/mask.dmi',
- "Grey" = 'icons/mob/species/grey/mask.dmi',
- "Plasmaman" = 'icons/mob/species/plasmaman/mask.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/mask.dmi',
+ "Unathi" = 'icons/mob/clothing/species/unathi/mask.dmi',
+ "Tajaran" = 'icons/mob/clothing/species/tajaran/mask.dmi',
+ "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/mask.dmi',
+ "Drask" = 'icons/mob/clothing/species/drask/mask.dmi',
+ "Grey" = 'icons/mob/clothing/species/grey/mask.dmi',
+ "Plasmaman" = 'icons/mob/clothing/species/plasmaman/mask.dmi'
)
// **** Welding gas mask ****
@@ -50,12 +50,12 @@
resistance_flags = FIRE_PROOF
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/mask.dmi',
- "Unathi" = 'icons/mob/species/unathi/mask.dmi',
- "Tajaran" = 'icons/mob/species/tajaran/mask.dmi',
- "Vulpkanin" = 'icons/mob/species/vulpkanin/mask.dmi',
- "Drask" = 'icons/mob/species/drask/mask.dmi',
- "Grey" = 'icons/mob/species/grey/mask.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/mask.dmi',
+ "Unathi" = 'icons/mob/clothing/species/unathi/mask.dmi',
+ "Tajaran" = 'icons/mob/clothing/species/tajaran/mask.dmi',
+ "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/mask.dmi',
+ "Drask" = 'icons/mob/clothing/species/drask/mask.dmi',
+ "Grey" = 'icons/mob/clothing/species/grey/mask.dmi'
)
/obj/item/clothing/mask/gas/explorer/marines
diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm
index e663856e3c5..ece319c7a1a 100644
--- a/code/modules/clothing/masks/miscellaneous.dm
+++ b/code/modules/clothing/masks/miscellaneous.dm
@@ -13,7 +13,7 @@
var/locked = FALSE //Indicates if a mask is locked, should always start as 0.
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/mask.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/mask.dmi'
)
// Clumsy folks can't take the mask off themselves.
@@ -91,11 +91,11 @@
flags = DROPDEL
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/mask.dmi',
- "Unathi" = 'icons/mob/species/unathi/mask.dmi',
- "Tajaran" = 'icons/mob/species/tajaran/mask.dmi',
- "Vulpkanin" = 'icons/mob/species/vulpkanin/mask.dmi',
- "Grey" = 'icons/mob/species/grey/mask.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/mask.dmi',
+ "Unathi" = 'icons/mob/clothing/species/unathi/mask.dmi',
+ "Tajaran" = 'icons/mob/clothing/species/tajaran/mask.dmi',
+ "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/mask.dmi',
+ "Grey" = 'icons/mob/clothing/species/grey/mask.dmi'
)
/obj/item/clothing/mask/muzzle/tapegag/dropped(mob/user)
@@ -119,12 +119,12 @@
materials = list(MAT_METAL=500, MAT_GLASS=50)
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/mask.dmi',
- "Unathi" = 'icons/mob/species/unathi/mask.dmi',
- "Tajaran" = 'icons/mob/species/tajaran/mask.dmi',
- "Vulpkanin" = 'icons/mob/species/vulpkanin/mask.dmi',
- "Grey" = 'icons/mob/species/grey/mask.dmi',
- "Drask" = 'icons/mob/species/drask/mask.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/mask.dmi',
+ "Unathi" = 'icons/mob/clothing/species/unathi/mask.dmi',
+ "Tajaran" = 'icons/mob/clothing/species/tajaran/mask.dmi',
+ "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/mask.dmi',
+ "Grey" = 'icons/mob/clothing/species/grey/mask.dmi',
+ "Drask" = 'icons/mob/clothing/species/drask/mask.dmi'
)
/obj/item/clothing/mask/muzzle/safety/shock
@@ -216,12 +216,12 @@
actions_types = list(/datum/action/item_action/adjust)
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/mask.dmi',
- "Unathi" = 'icons/mob/species/unathi/mask.dmi',
- "Tajaran" = 'icons/mob/species/tajaran/mask.dmi',
- "Vulpkanin" = 'icons/mob/species/vulpkanin/mask.dmi',
- "Grey" = 'icons/mob/species/grey/mask.dmi',
- "Drask" = 'icons/mob/species/drask/mask.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/mask.dmi',
+ "Unathi" = 'icons/mob/clothing/species/unathi/mask.dmi',
+ "Tajaran" = 'icons/mob/clothing/species/tajaran/mask.dmi',
+ "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/mask.dmi',
+ "Grey" = 'icons/mob/clothing/species/grey/mask.dmi',
+ "Drask" = 'icons/mob/clothing/species/drask/mask.dmi'
)
@@ -237,12 +237,12 @@
dog_fashion = /datum/dog_fashion/head/not_ian
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/mask.dmi',
- "Unathi" = 'icons/mob/species/unathi/mask.dmi',
- "Tajaran" = 'icons/mob/species/tajaran/mask.dmi',
- "Vulpkanin" = 'icons/mob/species/vulpkanin/mask.dmi',
- "Grey" = 'icons/mob/species/grey/mask.dmi',
- "Drask" = 'icons/mob/species/drask/mask.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/mask.dmi',
+ "Unathi" = 'icons/mob/clothing/species/unathi/mask.dmi',
+ "Tajaran" = 'icons/mob/clothing/species/tajaran/mask.dmi',
+ "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/mask.dmi',
+ "Grey" = 'icons/mob/clothing/species/grey/mask.dmi',
+ "Drask" = 'icons/mob/clothing/species/drask/mask.dmi'
)
/obj/item/clothing/mask/fakemoustache/attack_self(mob/user)
@@ -318,8 +318,8 @@
var/originalname = ""
sprite_sheets = list(
- "Grey" = 'icons/mob/species/grey/mask.dmi',
- "Drask" = 'icons/mob/species/drask/mask.dmi'
+ "Grey" = 'icons/mob/clothing/species/grey/mask.dmi',
+ "Drask" = 'icons/mob/clothing/species/drask/mask.dmi'
)
/obj/item/clothing/mask/horsehead/equipped(mob/user, slot)
@@ -427,12 +427,12 @@
icon_state = "bandbotany"
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/mask.dmi',
- "Unathi" = 'icons/mob/species/unathi/mask.dmi',
- "Tajaran" = 'icons/mob/species/tajaran/mask.dmi',
- "Vulpkanin" = 'icons/mob/species/vulpkanin/mask.dmi',
- "Grey" = 'icons/mob/species/grey/mask.dmi',
- "Drask" = 'icons/mob/species/drask/mask.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/mask.dmi',
+ "Unathi" = 'icons/mob/clothing/species/unathi/mask.dmi',
+ "Tajaran" = 'icons/mob/clothing/species/tajaran/mask.dmi',
+ "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/mask.dmi',
+ "Grey" = 'icons/mob/clothing/species/grey/mask.dmi',
+ "Drask" = 'icons/mob/clothing/species/drask/mask.dmi'
)
actions_types = list(/datum/action/item_action/adjust)
diff --git a/code/modules/clothing/patreon/glasses.dm b/code/modules/clothing/patreon/glasses.dm
index 08d5d6b0af8..88b8216338f 100644
--- a/code/modules/clothing/patreon/glasses.dm
+++ b/code/modules/clothing/patreon/glasses.dm
@@ -9,7 +9,7 @@
item_state = "gar"
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/eyes.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi'
)
diff --git a/code/modules/clothing/patreon/hats.dm b/code/modules/clothing/patreon/hats.dm
index 8b769ba4150..6c34a2576c5 100644
--- a/code/modules/clothing/patreon/hats.dm
+++ b/code/modules/clothing/patreon/hats.dm
@@ -11,7 +11,7 @@
flags = BLOCKHAIR
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/head.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/head.dmi'
)
//gold top hat and recolours
@@ -22,7 +22,7 @@
item_state = "goldtophat"
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/head.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/head.dmi'
)
@@ -47,7 +47,7 @@
flags = BLOCKHAIR
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/head.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/head.dmi'
)
//black sombrero
@@ -59,5 +59,5 @@
flags = BLOCKHAIR
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/head.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/head.dmi'
)
diff --git a/code/modules/clothing/spacesuits/alien.dm b/code/modules/clothing/spacesuits/alien.dm
index e546d67f485..f5e75dd2b9f 100644
--- a/code/modules/clothing/spacesuits/alien.dm
+++ b/code/modules/clothing/spacesuits/alien.dm
@@ -34,7 +34,7 @@
icon = 'icons/obj/clothing/species/unathi/hats.dmi'
species_restricted = list("Unathi")
sprite_sheets = list(
- "Unathi" = 'icons/mob/species/unathi/helmet.dmi'
+ "Unathi" = 'icons/mob/clothing/species/unathi/helmet.dmi'
)
/obj/item/clothing/head/helmet/space/unathi/helmet_cheap
@@ -48,7 +48,7 @@
icon = 'icons/obj/clothing/species/unathi/suits.dmi'
species_restricted = list("Unathi")
sprite_sheets = list(
- "Unathi" = 'icons/mob/species/unathi/suit.dmi'
+ "Unathi" = 'icons/mob/clothing/species/unathi/suit.dmi'
)
/obj/item/clothing/suit/space/unathi/rig_cheap
@@ -82,8 +82,8 @@
icon = 'icons/obj/clothing/species/vox/suits.dmi'
species_restricted = list("Vox", "Vox Armalis")
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/suit.dmi',
- "Vox Armalis" = 'icons/mob/species/armalis/suit.dmi',
+ "Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
+ "Vox Armalis" = 'icons/mob/clothing/species/armalis/suit.dmi',
)
/obj/item/clothing/head/helmet/space/vox
@@ -93,8 +93,8 @@
icon = 'icons/obj/clothing/species/vox/hats.dmi'
species_restricted = list("Vox","Vox Armalis")
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/head.dmi',
- "Vox Armalis" = 'icons/mob/species/armalis/head.dmi',
+ "Vox" = 'icons/mob/clothing/species/vox/head.dmi',
+ "Vox Armalis" = 'icons/mob/clothing/species/armalis/head.dmi',
)
/obj/item/clothing/head/helmet/space/vox/pressure
@@ -151,7 +151,7 @@
icon = 'icons/obj/clothing/species/vox/uniforms.dmi'
species_restricted = list("Vox")
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/uniform.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/uniform.dmi'
)
/obj/item/clothing/under/vox/vox_casual
@@ -170,8 +170,8 @@
item_state = "vox-casual-2"
species_restricted = list("Vox","Vox Armalis")
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/uniform.dmi',
- "Vox Armalis" = 'icons/mob/species/armalis/suit.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/uniform.dmi',
+ "Vox Armalis" = 'icons/mob/clothing/species/armalis/suit.dmi'
)
/obj/item/clothing/gloves/color/yellow/vox
@@ -185,8 +185,8 @@
icon = 'icons/obj/clothing/species/vox/gloves.dmi'
species_restricted = list("Vox","Vox Armalis")
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/gloves.dmi',
- "Vox Armalis" = 'icons/mob/species/armalis/gloves.dmi',
+ "Vox" = 'icons/mob/clothing/species/vox/gloves.dmi',
+ "Vox Armalis" = 'icons/mob/clothing/species/armalis/gloves.dmi',
)
/obj/item/clothing/shoes/magboots/vox
@@ -197,8 +197,8 @@
icon = 'icons/obj/clothing/species/vox/shoes.dmi'
species_restricted = list("Vox","Vox Armalis")
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/feet.dmi',
- "Vox Armalis" = 'icons/mob/species/armalis/feet.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/feet.dmi',
+ "Vox Armalis" = 'icons/mob/clothing/species/armalis/feet.dmi'
)
/obj/item/clothing/shoes/magboots/vox/attack_self(mob/user)
diff --git a/code/modules/clothing/spacesuits/ert.dm b/code/modules/clothing/spacesuits/ert.dm
index b8c4c7e86f0..571785f46a0 100644
--- a/code/modules/clothing/spacesuits/ert.dm
+++ b/code/modules/clothing/spacesuits/ert.dm
@@ -12,8 +12,8 @@
strip_delay = 130
sprite_sheets = list(
- "Grey" = 'icons/mob/species/grey/helmet.dmi',
- "Vox" = 'icons/mob/species/vox/helmet.dmi'
+ "Grey" = 'icons/mob/clothing/species/grey/helmet.dmi',
+ "Vox" = 'icons/mob/clothing/species/vox/helmet.dmi'
)
/obj/item/clothing/head/helmet/space/hardsuit/ert/Initialize()
@@ -59,8 +59,8 @@
strip_delay = 130
resistance_flags = FIRE_PROOF
sprite_sheets = list(
- "Drask" = 'icons/mob/species/drask/suit.dmi',
- "Vox" = 'icons/mob/species/vox/suit.dmi'
+ "Drask" = 'icons/mob/clothing/species/drask/suit.dmi',
+ "Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
//Commander
@@ -206,11 +206,11 @@
resistance_flags = FIRE_PROOF
has_camera = FALSE
sprite_sheets = list(
- "Grey" = 'icons/mob/species/grey/helmet.dmi',
- "Tajaran" = 'icons/mob/species/tajaran/helmet.dmi',
- "Unathi" = 'icons/mob/species/unathi/helmet.dmi',
- "Vox" = 'icons/mob/species/vox/helmet.dmi',
- "Vulpkanin" = 'icons/mob/species/vulpkanin/helmet.dmi'
+ "Grey" = 'icons/mob/clothing/species/grey/helmet.dmi',
+ "Tajaran" = 'icons/mob/clothing/species/tajaran/helmet.dmi',
+ "Unathi" = 'icons/mob/clothing/species/unathi/helmet.dmi',
+ "Vox" = 'icons/mob/clothing/species/vox/helmet.dmi',
+ "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/helmet.dmi'
)
/obj/item/clothing/suit/space/hardsuit/ert/paranormal
@@ -221,10 +221,10 @@
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/ert/paranormal
resistance_flags = FIRE_PROOF
sprite_sheets = list(
- "Tajaran" = 'icons/mob/species/tajaran/suit.dmi',
- "Unathi" = 'icons/mob/species/unathi/suit.dmi',
- "Vox" = 'icons/mob/species/vox/suit.dmi',
- "Vulpkanin" = 'icons/mob/species/vulpkanin/suit.dmi'
+ "Tajaran" = 'icons/mob/clothing/species/tajaran/suit.dmi',
+ "Unathi" = 'icons/mob/clothing/species/unathi/suit.dmi',
+ "Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
+ "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/suit.dmi'
)
hide_tail_by_species = list("Unathi, Tajaran, Vox, Vulpkanin")
diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm
index e4a5b029328..58514aa5a59 100644
--- a/code/modules/clothing/spacesuits/hardsuit.dm
+++ b/code/modules/clothing/spacesuits/hardsuit.dm
@@ -23,13 +23,13 @@
//Species-specific stuff.
species_restricted = list("exclude","Wryn")
sprite_sheets = list(
- "Unathi" = 'icons/mob/species/unathi/helmet.dmi',
- "Tajaran" = 'icons/mob/species/tajaran/helmet.dmi',
- "Skrell" = 'icons/mob/species/skrell/helmet.dmi',
- "Vox" = 'icons/mob/species/vox/helmet.dmi',
- "Vulpkanin" = 'icons/mob/species/vulpkanin/helmet.dmi',
- "Drask" = 'icons/mob/species/drask/helmet.dmi',
- "Grey" = 'icons/mob/species/grey/helmet.dmi'
+ "Unathi" = 'icons/mob/clothing/species/unathi/helmet.dmi',
+ "Tajaran" = 'icons/mob/clothing/species/tajaran/helmet.dmi',
+ "Skrell" = 'icons/mob/clothing/species/skrell/helmet.dmi',
+ "Vox" = 'icons/mob/clothing/species/vox/helmet.dmi',
+ "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/helmet.dmi',
+ "Drask" = 'icons/mob/clothing/species/drask/helmet.dmi',
+ "Grey" = 'icons/mob/clothing/species/grey/helmet.dmi'
)
sprite_sheets_obj = list(
"Unathi" = 'icons/obj/clothing/species/unathi/hats.dmi',
@@ -157,12 +157,12 @@
hide_tail_by_species = list("Vox" , "Vulpkanin" , "Unathi" , "Tajaran")
species_restricted = list("exclude", "Wryn")
sprite_sheets = list(
- "Unathi" = 'icons/mob/species/unathi/suit.dmi',
- "Tajaran" = 'icons/mob/species/tajaran/suit.dmi',
- "Skrell" = 'icons/mob/species/skrell/suit.dmi',
- "Vox" = 'icons/mob/species/vox/suit.dmi',
- "Vulpkanin" = 'icons/mob/species/vulpkanin/suit.dmi',
- "Drask" = 'icons/mob/species/drask/suit.dmi'
+ "Unathi" = 'icons/mob/clothing/species/unathi/suit.dmi',
+ "Tajaran" = 'icons/mob/clothing/species/tajaran/suit.dmi',
+ "Skrell" = 'icons/mob/clothing/species/skrell/suit.dmi',
+ "Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
+ "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/suit.dmi',
+ "Drask" = 'icons/mob/clothing/species/drask/suit.dmi'
)
sprite_sheets_obj = list(
"Unathi" = 'icons/obj/clothing/species/unathi/suits.dmi',
diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm
index 226196fbc32..32c192c213e 100644
--- a/code/modules/clothing/spacesuits/miscellaneous.dm
+++ b/code/modules/clothing/spacesuits/miscellaneous.dm
@@ -10,8 +10,8 @@
species_restricted = list("exclude", "Wryn")
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/helmet.dmi',
- "Grey" = 'icons/mob/species/grey/helmet.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/helmet.dmi',
+ "Grey" = 'icons/mob/clothing/species/grey/helmet.dmi'
)
/obj/item/clothing/head/helmet/space/capspace/equipped(mob/living/carbon/human/user, slot)
@@ -34,7 +34,7 @@
species_restricted = list("exclude", "Wryn")
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/suit.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
//Deathsquad space suit, not hardsuits because no flashlight!
@@ -77,7 +77,7 @@
species_restricted = list("exclude", "Wryn")
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/suit.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
/obj/item/clothing/head/helmet/space/deathsquad/beret
@@ -117,8 +117,8 @@
icon_state = "santahat"
sprite_sheets = list(
- "Grey" = 'icons/mob/species/Grey/head.dmi',
- "Drask" = 'icons/mob/species/Drask/helmet.dmi'
+ "Grey" = 'icons/mob/clothing/species/Grey/head.dmi',
+ "Drask" = 'icons/mob/clothing/species/Drask/helmet.dmi'
)
flags = BLOCKHAIR | STOPSPRESSUREDMAGE
flags_cover = HEADCOVERSEYES
@@ -177,13 +177,13 @@
species_restricted = list("exclude", "Wryn")
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/helmet.dmi',
- "Grey" = 'icons/mob/species/grey/helmet.dmi',
- "Skrell" = 'icons/mob/species/skrell/helmet.dmi',
- "Tajaran" = 'icons/mob/species/tajaran/helmet.dmi',
- "Drask" = 'icons/mob/species/drask/helmet.dmi',
- "Unathi" = 'icons/mob/species/unathi/helmet.dmi',
- "Vulpkanin" = 'icons/mob/species/vulpkanin/helmet.dmi',
+ "Vox" = 'icons/mob/clothing/species/vox/helmet.dmi',
+ "Grey" = 'icons/mob/clothing/species/grey/helmet.dmi',
+ "Skrell" = 'icons/mob/clothing/species/skrell/helmet.dmi',
+ "Tajaran" = 'icons/mob/clothing/species/tajaran/helmet.dmi',
+ "Drask" = 'icons/mob/clothing/species/drask/helmet.dmi',
+ "Unathi" = 'icons/mob/clothing/species/unathi/helmet.dmi',
+ "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/helmet.dmi',
)
sprite_sheets_obj = list(
"Vox" = 'icons/obj/clothing/species/vox/hats.dmi'
@@ -198,12 +198,12 @@
species_restricted = list("exclude", "Wryn")
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/suit.dmi',
- "Skrell" = 'icons/mob/species/skrell/suit.dmi',
- "Tajaran" = 'icons/mob/species/tajaran/suit.dmi',
- "Drask" = 'icons/mob/species/drask/suit.dmi',
- "Unathi" = 'icons/mob/species/unathi/suit.dmi',
- "Vulpkanin" = 'icons/mob/species/vulpkanin/suit.dmi',
+ "Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
+ "Skrell" = 'icons/mob/clothing/species/skrell/suit.dmi',
+ "Tajaran" = 'icons/mob/clothing/species/tajaran/suit.dmi',
+ "Drask" = 'icons/mob/clothing/species/drask/suit.dmi',
+ "Unathi" = 'icons/mob/clothing/species/unathi/suit.dmi',
+ "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/suit.dmi',
)
sprite_sheets_obj = list(
"Vox" = 'icons/obj/clothing/species/vox/suits.dmi'
@@ -218,10 +218,10 @@
species_restricted = list("exclude", "Wryn")
sprite_sheets = list(
- "Tajaran" = 'icons/mob/species/tajaran/suit.dmi',
- "Unathi" = 'icons/mob/species/unathi/suit.dmi',
- "Vox" = 'icons/mob/species/vox/suit.dmi',
- "Vulpkanin" = 'icons/mob/species/vulpkanin/suit.dmi',
+ "Tajaran" = 'icons/mob/clothing/species/tajaran/suit.dmi',
+ "Unathi" = 'icons/mob/clothing/species/unathi/suit.dmi',
+ "Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
+ "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/suit.dmi',
)
sprite_sheets_obj = list(
"Tajaran" = 'icons/obj/clothing/species/tajaran/suits.dmi',
@@ -240,11 +240,11 @@
flash_protect = 0
species_restricted = list("exclude", "Wryn")
sprite_sheets = list(
- "Tajaran" = 'icons/mob/species/tajaran/helmet.dmi',
- "Unathi" = 'icons/mob/species/unathi/helmet.dmi',
- "Vox" = 'icons/mob/species/vox/helmet.dmi',
- "Vulpkanin" = 'icons/mob/species/vulpkanin/helmet.dmi',
- "Grey" = 'icons/mob/species/grey/helmet.dmi'
+ "Tajaran" = 'icons/mob/clothing/species/tajaran/helmet.dmi',
+ "Unathi" = 'icons/mob/clothing/species/unathi/helmet.dmi',
+ "Vox" = 'icons/mob/clothing/species/vox/helmet.dmi',
+ "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/helmet.dmi',
+ "Grey" = 'icons/mob/clothing/species/grey/helmet.dmi'
)
sprite_sheets_obj = list(
"Vox" = 'icons/obj/clothing/species/vox/hats.dmi',
@@ -260,7 +260,7 @@
item_state = "spacemimehelmet"
species_restricted = list("exclude","Wryn")
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/helmet.dmi')
+ "Vox" = 'icons/mob/clothing/species/vox/helmet.dmi')
sprite_sheets_obj = null
/obj/item/clothing/suit/space/eva/mime
@@ -271,7 +271,7 @@
item_state = "spacemime_items"
species_restricted = list("exclude","Wryn")
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/suit.dmi')
+ "Vox" = 'icons/mob/clothing/species/vox/suit.dmi')
sprite_sheets_obj = null
/obj/item/clothing/head/helmet/space/eva/clown
@@ -282,7 +282,7 @@
item_state = "clownhelmet"
species_restricted = list("exclude","Wryn")
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/helmet.dmi')
+ "Vox" = 'icons/mob/clothing/species/vox/helmet.dmi')
sprite_sheets_obj = null
/obj/item/clothing/suit/space/eva/clown
@@ -293,5 +293,5 @@
item_state = "spaceclown_items"
species_restricted = list("exclude","Wryn")
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/suit.dmi')
+ "Vox" = 'icons/mob/clothing/species/vox/suit.dmi')
sprite_sheets_obj = null
diff --git a/code/modules/clothing/spacesuits/plasmamen.dm b/code/modules/clothing/spacesuits/plasmamen.dm
index e672852858d..df18facbb10 100644
--- a/code/modules/clothing/spacesuits/plasmamen.dm
+++ b/code/modules/clothing/spacesuits/plasmamen.dm
@@ -22,7 +22,7 @@
visor_flags_inv = HIDEEYES|HIDEFACE
icon = 'icons/obj/clothing/species/plasmaman/hats.dmi'
species_restricted = list("Plasmaman")
- sprite_sheets = list("Plasmaman" = 'icons/mob/species/plasmaman/helmet.dmi')
+ sprite_sheets = list("Plasmaman" = 'icons/mob/clothing/species/plasmaman/helmet.dmi')
/obj/item/clothing/head/helmet/space/plasmaman/New()
..()
diff --git a/code/modules/clothing/spacesuits/syndi.dm b/code/modules/clothing/spacesuits/syndi.dm
index 52a230fa60b..696428b90ff 100644
--- a/code/modules/clothing/spacesuits/syndi.dm
+++ b/code/modules/clothing/spacesuits/syndi.dm
@@ -7,11 +7,11 @@
desc = "Has a tag on it: Totally not property of a hostile corporation, honest!"
armor = list("melee" = 40, "bullet" = 50, "laser" = 30,"energy" = 15, "bomb" = 30, "bio" = 30, "rad" = 30, "fire" = 80, "acid" = 85)
sprite_sheets = list(
- "Grey" = 'icons/mob/species/grey/helmet.dmi',
- "Tajaran" = 'icons/mob/species/tajaran/helmet.dmi',
- "Unathi" = 'icons/mob/species/unathi/helmet.dmi',
- "Vulpkanin" = 'icons/mob/species/vulpkanin/helmet.dmi',
- "Vox" = 'icons/mob/species/vox/helmet.dmi')
+ "Grey" = 'icons/mob/clothing/species/grey/helmet.dmi',
+ "Tajaran" = 'icons/mob/clothing/species/tajaran/helmet.dmi',
+ "Unathi" = 'icons/mob/clothing/species/unathi/helmet.dmi',
+ "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/helmet.dmi',
+ "Vox" = 'icons/mob/clothing/species/vox/helmet.dmi')
/obj/item/clothing/suit/space/syndicate
@@ -23,10 +23,10 @@
allowed = list(/obj/item/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword/saber,/obj/item/restraints/handcuffs,/obj/item/tank/internals)
armor = list("melee" = 40, "bullet" = 50, "laser" = 30,"energy" = 15, "bomb" = 30, "bio" = 30, "rad" = 30, "fire" = 80, "acid" = 85)
sprite_sheets = list(
- "Tajaran" = 'icons/mob/species/tajaran/suit.dmi',
- "Unathi" = 'icons/mob/species/unathi/suit.dmi',
- "Vulpkanin" = 'icons/mob/species/vulpkanin/suit.dmi',
- "Vox" = 'icons/mob/species/vox/suit.dmi')
+ "Tajaran" = 'icons/mob/clothing/species/tajaran/suit.dmi',
+ "Unathi" = 'icons/mob/clothing/species/unathi/suit.dmi',
+ "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/suit.dmi',
+ "Vox" = 'icons/mob/clothing/species/vox/suit.dmi')
//Green syndicate space suit
diff --git a/code/modules/clothing/spacesuits/void.dm b/code/modules/clothing/spacesuits/void.dm
index e279b4697d3..e81482dd340 100644
--- a/code/modules/clothing/spacesuits/void.dm
+++ b/code/modules/clothing/spacesuits/void.dm
@@ -7,11 +7,11 @@
item_state = "void"
flags_inv = HIDEMASK|HIDEEARS
sprite_sheets = list(
- "Grey" = 'icons/mob/species/grey/helmet.dmi',
- "Tajaran" = 'icons/mob/species/tajaran/helmet.dmi',
- "Unathi" = 'icons/mob/species/unathi/helmet.dmi',
- "Vulpkanin" = 'icons/mob/species/vulpkanin/helmet.dmi',
- "Vox" = 'icons/mob/species/vox/helmet.dmi')
+ "Grey" = 'icons/mob/clothing/species/grey/helmet.dmi',
+ "Tajaran" = 'icons/mob/clothing/species/tajaran/helmet.dmi',
+ "Unathi" = 'icons/mob/clothing/species/unathi/helmet.dmi',
+ "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/helmet.dmi',
+ "Vox" = 'icons/mob/clothing/species/vox/helmet.dmi')
/obj/item/clothing/suit/space/nasavoid
name = "NASA Void Suit"
@@ -20,10 +20,10 @@
desc = "A high tech, NASA Centcom branch designed space suit. Used for AI satellite maintenance."
allowed = list(/obj/item/flashlight,/obj/item/tank/internals,/obj/item/multitool)
sprite_sheets = list(
- "Tajaran" = 'icons/mob/species/tajaran/suit.dmi',
- "Unathi" = 'icons/mob/species/unathi/suit.dmi',
- "Vulpkanin" = 'icons/mob/species/vulpkanin/suit.dmi',
- "Vox" = 'icons/mob/species/vox/suit.dmi')
+ "Tajaran" = 'icons/mob/clothing/species/tajaran/suit.dmi',
+ "Unathi" = 'icons/mob/clothing/species/unathi/suit.dmi',
+ "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/suit.dmi',
+ "Vox" = 'icons/mob/clothing/species/vox/suit.dmi')
//Colors!!!
/obj/item/clothing/head/helmet/space/nasavoid/green
diff --git a/code/modules/clothing/suits/alien.dm b/code/modules/clothing/suits/alien.dm
index 1fde5cd6f84..4021f440433 100644
--- a/code/modules/clothing/suits/alien.dm
+++ b/code/modules/clothing/suits/alien.dm
@@ -1,7 +1,7 @@
//Unathi clothing.
/obj/item/clothing/suit/unathi
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/suit.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
/obj/item/clothing/suit/unathi/robe
diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm
index 0a53e5c0abf..b928ff403b5 100644
--- a/code/modules/clothing/suits/armor.dm
+++ b/code/modules/clothing/suits/armor.dm
@@ -11,7 +11,7 @@
resistance_flags = NONE
armor = list("melee" = 30, "bullet" = 30, "laser" = 30, "energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/suit.dmi',
+ "Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
)
w_class = WEIGHT_CLASS_NORMAL
@@ -41,7 +41,7 @@
name = "security armor"
desc = "An armored vest that protects against some damage. This one has a clip for a holobadge."
sprite_sheets = list(
- "Grey" = 'icons/mob/species/grey/suit.dmi'
+ "Grey" = 'icons/mob/clothing/species/grey/suit.dmi'
)
icon_state = "armor"
item_state = "armor"
diff --git a/code/modules/clothing/suits/bio.dm b/code/modules/clothing/suits/bio.dm
index 996ce7e3ad9..448df4cf4e7 100644
--- a/code/modules/clothing/suits/bio.dm
+++ b/code/modules/clothing/suits/bio.dm
@@ -11,11 +11,11 @@
resistance_flags = ACID_PROOF
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/helmet.dmi',
- "Unathi" = 'icons/mob/species/unathi/head.dmi',
- "Tajaran" = 'icons/mob/species/tajaran/head.dmi',
- "Vulpkanin" = 'icons/mob/species/vulpkanin/head.dmi',
- "Grey" = 'icons/mob/species/grey/head.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/helmet.dmi',
+ "Unathi" = 'icons/mob/clothing/species/unathi/head.dmi',
+ "Tajaran" = 'icons/mob/clothing/species/tajaran/head.dmi',
+ "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/head.dmi',
+ "Grey" = 'icons/mob/clothing/species/grey/head.dmi'
)
/obj/item/clothing/suit/bio_suit
@@ -36,10 +36,10 @@
put_on_delay = 70
resistance_flags = ACID_PROOF
sprite_sheets = list(
- "Tajaran" = 'icons/mob/species/tajaran/suit.dmi',
- "Unathi" = 'icons/mob/species/unathi/suit.dmi',
- "Vulpkanin" = 'icons/mob/species/vulpkanin/suit.dmi',
- "Vox" = 'icons/mob/species/vox/suit.dmi'
+ "Tajaran" = 'icons/mob/clothing/species/tajaran/suit.dmi',
+ "Unathi" = 'icons/mob/clothing/species/unathi/suit.dmi',
+ "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/suit.dmi',
+ "Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
@@ -103,8 +103,8 @@
put_on_delay = 20
sprite_sheets = list(
- "Tajaran" = 'icons/mob/species/tajaran/suit.dmi',
- "Unathi" = 'icons/mob/species/unathi/suit.dmi',
- "Vulpkanin" = 'icons/mob/species/vulpkanin/suit.dmi',
+ "Tajaran" = 'icons/mob/clothing/species/tajaran/suit.dmi',
+ "Unathi" = 'icons/mob/clothing/species/unathi/suit.dmi',
+ "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/suit.dmi',
)
hide_tail_by_species = list("Unathi, Tajaran, Vulpkanin")
diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm
index b3fd2c5aa85..ed7c776058f 100644
--- a/code/modules/clothing/suits/jobs.dm
+++ b/code/modules/clothing/suits/jobs.dm
@@ -12,7 +12,7 @@
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 10, rad = 10, fire = 50, acid = 50)
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/suit.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
//Brig Physician
@@ -27,7 +27,7 @@
armor = list(melee = 10, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 10, rad = 0, fire = 50, acid = 50)
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/suit.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
//Botanist
@@ -41,7 +41,7 @@
allowed = list(/obj/item/reagent_containers/spray/plantbgone,/obj/item/plant_analyzer,/obj/item/seeds,/obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/glass/beaker, /obj/item/cultivator,/obj/item/reagent_containers/spray/pestspray,/obj/item/hatchet,/obj/item/storage/bag/plants)
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/suit.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
//Captain
@@ -55,7 +55,7 @@
allowed = list(/obj/item/disk, /obj/item/stamp, /obj/item/reagent_containers/food/drinks/flask, /obj/item/melee, /obj/item/storage/lockbox/medal, /obj/item/flash, /obj/item/storage/box/matches, /obj/item/lighter, /obj/item/clothing/mask/cigarette, /obj/item/storage/fancy/cigarettes, /obj/item/tank/internals/emergency_oxygen)
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/suit.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
/obj/item/clothing/suit/captunic/capjacket
@@ -67,7 +67,7 @@
flags_inv = HIDEJUMPSUIT
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/suit.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
/obj/item/clothing/suit/mantle/armor/captain
@@ -88,7 +88,7 @@
allowed = list(/obj/item/storage/bible, /obj/item/nullrod, /obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen)
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/suit.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
//Chaplain
@@ -103,7 +103,7 @@
allowed = list(/obj/item/storage/bible, /obj/item/nullrod, /obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen)
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/suit.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
//Chaplain
@@ -143,7 +143,7 @@
allowed = list (/obj/item/kitchen/knife)
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/suit.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
//Chef
@@ -185,7 +185,7 @@
heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/suit.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
//Forensics
@@ -221,7 +221,7 @@
heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/suit.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
//Engineering
@@ -235,13 +235,13 @@
resistance_flags = NONE
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/suit.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
//Lawyer
/obj/item/clothing/suit/storage/lawyer
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/suit.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
/obj/item/clothing/suit/storage/lawyer/blackjacket
@@ -313,7 +313,7 @@
adjust_flavour = "unbutton"
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/suit.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
/obj/item/clothing/suit/storage/ntrep
@@ -328,7 +328,7 @@
adjust_flavour = "unbutton"
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/suit.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
//Medical
@@ -346,7 +346,7 @@
adjust_flavour = "unbutton"
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/suit.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
//Mime
@@ -358,7 +358,7 @@
blood_overlay_type = "armor" //it's the less thing that I can put here
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/suit.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
/obj/item/clothing/suit/suspenders/nodrop
diff --git a/code/modules/clothing/suits/labcoat.dm b/code/modules/clothing/suits/labcoat.dm
index ea0a76b4427..fd0cc650679 100644
--- a/code/modules/clothing/suits/labcoat.dm
+++ b/code/modules/clothing/suits/labcoat.dm
@@ -11,8 +11,8 @@
armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 50, "rad" = 0, "fire" = 50, "acid" = 50)
species_exception = list(/datum/species/golem)
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/suit.dmi',
- "Grey" = 'icons/mob/species/grey/suit.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
+ "Grey" = 'icons/mob/clothing/species/grey/suit.dmi'
)
actions_types = list(/datum/action/item_action/button)
adjust_flavour = "unbutton"
diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm
index 6b27515dd93..47b79e2d228 100644
--- a/code/modules/clothing/suits/miscellaneous.dm
+++ b/code/modules/clothing/suits/miscellaneous.dm
@@ -21,7 +21,7 @@
resistance_flags = NONE
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/suit.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
/obj/item/clothing/suit/redtag
@@ -36,7 +36,7 @@
resistance_flags = NONE
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/suit.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
/*
@@ -49,7 +49,7 @@
item_state = "pirate_old"
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/suit.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
/obj/item/clothing/suit/pirate_black
@@ -59,7 +59,7 @@
item_state = "pirate"
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/suit.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
/obj/item/clothing/suit/hgpirate
@@ -122,7 +122,7 @@
body_parts_covered = UPPER_TORSO|LOWER_TORSO
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/suit.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
/obj/item/clothing/suit/apron/overalls
@@ -269,7 +269,7 @@
item_state = "classicponcho"
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/suit.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
/obj/item/clothing/suit/poncho/green
@@ -373,7 +373,7 @@
armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 10, "rad" = 0, "fire" = 0, "acid" = 0)
allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter)
- sprite_sheets = list("Vox" = 'icons/mob/species/vox/suit.dmi')
+ sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/suit.dmi')
/obj/item/clothing/head/hooded/winterhood
name = "winter hood"
@@ -385,7 +385,7 @@
flags = BLOCKHAIR
flags_inv = HIDEEARS
- sprite_sheets = list("Vox" = 'icons/mob/species/vox/head.dmi')
+ sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/head.dmi')
/obj/item/clothing/suit/hooded/wintercoat/captain
name = "captain's winter coat"
@@ -502,7 +502,7 @@
allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen)
hoodtype = /obj/item/clothing/head/hooded/hood
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/suit.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
/obj/item/clothing/head/hooded/hood
@@ -515,7 +515,7 @@
flags_inv = HIDEEARS
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/head.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/head.dmi'
)
/obj/item/clothing/head/hooded/hood/blue
@@ -576,7 +576,7 @@
item_state = "ianshirt"
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/suit.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
@@ -626,7 +626,7 @@
item_state = "brtrenchcoat"
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/suit.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
/obj/item/clothing/suit/blacktrenchcoat
@@ -636,7 +636,7 @@
item_state = "bltrenchcoat"
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/suit.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
//trackjackets
@@ -653,7 +653,7 @@
adjust_flavour = "unzip"
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/suit.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
/obj/item/clothing/suit/tracksuit/green
@@ -786,7 +786,7 @@
adjust_flavour = "unzip"
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/suit.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
/obj/item/clothing/suit/jacket/pilot
@@ -826,9 +826,9 @@
adjust_flavour = "unzip"
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/suit.dmi',
- "Drask" = 'icons/mob/species/drask/suit.dmi',
- "Grey" = 'icons/mob/species/grey/suit.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
+ "Drask" = 'icons/mob/clothing/species/drask/suit.dmi',
+ "Grey" = 'icons/mob/clothing/species/grey/suit.dmi'
)
/obj/item/clothing/suit/jacket/leather/overcoat
@@ -848,7 +848,7 @@
adjust_flavour = "unbutton"
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/suit.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
/obj/item/clothing/suit/soldiercoat
@@ -861,7 +861,7 @@
adjust_flavour = "unbutton"
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/suit.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
/obj/item/clothing/suit/toggle/owlwings
diff --git a/code/modules/clothing/suits/utility.dm b/code/modules/clothing/suits/utility.dm
index 6cd8596d8b3..78321ba9733 100644
--- a/code/modules/clothing/suits/utility.dm
+++ b/code/modules/clothing/suits/utility.dm
@@ -36,7 +36,7 @@
item_state = "firefighter"
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/suit.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
/obj/item/clothing/suit/fire/heavy
@@ -55,7 +55,7 @@
max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/suit.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
/*
@@ -79,8 +79,8 @@
resistance_flags = NONE
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/helmet.dmi',
- "Grey" = 'icons/mob/species/grey/head.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/helmet.dmi',
+ "Grey" = 'icons/mob/clothing/species/grey/head.dmi'
)
/obj/item/clothing/suit/bomb_suit
@@ -105,7 +105,7 @@
resistance_flags = NONE
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/suit.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
/obj/item/clothing/head/bomb_hood/security
@@ -133,8 +133,8 @@
resistance_flags = NONE
flags_2 = RAD_PROTECT_CONTENTS_2
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/head.dmi',
- "Grey" = 'icons/mob/species/grey/head.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/head.dmi',
+ "Grey" = 'icons/mob/clothing/species/grey/head.dmi'
)
/obj/item/clothing/suit/radiation
@@ -156,5 +156,5 @@
resistance_flags = NONE
flags_2 = RAD_PROTECT_CONTENTS_2
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/suit.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
diff --git a/code/modules/clothing/suits/wiz_robe.dm b/code/modules/clothing/suits/wiz_robe.dm
index d7c146e3602..8d529d82160 100644
--- a/code/modules/clothing/suits/wiz_robe.dm
+++ b/code/modules/clothing/suits/wiz_robe.dm
@@ -38,9 +38,9 @@
item_state = "wizhatmime"
dog_fashion = null
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/head.dmi',
- "Drask" = 'icons/mob/species/drask/head.dmi',
- "Grey" = 'icons/mob/species/grey/head.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/head.dmi',
+ "Drask" = 'icons/mob/clothing/species/drask/head.dmi',
+ "Grey" = 'icons/mob/clothing/species/grey/head.dmi'
)
/obj/item/clothing/head/wizard/fake
@@ -113,9 +113,9 @@
icon_state = "wizzmime"
item_state = "wizzmime"
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/suit.dmi',
- "Drask" = 'icons/mob/species/drask/suit.dmi',
- "Grey" = 'icons/mob/species/grey/suit.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
+ "Drask" = 'icons/mob/clothing/species/drask/suit.dmi',
+ "Grey" = 'icons/mob/clothing/species/grey/suit.dmi'
)
/obj/item/clothing/suit/wizrobe/marisa
diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm
index 53b53f54f48..b17f32df7a6 100644
--- a/code/modules/clothing/under/accessories/accessory.dm
+++ b/code/modules/clothing/under/accessories/accessory.dm
@@ -124,7 +124,7 @@
item_color = "waistcoat"
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/suit.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
/obj/item/clothing/accessory/stethoscope
@@ -526,7 +526,7 @@
item_color = "cowboyshirt"
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/suit.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
/obj/item/clothing/accessory/cowboyshirt/short_sleeved
@@ -537,7 +537,7 @@
item_color = "cowboyshirt_s"
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/suit.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
/obj/item/clothing/accessory/cowboyshirt/white
@@ -548,7 +548,7 @@
item_color = "cowboyshirt_white"
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/suit.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
/obj/item/clothing/accessory/cowboyshirt/white/short_sleeved
@@ -559,7 +559,7 @@
item_color = "cowboyshirt_whites"
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/suit.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
/obj/item/clothing/accessory/cowboyshirt/pink
@@ -570,7 +570,7 @@
item_color = "cowboyshirt_pink"
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/suit.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
/obj/item/clothing/accessory/cowboyshirt/pink/short_sleeved
@@ -581,7 +581,7 @@
item_color = "cowboyshirt_pinks"
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/suit.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
/obj/item/clothing/accessory/cowboyshirt/navy
@@ -592,7 +592,7 @@
item_color = "cowboyshirt_navy"
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/suit.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
/obj/item/clothing/accessory/cowboyshirt/navy/short_sleeved
@@ -603,7 +603,7 @@
item_color = "cowboyshirt_navys"
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/suit.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
/obj/item/clothing/accessory/cowboyshirt/red
@@ -614,7 +614,7 @@
item_color = "cowboyshirt_red"
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/suit.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
/obj/item/clothing/accessory/cowboyshirt/red/short_sleeved
@@ -625,9 +625,9 @@
item_color = "cowboyshirt_reds"
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/suit.dmi',
- "Drask" = 'icons/mob/species/drask/suit.dmi',
- "Grey" = 'icons/mob/species/grey/suit.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
+ "Drask" = 'icons/mob/clothing/species/drask/suit.dmi',
+ "Grey" = 'icons/mob/clothing/species/grey/suit.dmi'
)
/obj/item/clothing/accessory/corset
diff --git a/code/modules/clothing/under/accessories/storage.dm b/code/modules/clothing/under/accessories/storage.dm
index 8d7cbc1a143..dc15bd65d88 100644
--- a/code/modules/clothing/under/accessories/storage.dm
+++ b/code/modules/clothing/under/accessories/storage.dm
@@ -80,7 +80,7 @@
item_color = "webbing"
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/suit.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
/obj/item/clothing/accessory/storage/black_vest
diff --git a/code/modules/clothing/under/color.dm b/code/modules/clothing/under/color.dm
index 8d0e68eddb0..607113803fd 100644
--- a/code/modules/clothing/under/color.dm
+++ b/code/modules/clothing/under/color.dm
@@ -109,7 +109,7 @@
item_color = "psyche"
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/uniform.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/uniform.dmi'
)
/obj/item/clothing/under/color/lightblue
diff --git a/code/modules/clothing/under/jobs/plasmamen/_plasmamen.dm b/code/modules/clothing/under/jobs/plasmamen/_plasmamen.dm
index b3d7ce83431..05cb5a1fb71 100644
--- a/code/modules/clothing/under/jobs/plasmamen/_plasmamen.dm
+++ b/code/modules/clothing/under/jobs/plasmamen/_plasmamen.dm
@@ -9,7 +9,7 @@
var/extinguishes_left = 5
icon = 'icons/obj/clothing/species/plasmaman/uniform.dmi'
species_restricted = list("Plasmaman")
- sprite_sheets = list("Plasmaman" = 'icons/mob/species/plasmaman/uniform.dmi')
+ sprite_sheets = list("Plasmaman" = 'icons/mob/clothing/species/plasmaman/uniform.dmi')
icon_state = "plasmaman"
item_state = "plasmaman"
item_color = "plasmaman"
diff --git a/code/modules/clothing/under/jobs/security.dm b/code/modules/clothing/under/jobs/security.dm
index 32fc603b9c5..44c069b1bfd 100644
--- a/code/modules/clothing/under/jobs/security.dm
+++ b/code/modules/clothing/under/jobs/security.dm
@@ -85,7 +85,7 @@
strip_delay = 50
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/uniform.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/uniform.dmi'
)
/*
diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm
index e645c9e264e..f316f486379 100644
--- a/code/modules/customitems/item_defines.dm
+++ b/code/modules/customitems/item_defines.dm
@@ -344,7 +344,7 @@
M.icon = 'icons/obj/custom_items.dmi'
M.icon_state = "gas_tariq"
M.sprite_sheets = list(
- "Vulpkanin" = 'icons/mob/species/vulpkanin/mask.dmi'
+ "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/mask.dmi'
)
user.update_icons()
qdel(src)
@@ -935,7 +935,7 @@
icon = 'icons/obj/custom_items.dmi'
icon_state = "k3_webbing"
- sprite_sheets = list("Vox" = 'icons/mob/species/vox/suit.dmi')
+ sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/suit.dmi')
ignore_suitadjust = 0
actions_types = list(/datum/action/item_action/toggle)
suit_adjusted = 0
@@ -1648,7 +1648,7 @@
icon = 'icons/obj/custom_items.dmi'
lefthand_file = 'icons/mob/inhands/fluff_lefthand.dmi'
righthand_file = 'icons/mob/inhands/fluff_righthand.dmi'
- sprite_sheets = list("Vox" = 'icons/mob/species/vox/uniform.dmi')
+ sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/uniform.dmi')
icon_state = "kiaoutfit"
item_state = "kiaoutfit"
item_color = "kiaoutfit"
@@ -1671,7 +1671,7 @@
icon = 'icons/obj/custom_items.dmi'
lefthand_file = 'icons/mob/inhands/fluff_lefthand.dmi'
righthand_file = 'icons/mob/inhands/fluff_righthand.dmi'
- sprite_sheets = list("Vox" = 'icons/mob/species/vox/mask.dmi')
+ sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/mask.dmi')
icon_state = "kiamask"
item_state = "kiamask"
item_color = "kiamask"
@@ -1704,7 +1704,7 @@
desc = "A simple black dress with a white undercoat, tied with a blue ribbon."
lefthand_file = 'icons/mob/inhands/fluff_lefthand.dmi'
righthand_file = 'icons/mob/inhands/fluff_righthand.dmi'
- sprite_sheets = list("Vox" = 'icons/mob/species/vox/uniform.dmi')
+ sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/uniform.dmi')
icon = 'icons/obj/custom_items.dmi'
icon_state = "kikeridress"
item_state = "kikeridress"
diff --git a/code/modules/food_and_drinks/food/foods/bread.dm b/code/modules/food_and_drinks/food/foods/bread.dm
index 63eb623b8f9..7565b5b30a7 100644
--- a/code/modules/food_and_drinks/food/foods/bread.dm
+++ b/code/modules/food_and_drinks/food/foods/bread.dm
@@ -17,7 +17,6 @@
name = "meatbread slice"
desc = "A slice of delicious meatbread."
icon_state = "meatbreadslice"
- trash = /obj/item/trash/plate
filling_color = "#FF7575"
/obj/item/reagent_containers/food/snacks/sliceable/xenomeatbread
@@ -34,7 +33,6 @@
name = "xenomeatbread slice"
desc = "A slice of delicious meatbread. Extra Heretical."
icon_state = "xenobreadslice"
- trash = /obj/item/trash/plate
filling_color = "#8AFF75"
/obj/item/reagent_containers/food/snacks/sliceable/spidermeatbread
@@ -49,8 +47,7 @@
/obj/item/reagent_containers/food/snacks/spidermeatbreadslice
name = "spider meat bread slice"
desc = "A slice of meatloaf made from an animal that most likely still wants you dead."
- icon_state = "xenobreadslice"
- trash = /obj/item/trash/plate
+ icon_state = "spidermeatslice"
list_reagents = list("toxin" = 2)
/obj/item/reagent_containers/food/snacks/sliceable/bananabread
@@ -67,7 +64,6 @@
name = "banana-nut bread slice"
desc = "A slice of delicious banana bread."
icon_state = "bananabreadslice"
- trash = /obj/item/trash/plate
filling_color = "#EDE5AD"
tastes = list("bread" = 10)
@@ -85,7 +81,6 @@
name = "tofubread slice"
desc = "A slice of delicious tofubread."
icon_state = "tofubreadslice"
- trash = /obj/item/trash/plate
filling_color = "#F7FFE0"
/obj/item/reagent_containers/food/snacks/sliceable/bread
@@ -102,7 +97,6 @@
name = "bread slice"
desc = "A slice of home."
icon_state = "breadslice"
- trash = /obj/item/trash/plate
filling_color = "#D27332"
list_reagents = list("nutriment" = 2, "bread" = 5)
tastes = list("bread" = 10)
@@ -121,7 +115,6 @@
name = "cream cheese bread slice"
desc = "A slice of yum!"
icon_state = "creamcheesebreadslice"
- trash = /obj/item/trash/plate
filling_color = "#FFF896"
list_reagents = list("nutriment" = 4, "vitamin" = 1)
tastes = list("bread" = 10, "cheese" = 10)
@@ -140,7 +133,6 @@
name = "banarnarbread slice"
desc = "A slice of delicious mah'weyh pleggh at e'ntrath!"
icon_state = "banarnarbreadslice"
- trash = /obj/item/trash/plate
filling_color = "#6F0000"
list_reagents = list("nutriment" = 4, "vitamin" = 1)
tastes = list("heresy" = 10, "banana" = 10)
@@ -171,6 +163,8 @@
name = "baguette"
desc = "Bon appetit!"
icon_state = "baguette"
+ lefthand_file = 'icons/mob/inhands/items_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/items_righthand.dmi'
filling_color = "#E3D796"
bitesize = 3
list_reagents = list("nutriment" = 6, "vitamin" = 1)
@@ -198,7 +192,6 @@
name = "jellied toast"
desc = "A slice of bread covered with delicious jam."
icon_state = "jellytoast"
- trash = /obj/item/trash/plate
filling_color = "#B572AB"
bitesize = 3
tastes = list("toast" = 1, "jelly" = 1)
diff --git a/code/modules/food_and_drinks/food/foods/junkfood.dm b/code/modules/food_and_drinks/food/foods/junkfood.dm
index b36231d3829..ec17f3c4a5a 100644
--- a/code/modules/food_and_drinks/food/foods/junkfood.dm
+++ b/code/modules/food_and_drinks/food/foods/junkfood.dm
@@ -84,6 +84,14 @@
list_reagents = list("nutriment" = 2, "sugar" = 4)
tastes = list("bread" = 1)
+/obj/item/reagent_containers/food/snacks/stroopwafel
+ name = "stroopwafel"
+ desc = "Straight from the snack factories of Space Den Haag comes a classic dutch treat!"
+ icon_state = "stroopwafel"
+ filling_color = "#EDB878"
+ junkiness = 5
+ list_reagents = list("nutriment" = 10, "sugar" = 4)
+ tastes = list("syrup" = 3, "waffle" = 2)
//////////////////////
// Homemade //
diff --git a/code/modules/food_and_drinks/food/foods/sandwiches.dm b/code/modules/food_and_drinks/food/foods/sandwiches.dm
index 216e56af9f9..f0e49305175 100644
--- a/code/modules/food_and_drinks/food/foods/sandwiches.dm
+++ b/code/modules/food_and_drinks/food/foods/sandwiches.dm
@@ -165,7 +165,6 @@
name = "sandwich"
desc = "A grand creation of meat, cheese, bread, and several leaves of lettuce! Arthur Dent would be proud."
icon_state = "sandwich"
- trash = /obj/item/trash/plate
filling_color = "#D9BE29"
list_reagents = list("nutriment" = 6, "vitamin" = 1)
tastes = list("meat" = 2, "cheese" = 1, "bread" = 2, "lettuce" = 1)
@@ -174,7 +173,6 @@
name = "toasted sandwich"
desc = "Now if you only had a pepper bar."
icon_state = "toastedsandwich"
- trash = /obj/item/trash/plate
filling_color = "#D9BE29"
list_reagents = list("nutriment" = 6, "carbon" = 2)
tastes = list("toast" = 1)
@@ -183,7 +181,6 @@
name = "grilled cheese sandwich"
desc = "Goes great with tomato soup!"
icon_state = "toastedsandwich"
- trash = /obj/item/trash/plate
filling_color = "#D9BE29"
list_reagents = list("nutriment" = 7, "vitamin" = 1) //why make a regualr sandwhich when you can make grilled cheese, with this nutriment value?
tastes = list("toast" = 1, "grilled cheese" = 1)
@@ -192,7 +189,6 @@
name = "jelly sandwich"
desc = "You wish you had some peanut butter to go with this..."
icon_state = "jellysandwich"
- trash = /obj/item/trash/plate
filling_color = "#9E3A78"
bitesize = 3
tastes = list("toast" = 1, "jelly" = 1)
diff --git a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
index a1db59b83a5..6d1f482adf9 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
@@ -13,6 +13,7 @@
use_power = IDLE_POWER_USE
idle_power_usage = 5
active_power_usage = 100
+ face_while_pulling = TRUE
/// The maximum number of items the fridge can hold. Multiplicated by the matter bin component's rating.
var/max_n_of_items = 1500
/// Associative list (/text => /number) tracking the amounts of a specific item held by the fridge.
diff --git a/code/modules/mining/equipment/explorer_gear.dm b/code/modules/mining/equipment/explorer_gear.dm
index 8315d0ef781..b76c036390b 100644
--- a/code/modules/mining/equipment/explorer_gear.dm
+++ b/code/modules/mining/equipment/explorer_gear.dm
@@ -16,11 +16,11 @@
hide_tail_by_species = list("Vox" , "Vulpkanin" , "Unathi" , "Tajaran")
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/suit.dmi',
- "Drask" = 'icons/mob/species/drask/suit.dmi',
- "Tajaran" = 'icons/mob/species/tajaran/suit.dmi',
- "Unathi" = 'icons/mob/species/unathi/suit.dmi',
- "Vulpkanin" = 'icons/mob/species/vulpkanin/suit.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
+ "Drask" = 'icons/mob/clothing/species/drask/suit.dmi',
+ "Tajaran" = 'icons/mob/clothing/species/tajaran/suit.dmi',
+ "Unathi" = 'icons/mob/clothing/species/unathi/suit.dmi',
+ "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/suit.dmi'
)
/obj/item/clothing/head/hooded/explorer
@@ -37,10 +37,10 @@
resistance_flags = FIRE_PROOF
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/head.dmi',
- "Drask" = 'icons/mob/species/drask/head.dmi',
- "Grey" = 'icons/mob/species/grey/head.dmi',
- "Skrell" = 'icons/mob/species/skrell/head.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/head.dmi',
+ "Drask" = 'icons/mob/clothing/species/drask/head.dmi',
+ "Grey" = 'icons/mob/clothing/species/grey/head.dmi',
+ "Skrell" = 'icons/mob/clothing/species/skrell/head.dmi'
)
/obj/item/clothing/suit/space/hostile_environment
diff --git a/code/modules/mob/dead/observer/orbit.dm b/code/modules/mob/dead/observer/orbit.dm
index d5410015f5e..20b2a4d375a 100644
--- a/code/modules/mob/dead/observer/orbit.dm
+++ b/code/modules/mob/dead/observer/orbit.dm
@@ -104,6 +104,7 @@
"Shadowling Thrall" = (mind in SSticker.mode.shadowling_thralls),
"Abductor" = (mind in SSticker.mode.abductors),
"Revolutionary" = (mind in SSticker.mode.revolutionaries),
+ "Head Revolutionary" = (mind in SSticker.mode.head_revolutionaries)
)
for(var/antag_name in other_antags)
diff --git a/code/modules/mob/emote.dm b/code/modules/mob/emote.dm
index aa8936f7682..12312a4fdff 100644
--- a/code/modules/mob/emote.dm
+++ b/code/modules/mob/emote.dm
@@ -77,6 +77,9 @@
// Type 1 (Visual) emotes are sent to anyone in view of the item
if(m_type & EMOTE_VISUAL)
+ var/runechat_text = input
+ if(length(input) > 100)
+ runechat_text = "[copytext(input, 1, 101)]..."
var/list/can_see = get_mobs_in_view(1,src) //Allows silicon & mmi mobs carried around to see the emotes of the person carrying them around.
can_see |= viewers(src,null)
for(var/mob/O in can_see)
@@ -91,7 +94,7 @@
O.show_message(message, m_type)
if(O.client?.prefs.toggles2 & PREFTOGGLE_2_RUNECHAT)
- O.create_chat_message(src, input, symbol = RUNECHAT_SYMBOL_EMOTE)
+ O.create_chat_message(src, runechat_text, symbol = RUNECHAT_SYMBOL_EMOTE)
// Type 2 (Audible) emotes are sent to anyone in hear range
// of the *LOCATION* -- this is important for pAIs to be heard
diff --git a/code/modules/mob/hear_say.dm b/code/modules/mob/hear_say.dm
index 79ac1299164..b5bd17ed1e9 100644
--- a/code/modules/mob/hear_say.dm
+++ b/code/modules/mob/hear_say.dm
@@ -106,8 +106,8 @@
to_chat(src, "[speaker_name][speaker.GetAltName()] [track][verb], \"[message]\"")
// Create map text message
- if (client?.prefs.toggles2 & PREFTOGGLE_2_RUNECHAT) // can_hear is checked up there on L99
- create_chat_message(speaker.runechat_msg_location, message_clean, italics)
+ if(client?.prefs.toggles2 & PREFTOGGLE_2_RUNECHAT) // can_hear is checked up there on L99
+ create_chat_message(locateUID(speaker.runechat_msg_location), message_clean, italics)
if(speech_sound && (get_dist(speaker, src) <= world.view && src.z == speaker.z))
var/turf/source = speaker? get_turf(speaker) : get_turf(src)
diff --git a/code/modules/mob/living/carbon/brain/brain.dm b/code/modules/mob/living/carbon/brain/brain.dm
index 76a5d0bbb50..5452dc84d19 100644
--- a/code/modules/mob/living/carbon/brain/brain.dm
+++ b/code/modules/mob/living/carbon/brain/brain.dm
@@ -111,8 +111,8 @@ I'm using this for Stat to give it a more nifty interface to work with
/mob/living/carbon/brain/update_runechat_msg_location()
if(ismecha(loc))
- runechat_msg_location = loc
+ runechat_msg_location = loc.UID()
else if(container)
- runechat_msg_location = container
+ runechat_msg_location = container.UID()
else
- runechat_msg_location = src
+ return ..()
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index 9c8635afa9e..9cbec689ade 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -1939,9 +1939,9 @@ Eyes need to have significantly high darksight to shine unless the mob has the X
/mob/living/carbon/human/update_runechat_msg_location()
if(ismecha(loc))
- runechat_msg_location = loc
+ runechat_msg_location = loc.UID()
else
- runechat_msg_location = src
+ return ..()
/mob/living/carbon/human/verb/Examine_OOC()
set name = "Examine Meta-Info (OOC)"
diff --git a/code/modules/mob/living/carbon/human/species/diona.dm b/code/modules/mob/living/carbon/human/species/diona.dm
index 3813dedbdd7..294735c434d 100644
--- a/code/modules/mob/living/carbon/human/species/diona.dm
+++ b/code/modules/mob/living/carbon/human/species/diona.dm
@@ -10,6 +10,7 @@
burn_mod = 1.25
heatmod = 1.5
+ brain_mod = 0
var/pod = FALSE //did they come from a pod? If so, they're stronger than normal Diona.
blurb = "Commonly referred to (erroneously) as 'plant people', the Dionaea are a strange space-dwelling collective \
@@ -37,13 +38,13 @@
reagent_tag = PROCESS_ORG
has_organ = list(
- "nutrient channel" = /obj/item/organ/internal/liver/diona,
- "respiratory vacuoles" = /obj/item/organ/internal/lungs/diona,
- "neural strata" = /obj/item/organ/internal/heart/diona,
+ "liver" = /obj/item/organ/internal/liver/diona,
+ "lungs" = /obj/item/organ/internal/lungs/diona,
+ "heart" = /obj/item/organ/internal/heart/diona,
"eyes" = /obj/item/organ/internal/eyes/diona, //Default darksight of 2.
- "gas bladder" = /obj/item/organ/internal/brain/diona,
- "polyp segment" = /obj/item/organ/internal/kidneys/diona,
- "anchoring ligament" = /obj/item/organ/internal/appendix/diona
+ "brain" = /obj/item/organ/internal/brain/diona,
+ "kidneys" = /obj/item/organ/internal/kidneys/diona,
+ "appendix" = /obj/item/organ/internal/appendix/diona
)
has_limbs = list(
"chest" = list("path" = /obj/item/organ/external/chest/diona),
diff --git a/code/modules/mob/living/carbon/human/species/drask.dm b/code/modules/mob/living/carbon/human/species/drask.dm
index 05767c244f1..5f91e9ad1bb 100644
--- a/code/modules/mob/living/carbon/human/species/drask.dm
+++ b/code/modules/mob/living/carbon/human/species/drask.dm
@@ -56,7 +56,7 @@
has_organ = list(
"heart" = /obj/item/organ/internal/heart/drask,
"lungs" = /obj/item/organ/internal/lungs/drask,
- "metabolic strainer" = /obj/item/organ/internal/liver/drask,
+ "liver" = /obj/item/organ/internal/liver/drask,
"eyes" = /obj/item/organ/internal/eyes/drask, //5 darksight.
"brain" = /obj/item/organ/internal/brain/drask
)
diff --git a/code/modules/mob/living/carbon/human/species/nucleation.dm b/code/modules/mob/living/carbon/human/species/nucleation.dm
index 4c2f7623f0e..b4dc9d1f952 100644
--- a/code/modules/mob/living/carbon/human/species/nucleation.dm
+++ b/code/modules/mob/living/carbon/human/species/nucleation.dm
@@ -24,7 +24,7 @@
reagent_tag = PROCESS_ORG
has_organ = list(
"heart" = /obj/item/organ/internal/heart,
- "crystallized brain" = /obj/item/organ/internal/brain/crystal,
+ "brain" = /obj/item/organ/internal/brain/crystal,
"eyes" = /obj/item/organ/internal/eyes/luminescent_crystal, //Standard darksight of 2.
"strange crystal" = /obj/item/organ/internal/nucleation/strange_crystal
)
diff --git a/code/modules/mob/living/carbon/human/species/vox.dm b/code/modules/mob/living/carbon/human/species/vox.dm
index f4ccced8fd8..e7736da2291 100644
--- a/code/modules/mob/living/carbon/human/species/vox.dm
+++ b/code/modules/mob/living/carbon/human/species/vox.dm
@@ -59,7 +59,7 @@
"lungs" = /obj/item/organ/internal/lungs/vox,
"liver" = /obj/item/organ/internal/liver/vox,
"kidneys" = /obj/item/organ/internal/kidneys/vox,
- "cortical stack" = /obj/item/organ/internal/brain/vox,
+ "brain" = /obj/item/organ/internal/brain/vox,
"appendix" = /obj/item/organ/internal/appendix,
"eyes" = /obj/item/organ/internal/eyes/vox, //Default darksight of 2.
) //for determining the success of the heist game-mode's 'leave nobody behind' objective, while this is just an organ.
diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm
index af90d80e995..79d6c50ebfc 100644
--- a/code/modules/mob/living/carbon/human/update_icons.dm
+++ b/code/modules/mob/living/carbon/human/update_icons.dm
@@ -250,7 +250,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts)
apply_overlay(LIMBS_LAYER)
//Underwear
- var/icon/underwear_standing = new /icon('icons/mob/underwear.dmi', "nude")
+ var/icon/underwear_standing = new /icon('icons/mob/clothing/underwear.dmi', "nude")
if(underwear && dna.species.clothing_flags & HAS_UNDERWEAR)
var/datum/sprite_accessory/underwear/U = GLOB.underwear_list[underwear]
if(U)
@@ -546,7 +546,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts)
if(!t_color)
t_color = icon_state
- var/mutable_appearance/standing = mutable_appearance('icons/mob/uniform.dmi', "[t_color]_s", layer = -UNIFORM_LAYER)
+ var/mutable_appearance/standing = mutable_appearance('icons/mob/clothing/uniform.dmi', "[t_color]_s", layer = -UNIFORM_LAYER)
if(w_uniform.icon_override)
standing.icon = w_uniform.icon_override
@@ -638,7 +638,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts)
else if(gloves.sprite_sheets && gloves.sprite_sheets[dna.species.name])
standing = mutable_appearance(gloves.sprite_sheets[dna.species.name], "[t_state]", layer = -GLOVES_LAYER)
else
- standing = mutable_appearance('icons/mob/hands.dmi', "[t_state]", layer = -GLOVES_LAYER)
+ standing = mutable_appearance('icons/mob/clothing/hands.dmi', "[t_state]", layer = -GLOVES_LAYER)
if(gloves.blood_DNA)
var/image/bloodsies = image("icon" = dna.species.blood_mask, "icon_state" = "bloodyhands")
@@ -676,7 +676,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts)
else if(glasses.sprite_sheets && glasses.sprite_sheets[head_organ.dna.species.name])
new_glasses = mutable_appearance(glasses.sprite_sheets[head_organ.dna.species.name], "[glasses.icon_state]", layer = -GLASSES_LAYER)
else
- new_glasses = mutable_appearance('icons/mob/eyes.dmi', "[glasses.icon_state]", layer = -GLASSES_LAYER)
+ new_glasses = mutable_appearance('icons/mob/clothing/eyes.dmi', "[glasses.icon_state]", layer = -GLASSES_LAYER)
var/datum/sprite_accessory/hair/hair_style = GLOB.hair_styles_full_list[head_organ.h_style]
var/obj/item/clothing/glasses/G = glasses
@@ -722,7 +722,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts)
else if(l_ear.sprite_sheets && l_ear.sprite_sheets[dna.species.name])
overlays_standing[EARS_LAYER] = mutable_appearance(l_ear.sprite_sheets[dna.species.name], "[t_type]", layer = -EARS_LAYER)
else
- overlays_standing[EARS_LAYER] = mutable_appearance('icons/mob/ears.dmi', "[t_type]", layer = -EARS_LAYER)
+ overlays_standing[EARS_LAYER] = mutable_appearance('icons/mob/clothing/ears.dmi', "[t_type]", layer = -EARS_LAYER)
if(r_ear)
if(client && hud_used && hud_used.hud_shown)
@@ -739,7 +739,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts)
else if(r_ear.sprite_sheets && r_ear.sprite_sheets[dna.species.name])
overlays_standing[EARS_LAYER] = mutable_appearance(r_ear.sprite_sheets[dna.species.name], "[t_type]", layer = -EARS_LAYER)
else
- overlays_standing[EARS_LAYER] = mutable_appearance('icons/mob/ears.dmi', "[t_type]", layer = -EARS_LAYER)
+ overlays_standing[EARS_LAYER] = mutable_appearance('icons/mob/clothing/ears.dmi', "[t_type]", layer = -EARS_LAYER)
apply_overlay(EARS_LAYER)
/mob/living/carbon/human/update_inv_shoes()
@@ -761,7 +761,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts)
else if(shoes.sprite_sheets && shoes.sprite_sheets[dna.species.name])
standing = mutable_appearance(shoes.sprite_sheets[dna.species.name], "[shoes.icon_state]", layer = -SHOES_LAYER)
else
- standing = mutable_appearance('icons/mob/feet.dmi', "[shoes.icon_state]", layer = -SHOES_LAYER)
+ standing = mutable_appearance('icons/mob/clothing/feet.dmi', "[shoes.icon_state]", layer = -SHOES_LAYER)
if(shoes.blood_DNA)
@@ -793,7 +793,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts)
var/t_state = s_store.item_state
if(!t_state)
t_state = s_store.icon_state
- var/dmi='icons/mob/belt_mirror.dmi'
+ var/dmi='icons/mob/clothing/belt_mirror.dmi'
overlays_standing[SUIT_STORE_LAYER] = mutable_appearance(dmi, "[t_state]", layer = -SUIT_STORE_LAYER)
s_store.screen_loc = ui_sstore1 //TODO
apply_overlay(SUIT_STORE_LAYER)
@@ -814,7 +814,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts)
else if(head.sprite_sheets && head.sprite_sheets[dna.species.name])
standing = mutable_appearance(head.sprite_sheets[dna.species.name], "[head.icon_state]", layer = -HEAD_LAYER)
else
- standing = mutable_appearance('icons/mob/head.dmi', "[head.icon_state]", layer = -HEAD_LAYER)
+ standing = mutable_appearance('icons/mob/clothing/head.dmi', "[head.icon_state]", layer = -HEAD_LAYER)
if(head.blood_DNA)
var/image/bloodsies = image("icon" = dna.species.blood_mask, "icon_state" = "helmetblood")
@@ -847,7 +847,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts)
else if(belt.sprite_sheets && belt.sprite_sheets[dna.species.name])
overlays_standing[BELT_LAYER] = mutable_appearance(belt.sprite_sheets[dna.species.name], "[t_state]", layer = -BELT_LAYER)
else
- overlays_standing[BELT_LAYER] = mutable_appearance('icons/mob/belt.dmi', "[t_state]", layer = -BELT_LAYER)
+ overlays_standing[BELT_LAYER] = mutable_appearance('icons/mob/clothing/belt.dmi', "[t_state]", layer = -BELT_LAYER)
apply_overlay(BELT_LAYER)
@@ -870,7 +870,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts)
else if(wear_suit.sprite_sheets && wear_suit.sprite_sheets[dna.species.name])
standing = mutable_appearance(wear_suit.sprite_sheets[dna.species.name], "[wear_suit.icon_state]", layer = -SUIT_LAYER)
else
- standing = mutable_appearance('icons/mob/suit.dmi', "[wear_suit.icon_state]", layer = -SUIT_LAYER)
+ standing = mutable_appearance('icons/mob/clothing/suit.dmi', "[wear_suit.icon_state]", layer = -SUIT_LAYER)
if(wear_suit.breakouttime)
drop_l_hand()
@@ -951,7 +951,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts)
mask_icon = new(wear_mask.sprite_sheets[dna.species.name])
standing = mutable_appearance(wear_mask.sprite_sheets[dna.species.name], "[wear_mask.icon_state][(alternate_head && ("[wear_mask.icon_state]_[alternate_head.suffix]" in mask_icon.IconStates())) ? "_[alternate_head.suffix]" : ""]", layer = -FACEMASK_LAYER)
else
- standing = mutable_appearance('icons/mob/mask.dmi', "[wear_mask.icon_state][(alternate_head && ("[wear_mask.icon_state]_[alternate_head.suffix]" in mask_icon.IconStates())) ? "_[alternate_head.suffix]" : ""]", layer = -FACEMASK_LAYER)
+ standing = mutable_appearance('icons/mob/clothing/mask.dmi', "[wear_mask.icon_state][(alternate_head && ("[wear_mask.icon_state]_[alternate_head.suffix]" in mask_icon.IconStates())) ? "_[alternate_head.suffix]" : ""]", layer = -FACEMASK_LAYER)
if(!istype(wear_mask, /obj/item/clothing/mask/cigarette) && wear_mask.blood_DNA)
var/image/bloodsies = image("icon" = dna.species.blood_mask, "icon_state" = "maskblood")
@@ -975,7 +975,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts)
else if(back.sprite_sheets && back.sprite_sheets[dna.species.name])
standing = mutable_appearance(back.sprite_sheets[dna.species.name], "[back.icon_state]", layer = -BACK_LAYER)
else
- standing = mutable_appearance('icons/mob/back.dmi', "[back.icon_state]", layer = -BACK_LAYER)
+ standing = mutable_appearance('icons/mob/clothing/back.dmi', "[back.icon_state]", layer = -BACK_LAYER)
//create the image
standing.alpha = back.alpha
@@ -1239,11 +1239,11 @@ GLOBAL_LIST_EMPTY(damage_icon_parts)
update_tail_layer()
//Adds a collar overlay above the helmet layer if the suit has one
-// Suit needs an identically named sprite in icons/mob/collar.dmi
-// For suits with sprite_sheets, an identically named sprite needs to exist in a file like this icons/mob/species/[species_name_here]/collar.dmi.
+// Suit needs an identically named sprite in icons/mob/clothing/collar.dmi
+// For suits with sprite_sheets, an identically named sprite needs to exist in a file like this icons/mob/clothing/species/[species_name_here]/collar.dmi.
/mob/living/carbon/human/proc/update_collar()
remove_overlay(COLLAR_LAYER)
- var/icon/C = new('icons/mob/collar.dmi')
+ var/icon/C = new('icons/mob/clothing/collar.dmi')
var/mutable_appearance/standing = null
if(wear_suit)
diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm
index 9ac4200faec..6c646d2509e 100644
--- a/code/modules/mob/living/silicon/ai/ai.dm
+++ b/code/modules/mob/living/silicon/ai/ai.dm
@@ -1251,7 +1251,7 @@ GLOBAL_LIST_INIT(ai_verbs_default, list(
var/rendered = "Relayed Speech: [name_used] [message]"
if(client?.prefs.toggles2 & PREFTOGGLE_2_RUNECHAT)
var/message_clean = combine_message(message_pieces, null, M)
- create_chat_message(M.runechat_msg_location, message_clean)
+ create_chat_message(locateUID(M.runechat_msg_location), message_clean)
show_message(rendered, 2)
/mob/living/silicon/ai/proc/malfhacked(obj/machinery/power/apc/apc)
@@ -1371,8 +1371,8 @@ GLOBAL_LIST_INIT(ai_verbs_default, list(
/mob/living/silicon/ai/update_runechat_msg_location()
if(istype(loc, /obj/item/aicard) || ismecha(loc))
- runechat_msg_location = loc
+ runechat_msg_location = loc.UID()
else
- runechat_msg_location = src
+ return ..()
#undef TEXT_ANNOUNCEMENT_COOLDOWN
diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm
index 9ddbaf61a03..677f67ebf13 100644
--- a/code/modules/mob/living/silicon/pai/pai.dm
+++ b/code/modules/mob/living/silicon/pai/pai.dm
@@ -520,6 +520,6 @@
/mob/living/silicon/pai/update_runechat_msg_location()
if(istype(loc, /obj/item/paicard))
- runechat_msg_location = loc
+ runechat_msg_location = loc.UID()
else
- runechat_msg_location = src
+ return ..()
diff --git a/code/modules/mob/living/simple_animal/shade.dm b/code/modules/mob/living/simple_animal/shade.dm
index 3e4686e146d..1df0f15bcf4 100644
--- a/code/modules/mob/living/simple_animal/shade.dm
+++ b/code/modules/mob/living/simple_animal/shade.dm
@@ -65,6 +65,6 @@
/mob/living/simple_animal/shade/update_runechat_msg_location()
if(istype(loc, /obj/item/soulstone))
- runechat_msg_location = loc
+ runechat_msg_location = loc.UID()
else
- runechat_msg_location = src
+ return ..()
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index 91a6bad69ff..f801c0f072f 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -32,7 +32,6 @@
GLOB.alive_mob_list += src
set_focus(src)
prepare_huds()
- runechat_msg_location = src
update_runechat_msg_location()
. = ..()
@@ -1455,9 +1454,11 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \
/**
* Updates the mob's runechat maptext display location.
+ *
+ * By default, we set this to the src mob's `UID()`.
*/
/mob/proc/update_runechat_msg_location()
- return
+ runechat_msg_location = UID()
/**
diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm
index 423908e689d..2f7511e3b04 100644
--- a/code/modules/mob/mob_defines.dm
+++ b/code/modules/mob/mob_defines.dm
@@ -201,5 +201,5 @@
/// Overrides the health HUD element state if set.
var/health_hud_override = HEALTH_HUD_OVERRIDE_NONE
- /// The location our runechat message should appear. Should be src by default.
- var/atom/runechat_msg_location
+ /// A soft reference to the location where this mob's runechat message will appear. Uses `UID()`.
+ var/runechat_msg_location
diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm
index ed75caa8f39..21b357146cb 100644
--- a/code/modules/mob/mob_movement.dm
+++ b/code/modules/mob/mob_movement.dm
@@ -168,8 +168,13 @@
direct = newdir
n = get_step(mob, direct)
- . = mob.SelfMove(n, direct, delay)
- if(mob.pulling?.face_while_pulling)
+ var/prev_pulling_loc = null
+ if(mob.pulling)
+ prev_pulling_loc = mob.pulling.loc
+
+ . = mob.SelfMove(n, direct, delay) // The actual movement
+
+ if(prev_pulling_loc && mob.pulling?.face_while_pulling && (mob.pulling.loc != prev_pulling_loc))
mob.setDir(get_dir(mob, mob.pulling)) // Face welding tanks and stuff when pulling
else
mob.setDir(direct)
diff --git a/code/modules/mob/new_player/preferences_setup.dm b/code/modules/mob/new_player/preferences_setup.dm
index 3fe022269da..ec5ae76c33d 100644
--- a/code/modules/mob/new_player/preferences_setup.dm
+++ b/code/modules/mob/new_player/preferences_setup.dm
@@ -200,11 +200,11 @@
/datum/preferences/proc/blend_backpack(icon/clothes_s, backbag, satchel, backpack="backpack")
switch(backbag)
if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', backpack), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', backpack), ICON_OVERLAY)
if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', satchel), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', satchel), ICON_OVERLAY)
if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY)
return clothes_s
/datum/preferences/proc/update_preview_icon(for_observer=0) //seriously. This is horrendous.
@@ -400,538 +400,538 @@
socks_s = new/icon(u3_icon, "sk_[U3.icon_state]_s", ICON_OVERLAY)
var/icon/clothes_s = null
- var/uniform_dmi='icons/mob/uniform.dmi'
+ var/uniform_dmi='icons/mob/clothing/uniform.dmi'
if(job_support_low & JOB_CIVILIAN)//This gives the preview icon clothes depending on which job(if any) is set to 'high'
clothes_s = new /icon(uniform_dmi, "grey_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY)
if(backbag == 2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "backpack"), ICON_OVERLAY)
else if(backbag == 3 || backbag == 4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY)
else if(job_support_high)//I hate how this looks, but there's no reason to go through this switch if it's empty
switch(job_support_high)
if(JOB_HOP)
clothes_s = new /icon(uniform_dmi, "hop_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "brown"), ICON_UNDERLAY)
if(prob(1))
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "ianshirt"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "ianshirt"), ICON_OVERLAY)
switch(backbag)
if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "backpack"), ICON_OVERLAY)
if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-norm"), ICON_OVERLAY)
if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY)
if(JOB_BARTENDER)
clothes_s = new /icon(uniform_dmi, "ba_suit_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY)
if(prob(1))
- clothes_s.Blend(new /icon('icons/mob/head.dmi', "tophat"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/head.dmi', "tophat"), ICON_OVERLAY)
switch(backbag)
if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "backpack"), ICON_OVERLAY)
if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-norm"), ICON_OVERLAY)
if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY)
if(JOB_BOTANIST)
clothes_s = new /icon(uniform_dmi, "hydroponics_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/hands.dmi', "ggloves"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "apron"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/hands.dmi', "ggloves"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "apron"), ICON_OVERLAY)
if(prob(1))
- clothes_s.Blend(new /icon('icons/mob/head.dmi', "nymph"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/head.dmi', "nymph"), ICON_OVERLAY)
switch(backbag)
if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "backpack"), ICON_OVERLAY)
if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-hyd"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-hyd"), ICON_OVERLAY)
if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY)
if(JOB_CHEF)
clothes_s = new /icon(uniform_dmi, "chef_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/head.dmi', "chef"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/head.dmi', "chef"), ICON_OVERLAY)
if(prob(1))
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "apronchef"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "apronchef"), ICON_OVERLAY)
switch(backbag)
if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "backpack"), ICON_OVERLAY)
if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-norm"), ICON_OVERLAY)
if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY)
if(JOB_JANITOR)
clothes_s = new /icon(uniform_dmi, "janitor_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY)
if(prob(1))
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "bio_janitor"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "bio_janitor"), ICON_OVERLAY)
switch(backbag)
if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "backpack"), ICON_OVERLAY)
if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-norm"), ICON_OVERLAY)
if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY)
if(JOB_LIBRARIAN)
clothes_s = new /icon(uniform_dmi, "red_suit_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY)
if(prob(1))
- clothes_s.Blend(new /icon('icons/mob/head.dmi', "hairflower"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/head.dmi', "hairflower"), ICON_OVERLAY)
switch(backbag)
if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "backpack"), ICON_OVERLAY)
if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-norm"), ICON_OVERLAY)
if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY)
if(JOB_QUARTERMASTER)
clothes_s = new /icon(uniform_dmi, "qm_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "brown"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/hands.dmi', "bgloves"), ICON_UNDERLAY)
if(prob(1))
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "poncho"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "poncho"), ICON_OVERLAY)
switch(backbag)
if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "backpack"), ICON_OVERLAY)
if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-norm"), ICON_OVERLAY)
if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY)
if(JOB_CARGOTECH)
clothes_s = new /icon(uniform_dmi, "cargotech_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/hands.dmi', "bgloves"), ICON_UNDERLAY)
if(prob(1))
- clothes_s.Blend(new /icon('icons/mob/head.dmi', "flat_cap"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/head.dmi', "flat_cap"), ICON_OVERLAY)
switch(backbag)
if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "backpack"), ICON_OVERLAY)
if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-norm"), ICON_OVERLAY)
if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY)
if(JOB_MINER)
clothes_s = new /icon(uniform_dmi, "explorer_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "explorer"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "explorer"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/hands.dmi', "bgloves"), ICON_UNDERLAY)
if(prob(1))
- clothes_s.Blend(new /icon('icons/mob/head.dmi', "bearpelt"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/head.dmi', "bearpelt"), ICON_OVERLAY)
switch(backbag)
if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "explorerpack"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "explorerpack"), ICON_OVERLAY)
if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-explorer"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-explorer"), ICON_OVERLAY)
if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY)
if(JOB_LAWYER)
clothes_s = new /icon(uniform_dmi, "internalaffairs_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "brown"), ICON_UNDERLAY)
clothes_s.Blend(new /icon('icons/mob/inhands/items_righthand.dmi', "briefcase"), ICON_UNDERLAY)
if(prob(1))
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "suitjacket_blue"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "suitjacket_blue"), ICON_OVERLAY)
switch(backbag)
if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "backpack"), ICON_OVERLAY)
if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-norm"), ICON_OVERLAY)
if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY)
if(JOB_CHAPLAIN)
clothes_s = new /icon(uniform_dmi, "chapblack_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY)
if(prob(1))
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "imperium_monk"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "imperium_monk"), ICON_OVERLAY)
switch(backbag)
if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "backpack"), ICON_OVERLAY)
if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-norm"), ICON_OVERLAY)
if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY)
if(JOB_CLOWN)
clothes_s = new /icon(uniform_dmi, "clown_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "clown"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/mask.dmi', "clown"), ICON_OVERLAY)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "clownpack"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "clown"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/mask.dmi', "clown"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "clownpack"), ICON_OVERLAY)
if(JOB_MIME)
clothes_s = new /icon(uniform_dmi, "mime_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/hands.dmi', "lgloves"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/mask.dmi', "mime"), ICON_OVERLAY)
- clothes_s.Blend(new /icon('icons/mob/head.dmi', "beret"), ICON_OVERLAY)
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "suspenders"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/hands.dmi', "lgloves"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/mask.dmi', "mime"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/head.dmi', "beret"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "suspenders"), ICON_OVERLAY)
switch(backbag)
if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "backpack"), ICON_OVERLAY)
if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-norm"), ICON_OVERLAY)
if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY)
else if(job_medsci_high)
switch(job_medsci_high)
if(JOB_RD)
clothes_s = new /icon(uniform_dmi, "director_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_open"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "brown"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "labcoat_open"), ICON_OVERLAY)
if(prob(1))
- clothes_s.Blend(new /icon('icons/mob/head.dmi', "petehat"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/head.dmi', "petehat"), ICON_OVERLAY)
switch(backbag)
if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "backpack"), ICON_OVERLAY)
if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-tox"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-tox"), ICON_OVERLAY)
if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY)
if(JOB_SCIENTIST)
clothes_s = new /icon(uniform_dmi, "toxinswhite_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_tox_open"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "white"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "labcoat_tox_open"), ICON_OVERLAY)
if(prob(1))
- clothes_s.Blend(new /icon('icons/mob/head.dmi', "metroid"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/head.dmi', "metroid"), ICON_OVERLAY)
switch(backbag)
if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "backpack"), ICON_OVERLAY)
if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-tox"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-tox"), ICON_OVERLAY)
if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY)
if(JOB_CHEMIST)
clothes_s = new /icon(uniform_dmi, "chemistrywhite_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "white"), ICON_UNDERLAY)
if(prob(1))
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labgreen"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "labgreen"), ICON_OVERLAY)
else
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_chem_open"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "labcoat_chem_open"), ICON_OVERLAY)
switch(backbag)
if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "backpack"), ICON_OVERLAY)
if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-chem"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-chem"), ICON_OVERLAY)
if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY)
if(JOB_CMO)
clothes_s = new /icon(uniform_dmi, "cmo_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "brown"), ICON_UNDERLAY)
if(prob(1))
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "bio_cmo"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "bio_cmo"), ICON_OVERLAY)
else
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_cmo_open"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "labcoat_cmo_open"), ICON_OVERLAY)
switch(backbag)
if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "medicalpack"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "medicalpack"), ICON_OVERLAY)
if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-med"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-med"), ICON_OVERLAY)
if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY)
if(JOB_DOCTOR)
clothes_s = new /icon(uniform_dmi, "medical_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "white"), ICON_UNDERLAY)
if(prob(1))
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "surgeon"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "surgeon"), ICON_OVERLAY)
else
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_open"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "labcoat_open"), ICON_OVERLAY)
switch(backbag)
if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "medicalpack"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "medicalpack"), ICON_OVERLAY)
if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-med"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-med"), ICON_OVERLAY)
if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY)
if(JOB_CORONER)
clothes_s = new /icon(uniform_dmi, "medical_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "white"), ICON_UNDERLAY)
if(prob(1))
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "mortician"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "mortician"), ICON_OVERLAY)
else
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_open"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "labcoat_open"), ICON_OVERLAY)
switch(backbag)
if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "medicalpack"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "medicalpack"), ICON_OVERLAY)
if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-med"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-med"), ICON_OVERLAY)
if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY)
if(JOB_GENETICIST)
clothes_s = new /icon(uniform_dmi, "geneticswhite_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "white"), ICON_UNDERLAY)
if(prob(1))
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "monkeysuit"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "monkeysuit"), ICON_OVERLAY)
else
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_gen_open"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "labcoat_gen_open"), ICON_OVERLAY)
switch(backbag)
if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "backpack"), ICON_OVERLAY)
if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-gen"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-gen"), ICON_OVERLAY)
if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY)
if(JOB_VIROLOGIST)
clothes_s = new /icon(uniform_dmi, "virologywhite_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/mask.dmi', "sterile"), ICON_OVERLAY)
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_vir_open"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "white"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/mask.dmi', "sterile"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "labcoat_vir_open"), ICON_OVERLAY)
if(prob(1))
- clothes_s.Blend(new /icon('icons/mob/head.dmi', "plaguedoctor"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/head.dmi', "plaguedoctor"), ICON_OVERLAY)
switch(backbag)
if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "medicalpack"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "medicalpack"), ICON_OVERLAY)
if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-vir"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-vir"), ICON_OVERLAY)
if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY)
if(JOB_PSYCHIATRIST)
clothes_s = new /icon(uniform_dmi, "psych_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "laceups"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_open"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "laceups"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "labcoat_open"), ICON_OVERLAY)
switch(backbag)
if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "backpack"), ICON_OVERLAY)
if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-norm"), ICON_OVERLAY)
if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY)
if(JOB_PARAMEDIC)
clothes_s = new /icon(uniform_dmi, "paramedic_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/mask.dmi', "cigoff"), ICON_OVERLAY)
- clothes_s.Blend(new /icon('icons/mob/head.dmi', "bluesoft"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/mask.dmi', "cigoff"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/head.dmi', "bluesoft"), ICON_OVERLAY)
switch(backbag)
if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "medicalpack"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "medicalpack"), ICON_OVERLAY)
if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-med"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-med"), ICON_OVERLAY)
if(JOB_ROBOTICIST)
clothes_s = new /icon(uniform_dmi, "robotics_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_open"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/hands.dmi', "bgloves"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "labcoat_open"), ICON_OVERLAY)
if(prob(1))
clothes_s.Blend(new /icon('icons/mob/inhands/items_righthand.dmi', "toolbox_blue"), ICON_OVERLAY)
switch(backbag)
if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "backpack"), ICON_OVERLAY)
if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-norm"), ICON_OVERLAY)
if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY)
else if(job_engsec_high)
switch(job_engsec_high)
if(JOB_CAPTAIN)
clothes_s = new /icon(uniform_dmi, "captain_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "brown"), ICON_UNDERLAY)
if(prob(1))
- clothes_s.Blend(new /icon('icons/mob/head.dmi', "centcomcaptain"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/head.dmi', "centcomcaptain"), ICON_OVERLAY)
else
- clothes_s.Blend(new /icon('icons/mob/head.dmi', "captain"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/head.dmi', "captain"), ICON_OVERLAY)
switch(backbag)
if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "backpack"), ICON_OVERLAY)
if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-cap"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-cap"), ICON_OVERLAY)
if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY)
if(JOB_HOS)
clothes_s = new /icon(uniform_dmi, "hosred_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "jackboots"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/hands.dmi', "bgloves"), ICON_UNDERLAY)
if(prob(1))
- clothes_s.Blend(new /icon('icons/mob/head.dmi', "beret_hos"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/head.dmi', "beret_hos"), ICON_OVERLAY)
switch(backbag)
if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "securitypack"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "securitypack"), ICON_OVERLAY)
if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-sec"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-sec"), ICON_OVERLAY)
if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY)
if(JOB_WARDEN)
- clothes_s = new /icon('icons/mob/uniform.dmi', "warden_s")
+ clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "warden_s")
if(prob(1))
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "slippers_worn"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "slippers_worn"), ICON_OVERLAY)
else
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "jackboots"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/hands.dmi', "bgloves"), ICON_UNDERLAY)
switch(backbag)
if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "securitypack"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "securitypack"), ICON_OVERLAY)
if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-sec"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-sec"), ICON_OVERLAY)
if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY)
if(JOB_DETECTIVE)
clothes_s = new /icon(uniform_dmi, "detective_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "brown"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/hands.dmi', "bgloves"), ICON_UNDERLAY)
if(prob(1))
- clothes_s.Blend(new /icon('icons/mob/mask.dmi', "cigaron"), ICON_OVERLAY)
- clothes_s.Blend(new /icon('icons/mob/head.dmi', "detective"), ICON_OVERLAY)
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "detective"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/mask.dmi', "cigaron"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/head.dmi', "detective"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "detective"), ICON_OVERLAY)
switch(backbag)
if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "backpack"), ICON_OVERLAY)
if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-norm"), ICON_OVERLAY)
if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY)
if(JOB_OFFICER)
clothes_s = new /icon(uniform_dmi, "secred_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "jackboots"), ICON_UNDERLAY)
if(prob(1))
- clothes_s.Blend(new /icon('icons/mob/head.dmi', "beret_officer"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/head.dmi', "beret_officer"), ICON_OVERLAY)
switch(backbag)
if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "securitypack"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "securitypack"), ICON_OVERLAY)
if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-sec"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-sec"), ICON_OVERLAY)
if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY)
if(JOB_CHIEF)
clothes_s = new /icon(uniform_dmi, "chief_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/belt.dmi', "utility"), ICON_OVERLAY)
- clothes_s.Blend(new /icon('icons/mob/head.dmi', "hardhat0_white"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "brown"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/hands.dmi', "bgloves"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/belt.dmi', "utility"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/head.dmi', "hardhat0_white"), ICON_OVERLAY)
if(prob(1))
clothes_s.Blend(new /icon('icons/mob/inhands/items_righthand.dmi', "blueprints"), ICON_OVERLAY)
switch(backbag)
if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "engiepack"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "engiepack"), ICON_OVERLAY)
if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-eng"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-eng"), ICON_OVERLAY)
if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY)
if(JOB_ENGINEER)
clothes_s = new /icon(uniform_dmi, "engine_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "orange"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/belt.dmi', "utility"), ICON_OVERLAY)
- clothes_s.Blend(new /icon('icons/mob/head.dmi', "hardhat0_yellow"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "orange"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/belt.dmi', "utility"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/head.dmi', "hardhat0_yellow"), ICON_OVERLAY)
if(prob(1))
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "hazard"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "hazard"), ICON_OVERLAY)
switch(backbag)
if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "engiepack"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "engiepack"), ICON_OVERLAY)
if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-eng"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-eng"), ICON_OVERLAY)
if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY)
if(JOB_ATMOSTECH)
clothes_s = new /icon(uniform_dmi, "atmos_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/belt.dmi', "utility"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/hands.dmi', "bgloves"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/belt.dmi', "utility"), ICON_OVERLAY)
if(prob(1))
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "firesuit"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "firesuit"), ICON_OVERLAY)
switch(backbag)
if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "backpack"), ICON_OVERLAY)
if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-norm"), ICON_OVERLAY)
if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY)
if(JOB_AI)//Gives AI and borgs assistant-wear, so they can still customize their character
clothes_s = new /icon(uniform_dmi, "grey_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "straight_jacket"), ICON_OVERLAY)
- clothes_s.Blend(new /icon('icons/mob/head.dmi', "cardborg_h"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "straight_jacket"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/head.dmi', "cardborg_h"), ICON_OVERLAY)
if(backbag == 2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "backpack"), ICON_OVERLAY)
else if(backbag == 3 || backbag == 4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY)
if(JOB_CYBORG)
clothes_s = new /icon(uniform_dmi, "grey_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "cardborg"), ICON_OVERLAY)
- clothes_s.Blend(new /icon('icons/mob/head.dmi', "cardborg_h"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "cardborg"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/head.dmi', "cardborg_h"), ICON_OVERLAY)
if(backbag == 2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "backpack"), ICON_OVERLAY)
else if(backbag == 3 || backbag == 4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY)
else if(job_karma_high)
switch(job_karma_high)
if(JOB_MECHANIC)
clothes_s = new /icon(uniform_dmi, "mechanic_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "orange"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/belt.dmi', "utility"), ICON_OVERLAY)
- clothes_s.Blend(new /icon('icons/mob/head.dmi', "hardhat0_yellow"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "orange"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/belt.dmi', "utility"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/head.dmi', "hardhat0_yellow"), ICON_OVERLAY)
switch(backbag)
if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "engiepack"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "engiepack"), ICON_OVERLAY)
if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-eng"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-eng"), ICON_OVERLAY)
if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY)
if(JOB_PILOT)
clothes_s = new /icon(uniform_dmi, "secred_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "bomber"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "jackboots"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "bomber"), ICON_OVERLAY)
switch(backbag)
if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "securitypack"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "securitypack"), ICON_OVERLAY)
if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-sec"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-sec"), ICON_OVERLAY)
if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY)
if(JOB_BRIGDOC)
clothes_s = new /icon(uniform_dmi, "medical_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "fr_jacket_open"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "white"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "fr_jacket_open"), ICON_OVERLAY)
switch(backbag)
if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "medicalpack"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "medicalpack"), ICON_OVERLAY)
if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-med"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-med"), ICON_OVERLAY)
if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY)
if(JOB_NANO)
clothes_s = new /icon(uniform_dmi, "officer_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "laceups"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "laceups"), ICON_UNDERLAY)
switch(backbag)
if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "backpack"), ICON_OVERLAY)
if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-norm"), ICON_OVERLAY)
if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY)
if(JOB_BLUESHIELD)
clothes_s = new /icon(uniform_dmi, "officer_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/hands.dmi', "swat_gl"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "blueshield"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "jackboots"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/hands.dmi', "swat_gl"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "blueshield"), ICON_OVERLAY)
switch(backbag)
if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "securitypack"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "securitypack"), ICON_OVERLAY)
if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-norm"), ICON_OVERLAY)
if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY)
if(JOB_JUDGE)
clothes_s = new /icon(uniform_dmi, "really_black_suit_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "laceups"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/head.dmi', "mercy_hood"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "judge"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "laceups"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/head.dmi', "mercy_hood"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "judge"), ICON_UNDERLAY)
switch(backbag)
if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "backpack"), ICON_OVERLAY)
if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-norm"), ICON_OVERLAY)
if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY)
if(disabilities & DISABILITY_FLAG_NEARSIGHTED)
- preview_icon.Blend(new /icon('icons/mob/eyes.dmi', "glasses"), ICON_OVERLAY)
+ preview_icon.Blend(new /icon('icons/mob/clothing/eyes.dmi', "glasses"), ICON_OVERLAY)
// Observers get tourist outfit.
if(for_observer)
clothes_s = new /icon(uniform_dmi, "tourist_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY)
if(backbag == 2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "backpack"), ICON_OVERLAY)
else if(backbag == 3 || backbag == 4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY)
if(underwear_s)
preview_icon.Blend(underwear_s, ICON_OVERLAY)
diff --git a/code/modules/mob/new_player/sprite_accessories/sprite_accessories.dm b/code/modules/mob/new_player/sprite_accessories/sprite_accessories.dm
index 6e618dba0d0..7d9be34c063 100644
--- a/code/modules/mob/new_player/sprite_accessories/sprite_accessories.dm
+++ b/code/modules/mob/new_player/sprite_accessories/sprite_accessories.dm
@@ -167,11 +167,11 @@
// Underwear Definitions //
///////////////////////////
/datum/sprite_accessory/underwear
- icon = 'icons/mob/underwear.dmi'
+ icon = 'icons/mob/clothing/underwear.dmi'
species_allowed = list("Human", "Unathi", "Diona", "Vulpkanin", "Tajaran", "Kidan", "Grey", "Plasmaman", "Machine", "Skrell", "Slime People", "Skeleton", "Drask", "Vox")
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/underwear.dmi',
- "Grey" = 'icons/mob/species/grey/underwear.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/underwear.dmi',
+ "Grey" = 'icons/mob/clothing/species/grey/underwear.dmi'
)
gender = NEUTER
@@ -297,11 +297,11 @@
// Undershirt Definitions //
////////////////////////////
/datum/sprite_accessory/undershirt
- icon = 'icons/mob/underwear.dmi'
+ icon = 'icons/mob/clothing/underwear.dmi'
species_allowed = list("Human", "Unathi", "Diona", "Vulpkanin", "Tajaran", "Kidan", "Grey", "Plasmaman", "Machine", "Skrell", "Slime People", "Skeleton", "Drask", "Vox")
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/underwear.dmi',
- "Grey" = 'icons/mob/species/grey/underwear.dmi')
+ "Vox" = 'icons/mob/clothing/species/vox/underwear.dmi',
+ "Grey" = 'icons/mob/clothing/species/grey/underwear.dmi')
gender = NEUTER
/datum/sprite_accessory/undershirt/nude
@@ -536,9 +536,9 @@
// Socks Definitions //
///////////////////////
/datum/sprite_accessory/socks
- icon = 'icons/mob/underwear.dmi'
+ icon = 'icons/mob/clothing/underwear.dmi'
species_allowed = list("Human", "Unathi", "Diona", "Vulpkanin", "Tajaran", "Kidan", "Grey", "Plasmaman", "Machine", "Skrell", "Slime People", "Skeleton", "Drask", "Vox")
- sprite_sheets = list("Vox" = 'icons/mob/species/vox/underwear.dmi')
+ sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/underwear.dmi')
gender = NEUTER
/datum/sprite_accessory/socks/nude
diff --git a/code/modules/ninja/suit/mask.dm b/code/modules/ninja/suit/mask.dm
index f88ada9f0b4..b61258440bd 100644
--- a/code/modules/ninja/suit/mask.dm
+++ b/code/modules/ninja/suit/mask.dm
@@ -13,10 +13,10 @@ Contents:
item_state = "s-ninja_mask"
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/mask.dmi',
- "Unathi" = 'icons/mob/species/unathi/mask.dmi',
- "Tajaran" = 'icons/mob/species/tajaran/mask.dmi',
- "Vulpkanin" = 'icons/mob/species/vulpkanin/mask.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/mask.dmi',
+ "Unathi" = 'icons/mob/clothing/species/unathi/mask.dmi',
+ "Tajaran" = 'icons/mob/clothing/species/tajaran/mask.dmi',
+ "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/mask.dmi'
)
var/obj/item/voice_changer/voice_changer
diff --git a/code/modules/paperwork/faxmachine.dm b/code/modules/paperwork/faxmachine.dm
index 624a4ddd099..76a5dd4dc03 100644
--- a/code/modules/paperwork/faxmachine.dm
+++ b/code/modules/paperwork/faxmachine.dm
@@ -10,6 +10,7 @@ GLOBAL_LIST_EMPTY(fax_blacklist)
icon = 'icons/obj/library.dmi'
icon_state = "fax"
insert_anim = "faxsend"
+ var/receive_anim = "faxsend"
pass_flags = PASSTABLE
var/fax_network = "Local Fax Network"
/// If true, prevents fax machine from sending messages to NT machines
@@ -51,11 +52,17 @@ GLOBAL_LIST_EMPTY(fax_blacklist)
/obj/machinery/photocopier/faxmachine/longrange
name = "long range fax machine"
+ icon_state = "longfax"
+ insert_anim = "longfaxsend"
+ receive_anim = "longfaxreceive"
fax_network = "Central Command Quantum Entanglement Network"
long_range_enabled = TRUE
/obj/machinery/photocopier/faxmachine/longrange/syndie
name = "syndicate long range fax machine"
+ icon_state = "fax"
+ insert_anim = "faxsend"
+ receive_anim = "faxsend"
emagged = TRUE
syndie_restricted = TRUE
req_one_access = list(ACCESS_SYNDICATE)
@@ -293,7 +300,7 @@ GLOBAL_LIST_EMPTY(fax_blacklist)
if(department == "Unknown")
return FALSE //You can't send faxes to "Unknown"
- flick("faxreceive", src)
+ flick(receive_anim, src)
playsound(loc, 'sound/goonstation/machines/printer_dotmatrix.ogg', 50, 1)
diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm
index 49044665c08..ffb92c12cc4 100644
--- a/code/modules/power/apc.dm
+++ b/code/modules/power/apc.dm
@@ -1355,7 +1355,7 @@
for(var/obj/machinery/light/L in area)
if(L.nightshift_allowed)
L.nightshift_enabled = nightshift_lights
- L.update(FALSE)
+ L.update(FALSE, play_sound = FALSE)
CHECK_TICK
/obj/machinery/power/apc/proc/relock_callback()
diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm
index 250e065cfb6..fcccefbf513 100644
--- a/code/modules/power/cable.dm
+++ b/code/modules/power/cable.dm
@@ -471,7 +471,7 @@ By design, d1 is the smallest direction and d2 is the highest
// Definitions
////////////////////////////////
-GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe("cable restraints", /obj/item/restraints/handcuffs/cable, 15)))
+GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe/cable_restraints("cable restraints", /obj/item/restraints/handcuffs/cable, 15)))
/obj/item/stack/cable_coil
name = "cable coil"
diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm
index e275b747814..cb605bf2beb 100644
--- a/code/modules/power/lighting.dm
+++ b/code/modules/power/lighting.dm
@@ -8,6 +8,9 @@
#define LIGHT_BROKEN 2
#define LIGHT_BURNED 3
+#define LIGHT_ON_DELAY_LOWER 1 SECONDS
+#define LIGHT_ON_DELAY_UPPER 3 SECONDS
+
/**
* # Light fixture frame
*
@@ -173,6 +176,8 @@
power_channel = LIGHT //Lights are calc'd via area so they dont need to be in the machine list
/// Is the light on or off?
var/on = FALSE
+ /// Is the light currently turning on?
+ var/turning_on = FALSE
/// If the light state has changed since the last 'update()', also update the power requirements
var/power_state = FALSE
/// How much power does it use?
@@ -260,7 +265,7 @@
brightness_color = "#a0a080"
if(prob(5))
break_light_tube(TRUE)
- update(FALSE)
+ update(FALSE, TRUE, FALSE)
/obj/machinery/light/Destroy()
var/area/A = get_area(src)
@@ -290,62 +295,87 @@
return
/**
- * Updates the light's properties
+ * Updates the light's 'on' state and power consumption based on [/obj/machinery/light/var/on].
*
- * Updates the icon_state, luminosity, colour, and power usage of the light.
- * Also handles rigged light bulbs exploding.
* Arguments:
- * * trigger - Should this update make the light explode/burn out? (Defaults to TRUE)
+ * * trigger - Should this update check if the light will explode/burn out.
+ * * instant - Will the lightbulb turn on instantly, or after a short delay.
+ * * play_sound - Will the lightbulb play a sound when it's turned on.
*/
-/obj/machinery/light/proc/update(trigger = TRUE)
+/obj/machinery/light/proc/update(trigger = TRUE, instant = FALSE, play_sound = TRUE)
switch(status)
if(LIGHT_BROKEN, LIGHT_BURNED, LIGHT_EMPTY)
on = FALSE
- update_icon()
- if(on)
- var/BR = brightness_range
- var/PO = brightness_power
- var/CO = brightness_color
- if(color)
- CO = color
- var/area/A = get_area(src)
- if(A && A.fire)
- CO = bulb_emergency_colour
- else if(nightshift_enabled)
- BR = nightshift_light_range
- PO = nightshift_light_power
- if(!color)
- CO = nightshift_light_color
- var/matching = light && BR == light.light_range && PO == light.light_power && CO == light.light_color
- if(!matching)
- switchcount++
- if(rigged)
- if(status == LIGHT_OK && trigger)
- log_admin("LOG: Rigged light explosion, last touched by [fingerprintslast]")
- message_admins("LOG: Rigged light explosion, last touched by [fingerprintslast]")
- explode()
- // Whichever number is smallest gets set as the prob
- // Each spook adds a 0.5% to 1% chance of burnout
- else if(prob(min(40, switchcount / 10)))
- if(status == LIGHT_OK && trigger)
- burnout()
-
- else
- use_power = ACTIVE_POWER_USE
- set_light(BR, PO, CO)
- else
+ if(on) // Turning on
+ if(instant)
+ _turn_on(trigger, play_sound)
+ else if(!turning_on)
+ turning_on = TRUE
+ addtimer(CALLBACK(src, .proc/_turn_on, trigger, play_sound), rand(LIGHT_ON_DELAY_LOWER, LIGHT_ON_DELAY_UPPER))
+ else // Turning off
use_power = IDLE_POWER_USE
set_light(0)
+ update_icon()
active_power_usage = (brightness_range * 10)
if(on != power_state) // Light was turned on/off, so update the power usage
power_state = on
if(on)
- static_power_used = brightness_range * 20 //20W per unit luminosity
+ static_power_used = brightness_range * 20 //20W per unit of luminosity
addStaticPower(static_power_used, STATIC_LIGHT)
else
removeStaticPower(static_power_used, STATIC_LIGHT)
+/**
+ * The actual proc to turn on the lightbulb.
+ *
+ * Private proc, do not call directly. Use [/obj/machinery/light/proc/update] instead.
+ *
+ * Sets the light power, range, and colour based on environmental conditions such as night shift and fire alarms.
+ * Also handles light bulbs burning out and exploding if `trigger` is `TRUE`.
+ */
+/obj/machinery/light/proc/_turn_on(trigger, play_sound = TRUE)
+ PRIVATE_PROC(TRUE)
+ if(QDELETED(src))
+ return
+ turning_on = FALSE
+ if(!on)
+ return
+ var/BR = brightness_range
+ var/PO = brightness_power
+ var/CO = brightness_color
+ if(color)
+ CO = color
+ var/area/A = get_area(src)
+ if(A?.fire)
+ CO = bulb_emergency_colour
+ else if(nightshift_enabled)
+ BR = nightshift_light_range
+ PO = nightshift_light_power
+ if(!color)
+ CO = nightshift_light_color
+ if(light && (BR == light.light_range) && (PO == light.light_power) && (CO == light.light_color))
+ return // Nothing's changed here
+
+ switchcount++
+ update_icon()
+ if(trigger && (status == LIGHT_OK))
+ if(rigged)
+ log_admin("LOG: Rigged light explosion, last touched by [fingerprintslast].")
+ message_admins("LOG: Rigged light explosion, last touched by [fingerprintslast].")
+ explode()
+ return
+ // Whichever number is smallest gets set as the prob
+ // Each spook adds a 0.5% to 1% chance of burnout
+ else if(prob(min(40, switchcount / 10)))
+ burnout()
+ return
+
+ use_power = ACTIVE_POWER_USE
+ set_light(BR, PO, CO)
+ if(play_sound)
+ playsound(src, 'sound/machines/light_on.ogg', 60, TRUE)
+
/obj/machinery/light/proc/burnout()
status = LIGHT_BURNED
icon_state = "[base_state]-burned"
@@ -404,7 +434,7 @@
brightness_color = L.brightness_color
lightmaterials = L.materials
on = has_power()
- update()
+ update(TRUE, TRUE, FALSE)
user.drop_item() //drop the item to update overlays and such
qdel(L)
@@ -538,13 +568,13 @@
if(status != LIGHT_OK)
break
on = FALSE
- update(FALSE)
+ update(FALSE, TRUE, FALSE)
sleep(rand(1, 3))
on = (status == LIGHT_OK)
- update(FALSE)
+ update(FALSE, TRUE, FALSE)
sleep(rand(1, 10))
on = (status == LIGHT_OK)
- update(FALSE)
+ update(FALSE, TRUE, FALSE)
flickering = FALSE
@@ -620,7 +650,7 @@
user.put_in_active_hand(L)
status = LIGHT_EMPTY
- update(FALSE)
+ update()
return L
/obj/machinery/light/attack_tk(mob/user)
@@ -649,8 +679,8 @@
if(status == LIGHT_OK)
return
status = LIGHT_OK
- on = 1
- update()
+ on = TRUE
+ update(FALSE, TRUE, FALSE)
/obj/machinery/light/zap_act(power, zap_flags)
var/explosive = zap_flags & ZAP_MACHINE_EXPLOSIVE
@@ -856,3 +886,10 @@
on = FALSE
visible_message("[src] flickers and falls dark.")
update(FALSE)
+
+#undef LIGHT_OK
+#undef LIGHT_EMPTY
+#undef LIGHT_BROKEN
+#undef LIGHT_BURNED
+#undef LIGHT_ON_DELAY_LOWER
+#undef LIGHT_ON_DELAY_UPPER
diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
index 69a67c5ffc6..fc650f1810f 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -56,7 +56,7 @@
var/knife_x_offset = 0
var/knife_y_offset = 0
- var/can_holster = TRUE
+ var/can_holster = FALSE // Anything that can be holstered should be manually set
var/list/upgrades = list()
diff --git a/code/modules/projectiles/guns/alien.dm b/code/modules/projectiles/guns/alien.dm
index 973e7da9596..135923c6ef6 100644
--- a/code/modules/projectiles/guns/alien.dm
+++ b/code/modules/projectiles/guns/alien.dm
@@ -52,7 +52,7 @@
ammo_type = list(/obj/item/ammo_casing/energy/sonic)
cell_type = /obj/item/stock_parts/cell/super
restricted_species = list(/datum/species/vox/armalis)
- sprite_sheets_inhand = list("Vox Armalis" = 'icons/mob/species/armalis/held.dmi') //Big guns big birds.
+ sprite_sheets_inhand = list("Vox Armalis" = 'icons/mob/clothing/species/armalis/held.dmi') //Big guns big birds.
/obj/item/gun/energy/noisecannon/update_icon()
return
diff --git a/code/modules/projectiles/guns/energy/nuclear.dm b/code/modules/projectiles/guns/energy/nuclear.dm
index 4fac1c96828..d4cb1b03244 100644
--- a/code/modules/projectiles/guns/energy/nuclear.dm
+++ b/code/modules/projectiles/guns/energy/nuclear.dm
@@ -35,6 +35,7 @@
can_flashlight = 0 // Can't attach or detach the flashlight, and override it's icon update
actions_types = list(/datum/action/item_action/toggle_gunlight)
shaded_charge = FALSE
+ can_holster = TRUE // Pistol sized, so it should fit into a holster
/obj/item/gun/energy/gun/mini/Initialize(mapload, ...)
gun_light = new /obj/item/flashlight/seclite(src)
@@ -57,6 +58,7 @@
ammo_x_offset = 4
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
shaded_charge = FALSE
+ can_holster = TRUE
/obj/item/gun/energy/gun/blueshield
name = "advanced stun revolver"
@@ -67,6 +69,7 @@
ammo_type = list(/obj/item/ammo_casing/energy/electrode/hos, /obj/item/ammo_casing/energy/laser/hos)
ammo_x_offset = 1
shaded_charge = TRUE
+ can_holster = TRUE
/obj/item/gun/energy/gun/blueshield/pdw9
name = "PDW-9 taser pistol"
diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm
index 5801a1daa59..e2323765f82 100644
--- a/code/modules/projectiles/guns/energy/special.dm
+++ b/code/modules/projectiles/guns/energy/special.dm
@@ -37,6 +37,7 @@
origin_tech = "combat=4;materials=4;biotech=5;plasmatech=6"
ammo_type = list(/obj/item/ammo_casing/energy/declone)
ammo_x_offset = 1
+ can_holster = TRUE
/obj/item/gun/energy/decloner/update_icon()
..()
@@ -56,6 +57,7 @@
modifystate = 1
ammo_x_offset = 1
selfcharge = 1
+ can_holster = TRUE
// Meteor Gun //
/obj/item/gun/energy/meteorgun
@@ -109,6 +111,7 @@
can_flashlight = 0
max_mod_capacity = 0
empty_state = null
+ can_holster = TRUE
/obj/item/gun/energy/kinetic_accelerator/crossbow/detailed_examine()
return "This is an energy weapon. To fire the weapon, have your gun mode set to 'fire', \
@@ -159,6 +162,7 @@
force = 12
sharp = 1
can_charge = 0
+ can_holster = TRUE
/obj/item/gun/energy/plasmacutter/examine(mob/user)
. = ..()
@@ -297,6 +301,7 @@
clumsy_check = 0
selfcharge = 1
ammo_x_offset = 3
+ can_holster = TRUE // you'll never see it coming
/obj/item/gun/energy/toxgun
name = "plasma pistol"
@@ -308,6 +313,7 @@
origin_tech = "combat=4;magnets=4;powerstorage=3"
ammo_type = list(/obj/item/ammo_casing/energy/toxplasma)
shaded_charge = 1
+ can_holster = TRUE
// Energy Sniper //
/obj/item/gun/energy/sniperrifle
@@ -636,6 +642,7 @@
selfcharge = 1
ammo_x_offset = 3
var/mimic_type = /obj/item/gun/projectile/automatic/pistol //Setting this to the mimicgun type does exactly what you think it will.
+ can_holster = TRUE
/obj/item/gun/energy/mimicgun/newshot()
var/obj/item/ammo_casing/energy/mimic/M = ammo_type[select]
diff --git a/code/modules/projectiles/guns/energy/stun.dm b/code/modules/projectiles/guns/energy/stun.dm
index 7e5657e0099..75b22634d99 100644
--- a/code/modules/projectiles/guns/energy/stun.dm
+++ b/code/modules/projectiles/guns/energy/stun.dm
@@ -6,6 +6,7 @@
origin_tech = "combat=3"
ammo_type = list(/obj/item/ammo_casing/energy/electrode)
ammo_x_offset = 3
+ can_holster = TRUE // Pistol size
/obj/item/gun/energy/shock_revolver
name = "tesla revolver"
@@ -16,6 +17,8 @@
ammo_type = list(/obj/item/ammo_casing/energy/shock_revolver)
can_flashlight = 0
shaded_charge = FALSE
+ can_holster = TRUE
+
/obj/item/gun/energy/gun/advtaser
name = "hybrid taser"
@@ -26,6 +29,7 @@
ammo_x_offset = 2
flight_x_offset = 15
shaded_charge = FALSE
+ can_holster = TRUE // Pistol size
/obj/item/gun/energy/gun/advtaser/detailed_examine()
return "This is an energy weapon. To recharge this weapon, use a weapon recharger. \
@@ -49,6 +53,7 @@
origin_tech = "combat=3"
ammo_type = list(/obj/item/ammo_casing/energy/disabler)
ammo_x_offset = 3
+ can_holster = TRUE
/obj/item/gun/energy/disabler/cyborg
name = "cyborg disabler"
diff --git a/code/modules/projectiles/guns/magic.dm b/code/modules/projectiles/guns/magic.dm
index 05a0134ded6..b03bd121615 100644
--- a/code/modules/projectiles/guns/magic.dm
+++ b/code/modules/projectiles/guns/magic.dm
@@ -18,6 +18,7 @@
origin_tech = null
clumsy_check = 0
trigger_guard = TRIGGER_GUARD_ALLOW_ALL // Has no trigger at all, uses magic instead
+ can_holster = FALSE // Nothing here is a gun, and therefore shouldn't really fit into a holster
lefthand_file = 'icons/mob/inhands/items_lefthand.dmi' //not really a gun and some toys use these inhands
righthand_file = 'icons/mob/inhands/items_righthand.dmi'
diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm
index 7e4c0ac8cdd..ec24553f68d 100644
--- a/code/modules/projectiles/guns/projectile/automatic.dm
+++ b/code/modules/projectiles/guns/projectile/automatic.dm
@@ -4,7 +4,6 @@
var/select = 1
can_tactical = TRUE
can_suppress = 1
- can_holster = FALSE
burst_size = 3
fire_delay = 2
actions_types = list(/datum/action/item_action/toggle_firemode)
@@ -143,6 +142,7 @@
mag_type = /obj/item/ammo_box/magazine/uzim9mm
fire_sound = 'sound/weapons/gunshots/gunshot_pistol.ogg'
burst_size = 2
+ can_holster = TRUE // it's a mini-uzi after all
//M-90gl Carbine//
/obj/item/gun/projectile/automatic/m90
diff --git a/code/modules/projectiles/guns/projectile/launchers.dm b/code/modules/projectiles/guns/projectile/launchers.dm
index 8256c8c7a50..37ba272a67e 100644
--- a/code/modules/projectiles/guns/projectile/launchers.dm
+++ b/code/modules/projectiles/guns/projectile/launchers.dm
@@ -9,6 +9,7 @@
mag_type = /obj/item/ammo_box/magazine/internal/grenadelauncher
fire_sound = 'sound/weapons/grenadelaunch.ogg'
w_class = WEIGHT_CLASS_NORMAL
+ can_holster = FALSE // Not your normal revolver
/obj/item/gun/projectile/revolver/grenadelauncher/attackby(obj/item/A, mob/user, params)
..()
diff --git a/code/modules/projectiles/guns/projectile/revolver.dm b/code/modules/projectiles/guns/projectile/revolver.dm
index aa365767223..1b9dcc15079 100644
--- a/code/modules/projectiles/guns/projectile/revolver.dm
+++ b/code/modules/projectiles/guns/projectile/revolver.dm
@@ -5,6 +5,7 @@
mag_type = /obj/item/ammo_box/magazine/internal/cylinder
origin_tech = "combat=3;materials=2"
fire_sound = 'sound/weapons/gunshots/gunshot_strong.ogg'
+ can_holster = TRUE
/obj/item/gun/projectile/revolver/New()
..()
@@ -158,6 +159,7 @@
fire_sound_text = null
lefthand_file = null
righthand_file = null
+ can_holster = FALSE // Get your fingers out of there!
trigger_guard = TRIGGER_GUARD_ALLOW_ALL
clumsy_check = 0 //Stole your uplink! Honk!
needs_permit = 0 //go away beepsky
diff --git a/code/modules/projectiles/guns/projectile/sniper.dm b/code/modules/projectiles/guns/projectile/sniper.dm
index 316a22a4db1..e4bb23b0ceb 100644
--- a/code/modules/projectiles/guns/projectile/sniper.dm
+++ b/code/modules/projectiles/guns/projectile/sniper.dm
@@ -86,17 +86,30 @@
damage = 70
stun = 5
weaken = 5
- dismemberment = 50
armour_penetration = 50
- var/breakthings = TRUE
-/obj/item/projectile/bullet/sniper/on_hit(atom/target, blocked = 0, hit_zone)
- if((blocked != 100) && (!ismob(target) && breakthings))
+/obj/item/ammo_box/magazine/sniper_rounds/antimatter
+ name = "sniper rounds (Antimatter)"
+ desc = "Antimatter sniper rounds, for when you really don't like something."
+ icon_state = "antimatter"
+ ammo_type = /obj/item/ammo_casing/antimatter
+
+/obj/item/ammo_casing/antimatter
+ desc = "A .50 antimatter bullet casing, designed to cause massive damage to whatever is hit."
+ caliber = ".50"
+ projectile_type = /obj/item/projectile/bullet/sniper/antimatter
+ icon_state = ".50"
+
+/obj/item/projectile/bullet/sniper/antimatter
+ name = "antimatter bullet"
+ dismemberment = 50
+
+/obj/item/projectile/bullet/sniper/antimatter/on_hit(atom/target, blocked = 0, hit_zone)
+ if((blocked != 100) && (!ismob(target)))
target.ex_act(rand(1,2))
return ..()
-
//Sleepy ammo
/obj/item/ammo_box/magazine/sniper_rounds/soporific
name = "sniper rounds (Zzzzz)"
@@ -117,9 +130,7 @@
armour_penetration = 0
nodamage = 1
stun = 0
- dismemberment = 0
weaken = 0
- breakthings = FALSE
/obj/item/projectile/bullet/sniper/soporific/on_hit(atom/target, blocked = 0, hit_zone)
if((blocked != 100) && istype(target, /mob/living))
@@ -145,17 +156,15 @@
icon_state = ".50"
/obj/item/projectile/bullet/sniper/haemorrhage
- armour_penetration = 15
- damage = 15
- stun = 0
- dismemberment = 0
- weaken = 0
- breakthings = FALSE
+ armour_penetration = 25
+ damage = 45
+ stun = 3
+ weaken = 3
/obj/item/projectile/bullet/sniper/haemorrhage/on_hit(atom/target, blocked = 0, hit_zone)
if((blocked != 100) && iscarbon(target))
var/mob/living/carbon/C = target
- C.bleed(100)
+ C.bleed(150)
return ..()
@@ -163,6 +172,7 @@
/obj/item/ammo_box/magazine/sniper_rounds/penetrator
name = "sniper rounds (penetrator)"
desc = "An extremely powerful round capable of passing straight through cover and anyone unfortunate enough to be behind it."
+ icon_state = "penetrator"
ammo_type = /obj/item/ammo_casing/penetrator
origin_tech = "combat=6;syndicate=3"
max_ammo = 5
@@ -181,7 +191,6 @@
stun = 0
dismemberment = 0
weaken = 0
- breakthings = FALSE
//compact ammo
/obj/item/ammo_box/magazine/sniper_rounds/compact
@@ -193,14 +202,11 @@
/obj/item/ammo_casing/compact
desc = "A .50 caliber compact round casing."
caliber = ".50"
- projectile_type = /obj/item/projectile/bullet/sniper/compact
+ projectile_type = /obj/item/projectile/bullet/sniper //Same as the base sniper bullet, but can't be reloaded with any fancy sniper ammo in the mag, which only holds 4
muzzle_flash_strength = MUZZLE_FLASH_STRENGTH_NORMAL
muzzle_flash_range = MUZZLE_FLASH_RANGE_NORMAL
icon_state = ".50"
-/obj/item/projectile/bullet/sniper/compact //Can't dismember, and can't break things; just deals massive damage.
- dismemberment = 0
- breakthings = FALSE
//toy magazine
/obj/item/ammo_box/magazine/toy/sniper_rounds
diff --git a/code/modules/projectiles/guns/projectile/toy.dm b/code/modules/projectiles/guns/projectile/toy.dm
index 55a9aa79c6b..5250ae70c81 100644
--- a/code/modules/projectiles/guns/projectile/toy.dm
+++ b/code/modules/projectiles/guns/projectile/toy.dm
@@ -26,6 +26,7 @@
can_suppress = 0
burst_size = 1
fire_delay = 0
+ can_holster = TRUE
actions_types = list()
/obj/item/gun/projectile/automatic/toy/pistol/update_icon()
@@ -42,8 +43,8 @@
..()
/obj/item/gun/projectile/automatic/toy/pistol/enforcer
- name = "Foam Enforcer"
- desc = "A foam shooting version of the Enforcer meant to be used for training new caddets who can't be trusted with rubber bullets."
+ name = "foam Enforcer"
+ desc = "A foam-shooting version of the Enforcer meant to be used for training new cadets who can't be trusted with rubber bullets."
icon_state = "enforcer"
mag_type = /obj/item/ammo_box/magazine/toy/enforcer
can_flashlight = TRUE
diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
index 4ee5d7aa28e..97e85cb7857 100644
--- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
@@ -16,7 +16,6 @@
var/recharge_counter = 0
var/hackedcheck = FALSE
var/obj/item/reagent_containers/beaker = null
- var/image/icon_beaker = null //cached overlay
var/list/dispensable_reagents = list("hydrogen", "lithium", "carbon", "nitrogen", "oxygen", "fluorine",
"sodium", "aluminum", "silicon", "phosphorus", "sulfur", "chlorine", "potassium", "iron",
"copper", "mercury", "plasma", "radium", "water", "ethanol", "sugar", "iodine", "bromine", "silver", "chromium")
@@ -130,6 +129,15 @@
else
stat |= NOPOWER
+/obj/machinery/chem_dispenser/update_icon()
+ if(panel_open)
+ icon_state = "[initial(icon_state)]-o"
+ return
+ if(!powered() && !is_drink)
+ icon_state = "dispenser_nopower"
+ return
+ icon_state = "[initial(icon_state)][beaker ? "_working" : ""]"
+
/obj/machinery/chem_dispenser/ex_act(severity)
if(severity < 3)
if(beaker)
@@ -140,7 +148,6 @@
..()
if(A == beaker)
beaker = null
- overlays.Cut()
/obj/machinery/chem_dispenser/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
// update the ui if it exists, returns null if no ui is passed/found
@@ -204,11 +211,6 @@
atom_say("Not enough energy to complete operation!")
return
R.add_reagent(params["reagent"], actual)
- overlays.Cut()
- if(!icon_beaker)
- icon_beaker = mutable_appearance('icons/obj/chemical.dmi', "disp_beaker") //randomize beaker overlay position.
- icon_beaker.pixel_x = rand(-10, 5)
- overlays += icon_beaker
if("remove")
var/amount = text2num(params["amount"])
if(!beaker || !amount)
@@ -226,7 +228,7 @@
if(Adjacent(usr) && !issilicon(usr))
usr.put_in_hands(beaker)
beaker = null
- overlays.Cut()
+ update_icon()
else
return FALSE
@@ -255,10 +257,7 @@
I.forceMove(src)
to_chat(user, "You set [I] on the machine.")
SStgui.update_uis(src) // update all UIs attached to src
- if(!icon_beaker)
- icon_beaker = mutable_appearance('icons/obj/chemical.dmi', "disp_beaker") //randomize beaker overlay position.
- icon_beaker.pixel_x = rand(-10, 5)
- overlays += icon_beaker
+ update_icon()
return
return ..()
diff --git a/code/modules/reagents/chemistry/reagents/alcohol.dm b/code/modules/reagents/chemistry/reagents/alcohol.dm
index 94172e14f0e..fa2765e54b4 100644
--- a/code/modules/reagents/chemistry/reagents/alcohol.dm
+++ b/code/modules/reagents/chemistry/reagents/alcohol.dm
@@ -1458,3 +1458,58 @@
drink_desc = "A sawed-off cola bottle filled with Fernet Cola. You can hear cuarteto music coming from the inside."
taste_description = "low class heaven"
remove_nutrition = 1
+
+/datum/reagent/consumable/ethanol/gimlet
+ name = "Gimlet"
+ id = "gimlet"
+ description = "A sharp cocktail dating back to the 19th century. Gin and lime, nothing else."
+ color = "#DEF8AB" // rgb (222, 248, 171)
+ alcohol_perc = 0.3
+ drink_icon = "gimlet"
+ drink_name = "Gimlet"
+ drink_desc = "There are debates on whether this drink should be half gin and half lime, or three parts gin and one part lime. All you know is, it's alcohol."
+ taste_description = "sharpness"
+
+/datum/reagent/consumable/ethanol/sidecar
+ name = "Sidecar"
+ id = "sidecar"
+ description = "A citrus cocktail of cognac, lemon and orange."
+ color = "#D7A61E" // rgb (215, 166, 30)
+ alcohol_perc = 0.4
+ drink_icon = "sidecar"
+ drink_name = "Sidecar"
+ drink_desc = "You can smell the citrus from here!"
+ taste_description = "smooth cognac and tart citrus"
+
+/datum/reagent/consumable/ethanol/whiskey_sour
+ name = "Whiskey Sour"
+ id = "whiskeysour"
+ description = "A tantalizing mixture of whiskey, sugar, lemon juice... and egg whites?"
+ color = "#E4D629" // rgb (228, 214, 41)
+ alcohol_perc = 0.6
+ drink_icon = "whiskeysour"
+ drink_name = "Whiskey Sour"
+ drink_desc = "Lemon and whiskey, with a cute foamy head!"
+ taste_description = "warm whiskey and sweetness"
+
+/datum/reagent/consumable/ethanol/mint_julep
+ name = "Mint Julep"
+ id = "mintjulep"
+ description = "A refreshing, cold mix of whiskey and mint. Perfect for summer!"
+ color = "#EAE2C8" // rgb (243, 226, 200)
+ alcohol_perc = 0.4
+ drink_icon = "mintjulep"
+ drink_name = "Mint Julep"
+ drink_desc = "A dainty glass of whiskey and mint on the rocks. Perfect for summer!"
+ taste_description = "sweet and cooling mint"
+
+/datum/reagent/consumable/ethanol/pina_colada
+ name = "Pina Colada"
+ id = "pinacolada"
+ description = "Tropical deliciousness."
+ color = "#F9D17D" // rgb (249, 209, 125)
+ alcohol_perc = 0.4
+ drink_icon = "pinacolada"
+ drink_name = "Pina Colada"
+ drink_desc = "After taking a sip, you feel contractually obligated to start singing a certain song of the same name."
+ taste_description = "tart and tropical pineapple"
diff --git a/code/modules/reagents/chemistry/reagents/drink_cold.dm b/code/modules/reagents/chemistry/reagents/drink_cold.dm
index 3d225263359..e589b07cf03 100644
--- a/code/modules/reagents/chemistry/reagents/drink_cold.dm
+++ b/code/modules/reagents/chemistry/reagents/drink_cold.dm
@@ -177,3 +177,13 @@
/datum/reagent/consumable/drink/cold/rewriter/on_mob_life(mob/living/M)
M.Jitter(5)
return ..()
+
+/datum/reagent/consumable/drink/cold/arnold_palmer
+ name = "Arnold Palmer"
+ id = "arnold_palmer"
+ description = "A wholesome mixture of lemonade and iced tea."
+ color = "#8B5427" // rgb: 139, 84, 39
+ drink_icon = "arnoldpalmer"
+ drink_name = "Arnold Palmer"
+ drink_desc = "A wholesome mixture of lemonade and iced tea... looks like somebody didn't stir this one very well."
+ taste_description = "sweet and fizzy"
diff --git a/code/modules/reagents/chemistry/recipes/drinks.dm b/code/modules/reagents/chemistry/recipes/drinks.dm
index 1bdb91f1ab6..f03ae9b316b 100644
--- a/code/modules/reagents/chemistry/recipes/drinks.dm
+++ b/code/modules/reagents/chemistry/recipes/drinks.dm
@@ -902,3 +902,51 @@
result_amount = 3
mix_message = "The ingredients mix into a dark brown godly substance"
mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
+
+/datum/chemical_reaction/arnold_palmer
+ name = "Arnold Palmer"
+ id = "arnold_palmer"
+ result = "arnold_palmer"
+ required_reagents = list("icetea" = 1, "lemonade" = 1)
+ result_amount = 2
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
+
+/datum/chemical_reaction/gimlet
+ name = "Gimlet"
+ id = "gimlet"
+ result = "gimlet"
+ required_reagents = list("gin" = 1, "limejuice" = 1)
+ result_amount = 2
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
+
+/datum/chemical_reaction/sidecar
+ name = "Sidecar"
+ id = "sidecar"
+ result = "sidecar"
+ required_reagents = list("cognac" = 1, "orangejuice" = 1, "lemonjuice" = 1)
+ result_amount = 3
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
+
+/datum/chemical_reaction/whiskey_sour
+ name = "Whiskey Sour"
+ id = "whiskeysour"
+ result = "whiskeysour"
+ required_reagents = list("whiskey" = 1, "lemonjuice" = 1, "sugar" = 1, "egg" = 1)
+ result_amount = 4
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
+
+/datum/chemical_reaction/mint_julep
+ name = "Mint Julep"
+ id = "mintjulep"
+ result = "mintjulep"
+ required_reagents = list("whiskey" = 1, "sugar" = 1, "ice" = 1, "mint" = 1)
+ result_amount = 4
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
+
+/datum/chemical_reaction/pina_colada
+ name = "Pina Colada"
+ id = "pinacolada"
+ result = "pinacolada"
+ required_reagents = list("rum" = 3, "pineapplejuice" = 2, "cream" = 1)
+ result_amount = 6
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
diff --git a/code/modules/reagents/reagent_containers/bottle.dm b/code/modules/reagents/reagent_containers/bottle.dm
index 4274c3114db..effeb05d1a4 100644
--- a/code/modules/reagents/reagent_containers/bottle.dm
+++ b/code/modules/reagents/reagent_containers/bottle.dm
@@ -39,7 +39,7 @@
underlays += filling
if(!is_open_container())
- var/image/lid = image(icon, src, "lid_bottle")
+ var/image/lid = image(icon, src, "lid_[icon_state]")
overlays += lid
/obj/item/reagent_containers/glass/bottle/decompile_act(obj/item/matter_decompiler/C, mob/user)
diff --git a/code/modules/station_goals/bsa.dm b/code/modules/station_goals/bsa.dm
index 0a046c3dcff..cfb8a3367f8 100644
--- a/code/modules/station_goals/bsa.dm
+++ b/code/modules/station_goals/bsa.dm
@@ -28,7 +28,7 @@
return FALSE
/obj/machinery/bsa
- icon = 'icons/obj/machines/particle_accelerator3.dmi'
+ icon = 'icons/obj/machines/particle_accelerator.dmi'
density = 1
anchored = 1
@@ -260,7 +260,7 @@
var/target
use_power = NO_POWER_USE
circuit = /obj/item/circuitboard/computer/bsa_control
- icon = 'icons/obj/machines/particle_accelerator3.dmi'
+ icon = 'icons/obj/machines/particle_accelerator.dmi'
icon_state = "control_boxp"
var/icon_state_broken = "control_box"
var/icon_state_nopower = "control_boxw"
diff --git a/code/modules/unit_tests/_unit_tests.dm b/code/modules/unit_tests/_unit_tests.dm
index d929acd58ca..fb0878dee9c 100644
--- a/code/modules/unit_tests/_unit_tests.dm
+++ b/code/modules/unit_tests/_unit_tests.dm
@@ -12,6 +12,7 @@
#include "spawn_humans.dm"
#include "sql.dm"
#include "subsystem_init.dm"
+#include "subsystem_metric_sanity.dm"
#include "timer_sanity.dm"
#include "unit_test.dm"
#endif
diff --git a/code/modules/unit_tests/subsystem_metric_sanity.dm b/code/modules/unit_tests/subsystem_metric_sanity.dm
new file mode 100644
index 00000000000..ad5bb254a60
--- /dev/null
+++ b/code/modules/unit_tests/subsystem_metric_sanity.dm
@@ -0,0 +1,19 @@
+// Unit test to ensure SS metrics are valid
+/datum/unit_test/subsystem_metric_sanity/Run()
+ for(var/datum/controller/subsystem/SS in Master.subsystems)
+ var/list/data = SS.get_metrics()
+ if(length(data) != 3)
+ Fail("SS[SS.ss_id] has invalid metrics data!")
+ continue
+ if(isnull(data["cost"]))
+ Fail("SS[SS.ss_id] has invalid metrics data! No 'cost' found in [json_encode(data)]")
+ continue
+ if(isnull(data["tick_usage"]))
+ Fail("SS[SS.ss_id] has invalid metrics data! No 'tick_usage' found in [json_encode(data)]")
+ continue
+ if(isnull(data["custom"]))
+ Fail("SS[SS.ss_id] has invalid metrics data! No 'custom' found in [json_encode(data)]")
+ continue
+ if(!islist(data["custom"]))
+ Fail("SS[SS.ss_id] has invalid metrics data! 'custom' is not a list in [json_encode(data)]")
+ continue
diff --git a/code/modules/world_topic/queue_status.dm b/code/modules/world_topic/queue_status.dm
new file mode 100644
index 00000000000..02649e61fa8
--- /dev/null
+++ b/code/modules/world_topic/queue_status.dm
@@ -0,0 +1,36 @@
+/datum/world_topic_handler/queue_status
+ topic_key = "queue_status"
+ requires_commskey = TRUE
+
+// This topic is sent every 10 seconds from the bouncer
+/datum/world_topic_handler/queue_status/execute(list/input, key_valid)
+ var/ckey_check = input["ckey_check"]
+
+ if(!ckey_check)
+ return json_encode(list("error" = "No ckey supplied"))
+
+ var/list/output_data = list()
+ output_data["queue_enabled"] = SSqueue.queue_enabled
+
+ // Decide whether we should hold the player in queue
+ // NOTE: We only queue never seen before players
+ if(SSqueue.queue_enabled)
+ // If they are in the bypass list, let em in
+ if(ckey_check in SSqueue.queue_bypass_list)
+ output_data["allow_player"] = TRUE
+ else // Otherwise
+ // If we have more than the threshold, queue
+ if(length(GLOB.clients) > SSqueue.queue_threshold)
+ output_data["allow_player"] = FALSE
+ else // We have less than the threshold, allow if were in the timeframe
+ if(world.time > (SSqueue.last_letin_time + 3 SECONDS))
+ output_data["allow_player"] = TRUE
+ SSqueue.last_letin_time = world.time
+ else
+ output_data["allow_player"] = FALSE
+
+ else
+ // We arent enabled. Just let them in anyway.
+ output_data["allow_player"] = TRUE
+
+ return json_encode(output_data)
diff --git a/code/modules/world_topic/status.dm b/code/modules/world_topic/status.dm
index 4f964eeeb3b..8137cb7f10d 100644
--- a/code/modules/world_topic/status.dm
+++ b/code/modules/world_topic/status.dm
@@ -31,7 +31,8 @@
status_info["players"] = player_count
status_info["admins"] = admin_count
status_info["map_name"] = SSmapping.map_datum.fluff_name
-
+ status_info["round_id"] = GLOB.round_id
+
// Add more info if we are authed
if(key_valid)
if(SSticker && SSticker.mode)
diff --git a/config/example/config.toml b/config/example/config.toml
index 254f793221e..834a4915941 100644
--- a/config/example/config.toml
+++ b/config/example/config.toml
@@ -16,7 +16,6 @@
# - afk_configuration
# - custom_sprites_configuration
# - database_configuration
-# - debug_configuration
# - discord_configuration
# - event_configuration
# - gamemode_configuration
@@ -25,6 +24,8 @@
# - ipintel_configuration
# - job_configuration
# - logging_configuration
+# - mc_configuration
+# - metrics_configuration
# - movement_configuration
# - overflow_configuration
# - ruin_configuration
@@ -301,8 +302,6 @@ allow_character_metadata = true
lobby_time = 240
# Forbid people without a BYOND account joining the server
guest_ban = true
-# Player threshold before the automatic panic bunker engages
-panic_bunker_threshold = 150
# Allow players to use antagHUD?
allow_antag_hud = true
# Forbid players from rejoining if they use antag hud
@@ -518,6 +517,22 @@ enable_debug_logging = true
################################################################
+[metrics_configuration]
+# This section contains values for all metrics storing.
+# This is designed for ElasticSearch but you might be able to make it work with other things.
+# Metrics form a JSON body which is sent by POST to a HTTP/HTTPS endpoint with API key authentication
+
+# Do we want to enable metrics sending
+enable_metrics = false
+# Metrics endpoint. Include protocol, host and ingest path
+metrics_endpoint = "http://elastic-host:9200/your_index/_doc"
+# Metrics API token. Placed into the auth header
+metrics_api_token = "your_base64_encoded_thingy=="
+
+
+################################################################
+
+
[mc_configuration]
# This section is settings for the MC
# Dont change these unless you know what you are doing
diff --git a/icons/_nanomaps/MetaStation_nanomap_z1.png b/icons/_nanomaps/MetaStation_nanomap_z1.png
index 6732d365843..7cf1012817e 100644
Binary files a/icons/_nanomaps/MetaStation_nanomap_z1.png and b/icons/_nanomaps/MetaStation_nanomap_z1.png differ
diff --git a/icons/mob/back.dmi b/icons/mob/clothing/back.dmi
similarity index 100%
rename from icons/mob/back.dmi
rename to icons/mob/clothing/back.dmi
diff --git a/icons/mob/belt.dmi b/icons/mob/clothing/belt.dmi
similarity index 100%
rename from icons/mob/belt.dmi
rename to icons/mob/clothing/belt.dmi
diff --git a/icons/mob/belt_mirror.dmi b/icons/mob/clothing/belt_mirror.dmi
similarity index 100%
rename from icons/mob/belt_mirror.dmi
rename to icons/mob/clothing/belt_mirror.dmi
diff --git a/icons/mob/collar.dmi b/icons/mob/clothing/collar.dmi
similarity index 100%
rename from icons/mob/collar.dmi
rename to icons/mob/clothing/collar.dmi
diff --git a/icons/mob/ears.dmi b/icons/mob/clothing/ears.dmi
similarity index 100%
rename from icons/mob/ears.dmi
rename to icons/mob/clothing/ears.dmi
diff --git a/icons/mob/eyes.dmi b/icons/mob/clothing/eyes.dmi
similarity index 100%
rename from icons/mob/eyes.dmi
rename to icons/mob/clothing/eyes.dmi
diff --git a/icons/mob/feet.dmi b/icons/mob/clothing/feet.dmi
similarity index 100%
rename from icons/mob/feet.dmi
rename to icons/mob/clothing/feet.dmi
diff --git a/icons/mob/hands.dmi b/icons/mob/clothing/hands.dmi
similarity index 100%
rename from icons/mob/hands.dmi
rename to icons/mob/clothing/hands.dmi
diff --git a/icons/mob/head.dmi b/icons/mob/clothing/head.dmi
similarity index 100%
rename from icons/mob/head.dmi
rename to icons/mob/clothing/head.dmi
diff --git a/icons/mob/mask.dmi b/icons/mob/clothing/mask.dmi
similarity index 100%
rename from icons/mob/mask.dmi
rename to icons/mob/clothing/mask.dmi
diff --git a/icons/mob/species/armalis/back.dmi b/icons/mob/clothing/species/armalis/back.dmi
similarity index 100%
rename from icons/mob/species/armalis/back.dmi
rename to icons/mob/clothing/species/armalis/back.dmi
diff --git a/icons/mob/species/armalis/belt.dmi b/icons/mob/clothing/species/armalis/belt.dmi
similarity index 100%
rename from icons/mob/species/armalis/belt.dmi
rename to icons/mob/clothing/species/armalis/belt.dmi
diff --git a/icons/mob/species/armalis/ears.dmi b/icons/mob/clothing/species/armalis/ears.dmi
similarity index 100%
rename from icons/mob/species/armalis/ears.dmi
rename to icons/mob/clothing/species/armalis/ears.dmi
diff --git a/icons/mob/species/armalis/feet.dmi b/icons/mob/clothing/species/armalis/feet.dmi
similarity index 100%
rename from icons/mob/species/armalis/feet.dmi
rename to icons/mob/clothing/species/armalis/feet.dmi
diff --git a/icons/mob/species/armalis/gloves.dmi b/icons/mob/clothing/species/armalis/gloves.dmi
similarity index 100%
rename from icons/mob/species/armalis/gloves.dmi
rename to icons/mob/clothing/species/armalis/gloves.dmi
diff --git a/icons/mob/species/armalis/head.dmi b/icons/mob/clothing/species/armalis/head.dmi
similarity index 100%
rename from icons/mob/species/armalis/head.dmi
rename to icons/mob/clothing/species/armalis/head.dmi
diff --git a/icons/mob/species/armalis/held.dmi b/icons/mob/clothing/species/armalis/held.dmi
similarity index 100%
rename from icons/mob/species/armalis/held.dmi
rename to icons/mob/clothing/species/armalis/held.dmi
diff --git a/icons/mob/species/armalis/mask.dmi b/icons/mob/clothing/species/armalis/mask.dmi
similarity index 100%
rename from icons/mob/species/armalis/mask.dmi
rename to icons/mob/clothing/species/armalis/mask.dmi
diff --git a/icons/mob/species/armalis/suit.dmi b/icons/mob/clothing/species/armalis/suit.dmi
similarity index 100%
rename from icons/mob/species/armalis/suit.dmi
rename to icons/mob/clothing/species/armalis/suit.dmi
diff --git a/icons/mob/species/drask/eyes.dmi b/icons/mob/clothing/species/drask/eyes.dmi
similarity index 100%
rename from icons/mob/species/drask/eyes.dmi
rename to icons/mob/clothing/species/drask/eyes.dmi
diff --git a/icons/mob/species/drask/gloves.dmi b/icons/mob/clothing/species/drask/gloves.dmi
similarity index 100%
rename from icons/mob/species/drask/gloves.dmi
rename to icons/mob/clothing/species/drask/gloves.dmi
diff --git a/icons/mob/species/drask/gloves1.dmi b/icons/mob/clothing/species/drask/gloves1.dmi
similarity index 100%
rename from icons/mob/species/drask/gloves1.dmi
rename to icons/mob/clothing/species/drask/gloves1.dmi
diff --git a/icons/mob/species/drask/head.dmi b/icons/mob/clothing/species/drask/head.dmi
similarity index 100%
rename from icons/mob/species/drask/head.dmi
rename to icons/mob/clothing/species/drask/head.dmi
diff --git a/icons/mob/species/drask/helmet.dmi b/icons/mob/clothing/species/drask/helmet.dmi
similarity index 100%
rename from icons/mob/species/drask/helmet.dmi
rename to icons/mob/clothing/species/drask/helmet.dmi
diff --git a/icons/mob/species/drask/mask.dmi b/icons/mob/clothing/species/drask/mask.dmi
similarity index 100%
rename from icons/mob/species/drask/mask.dmi
rename to icons/mob/clothing/species/drask/mask.dmi
diff --git a/icons/mob/species/drask/shoes.dmi b/icons/mob/clothing/species/drask/shoes.dmi
similarity index 100%
rename from icons/mob/species/drask/shoes.dmi
rename to icons/mob/clothing/species/drask/shoes.dmi
diff --git a/icons/mob/species/drask/suit.dmi b/icons/mob/clothing/species/drask/suit.dmi
similarity index 100%
rename from icons/mob/species/drask/suit.dmi
rename to icons/mob/clothing/species/drask/suit.dmi
diff --git a/icons/mob/species/drask/uniform.dmi b/icons/mob/clothing/species/drask/uniform.dmi
similarity index 100%
rename from icons/mob/species/drask/uniform.dmi
rename to icons/mob/clothing/species/drask/uniform.dmi
diff --git a/icons/mob/species/grey/back.dmi b/icons/mob/clothing/species/grey/back.dmi
similarity index 100%
rename from icons/mob/species/grey/back.dmi
rename to icons/mob/clothing/species/grey/back.dmi
diff --git a/icons/mob/species/grey/eyes.dmi b/icons/mob/clothing/species/grey/eyes.dmi
similarity index 100%
rename from icons/mob/species/grey/eyes.dmi
rename to icons/mob/clothing/species/grey/eyes.dmi
diff --git a/icons/mob/species/grey/head.dmi b/icons/mob/clothing/species/grey/head.dmi
similarity index 100%
rename from icons/mob/species/grey/head.dmi
rename to icons/mob/clothing/species/grey/head.dmi
diff --git a/icons/mob/species/grey/helmet.dmi b/icons/mob/clothing/species/grey/helmet.dmi
similarity index 100%
rename from icons/mob/species/grey/helmet.dmi
rename to icons/mob/clothing/species/grey/helmet.dmi
diff --git a/icons/mob/species/grey/mask.dmi b/icons/mob/clothing/species/grey/mask.dmi
similarity index 100%
rename from icons/mob/species/grey/mask.dmi
rename to icons/mob/clothing/species/grey/mask.dmi
diff --git a/icons/mob/species/grey/suit.dmi b/icons/mob/clothing/species/grey/suit.dmi
similarity index 100%
rename from icons/mob/species/grey/suit.dmi
rename to icons/mob/clothing/species/grey/suit.dmi
diff --git a/icons/mob/species/grey/underwear.dmi b/icons/mob/clothing/species/grey/underwear.dmi
similarity index 100%
rename from icons/mob/species/grey/underwear.dmi
rename to icons/mob/clothing/species/grey/underwear.dmi
diff --git a/icons/mob/species/grey/uniform.dmi b/icons/mob/clothing/species/grey/uniform.dmi
similarity index 100%
rename from icons/mob/species/grey/uniform.dmi
rename to icons/mob/clothing/species/grey/uniform.dmi
diff --git a/icons/mob/species/kidan/head.dmi b/icons/mob/clothing/species/kidan/head.dmi
similarity index 100%
rename from icons/mob/species/kidan/head.dmi
rename to icons/mob/clothing/species/kidan/head.dmi
diff --git a/icons/mob/species/plasmaman/helmet.dmi b/icons/mob/clothing/species/plasmaman/helmet.dmi
similarity index 100%
rename from icons/mob/species/plasmaman/helmet.dmi
rename to icons/mob/clothing/species/plasmaman/helmet.dmi
diff --git a/icons/mob/species/plasmaman/mask.dmi b/icons/mob/clothing/species/plasmaman/mask.dmi
similarity index 100%
rename from icons/mob/species/plasmaman/mask.dmi
rename to icons/mob/clothing/species/plasmaman/mask.dmi
diff --git a/icons/mob/species/plasmaman/uniform.dmi b/icons/mob/clothing/species/plasmaman/uniform.dmi
similarity index 100%
rename from icons/mob/species/plasmaman/uniform.dmi
rename to icons/mob/clothing/species/plasmaman/uniform.dmi
diff --git a/icons/mob/species/skrell/head.dmi b/icons/mob/clothing/species/skrell/head.dmi
similarity index 100%
rename from icons/mob/species/skrell/head.dmi
rename to icons/mob/clothing/species/skrell/head.dmi
diff --git a/icons/mob/species/skrell/held.dmi b/icons/mob/clothing/species/skrell/held.dmi
similarity index 100%
rename from icons/mob/species/skrell/held.dmi
rename to icons/mob/clothing/species/skrell/held.dmi
diff --git a/icons/mob/species/skrell/helmet.dmi b/icons/mob/clothing/species/skrell/helmet.dmi
similarity index 100%
rename from icons/mob/species/skrell/helmet.dmi
rename to icons/mob/clothing/species/skrell/helmet.dmi
diff --git a/icons/mob/species/skrell/suit.dmi b/icons/mob/clothing/species/skrell/suit.dmi
similarity index 100%
rename from icons/mob/species/skrell/suit.dmi
rename to icons/mob/clothing/species/skrell/suit.dmi
diff --git a/icons/mob/species/tajaran/head.dmi b/icons/mob/clothing/species/tajaran/head.dmi
similarity index 100%
rename from icons/mob/species/tajaran/head.dmi
rename to icons/mob/clothing/species/tajaran/head.dmi
diff --git a/icons/mob/species/tajaran/helmet.dmi b/icons/mob/clothing/species/tajaran/helmet.dmi
similarity index 100%
rename from icons/mob/species/tajaran/helmet.dmi
rename to icons/mob/clothing/species/tajaran/helmet.dmi
diff --git a/icons/mob/species/tajaran/mask.dmi b/icons/mob/clothing/species/tajaran/mask.dmi
similarity index 100%
rename from icons/mob/species/tajaran/mask.dmi
rename to icons/mob/clothing/species/tajaran/mask.dmi
diff --git a/icons/mob/species/tajaran/suit.dmi b/icons/mob/clothing/species/tajaran/suit.dmi
similarity index 100%
rename from icons/mob/species/tajaran/suit.dmi
rename to icons/mob/clothing/species/tajaran/suit.dmi
diff --git a/icons/mob/species/unathi/feet.dmi b/icons/mob/clothing/species/unathi/feet.dmi
similarity index 100%
rename from icons/mob/species/unathi/feet.dmi
rename to icons/mob/clothing/species/unathi/feet.dmi
diff --git a/icons/mob/species/unathi/gloves.dmi b/icons/mob/clothing/species/unathi/gloves.dmi
similarity index 100%
rename from icons/mob/species/unathi/gloves.dmi
rename to icons/mob/clothing/species/unathi/gloves.dmi
diff --git a/icons/mob/species/unathi/head.dmi b/icons/mob/clothing/species/unathi/head.dmi
similarity index 100%
rename from icons/mob/species/unathi/head.dmi
rename to icons/mob/clothing/species/unathi/head.dmi
diff --git a/icons/mob/species/unathi/helmet.dmi b/icons/mob/clothing/species/unathi/helmet.dmi
similarity index 100%
rename from icons/mob/species/unathi/helmet.dmi
rename to icons/mob/clothing/species/unathi/helmet.dmi
diff --git a/icons/mob/species/unathi/mask.dmi b/icons/mob/clothing/species/unathi/mask.dmi
similarity index 100%
rename from icons/mob/species/unathi/mask.dmi
rename to icons/mob/clothing/species/unathi/mask.dmi
diff --git a/icons/mob/species/unathi/suit.dmi b/icons/mob/clothing/species/unathi/suit.dmi
similarity index 100%
rename from icons/mob/species/unathi/suit.dmi
rename to icons/mob/clothing/species/unathi/suit.dmi
diff --git a/icons/mob/species/vox/back.dmi b/icons/mob/clothing/species/vox/back.dmi
similarity index 100%
rename from icons/mob/species/vox/back.dmi
rename to icons/mob/clothing/species/vox/back.dmi
diff --git a/icons/mob/species/vox/collar.dmi b/icons/mob/clothing/species/vox/collar.dmi
similarity index 100%
rename from icons/mob/species/vox/collar.dmi
rename to icons/mob/clothing/species/vox/collar.dmi
diff --git a/icons/mob/species/vox/ears.dmi b/icons/mob/clothing/species/vox/ears.dmi
similarity index 100%
rename from icons/mob/species/vox/ears.dmi
rename to icons/mob/clothing/species/vox/ears.dmi
diff --git a/icons/mob/species/vox/eyes.dmi b/icons/mob/clothing/species/vox/eyes.dmi
similarity index 100%
rename from icons/mob/species/vox/eyes.dmi
rename to icons/mob/clothing/species/vox/eyes.dmi
diff --git a/icons/mob/species/vox/feet.dmi b/icons/mob/clothing/species/vox/feet.dmi
similarity index 100%
rename from icons/mob/species/vox/feet.dmi
rename to icons/mob/clothing/species/vox/feet.dmi
diff --git a/icons/mob/species/vox/gloves.dmi b/icons/mob/clothing/species/vox/gloves.dmi
similarity index 100%
rename from icons/mob/species/vox/gloves.dmi
rename to icons/mob/clothing/species/vox/gloves.dmi
diff --git a/icons/mob/species/vox/head.dmi b/icons/mob/clothing/species/vox/head.dmi
similarity index 100%
rename from icons/mob/species/vox/head.dmi
rename to icons/mob/clothing/species/vox/head.dmi
diff --git a/icons/mob/species/vox/helmet.dmi b/icons/mob/clothing/species/vox/helmet.dmi
similarity index 100%
rename from icons/mob/species/vox/helmet.dmi
rename to icons/mob/clothing/species/vox/helmet.dmi
diff --git a/icons/mob/species/vox/mask.dmi b/icons/mob/clothing/species/vox/mask.dmi
similarity index 100%
rename from icons/mob/species/vox/mask.dmi
rename to icons/mob/clothing/species/vox/mask.dmi
diff --git a/icons/mob/species/vox/shoes.dmi b/icons/mob/clothing/species/vox/shoes.dmi
similarity index 100%
rename from icons/mob/species/vox/shoes.dmi
rename to icons/mob/clothing/species/vox/shoes.dmi
diff --git a/icons/mob/species/vox/suit.dmi b/icons/mob/clothing/species/vox/suit.dmi
similarity index 100%
rename from icons/mob/species/vox/suit.dmi
rename to icons/mob/clothing/species/vox/suit.dmi
diff --git a/icons/mob/species/vox/underwear.dmi b/icons/mob/clothing/species/vox/underwear.dmi
similarity index 100%
rename from icons/mob/species/vox/underwear.dmi
rename to icons/mob/clothing/species/vox/underwear.dmi
diff --git a/icons/mob/species/vox/uniform.dmi b/icons/mob/clothing/species/vox/uniform.dmi
similarity index 100%
rename from icons/mob/species/vox/uniform.dmi
rename to icons/mob/clothing/species/vox/uniform.dmi
diff --git a/icons/mob/species/vulpkanin/head.dmi b/icons/mob/clothing/species/vulpkanin/head.dmi
similarity index 100%
rename from icons/mob/species/vulpkanin/head.dmi
rename to icons/mob/clothing/species/vulpkanin/head.dmi
diff --git a/icons/mob/species/vulpkanin/helmet.dmi b/icons/mob/clothing/species/vulpkanin/helmet.dmi
similarity index 100%
rename from icons/mob/species/vulpkanin/helmet.dmi
rename to icons/mob/clothing/species/vulpkanin/helmet.dmi
diff --git a/icons/mob/species/vulpkanin/mask.dmi b/icons/mob/clothing/species/vulpkanin/mask.dmi
similarity index 100%
rename from icons/mob/species/vulpkanin/mask.dmi
rename to icons/mob/clothing/species/vulpkanin/mask.dmi
diff --git a/icons/mob/species/vulpkanin/suit.dmi b/icons/mob/clothing/species/vulpkanin/suit.dmi
similarity index 100%
rename from icons/mob/species/vulpkanin/suit.dmi
rename to icons/mob/clothing/species/vulpkanin/suit.dmi
diff --git a/icons/mob/suit.dmi b/icons/mob/clothing/suit.dmi
similarity index 100%
rename from icons/mob/suit.dmi
rename to icons/mob/clothing/suit.dmi
diff --git a/icons/mob/underwear.dmi b/icons/mob/clothing/underwear.dmi
similarity index 100%
rename from icons/mob/underwear.dmi
rename to icons/mob/clothing/underwear.dmi
diff --git a/icons/mob/uniform.dmi b/icons/mob/clothing/uniform.dmi
similarity index 100%
rename from icons/mob/uniform.dmi
rename to icons/mob/clothing/uniform.dmi
diff --git a/icons/mob/inhands/items_lefthand.dmi b/icons/mob/inhands/items_lefthand.dmi
index 78506ad1890..a0b551e83bd 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 7e574384d62..39636bd7bab 100644
Binary files a/icons/mob/inhands/items_righthand.dmi and b/icons/mob/inhands/items_righthand.dmi differ
diff --git a/icons/obj/aicards.dmi b/icons/obj/aicards.dmi
index 3a9e773a00c..177e72ad4bc 100644
Binary files a/icons/obj/aicards.dmi and b/icons/obj/aicards.dmi differ
diff --git a/icons/obj/airlock_machines.dmi b/icons/obj/airlock_machines.dmi
index 80821813cbc..4bb40dde0ad 100644
Binary files a/icons/obj/airlock_machines.dmi and b/icons/obj/airlock_machines.dmi differ
diff --git a/icons/obj/ammo.dmi b/icons/obj/ammo.dmi
index b1303637768..6c090bdc386 100644
Binary files a/icons/obj/ammo.dmi and b/icons/obj/ammo.dmi differ
diff --git a/icons/obj/apc_repair.dmi b/icons/obj/apc_repair.dmi
index 4aadcd2ebdc..9e494902ba4 100644
Binary files a/icons/obj/apc_repair.dmi and b/icons/obj/apc_repair.dmi differ
diff --git a/icons/obj/biogenerator.dmi b/icons/obj/biogenerator.dmi
index 02cf868a31f..7989d6f355f 100644
Binary files a/icons/obj/biogenerator.dmi and b/icons/obj/biogenerator.dmi differ
diff --git a/icons/obj/bodybag.dmi b/icons/obj/bodybag.dmi
index 945ded53552..3cdeff4d342 100644
Binary files a/icons/obj/bodybag.dmi and b/icons/obj/bodybag.dmi differ
diff --git a/icons/obj/bureaucracy.dmi b/icons/obj/bureaucracy.dmi
index cb29615d4c9..c708ef12d0a 100644
Binary files a/icons/obj/bureaucracy.dmi and b/icons/obj/bureaucracy.dmi differ
diff --git a/icons/obj/chairs.dmi b/icons/obj/chairs.dmi
index dba239a064f..7486f0e9859 100644
Binary files a/icons/obj/chairs.dmi and b/icons/obj/chairs.dmi differ
diff --git a/icons/obj/chemical.dmi b/icons/obj/chemical.dmi
index 17101426105..2b898e3462f 100644
Binary files a/icons/obj/chemical.dmi and b/icons/obj/chemical.dmi differ
diff --git a/icons/obj/computer.dmi b/icons/obj/computer.dmi
index 042b5fe7f38..dcfe0a20810 100644
Binary files a/icons/obj/computer.dmi and b/icons/obj/computer.dmi differ
diff --git a/icons/obj/computer3.dmi b/icons/obj/computer3.dmi
deleted file mode 100644
index 30705076d62..00000000000
Binary files a/icons/obj/computer3.dmi and /dev/null differ
diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi
index fb7c28c3f6d..02b2cff8a8d 100644
Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ
diff --git a/icons/obj/food/custom.dmi b/icons/obj/food/custom.dmi
index 42d28790790..fba3b4e6e68 100644
Binary files a/icons/obj/food/custom.dmi and b/icons/obj/food/custom.dmi differ
diff --git a/icons/obj/food/food.dmi b/icons/obj/food/food.dmi
index dbbfeeb5db0..3cb9250df9e 100644
Binary files a/icons/obj/food/food.dmi and b/icons/obj/food/food.dmi differ
diff --git a/icons/obj/hydroponics/equipment.dmi b/icons/obj/hydroponics/equipment.dmi
index 3cb9e63cb38..fdb7ec1d0a7 100644
Binary files a/icons/obj/hydroponics/equipment.dmi and b/icons/obj/hydroponics/equipment.dmi differ
diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi
index 23c3dcd676c..d00d1d4fb94 100644
Binary files a/icons/obj/items.dmi and b/icons/obj/items.dmi differ
diff --git a/icons/obj/janitor.dmi b/icons/obj/janitor.dmi
index ebc1cca56da..e2a1f7cfae2 100644
Binary files a/icons/obj/janitor.dmi and b/icons/obj/janitor.dmi differ
diff --git a/icons/obj/kitchen.dmi b/icons/obj/kitchen.dmi
index 9f83289c81b..0d13c90cd15 100644
Binary files a/icons/obj/kitchen.dmi and b/icons/obj/kitchen.dmi differ
diff --git a/icons/obj/library.dmi b/icons/obj/library.dmi
index dc12bb7dd67..ce0beb1b201 100644
Binary files a/icons/obj/library.dmi and b/icons/obj/library.dmi differ
diff --git a/icons/obj/lighting.dmi b/icons/obj/lighting.dmi
index 4886978ff48..7487c376774 100644
Binary files a/icons/obj/lighting.dmi and b/icons/obj/lighting.dmi differ
diff --git a/icons/obj/machines/HONKputer.dmi b/icons/obj/machines/HONKputer.dmi
deleted file mode 100644
index 921f6cf219f..00000000000
Binary files a/icons/obj/machines/HONKputer.dmi and /dev/null differ
diff --git a/icons/obj/machines/am_engine.dmi b/icons/obj/machines/am_engine.dmi
deleted file mode 100644
index 9d32bb0d406..00000000000
Binary files a/icons/obj/machines/am_engine.dmi and /dev/null differ
diff --git a/icons/obj/machines/antenna.dmi b/icons/obj/machines/antenna.dmi
deleted file mode 100644
index 5bf1e318a7c..00000000000
Binary files a/icons/obj/machines/antenna.dmi and /dev/null differ
diff --git a/icons/obj/machines/antimatter.dmi b/icons/obj/machines/antimatter.dmi
deleted file mode 100644
index a4be203e1a3..00000000000
Binary files a/icons/obj/machines/antimatter.dmi and /dev/null differ
diff --git a/icons/obj/machines/broadcast.dmi b/icons/obj/machines/broadcast.dmi
deleted file mode 100644
index c2c7ba0f61f..00000000000
Binary files a/icons/obj/machines/broadcast.dmi and /dev/null differ
diff --git a/icons/obj/machines/fiber.dmi b/icons/obj/machines/fiber.dmi
deleted file mode 100644
index c75fd6482ea..00000000000
Binary files a/icons/obj/machines/fiber.dmi and /dev/null differ
diff --git a/icons/obj/machines/heavy_fiber.dmi b/icons/obj/machines/heavy_fiber.dmi
deleted file mode 100644
index 8bd8d0747d1..00000000000
Binary files a/icons/obj/machines/heavy_fiber.dmi and /dev/null differ
diff --git a/icons/obj/machines/lasers.dmi b/icons/obj/machines/lasers.dmi
deleted file mode 100644
index 1925fb40860..00000000000
Binary files a/icons/obj/machines/lasers.dmi and /dev/null differ
diff --git a/icons/obj/machines/mining_machines.dmi b/icons/obj/machines/mining_machines.dmi
index 83c12986772..d6fc1afd716 100644
Binary files a/icons/obj/machines/mining_machines.dmi and b/icons/obj/machines/mining_machines.dmi differ
diff --git a/icons/obj/machines/netcable.dmi b/icons/obj/machines/netcable.dmi
deleted file mode 100644
index 5e2bc3208b4..00000000000
Binary files a/icons/obj/machines/netcable.dmi and /dev/null differ
diff --git a/icons/obj/machines/netobjs.dmi b/icons/obj/machines/netobjs.dmi
deleted file mode 100644
index f13172260ca..00000000000
Binary files a/icons/obj/machines/netobjs.dmi and /dev/null differ
diff --git a/icons/obj/machines/particle_accelerator.dmi b/icons/obj/machines/particle_accelerator.dmi
index f8455d80b49..31e1b92eaf6 100644
Binary files a/icons/obj/machines/particle_accelerator.dmi and b/icons/obj/machines/particle_accelerator.dmi differ
diff --git a/icons/obj/machines/particle_accelerator2.dmi b/icons/obj/machines/particle_accelerator2.dmi
deleted file mode 100644
index d0263af5ad9..00000000000
Binary files a/icons/obj/machines/particle_accelerator2.dmi and /dev/null differ
diff --git a/icons/obj/machines/particle_accelerator3.dmi b/icons/obj/machines/particle_accelerator3.dmi
deleted file mode 100644
index c601b8d1b6a..00000000000
Binary files a/icons/obj/machines/particle_accelerator3.dmi and /dev/null differ
diff --git a/icons/obj/machines/washing_machine.dmi b/icons/obj/machines/washing_machine.dmi
index ef80dac0d8a..e3fae0828ab 100644
Binary files a/icons/obj/machines/washing_machine.dmi and b/icons/obj/machines/washing_machine.dmi differ
diff --git a/icons/obj/mainframe.dmi b/icons/obj/mainframe.dmi
deleted file mode 100644
index e534206fa00..00000000000
Binary files a/icons/obj/mainframe.dmi and /dev/null differ
diff --git a/icons/obj/nuke_tools.dmi b/icons/obj/nuke_tools.dmi
index 1e06f1f89ea..71410e95039 100644
Binary files a/icons/obj/nuke_tools.dmi and b/icons/obj/nuke_tools.dmi differ
diff --git a/icons/obj/objects.dmi b/icons/obj/objects.dmi
index f9cb6e9ae6c..dbd0abdac97 100644
Binary files a/icons/obj/objects.dmi and b/icons/obj/objects.dmi differ
diff --git a/icons/obj/pda.dmi b/icons/obj/pda.dmi
index 5cf13a408d5..6d9d83e4fca 100644
Binary files a/icons/obj/pda.dmi and b/icons/obj/pda.dmi differ
diff --git a/icons/obj/power.dmi b/icons/obj/power.dmi
index d4e21d7e6c8..0a77587a252 100644
Binary files a/icons/obj/power.dmi and b/icons/obj/power.dmi differ
diff --git a/icons/obj/reagentfillings.dmi b/icons/obj/reagentfillings.dmi
index c36fbf01876..9cf1c37fb50 100644
Binary files a/icons/obj/reagentfillings.dmi and b/icons/obj/reagentfillings.dmi differ
diff --git a/icons/obj/stationobjs.dmi b/icons/obj/stationobjs.dmi
index 34288086aa4..4d9983203a2 100755
Binary files a/icons/obj/stationobjs.dmi and b/icons/obj/stationobjs.dmi differ
diff --git a/icons/obj/stock_parts.dmi b/icons/obj/stock_parts.dmi
index 38ddb183e97..8eed649cb05 100644
Binary files a/icons/obj/stock_parts.dmi and b/icons/obj/stock_parts.dmi differ
diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi
index b75eae77d79..45adf5cc6e9 100644
Binary files a/icons/obj/storage.dmi and b/icons/obj/storage.dmi differ
diff --git a/icons/obj/vending.dmi b/icons/obj/vending.dmi
index 1d54a9b94a3..6f4107c1911 100755
Binary files a/icons/obj/vending.dmi and b/icons/obj/vending.dmi differ
diff --git a/icons/obj/walllocker.dmi b/icons/obj/walllocker.dmi
index 4c9389ec1aa..3eb10b14406 100644
Binary files a/icons/obj/walllocker.dmi and b/icons/obj/walllocker.dmi differ
diff --git a/icons/obj/watercloset.dmi b/icons/obj/watercloset.dmi
index baa04328498..4f0e1f8156e 100644
Binary files a/icons/obj/watercloset.dmi and b/icons/obj/watercloset.dmi differ
diff --git a/paradise.dme b/paradise.dme
index 11176b1befe..b6861bb6feb 100644
--- a/paradise.dme
+++ b/paradise.dme
@@ -200,6 +200,7 @@
#include "code\controllers\configuration\sections\job_configuration.dm"
#include "code\controllers\configuration\sections\logging_configuration.dm"
#include "code\controllers\configuration\sections\mc_configuration.dm"
+#include "code\controllers\configuration\sections\metrics_configuration.dm"
#include "code\controllers\configuration\sections\movement_configuration.dm"
#include "code\controllers\configuration\sections\overflow_configuration.dm"
#include "code\controllers\configuration\sections\ruin_configuration.dm"
@@ -235,6 +236,7 @@
#include "code\controllers\subsystem\machinery.dm"
#include "code\controllers\subsystem\mapping.dm"
#include "code\controllers\subsystem\medals.dm"
+#include "code\controllers\subsystem\metrics.dm"
#include "code\controllers\subsystem\mobs.dm"
#include "code\controllers\subsystem\nano_mob_hunter.dm"
#include "code\controllers\subsystem\nightshift.dm"
@@ -246,6 +248,7 @@
#include "code\controllers\subsystem\radiation.dm"
#include "code\controllers\subsystem\radio.dm"
#include "code\controllers\subsystem\runechat.dm"
+#include "code\controllers\subsystem\server_queue.dm"
#include "code\controllers\subsystem\shuttles.dm"
#include "code\controllers\subsystem\sounds.dm"
#include "code\controllers\subsystem\spacedrift.dm"
@@ -1203,6 +1206,7 @@
#include "code\modules\admin\verbs\gimmick_team.dm"
#include "code\modules\admin\verbs\infiltratorteam_syndicate.dm"
#include "code\modules\admin\verbs\logging_view.dm"
+#include "code\modules\admin\verbs\manage_queue.dm"
#include "code\modules\admin\verbs\map_template_loadverb.dm"
#include "code\modules\admin\verbs\mapping.dm"
#include "code\modules\admin\verbs\massmodvar.dm"
@@ -2508,6 +2512,7 @@
#include "code\modules\world_topic\manifest.dm"
#include "code\modules\world_topic\ping.dm"
#include "code\modules\world_topic\players.dm"
+#include "code\modules\world_topic\queue_status.dm"
#include "code\modules\world_topic\status.dm"
#include "goon\code\datums\browserOutput.dm"
#include "interface\interface.dm"
diff --git a/sound/machines/light_on.ogg b/sound/machines/light_on.ogg
new file mode 100644
index 00000000000..2442739a040
Binary files /dev/null and b/sound/machines/light_on.ogg differ
diff --git a/sound/machines/lightswitch.ogg b/sound/machines/lightswitch.ogg
new file mode 100644
index 00000000000..e91a6c3030c
Binary files /dev/null and b/sound/machines/lightswitch.ogg differ