diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm
index 55ed3e72ff..820ffd0be4 100644
--- a/_maps/map_files/BoxStation/BoxStation.dmm
+++ b/_maps/map_files/BoxStation/BoxStation.dmm
@@ -3,44 +3,17 @@
/turf/open/space/basic,
/area/space)
"aab" = (
-/obj/machinery/firealarm{
- dir = 4;
- pixel_x = 24
- },
-/obj/structure/table,
-/obj/machinery/chem_dispenser/drinks/beer{
- dir = 8
- },
-/obj/item/radio/intercom{
- pixel_y = 25
- },
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
+/obj/effect/turf_decal/stripes/line{
dir = 1
},
-/turf/open/floor/plasteel,
-/area/crew_quarters/bar)
+/turf/open/floor/plating,
+/area/space/nearstation)
"aac" = (
-/obj/machinery/requests_console{
- department = "Bar";
- departmentType = 2;
- pixel_x = 30;
- receive_ore_updates = 1
+/obj/effect/turf_decal/stripes/line{
+ dir = 5
},
-/obj/machinery/camera{
- c_tag = "Bar";
- dir = 8
- },
-/obj/structure/table,
-/obj/machinery/chem_dispenser/drinks{
- dir = 8
- },
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
- dir = 1
- },
-/turf/open/floor/plasteel,
-/area/crew_quarters/bar)
+/turf/open/floor/plating,
+/area/space/nearstation)
"aad" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -113,40 +86,30 @@
"aan" = (
/obj/machinery/hydroponics/soil,
/obj/item/seeds/ambrosia,
-/obj/effect/turf_decal/tile/green{
- dir = 1
+/obj/machinery/newscaster{
+ pixel_y = 32
},
-/obj/effect/turf_decal/tile/green{
- dir = 4
- },
-/obj/effect/turf_decal/tile/green{
- dir = 8
- },
-/turf/open/floor/plasteel,
+/turf/open/floor/grass,
/area/security/prison)
"aao" = (
-/obj/machinery/airalarm{
- pixel_y = 23
- },
-/turf/open/floor/plating,
+/obj/machinery/hydroponics/soil,
+/obj/item/seeds/carrot,
+/turf/open/floor/grass,
/area/security/prison)
"aap" = (
/obj/machinery/hydroponics/soil,
-/obj/item/seeds/carrot,
-/obj/effect/turf_decal/tile/green{
- dir = 1
- },
-/obj/effect/turf_decal/tile/green{
- dir = 4
- },
-/turf/open/floor/plasteel,
-/area/security/prison)
-"aaq" = (
+/obj/item/plant_analyzer,
/obj/structure/sign/warning/electricshock{
pixel_y = 32
},
+/turf/open/floor/grass,
+/area/security/prison)
+"aaq" = (
/obj/machinery/hydroponics/soil,
-/obj/item/plant_analyzer,
+/obj/item/seeds/glowshroom,
+/turf/open/floor/grass,
+/area/security/prison)
+"aar" = (
/obj/machinery/camera{
c_tag = "Prison Common Room";
network = list("ss13","prison")
@@ -158,24 +121,20 @@
/obj/effect/turf_decal/tile/green{
dir = 4
},
-/turf/open/floor/plasteel,
-/area/security/prison)
-"aar" = (
-/obj/machinery/hydroponics/soil,
-/obj/item/seeds/glowshroom,
/obj/effect/turf_decal/tile/green{
- dir = 1
+ dir = 8
},
-/obj/effect/turf_decal/tile/green{
- dir = 4
+/obj/structure/sink{
+ pixel_y = 20
},
/turf/open/floor/plasteel,
/area/security/prison)
"aas" = (
-/obj/structure/sink{
- pixel_y = 20
+/obj/structure/sign/warning/electricshock{
+ pixel_y = 32
},
-/turf/open/floor/plating,
+/obj/machinery/seed_extractor,
+/turf/open/floor/plasteel,
/area/security/prison)
"aat" = (
/turf/open/floor/plasteel,
@@ -194,78 +153,64 @@
/obj/machinery/light{
dir = 8
},
-/turf/open/floor/plating,
+/turf/open/floor/grass,
/area/security/prison)
"aax" = (
-/mob/living/simple_animal/mouse/brown/Tom,
-/turf/open/floor/plating,
+/turf/open/floor/grass,
/area/security/prison)
"aay" = (
/turf/open/floor/plating,
/area/security/prison)
"aaz" = (
/obj/item/reagent_containers/glass/bucket,
-/turf/open/floor/plating,
+/turf/open/floor/grass,
/area/security/prison)
"aaA" = (
-/obj/machinery/seed_extractor,
+/obj/machinery/vr_sleeper{
+ dir = 8
+ },
/turf/open/floor/plasteel,
/area/security/prison)
"aaB" = (
-/obj/structure/window/reinforced,
-/obj/machinery/hydroponics/soil,
-/obj/item/seeds/potato,
+/mob/living/simple_animal/mouse/brown/Tom,
+/turf/open/floor/grass,
+/area/security/prison)
+"aaC" = (
+/obj/effect/turf_decal/tile/green{
+ dir = 8
+ },
/obj/effect/turf_decal/tile/green{
dir = 1
},
/obj/effect/turf_decal/tile/green,
/obj/effect/turf_decal/tile/green{
- dir = 8
+ dir = 4
},
/turf/open/floor/plasteel,
/area/security/prison)
-"aaC" = (
-/obj/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/security/prison)
"aaD" = (
/obj/structure/window/reinforced,
/obj/machinery/hydroponics/soil,
-/obj/item/seeds/grass,
-/obj/effect/turf_decal/tile/green,
-/obj/effect/turf_decal/tile/green{
- dir = 8
- },
-/turf/open/floor/plasteel,
+/obj/item/seeds/potato,
+/turf/open/floor/grass,
/area/security/prison)
"aaE" = (
/obj/structure/window/reinforced,
/obj/machinery/hydroponics/soil,
-/obj/item/cultivator,
-/obj/effect/turf_decal/tile/green,
-/obj/effect/turf_decal/tile/green{
- dir = 4
- },
-/obj/effect/turf_decal/tile/green{
- dir = 8
- },
-/turf/open/floor/plasteel,
+/obj/item/seeds/grass,
+/turf/open/floor/grass,
/area/security/prison)
"aaF" = (
-/obj/structure/window/reinforced,
/obj/machinery/hydroponics/soil,
-/obj/item/cultivator,
-/obj/effect/turf_decal/tile/green,
-/obj/effect/turf_decal/tile/green{
- dir = 8
- },
-/turf/open/floor/plasteel,
+/obj/structure/window/reinforced,
+/obj/item/seeds/tower,
+/turf/open/floor/grass,
/area/security/prison)
"aaG" = (
/obj/machinery/light{
dir = 4
},
-/obj/machinery/cryopod{
+/obj/machinery/vr_sleeper{
dir = 8
},
/turf/open/floor/plasteel,
@@ -281,78 +226,49 @@
/obj/structure/chair/stool,
/turf/open/floor/plasteel,
/area/security/prison)
-"aaK" = (
-/obj/machinery/washing_machine,
-/obj/structure/window/reinforced{
- dir = 1
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/turf/open/floor/plasteel/cafeteria,
-/area/security/prison)
"aaL" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/structure/window/reinforced{
- dir = 1
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/turf/open/floor/plasteel/cafeteria,
-/area/security/prison)
-"aaM" = (
/obj/machinery/computer/libraryconsole/bookmanagement,
/obj/structure/table,
-/obj/machinery/newscaster{
- pixel_x = -32
- },
/turf/open/floor/plasteel,
/area/security/prison)
+"aaM" = (
+/obj/structure/falsewall,
+/turf/open/floor/plating,
+/area/security/prison)
"aaN" = (
-/obj/structure/table,
-/obj/item/pen,
-/turf/open/floor/plasteel,
+/obj/structure/window/reinforced,
+/obj/machinery/hydroponics/soil,
+/obj/item/cultivator,
+/turf/open/floor/grass,
/area/security/prison)
"aaO" = (
-/obj/structure/table,
-/obj/item/storage/pill_bottle/dice,
+/obj/effect/turf_decal/tile/green,
+/obj/effect/turf_decal/tile/green{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/green{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/green{
+ dir = 1
+ },
/turf/open/floor/plasteel,
/area/security/prison)
"aaP" = (
-/obj/structure/table,
-/obj/structure/bedsheetbin,
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 8
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 10
},
+/turf/closed/wall,
+/area/security/execution/transfer)
+"aaQ" = (
/obj/machinery/computer/cryopod{
dir = 8;
pixel_x = 26
},
-/turf/open/floor/plasteel/cafeteria,
-/area/security/prison)
-"aaQ" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
+/obj/machinery/cryopod{
dir = 8
},
-/turf/open/floor/plasteel/cafeteria,
+/turf/open/floor/plasteel,
/area/security/prison)
"aaR" = (
/obj/structure/lattice,
@@ -372,50 +288,30 @@
/turf/open/space,
/area/space/nearstation)
"aaU" = (
-/obj/machinery/computer/arcade{
- icon_state = "arcade";
+/obj/machinery/computer/arcade/minesweeper{
dir = 4
},
/turf/open/floor/plasteel,
/area/security/prison)
"aaV" = (
-/obj/structure/table,
-/obj/item/paper_bin{
- pixel_x = -3;
- pixel_y = 7
- },
-/obj/item/pen,
+/obj/structure/chair/sofa/right,
/turf/open/floor/plasteel,
/area/security/prison)
"aaW" = (
-/obj/structure/table,
-/obj/item/toy/cards/deck,
+/obj/structure/chair/sofa/left,
/turf/open/floor/plasteel,
/area/security/prison)
"aaX" = (
-/obj/machinery/washing_machine,
/obj/structure/window/reinforced,
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
+/obj/machinery/cryopod{
dir = 8
},
-/turf/open/floor/plasteel/cafeteria,
+/turf/open/floor/plasteel,
/area/security/prison)
"aaY" = (
-/obj/structure/window/reinforced,
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/turf/open/floor/plasteel/cafeteria,
-/area/security/prison)
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/closed/wall,
+/area/security/execution/transfer)
"aaZ" = (
/turf/closed/wall/r_wall,
/area/ai_monitored/security/armory)
@@ -450,11 +346,11 @@
/turf/open/floor/plasteel,
/area/security/prison)
"abg" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 10
+/obj/machinery/computer/arcade{
+ dir = 4
},
-/turf/closed/wall/r_wall,
-/area/security/execution/transfer)
+/turf/open/floor/plasteel,
+/area/security/prison)
"abh" = (
/obj/machinery/holopad,
/turf/open/floor/plasteel,
@@ -473,6 +369,7 @@
/obj/structure/window/reinforced{
dir = 8
},
+/obj/machinery/washing_machine,
/turf/open/floor/plasteel/freezer,
/area/security/prison)
"abk" = (
@@ -560,8 +457,7 @@
/area/security/execution/transfer)
"abu" = (
/obj/machinery/door/poddoor{
- id = "executionspaceblast";
- name = "blast door"
+ id = "executionspaceblast"
},
/turf/open/floor/plating,
/area/security/execution/transfer)
@@ -588,8 +484,9 @@
/turf/open/floor/plasteel/dark,
/area/security/execution/transfer)
"abx" = (
-/obj/machinery/vending/cola/random,
-/turf/open/floor/plasteel,
+/obj/structure/bedsheetbin/color,
+/obj/structure/table,
+/turf/open/floor/plasteel/freezer,
/area/security/prison)
"aby" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -616,9 +513,6 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 4
},
-/obj/item/twohanded/required/kirbyplants{
- icon_state = "plant-24"
- },
/turf/open/floor/plasteel,
/area/security/prison)
"abB" = (
@@ -655,7 +549,6 @@
"abG" = (
/obj/machinery/door/window/westleft{
base_state = "right";
- dir = 8;
icon_state = "right";
name = "Unisex Showers"
},
@@ -751,8 +644,7 @@
pixel_y = -3
},
/obj/machinery/camera/motion{
- c_tag = "Armory Motion Sensor";
- dir = 2
+ c_tag = "Armory Motion Sensor"
},
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -921,7 +813,6 @@
/area/security/execution/transfer)
"acb" = (
/obj/machinery/sparker{
- dir = 2;
id = "executionburn";
pixel_x = 25
},
@@ -1009,8 +900,8 @@
/area/ai_monitored/security/armory)
"acm" = (
/obj/machinery/power/apc/highcap/five_k{
- dir = 4;
areastring = "/area/ai_monitored/security/armory";
+ dir = 4;
name = "Armory APC";
pixel_x = 24
},
@@ -1098,18 +989,14 @@
/turf/open/floor/plasteel/dark,
/area/security/execution/transfer)
"acA" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/on{
- dir = 2
- },
+/obj/machinery/atmospherics/components/unary/outlet_injector/on,
/obj/effect/turf_decal/stripes/line{
dir = 6
},
/turf/open/floor/plasteel/dark,
/area/security/execution/transfer)
"acB" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel/dark,
/area/security/execution/transfer)
"acC" = (
@@ -1120,7 +1007,6 @@
},
/obj/item/radio/intercom{
desc = "Talk through this. It looks like it has been modified to not broadcast.";
- dir = 2;
name = "Prison Intercom (General)";
pixel_y = 24;
prison_radio = 1
@@ -1150,7 +1036,6 @@
},
/obj/item/radio/intercom{
desc = "Talk through this. It looks like it has been modified to not broadcast.";
- dir = 2;
name = "Prison Intercom (General)";
pixel_y = 24;
prison_radio = 1
@@ -1172,7 +1057,6 @@
},
/obj/item/radio/intercom{
desc = "Talk through this. It looks like it has been modified to not broadcast.";
- dir = 2;
name = "Prison Intercom (General)";
pixel_y = 24;
prison_radio = 1
@@ -1211,13 +1095,15 @@
/turf/open/floor/plasteel,
/area/security/prison)
"acK" = (
-/obj/structure/sink{
- dir = 8;
- pixel_x = -12;
- pixel_y = 2
+/obj/structure/mirror{
+ pixel_x = 25
},
/obj/machinery/light/small{
- dir = 4
+ dir = 8
+ },
+/obj/structure/sink{
+ dir = 4;
+ pixel_x = 11
},
/turf/open/floor/plasteel/freezer,
/area/security/prison)
@@ -1239,25 +1125,23 @@
pixel_y = -3
},
/obj/machinery/atmospherics/components/unary/vent_pump/on,
-/obj/effect/turf_decal/bot{
- dir = 2
- },
+/obj/effect/turf_decal/bot,
/obj/structure/window/reinforced{
dir = 1;
layer = 2.9
},
-/turf/open/floor/plasteel{
- dir = 2
- },
+/turf/open/floor/plasteel,
/area/ai_monitored/security/armory)
"acN" = (
-/obj/structure/chair/stool/bar,
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
- dir = 1
+/obj/structure/table/wood,
+/obj/item/flashlight/lamp/green{
+ on = 0;
+ pixel_x = -7;
+ pixel_y = 12
},
-/turf/open/floor/plasteel,
-/area/crew_quarters/bar)
+/obj/machinery/atmospherics/components/unary/vent_pump/on,
+/turf/open/floor/carpet,
+/area/crew_quarters/dorms)
"acO" = (
/obj/structure/closet/l3closet/security,
/obj/machinery/camera{
@@ -1278,15 +1162,16 @@
/area/crew_quarters/heads/hos)
"acR" = (
/obj/structure/table/wood,
+/obj/item/paper_bin{
+ pixel_x = -3;
+ pixel_y = 7
+ },
/obj/item/flashlight/lamp/green{
on = 0;
pixel_x = -3;
pixel_y = 8
},
-/obj/item/paper_bin{
- pixel_x = -3;
- pixel_y = 7
- },
+/obj/item/pen/fountain,
/turf/open/floor/carpet,
/area/crew_quarters/heads/hos)
"acS" = (
@@ -1438,9 +1323,7 @@
pixel_x = 3;
pixel_y = -3
},
-/obj/effect/turf_decal/bot{
- dir = 2
- },
+/obj/effect/turf_decal/bot,
/obj/structure/window/reinforced{
dir = 1;
layer = 2.9
@@ -1448,9 +1331,7 @@
/obj/structure/window/reinforced{
dir = 4
},
-/turf/open/floor/plasteel{
- dir = 2
- },
+/turf/open/floor/plasteel,
/area/ai_monitored/security/armory)
"adk" = (
/obj/structure/rack,
@@ -1463,9 +1344,7 @@
pixel_x = 3;
pixel_y = -3
},
-/obj/effect/turf_decal/bot{
- dir = 2
- },
+/obj/effect/turf_decal/bot,
/obj/structure/window/reinforced{
dir = 1;
layer = 2.9
@@ -1473,9 +1352,7 @@
/obj/structure/window/reinforced{
dir = 8
},
-/turf/open/floor/plasteel{
- dir = 2
- },
+/turf/open/floor/plasteel,
/area/ai_monitored/security/armory)
"adl" = (
/obj/machinery/door/poddoor/shutters{
@@ -1514,15 +1391,12 @@
/turf/open/floor/carpet,
/area/crew_quarters/heads/hos)
"adq" = (
-/obj/structure/table/wood,
-/obj/item/instrument/guitar{
- pixel_x = -7
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable{
+ icon_state = "1-2"
},
-/obj/item/instrument/eguitar{
- pixel_x = 5
- },
-/turf/open/floor/wood,
-/area/crew_quarters/theatre)
+/turf/open/floor/plating,
+/area/maintenance/fore/secondary)
"adr" = (
/obj/structure/sign/warning/vacuum/external{
pixel_x = -32
@@ -1700,9 +1574,7 @@
/area/security/prison)
"adK" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
/area/ai_monitored/security/armory)
"adL" = (
@@ -1731,8 +1603,8 @@
/area/crew_quarters/heads/hos)
"adN" = (
/obj/machinery/power/apc{
- dir = 8;
areastring = "/area/crew_quarters/heads/hos";
+ dir = 8;
name = "Head of Security's Office APC";
pixel_x = -24
},
@@ -1743,8 +1615,11 @@
/turf/open/floor/carpet,
/area/crew_quarters/heads/hos)
"adO" = (
-/obj/structure/chair/stool,
/obj/effect/landmark/event_spawn,
+/obj/structure/chair/comfy/brown{
+ color = "#596479";
+ dir = 4
+ },
/turf/open/floor/plasteel,
/area/security/prison)
"adP" = (
@@ -1755,9 +1630,7 @@
/turf/open/floor/carpet,
/area/crew_quarters/heads/hos)
"adQ" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
/area/ai_monitored/security/armory)
"adR" = (
@@ -2040,13 +1913,12 @@
/area/security/prison)
"aer" = (
/obj/machinery/firealarm{
- dir = 2;
pixel_y = 24
},
/obj/machinery/power/apc{
+ areastring = "/area/security/prison";
dir = 4;
name = "Prison Wing APC";
- areastring = "/area/security/prison";
pixel_x = 24
},
/obj/structure/cable{
@@ -2065,7 +1937,6 @@
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/machinery/suit_storage_unit/security,
/obj/effect/turf_decal/tile/red,
/obj/effect/turf_decal/tile/red{
dir = 8
@@ -2082,7 +1953,6 @@
/obj/structure/cable{
icon_state = "1-8"
},
-/obj/machinery/suit_storage_unit/security,
/obj/effect/turf_decal/tile/red,
/obj/effect/turf_decal/tile/red{
dir = 8
@@ -2145,7 +2015,8 @@
"aeB" = (
/obj/structure/table,
/obj/item/stack/packageWrap,
-/obj/item/pen,
+/obj/item/stack/packageWrap,
+/obj/item/hand_labeler,
/turf/open/floor/plasteel,
/area/security/main)
"aeC" = (
@@ -2444,8 +2315,6 @@
/area/security/main)
"afd" = (
/obj/item/radio/intercom{
- freerange = 0;
- frequency = 1459;
name = "Station Intercom (General)";
pixel_x = 29
},
@@ -2553,7 +2422,7 @@
/turf/open/floor/plasteel,
/area/security/main)
"afn" = (
-/obj/structure/table,
+/obj/machinery/suit_storage_unit/security,
/turf/open/floor/plasteel/showroomfloor,
/area/security/warden)
"afo" = (
@@ -2924,9 +2793,8 @@
/obj/structure/closet/secure_closet/injection,
/obj/structure/cable,
/obj/machinery/power/apc{
- dir = 2;
- name = "Prisoner Transfer Centre";
areastring = "/area/security/execution/transfer";
+ name = "Prisoner Transfer Centre";
pixel_y = -27
},
/turf/open/floor/plasteel/dark,
@@ -3034,9 +2902,7 @@
icon_state = "2-4"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
/area/ai_monitored/security/armory)
"agr" = (
@@ -3054,12 +2920,11 @@
/turf/open/floor/plasteel/showroomfloor,
/area/security/warden)
"agu" = (
-/obj/structure/table,
-/obj/machinery/recharger,
/obj/machinery/airalarm{
dir = 8;
pixel_x = 24
},
+/obj/machinery/suit_storage_unit/security,
/turf/open/floor/plasteel/showroomfloor,
/area/security/warden)
"agv" = (
@@ -3085,6 +2950,7 @@
/obj/effect/turf_decal/tile/red{
dir = 8
},
+/obj/machinery/syndicatebomb/training,
/turf/open/floor/plasteel,
/area/security/main)
"agx" = (
@@ -3159,8 +3025,13 @@
/area/security/brig)
"agE" = (
/obj/structure/table,
-/obj/item/folder/red,
-/obj/item/pen,
+/obj/item/storage/fancy/donut_box{
+ pixel_y = 10
+ },
+/obj/item/storage/fancy/donut_box,
+/obj/item/storage/fancy/donut_box{
+ pixel_y = -10
+ },
/turf/open/floor/plasteel,
/area/security/main)
"agF" = (
@@ -3334,8 +3205,11 @@
/turf/open/floor/plating,
/area/security/warden)
"agX" = (
-/obj/structure/table,
-/obj/machinery/recharger,
+/obj/structure/closet/secure_closet/warden,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/item/book/manual/wiki/security_space_law,
/turf/open/floor/plasteel/showroomfloor,
/area/security/warden)
"agY" = (
@@ -3402,14 +3276,21 @@
/turf/open/floor/plasteel,
/area/security/main)
"ahh" = (
+/obj/item/paper_bin/bundlenatural{
+ pixel_x = 6;
+ pixel_y = 4
+ },
+/obj/item/paper_bin{
+ pixel_x = -6;
+ pixel_y = 4
+ },
+/obj/item/pen/fountain,
+/obj/item/folder/red,
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/item/pen,
/obj/structure/table,
-/obj/item/paper_bin{
- pixel_x = -3;
- pixel_y = 7
- },
/turf/open/floor/plasteel,
/area/security/main)
"ahi" = (
@@ -3517,8 +3398,6 @@
/area/security/brig)
"ahs" = (
/obj/item/radio/intercom{
- freerange = 0;
- frequency = 1459;
name = "Station Intercom (General)";
pixel_y = 24
},
@@ -3563,9 +3442,9 @@
/area/security/brig)
"ahv" = (
/obj/machinery/power/apc{
+ areastring = "/area/security/warden";
dir = 8;
name = "Brig Control APC";
- areastring = "/area/security/warden";
pixel_x = -24
},
/obj/structure/cable{
@@ -3649,9 +3528,7 @@
/area/security/main)
"ahD" = (
/obj/machinery/door/window/westleft{
- base_state = "left";
dir = 4;
- icon_state = "left";
name = "Brig Infirmary"
},
/obj/effect/turf_decal/tile/red,
@@ -3784,9 +3661,9 @@
/area/security/main)
"ahN" = (
/obj/machinery/power/apc{
+ areastring = "/area/security/main";
dir = 4;
name = "Security Office APC";
- areastring = "/area/security/main";
pixel_x = 24
},
/obj/structure/cable{
@@ -3809,9 +3686,17 @@
/turf/open/floor/plasteel/white,
/area/security/brig)
"ahQ" = (
-/obj/structure/closet/secure_closet/warden,
-/obj/structure/cable{
- icon_state = "4-8"
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/structure/table,
+/obj/machinery/recharger{
+ pixel_x = -6;
+ pixel_y = 3
+ },
+/obj/machinery/recharger{
+ pixel_x = 6;
+ pixel_y = 3
},
/turf/open/floor/plasteel/showroomfloor,
/area/security/warden)
@@ -3966,16 +3851,11 @@
/turf/open/floor/plasteel/white,
/area/security/brig)
"aie" = (
-/obj/structure/table,
-/obj/item/folder/red,
-/obj/item/pen,
-/obj/item/hand_labeler,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/obj/item/book/manual/wiki/security_space_law,
-/turf/open/floor/plasteel/showroomfloor,
-/area/security/warden)
+/obj/structure/closet/wardrobe/mixed,
+/obj/item/clothing/shoes/jackboots,
+/obj/item/coin/silver,
+/turf/open/floor/plating,
+/area/maintenance/starboard/fore)
"aif" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable{
@@ -4475,7 +4355,6 @@
"aje" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on,
/obj/machinery/firealarm{
- dir = 2;
pixel_y = 24
},
/obj/effect/turf_decal/tile/red{
@@ -4535,8 +4414,6 @@
/area/security/courtroom)
"ajj" = (
/obj/item/radio/intercom{
- broadcasting = 0;
- listening = 1;
name = "Station Intercom (General)";
pixel_y = 20
},
@@ -4590,10 +4467,10 @@
/turf/open/floor/plasteel/dark,
/area/security/courtroom)
"ajq" = (
+/obj/structure/lattice/catwalk,
/obj/structure/cable{
icon_state = "0-2"
},
-/obj/structure/lattice/catwalk,
/turf/open/space,
/area/solar/port/fore)
"ajr" = (
@@ -4643,7 +4520,6 @@
/area/security/brig)
"ajx" = (
/obj/machinery/firealarm{
- dir = 2;
pixel_y = 24
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -4660,9 +4536,9 @@
/area/security/brig)
"ajy" = (
/obj/machinery/power/apc{
+ areastring = "/area/security/brig";
dir = 1;
name = "Brig APC";
- areastring = "/area/security/brig";
pixel_y = 24
},
/obj/structure/cable{
@@ -4740,9 +4616,7 @@
/area/security/courtroom)
"ajF" = (
/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden,
-/obj/effect/turf_decal/tile/red{
- dir = 2
- },
+/obj/effect/turf_decal/tile/red,
/turf/open/floor/plasteel,
/area/security/brig)
"ajG" = (
@@ -4824,9 +4698,7 @@
"ajO" = (
/obj/structure/table/wood,
/obj/item/radio/intercom{
- broadcasting = 0;
dir = 8;
- listening = 1;
name = "Station Intercom (Court)"
},
/obj/effect/turf_decal/tile/neutral{
@@ -5027,9 +4899,7 @@
dir = 1
},
/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
-/obj/effect/turf_decal/tile/red{
- dir = 2
- },
+/obj/effect/turf_decal/tile/red,
/turf/open/floor/plasteel,
/area/security/brig)
"akh" = (
@@ -5077,9 +4947,7 @@
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 1
},
-/obj/effect/turf_decal/tile/red{
- dir = 2
- },
+/obj/effect/turf_decal/tile/red,
/turf/open/floor/plasteel,
/area/security/brig)
"akl" = (
@@ -5582,10 +5450,10 @@
/turf/open/floor/plasteel,
/area/security/brig)
"alg" = (
+/obj/structure/lattice/catwalk,
/obj/structure/cable{
icon_state = "0-2"
},
-/obj/structure/lattice/catwalk,
/turf/open/space,
/area/solar/starboard/fore)
"alh" = (
@@ -5703,7 +5571,6 @@
},
/obj/item/radio/intercom{
desc = "Talk through this. It looks like it has been modified to not broadcast.";
- dir = 2;
name = "Prison Intercom (General)";
pixel_x = -25;
pixel_y = -2;
@@ -5738,7 +5605,6 @@
},
/obj/item/radio/intercom{
desc = "Talk through this. It looks like it has been modified to not broadcast.";
- dir = 2;
name = "Prison Intercom (General)";
pixel_x = -25;
pixel_y = -2;
@@ -5815,9 +5681,7 @@
/turf/open/floor/plasteel,
/area/security/brig)
"alF" = (
-/obj/machinery/atmospherics/components/unary/tank/air{
- dir = 2
- },
+/obj/machinery/atmospherics/components/unary/tank/air,
/turf/open/floor/plating,
/area/maintenance/port/fore)
"alG" = (
@@ -5862,22 +5726,25 @@
/turf/open/floor/plasteel,
/area/security/courtroom)
"alK" = (
-/obj/structure/disposalpipe/segment,
-/obj/structure/cable{
- icon_state = "1-2"
+/obj/machinery/button/door{
+ id = "Room Two";
+ name = "Door Bolt Control";
+ normaldoorcontrol = 1;
+ pixel_x = 7;
+ pixel_y = -24;
+ specialfunctions = 4
},
-/obj/structure/cable{
- icon_state = "2-8"
+/obj/structure/chair/comfy/brown{
+ dir = 8
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plating,
-/area/maintenance/fore/secondary)
+/turf/open/floor/carpet,
+/area/crew_quarters/dorms)
"alL" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/power/apc{
+ areastring = "/area/security/courtroom";
dir = 8;
name = "Courtroom APC";
- areastring = "/area/security/courtroom";
pixel_x = -24
},
/obj/structure/cable{
@@ -5905,14 +5772,8 @@
/turf/open/floor/plasteel,
/area/security/prison)
"alN" = (
-/obj/machinery/camera{
- c_tag = "Dormitory Toilets";
- dir = 1
- },
-/obj/structure/table,
-/obj/structure/bedsheetbin/towel,
-/turf/open/floor/plasteel/freezer,
-/area/crew_quarters/toilet)
+/turf/open/space/basic,
+/area/space/nearstation)
"alO" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -5923,8 +5784,7 @@
"alQ" = (
/obj/machinery/power/solar_control{
id = "auxsolareast";
- name = "Port Bow Solar Control";
- track = 0
+ name = "Port Bow Solar Control"
},
/obj/structure/cable{
icon_state = "0-4"
@@ -6026,17 +5886,23 @@
/turf/open/floor/plasteel,
/area/security/processing)
"amd" = (
-/obj/effect/turf_decal/tile/red{
- dir = 8
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/machinery/button/door{
+ desc = "Bolts the doors to the Private Study.";
+ id = "PrivateStudy";
+ name = "Private Study Lock";
+ pixel_x = -5;
+ pixel_y = 24;
+ req_access_txt = "28"
},
-/obj/machinery/computer/arcade{
- icon_state = "arcade";
- dir = 4
+/obj/machinery/button/door{
+ id = "PrivateStudy1";
+ name = "Privacy Shutters";
+ pixel_x = 5;
+ pixel_y = 24
},
-/turf/open/floor/plasteel/white/corner{
- dir = 1
- },
-/area/hallway/secondary/exit)
+/turf/open/floor/wood,
+/area/library)
"ame" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -6048,7 +5914,6 @@
/area/security/processing)
"amf" = (
/obj/structure/bed,
-/obj/item/bedsheet,
/obj/structure/cable{
icon_state = "1-2"
},
@@ -6056,6 +5921,7 @@
id = "Cell 1";
pixel_x = -28
},
+/obj/item/bedsheet/orange,
/turf/open/floor/plasteel,
/area/security/brig)
"amg" = (
@@ -6067,11 +5933,11 @@
/area/security/brig)
"amh" = (
/obj/structure/bed,
-/obj/item/bedsheet,
/obj/machinery/flasher{
id = "Cell 2";
pixel_x = -28
},
+/obj/item/bedsheet/orange,
/turf/open/floor/plasteel,
/area/security/brig)
"ami" = (
@@ -6083,11 +5949,11 @@
/area/security/brig)
"amj" = (
/obj/structure/bed,
-/obj/item/bedsheet,
/obj/machinery/flasher{
id = "Cell 3";
pixel_x = -28
},
+/obj/item/bedsheet/orange,
/turf/open/floor/plasteel,
/area/security/brig)
"amk" = (
@@ -6170,7 +6036,6 @@
/obj/item/bedsheet,
/obj/item/radio/intercom{
desc = "Talk through this. It looks like it has been modified to not broadcast.";
- dir = 2;
name = "Prison Intercom (General)";
pixel_x = 25;
pixel_y = -2;
@@ -6216,11 +6081,8 @@
/turf/open/floor/plating,
/area/maintenance/solars/starboard/fore)
"amx" = (
-/obj/structure/chair{
- dir = 1
- },
-/turf/open/floor/plating,
-/area/maintenance/starboard/fore)
+/turf/closed/wall,
+/area/crew_quarters/abandoned_gambling_den)
"amy" = (
/obj/structure/chair/stool{
pixel_y = 8
@@ -6244,16 +6106,18 @@
/turf/open/floor/plating,
/area/maintenance/solars/port/fore)
"amB" = (
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
- dir = 1
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable{
+ icon_state = "1-2"
},
-/obj/machinery/computer/arcade{
- icon_state = "arcade";
- dir = 1
+/obj/structure/cable{
+ icon_state = "2-8"
},
-/turf/open/floor/plasteel,
-/area/crew_quarters/bar)
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 6
+ },
+/turf/open/floor/plating,
+/area/maintenance/fore/secondary)
"amC" = (
/turf/open/floor/plating,
/area/maintenance/port/fore)
@@ -6300,6 +6164,29 @@
/obj/item/trash/plate,
/turf/open/floor/plating,
/area/maintenance/port/fore)
+"amI" = (
+/obj/machinery/atmospherics/components/binary/pump/on{
+ dir = 4;
+ name = "Air In"
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/turf/open/floor/plating,
+/area/maintenance/fore/secondary)
+"amJ" = (
+/obj/structure/mirror{
+ pixel_y = 32
+ },
+/obj/structure/sink{
+ dir = 1;
+ pixel_y = 25
+ },
+/obj/structure/toilet{
+ dir = 4
+ },
+/turf/open/floor/mineral/titanium/blue,
+/area/crew_quarters/dorms)
"amK" = (
/obj/structure/sign/warning/docking,
/turf/closed/wall,
@@ -6320,6 +6207,19 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel,
/area/security/processing)
+"amN" = (
+/turf/open/floor/plasteel,
+/area/crew_quarters/fitness)
+"amO" = (
+/obj/machinery/shower{
+ dir = 8
+ },
+/turf/open/floor/mineral/titanium/blue,
+/area/crew_quarters/dorms)
+"amP" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/closed/wall,
+/area/crew_quarters/dorms)
"amQ" = (
/obj/structure/cable{
icon_state = "0-4"
@@ -6465,18 +6365,21 @@
/turf/open/floor/plating,
/area/maintenance/fore/secondary)
"anc" = (
-/obj/structure/cable{
- icon_state = "1-2"
+/obj/machinery/shower{
+ dir = 4
},
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/plating,
-/area/maintenance/fore/secondary)
+/obj/item/soap,
+/turf/open/floor/mineral/titanium/blue,
+/area/crew_quarters/dorms)
"and" = (
/obj/machinery/light/small{
dir = 4
},
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/lootdrop/maintenance{
+ lootcount = 2;
+ name = "2maintenance loot spawner"
+ },
/turf/open/floor/plating,
/area/maintenance/fore/secondary)
"ane" = (
@@ -6493,9 +6396,9 @@
icon_state = "0-4"
},
/obj/machinery/power/apc{
+ areastring = "/area/maintenance/solars/port/fore";
dir = 8;
name = "Port Bow Solar APC";
- areastring = "/area/maintenance/solars/port/fore";
pixel_x = -25;
pixel_y = 3
},
@@ -6566,6 +6469,13 @@
},
/turf/open/floor/plating,
/area/maintenance/port/fore)
+"anq" = (
+/obj/structure/sign/poster/official/twelve_gauge,
+/turf/closed/wall/r_wall,
+/area/ai_monitored/security/armory)
+"anr" = (
+/turf/open/floor/mineral/titanium/blue,
+/area/crew_quarters/dorms)
"ans" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 4
@@ -6679,15 +6589,11 @@
/turf/open/floor/plating,
/area/security/courtroom)
"anD" = (
-/obj/structure/cable{
- icon_state = "1-2"
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 6
},
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- dir = 1
- },
-/turf/open/floor/plating,
-/area/maintenance/fore/secondary)
+/turf/open/floor/carpet,
+/area/crew_quarters/dorms)
"anE" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
@@ -6733,6 +6639,16 @@
/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plating,
/area/maintenance/port/fore)
+"anM" = (
+/obj/structure/window/reinforced/tinted{
+ dir = 8
+ },
+/obj/structure/window/reinforced/tinted{
+ dir = 4
+ },
+/obj/structure/curtain,
+/turf/open/floor/mineral/titanium/blue,
+/area/crew_quarters/dorms)
"anN" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
@@ -6879,8 +6795,7 @@
"aoh" = (
/obj/machinery/power/solar_control{
id = "auxsolareast";
- name = "Starboard Bow Solar Control";
- track = 0
+ name = "Starboard Bow Solar Control"
},
/obj/structure/cable{
icon_state = "0-4"
@@ -6932,6 +6847,9 @@
/obj/item/circuitboard/machine/monkey_recycler,
/turf/open/floor/plating,
/area/maintenance/port/fore)
+"aop" = (
+/turf/open/floor/mineral/titanium/blue,
+/area/crew_quarters/toilet)
"aoq" = (
/obj/structure/sign/warning/vacuum/external{
pixel_y = -32
@@ -7026,9 +6944,7 @@
/turf/open/floor/plasteel,
/area/hallway/primary/fore)
"aoz" = (
-/obj/effect/turf_decal/tile/red{
- dir = 2
- },
+/obj/effect/turf_decal/tile/red,
/turf/open/floor/plasteel,
/area/hallway/primary/fore)
"aoA" = (
@@ -7037,9 +6953,7 @@
pixel_y = -29
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/tile/red{
- dir = 2
- },
+/obj/effect/turf_decal/tile/red,
/turf/open/floor/plasteel,
/area/hallway/primary/fore)
"aoB" = (
@@ -7047,16 +6961,12 @@
dir = 1;
pixel_y = -24
},
-/obj/effect/turf_decal/tile/red{
- dir = 2
- },
+/obj/effect/turf_decal/tile/red,
/turf/open/floor/plasteel,
/area/hallway/primary/fore)
"aoC" = (
/obj/machinery/vending/coffee,
-/obj/effect/turf_decal/tile/red{
- dir = 2
- },
+/obj/effect/turf_decal/tile/red,
/turf/open/floor/plasteel,
/area/hallway/primary/fore)
"aoD" = (
@@ -7068,23 +6978,17 @@
pixel_x = 5;
pixel_y = -32
},
-/obj/effect/turf_decal/tile/red{
- dir = 2
- },
+/obj/effect/turf_decal/tile/red,
/turf/open/floor/plasteel,
/area/hallway/primary/fore)
"aoE" = (
/obj/machinery/vending/cigarette,
-/obj/effect/turf_decal/tile/red{
- dir = 2
- },
+/obj/effect/turf_decal/tile/red,
/turf/open/floor/plasteel,
/area/hallway/primary/fore)
"aoF" = (
/obj/machinery/vending/snack/random,
-/obj/effect/turf_decal/tile/red{
- dir = 2
- },
+/obj/effect/turf_decal/tile/red,
/turf/open/floor/plasteel,
/area/hallway/primary/fore)
"aoG" = (
@@ -7104,27 +7008,9 @@
/turf/open/floor/plasteel/dark,
/area/security/courtroom)
"aoI" = (
-/obj/structure/cable{
- icon_state = "1-8"
- },
-/obj/structure/disposalpipe/segment{
- dir = 9
- },
-/obj/machinery/light/small{
- dir = 4
- },
-/obj/machinery/power/apc{
- dir = 2;
- name = "Fitness Room APC";
- areastring = "/area/crew_quarters/fitness";
- pixel_y = -24
- },
-/obj/structure/cable{
- icon_state = "0-8"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plating,
-/area/maintenance/fore/secondary)
+/obj/structure/fireplace,
+/turf/open/floor/carpet,
+/area/crew_quarters/dorms)
"aoJ" = (
/obj/structure/disposalpipe/segment,
/turf/open/floor/plating,
@@ -7219,6 +7105,26 @@
/obj/structure/closet/emcloset,
/turf/open/floor/plating,
/area/maintenance/port/fore)
+"aoY" = (
+/obj/structure/sign/warning/fire{
+ desc = "A sign that states the labeled room's number.";
+ dir = 10;
+ icon_state = "roomnum";
+ name = "Room Number 6";
+ pixel_y = 24
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/machinery/washing_machine{
+ pixel_x = 7;
+ pixel_y = 7
+ },
+/turf/open/floor/plasteel,
+/area/crew_quarters/dorms)
"aoZ" = (
/obj/machinery/atmospherics/components/binary/valve/digital{
name = "Waste Release"
@@ -7334,9 +7240,9 @@
icon_state = "0-2"
},
/obj/machinery/power/apc{
+ areastring = "/area/maintenance/fore/secondary";
dir = 1;
name = "Fore Maintenance APC";
- areastring = "/area/maintenance/fore/secondary";
pixel_y = 24
},
/obj/structure/disposalpipe/segment{
@@ -7367,38 +7273,23 @@
/turf/open/floor/plating,
/area/maintenance/fore/secondary)
"apu" = (
-/obj/structure/cable{
- icon_state = "4-8"
+/obj/structure/closet/secure_closet/personal/cabinet{
+ desc = "Swipe your ID on the closet to claim it. First come first serve, this one is wooden and fancy. Store your stuff here.";
+ name = "Personal ID-Locked Closet";
+ pixel_y = 15
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 9
- },
-/turf/open/floor/plating,
-/area/maintenance/fore/secondary)
+/turf/open/floor/carpet,
+/area/crew_quarters/dorms)
"apv" = (
-/obj/machinery/door/airlock/maintenance{
- name = "Fitness Maintenance";
- req_access_txt = "12"
- },
+/obj/structure/lattice/catwalk,
+/turf/open/space/basic,
+/area/space/nearstation)
+"apw" = (
/obj/structure/cable{
icon_state = "1-2"
},
/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plating,
-/area/maintenance/fore/secondary)
-"apw" = (
-/obj/machinery/atmospherics/components/binary/pump/on{
- dir = 4;
- name = "Air In"
- },
-/obj/effect/landmark/blobstart,
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plating,
/area/maintenance/fore/secondary)
"apx" = (
@@ -7435,9 +7326,9 @@
icon_state = "0-4"
},
/obj/machinery/power/apc{
+ areastring = "/area/maintenance/solars/starboard/fore";
dir = 8;
name = "Starboard Bow Solar APC";
- areastring = "/area/maintenance/solars/starboard/fore";
pixel_x = -25;
pixel_y = 3
},
@@ -7458,8 +7349,9 @@
/turf/closed/wall/r_wall,
/area/maintenance/starboard/fore)
"apD" = (
-/obj/structure/closet/wardrobe/mixed,
-/obj/item/clothing/shoes/jackboots,
+/obj/effect/decal/cleanable/cobweb/cobweb2,
+/obj/machinery/computer/slot_machine,
+/obj/item/coin/iron,
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
"apE" = (
@@ -7475,6 +7367,15 @@
/obj/machinery/portable_atmospherics/canister/water_vapor,
/turf/open/floor/plasteel,
/area/janitor)
+"apH" = (
+/obj/machinery/door/airlock{
+ desc = "A small bathroom with a sink, toilet and shower.";
+ id_tag = "Bath1";
+ name = "Bathroom"
+ },
+/obj/machinery/door/firedoor,
+/turf/open/floor/mineral/titanium/blue,
+/area/crew_quarters/toilet)
"apI" = (
/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/atmos_waste{
dir = 1
@@ -7485,6 +7386,12 @@
"apJ" = (
/turf/closed/wall,
/area/construction/mining/aux_base)
+"apK" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/space/nearstation)
"apL" = (
/obj/structure/table,
/obj/effect/spawner/lootdrop/maintenance{
@@ -7513,6 +7420,14 @@
/obj/effect/spawner/structure/window,
/turf/open/floor/plating,
/area/maintenance/port/fore)
+"apQ" = (
+/obj/machinery/door/airlock{
+ desc = "A small bathroom with a sink, toilet and shower.";
+ id_tag = "Bath2";
+ name = "Bathroom"
+ },
+/turf/open/floor/mineral/titanium/blue,
+/area/crew_quarters/toilet)
"apR" = (
/obj/item/paper/fluff/jobs/security/beepsky_mom,
/turf/open/floor/plating,
@@ -7523,6 +7438,18 @@
},
/turf/open/floor/plating,
/area/maintenance/fore)
+"apT" = (
+/obj/structure/lattice/catwalk,
+/obj/item/stack/marker_beacon{
+ anchored = 1;
+ icon_state = "markerburgundy-on";
+ light_power = 3;
+ light_range = 3;
+ name = "Docking Beacon";
+ picked_color = "Burgundy"
+ },
+/turf/open/space/basic,
+/area/space/nearstation)
"apU" = (
/turf/open/floor/plating,
/area/security/vacantoffice/b)
@@ -7539,13 +7466,21 @@
/turf/open/floor/plating,
/area/maintenance/fore)
"apX" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/closed/wall,
-/area/crew_quarters/fitness)
-"apY" = (
-/obj/structure/closet/secure_closet/personal,
+/obj/structure/bed,
+/obj/item/bedsheet/random,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+ dir = 8
+ },
/turf/open/floor/carpet,
/area/crew_quarters/dorms)
+"apY" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/door/poddoor/shutters/preopen{
+ id = "maintdiy";
+ name = "Security Shutters"
+ },
+/turf/open/floor/plating,
+/area/crew_quarters/abandoned_gambling_den)
"apZ" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 8
@@ -7553,12 +7488,9 @@
/turf/open/floor/wood,
/area/lawoffice)
"aqa" = (
-/obj/structure/table,
-/obj/machinery/light/small{
- dir = 8
- },
-/turf/open/floor/carpet,
-/area/crew_quarters/dorms)
+/obj/machinery/recharge_station,
+/turf/open/floor/plating,
+/area/maintenance/fore/secondary)
"aqb" = (
/obj/structure/rack,
/obj/item/storage/briefcase,
@@ -7639,9 +7571,8 @@
/area/maintenance/fore/secondary)
"aqk" = (
/obj/machinery/power/apc{
- dir = 2;
- name = "Dormitory APC";
areastring = "/area/crew_quarters/dorms";
+ name = "Dormitory APC";
pixel_y = -24
},
/obj/structure/cable{
@@ -7653,32 +7584,22 @@
/turf/open/floor/plating,
/area/maintenance/fore/secondary)
"aql" = (
-/obj/structure/disposalpipe/segment{
- dir = 6
+/obj/structure/mirror{
+ pixel_y = 32
},
-/obj/structure/cable{
- icon_state = "2-8"
+/obj/structure/sink{
+ dir = 1;
+ pixel_y = 25
},
-/obj/structure/cable{
- icon_state = "2-4"
- },
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- dir = 1
- },
-/turf/open/floor/plating,
-/area/maintenance/fore/secondary)
-"aqm" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+/obj/machinery/light/small{
dir = 4
},
-/turf/open/floor/plating,
-/area/maintenance/fore/secondary)
+/turf/open/floor/mineral/titanium/blue,
+/area/crew_quarters/dorms)
+"aqm" = (
+/obj/structure/chair/sofa/right,
+/turf/open/floor/carpet,
+/area/crew_quarters/dorms)
"aqn" = (
/obj/structure/bed,
/obj/machinery/airalarm{
@@ -7698,11 +7619,25 @@
/turf/open/floor/carpet,
/area/crew_quarters/dorms)
"aqo" = (
-/obj/structure/chair/stool{
- pixel_y = 8
+/obj/structure/cable{
+ icon_state = "4-8"
},
-/turf/open/floor/wood,
-/area/crew_quarters/dorms)
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 9
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/power/apc{
+ areastring = "/area/crew_quarters/fitness";
+ name = "Fitness Room APC";
+ pixel_y = -24
+ },
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/turf/open/floor/plating,
+/area/maintenance/fore/secondary)
"aqp" = (
/obj/structure/rack,
/obj/item/clothing/suit/fire/firefighter,
@@ -7727,24 +7662,45 @@
/turf/open/floor/plating,
/area/maintenance/fore/secondary)
"aqr" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 6
+ },
+/turf/open/floor/plating,
+/area/maintenance/fore/secondary)
+"aqs" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 6
},
/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/door/poddoor/shutters/preopen{
+ id = "holoprivacy";
+ name = "Holodeck Shutters"
+ },
/turf/open/floor/plating,
/area/crew_quarters/fitness)
-"aqs" = (
+"aqt" = (
+/obj/machinery/door/airlock{
+ desc = "A small bathroom with a sink, toilet and shower.";
+ id_tag = "Bath3";
+ name = "Bathroom"
+ },
+/turf/open/floor/mineral/titanium/blue,
+/area/crew_quarters/toilet)
+"aqu" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/crew_quarters/fitness)
-"aqu" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 10
+/obj/machinery/door/poddoor/shutters/preopen{
+ id = "holoprivacy";
+ name = "Holodeck Shutters"
},
-/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/crew_quarters/fitness)
"aqv" = (
@@ -7788,26 +7744,47 @@
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
"aqB" = (
-/obj/effect/decal/cleanable/cobweb/cobweb2,
+/obj/structure/table/glass,
+/obj/item/paper_bin{
+ pixel_x = -3;
+ pixel_y = 7
+ },
+/obj/item/pen,
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
"aqC" = (
-/obj/machinery/computer/slot_machine{
- balance = 15;
- money = 500
+/obj/machinery/atmospherics/components/unary/vent_pump/on,
+/obj/structure/chair/comfy/brown{
+ dir = 4
},
-/obj/item/coin/iron,
-/turf/open/floor/plating,
-/area/maintenance/starboard/fore)
+/turf/open/floor/wood,
+/area/crew_quarters/dorms)
"aqD" = (
-/obj/effect/decal/cleanable/cobweb,
-/obj/item/coin/gold,
-/turf/open/floor/plating,
-/area/maintenance/starboard/fore)
+/obj/machinery/airalarm{
+ pixel_y = 23
+ },
+/obj/structure/table/wood,
+/turf/open/floor/wood,
+/area/crew_quarters/dorms)
"aqE" = (
-/obj/effect/landmark/xeno_spawn,
-/turf/open/floor/plating,
-/area/maintenance/starboard/fore)
+/obj/item/flashlight/lamp/green{
+ pixel_x = -3;
+ pixel_y = 22
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 4;
+ pixel_y = 5
+ },
+/obj/structure/dresser{
+ desc = "There's plenty of clothes here to change into! It has a surprising amount of variety, too.";
+ name = "Dresser";
+ pixel_y = 7
+ },
+/turf/open/floor/carpet,
+/area/crew_quarters/dorms)
+"aqF" = (
+/turf/open/floor/carpet,
+/area/crew_quarters/dorms)
"aqG" = (
/obj/docking_port/stationary/random{
dir = 4;
@@ -7816,6 +7793,28 @@
},
/turf/open/space,
/area/space/nearstation)
+"aqH" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 9
+ },
+/turf/open/floor/plating,
+/area/maintenance/fore/secondary)
+"aqI" = (
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/obj/machinery/light/small{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 9
+ },
+/turf/open/floor/plating,
+/area/maintenance/fore/secondary)
"aqJ" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/obj/machinery/door/airlock/external{
@@ -7841,19 +7840,25 @@
/obj/machinery/meter,
/turf/open/floor/plating,
/area/maintenance/port/fore)
+"aqN" = (
+/obj/structure/toilet{
+ dir = 8
+ },
+/turf/open/floor/mineral/titanium/blue,
+/area/crew_quarters/dorms)
"aqO" = (
/obj/structure/closet,
/obj/effect/spawner/lootdrop/maintenance{
- lootcount = 2;
- name = "2maintenance loot spawner"
+ lootcount = 3;
+ name = "3maintenance loot spawner"
},
/turf/open/floor/plating,
/area/maintenance/port/fore)
"aqP" = (
/obj/machinery/power/apc{
+ areastring = "/area/maintenance/port/fore";
dir = 1;
name = "Port Bow Maintenance APC";
- areastring = "/area/maintenance/port/fore";
pixel_x = -1;
pixel_y = 26
},
@@ -7882,9 +7887,9 @@
/area/security/processing)
"aqT" = (
/obj/machinery/power/apc{
+ areastring = "/area/security/processing";
dir = 8;
name = "Labor Shuttle Dock APC";
- areastring = "/area/security/processing";
pixel_x = -24
},
/obj/structure/cable,
@@ -7893,6 +7898,14 @@
},
/turf/open/floor/plating,
/area/maintenance/fore)
+"aqU" = (
+/obj/structure/closet/secure_closet/personal{
+ desc = "Swipe your ID on this locker to claim it. You can drag it around and use it as your own personal storage area. Very useful.";
+ name = "Personal ID-Locked Locker";
+ pixel_y = 10
+ },
+/turf/open/floor/carpet,
+/area/crew_quarters/dorms)
"aqV" = (
/obj/structure/table/wood,
/obj/item/paper_bin{
@@ -7961,6 +7974,13 @@
"arf" = (
/turf/closed/wall,
/area/crew_quarters/dorms)
+"arg" = (
+/obj/machinery/hydroponics/constructable,
+/obj/machinery/light{
+ dir = 1
+ },
+/turf/open/floor/plasteel/dark,
+/area/hydroponics)
"arh" = (
/obj/machinery/door/airlock/maintenance{
name = "Dormitories Maintenance";
@@ -7970,60 +7990,49 @@
/turf/open/floor/plating,
/area/maintenance/fore/secondary)
"ari" = (
-/obj/machinery/airalarm{
- pixel_y = 23
- },
-/obj/structure/closet/secure_closet/personal/cabinet,
-/obj/effect/decal/cleanable/cobweb/cobweb2,
-/turf/open/floor/wood,
-/area/crew_quarters/dorms)
-"arj" = (
-/turf/closed/wall,
-/area/crew_quarters/fitness)
-"ark" = (
-/obj/machinery/airalarm{
- pixel_y = 23
- },
-/obj/structure/closet/secure_closet/personal/cabinet,
-/turf/open/floor/wood,
-/area/crew_quarters/dorms)
-"arl" = (
-/obj/structure/disposalpipe/junction/flip{
- dir = 2
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/effect/turf_decal/tile/neutral{
+/obj/machinery/light/small{
dir = 1
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
+/turf/open/floor/carpet,
+/area/crew_quarters/dorms)
+"arj" = (
+/obj/machinery/door/airlock{
+ id_tag = "Room Two";
+ name = "Room Seven - Luxury Suite"
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
-"arm" = (
+/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/plasteel/dark,
+/area/crew_quarters/dorms)
+"ark" = (
+/obj/structure/bed,
+/obj/item/bedsheet/random,
+/turf/open/floor/carpet,
+/area/crew_quarters/dorms)
+"arl" = (
+/obj/structure/sign/poster/official/ion_rifle,
+/turf/closed/wall/r_wall,
+/area/ai_monitored/security/armory)
+"arm" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 10
+ },
/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/door/poddoor/shutters/preopen{
+ id = "holoprivacy";
+ name = "Holodeck Shutters"
+ },
/turf/open/floor/plating,
/area/crew_quarters/fitness)
"arn" = (
-/obj/structure/closet/athletic_mixed,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 5
+/obj/structure/cable{
+ icon_state = "4-8"
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral{
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
+/turf/open/floor/plating,
+/area/maintenance/fore/secondary)
"aro" = (
/turf/open/floor/engine{
name = "Holodeck Projector Floor"
@@ -8046,35 +8055,31 @@
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
"arr" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/structure/cable{
- icon_state = "2-8"
+/obj/structure/disposalpipe/segment,
+/obj/machinery/door/airlock/maintenance{
+ name = "Dormitories Maintenance";
+ req_access_txt = "12"
},
/turf/open/floor/plating,
-/area/maintenance/starboard/fore)
+/area/maintenance/fore/secondary)
"ars" = (
-/obj/machinery/power/apc{
- dir = 1;
- name = "Starboard Bow Maintenance APC";
- areastring = "/area/maintenance/starboard/fore";
- pixel_y = 24
+/obj/item/flashlight/lamp/green{
+ pixel_x = -3;
+ pixel_y = 22
},
-/obj/structure/cable{
- icon_state = "0-4"
+/obj/structure/dresser{
+ desc = "There's plenty of clothes here to change into! It has a surprising amount of variety, too.";
+ name = "Dresser";
+ pixel_y = 7
},
-/turf/open/floor/plating,
-/area/maintenance/starboard/fore)
+/turf/open/floor/wood,
+/area/crew_quarters/dorms)
"art" = (
-/obj/machinery/light/small{
- dir = 1
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 5
},
-/obj/machinery/camera{
- c_tag = "Fore Starboard Solar Access"
- },
-/turf/open/floor/plating,
-/area/maintenance/starboard/fore)
+/turf/open/floor/plasteel,
+/area/crew_quarters/fitness)
"aru" = (
/obj/structure/chair/stool,
/turf/open/floor/plating,
@@ -8099,11 +8104,11 @@
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
"ary" = (
-/obj/structure/closet,
-/obj/item/coin/iron,
-/obj/effect/spawner/lootdrop/maintenance,
-/turf/open/floor/plating,
-/area/maintenance/starboard/fore)
+/obj/machinery/airalarm{
+ pixel_y = 23
+ },
+/turf/open/floor/wood,
+/area/crew_quarters/dorms)
"arz" = (
/obj/item/coin/gold,
/obj/item/coin/iron,
@@ -8112,11 +8117,26 @@
"arA" = (
/obj/structure/closet,
/obj/effect/spawner/lootdrop/maintenance,
+/obj/item/coin/plasma,
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
"arB" = (
/turf/closed/wall/r_wall,
/area/hallway/secondary/entry)
+"arC" = (
+/obj/machinery/light{
+ dir = 8
+ },
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
+"arD" = (
+/obj/item/radio/intercom{
+ dir = 4;
+ name = "Station Intercom (General)";
+ pixel_x = 27
+ },
+/turf/open/floor/carpet,
+/area/crew_quarters/dorms)
"arE" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on,
/obj/effect/turf_decal/tile/yellow{
@@ -8204,14 +8224,27 @@
/turf/open/floor/plating,
/area/maintenance/port/fore)
"arO" = (
-/obj/machinery/monkey_recycler,
-/obj/item/reagent_containers/food/snacks/monkeycube,
-/obj/item/reagent_containers/food/snacks/monkeycube,
-/turf/open/floor/plating,
-/area/maintenance/port/fore)
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/obj/structure/chair/sofa,
+/obj/item/radio/intercom{
+ pixel_y = 25
+ },
+/obj/effect/landmark/start/assistant,
+/turf/open/floor/plasteel,
+/area/crew_quarters/fitness)
"arP" = (
/turf/closed/wall,
/area/maintenance/fore)
+"arQ" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral,
+/turf/open/floor/plasteel,
+/area/crew_quarters/dorms)
"arR" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on,
/obj/structure/table/wood,
@@ -8284,14 +8317,15 @@
/turf/open/floor/plasteel,
/area/hallway/primary/fore)
"asb" = (
-/obj/structure/disposalpipe/trunk{
- dir = 8
+/obj/structure/sign/warning/fire{
+ desc = "A sign that states the labeled room's number.";
+ dir = 5;
+ icon_state = "roomnum";
+ name = "Room Number 7";
+ pixel_y = 24
},
-/obj/machinery/disposal/bin,
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral{
+/obj/structure/chair/sofa/right,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/turf/open/floor/plasteel,
@@ -8335,20 +8369,11 @@
/turf/open/floor/plasteel,
/area/crew_quarters/dorms)
"asg" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+/obj/structure/chair{
dir = 4
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
/turf/open/floor/plasteel,
-/area/crew_quarters/dorms)
+/area/crew_quarters/fitness)
"ash" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -8381,7 +8406,10 @@
/turf/open/floor/plating,
/area/security/vacantoffice/b)
"ask" = (
-/obj/structure/dresser,
+/obj/machinery/light/small{
+ dir = 4;
+ light_color = "#d8b1b1"
+ },
/turf/open/floor/wood,
/area/crew_quarters/dorms)
"asl" = (
@@ -8392,12 +8420,15 @@
/turf/open/floor/plating,
/area/security/vacantoffice/b)
"asm" = (
-/obj/machinery/light/small{
- dir = 1
+/obj/structure/closet/secure_closet/bar{
+ req_access_txt = "25"
},
-/obj/machinery/atmospherics/components/unary/vent_pump/on,
+/obj/item/clothing/under/waiter,
+/obj/item/clothing/under/waiter,
+/obj/item/clothing/under/waiter,
+/obj/item/gun/ballistic/revolver/doublebarrel,
/turf/open/floor/wood,
-/area/crew_quarters/dorms)
+/area/crew_quarters/bar)
"asn" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
/turf/open/floor/plating,
@@ -8414,69 +8445,41 @@
/turf/open/floor/plating,
/area/maintenance/fore)
"asp" = (
-/obj/structure/table/wood,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/machinery/vending/wardrobe/bar_wardrobe,
/turf/open/floor/wood,
-/area/crew_quarters/dorms)
+/area/crew_quarters/bar)
"asq" = (
-/obj/machinery/camera{
- c_tag = "Fitness Room"
+/obj/machinery/light,
+/obj/machinery/firealarm{
+ dir = 1;
+ pixel_y = -24
},
-/obj/structure/closet/masks,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
"asr" = (
-/obj/structure/closet/boxinggloves,
-/obj/machinery/light{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/obj/item/clothing/shoes/jackboots,
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
+/obj/structure/table/wood/fancy,
+/obj/item/reagent_containers/food/drinks/soda_cans/starkist{
+ pixel_x = -3;
+ pixel_y = 5
},
/turf/open/floor/plasteel,
/area/crew_quarters/fitness)
"ass" = (
-/obj/structure/closet/lasertag/red,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 10
+/obj/effect/mapping_helpers/airlock/cyclelink_helper,
+/obj/machinery/door/airlock/external{
+ name = "External Access";
+ req_access_txt = "13"
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
+/turf/open/floor/plating,
+/area/maintenance/starboard/fore)
"ast" = (
-/obj/structure/closet/lasertag/blue,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
+/obj/machinery/airalarm{
+ pixel_y = 23
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
+/obj/structure/chair/sofa/left,
+/turf/open/floor/carpet,
+/area/crew_quarters/dorms)
"asu" = (
/obj/structure/bed,
/obj/machinery/button/door{
@@ -8496,6 +8499,9 @@
lootcount = 3;
name = "3maintenance loot spawner"
},
+/obj/structure/light_construct{
+ dir = 8
+ },
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
"asw" = (
@@ -8531,6 +8537,10 @@
"asC" = (
/turf/open/floor/plasteel/airless,
/area/space/nearstation)
+"asD" = (
+/obj/machinery/light,
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
"asE" = (
/turf/closed/wall,
/area/hallway/secondary/entry)
@@ -8538,6 +8548,13 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/construction/mining/aux_base)
+"asG" = (
+/obj/machinery/camera{
+ c_tag = "Bar South";
+ dir = 1
+ },
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
"asH" = (
/obj/structure/closet/toolcloset,
/obj/effect/turf_decal/tile/yellow{
@@ -8582,40 +8599,30 @@
/turf/open/floor/plating,
/area/maintenance/port/fore)
"asL" = (
-/obj/structure/bed,
-/obj/machinery/button/door{
- id = "Dorm6";
- name = "Cabin Bolt Control";
- normaldoorcontrol = 1;
- pixel_y = -25;
- specialfunctions = 4
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
-/obj/effect/spawner/lootdrop/bedsheet,
-/turf/open/floor/wood,
-/area/crew_quarters/dorms)
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plating,
+/area/space/nearstation)
"asM" = (
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- dir = 8
+/obj/structure/cable{
+ icon_state = "1-2"
},
/obj/structure/cable{
- icon_state = "1-4"
+ icon_state = "2-4"
},
-/obj/effect/turf_decal/tile/neutral{
+/turf/open/floor/plating,
+/area/maintenance/starboard/fore)
+"asN" = (
+/obj/machinery/light/small{
dir = 1
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
+/obj/machinery/camera{
+ c_tag = "Fore Starboard Solar Access"
},
-/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
-"asN" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
+/obj/structure/cable{
+ icon_state = "4-8"
},
-/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
+/turf/open/floor/plating,
+/area/maintenance/starboard/fore)
"asO" = (
/obj/structure/reagent_dispensers/fueltank,
/turf/open/floor/plating,
@@ -8643,48 +8650,64 @@
/turf/open/floor/plating,
/area/maintenance/fore)
"asU" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/effect/spawner/lootdrop/maintenance{
+ lootcount = 8;
+ name = "8maintenance loot spawner"
+ },
/turf/open/floor/plasteel,
/area/security/vacantoffice/b)
"asV" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- dir = 1
+/obj/machinery/power/apc{
+ areastring = "/area/maintenance/starboard/fore";
+ dir = 1;
+ name = "Starboard Bow Maintenance APC";
+ pixel_y = 24
},
/obj/structure/cable{
- icon_state = "2-8"
+ icon_state = "0-8"
},
-/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
+/turf/open/floor/plating,
+/area/maintenance/starboard/fore)
"asW" = (
-/obj/machinery/light/small{
- dir = 8
+/obj/structure/table/wood,
+/obj/item/storage/box/evidence,
+/obj/item/hand_labeler{
+ pixel_x = 5
},
-/obj/structure/rack,
-/obj/item/storage/briefcase,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/item/taperecorder,
/turf/open/floor/plasteel/grimy,
/area/security/detectives_office)
"asX" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/item/radio/intercom{
+ pixel_y = 25
+ },
/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
+/area/crew_quarters/dorms)
"asY" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 9
+/obj/machinery/door/poddoor/shutters/preopen{
+ id = "holoprivacy";
+ name = "Holodeck Shutters"
},
/turf/open/floor/plating,
/area/crew_quarters/fitness)
"asZ" = (
+/obj/structure/chair/sofa/left,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
- },
-/obj/machinery/vr_sleeper,
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
- dir = 4
+ dir = 10
},
/turf/open/floor/plasteel,
/area/crew_quarters/fitness)
@@ -8725,23 +8748,23 @@
/turf/open/floor/carpet,
/area/crew_quarters/dorms)
"atf" = (
-/obj/structure/chair/stool{
- pixel_y = 8
+/obj/machinery/camera{
+ c_tag = "Bar Storage"
},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
- dir = 4
+/obj/structure/sink/kitchen{
+ pixel_y = 28
},
-/turf/open/floor/carpet,
-/area/crew_quarters/dorms)
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
"atg" = (
/obj/machinery/door/airlock{
id_tag = "Dorm4";
- name = "Dorm 4"
+ name = "Room Three"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/dark,
/area/crew_quarters/dorms)
"ath" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -8772,6 +8795,17 @@
},
/turf/open/floor/plasteel,
/area/crew_quarters/dorms)
+"atk" = (
+/obj/machinery/light/small,
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
+"atl" = (
+/obj/machinery/airalarm{
+ dir = 4;
+ pixel_x = -23
+ },
+/turf/open/floor/carpet,
+/area/crew_quarters/dorms)
"atm" = (
/turf/open/floor/wood,
/area/crew_quarters/dorms)
@@ -8816,7 +8850,13 @@
/turf/open/floor/plating,
/area/security/vacantoffice/b)
"att" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/structure/table/wood/fancy,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/item/reagent_containers/food/drinks/britcup{
+ desc = "Kingston's personal cup.";
+ pixel_x = 5;
+ pixel_y = 5
+ },
/turf/open/floor/plasteel,
/area/crew_quarters/fitness)
"atu" = (
@@ -8860,8 +8900,22 @@
icon_state = "panelscorched"
},
/area/maintenance/starboard/fore)
+"atz" = (
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+ dir = 4
+ },
+/obj/structure/closet/wardrobe/black,
+/obj/item/clothing/under/skirt/black,
+/obj/item/clothing/head/beret/black,
+/obj/item/clothing/head/beret/black,
+/obj/item/clothing/under/trendy_fit,
+/obj/item/clothing/under/trendy_fit,
+/obj/item/clothing/under/sundress,
+/turf/open/floor/plasteel,
+/area/crew_quarters/fitness)
"atA" = (
/obj/structure/table,
+/obj/item/paicard,
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
"atB" = (
@@ -8957,13 +9011,19 @@
/turf/closed/wall,
/area/maintenance/port/fore)
"atQ" = (
-/obj/machinery/door/airlock{
- id_tag = "Dorm5";
- name = "Cabin 1"
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+ dir = 8
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/wood,
-/area/crew_quarters/dorms)
+/obj/structure/closet/wardrobe/white,
+/obj/item/clothing/under/waiter,
+/obj/item/clothing/under/waiter,
+/obj/item/clothing/under/waiter,
+/obj/structure/sign/poster/contraband/lizard{
+ pixel_x = -32
+ },
+/obj/item/clothing/suit/straight_jacket,
+/turf/open/floor/plasteel,
+/area/crew_quarters/fitness)
"atR" = (
/obj/effect/landmark/carpspawn,
/obj/structure/lattice,
@@ -8973,10 +9033,15 @@
/turf/closed/wall,
/area/space/nearstation)
"atT" = (
-/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance,
-/turf/open/floor/plating,
-/area/maintenance/port/fore)
+/obj/structure/table/wood/poker,
+/obj/item/toy/cards/deck{
+ pixel_y = 5
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 1
+ },
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
"atU" = (
/obj/structure/rack,
/obj/effect/spawner/lootdrop/maintenance{
@@ -8986,44 +9051,48 @@
/turf/open/floor/plating,
/area/maintenance/port/fore)
"atV" = (
-/obj/machinery/airalarm{
- dir = 4;
- pixel_x = -23
- },
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
- dir = 1
+ dir = 4;
+ pixel_y = 5
},
-/obj/effect/turf_decal/tile/neutral{
+/obj/structure/chair/sofa{
dir = 1
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
/turf/open/floor/plasteel,
/area/crew_quarters/fitness)
"atW" = (
/obj/structure/chair/stool,
/turf/open/floor/plating,
/area/maintenance/port/fore)
+"atX" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 6
+ },
+/turf/open/floor/plating,
+/area/space/nearstation)
"atY" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/closed/wall,
/area/security/vacantoffice/b)
"atZ" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/public/glass{
- name = "Holodeck Door"
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 8
},
/turf/open/floor/plasteel,
/area/crew_quarters/fitness)
"aua" = (
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
- dir = 4
+/obj/structure/bed,
+/obj/machinery/button/door{
+ id = "Dorm6";
+ name = "Cabin Bolt Control";
+ normaldoorcontrol = 1;
+ pixel_y = -25;
+ specialfunctions = 4
},
-/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
+/obj/effect/spawner/lootdrop/bedsheet,
+/turf/open/floor/wood,
+/area/crew_quarters/dorms)
"aub" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/effect/turf_decal/tile/yellow,
@@ -9043,6 +9112,12 @@
},
/turf/open/floor/plasteel,
/area/construction/mining/aux_base)
+"aud" = (
+/obj/machinery/atmospherics/components/unary/tank/air{
+ dir = 8
+ },
+/turf/open/floor/plating,
+/area/maintenance/starboard/fore)
"aue" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/closed/wall,
@@ -9146,60 +9221,60 @@
/turf/open/floor/plating,
/area/maintenance/fore)
"aup" = (
-/obj/machinery/door/airlock{
- id_tag = "Dorm6";
- name = "Cabin 2"
+/obj/structure/table/wood/fancy,
+/obj/item/reagent_containers/food/condiment/saltshaker{
+ pixel_x = -3;
+ pixel_y = 9
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/wood,
-/area/crew_quarters/dorms)
+/obj/item/reagent_containers/food/condiment/peppermill{
+ dir = 1;
+ pixel_x = 3;
+ pixel_y = 9
+ },
+/turf/open/floor/plasteel,
+/area/crew_quarters/fitness)
"auq" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/closed/wall,
/area/security/vacantoffice/b)
"aur" = (
-/obj/machinery/door/window/eastright{
- base_state = "left";
- dir = 8;
- icon_state = "left";
- name = "Fitness Ring"
- },
-/obj/structure/window/reinforced{
- dir = 1
- },
-/turf/open/floor/plasteel/dark,
-/area/crew_quarters/fitness)
+/obj/structure/table/wood/fancy/black,
+/obj/machinery/light/small,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
+/turf/open/floor/carpet,
+/area/crew_quarters/dorms)
"aus" = (
-/obj/structure/cable{
- icon_state = "1-2"
+/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
+/area/crew_quarters/dorms)
"aut" = (
-/obj/structure/window/reinforced{
- dir = 1
+/obj/machinery/door/airlock{
+ id_tag = "Room One";
+ name = "Room Six - Luxury Suite"
},
+/obj/machinery/door/firedoor,
/turf/open/floor/plasteel/dark,
-/area/crew_quarters/fitness)
+/area/crew_quarters/dorms)
"auu" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- dir = 4
+/obj/structure/closet/secure_closet/personal/cabinet{
+ desc = "Swipe your ID on the closet to claim it. First come first serve, this one is wooden and fancy. Store your stuff here.";
+ name = "Personal ID-Locked Closet";
+ pixel_y = 15
},
-/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
+/turf/open/floor/wood,
+/area/crew_quarters/dorms)
"auv" = (
-/obj/structure/window/reinforced{
- dir = 4
+/obj/machinery/atmospherics/components/unary/vent_pump/on,
+/obj/structure/closet/secure_closet/personal/cabinet{
+ desc = "Swipe your ID on the closet to claim it. First come first serve, this one is wooden and fancy. Store your stuff here.";
+ name = "Personal ID-Locked Closet";
+ pixel_y = 15
},
-/obj/structure/window/reinforced{
- dir = 1
- },
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
- dir = 4
- },
-/turf/open/floor/plasteel/dark,
-/area/crew_quarters/fitness)
+/turf/open/floor/wood,
+/area/crew_quarters/dorms)
"auw" = (
/obj/structure/bed,
/obj/machinery/airalarm{
@@ -9219,54 +9294,79 @@
/turf/open/floor/carpet,
/area/crew_quarters/dorms)
"aux" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+ dir = 8
+ },
+/obj/machinery/meter,
+/turf/open/floor/plating,
+/area/maintenance/starboard/fore)
+"auy" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
-/turf/open/floor/plasteel,
-/area/crew_quarters/dorms)
-"auy" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/public/glass{
- name = "Holodeck Door"
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 5
- },
-/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
-"auz" = (
-/obj/machinery/camera{
- c_tag = "Holodeck"
- },
-/obj/machinery/airalarm{
- pixel_y = 24
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
- dir = 8
- },
-/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
-"auA" = (
-/obj/machinery/light/small{
+/obj/effect/turf_decal/tile/neutral{
dir = 1
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/plasteel,
+/area/crew_quarters/dorms)
+"auz" = (
+/obj/machinery/light/small,
+/obj/machinery/atmospherics/components/unary/tank/air{
+ dir = 8
+ },
+/turf/open/floor/plating,
+/area/maintenance/starboard/fore)
+"auA" = (
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 4
},
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/structure/sign/warning/fire{
+ desc = "A sign that states the labeled room's number.";
+ dir = 4;
+ icon_state = "roomnum";
+ name = "Room Number 3";
+ pixel_x = -30;
+ pixel_y = -7
+ },
+/obj/effect/landmark/start/assistant,
/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
+/area/crew_quarters/dorms)
"auB" = (
/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 9
+ },
+/obj/machinery/door/poddoor/shutters/preopen{
+ id = "holoprivacy";
+ name = "Holodeck Shutters"
+ },
/turf/open/floor/plating,
/area/crew_quarters/fitness)
"auC" = (
-/obj/machinery/light/small,
-/turf/open/floor/plating,
-/area/maintenance/starboard/fore)
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/turf/open/floor/plasteel,
+/area/crew_quarters/dorms)
"auD" = (
/obj/structure/reagent_dispensers/fueltank,
/turf/open/floor/plating,
@@ -9328,6 +9428,21 @@
},
/turf/open/floor/plasteel,
/area/maintenance/department/electrical)
+"auN" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 5
+ },
+/turf/open/floor/plasteel,
+/area/crew_quarters/dorms)
"auO" = (
/obj/structure/closet/emcloset,
/turf/open/floor/plating,
@@ -9339,37 +9454,20 @@
/turf/open/floor/plasteel,
/area/construction/mining/aux_base)
"auR" = (
-/obj/machinery/light{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden,
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/turf/open/floor/plasteel,
-/area/crew_quarters/dorms)
+/turf/closed/wall,
+/area/crew_quarters/fitness)
"auS" = (
-/obj/machinery/requests_console{
- department = "Crew Quarters";
- pixel_y = 30
- },
/obj/machinery/camera{
- c_tag = "Dormitory North"
+ c_tag = "Holodeck"
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
+/obj/machinery/airalarm{
+ pixel_y = 24
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+ dir = 8
},
/turf/open/floor/plasteel,
-/area/crew_quarters/dorms)
+/area/crew_quarters/fitness)
"auT" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -9377,36 +9475,20 @@
/turf/open/floor/plating,
/area/maintenance/port/fore)
"auU" = (
-/obj/machinery/firealarm{
- dir = 2;
- pixel_y = 24
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/turf/open/floor/plasteel,
-/area/crew_quarters/dorms)
+/obj/machinery/atmospherics/components/binary/valve,
+/turf/open/floor/plating,
+/area/maintenance/starboard/fore)
"auV" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/closed/wall,
/area/maintenance/port/fore)
"auW" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/effect/turf_decal/tile/neutral{
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 1
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
/turf/open/floor/plasteel,
/area/crew_quarters/dorms)
"auX" = (
@@ -9475,13 +9557,7 @@
/turf/open/floor/plating,
/area/maintenance/fore)
"avg" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
/turf/open/floor/plasteel,
/area/crew_quarters/dorms)
"avh" = (
@@ -9490,18 +9566,18 @@
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/machinery/power/apc{
+ areastring = "/area/security/vacantoffice/b";
dir = 8;
name = "Vacant Office B APC";
- areastring = "/area/security/vacantoffice/b";
pixel_x = -24
},
/turf/open/floor/plating,
/area/maintenance/fore)
"avi" = (
/obj/machinery/power/apc{
+ areastring = "/area/lawoffice";
dir = 1;
name = "Law Office APC";
- areastring = "/area/lawoffice";
pixel_y = 24
},
/obj/structure/cable{
@@ -9533,43 +9609,17 @@
/turf/open/floor/plasteel,
/area/hallway/primary/fore)
"avl" = (
-/obj/structure/extinguisher_cabinet{
- pixel_x = -5;
- pixel_y = 30
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
+ dir = 8
},
/turf/open/floor/plasteel,
/area/crew_quarters/dorms)
"avm" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel,
/area/crew_quarters/dorms)
"avn" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
+/obj/structure/disposalpipe/segment,
/turf/open/floor/plasteel,
/area/crew_quarters/dorms)
"avo" = (
@@ -9597,8 +9647,7 @@
pixel_y = 24
},
/obj/machinery/camera{
- c_tag = "Detective's Office";
- dir = 2
+ c_tag = "Detective's Office"
},
/turf/open/floor/plasteel/grimy,
/area/security/detectives_office)
@@ -9616,68 +9665,63 @@
/turf/open/floor/plating,
/area/maintenance/fore)
"avt" = (
-/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
+ dir = 4
+ },
/turf/open/floor/plasteel,
/area/crew_quarters/dorms)
"avu" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/effect/turf_decal/tile/neutral{
+/obj/structure/chair/sofa/left{
dir = 1
},
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/turf/open/floor/plasteel,
-/area/crew_quarters/dorms)
-"avv" = (
-/obj/structure/chair/stool{
- pixel_y = 8
- },
-/obj/effect/landmark/start/assistant,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
- },
-/turf/open/floor/plasteel,
-/area/crew_quarters/dorms)
-"avw" = (
-/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
/turf/open/floor/plasteel,
/area/crew_quarters/fitness)
+"avv" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/machinery/meter,
+/turf/open/floor/plating,
+/area/maintenance/starboard/fore)
+"avw" = (
+/obj/machinery/button/door{
+ id = "Room One";
+ name = "Door Bolt Control";
+ normaldoorcontrol = 1;
+ pixel_x = -25;
+ specialfunctions = 4
+ },
+/turf/open/floor/carpet,
+/area/crew_quarters/dorms)
"avx" = (
-/obj/effect/spawner/structure/window,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+ dir = 8
+ },
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/plasteel,
+/area/crew_quarters/dorms)
+"avy" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/door/poddoor/shutters/preopen{
+ id = "holoprivacy";
+ name = "Holodeck Shutters"
+ },
/turf/open/floor/plating,
/area/crew_quarters/fitness)
-"avy" = (
-/obj/structure/window/reinforced{
- dir = 8
- },
-/turf/open/floor/plasteel/dark,
-/area/crew_quarters/fitness)
"avz" = (
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
+/obj/machinery/computer/holodeck{
dir = 4
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
/area/crew_quarters/fitness)
"avA" = (
-/obj/structure/window/reinforced{
- dir = 4
+/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden,
+/obj/machinery/light{
+ dir = 4;
+ light_color = "#e8eaff"
},
-/turf/open/floor/plasteel/dark,
+/obj/structure/chair/sofa/right{
+ dir = 1
+ },
+/turf/open/floor/plasteel,
/area/crew_quarters/fitness)
"avB" = (
/obj/effect/spawner/structure/window/reinforced,
@@ -9687,17 +9731,20 @@
/turf/open/floor/plating,
/area/ai_monitored/security/armory)
"avC" = (
-/obj/structure/chair{
- dir = 8
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 5
},
-/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
+/turf/open/floor/plating,
+/area/maintenance/starboard/fore)
"avD" = (
-/obj/machinery/computer/holodeck{
- dir = 4
+/obj/structure/cable{
+ icon_state = "2-4"
},
-/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 10
+ },
+/turf/open/floor/plating,
+/area/maintenance/starboard/fore)
"avE" = (
/obj/machinery/door/poddoor/preopen{
id = "maint3"
@@ -9746,9 +9793,9 @@
/area/maintenance/department/electrical)
"avL" = (
/obj/machinery/power/apc{
+ areastring = "/area/maintenance/department/electrical";
dir = 1;
name = "Electrical Maintenance APC";
- areastring = "/area/maintenance/department/electrical";
pixel_y = 24
},
/obj/structure/cable{
@@ -9777,8 +9824,6 @@
},
/obj/item/multitool,
/obj/item/radio/intercom{
- freerange = 0;
- frequency = 1459;
name = "Station Intercom (General)";
pixel_x = 29
},
@@ -9810,11 +9855,17 @@
/turf/open/floor/plasteel,
/area/construction/mining/aux_base)
"avR" = (
-/obj/structure/table/wood,
-/obj/item/storage/firstaid/regular,
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
-/turf/open/floor/plasteel,
-/area/crew_quarters/dorms)
+/obj/structure/table/wood/poker,
+/obj/item/clothing/mask/cigarette/cigar{
+ pixel_x = 3;
+ pixel_y = 3
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+ dir = 4;
+ pixel_y = 5
+ },
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
"avS" = (
/obj/item/wrench,
/turf/open/floor/plating,
@@ -9892,9 +9943,9 @@
/area/maintenance/fore)
"awd" = (
/obj/machinery/power/apc{
+ areastring = "/area/maintenance/fore";
dir = 1;
name = "Fore Maintenance APC";
- areastring = "/area/maintenance/fore";
pixel_y = 24
},
/obj/structure/cable{
@@ -10027,60 +10078,73 @@
/turf/open/floor/plating,
/area/maintenance/fore/secondary)
"awo" = (
-/obj/machinery/door/airlock{
- id_tag = "Dorm3";
- name = "Dorm 3"
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+/obj/structure/chair/comfy/black{
dir = 4
},
-/turf/open/floor/plasteel,
+/obj/item/radio/intercom{
+ name = "Station Intercom (General)";
+ pixel_y = -29
+ },
+/turf/open/floor/carpet,
/area/crew_quarters/dorms)
"awp" = (
-/obj/structure/table/wood,
+/obj/structure/disposalpipe/segment{
+ dir = 5
+ },
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/obj/item/storage/pill_bottle/dice,
/turf/open/floor/plasteel,
/area/crew_quarters/dorms)
"awq" = (
-/obj/structure/chair/stool{
- pixel_y = 8
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
- },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel,
-/area/crew_quarters/dorms)
+/area/crew_quarters/fitness)
"awr" = (
/turf/open/floor/plasteel,
/area/crew_quarters/dorms)
"aws" = (
-/obj/structure/table/wood,
-/obj/item/coin/silver,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/public/glass{
+ name = "Holodeck Door"
+ },
+/turf/open/floor/plasteel/dark,
+/area/crew_quarters/fitness)
+"awt" = (
+/obj/structure/disposalpipe/segment{
dir = 4
},
-/turf/open/floor/plasteel,
-/area/crew_quarters/dorms)
-"awt" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 9
+ dir = 4
},
/turf/open/floor/plasteel,
/area/crew_quarters/dorms)
"awu" = (
-/obj/structure/chair/stool{
- pixel_y = 8
- },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/structure/closet/wardrobe/mixed,
+/obj/item/clothing/under/kilt,
+/obj/item/clothing/under/kilt,
+/obj/item/clothing/under/skirt/purple,
+/obj/item/clothing/head/beret,
+/obj/item/clothing/head/beret,
+/obj/item/clothing/head/beret,
/turf/open/floor/plasteel,
-/area/crew_quarters/dorms)
+/area/crew_quarters/fitness)
"awv" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
+/obj/structure/sign/warning/fire{
+ desc = "A sign that states the labeled room's number.";
+ dir = 8;
+ icon_state = "roomnum";
+ name = "Room Number 4";
+ pixel_y = 24
+ },
+/obj/effect/turf_decal/tile/neutral{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
/turf/open/floor/plasteel,
/area/crew_quarters/dorms)
"aww" = (
@@ -10097,48 +10161,62 @@
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
"awy" = (
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+ dir = 4
+ },
+/turf/open/floor/carpet,
+/area/crew_quarters/dorms)
"awz" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/public/glass{
- name = "Fitness"
+ name = "Holodeck Door"
},
-/turf/open/floor/plasteel,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 5
+ },
+/turf/open/floor/plasteel/dark,
/area/crew_quarters/fitness)
"awA" = (
-/obj/structure/cable{
- icon_state = "1-2"
+/obj/machinery/door/airlock{
+ id_tag = "Dorm5";
+ name = "Room Four"
},
-/obj/machinery/holopad,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/plasteel/dark,
+/area/crew_quarters/dorms)
"awB" = (
-/obj/effect/landmark/start/assistant,
-/obj/machinery/vr_sleeper,
-/obj/effect/turf_decal/tile/green,
-/obj/effect/turf_decal/tile/green{
- dir = 4
- },
-/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
"awC" = (
-/obj/structure/table,
-/obj/item/paper/fluff/holodeck/disclaimer,
-/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
"awD" = (
/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
"awE" = (
-/obj/effect/decal/cleanable/cobweb/cobweb2,
-/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance,
-/turf/open/floor/plating,
-/area/maintenance/starboard/fore)
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/structure/table/wood,
+/obj/item/reagent_containers/food/condiment/saltshaker{
+ pixel_x = -3;
+ pixel_y = 20
+ },
+/obj/item/reagent_containers/food/condiment/peppermill{
+ dir = 1;
+ pixel_x = 3;
+ pixel_y = 20
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/item/reagent_containers/food/drinks/britcup,
+/turf/open/floor/plasteel,
+/area/crew_quarters/dorms)
"awF" = (
/obj/structure/closet/crate,
/obj/effect/spawner/lootdrop/maintenance{
@@ -10179,26 +10257,34 @@
/area/maintenance/starboard/fore)
"awK" = (
/obj/structure/table/glass,
-/obj/item/pen,
+/obj/item/coin/silver,
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
"awL" = (
-/obj/structure/table/glass,
-/obj/item/paper_bin{
- pixel_x = -3;
- pixel_y = 7
+/obj/structure/table,
+/obj/item/instrument/guitar{
+ pixel_x = -7
},
+/obj/item/instrument/eguitar{
+ pixel_x = 5
+ },
+/obj/item/instrument/violin,
+/obj/item/instrument/trombone,
+/obj/item/instrument/saxophone,
+/obj/item/instrument/piano_synth,
+/obj/item/instrument/recorder,
+/obj/item/instrument/accordion,
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
"awM" = (
-/obj/structure/cable{
- icon_state = "2-4"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 6
+/obj/machinery/button/door{
+ id = "maintdiy";
+ name = "Shutters Control Button";
+ pixel_x = -6;
+ pixel_y = 24
},
/turf/open/floor/plating,
-/area/maintenance/starboard/fore)
+/area/crew_quarters/abandoned_gambling_den)
"awN" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -10294,6 +10380,14 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/hallway/secondary/entry)
+"awX" = (
+/obj/machinery/door/airlock{
+ id_tag = "Dorm6";
+ name = "Room Five"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/plasteel/dark,
+/area/crew_quarters/dorms)
"awY" = (
/obj/machinery/light{
dir = 1
@@ -10357,6 +10451,15 @@
},
/turf/open/floor/plasteel,
/area/construction/mining/aux_base)
+"axd" = (
+/obj/structure/closet,
+/obj/effect/decal/cleanable/cobweb,
+/obj/effect/spawner/lootdrop/maintenance{
+ lootcount = 4;
+ name = "4maintenance loot spawner"
+ },
+/turf/open/floor/plating,
+/area/maintenance/starboard/fore)
"axe" = (
/obj/machinery/sleeper{
dir = 4
@@ -10558,12 +10661,11 @@
/turf/open/floor/plasteel,
/area/hallway/primary/fore)
"axC" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+/obj/effect/turf_decal/tile/red{
dir = 4
},
-/obj/effect/turf_decal/tile/blue{
- dir = 8
+/obj/structure/sign/poster/official/enlist{
+ pixel_y = 32
},
/turf/open/floor/plasteel,
/area/hallway/primary/fore)
@@ -10574,12 +10676,16 @@
/turf/closed/wall,
/area/maintenance/fore/secondary)
"axE" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- dir = 1
+/obj/structure/closet,
+/obj/effect/spawner/lootdrop/maintenance{
+ lootcount = 8;
+ name = "8maintenance loot spawner"
},
-/obj/effect/turf_decal/tile/blue,
-/turf/open/floor/plasteel,
-/area/hallway/primary/fore)
+/obj/item/radio/intercom{
+ pixel_y = 25
+ },
+/turf/open/floor/plating,
+/area/crew_quarters/abandoned_gambling_den)
"axF" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 9
@@ -10617,6 +10723,12 @@
},
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
+"axJ" = (
+/obj/structure/piano{
+ icon_state = "piano"
+ },
+/turf/open/floor/plating,
+/area/maintenance/starboard/fore)
"axK" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 8
@@ -10624,128 +10736,189 @@
/turf/closed/wall,
/area/maintenance/port/fore)
"axL" = (
-/obj/machinery/holopad,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/structure/closet/wardrobe/grey,
+/obj/item/clothing/under/assistantformal,
+/obj/item/clothing/under/assistantformal,
+/obj/machinery/camera{
+ c_tag = "Dorms East - Holodeck";
+ dir = 4
+ },
/turf/open/floor/plasteel,
-/area/crew_quarters/dorms)
+/area/crew_quarters/fitness)
"axM" = (
-/obj/structure/table/wood,
-/obj/item/paicard,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 10
+ },
/turf/open/floor/plasteel,
/area/crew_quarters/dorms)
"axN" = (
-/obj/structure/table/wood,
-/obj/item/storage/crayons,
-/turf/open/floor/plasteel,
+/obj/structure/chair/comfy/black{
+ dir = 8
+ },
+/turf/open/floor/carpet,
/area/crew_quarters/dorms)
"axO" = (
-/obj/structure/chair/stool{
- pixel_y = 8
- },
-/obj/effect/landmark/start/assistant,
-/turf/open/floor/plasteel,
+/obj/machinery/light/small,
+/turf/open/floor/mineral/titanium/blue,
/area/crew_quarters/dorms)
"axP" = (
-/obj/structure/table/wood,
-/obj/item/toy/cards/deck{
- pixel_x = 2
+/obj/structure/cable{
+ icon_state = "4-8"
},
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/structure/table/wood,
+/obj/item/paicard,
/obj/item/clothing/mask/balaclava{
pixel_x = -8;
pixel_y = 8
},
+/obj/item/toy/cards/deck{
+ pixel_x = 2
+ },
+/obj/item/storage/crayons,
/turf/open/floor/plasteel,
/area/crew_quarters/dorms)
"axQ" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
-"axR" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/public/glass{
- name = "Fitness"
- },
-/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
-"axS" = (
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
+/obj/machinery/light{
dir = 8
},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral{
dir = 8
},
-/turf/open/floor/plasteel/dark,
-/area/crew_quarters/fitness)
-"axT" = (
-/obj/structure/cable{
- icon_state = "1-2"
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+ dir = 4
},
-/obj/structure/cable{
- icon_state = "2-8"
- },
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- dir = 8
- },
-/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
-"axU" = (
-/obj/structure/window/reinforced,
-/turf/open/floor/plasteel/dark,
-/area/crew_quarters/fitness)
-"axV" = (
-/obj/structure/cable{
- icon_state = "2-4"
+/obj/structure/sign/warning/fire{
+ desc = "A sign that states the labeled room's number.";
+ dir = 1;
+ icon_state = "roomnum";
+ name = "Room Number 2";
+ pixel_x = -30;
+ pixel_y = -7
},
/turf/open/floor/plasteel,
/area/crew_quarters/dorms)
-"axW" = (
-/obj/machinery/door/window/eastright{
- base_state = "left";
- icon_state = "left";
- name = "Fitness Ring"
+"axR" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
},
-/obj/structure/window/reinforced,
-/turf/open/floor/plasteel/dark,
-/area/crew_quarters/fitness)
-"axX" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/turf/open/floor/plasteel,
/area/crew_quarters/dorms)
-"axY" = (
-/obj/effect/turf_decal/tile/green,
-/obj/effect/turf_decal/tile/green{
+"axS" = (
+/obj/item/flashlight/lamp/green{
+ pixel_x = -3;
+ pixel_y = 22
+ },
+/obj/structure/dresser{
+ desc = "There's plenty of clothes here to change into! It has a surprising amount of variety, too.";
+ name = "Dresser";
+ pixel_y = 7
+ },
+/turf/open/floor/plating,
+/area/maintenance/port)
+"axT" = (
+/obj/machinery/door/airlock{
+ id_tag = "Dorm3";
+ name = "Room Two"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
+/turf/open/floor/plasteel/dark,
+/area/crew_quarters/dorms)
+"axU" = (
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
+/obj/structure/sign/warning/fire{
+ desc = "A sign that states the labeled room's number.";
+ dir = 6;
+ icon_state = "roomnum";
+ name = "Room Number 5";
+ pixel_y = 24
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
-"axZ" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/public/glass{
- name = "Holodeck Door"
+/area/crew_quarters/dorms)
+"axV" = (
+/obj/structure/chair/comfy/brown{
+ dir = 8
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
+"axW" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 6
},
/turf/open/floor/plasteel,
+/area/crew_quarters/dorms)
+"axX" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/obj/machinery/light/small,
+/turf/open/floor/carpet,
+/area/crew_quarters/dorms)
+"axY" = (
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+ dir = 1
+ },
+/obj/structure/closet/toolcloset,
+/turf/open/floor/plating,
+/area/maintenance/starboard/aft)
+"axZ" = (
+/obj/machinery/light/small{
+ dir = 1;
+ light_color = "#ffc1c1"
+ },
+/obj/machinery/airalarm{
+ pixel_y = 24
+ },
+/turf/open/floor/plasteel,
/area/crew_quarters/fitness)
"aya" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
- dir = 8
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
},
/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
+/area/crew_quarters/dorms)
"ayb" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
+/obj/structure/chair{
+ dir = 8
},
/turf/open/floor/plasteel,
/area/crew_quarters/fitness)
@@ -10821,9 +10994,7 @@
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"ayn" = (
-/obj/effect/turf_decal/stripes/corner{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/corner,
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"ayo" = (
@@ -10997,14 +11168,6 @@
/turf/closed/wall/r_wall,
/area/ai_monitored/storage/eva)
"ayM" = (
-/obj/machinery/firealarm{
- dir = 2;
- pixel_y = 24
- },
-/obj/item/clothing/head/welding,
-/turf/open/floor/plasteel,
-/area/ai_monitored/storage/eva)
-"ayN" = (
/obj/structure/rack,
/obj/machinery/light{
dir = 1
@@ -11014,8 +11177,15 @@
/obj/item/flashlight,
/obj/item/flashlight,
/obj/item/flashlight,
+/obj/item/clothing/glasses/welding,
/turf/open/floor/plasteel/dark,
/area/ai_monitored/storage/eva)
+"ayN" = (
+/obj/machinery/firealarm{
+ pixel_y = 24
+ },
+/turf/open/floor/plasteel,
+/area/ai_monitored/storage/eva)
"ayO" = (
/obj/structure/table,
/obj/item/storage/toolbox/electrical{
@@ -11029,9 +11199,9 @@
/area/ai_monitored/storage/eva)
"ayP" = (
/obj/machinery/power/apc{
+ areastring = "/area/ai_monitored/storage/eva";
dir = 1;
name = "EVA Storage APC";
- areastring = "/area/ai_monitored/storage/eva";
pixel_y = 24
},
/obj/structure/cable{
@@ -11114,38 +11284,45 @@
/turf/open/floor/plasteel,
/area/ai_monitored/storage/eva)
"ayY" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
- dir = 1
+/obj/structure/sign/poster/official/cohiba_robusto_ad,
+/turf/closed/wall,
+/area/lawoffice)
+"ayZ" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
},
/obj/effect/turf_decal/tile/blue{
dir = 8
},
-/turf/open/floor/plasteel,
-/area/hallway/primary/fore)
-"ayZ" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
- dir = 1
+/obj/structure/sign/poster/contraband/pwr_game{
+ pixel_x = -32
},
-/obj/effect/turf_decal/tile/blue,
/turf/open/floor/plasteel,
/area/hallway/primary/fore)
"aza" = (
-/obj/machinery/light,
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
+/obj/machinery/vr_sleeper{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/green{
dir = 8
},
-/turf/open/floor/plasteel,
-/area/crew_quarters/dorms)
+/obj/effect/turf_decal/tile/green{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/turf/open/floor/plasteel/white/side{
+ dir = 4
+ },
+/area/crew_quarters/fitness)
"azb" = (
-/obj/structure/chair/stool{
- pixel_y = 8
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
-/turf/open/floor/plasteel,
-/area/crew_quarters/dorms)
+/turf/open/floor/plasteel/dark,
+/area/crew_quarters/fitness)
"azc" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 4
@@ -11159,47 +11336,68 @@
/turf/open/floor/plasteel,
/area/crew_quarters/dorms)
"azd" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral{
+/obj/machinery/vr_sleeper{
dir = 8
},
-/turf/open/floor/plasteel,
-/area/crew_quarters/dorms)
-"aze" = (
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/turf/open/floor/plasteel,
-/area/crew_quarters/dorms)
-"azf" = (
-/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden,
-/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
-"azg" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 10
- },
-/turf/open/floor/plating,
-/area/crew_quarters/fitness)
-"azh" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/obj/machinery/vr_sleeper,
/obj/effect/turf_decal/tile/green,
/obj/effect/turf_decal/tile/green{
dir = 4
},
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/turf/open/floor/plasteel/white/side{
+ dir = 8
+ },
+/area/crew_quarters/fitness)
+"aze" = (
+/obj/machinery/vr_sleeper{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/turf/open/floor/plasteel/white/side{
+ dir = 4
+ },
+/area/crew_quarters/fitness)
+"azf" = (
+/obj/structure/grille/broken,
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/obj/structure/window{
+ dir = 4
+ },
+/obj/structure/window,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/plating{
+ icon_state = "panelscorched"
+ },
+/area/maintenance/starboard/fore)
+"azg" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/obj/machinery/button/door{
+ id = "holoprivacy";
+ name = "Holodeck Privacy";
+ pixel_y = 24
+ },
/turf/open/floor/plasteel,
/area/crew_quarters/fitness)
+"azh" = (
+/obj/machinery/door/airlock{
+ name = "Instrument Storage"
+ },
+/turf/open/floor/plasteel/dark,
+/area/maintenance/starboard/fore)
"azi" = (
/obj/machinery/door/airlock/maintenance{
name = "Garden Maintenance";
@@ -11209,61 +11407,81 @@
/turf/open/floor/plating,
/area/maintenance/port/fore)
"azj" = (
-/obj/structure/disposalpipe/segment{
- dir = 5
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
},
-/obj/item/radio/intercom{
- name = "Station Intercom (General)";
- pixel_y = -29
+/obj/structure/closet{
+ name = "Holodeck Outfits"
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
+/obj/item/clothing/under/trek/Q,
+/obj/item/clothing/under/trek/command/next,
+/obj/item/clothing/under/trek/command/next,
+/obj/item/clothing/under/trek/command/next,
+/obj/item/clothing/under/trek/engsec/next,
+/obj/item/clothing/under/trek/engsec/next,
+/obj/item/clothing/under/trek/engsec/next,
+/obj/item/clothing/under/trek/engsec/next,
+/obj/item/clothing/under/trek/medsci/next,
+/obj/item/clothing/under/trek/medsci/next,
+/obj/item/clothing/under/trek/medsci/next,
+/obj/item/clothing/under/mw2_russian_para,
+/obj/item/clothing/under/mw2_russian_para,
+/obj/item/clothing/under/gladiator,
+/obj/item/clothing/under/gladiator,
+/obj/machinery/firealarm{
+ dir = 8;
+ pixel_x = -24
},
/turf/open/floor/plasteel,
/area/crew_quarters/fitness)
"azk" = (
-/obj/structure/disposalpipe/segment{
- dir = 10
+/obj/structure/chair{
+ dir = 8
+ },
+/obj/machinery/light/small{
+ dir = 4;
+ light_color = "#d8b1b1"
},
/turf/open/floor/plasteel,
/area/crew_quarters/fitness)
"azl" = (
-/obj/structure/cable{
- icon_state = "1-2"
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
-/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
-"azm" = (
-/obj/structure/chair/stool{
- pixel_y = 8
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+ dir = 8
},
/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
-"azn" = (
-/obj/structure/table,
-/obj/item/storage/firstaid/regular,
-/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
-"azo" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
+/area/crew_quarters/dorms)
+"azm" = (
+/obj/machinery/shower{
dir = 4
},
-/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
+/turf/open/floor/plasteel/freezer,
+/area/crew_quarters/toilet)
+"azn" = (
+/turf/open/floor/plasteel/dark,
+/area/crew_quarters/dorms)
+"azo" = (
+/obj/machinery/shower{
+ dir = 8;
+ pixel_y = -4
+ },
+/turf/open/floor/plasteel/freezer,
+/area/crew_quarters/toilet)
"azp" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 10
+ },
+/obj/machinery/door/poddoor/shutters/preopen{
+ id = "holoprivacy";
+ name = "Holodeck Shutters"
+ },
/turf/open/floor/plating,
/area/crew_quarters/fitness)
"azq" = (
@@ -11466,6 +11684,27 @@
},
/turf/open/floor/plating,
/area/maintenance/fore)
+"azP" = (
+/obj/structure/table/wood,
+/obj/machinery/requests_console{
+ department = "Theatre";
+ name = "theatre RC";
+ pixel_x = -32
+ },
+/obj/item/reagent_containers/food/snacks/baguette,
+/obj/item/toy/dummy,
+/obj/item/lipstick/random{
+ pixel_x = 2;
+ pixel_y = 2
+ },
+/obj/item/lipstick/random{
+ pixel_x = -2;
+ pixel_y = -2
+ },
+/turf/open/floor/plasteel/white/side{
+ dir = 4
+ },
+/area/crew_quarters/theatre)
"azQ" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -11504,12 +11743,9 @@
/turf/open/floor/plasteel,
/area/ai_monitored/storage/eva)
"azT" = (
-/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden,
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
-/turf/open/floor/plasteel,
-/area/crew_quarters/dorms)
+/obj/effect/landmark/event_spawn,
+/turf/closed/wall,
+/area/crew_quarters/fitness)
"azU" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -11523,27 +11759,38 @@
/turf/open/floor/plasteel,
/area/ai_monitored/storage/eva)
"azV" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+/obj/machinery/vr_sleeper{
dir = 8
},
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/turf/open/floor/plasteel/white/side{
dir = 8
},
-/turf/open/floor/plasteel,
-/area/crew_quarters/dorms)
+/area/crew_quarters/fitness)
"azW" = (
/turf/open/floor/plasteel,
/area/ai_monitored/storage/eva)
"azX" = (
-/obj/machinery/door/airlock{
- name = "Unisex Showers"
+/obj/machinery/vr_sleeper{
+ dir = 4
},
-/obj/structure/cable{
- icon_state = "1-2"
+/obj/effect/turf_decal/tile/green{
+ dir = 8
},
-/turf/open/floor/plasteel/freezer,
-/area/crew_quarters/toilet)
+/obj/effect/turf_decal/tile/green,
+/obj/effect/turf_decal/tile/green{
+ dir = 1
+ },
+/turf/open/floor/plasteel/white/corner{
+ dir = 4
+ },
+/area/crew_quarters/fitness)
"azY" = (
/obj/structure/table,
/obj/item/radio/off,
@@ -11563,27 +11810,26 @@
/turf/open/floor/plasteel,
/area/hallway/primary/fore)
"aAb" = (
-/obj/machinery/door/airlock{
- id_tag = "Dorm2";
- name = "Dorm 2"
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
- },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel,
-/area/crew_quarters/dorms)
+/area/crew_quarters/fitness)
"aAc" = (
/obj/effect/spawner/structure/window,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
"aAd" = (
-/obj/machinery/light_switch{
- pixel_y = -25
+/obj/machinery/camera{
+ c_tag = "Dorms West"
},
-/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
- dir = 8
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
+ dir = 1
},
/turf/open/floor/plasteel,
/area/crew_quarters/dorms)
@@ -11595,46 +11841,51 @@
/turf/open/floor/plating,
/area/maintenance/port/fore)
"aAf" = (
-/obj/structure/closet/wardrobe/pjs,
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
+/obj/machinery/vr_sleeper{
dir = 8
},
-/turf/open/floor/plasteel,
-/area/crew_quarters/dorms)
+/obj/effect/turf_decal/tile/green{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/green,
+/obj/effect/turf_decal/tile/green{
+ dir = 4
+ },
+/turf/open/floor/plasteel/white/corner{
+ dir = 1
+ },
+/area/crew_quarters/fitness)
"aAg" = (
-/obj/item/radio/intercom{
- name = "Station Intercom (General)";
- pixel_y = -29
+/obj/machinery/vr_sleeper{
+ dir = 4
},
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
dir = 8
},
-/turf/open/floor/plasteel,
-/area/crew_quarters/dorms)
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/turf/open/floor/plasteel/white/corner{
+ dir = 4
+ },
+/area/crew_quarters/fitness)
"aAh" = (
/turf/closed/wall,
/area/crew_quarters/toilet)
"aAi" = (
-/obj/structure/closet/wardrobe/pjs,
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
+/obj/machinery/door/airlock/maintenance{
+ req_access_txt = "12"
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/turf/open/floor/plasteel,
-/area/crew_quarters/dorms)
+/turf/open/floor/plating,
+/area/crew_quarters/fitness)
"aAj" = (
/obj/structure/cable{
icon_state = "1-4"
},
/obj/machinery/power/apc{
- dir = 2;
- name = "Security Checkpoint APC";
areastring = "/area/security/checkpoint/auxiliary";
+ name = "Security Checkpoint APC";
pixel_x = 1;
pixel_y = -24
},
@@ -11643,119 +11894,77 @@
/turf/open/floor/plating,
/area/maintenance/port/fore)
"aAk" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/structure/disposalpipe/segment{
- dir = 5
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
+/obj/structure/closet/athletic_mixed,
/turf/open/floor/plasteel,
/area/crew_quarters/fitness)
"aAl" = (
-/obj/structure/cable{
- icon_state = "1-4"
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 5
- },
-/obj/structure/reagent_dispensers/water_cooler,
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
+/obj/structure/closet/boxinggloves,
/turf/open/floor/plasteel,
/area/crew_quarters/fitness)
"aAm" = (
-/obj/machinery/firealarm{
- dir = 1;
- pixel_y = -24
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/public/glass{
+ name = "Holodeck Door"
},
-/obj/structure/cable{
- icon_state = "4-8"
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 6
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/light,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/dark,
/area/crew_quarters/fitness)
"aAn" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/structure/disposalpipe/segment{
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 4
},
-/obj/machinery/light_switch{
- pixel_y = -25
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
+/area/crew_quarters/dorms)
"aAo" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+ dir = 1
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
+/turf/open/floor/plasteel/dark,
+/area/crew_quarters/dorms)
"aAp" = (
-/obj/structure/cable{
- icon_state = "2-8"
+/obj/structure/closet{
+ name = "Suit Closet"
},
-/obj/structure/disposalpipe/segment{
- dir = 10
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 10
- },
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
+/obj/item/clothing/under/suit_jacket/white,
+/obj/item/clothing/under/suit_jacket/tan,
+/obj/item/clothing/under/suit_jacket/red,
+/obj/item/clothing/under/suit_jacket/really_black,
+/obj/item/clothing/under/suit_jacket/navy,
+/obj/item/clothing/under/suit_jacket/green,
+/obj/item/clothing/under/suit_jacket/female,
+/obj/item/clothing/under/suit_jacket/checkered,
+/obj/item/clothing/under/suit_jacket/charcoal,
+/obj/item/clothing/under/suit_jacket/burgundy,
+/obj/item/clothing/under/suit_jacket,
+/obj/item/clothing/under/lawyer/black,
+/obj/item/clothing/under/lawyer/blacksuit,
+/obj/item/clothing/under/lawyer/blue,
+/obj/item/clothing/under/lawyer/bluesuit,
+/obj/item/clothing/under/lawyer/female,
+/obj/item/clothing/under/lawyer/purpsuit,
+/obj/item/clothing/under/lawyer/really_black,
+/obj/item/clothing/under/lawyer/red,
+/turf/open/floor/plasteel,
+/area/crew_quarters/fitness)
+"aAq" = (
+/obj/effect/spawner/lootdrop/maintenance,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
+/turf/open/floor/plating,
+/area/maintenance/starboard/fore)
+"aAr" = (
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
+/turf/open/floor/plasteel,
+/area/crew_quarters/fitness)
+"aAs" = (
+/obj/machinery/light/small{
+ dir = 4;
+ light_color = "#d8b1b1"
},
/turf/open/floor/plasteel,
/area/crew_quarters/fitness)
-"aAr" = (
-/obj/structure/closet,
-/obj/effect/decal/cleanable/cobweb,
-/obj/effect/spawner/lootdrop/maintenance,
-/turf/open/floor/plating,
-/area/maintenance/starboard/fore)
-"aAs" = (
-/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance{
- lootcount = 2;
- name = "2maintenance loot spawner"
- },
-/turf/open/floor/plating,
-/area/maintenance/starboard/fore)
"aAt" = (
/obj/machinery/door/poddoor/preopen{
id = "maint2"
@@ -11763,12 +11972,12 @@
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
"aAu" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
/obj/machinery/door/poddoor/preopen{
id = "maint2"
},
-/obj/structure/cable{
- icon_state = "1-2"
- },
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
"aAv" = (
@@ -11780,9 +11989,9 @@
/area/maintenance/starboard/fore)
"aAw" = (
/obj/machinery/power/apc{
+ areastring = "/area/hydroponics/garden";
dir = 4;
name = "Garden APC";
- areastring = "/area/hydroponics/garden";
pixel_x = 27;
pixel_y = 2
},
@@ -11796,9 +12005,7 @@
/turf/open/floor/plasteel,
/area/hydroponics/garden)
"aAy" = (
-/obj/machinery/power/smes{
- charge = 0
- },
+/obj/machinery/power/smes,
/obj/structure/cable{
icon_state = "0-4"
},
@@ -11825,9 +12032,7 @@
/turf/closed/wall,
/area/maintenance/department/electrical)
"aAB" = (
-/obj/machinery/power/smes{
- charge = 0
- },
+/obj/machinery/power/smes,
/obj/structure/cable{
icon_state = "0-8"
},
@@ -11900,9 +12105,8 @@
/area/hydroponics/garden)
"aAL" = (
/obj/machinery/power/apc{
- dir = 2;
- name = "Primary Tool Storage APC";
areastring = "/area/storage/primary";
+ name = "Primary Tool Storage APC";
pixel_x = 1;
pixel_y = -24
},
@@ -11914,6 +12118,16 @@
},
/turf/open/floor/plating,
/area/maintenance/port/fore)
+"aAM" = (
+/obj/structure/mirror{
+ pixel_y = 32
+ },
+/obj/structure/sink{
+ dir = 1;
+ pixel_y = 25
+ },
+/turf/open/floor/mineral/titanium/blue,
+/area/crew_quarters/toilet)
"aAN" = (
/obj/structure/cable{
icon_state = "2-8"
@@ -11989,18 +12203,11 @@
/turf/open/floor/plasteel,
/area/ai_monitored/storage/eva)
"aAX" = (
-/obj/machinery/light{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
},
/turf/open/floor/plasteel,
-/area/crew_quarters/dorms)
+/area/crew_quarters/fitness)
"aAY" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -12008,10 +12215,10 @@
/turf/open/floor/plating,
/area/maintenance/port/fore)
"aAZ" = (
-/obj/structure/cable{
- icon_state = "1-2"
+/obj/structure/urinal{
+ pixel_y = 32
},
-/turf/open/floor/plasteel/freezer,
+/turf/open/floor/mineral/titanium/blue,
/area/crew_quarters/toilet)
"aBa" = (
/turf/closed/wall/r_wall,
@@ -12084,9 +12291,9 @@
/area/maintenance/fore)
"aBi" = (
/obj/machinery/power/apc{
+ areastring = "/area/gateway";
dir = 8;
name = "Gateway APC";
- areastring = "/area/gateway";
pixel_x = -24;
pixel_y = -1
},
@@ -12126,7 +12333,6 @@
/turf/open/floor/plating,
/area/maintenance/port/fore)
"aBm" = (
-/obj/effect/landmark/start/assistant,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 5
},
@@ -12216,26 +12422,41 @@
/turf/open/floor/plasteel,
/area/hydroponics/garden)
"aBx" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 9
- },
-/turf/closed/wall,
-/area/crew_quarters/toilet)
+/obj/effect/turf_decal/stripes/corner,
+/turf/open/floor/plasteel,
+/area/hydroponics)
"aBy" = (
-/turf/open/floor/plasteel/freezer,
-/area/crew_quarters/toilet)
-"aBz" = (
-/obj/machinery/shower{
+/obj/machinery/camera{
+ c_tag = "Library North"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/turf/open/floor/plasteel/freezer,
-/area/crew_quarters/toilet)
-"aBA" = (
-/obj/machinery/shower{
- dir = 8
+/obj/structure/chair/sofa/right,
+/obj/machinery/light{
+ dir = 1;
+ light_color = "#c1caff"
},
-/turf/open/floor/plasteel/freezer,
-/area/crew_quarters/toilet)
+/turf/open/floor/wood,
+/area/library)
+"aBz" = (
+/obj/structure/disposalpipe/segment{
+ dir = 6
+ },
+/obj/effect/landmark/start/assistant,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/obj/structure/chair/sofa/left,
+/turf/open/floor/wood,
+/area/library)
+"aBA" = (
+/obj/structure/chair/comfy/brown{
+ dir = 4
+ },
+/obj/effect/landmark/event_spawn,
+/turf/open/floor/wood,
+/area/library)
"aBB" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/closed/wall,
@@ -12251,6 +12472,12 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
+"aBD" = (
+/obj/structure/chair/comfy/brown{
+ dir = 8
+ },
+/turf/open/floor/wood,
+/area/library)
"aBE" = (
/obj/item/clothing/under/rank/mailman,
/obj/item/clothing/head/mailman,
@@ -12300,9 +12527,12 @@
/turf/open/floor/plating,
/area/maintenance/port/fore)
"aBM" = (
-/obj/effect/landmark/start/assistant,
-/turf/open/floor/plasteel,
-/area/hydroponics/garden)
+/obj/structure/sign/poster/official/nanomichi_ad{
+ pixel_y = 32
+ },
+/obj/machinery/vending/snack/random,
+/turf/open/floor/plasteel/dark,
+/area/hallway/primary/central)
"aBN" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/closed/wall,
@@ -12359,9 +12589,9 @@
/area/ai_monitored/nuke_storage)
"aBU" = (
/obj/machinery/power/apc{
+ areastring = "/area/ai_monitored/nuke_storage";
dir = 1;
name = "Vault APC";
- areastring = "/area/ai_monitored/nuke_storage";
pixel_y = 25
},
/obj/structure/cable{
@@ -12483,21 +12713,27 @@
/turf/open/floor/carpet,
/area/crew_quarters/cryopod)
"aCe" = (
-/obj/effect/landmark/xeno_spawn,
-/obj/item/bikehorn/rubberducky,
-/obj/structure/cable{
- icon_state = "1-2"
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
+ dir = 1
},
-/turf/open/floor/plasteel/freezer,
-/area/crew_quarters/toilet)
+/obj/effect/turf_decal/tile/blue,
+/obj/structure/sign/poster/official/do_not_question{
+ pixel_x = 32
+ },
+/turf/open/floor/plasteel,
+/area/hallway/primary/fore)
"aCf" = (
-/obj/machinery/camera{
- c_tag = "Theatre Storage"
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 1
},
-/turf/open/floor/plasteel/white/side{
- dir = 4
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
},
-/area/crew_quarters/theatre)
+/obj/structure/sign/poster/official/obey{
+ pixel_x = -32
+ },
+/turf/open/floor/plasteel,
+/area/hallway/primary/fore)
"aCg" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -12505,11 +12741,14 @@
/turf/open/floor/plasteel,
/area/ai_monitored/storage/eva)
"aCh" = (
-/obj/machinery/vending/autodrobe,
-/turf/open/floor/plasteel/white/side{
- dir = 4
+/obj/machinery/shower{
+ dir = 8;
+ pixel_y = -4
},
-/area/crew_quarters/theatre)
+/obj/effect/landmark/xeno_spawn,
+/obj/effect/landmark/start/assistant,
+/turf/open/floor/plasteel/freezer,
+/area/crew_quarters/toilet)
"aCi" = (
/obj/structure/cable,
/obj/effect/spawner/structure/window/reinforced,
@@ -12536,32 +12775,48 @@
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
"aCm" = (
-/obj/structure/sink{
- dir = 8;
- pixel_x = -12;
- pixel_y = 2
+/obj/item/radio/intercom{
+ pixel_y = 25
},
-/obj/structure/mirror{
- pixel_x = -28
+/obj/machinery/camera{
+ c_tag = "Theatre Stage"
},
-/obj/machinery/light{
- dir = 1
- },
-/turf/open/floor/plasteel/freezer,
-/area/crew_quarters/toilet)
-"aCn" = (
-/obj/structure/urinal{
- pixel_y = 32
- },
-/turf/open/floor/plasteel/freezer,
-/area/crew_quarters/toilet)
-"aCo" = (
-/obj/structure/chair/stool{
- pixel_y = 8
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+/obj/structure/chair/comfy/brown{
dir = 4
},
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
+"aCn" = (
+/obj/structure/table/wood/fancy,
+/obj/item/reagent_containers/food/condiment/saltshaker{
+ pixel_x = -3;
+ pixel_y = 20
+ },
+/obj/item/reagent_containers/food/condiment/peppermill{
+ dir = 1;
+ pixel_x = 3;
+ pixel_y = 20
+ },
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
+"aCo" = (
+/obj/structure/closet{
+ name = "Costume Closet"
+ },
+/obj/item/clothing/head/russobluecamohat,
+/obj/item/clothing/head/russobluecamohat,
+/obj/item/clothing/head/russofurhat,
+/obj/item/clothing/head/russofurhat,
+/obj/item/clothing/head/russofurhat,
+/obj/item/clothing/head/russofurhat,
+/obj/item/clothing/under/mw2_russian_para,
+/obj/item/clothing/under/mw2_russian_para,
+/obj/item/clothing/under/mw2_russian_para,
+/obj/item/clothing/under/mw2_russian_para,
+/obj/item/clothing/shoes/jackboots,
+/obj/item/clothing/shoes/jackboots,
+/obj/item/clothing/shoes/jackboots,
+/obj/item/clothing/shoes/jackboots,
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
"aCp" = (
@@ -12578,19 +12833,11 @@
/turf/open/floor/plasteel/white/corner,
/area/hallway/secondary/entry)
"aCq" = (
-/obj/structure/table/wood,
-/obj/machinery/requests_console{
- department = "Theatre";
- departmentType = 0;
- name = "theatre RC";
- pixel_x = -32
- },
-/obj/item/reagent_containers/food/snacks/baguette,
-/obj/item/toy/dummy,
-/turf/open/floor/plasteel/white/side{
- dir = 4
- },
-/area/crew_quarters/theatre)
+/obj/structure/closet/lasertag/red,
+/obj/item/clothing/under/pj/red,
+/obj/item/clothing/under/pj/red,
+/turf/open/floor/plasteel,
+/area/crew_quarters/fitness)
"aCr" = (
/turf/closed/wall,
/area/crew_quarters/theatre)
@@ -12614,30 +12861,53 @@
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
"aCu" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 5
- },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/door/poddoor/shutters/preopen{
+ id = "holoprivacy";
+ name = "Holodeck Shutters"
+ },
/turf/open/floor/plating,
/area/crew_quarters/fitness)
"aCv" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
+ dir = 5
},
/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/door/poddoor/shutters/preopen{
+ id = "holoprivacy";
+ name = "Holodeck Shutters"
+ },
/turf/open/floor/plating,
/area/crew_quarters/fitness)
"aCw" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 9
+ dir = 4
},
/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/door/poddoor/shutters/preopen{
+ id = "holoprivacy";
+ name = "Holodeck Shutters"
+ },
/turf/open/floor/plating,
/area/crew_quarters/fitness)
+"aCx" = (
+/obj/structure/disposalpipe/segment{
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
"aCy" = (
-/obj/effect/decal/cleanable/oil,
-/turf/open/floor/plating,
-/area/maintenance/starboard/fore)
+/obj/machinery/disposal/bin,
+/obj/structure/disposalpipe/trunk{
+ dir = 8
+ },
+/obj/machinery/firealarm{
+ pixel_y = 24
+ },
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
"aCz" = (
/obj/structure/window/reinforced{
dir = 8
@@ -12648,18 +12918,11 @@
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
"aCA" = (
-/obj/structure/grille/broken,
-/obj/structure/cable{
- icon_state = "1-8"
+/obj/structure/chair/comfy/brown{
+ dir = 1
},
-/obj/structure/window{
- dir = 4
- },
-/obj/structure/window,
-/turf/open/floor/plating{
- icon_state = "panelscorched"
- },
-/area/maintenance/starboard/fore)
+/turf/open/floor/wood,
+/area/library)
"aCB" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 6
@@ -12789,6 +13052,13 @@
"aCR" = (
/turf/closed/wall,
/area/chapel/main)
+"aCS" = (
+/obj/structure/disposalpipe/segment,
+/obj/structure/chair/comfy/brown{
+ dir = 1
+ },
+/turf/open/floor/wood,
+/area/library)
"aCT" = (
/obj/structure/table,
/obj/item/stack/sheet/metal/fifty,
@@ -12800,6 +13070,23 @@
},
/turf/open/floor/plasteel,
/area/construction/mining/aux_base)
+"aCU" = (
+/obj/machinery/photocopier{
+ pixel_x = -5;
+ pixel_y = -5
+ },
+/turf/open/floor/wood,
+/area/library)
+"aCV" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/blue,
+/obj/structure/sign/poster/official/obey{
+ pixel_x = 32
+ },
+/turf/open/floor/plasteel,
+/area/hallway/primary/fore)
"aCW" = (
/obj/structure/reagent_dispensers/watertank,
/obj/effect/spawner/lootdrop/maintenance,
@@ -12846,7 +13133,6 @@
pixel_y = 5
},
/obj/machinery/firealarm{
- dir = 2;
pixel_y = 24
},
/turf/open/floor/plasteel,
@@ -12857,7 +13143,6 @@
dir = 1
},
/obj/item/radio/intercom{
- broadcasting = 0;
name = "Station Intercom (General)";
pixel_y = 20
},
@@ -12900,9 +13185,14 @@
/turf/open/floor/plasteel,
/area/hydroponics/garden)
"aDh" = (
-/obj/machinery/vending/assist,
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/obj/structure/sign/poster/official/space_cops{
+ pixel_x = -32
+ },
/turf/open/floor/plasteel,
-/area/storage/primary)
+/area/hallway/primary/fore)
"aDi" = (
/obj/structure/window/reinforced,
/turf/open/floor/plasteel/dark,
@@ -12927,7 +13217,6 @@
},
/obj/machinery/requests_console{
department = "Tool Storage";
- departmentType = 0;
pixel_y = 30
},
/turf/open/floor/plasteel,
@@ -12954,7 +13243,6 @@
/obj/item/assembly/signaler,
/obj/item/assembly/signaler,
/obj/item/radio/intercom{
- broadcasting = 0;
name = "Station Intercom (General)";
pixel_y = 20
},
@@ -13011,6 +13299,10 @@
},
/turf/open/floor/circuit,
/area/ai_monitored/nuke_storage)
+"aDu" = (
+/obj/structure/chair/comfy/brown,
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
"aDv" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 8
@@ -13073,9 +13365,7 @@
/area/ai_monitored/storage/eva)
"aDB" = (
/obj/machinery/suit_storage_unit/standard_unit,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
/area/ai_monitored/storage/eva)
"aDC" = (
@@ -13099,9 +13389,7 @@
c_tag = "EVA Storage";
dir = 1
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
/area/ai_monitored/storage/eva)
"aDF" = (
@@ -13112,38 +13400,33 @@
/turf/open/floor/plasteel,
/area/ai_monitored/storage/eva)
"aDG" = (
-/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden,
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
+/obj/machinery/door/poddoor/shutters/preopen{
+ desc = "Privacy shutters for the Private Study. Stops people spying in on your game.";
+ id = "PrivateStudy1";
+ name = "Private Study Privacy Shutters"
},
-/obj/machinery/camera{
- c_tag = "Dormitory South";
- dir = 8
- },
-/turf/open/floor/plasteel,
-/area/crew_quarters/dorms)
+/obj/effect/spawner/structure/window,
+/turf/open/floor/wood,
+/area/library)
"aDH" = (
-/obj/structure/table,
-/obj/item/paper_bin{
- pixel_x = 1;
- pixel_y = 9
- },
-/obj/item/pen,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
- },
-/obj/item/folder/white,
-/obj/item/stamp/rd{
- pixel_x = 3;
- pixel_y = -2
- },
-/turf/open/floor/plasteel/cafeteria,
-/area/crew_quarters/heads/hor)
+/obj/structure/table/wood,
+/obj/item/flashlight/lamp/green,
+/obj/item/pen/fountain/captain,
+/turf/open/floor/carpet,
+/area/crew_quarters/heads/captain)
"aDI" = (
/obj/structure/sign/warning/electricshock,
/turf/closed/wall/r_wall,
/area/ai_monitored/storage/eva)
+"aDJ" = (
+/obj/machinery/door/airlock{
+ desc = "Private study room where nerds are probably playing Dungeons and Dragons 13e, or a place for blood cult rituals.";
+ id_tag = "PrivateStudy";
+ name = "Private Study"
+ },
+/obj/machinery/door/firedoor,
+/turf/open/floor/wood,
+/area/library)
"aDK" = (
/obj/machinery/door/airlock/public/glass{
name = "Cryogenics "
@@ -13156,126 +13439,147 @@
/turf/open/floor/plasteel,
/area/crew_quarters/cryopod)
"aDL" = (
-/obj/structure/sink{
- dir = 8;
- pixel_x = -12;
- pixel_y = 2
- },
-/obj/structure/sink{
- dir = 8;
- pixel_x = -12;
- pixel_y = 2
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
- },
-/obj/structure/cable{
- icon_state = "2-4"
- },
-/turf/open/floor/plasteel/freezer,
-/area/crew_quarters/toilet)
-"aDM" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/open/floor/plasteel/freezer,
-/area/crew_quarters/toilet)
-"aDN" = (
-/obj/machinery/light/small,
-/turf/open/floor/plasteel/freezer,
-/area/crew_quarters/toilet)
-"aDO" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
-/obj/machinery/airalarm{
- pixel_y = 23
- },
-/turf/open/floor/plasteel/freezer,
-/area/crew_quarters/toilet)
-"aDP" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on,
-/turf/open/floor/plasteel/freezer,
-/area/crew_quarters/toilet)
-"aDQ" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/open/floor/plasteel/freezer,
-/area/crew_quarters/toilet)
-"aDR" = (
-/obj/structure/table/wood,
-/obj/structure/mirror{
- pixel_x = -28
- },
-/obj/item/lipstick/random{
- pixel_x = 2;
- pixel_y = 2
- },
-/obj/item/lipstick/random{
- pixel_x = -2;
- pixel_y = -2
- },
-/turf/open/floor/plasteel/white/side{
- dir = 4
- },
-/area/crew_quarters/theatre)
-"aDS" = (
/obj/machinery/door/airlock{
- name = "Unisex Showers"
+ desc = "Private study room where nerds are probably playing Dungeons and Dragons 13e, or a place for blood cult rituals.";
+ id_tag = "PrivateStudy";
+ name = "Private Study"
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+/obj/machinery/door/firedoor,
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/wood,
+/area/library)
+"aDM" = (
+/obj/structure/chair/sofa/right,
+/obj/structure/window{
+ dir = 1
+ },
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
+"aDN" = (
+/obj/structure/chair/sofa,
+/obj/structure/window{
+ dir = 1
+ },
+/obj/effect/landmark/start/assistant,
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
+"aDO" = (
+/obj/structure/chair/sofa/left,
+/obj/structure/window{
+ dir = 1
+ },
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
+"aDP" = (
+/obj/structure/chair/comfy/brown{
dir = 4
},
-/obj/structure/cable{
- icon_state = "4-8"
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
+"aDQ" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+ dir = 4
},
-/turf/open/floor/plasteel/freezer,
-/area/crew_quarters/toilet)
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
+"aDR" = (
+/obj/structure/closet/lasertag/blue,
+/obj/item/clothing/under/pj/blue,
+/obj/item/clothing/under/pj/blue,
+/turf/open/floor/plasteel,
+/area/crew_quarters/fitness)
+"aDS" = (
+/obj/machinery/light/small{
+ dir = 4;
+ light_color = "#d8b1b1"
+ },
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
"aDT" = (
-/obj/machinery/light/small,
-/obj/structure/cable{
- icon_state = "1-8"
+/obj/structure/table/wood/fancy,
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 4;
+ pixel_y = 5
},
-/turf/open/floor/plasteel/freezer,
-/area/crew_quarters/toilet)
+/obj/item/reagent_containers/food/snacks/burger/plain,
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
"aDU" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
- dir = 8
+/obj/structure/table,
+/obj/item/reagent_containers/food/condiment/saltshaker{
+ pixel_x = -3;
+ pixel_y = 9
},
-/obj/structure/cable{
- icon_state = "4-8"
+/obj/item/reagent_containers/food/condiment/peppermill{
+ dir = 1;
+ pixel_x = 3;
+ pixel_y = 9
},
-/turf/open/floor/plasteel/freezer,
-/area/crew_quarters/toilet)
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
"aDV" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
-/obj/machinery/meter,
-/turf/open/floor/plating,
-/area/maintenance/starboard/fore)
+/obj/structure/table/wood/fancy,
+/obj/machinery/light,
+/obj/item/reagent_containers/food/condiment/saltshaker{
+ pixel_x = -3;
+ pixel_y = 20
+ },
+/obj/item/reagent_containers/food/condiment/peppermill{
+ dir = 1;
+ pixel_x = 3;
+ pixel_y = 20
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+ dir = 4;
+ pixel_y = 5
+ },
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
"aDW" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+/obj/machinery/holopad,
+/obj/machinery/camera{
+ c_tag = "Dorms Central"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 10
},
-/turf/open/floor/plating,
-/area/maintenance/starboard/fore)
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/extinguisher_cabinet{
+ pixel_x = -5;
+ pixel_y = 30
+ },
+/turf/open/floor/plasteel,
+/area/crew_quarters/dorms)
"aDX" = (
-/obj/effect/decal/cleanable/cobweb/cobweb2,
-/obj/structure/reagent_dispensers/fueltank,
-/turf/open/floor/plating,
-/area/maintenance/starboard/fore)
+/obj/structure/chair/sofa{
+ dir = 1
+ },
+/obj/structure/window,
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
"aDY" = (
-/obj/structure/chair/stool,
-/obj/effect/landmark/start/mime,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
- dir = 4
+/obj/structure/cable{
+ icon_state = "1-2"
},
-/turf/open/floor/plasteel/white/side{
- dir = 4
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/structure/sink{
+ dir = 4;
+ pixel_x = 11
},
-/area/crew_quarters/theatre)
+/obj/structure/mirror{
+ pixel_x = 25
+ },
+/turf/open/floor/mineral/titanium/blue,
+/area/crew_quarters/toilet)
"aDZ" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -13304,29 +13608,17 @@
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
"aEb" = (
-/obj/machinery/door/airlock/maintenance{
- name = "Theatre Maintenance";
- req_access_txt = "46"
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
+/obj/structure/closet/secure_closet/personal/cabinet{
+ desc = "Swipe your ID on the closet to claim it. First come first serve, this one is wooden and fancy. Store your stuff here.";
+ name = "Personal ID-Locked Closet";
+ pixel_y = 15
},
/turf/open/floor/plating,
-/area/maintenance/starboard/fore)
+/area/maintenance/port)
"aEc" = (
-/obj/structure/disposalpipe/segment{
- dir = 6
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
- },
-/turf/open/floor/plasteel/white/side{
- dir = 4
- },
-/area/crew_quarters/theatre)
+/obj/structure/chair/wood/wings,
+/turf/open/floor/plating,
+/area/maintenance/port)
"aEd" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -13360,9 +13652,8 @@
dir = 4
},
/obj/machinery/power/apc{
- dir = 2;
- name = "Chapel APC";
areastring = "/area/chapel/main";
+ name = "Chapel APC";
pixel_y = -24
},
/obj/structure/cable{
@@ -13424,11 +13715,121 @@
/obj/structure/fans/tiny,
/turf/open/floor/plating,
/area/chapel/main)
+"aEo" = (
+/obj/machinery/light{
+ dir = 4
+ },
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
+"aEp" = (
+/obj/structure/flora/ausbushes/fullgrass,
+/obj/structure/flora/ausbushes/sparsegrass,
+/obj/structure/flora/ausbushes/ppflowers,
+/obj/structure/flora/ausbushes/ywflowers,
+/obj/structure/flora/ausbushes/brflowers,
+/obj/effect/spawner/structure/window,
+/turf/open/floor/grass,
+/area/crew_quarters/bar)
+"aEq" = (
+/obj/structure/chair/stool{
+ pixel_y = 8
+ },
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
+"aEr" = (
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 5
+ },
+/obj/machinery/light{
+ dir = 1;
+ light_color = "#cee5d2"
+ },
+/obj/structure/table,
+/obj/structure/bedsheetbin/color,
+/turf/open/floor/plasteel,
+/area/crew_quarters/dorms)
+"aEs" = (
+/obj/machinery/vending/cola/red,
+/turf/open/floor/plasteel/dark,
+/area/hallway/primary/central)
+"aEt" = (
+/obj/machinery/computer/arcade/minesweeper,
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
+"aEu" = (
+/obj/machinery/computer/arcade/battle,
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
+"aEv" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/structure/closet/wardrobe/pjs,
+/obj/item/clothing/under/maid,
+/obj/item/clothing/under/maid,
+/obj/item/clothing/under/janimaid,
+/obj/item/clothing/under/janimaid,
+/obj/item/clothing/accessory/maidapron,
+/obj/item/clothing/accessory/maidapron,
+/obj/machinery/light{
+ dir = 8
+ },
+/turf/open/floor/plasteel,
+/area/crew_quarters/fitness)
+"aEw" = (
+/obj/structure/table/reinforced,
+/obj/effect/turf_decal/tile/bar,
+/obj/effect/turf_decal/tile/bar{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/turf/open/floor/plasteel,
+/area/crew_quarters/bar)
+"aEx" = (
+/obj/structure/table/reinforced,
+/obj/item/clothing/head/that,
+/obj/effect/turf_decal/tile/bar,
+/obj/effect/turf_decal/tile/bar{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/turf/open/floor/plasteel,
+/area/crew_quarters/bar)
+"aEy" = (
+/obj/structure/table,
+/obj/item/reagent_containers/food/condiment/saltshaker{
+ pixel_x = -9;
+ pixel_y = 9
+ },
+/obj/item/reagent_containers/food/condiment/saltshaker{
+ pixel_x = -3;
+ pixel_y = 9
+ },
+/obj/item/reagent_containers/food/condiment/peppermill{
+ dir = 1;
+ pixel_x = -3
+ },
+/obj/item/reagent_containers/food/condiment/peppermill{
+ pixel_x = -9
+ },
+/obj/item/sharpener{
+ pixel_x = 10
+ },
+/turf/open/floor/plasteel/cafeteria,
+/area/crew_quarters/kitchen)
"aEz" = (
/obj/machinery/power/apc{
+ areastring = "/area/hallway/secondary/entry";
dir = 4;
name = "Entry Hall APC";
- areastring = "/area/hallway/secondary/entry";
pixel_x = 24
},
/obj/structure/cable,
@@ -13685,97 +14086,68 @@
/turf/closed/wall/r_wall,
/area/ai_monitored/storage/eva)
"aFd" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
+/obj/structure/table/wood,
+/obj/item/instrument/guitar{
+ pixel_x = -7
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
+/obj/item/instrument/eguitar{
+ pixel_x = 5
},
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/open/floor/plasteel,
-/area/crew_quarters/dorms)
+/obj/item/instrument/violin,
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
"aFe" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- dir = 8
+/obj/machinery/door/airlock{
+ id_tag = "Dorm2";
+ name = "Room One"
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/open/floor/plasteel,
-/area/crew_quarters/dorms)
-"aFf" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- dir = 1
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/structure/cable{
- icon_state = "1-8"
- },
-/turf/open/floor/plasteel/freezer,
-/area/crew_quarters/toilet)
-"aFg" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/turf/closed/wall,
-/area/crew_quarters/toilet)
-"aFh" = (
-/obj/machinery/door/airlock{
- name = "Unisex Restrooms"
+/turf/open/floor/plasteel/dark,
+/area/crew_quarters/dorms)
+"aFf" = (
+/obj/structure/piano{
+ icon_state = "piano"
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/open/floor/plasteel/freezer,
-/area/crew_quarters/toilet)
-"aFi" = (
-/obj/machinery/power/apc{
- dir = 4;
- name = "Dormitory Bathrooms APC";
- areastring = "/area/crew_quarters/toilet";
- pixel_x = 26
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/obj/structure/cable{
- icon_state = "0-8"
- },
-/turf/open/floor/plasteel/freezer,
-/area/crew_quarters/toilet)
-"aFj" = (
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/blue{
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
+"aFg" = (
+/obj/structure/chair/comfy/black{
dir = 8
},
-/turf/open/floor/plasteel,
-/area/crew_quarters/theatre)
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
+"aFh" = (
+/obj/structure/chair/comfy/brown{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
+"aFi" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
+"aFj" = (
+/obj/structure/table,
+/obj/item/reagent_containers/food/drinks/britcup,
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
"aFk" = (
-/obj/machinery/disposal/bin,
-/obj/structure/disposalpipe/trunk{
+/obj/structure/table/reinforced,
+/obj/effect/turf_decal/tile/bar,
+/obj/effect/turf_decal/tile/bar{
dir = 1
},
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
-/area/crew_quarters/theatre)
+/area/crew_quarters/bar)
"aFl" = (
/obj/machinery/light/small{
dir = 8
@@ -13808,12 +14180,17 @@
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
"aFp" = (
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
+/obj/machinery/door/window/southright{
+ name = "Bar Door";
+ req_one_access_txt = "25;28"
},
-/turf/open/floor/plating,
-/area/maintenance/starboard/fore)
+/obj/effect/turf_decal/tile/bar,
+/obj/effect/turf_decal/tile/bar{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
+/area/crew_quarters/bar)
"aFq" = (
/obj/structure/lattice,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -13846,6 +14223,20 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
+"aFt" = (
+/obj/structure/table/reinforced,
+/obj/machinery/computer/security/telescreen/entertainment{
+ pixel_x = 32
+ },
+/obj/item/book/manual/wiki/barman_recipes,
+/obj/item/reagent_containers/rag,
+/obj/effect/turf_decal/tile/bar,
+/obj/effect/turf_decal/tile/bar{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
+/area/crew_quarters/bar)
"aFu" = (
/turf/closed/wall,
/area/library)
@@ -13871,15 +14262,14 @@
/area/maintenance/starboard/fore)
"aFy" = (
/obj/machinery/power/apc{
- dir = 2;
- name = "Chapel Office APC";
areastring = "/area/chapel/office";
+ name = "Chapel Office APC";
pixel_y = -24
},
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plating,
-/area/chapel/office)
+/area/maintenance/starboard/fore)
"aFz" = (
/turf/open/floor/plasteel/dark,
/area/chapel/main)
@@ -13899,6 +14289,36 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel/dark,
/area/chapel/main)
+"aFC" = (
+/obj/structure/table,
+/obj/item/reagent_containers/food/snacks/bluecherrycupcake{
+ pixel_y = 5
+ },
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
+"aFD" = (
+/obj/structure/chair/comfy/brown{
+ dir = 1
+ },
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
+"aFE" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/machinery/airalarm{
+ dir = 8;
+ pixel_x = 23
+ },
+/turf/open/floor/mineral/titanium/blue,
+/area/crew_quarters/toilet)
+"aFF" = (
+/obj/structure/chair/sofa{
+ dir = 1
+ },
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
"aFG" = (
/obj/effect/turf_decal/tile/blue{
dir = 4
@@ -14044,7 +14464,9 @@
/turf/open/floor/plasteel,
/area/storage/primary)
"aFS" = (
-/obj/effect/landmark/start/assistant,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+ dir = 4
+ },
/turf/open/floor/plasteel,
/area/storage/primary)
"aFT" = (
@@ -14054,9 +14476,8 @@
/turf/open/floor/plasteel,
/area/storage/primary)
"aFU" = (
-/obj/effect/landmark/start/assistant,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
- dir = 4
+/obj/structure/chair/stool{
+ pixel_y = 8
},
/turf/open/floor/plasteel,
/area/storage/primary)
@@ -14075,8 +14496,6 @@
/area/gateway)
"aFX" = (
/obj/item/radio/intercom{
- freerange = 0;
- frequency = 1459;
name = "Station Intercom (General)";
pixel_x = -30
},
@@ -14191,39 +14610,48 @@
/turf/open/floor/plasteel/dark,
/area/ai_monitored/storage/eva)
"aGk" = (
-/obj/structure/sink{
- dir = 8;
- pixel_x = -12;
- pixel_y = 2
+/obj/effect/turf_decal/stripes/line{
+ dir = 9
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel/freezer,
-/area/crew_quarters/toilet)
+/turf/open/floor/plating,
+/area/space/nearstation)
"aGl" = (
-/obj/machinery/light_switch{
- pixel_x = 27
+/obj/structure/closet/crate,
+/obj/item/book/manual/wiki/telescience,
+/obj/item/book/manual/wiki/engineering_guide,
+/obj/item/book/manual/wiki/engineering_construction,
+/obj/item/book/manual/wiki/atmospherics,
+/obj/item/book/manual/wiki/detective,
+/obj/item/book/manual/wiki/tcomms,
+/obj/item/book/manual/wiki/engineering_singulo_tesla,
+/obj/item/book/manual/wiki/experimentor,
+/obj/item/book/manual/wiki/research_and_development,
+/obj/item/book/manual/wiki/robotics_cyborgs,
+/obj/item/book/manual/wiki/security_space_law,
+/obj/item/book/manual/wiki/medicine,
+/obj/item/book/manual/wiki/medical_cloning,
+/obj/item/book/manual/wiki/infections,
+/obj/item/book/manual/ripley_build_and_repair,
+/obj/item/book/manual/hydroponics_pod_people,
+/obj/item/book/manual/wiki/toxins,
+/obj/item/book/manual/wiki/grenades,
+/obj/item/book{
+ desc = "An undeniably handy book.";
+ icon_state = "bookknock";
+ name = "A Simpleton's Guide to Safe-cracking with Stethoscopes"
},
-/turf/open/floor/plasteel/freezer,
-/area/crew_quarters/toilet)
+/turf/open/floor/wood,
+/area/library)
"aGm" = (
-/obj/structure/toilet{
- pixel_y = 8
- },
-/obj/machinery/light/small{
- dir = 8
- },
-/turf/open/floor/plasteel/freezer,
-/area/crew_quarters/toilet)
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
+/area/hydroponics)
"aGn" = (
-/obj/structure/toilet{
- pixel_y = 8
+/obj/effect/turf_decal/stripes/corner{
+ dir = 1
},
-/obj/machinery/light/small{
- dir = 8
- },
-/obj/effect/landmark/blobstart,
-/turf/open/floor/plasteel/freezer,
-/area/crew_quarters/toilet)
+/turf/open/floor/plasteel,
+/area/hydroponics)
"aGo" = (
/obj/structure/table,
/obj/item/stack/sheet/rglass{
@@ -14243,12 +14671,11 @@
/turf/open/floor/plasteel,
/area/ai_monitored/storage/eva)
"aGp" = (
-/obj/machinery/light/small{
- dir = 8
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
},
-/obj/machinery/recharge_station,
-/turf/open/floor/plasteel/freezer,
-/area/crew_quarters/toilet)
+/turf/open/floor/plasteel,
+/area/hydroponics)
"aGq" = (
/obj/item/stack/sheet/plasteel{
amount = 10
@@ -14300,28 +14727,13 @@
/turf/closed/wall,
/area/crew_quarters/theatre)
"aGw" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/obj/structure/closet/secure_closet/freezer/cream_pie,
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/turf/open/floor/plasteel,
-/area/crew_quarters/theatre)
+/obj/machinery/seed_extractor,
+/turf/open/floor/plasteel/dark,
+/area/hydroponics)
"aGx" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/turf/closed/wall,
-/area/crew_quarters/toilet)
+/obj/machinery/biogenerator,
+/turf/open/floor/plasteel/dark,
+/area/hydroponics)
"aGy" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -14479,6 +14891,12 @@
},
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
+"aGK" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/turf/open/floor/plasteel,
+/area/hydroponics)
"aGL" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -14520,15 +14938,9 @@
/turf/closed/wall,
/area/chapel/office)
"aGP" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
-/turf/open/floor/plating,
-/area/maintenance/starboard/fore)
+/obj/machinery/vending/hydronutrients,
+/turf/open/floor/plasteel/dark,
+/area/hydroponics)
"aGQ" = (
/obj/structure/disposalpipe/segment{
dir = 10
@@ -14541,6 +14953,12 @@
},
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
+"aGR" = (
+/obj/machinery/vending/hydroseeds{
+ slogan_delay = 700
+ },
+/turf/open/floor/plasteel/dark,
+/area/hydroponics)
"aGS" = (
/obj/structure/cable{
icon_state = "2-8"
@@ -14632,17 +15050,33 @@
/area/hallway/secondary/entry)
"aHb" = (
/obj/structure/table/wood,
-/obj/item/paper_bin{
- pixel_x = 1;
- pixel_y = 9
+/obj/item/paper_bin/bundlenatural{
+ pixel_x = 6;
+ pixel_y = 4
},
-/obj/item/stack/packageWrap,
-/turf/open/floor/wood,
-/area/library)
+/obj/item/paper_bin{
+ pixel_x = -6;
+ pixel_y = 4
+ },
+/obj/item/pen/fountain,
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/item/pen/fourcolor,
+/turf/open/floor/plasteel,
+/area/crew_quarters/dorms)
"aHc" = (
-/obj/machinery/vending/games,
-/turf/open/floor/wood,
-/area/library)
+/obj/effect/turf_decal/stripes/corner{
+ dir = 8
+ },
+/obj/effect/landmark/start/botanist,
+/turf/open/floor/plasteel,
+/area/hydroponics)
"aHd" = (
/obj/machinery/disposal/bin,
/obj/structure/disposalpipe/trunk,
@@ -14668,8 +15102,7 @@
pixel_y = 28
},
/obj/machinery/camera{
- c_tag = "Chapel Office";
- dir = 2
+ c_tag = "Chapel Office"
},
/turf/open/floor/plasteel/grimy,
/area/chapel/office)
@@ -14750,6 +15183,34 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/chapel/main)
+"aHr" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/turf/open/floor/plasteel,
+/area/hydroponics)
+"aHs" = (
+/obj/effect/turf_decal/stripes/corner{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/hydroponics)
+"aHt" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/machinery/light{
+ dir = 1;
+ light_color = "#cee5d2"
+ },
+/turf/open/floor/plasteel,
+/area/crew_quarters/dorms)
"aHu" = (
/obj/machinery/status_display{
pixel_x = 32
@@ -14828,12 +15289,12 @@
/turf/open/floor/plasteel/dark,
/area/ai_monitored/storage/eva)
"aHD" = (
-/obj/structure/chair/stool{
- pixel_y = 8
+/obj/structure/chair/comfy/beige{
+ dir = 8
},
/obj/effect/landmark/start/assistant,
-/turf/open/floor/plasteel,
-/area/storage/primary)
+/turf/open/floor/plasteel/grimy,
+/area/hallway/secondary/entry)
"aHE" = (
/obj/structure/table,
/obj/item/weldingtool,
@@ -15000,38 +15461,67 @@
/turf/open/floor/plasteel,
/area/crew_quarters/dorms)
"aHU" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
+/obj/structure/extinguisher_cabinet{
+ pixel_y = -30
+ },
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
+"aHV" = (
+/obj/machinery/airalarm{
+ dir = 1;
+ pixel_y = -22
+ },
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
+"aHW" = (
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
+ dir = 4
+ },
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
+"aHX" = (
+/obj/machinery/light{
dir = 1
},
-/obj/structure/sink{
- dir = 8;
- pixel_x = -12;
- pixel_y = 2
+/obj/structure/table/wood/fancy,
+/obj/item/reagent_containers/food/condiment/peppermill{
+ pixel_x = -9
},
-/obj/structure/mirror{
- pixel_x = -28
+/obj/item/reagent_containers/food/condiment/peppermill{
+ dir = 1;
+ pixel_x = -3
},
-/obj/effect/landmark/start/assistant,
-/turf/open/floor/plasteel/freezer,
-/area/crew_quarters/toilet)
-"aHV" = (
-/obj/machinery/door/airlock{
- name = "Unit 1"
+/obj/item/reagent_containers/food/condiment/saltshaker{
+ pixel_x = -9;
+ pixel_y = 9
},
-/turf/open/floor/plasteel/freezer,
-/area/crew_quarters/toilet)
-"aHW" = (
-/obj/machinery/door/airlock{
- name = "Unit 2"
+/obj/item/reagent_containers/food/condiment/saltshaker{
+ pixel_x = -3;
+ pixel_y = 9
},
-/turf/open/floor/plasteel/freezer,
-/area/crew_quarters/toilet)
-"aHX" = (
-/obj/machinery/door/airlock{
- name = "Unit B"
+/obj/item/reagent_containers/food/condiment/pack/ketchup{
+ pixel_x = 5
},
-/turf/open/floor/plasteel/freezer,
-/area/crew_quarters/toilet)
+/obj/item/reagent_containers/food/condiment/pack/ketchup{
+ pixel_x = 5
+ },
+/obj/item/reagent_containers/food/condiment/pack/ketchup{
+ pixel_x = 5
+ },
+/obj/item/reagent_containers/food/condiment/pack/hotsauce{
+ pixel_x = 10
+ },
+/obj/item/reagent_containers/food/condiment/pack/hotsauce{
+ pixel_x = 10
+ },
+/obj/item/reagent_containers/food/condiment/pack/mustard{
+ pixel_x = 10
+ },
+/obj/item/reagent_containers/food/condiment/pack/mustard{
+ pixel_x = 10
+ },
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
"aHY" = (
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 1
@@ -15039,23 +15529,12 @@
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
"aHZ" = (
-/obj/machinery/airalarm{
- dir = 4;
- pixel_x = -22
- },
-/obj/structure/closet/crate/wooden/toy,
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 8
+/obj/effect/turf_decal/tile/blue,
+/obj/structure/sign/poster/contraband/fun_police{
+ pixel_x = 32
},
/turf/open/floor/plasteel,
-/area/crew_quarters/theatre)
+/area/hallway/primary/fore)
"aIa" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -15065,9 +15544,9 @@
/area/maintenance/starboard/fore)
"aIb" = (
/obj/machinery/power/apc{
+ areastring = "/area/crew_quarters/theatre";
dir = 8;
name = "Theatre APC";
- areastring = "/area/crew_quarters/theatre";
pixel_x = -25
},
/obj/structure/cable,
@@ -15078,9 +15557,8 @@
/area/maintenance/starboard/fore)
"aIc" = (
/obj/machinery/power/apc{
- dir = 2;
- name = "Bar APC";
areastring = "/area/crew_quarters/bar";
+ name = "Bar APC";
pixel_y = -24
},
/obj/structure/cable,
@@ -15120,18 +15598,13 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/obj/effect/turf_decal/bot{
- dir = 2
- },
-/turf/open/floor/plasteel{
- dir = 2
- },
+/obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
/area/crew_quarters/bar)
"aIh" = (
/obj/machinery/power/apc{
- dir = 2;
- name = "Kitchen APC";
areastring = "/area/crew_quarters/kitchen";
+ name = "Kitchen APC";
pixel_y = -24
},
/obj/structure/cable,
@@ -15140,6 +15613,12 @@
},
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
+"aIi" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 9
+ },
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
"aIj" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -15190,9 +15669,8 @@
/area/maintenance/starboard/fore)
"aIn" = (
/obj/machinery/power/apc{
- dir = 2;
- name = "Hydroponics APC";
areastring = "/area/hydroponics";
+ name = "Hydroponics APC";
pixel_y = -24
},
/obj/structure/cable{
@@ -15219,21 +15697,15 @@
/turf/closed/wall,
/area/hydroponics)
"aIr" = (
-/obj/structure/filingcabinet,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/wood,
-/area/library)
+/turf/open/floor/plating,
+/area/crew_quarters/abandoned_gambling_den)
"aIs" = (
-/obj/structure/chair/office/dark,
-/obj/machinery/camera{
- c_tag = "Library North";
- dir = 2
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 6
},
+/obj/structure/chair/comfy/brown,
/turf/open/floor/wood,
-/area/library)
+/area/crew_quarters/bar)
"aIt" = (
/turf/open/floor/wood,
/area/library)
@@ -15253,16 +15725,11 @@
/turf/open/floor/wood,
/area/library)
"aIw" = (
-/obj/structure/chair/office/dark,
-/obj/structure/disposalpipe/segment{
- dir = 6
- },
-/obj/effect/landmark/start/assistant,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
+ dir = 9
},
/turf/open/floor/wood,
-/area/library)
+/area/crew_quarters/bar)
"aIx" = (
/obj/structure/disposalpipe/segment{
dir = 9
@@ -15273,29 +15740,35 @@
/turf/open/floor/wood,
/area/library)
"aIy" = (
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel/dark,
-/area/chapel/office)
+/obj/structure/table/wood,
+/obj/item/paper_bin{
+ pixel_x = 1;
+ pixel_y = 9
+ },
+/obj/item/stack/packageWrap,
+/obj/item/pen/fourcolor,
+/turf/open/floor/wood,
+/area/library)
"aIz" = (
/obj/machinery/disposal/bin,
/obj/structure/disposalpipe/trunk,
/turf/open/floor/plasteel/grimy,
/area/chapel/office)
"aIA" = (
-/obj/structure/table/wood,
-/obj/item/paper_bin{
- pixel_x = -2;
- pixel_y = 5
- },
-/obj/item/storage/crayons,
-/turf/open/floor/plasteel/grimy,
-/area/chapel/office)
-"aIB" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/structure/bodycontainer/crematorium{
id = "crematoriumChapel"
},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
+ dir = 8
+ },
+/turf/open/floor/plasteel/dark,
+/area/chapel/office)
+"aIB" = (
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+ dir = 8
+ },
/turf/open/floor/plasteel/dark,
/area/chapel/office)
"aIC" = (
@@ -15319,6 +15792,15 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/security/warden)
+"aIG" = (
+/obj/structure/disposalpipe/segment{
+ dir = 10
+ },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/crew_quarters/dorms)
"aIH" = (
/obj/structure/table,
/obj/item/storage/box/lights/mixed,
@@ -15370,8 +15852,7 @@
/area/storage/primary)
"aIO" = (
/obj/machinery/camera{
- c_tag = "Arrivals Lounge";
- dir = 2
+ c_tag = "Arrivals Lounge"
},
/obj/machinery/light{
dir = 1
@@ -15419,8 +15900,6 @@
/obj/structure/table/glass,
/obj/item/plant_analyzer,
/obj/item/radio/intercom{
- freerange = 0;
- frequency = 1459;
name = "Station Intercom (General)";
pixel_x = 29
},
@@ -15580,12 +16059,13 @@
/turf/open/floor/plasteel,
/area/ai_monitored/storage/eva)
"aJk" = (
-/obj/machinery/door/airlock{
- name = "Theatre Backstage";
- req_access_txt = "46"
+/obj/machinery/holopad,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
},
/turf/open/floor/plasteel,
-/area/crew_quarters/theatre)
+/area/crew_quarters/dorms)
"aJl" = (
/obj/structure/tank_dispenser/oxygen,
/obj/machinery/light{
@@ -15597,12 +16077,11 @@
/turf/open/floor/plasteel,
/area/ai_monitored/storage/eva)
"aJm" = (
-/obj/structure/sink/kitchen{
- pixel_y = 28
+/obj/machinery/light{
+ dir = 8
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/wood,
-/area/crew_quarters/bar)
+/turf/open/floor/plating,
+/area/crew_quarters/abandoned_gambling_den)
"aJn" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -15612,8 +16091,7 @@
dir = 1
},
/obj/machinery/camera{
- c_tag = "Central Hallway North";
- dir = 2
+ c_tag = "Central Hallway North"
},
/obj/effect/turf_decal/tile/blue{
dir = 1
@@ -15685,8 +16163,17 @@
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"aJv" = (
-/obj/machinery/vending/cola/random,
-/turf/open/floor/plasteel/dark,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/structure/sign/poster/contraband/robust_softdrinks{
+ pixel_x = -32;
+ pixel_y = 32
+ },
+/turf/open/floor/plasteel,
/area/hallway/primary/central)
"aJw" = (
/turf/closed/wall,
@@ -15706,6 +16193,10 @@
},
/turf/open/floor/plasteel,
/area/hallway/primary/central)
+"aJz" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/plasteel/dark,
+/area/crew_quarters/dorms)
"aJA" = (
/obj/machinery/door/airlock/maintenance{
name = "Kitchen Maintenance";
@@ -15737,13 +16228,12 @@
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
"aJE" = (
-/obj/item/reagent_containers/food/drinks/shaker,
-/obj/item/gun/ballistic/revolver/doublebarrel,
-/obj/structure/table/wood,
-/obj/item/stack/spacecash/c10,
-/obj/item/stack/spacecash/c100,
-/turf/open/floor/wood,
-/area/crew_quarters/bar)
+/obj/machinery/light{
+ dir = 4;
+ light_color = "#e8eaff"
+ },
+/turf/open/floor/plating,
+/area/crew_quarters/abandoned_gambling_den)
"aJF" = (
/obj/machinery/newscaster{
pixel_x = 30
@@ -15770,9 +16260,6 @@
/area/chapel/office)
"aJH" = (
/obj/machinery/door/window/southleft{
- base_state = "left";
- dir = 2;
- icon_state = "left";
name = "Bar Delivery";
req_access_txt = "25"
},
@@ -15783,11 +16270,11 @@
/turf/closed/wall,
/area/crew_quarters/kitchen)
"aJJ" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- dir = 8
- },
-/turf/open/floor/plasteel/dark,
-/area/chapel/office)
+/obj/structure/table/wood,
+/obj/item/folder/yellow,
+/obj/item/pen/blue,
+/turf/open/floor/wood,
+/area/library)
"aJK" = (
/obj/machinery/navbeacon{
codes_txt = "delivery;dir=2";
@@ -15795,12 +16282,8 @@
location = "Kitchen"
},
/obj/structure/plasticflaps/opaque,
-/obj/effect/turf_decal/bot{
- dir = 2
- },
-/turf/open/floor/plasteel{
- dir = 2
- },
+/obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
/area/crew_quarters/kitchen)
"aJL" = (
/obj/machinery/navbeacon{
@@ -15809,30 +16292,26 @@
location = "Hydroponics"
},
/obj/structure/plasticflaps/opaque,
-/obj/effect/turf_decal/bot{
- dir = 2
- },
-/turf/open/floor/plasteel{
- dir = 2
- },
-/area/hydroponics)
-"aJM" = (
-/obj/structure/table/wood,
-/obj/item/flashlight/lamp{
- pixel_y = 10
- },
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
- },
-/turf/open/floor/plasteel/grimy,
-/area/chapel/office)
-"aJN" = (
-/obj/structure/table,
-/obj/item/book/manual/hydroponics_pod_people,
-/obj/item/paper/guides/jobs/hydroponics,
+/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/hydroponics)
+"aJM" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 5
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on,
+/turf/open/floor/plasteel/dark,
+/area/chapel/office)
+"aJN" = (
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/obj/structure/sign/departments/security{
+ pixel_x = -32;
+ pixel_y = -32
+ },
+/turf/open/floor/plasteel,
+/area/hallway/primary/fore)
"aJO" = (
/obj/structure/table,
/obj/machinery/reagentgrinder,
@@ -15840,30 +16319,55 @@
/area/hydroponics)
"aJP" = (
/obj/structure/table/wood,
-/obj/item/folder/yellow,
-/obj/item/pen,
-/turf/open/floor/wood,
-/area/library)
-"aJQ" = (
-/obj/structure/chair/office/dark{
+/obj/item/flashlight/lamp{
+ pixel_y = 10
+ },
+/obj/structure/disposalpipe/segment,
+/obj/item/nullrod,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/turf/open/floor/wood,
-/area/library)
-"aJR" = (
-/obj/structure/chair/office/dark{
+/turf/open/floor/plasteel/grimy,
+/area/chapel/office)
+"aJQ" = (
+/obj/machinery/light{
dir = 8
},
-/turf/open/floor/wood,
-/area/library)
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+ dir = 8
+ },
+/turf/open/floor/plasteel,
+/area/crew_quarters/dorms)
+"aJR" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/effect/turf_decal/tile/neutral,
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/crew_quarters/dorms)
"aJS" = (
/obj/structure/table/wood,
/obj/structure/disposalpipe/segment,
+/obj/item/paicard,
/turf/open/floor/wood,
/area/library)
"aJT" = (
/obj/structure/table/wood,
-/obj/item/nullrod,
+/obj/item/paper_bin{
+ pixel_x = -2;
+ pixel_y = 5
+ },
+/obj/item/storage/crayons,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
@@ -15971,9 +16475,9 @@
icon_state = "0-4"
},
/obj/machinery/power/apc{
+ areastring = "/area/construction/mining/aux_base";
dir = 8;
name = "Auxillary Base Construction APC";
- areastring = "/area/construction/mining/aux_base";
pixel_x = -24
},
/obj/structure/cable{
@@ -15984,11 +16488,33 @@
},
/turf/open/floor/plating,
/area/maintenance/port/fore)
+"aKg" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/crew_quarters/dorms)
+"aKh" = (
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
+/turf/open/floor/plasteel,
+/area/crew_quarters/dorms)
+"aKi" = (
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
+ dir = 1
+ },
+/obj/structure/table,
+/obj/structure/bedsheetbin/towel,
+/turf/open/floor/plasteel,
+/area/crew_quarters/dorms)
"aKj" = (
/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"aKk" = (
@@ -16028,22 +16554,24 @@
/turf/open/floor/plating,
/area/storage/primary)
"aKq" = (
-/obj/item/radio/intercom{
- pixel_y = 25
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 9
},
-/obj/machinery/camera{
- c_tag = "Theatre Stage";
- dir = 2
- },
-/turf/open/floor/wood,
-/area/crew_quarters/theatre)
+/turf/open/floor/plasteel,
+/area/crew_quarters/dorms)
"aKr" = (
-/obj/machinery/airalarm{
- dir = 2;
- pixel_y = 24
+/obj/structure/cable{
+ icon_state = "4-8"
},
-/turf/open/floor/wood,
-/area/crew_quarters/theatre)
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral,
+/turf/open/floor/plasteel,
+/area/crew_quarters/dorms)
"aKs" = (
/obj/structure/disposalpipe/segment,
/obj/effect/spawner/structure/window,
@@ -16182,14 +16710,22 @@
/turf/open/floor/plasteel,
/area/hydroponics)
"aKJ" = (
-/obj/machinery/light_switch{
- pixel_y = 28
+/obj/item/radio/intercom{
+ name = "Station Intercom (General)";
+ pixel_y = -29
},
-/obj/machinery/light{
- dir = 1
+/obj/structure/cable{
+ icon_state = "4-8"
},
-/turf/open/floor/wood,
-/area/crew_quarters/theatre)
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral,
+/turf/open/floor/plasteel,
+/area/crew_quarters/dorms)
"aKK" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/closet/secure_closet/hydroponics,
@@ -16212,45 +16748,46 @@
/turf/open/floor/plasteel,
/area/hydroponics)
"aKM" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
- dir = 1
+/obj/structure/cable{
+ icon_state = "4-8"
},
-/turf/open/floor/plasteel,
-/area/crew_quarters/bar)
-"aKN" = (
-/obj/structure/window/reinforced{
- dir = 4
+/obj/structure/cable{
+ icon_state = "2-8"
},
-/turf/open/floor/wood,
-/area/crew_quarters/theatre)
-"aKO" = (
-/obj/machinery/disposal/bin,
-/obj/structure/disposalpipe/trunk{
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 10
+ },
+/obj/effect/turf_decal/tile/neutral{
dir = 8
},
-/obj/machinery/firealarm{
- dir = 2;
- pixel_y = 24
- },
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
- dir = 1
- },
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
-/area/crew_quarters/bar)
+/area/crew_quarters/dorms)
+"aKN" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/structure/chair/comfy/brown,
+/turf/open/floor/plasteel,
+/area/crew_quarters/dorms)
+"aKO" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/structure/chair/comfy/black,
+/turf/open/floor/plasteel,
+/area/crew_quarters/dorms)
"aKP" = (
-/obj/structure/disposalpipe/segment{
- dir = 5
+/obj/machinery/door/airlock{
+ name = "Unisex Restrooms"
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
- dir = 1
+/obj/structure/cable{
+ icon_state = "1-2"
},
-/turf/open/floor/plasteel,
-/area/crew_quarters/bar)
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/machinery/door/firedoor,
+/turf/open/floor/plasteel/dark,
+/area/crew_quarters/dorms)
"aKQ" = (
/obj/machinery/reagentgrinder,
/obj/structure/table/wood,
@@ -16260,11 +16797,13 @@
/turf/open/floor/wood,
/area/crew_quarters/bar)
"aKS" = (
-/obj/machinery/camera{
- c_tag = "Bar Storage"
+/obj/effect/turf_decal/tile/red,
+/obj/structure/sign/departments/security{
+ pixel_x = 32;
+ pixel_y = -32
},
-/turf/open/floor/wood,
-/area/crew_quarters/bar)
+/turf/open/floor/plasteel,
+/area/hallway/primary/fore)
"aKT" = (
/obj/structure/closet/secure_closet/freezer/meat,
/turf/open/floor/plasteel/showroomfloor,
@@ -16275,9 +16814,6 @@
/area/hydroponics)
"aKV" = (
/obj/machinery/door/window/southleft{
- base_state = "left";
- dir = 2;
- icon_state = "left";
name = "Kitchen Delivery";
req_access_txt = "28"
},
@@ -16317,8 +16853,9 @@
c_tag = "Chapel Crematorium";
dir = 4
},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
- dir = 1
+/obj/structure/bodycontainer/morgue,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 5
},
/turf/open/floor/plasteel/dark,
/area/chapel/office)
@@ -16387,11 +16924,9 @@
/turf/open/floor/wood,
/area/library)
"aLh" = (
-/obj/machinery/light{
- dir = 4
- },
-/turf/open/floor/wood,
-/area/library)
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/closed/wall,
+/area/crew_quarters/toilet)
"aLi" = (
/obj/structure/chair/comfy/beige,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -16467,6 +17002,23 @@
},
/turf/open/floor/plasteel/dark,
/area/chapel/main)
+"aLs" = (
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/machinery/camera{
+ c_tag = "Dorms South";
+ dir = 8
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/crew_quarters/dorms)
"aLt" = (
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 4
@@ -16550,9 +17102,9 @@
icon_state = "0-2"
},
/obj/machinery/power/apc{
- name = "Port Hall APC";
areastring = "/area/hallway/primary/port";
dir = 1;
+ name = "Port Hall APC";
pixel_y = 26
},
/turf/open/floor/plasteel,
@@ -16588,8 +17140,7 @@
/area/hallway/primary/port)
"aLL" = (
/obj/machinery/camera{
- c_tag = "Port Hallway 2";
- dir = 2
+ c_tag = "Port Hallway 2"
},
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -16628,15 +17179,18 @@
/turf/open/floor/plasteel,
/area/hallway/primary/port)
"aLQ" = (
-/obj/machinery/camera{
- c_tag = "Central Hallway North-East";
- dir = 2
+/obj/structure/cable,
+/obj/machinery/power/apc{
+ areastring = "/area/crew_quarters/toilet";
+ dir = 4;
+ name = "Dormitory Bathrooms APC";
+ pixel_x = 26
},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
- dir = 8
- },
-/turf/open/floor/plasteel,
-/area/hallway/primary/central)
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/structure/table/glass,
+/obj/structure/bedsheetbin/towel,
+/turf/open/floor/mineral/titanium/blue,
+/area/crew_quarters/toilet)
"aLR" = (
/obj/machinery/newscaster{
pixel_y = 32
@@ -16650,10 +17204,11 @@
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"aLS" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
+/obj/machinery/disposal/bin,
+/obj/structure/disposalpipe/trunk,
+/turf/open/floor/plasteel/white/side{
dir = 4
},
-/turf/open/floor/wood,
/area/crew_quarters/theatre)
"aLT" = (
/obj/machinery/door/firedoor,
@@ -16678,15 +17233,13 @@
dir = 1
},
/obj/machinery/firealarm{
- dir = 2;
pixel_y = 24
},
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"aLW" = (
/obj/machinery/camera{
- c_tag = "Central Hallway North-West";
- dir = 2
+ c_tag = "Central Hallway North-West"
},
/obj/machinery/airalarm{
pixel_y = 23
@@ -16746,14 +17299,12 @@
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"aMg" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
+/obj/machinery/vending/cola/pwr_game,
+/obj/structure/sign/poster/contraband/pwr_game{
+ pixel_y = 32
},
/turf/open/floor/plasteel,
-/area/hallway/primary/central)
+/area/crew_quarters/locker)
"aMh" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 4
@@ -16790,7 +17341,6 @@
/area/crew_quarters/kitchen)
"aMm" = (
/obj/machinery/firealarm{
- dir = 2;
pixel_y = 24
},
/turf/open/floor/plasteel,
@@ -16808,20 +17358,33 @@
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"aMp" = (
-/obj/structure/chair/stool{
- pixel_y = 8
- },
-/turf/open/floor/wood,
-/area/crew_quarters/theatre)
+/obj/effect/landmark/blobstart,
+/turf/open/floor/plating,
+/area/maintenance/department/electrical)
"aMq" = (
-/obj/structure/piano{
- icon_state = "piano"
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
},
-/turf/open/floor/wood,
-/area/crew_quarters/theatre)
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/plasteel,
+/area/crew_quarters/dorms)
"aMr" = (
-/turf/open/floor/wood,
-/area/crew_quarters/theatre)
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/turf/open/floor/plasteel,
+/area/crew_quarters/dorms)
"aMs" = (
/obj/structure/disposalpipe/segment{
dir = 5
@@ -16843,41 +17406,33 @@
/turf/open/floor/plasteel,
/area/hydroponics)
"aMu" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- dir = 4
- },
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
+/obj/machinery/camera{
+ c_tag = "Bathrooms";
dir = 1
},
-/turf/open/floor/plasteel,
-/area/crew_quarters/bar)
+/obj/structure/urinal{
+ pixel_y = 32
+ },
+/turf/open/floor/mineral/titanium/blue,
+/area/crew_quarters/toilet)
"aMv" = (
-/obj/structure/window/reinforced{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/turf/open/floor/wood,
-/area/crew_quarters/theatre)
-"aMw" = (
-/obj/machinery/computer/slot_machine,
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
- dir = 1
- },
-/turf/open/floor/plasteel,
-/area/crew_quarters/bar)
-"aMx" = (
-/obj/structure/chair/stool,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
- dir = 1
+/turf/open/floor/plasteel/freezer,
+/area/crew_quarters/toilet)
+"aMw" = (
+/obj/machinery/door/airlock{
+ name = "Unisex Restrooms"
},
-/turf/open/floor/plasteel,
-/area/crew_quarters/bar)
+/obj/machinery/door/firedoor,
+/turf/open/floor/plasteel/dark,
+/area/hallway/primary/central)
+"aMx" = (
+/obj/machinery/door/airlock{
+ name = "Shower Room"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/plasteel/dark,
+/area/crew_quarters/toilet)
"aMy" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -16910,13 +17465,21 @@
/turf/open/floor/plasteel,
/area/hydroponics)
"aMB" = (
-/obj/machinery/vending/coffee,
-/turf/open/floor/wood,
-/area/crew_quarters/bar)
+/obj/effect/spawner/structure/window,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/crew_quarters/abandoned_gambling_den)
"aMC" = (
-/obj/machinery/vending/cola/random,
-/turf/open/floor/wood,
-/area/crew_quarters/bar)
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/light_switch{
+ pixel_y = -25
+ },
+/turf/open/floor/plating,
+/area/crew_quarters/abandoned_gambling_den)
"aMD" = (
/obj/machinery/icecream_vat,
/turf/open/floor/plasteel/showroomfloor,
@@ -16942,27 +17505,28 @@
/turf/open/floor/plasteel,
/area/hydroponics)
"aMH" = (
-/obj/structure/chair/office/dark{
- dir = 1
+/obj/machinery/door/airlock{
+ name = "Unisex Restrooms"
},
-/turf/open/floor/wood,
-/area/library)
+/obj/machinery/door/firedoor,
+/turf/open/floor/plasteel/dark,
+/area/crew_quarters/bar)
"aMI" = (
/obj/machinery/light/small,
/obj/machinery/vending/wardrobe/hydro_wardrobe,
/turf/open/floor/plasteel,
/area/hydroponics)
"aMJ" = (
-/obj/structure/chair/office/dark{
- dir = 1
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
},
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/wood,
-/area/library)
+/turf/closed/wall,
+/area/crew_quarters/dorms)
"aMK" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
- dir = 1
+/obj/structure/disposalpipe/segment{
+ dir = 5
},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/turf/open/floor/plasteel/dark,
/area/chapel/office)
"aML" = (
@@ -16973,8 +17537,7 @@
/area/chapel/main)
"aMM" = (
/obj/machinery/camera{
- c_tag = "Chapel North";
- dir = 2
+ c_tag = "Chapel North"
},
/turf/open/floor/plasteel/dark,
/area/chapel/main)
@@ -17041,9 +17604,11 @@
/turf/open/floor/plasteel,
/area/hallway/primary/port)
"aMW" = (
-/obj/structure/bodycontainer/morgue,
-/turf/open/floor/plasteel/dark,
-/area/chapel/office)
+/obj/structure/bookcase{
+ name = "Forbidden Knowledge"
+ },
+/turf/open/floor/carpet,
+/area/library)
"aMX" = (
/turf/open/floor/plasteel/grimy,
/area/chapel/office)
@@ -17124,6 +17689,13 @@
},
/turf/open/floor/plasteel,
/area/hallway/primary/port)
+"aNn" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/structure/chair/comfy/brown,
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
"aNo" = (
/obj/structure/cable{
icon_state = "1-8"
@@ -17154,17 +17726,33 @@
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"aNt" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/structure/chair/comfy/brown{
dir = 4
},
-/turf/open/floor/wood,
-/area/crew_quarters/theatre)
-"aNu" = (
-/obj/structure/closet/secure_closet/bar{
- req_access_txt = "25"
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
},
-/turf/open/floor/wood,
-/area/crew_quarters/bar)
+/obj/effect/turf_decal/tile/neutral,
+/obj/machinery/airalarm{
+ dir = 1;
+ pixel_y = -22
+ },
+/turf/open/floor/plasteel,
+/area/crew_quarters/dorms)
+"aNu" = (
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/obj/machinery/power/apc{
+ areastring = "/area/crew_quarters/abandoned_gambling_den";
+ name = "Abandoned Gambling Den APC";
+ pixel_y = -24
+ },
+/turf/open/floor/plating,
+/area/crew_quarters/abandoned_gambling_den)
"aNv" = (
/obj/effect/turf_decal/plaque{
icon_state = "L4"
@@ -17240,57 +17828,78 @@
/turf/open/floor/wood,
/area/crew_quarters/bar)
"aNF" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
+/obj/structure/table/reinforced,
+/obj/effect/turf_decal/tile/bar,
+/obj/effect/turf_decal/tile/bar{
+ dir = 1
},
-/turf/open/floor/wood,
-/area/crew_quarters/theatre)
+/obj/effect/turf_decal/stripes/line{
+ dir = 10
+ },
+/obj/item/reagent_containers/food/drinks/soda_cans/starkist{
+ pixel_x = -3;
+ pixel_y = 5
+ },
+/turf/open/floor/plasteel,
+/area/crew_quarters/bar)
"aNG" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
+/obj/structure/cable{
+ icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
- dir = 1
+/obj/structure/chair/comfy/brown{
+ dir = 8
},
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
-/area/crew_quarters/bar)
+/area/crew_quarters/dorms)
"aNH" = (
-/obj/machinery/door/window{
- dir = 4;
- name = "Theatre Stage"
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/structure/sign/warning/fire{
+ desc = "A sign that states the labeled room's number.";
+ icon_state = "roomnum";
+ name = "Room Number 1";
+ pixel_x = -30;
+ pixel_y = -7
+ },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 4
},
-/turf/open/floor/wood,
-/area/crew_quarters/theatre)
+/turf/open/floor/plasteel,
+/area/crew_quarters/dorms)
"aNI" = (
-/obj/machinery/computer/slot_machine,
-/obj/machinery/light/small{
- dir = 4
- },
-/obj/machinery/status_display{
- pixel_x = 32
- },
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
- dir = 1
- },
+/obj/structure/closet/jcloset,
+/obj/item/storage/bag/trash,
+/obj/item/clothing/under/janimaid,
+/obj/item/clothing/under/janimaid,
+/obj/item/clothing/under/janimaid,
+/obj/item/clothing/under/maid,
+/obj/item/clothing/under/maid,
+/obj/item/clothing/under/maid,
/turf/open/floor/plasteel,
-/area/crew_quarters/bar)
+/area/janitor)
"aNJ" = (
-/obj/structure/chair/stool,
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- dir = 4
- },
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
- dir = 1
+/obj/structure/table,
+/obj/item/grenade/chem_grenade/cleaner,
+/obj/item/grenade/chem_grenade/cleaner,
+/obj/item/grenade/chem_grenade/cleaner,
+/obj/machinery/requests_console{
+ department = "Janitorial";
+ departmentType = 1;
+ pixel_y = -29
},
+/obj/item/reagent_containers/spray/cleaner,
+/obj/item/storage/box/lights/mixed,
+/obj/item/storage/box/lights/mixed,
/turf/open/floor/plasteel,
-/area/crew_quarters/bar)
+/area/janitor)
"aNK" = (
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 8
@@ -17343,6 +17952,7 @@
"aNR" = (
/obj/structure/table/wood,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/item/paicard,
/turf/open/floor/carpet,
/area/hallway/secondary/entry)
"aNS" = (
@@ -17379,9 +17989,11 @@
/turf/open/floor/plasteel,
/area/hallway/primary/port)
"aNV" = (
-/obj/machinery/photocopier,
-/turf/open/floor/wood,
-/area/library)
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 8
+ },
+/turf/open/floor/plating,
+/area/crew_quarters/abandoned_gambling_den)
"aNW" = (
/obj/machinery/door/airlock/public/glass{
name = "Chapel Office";
@@ -17588,6 +18200,15 @@
},
/turf/open/floor/plasteel,
/area/hallway/primary/port)
+"aOu" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/obj/structure/chair/comfy/brown{
+ dir = 8
+ },
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
"aOv" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -17712,32 +18333,56 @@
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"aOH" = (
-/obj/structure/window/reinforced,
-/turf/open/floor/wood,
-/area/crew_quarters/theatre)
+/obj/structure/closet/secure_closet/captains,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+ dir = 4
+ },
+/obj/item/clothing/under/captainparade,
+/turf/open/floor/carpet,
+/area/crew_quarters/heads/captain)
"aOI" = (
/obj/structure/kitchenspike,
/turf/open/floor/plasteel/showroomfloor,
/area/crew_quarters/kitchen)
"aOJ" = (
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
- dir = 4
+/obj/item/radio/intercom{
+ dir = 8;
+ name = "Station Intercom (General)";
+ pixel_x = -28
},
-/turf/open/floor/wood,
-/area/crew_quarters/theatre)
-"aOK" = (
-/obj/effect/spawner/structure/window,
-/turf/open/floor/plating,
-/area/crew_quarters/bar)
-"aOL" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
+/obj/structure/closet/secure_closet/hop,
+/obj/effect/turf_decal/tile/blue{
dir = 1
},
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/obj/item/clothing/suit/ianshirt,
/turf/open/floor/plasteel,
+/area/crew_quarters/heads/hop)
+"aOK" = (
+/obj/machinery/door/airlock{
+ name = "Theatre Backstage";
+ req_access_txt = "46"
+ },
+/obj/machinery/door/firedoor,
+/turf/open/floor/plasteel/dark,
/area/crew_quarters/bar)
+"aOL" = (
+/obj/machinery/camera{
+ c_tag = "Central Hallway North-East"
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+ dir = 8
+ },
+/obj/structure/extinguisher_cabinet{
+ pixel_x = -5;
+ pixel_y = 30
+ },
+/turf/open/floor/plasteel,
+/area/hallway/primary/central)
"aOM" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/machinery/atmospherics/components/unary/vent_pump/on{
@@ -17806,8 +18451,7 @@
"aOW" = (
/obj/machinery/hydroponics/constructable,
/obj/machinery/camera{
- c_tag = "Hydroponics North";
- dir = 2
+ c_tag = "Hydroponics North"
},
/turf/open/floor/plasteel/dark,
/area/hydroponics)
@@ -17864,29 +18508,38 @@
/turf/open/floor/wood,
/area/library)
"aPg" = (
-/obj/structure/bookcase{
- name = "Forbidden Knowledge"
- },
-/turf/open/floor/engine/cult,
-/area/library)
-"aPh" = (
-/obj/structure/table/wood,
-/obj/item/paper_bin{
- pixel_x = -3;
- pixel_y = 7
- },
-/obj/item/pen/invisible,
-/turf/open/floor/engine/cult,
-/area/library)
-"aPi" = (
-/obj/structure/table/wood,
-/obj/item/taperecorder,
-/obj/item/camera,
/obj/item/radio/intercom{
pixel_y = 25
},
-/turf/open/floor/engine/cult,
+/obj/machinery/vending/wardrobe/curator_wardrobe,
+/turf/open/floor/carpet,
/area/library)
+"aPh" = (
+/obj/structure/table/wood,
+/obj/item/book/codex_gigas,
+/obj/item/clothing/under/suit_jacket/red,
+/obj/structure/destructible/cult/tome,
+/turf/open/floor/carpet,
+/area/library)
+"aPi" = (
+/obj/structure/chair/comfy/brown,
+/turf/open/floor/carpet,
+/area/library)
+"aPj" = (
+/obj/machinery/vr_sleeper{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 4
+ },
+/turf/open/floor/plasteel/white/corner{
+ dir = 1
+ },
+/area/crew_quarters/fitness)
"aPk" = (
/turf/open/floor/plasteel/chapel{
dir = 4
@@ -17961,7 +18614,6 @@
/area/hallway/secondary/entry)
"aPv" = (
/obj/item/radio/intercom{
- broadcasting = 0;
name = "Station Intercom (General)";
pixel_y = 20
},
@@ -18080,6 +18732,19 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel,
/area/hallway/primary/port)
+"aPP" = (
+/obj/structure/reagent_dispensers/watertank/high,
+/obj/structure/sign/poster/contraband/lizard{
+ pixel_x = -32
+ },
+/obj/structure/sign/poster/contraband/lizard{
+ pixel_x = -32
+ },
+/obj/structure/sign/poster/contraband/lizard{
+ pixel_x = -32
+ },
+/turf/open/floor/plasteel,
+/area/hydroponics)
"aPQ" = (
/turf/closed/wall,
/area/storage/tools)
@@ -18170,39 +18835,34 @@
/turf/open/floor/plating,
/area/bridge)
"aPY" = (
-/obj/structure/chair/stool,
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
- dir = 1
+/obj/structure/table/optable{
+ name = "Robotics Operating Table"
},
-/turf/open/floor/plasteel,
-/area/crew_quarters/bar)
+/obj/effect/landmark/event_spawn,
+/obj/item/tank/internals/anesthetic,
+/obj/item/clothing/mask/breath,
+/turf/open/floor/plasteel/dark,
+/area/science/robotics/lab)
"aPZ" = (
-/obj/structure/table,
-/obj/machinery/computer/security/telescreen/entertainment{
- pixel_x = -31
- },
-/obj/item/clothing/head/hardhat/cakehat,
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
- dir = 1
+/obj/item/mop,
+/obj/item/reagent_containers/glass/bucket,
+/obj/structure/sign/poster/contraband/busty_backdoor_xeno_babes_6{
+ pixel_x = 32
},
/turf/open/floor/plasteel,
-/area/crew_quarters/bar)
+/area/janitor)
"aQa" = (
-/obj/structure/table,
-/obj/item/kitchen/fork,
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
- dir = 1
+/obj/structure/reagent_dispensers/watertank,
+/obj/structure/sign/poster/contraband/lusty_xenomorph{
+ pixel_x = 32
},
/turf/open/floor/plasteel,
-/area/crew_quarters/bar)
+/area/janitor)
"aQb" = (
-/obj/structure/window/reinforced,
-/obj/structure/table/wood,
-/obj/item/instrument/violin,
-/turf/open/floor/wood,
+/obj/machinery/vending/autodrobe,
+/turf/open/floor/plasteel/white/side{
+ dir = 4
+ },
/area/crew_quarters/theatre)
"aQc" = (
/obj/effect/turf_decal/tile/bar,
@@ -18212,23 +18872,15 @@
/turf/open/floor/plasteel,
/area/crew_quarters/bar)
"aQd" = (
-/obj/structure/chair,
-/obj/effect/landmark/start/assistant,
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
- dir = 1
- },
-/turf/open/floor/plasteel,
-/area/crew_quarters/bar)
+/obj/structure/lattice,
+/turf/open/space/basic,
+/area/space)
"aQe" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/structure/chair/stool,
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
- dir = 1
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
},
-/turf/open/floor/plasteel,
-/area/crew_quarters/bar)
+/turf/open/floor/plating,
+/area/space/nearstation)
"aQf" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/effect/turf_decal/tile/green{
@@ -18343,22 +18995,24 @@
/area/library)
"aQr" = (
/obj/machinery/light/small,
-/obj/machinery/vending/wardrobe/curator_wardrobe,
-/turf/open/floor/engine/cult,
+/obj/structure/table/wood/fancy,
+/turf/open/floor/carpet,
/area/library)
"aQs" = (
-/obj/structure/destructible/cult/tome,
-/obj/item/clothing/under/suit_jacket/red,
-/obj/item/book/codex_gigas,
-/turf/open/floor/engine/cult,
+/obj/structure/bed,
+/obj/item/bedsheet/black,
+/turf/open/floor/carpet,
/area/library)
"aQt" = (
-/obj/effect/landmark/blobstart,
-/obj/structure/chair/comfy/brown{
- dir = 1
- },
-/turf/open/floor/engine/cult,
-/area/library)
+/obj/structure/table,
+/obj/item/stack/cable_coil/random,
+/obj/item/stack/cable_coil/random,
+/obj/item/stack/cable_coil,
+/obj/item/paper_bin/construction,
+/obj/item/stack/cable_coil,
+/obj/item/pen/fourcolor,
+/turf/open/floor/plasteel,
+/area/storage/art)
"aQu" = (
/turf/open/floor/plasteel/chapel,
/area/chapel/main)
@@ -18494,37 +19148,67 @@
/area/crew_quarters/locker)
"aQO" = (
/obj/structure/closet/wardrobe/white,
+/obj/item/clothing/suit/ghost_sheet,
+/obj/item/clothing/suit/ghost_sheet,
+/obj/item/clothing/suit/ghost_sheet,
/turf/open/floor/plasteel,
/area/crew_quarters/locker)
"aQP" = (
-/obj/structure/reagent_dispensers/fueltank,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/structure/chair/comfy/brown{
+ dir = 8
+ },
+/obj/machinery/airalarm{
+ pixel_y = 23
+ },
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
+"aQQ" = (
/obj/machinery/light_switch{
pixel_y = 28
},
-/turf/open/floor/plasteel,
-/area/crew_quarters/locker)
-"aQQ" = (
-/obj/structure/reagent_dispensers/watertank,
+/obj/machinery/vending/cigarette,
/turf/open/floor/plasteel,
/area/crew_quarters/locker)
"aQR" = (
-/obj/machinery/vending/cola/random,
+/obj/machinery/camera{
+ c_tag = "Arrivals Bay 3 & 4";
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/landmark/start/assistant,
/turf/open/floor/plasteel,
-/area/crew_quarters/locker)
+/area/hallway/secondary/entry)
"aQS" = (
/obj/machinery/vending/coffee,
/turf/open/floor/plasteel,
/area/crew_quarters/locker)
"aQT" = (
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/plasteel,
-/area/crew_quarters/locker)
+/obj/item/clothing/gloves/color/rainbow,
+/obj/item/clothing/head/soft/rainbow,
+/obj/item/clothing/shoes/sneakers/rainbow,
+/obj/item/clothing/under/color/rainbow,
+/turf/open/floor/plating,
+/area/maintenance/port/fore)
"aQU" = (
-/obj/machinery/vending/kink,
-/turf/open/floor/plasteel,
-/area/crew_quarters/locker)
+/obj/structure/sign/poster/contraband/lizard{
+ pixel_x = -32
+ },
+/obj/structure/sign/poster/contraband/lizard{
+ pixel_x = -32
+ },
+/obj/structure/sign/poster/contraband/lizard{
+ pixel_x = -32
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plating,
+/area/maintenance/starboard/fore)
"aQV" = (
-/obj/machinery/vending/clothing,
+/obj/structure/disposalpipe/segment{
+ dir = 5
+ },
/turf/open/floor/plasteel,
/area/crew_quarters/locker)
"aQW" = (
@@ -18532,18 +19216,19 @@
/turf/open/floor/plasteel,
/area/crew_quarters/locker)
"aQX" = (
-/obj/machinery/firealarm{
- dir = 2;
- pixel_y = 24
+/obj/machinery/vending/clothing,
+/obj/structure/disposalpipe/segment{
+ dir = 4
},
/turf/open/floor/plasteel,
/area/crew_quarters/locker)
"aQY" = (
-/obj/structure/table,
-/obj/item/stack/cable_coil/random,
-/obj/item/stack/cable_coil/random,
+/obj/machinery/vending/autodrobe/all_access,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/open/floor/plasteel,
-/area/storage/art)
+/area/crew_quarters/locker)
"aQZ" = (
/obj/machinery/light/small{
dir = 4
@@ -18736,47 +19421,30 @@
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"aRu" = (
-/obj/machinery/light{
- dir = 8
- },
-/obj/structure/chair/stool,
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
- dir = 1
- },
-/turf/open/floor/plasteel,
-/area/crew_quarters/bar)
-"aRv" = (
-/obj/structure/chair{
- dir = 1
- },
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
- dir = 1
- },
-/turf/open/floor/plasteel,
-/area/crew_quarters/bar)
-"aRw" = (
-/obj/structure/chair{
- dir = 1
- },
-/obj/effect/landmark/start/assistant,
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
- dir = 1
- },
-/turf/open/floor/plasteel,
-/area/crew_quarters/bar)
-"aRx" = (
-/obj/structure/chair{
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
- dir = 1
+/obj/machinery/vending/kink,
+/obj/machinery/light{
+ dir = 4;
+ light_color = "#e8eaff"
},
/turf/open/floor/plasteel,
-/area/crew_quarters/bar)
+/area/crew_quarters/fitness)
+"aRv" = (
+/obj/effect/landmark/blobstart,
+/turf/open/floor/plating,
+/area/maintenance/starboard/fore)
+"aRw" = (
+/obj/structure/fans/tiny/invisible,
+/turf/open/space/basic,
+/area/space)
+"aRx" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 10
+ },
+/turf/open/floor/plating,
+/area/space/nearstation)
"aRy" = (
/obj/structure/extinguisher_cabinet{
pixel_x = -5;
@@ -18795,7 +19463,9 @@
/turf/open/floor/plasteel,
/area/crew_quarters/bar)
"aRA" = (
-/obj/machinery/vending/dinnerware,
+/obj/machinery/vending/dinnerware{
+ contraband = list(/obj/item/kitchen/rollingpin = 2, /obj/item/kitchen/knife/butcher = 2, /obj/item/reagent_containers/food/condiment/flour = 4)
+ },
/turf/open/floor/plasteel/cafeteria,
/area/crew_quarters/kitchen)
"aRB" = (
@@ -18803,8 +19473,7 @@
pixel_y = 25
},
/obj/machinery/camera{
- c_tag = "Kitchen";
- dir = 2
+ c_tag = "Kitchen"
},
/obj/structure/closet/secure_closet/freezer/fridge,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -18875,9 +19544,9 @@
icon_state = "1-2"
},
/obj/machinery/power/apc{
+ areastring = "/area/library";
dir = 4;
name = "Library APC";
- areastring = "/area/library";
pixel_x = 24
},
/obj/structure/cable,
@@ -18945,9 +19614,9 @@
/area/hallway/secondary/exit)
"aRV" = (
/obj/machinery/power/apc{
+ areastring = "/area/storage/tools";
dir = 1;
name = "Auxiliary Tool Storage APC";
- areastring = "/area/storage/tools";
pixel_y = 24
},
/obj/machinery/firealarm{
@@ -18990,8 +19659,7 @@
pixel_y = 28
},
/obj/machinery/camera{
- c_tag = "Auxiliary Tool Storage";
- dir = 2
+ c_tag = "Auxiliary Tool Storage"
},
/obj/structure/table,
/obj/item/stack/sheet/metal/fifty,
@@ -19012,7 +19680,6 @@
/area/storage/tools)
"aSd" = (
/obj/machinery/firealarm{
- dir = 2;
pixel_y = -24
},
/turf/open/floor/plasteel,
@@ -19032,26 +19699,39 @@
/turf/open/floor/plating,
/area/maintenance/port)
"aSh" = (
-/obj/structure/closet/wardrobe/mixed,
-/obj/item/radio/intercom{
- name = "Station Intercom (General)";
- pixel_x = -27
+/obj/structure/table,
+/obj/item/storage/toolbox/artistic{
+ pixel_y = 10
+ },
+/obj/item/storage/toolbox/artistic,
+/obj/item/storage/toolbox/electrical{
+ pixel_y = -10
},
/turf/open/floor/plasteel,
-/area/crew_quarters/locker)
+/area/storage/art)
"aSi" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
/turf/open/floor/plasteel,
/area/crew_quarters/locker)
-"aSk" = (
-/obj/structure/table,
-/obj/item/stack/cable_coil/random,
-/obj/item/stack/cable_coil/random,
-/obj/item/stack/cable_coil,
-/obj/item/paper_bin/construction,
-/obj/item/stack/cable_coil,
+"aSj" = (
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/light,
/turf/open/floor/plasteel,
-/area/storage/art)
+/area/crew_quarters/dorms)
+"aSk" = (
+/obj/structure/table/wood,
+/obj/item/camera_film,
+/obj/item/camera_film,
+/obj/item/taperecorder,
+/obj/item/camera,
+/turf/open/floor/wood,
+/area/library)
"aSl" = (
/obj/machinery/light_switch{
pixel_y = 28
@@ -19067,36 +19747,50 @@
/turf/open/floor/plating,
/area/storage/emergency/port)
"aSo" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/structure/disposalpipe/trunk{
dir = 4
},
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
- dir = 1
- },
-/turf/open/floor/plasteel,
-/area/crew_quarters/bar)
-"aSp" = (
-/obj/structure/chair/stool,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 9
- },
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
- dir = 1
- },
-/turf/open/floor/plasteel,
-/area/crew_quarters/bar)
-"aSq" = (
-/obj/structure/chair{
+/obj/machinery/disposal/bin,
+/obj/effect/turf_decal/tile/neutral{
dir = 8
},
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
- dir = 1
- },
+/obj/effect/turf_decal/tile/neutral,
+/obj/machinery/light,
/turf/open/floor/plasteel,
-/area/crew_quarters/bar)
+/area/crew_quarters/dorms)
+"aSp" = (
+/obj/structure/toilet{
+ dir = 4
+ },
+/obj/structure/mirror{
+ pixel_y = 32
+ },
+/obj/structure/sink{
+ dir = 1;
+ pixel_y = 25
+ },
+/obj/machinery/button/door{
+ id = "Bath1";
+ name = "Door Bolt Control";
+ normaldoorcontrol = 1;
+ pixel_x = 14;
+ pixel_y = 38;
+ specialfunctions = 4
+ },
+/obj/machinery/light/small{
+ dir = 8
+ },
+/turf/open/floor/mineral/titanium/blue,
+/area/crew_quarters/toilet)
+"aSq" = (
+/obj/machinery/door/airlock{
+ name = "Recharging Station"
+ },
+/turf/open/floor/plating,
+/area/maintenance/fore/secondary)
"aSr" = (
/turf/open/floor/plasteel,
/area/storage/tools)
@@ -19212,28 +19906,20 @@
/turf/open/floor/plasteel,
/area/crew_quarters/bar)
"aSG" = (
-/obj/structure/table/wood/poker,
-/obj/item/toy/cards/deck,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
+/obj/structure/fireplace,
+/obj/machinery/airalarm{
+ dir = 8;
+ pixel_x = 23
},
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
- dir = 1
- },
-/turf/open/floor/plasteel,
-/area/crew_quarters/bar)
+/turf/open/floor/plating,
+/area/maintenance/port)
"aSH" = (
-/obj/structure/chair/stool,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
+/obj/structure/lattice/catwalk,
+/obj/structure/cable{
+ icon_state = "1-2"
},
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
- dir = 1
- },
-/turf/open/floor/plasteel,
-/area/crew_quarters/bar)
+/turf/open/space,
+/area/solar/starboard/aft)
"aSI" = (
/obj/machinery/door/airlock/public/glass{
name = "Kitchen";
@@ -19314,13 +20000,17 @@
/turf/open/floor/plasteel/dark,
/area/hydroponics)
"aSS" = (
-/obj/machinery/seed_extractor,
-/turf/open/floor/plasteel,
-/area/hydroponics)
+/obj/structure/lattice/catwalk,
+/obj/structure/cable,
+/turf/open/space,
+/area/solar/starboard/aft)
"aST" = (
-/obj/machinery/biogenerator,
-/turf/open/floor/plasteel,
-/area/hydroponics)
+/obj/structure/lattice/catwalk,
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/turf/open/space,
+/area/solar/starboard/aft)
"aSU" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 1
@@ -19342,25 +20032,19 @@
/turf/open/floor/plasteel,
/area/storage/tools)
"aSX" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+/obj/machinery/vending/kink,
+/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/open/floor/plating,
-/area/maintenance/port)
-"aSY" = (
-/obj/structure/table/reinforced,
-/obj/item/clothing/head/that{
- throwforce = 1
- },
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
- dir = 1
- },
/turf/open/floor/plasteel,
-/area/crew_quarters/bar)
+/area/crew_quarters/locker)
+"aSY" = (
+/obj/structure/lattice/catwalk,
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/turf/open/space,
+/area/solar/starboard/aft)
"aSZ" = (
/obj/effect/landmark/start/bartender,
/obj/effect/turf_decal/tile/bar,
@@ -19369,6 +20053,13 @@
},
/turf/open/floor/plasteel,
/area/crew_quarters/bar)
+"aTa" = (
+/obj/structure/lattice/catwalk,
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/turf/open/space,
+/area/solar/starboard/aft)
"aTb" = (
/obj/machinery/newscaster{
pixel_y = 32
@@ -19377,9 +20068,7 @@
/area/library)
"aTc" = (
/obj/machinery/door/window/northright{
- base_state = "right";
dir = 8;
- icon_state = "right";
name = "Library Desk Door";
req_access_txt = "37"
},
@@ -19475,6 +20164,20 @@
},
/turf/open/floor/plating,
/area/hallway/secondary/exit)
+"aTp" = (
+/obj/structure/lattice/catwalk,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/space,
+/area/solar/port/fore)
+"aTq" = (
+/obj/structure/lattice/catwalk,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/space,
+/area/solar/starboard/fore)
"aTr" = (
/obj/machinery/door/firedoor,
/obj/machinery/status_display{
@@ -19506,17 +20209,25 @@
/turf/open/floor/plating,
/area/maintenance/port)
"aTw" = (
-/obj/structure/closet/wardrobe/green,
-/obj/machinery/light{
- dir = 8
+/obj/structure/closet/wardrobe/mixed,
+/obj/item/radio/intercom{
+ name = "Station Intercom (General)";
+ pixel_x = -27
},
+/obj/item/clothing/head/beret,
+/obj/item/clothing/head/beret,
+/obj/item/clothing/head/russobluecamohat,
+/obj/item/clothing/head/russobluecamohat,
/turf/open/floor/plasteel,
/area/crew_quarters/locker)
"aTx" = (
-/obj/structure/chair/stool{
- pixel_y = 8
+/obj/machinery/firealarm{
+ pixel_y = 24
},
-/obj/effect/landmark/start/assistant,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/vending/games,
/turf/open/floor/plasteel,
/area/crew_quarters/locker)
"aTy" = (
@@ -19524,45 +20235,71 @@
/turf/open/floor/plasteel,
/area/crew_quarters/locker)
"aTz" = (
-/obj/structure/table,
-/turf/open/floor/plasteel,
-/area/crew_quarters/locker)
-"aTA" = (
-/obj/structure/table,
-/obj/item/storage/toolbox/mechanical{
- pixel_x = -2;
- pixel_y = -1
- },
-/turf/open/floor/plasteel,
-/area/crew_quarters/locker)
-"aTB" = (
/obj/structure/chair/stool{
pixel_y = 8
},
/turf/open/floor/plasteel,
/area/crew_quarters/locker)
-"aTC" = (
-/obj/structure/table,
-/obj/item/storage/toolbox/mechanical{
- pixel_x = -2;
- pixel_y = -1
+"aTA" = (
+/obj/machinery/disposal/bin,
+/obj/structure/disposalpipe/trunk{
+ dir = 8
},
-/obj/structure/disposalpipe/segment,
+/turf/open/floor/plasteel,
+/area/crew_quarters/locker)
+"aTB" = (
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 4
+ },
+/obj/structure/window{
+ dir = 1
+ },
+/obj/structure/window{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/red,
+/obj/effect/landmark/start/assistant,
+/turf/open/floor/plasteel,
+/area/crew_quarters/locker)
+"aTC" = (
+/obj/effect/turf_decal/tile/red{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/structure/window{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/red,
/turf/open/floor/plasteel,
/area/crew_quarters/locker)
"aTD" = (
-/obj/structure/closet/secure_closet/personal,
-/obj/machinery/airalarm{
- dir = 8;
- pixel_x = 24
+/obj/effect/turf_decal/tile/red{
+ dir = 1
},
-/obj/machinery/camera{
- c_tag = "Locker Room East";
- dir = 8
- },
-/obj/machinery/light{
+/obj/effect/turf_decal/tile/yellow{
dir = 4
},
+/obj/effect/turf_decal/tile/blue,
+/obj/structure/window{
+ dir = 1
+ },
+/obj/structure/window{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/yellow{
+ dir = 8
+ },
/turf/open/floor/plasteel,
/area/crew_quarters/locker)
"aTE" = (
@@ -19606,6 +20343,12 @@
/area/storage/emergency/port)
"aTL" = (
/obj/structure/table,
+/obj/item/storage/toolbox/artistic{
+ icon_state = "yellow";
+ item_state = "toolbox_yellow";
+ name = "Cable Toolbox";
+ pixel_y = 6
+ },
/obj/item/storage/toolbox/emergency,
/turf/open/floor/plasteel,
/area/storage/tools)
@@ -19615,10 +20358,15 @@
/turf/open/floor/plasteel/cafeteria,
/area/crew_quarters/kitchen)
"aTN" = (
-/obj/structure/table,
-/obj/item/kitchen/rollingpin,
-/turf/open/floor/plasteel/cafeteria,
-/area/crew_quarters/kitchen)
+/obj/machinery/vending/dinnerware{
+ contraband = list(/obj/item/reagent_containers/food/condiment/flour = 4);
+ desc = "This vendor is full of condiments to put on food.";
+ name = "\improper Condiments Vendor";
+ product_ads = "Get your sauces here!;No slave labour was used to make these products!;Nanotrasen Approved?!";
+ products = list(/obj/item/storage/bag/tray = 8, /obj/item/reagent_containers/food/drinks/drinkingglass = 10, /obj/item/storage/box/cups = 5, /obj/item/reagent_containers/food/condiment/pack/ketchup = 20, /obj/item/reagent_containers/food/condiment/pack/mustard = 20, /obj/item/reagent_containers/food/condiment/pack/hotsauce = 20, /obj/item/reagent_containers/food/condiment/pack/astrotame = 20, /obj/item/reagent_containers/food/condiment/saltshaker = 20, /obj/item/reagent_containers/food/condiment/peppermill = 20)
+ },
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
"aTO" = (
/obj/structure/table,
/obj/item/book/manual/chef_recipes,
@@ -19738,28 +20486,19 @@
/turf/open/floor/plasteel,
/area/bridge)
"aUf" = (
-/obj/machinery/airalarm{
- dir = 4;
- pixel_x = -22
+/obj/structure/lattice/catwalk,
+/obj/structure/cable{
+ icon_state = "0-4"
},
-/obj/machinery/camera{
- c_tag = "Bar West";
- dir = 4
- },
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
- dir = 1
- },
-/turf/open/floor/plasteel,
-/area/crew_quarters/bar)
+/turf/open/space,
+/area/solar/port/aft)
"aUg" = (
-/obj/structure/chair,
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
- dir = 1
+/obj/structure/lattice/catwalk,
+/obj/structure/cable{
+ icon_state = "4-8"
},
-/turf/open/floor/plasteel,
-/area/crew_quarters/bar)
+/turf/open/space,
+/area/solar/port/aft)
"aUh" = (
/obj/structure/table/reinforced,
/obj/machinery/door/window/eastleft{
@@ -19784,15 +20523,28 @@
/turf/open/floor/plasteel/dark,
/area/hydroponics)
"aUj" = (
-/obj/machinery/vending/hydronutrients,
-/turf/open/floor/plasteel,
-/area/hydroponics)
-"aUk" = (
-/obj/machinery/vending/hydroseeds{
- slogan_delay = 700
+/obj/item/soap,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/machinery/light/small{
+ dir = 1;
+ light_color = "#ffc1c1"
},
-/turf/open/floor/plasteel,
-/area/hydroponics)
+/turf/open/floor/plasteel/freezer,
+/area/crew_quarters/toilet)
+"aUk" = (
+/obj/effect/turf_decal/tile/green{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/green,
+/obj/machinery/camera{
+ c_tag = "VR Sleepers";
+ dir = 1
+ },
+/obj/machinery/light/small,
+/turf/open/floor/plasteel/white/side{
+ dir = 1
+ },
+/area/crew_quarters/fitness)
"aUl" = (
/obj/structure/chair/office/dark{
dir = 8
@@ -19817,39 +20569,71 @@
/turf/open/floor/plasteel,
/area/crew_quarters/locker)
"aUp" = (
+/obj/machinery/airalarm{
+ dir = 8;
+ pixel_x = 24
+ },
+/obj/machinery/camera{
+ c_tag = "Locker Room East";
+ dir = 8
+ },
+/obj/machinery/light{
+ dir = 4
+ },
/obj/structure/table,
-/obj/item/clothing/head/soft/grey{
- pixel_x = -2;
- pixel_y = 3
+/obj/item/reagent_containers/rag/towel/random,
+/obj/item/razor,
+/turf/open/floor/plasteel,
+/area/crew_quarters/locker)
+"aUq" = (
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 8
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/turf/open/floor/plasteel,
-/area/crew_quarters/locker)
-"aUq" = (
-/obj/structure/table,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+/obj/structure/window{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
dir = 4
},
/turf/open/floor/plasteel,
/area/crew_quarters/locker)
"aUr" = (
-/obj/structure/chair/stool{
- pixel_y = 8
- },
-/obj/effect/landmark/start/assistant,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
/turf/open/floor/plasteel,
/area/crew_quarters/locker)
"aUs" = (
-/obj/structure/table,
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/yellow{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/yellow{
+ dir = 8
+ },
/turf/open/floor/plasteel,
/area/crew_quarters/locker)
"aUt" = (
@@ -19859,12 +20643,27 @@
/turf/open/floor/plasteel,
/area/crew_quarters/locker)
"aUu" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/obj/structure/window{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
/turf/open/floor/plasteel,
/area/crew_quarters/locker)
"aUv" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 10
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
+ dir = 4
},
/turf/open/floor/plasteel,
/area/crew_quarters/locker)
@@ -19911,10 +20710,17 @@
/turf/open/floor/wood,
/area/library)
"aUC" = (
-/obj/structure/chair/comfy/black,
-/obj/effect/landmark/start/assistant,
-/turf/open/floor/wood,
-/area/library)
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+ dir = 4
+ },
+/obj/effect/landmark/start/mime,
+/obj/structure/disposalpipe/segment{
+ dir = 5
+ },
+/turf/open/floor/plasteel/white/side{
+ dir = 4
+ },
+/area/crew_quarters/theatre)
"aUD" = (
/obj/structure/table/wood,
/obj/item/flashlight/lamp/green{
@@ -19966,6 +20772,15 @@
dir = 1
},
/area/chapel/main)
+"aUL" = (
+/obj/machinery/computer/arcade,
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/turf/open/floor/plasteel/white/corner{
+ dir = 1
+ },
+/area/hallway/secondary/exit)
"aUM" = (
/obj/machinery/camera{
c_tag = "Arrivals Bay 2";
@@ -19984,11 +20799,29 @@
/turf/open/floor/wood,
/area/security/vacantoffice)
"aUP" = (
-/obj/machinery/airalarm{
- pixel_y = 23
+/obj/structure/toilet{
+ dir = 4
},
-/turf/open/floor/wood,
-/area/security/vacantoffice)
+/obj/structure/mirror{
+ pixel_y = 32
+ },
+/obj/structure/sink{
+ dir = 1;
+ pixel_y = 25
+ },
+/obj/machinery/button/door{
+ id = "Bath2";
+ name = "Door Bolt Control";
+ normaldoorcontrol = 1;
+ pixel_x = 14;
+ pixel_y = 38;
+ specialfunctions = 4
+ },
+/obj/machinery/light/small{
+ dir = 8
+ },
+/turf/open/floor/mineral/titanium/blue,
+/area/crew_quarters/toilet)
"aUQ" = (
/obj/structure/table/wood,
/turf/open/floor/wood,
@@ -20012,18 +20845,29 @@
/turf/open/floor/plating,
/area/maintenance/port)
"aUU" = (
-/obj/structure/closet/wardrobe/grey,
-/obj/machinery/requests_console{
- department = "Locker Room";
- pixel_x = -32
+/obj/structure/closet/wardrobe/green,
+/obj/machinery/light{
+ dir = 8
},
+/obj/item/clothing/under/kilt,
+/obj/item/clothing/under/kilt,
/turf/open/floor/plasteel,
/area/crew_quarters/locker)
"aUV" = (
-/obj/structure/chair/stool{
- pixel_y = 8
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/obj/machinery/door/window/westright{
+ name = "Red Corner"
+ },
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
dir = 4
},
/turf/open/floor/plasteel,
@@ -20040,17 +20884,29 @@
/turf/open/floor/plasteel,
/area/crew_quarters/locker)
"aUY" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
/turf/open/floor/plasteel,
/area/crew_quarters/locker)
"aUZ" = (
-/obj/structure/closet/secure_closet/personal,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 10
- },
+/obj/structure/table,
+/obj/item/clothing/gloves/boxing/yellow,
+/obj/item/clothing/gloves/boxing/green,
+/obj/item/clothing/gloves/boxing/blue,
+/obj/item/clothing/gloves/boxing/blue,
+/obj/item/clothing/gloves/boxing,
+/obj/item/clothing/gloves/boxing,
/turf/open/floor/plasteel,
/area/crew_quarters/locker)
"aVa" = (
@@ -20128,9 +20984,9 @@
/area/bridge)
"aVh" = (
/obj/machinery/power/apc{
+ areastring = "/area/hallway/primary/fore";
dir = 8;
name = "Fore Primary Hallway APC";
- areastring = "/area/hallway/primary/fore";
pixel_x = -24
},
/obj/structure/cable{
@@ -20295,8 +21151,7 @@
/area/hallway/primary/central)
"aVv" = (
/obj/machinery/camera{
- c_tag = "Bridge East Entrance";
- dir = 2
+ c_tag = "Bridge East Entrance"
},
/obj/effect/turf_decal/tile/blue{
dir = 1
@@ -20307,40 +21162,42 @@
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"aVw" = (
-/obj/structure/table/wood/poker,
-/obj/item/clothing/mask/cigarette/cigar,
-/obj/item/toy/cards/deck,
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
- dir = 1
- },
-/turf/open/floor/plasteel,
-/area/crew_quarters/bar)
+/obj/effect/landmark/carpspawn,
+/turf/open/space/basic,
+/area/space)
"aVx" = (
-/obj/machinery/holopad,
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
- dir = 1
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 9
},
-/turf/open/floor/plasteel,
-/area/crew_quarters/bar)
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/door/poddoor/shutters/preopen{
+ id = "holoprivacy";
+ name = "Holodeck Shutters"
+ },
+/turf/open/floor/plating,
+/area/crew_quarters/fitness)
"aVy" = (
-/obj/structure/table/reinforced,
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
- dir = 1
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/structure/table,
+/obj/item/storage/firstaid/regular{
+ pixel_y = 5
},
/turf/open/floor/plasteel,
-/area/crew_quarters/bar)
+/area/crew_quarters/fitness)
"aVz" = (
/turf/open/floor/plasteel/cafeteria,
/area/crew_quarters/kitchen)
"aVA" = (
-/obj/structure/table/reinforced,
-/obj/machinery/door/firedoor,
-/obj/item/reagent_containers/food/snacks/pie/cream,
-/turf/open/floor/plasteel/cafeteria,
-/area/crew_quarters/kitchen)
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/plasteel/white/side{
+ dir = 4
+ },
+/area/crew_quarters/theatre)
"aVB" = (
/obj/structure/table,
/obj/item/reagent_containers/food/condiment/enzyme{
@@ -20360,15 +21217,18 @@
/turf/open/floor/plating,
/area/maintenance/port)
"aVD" = (
-/obj/structure/table,
-/obj/item/reagent_containers/food/condiment/saltshaker{
- pixel_x = -3
+/obj/machinery/door/airlock/maintenance{
+ name = "Theatre Maintenance";
+ req_access_txt = "46"
},
-/obj/item/reagent_containers/food/condiment/peppermill{
- pixel_x = 3
+/obj/structure/disposalpipe/segment{
+ dir = 4
},
-/turf/open/floor/plasteel/cafeteria,
-/area/crew_quarters/kitchen)
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/crew_quarters/theatre)
"aVE" = (
/obj/structure/table,
/obj/item/storage/box/donkpockets{
@@ -20384,6 +21244,14 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/plasteel/cafeteria,
/area/crew_quarters/kitchen)
+"aVG" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 9
+ },
+/obj/structure/table,
+/obj/item/coin/gold,
+/turf/open/floor/plasteel,
+/area/crew_quarters/fitness)
"aVH" = (
/obj/machinery/processor,
/obj/machinery/firealarm{
@@ -20409,9 +21277,14 @@
/turf/open/floor/plasteel/dark,
/area/hydroponics)
"aVK" = (
-/obj/effect/landmark/start/botanist,
-/turf/open/floor/plasteel,
-/area/hydroponics)
+/obj/machinery/shower{
+ dir = 4
+ },
+/obj/item/radio/intercom{
+ pixel_y = 25
+ },
+/turf/open/floor/plasteel/freezer,
+/area/crew_quarters/toilet)
"aVL" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -20454,10 +21327,9 @@
/turf/open/floor/plasteel,
/area/hallway/primary/starboard)
"aVP" = (
-/obj/structure/table/wood,
-/obj/item/paper,
-/turf/open/floor/wood,
-/area/library)
+/obj/machinery/vending/autodrobe/all_access,
+/turf/open/floor/plasteel,
+/area/crew_quarters/fitness)
"aVQ" = (
/obj/structure/chair/comfy/black{
dir = 8
@@ -20466,27 +21338,32 @@
/area/library)
"aVR" = (
/obj/structure/table/wood,
-/obj/item/pen/red,
-/obj/item/pen/blue{
- pixel_x = 5;
- pixel_y = 5
+/obj/item/paper_bin/bundlenatural{
+ pixel_x = 6;
+ pixel_y = 4
},
+/obj/item/paper_bin{
+ pixel_x = -6;
+ pixel_y = 4
+ },
+/obj/item/pen/fountain,
+/obj/item/pen/fourcolor,
/turf/open/floor/wood,
/area/library)
"aVS" = (
/obj/structure/table/wood,
-/obj/item/camera_film,
-/obj/item/camera_film,
+/obj/item/pen/red,
/turf/open/floor/wood,
/area/library)
"aVT" = (
/obj/structure/table/wood,
-/obj/item/paper_bin{
- pixel_x = 1;
- pixel_y = 9
+/obj/item/reagent_containers/food/drinks/bottle/whiskey{
+ pixel_x = 3
},
-/turf/open/floor/wood,
-/area/library)
+/obj/item/lighter,
+/obj/item/restraints/handcuffs,
+/turf/open/floor/carpet,
+/area/security/detectives_office)
"aVU" = (
/obj/structure/chair/stool,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -20587,6 +21464,7 @@
/area/chapel/main)
"aWh" = (
/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden,
+/obj/item/beacon,
/turf/open/floor/plasteel,
/area/hallway/secondary/exit)
"aWi" = (
@@ -20629,6 +21507,14 @@
"aWn" = (
/obj/structure/closet/wardrobe/black,
/obj/item/clothing/shoes/jackboots,
+/obj/item/clothing/under/janimaid,
+/obj/item/clothing/under/janimaid,
+/obj/item/clothing/under/maid,
+/obj/item/clothing/under/maid,
+/obj/item/clothing/accessory/maidapron,
+/obj/item/clothing/accessory/maidapron,
+/obj/item/clothing/head/beret/black,
+/obj/item/clothing/head/beret/black,
/turf/open/floor/plasteel,
/area/crew_quarters/locker)
"aWo" = (
@@ -20689,9 +21575,9 @@
/area/maintenance/port)
"aWw" = (
/obj/machinery/power/apc{
+ areastring = "/area/storage/art";
dir = 1;
name = "Art Storage";
- areastring = "/area/storage/art";
pixel_y = 24
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -20721,9 +21607,9 @@
/area/crew_quarters/toilet/locker)
"aWz" = (
/obj/machinery/power/apc{
+ areastring = "/area/storage/emergency/port";
dir = 1;
name = "Port Emergency Storage APC";
- areastring = "/area/storage/emergency/port";
pixel_y = 24
},
/obj/structure/cable{
@@ -20741,9 +21627,21 @@
/turf/open/floor/plating,
/area/maintenance/port)
"aWB" = (
-/obj/structure/reagent_dispensers/fueltank,
-/turf/open/floor/plating,
-/area/maintenance/port)
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/turf/open/floor/plasteel,
+/area/crew_quarters/locker)
"aWC" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -20971,9 +21869,8 @@
/area/bridge)
"aWW" = (
/obj/machinery/power/apc/highcap/five_k{
- dir = 2;
- name = "Bridge APC";
areastring = "/area/bridge";
+ name = "Bridge APC";
pixel_y = -24
},
/obj/structure/cable,
@@ -21124,51 +22021,51 @@
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"aXi" = (
-/obj/machinery/light{
+/obj/machinery/vending/clothing,
+/turf/open/floor/plasteel,
+/area/crew_quarters/fitness)
+"aXj" = (
+/obj/structure/reagent_dispensers/water_cooler,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/effect/turf_decal/tile/neutral{
dir = 8
},
-/obj/machinery/computer/security/telescreen/entertainment{
- pixel_x = -31
- },
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
- dir = 1
- },
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
-/area/crew_quarters/bar)
-"aXj" = (
-/obj/structure/table/reinforced,
-/obj/item/lighter,
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
- dir = 1
- },
-/turf/open/floor/plasteel,
-/area/crew_quarters/bar)
+/area/crew_quarters/dorms)
"aXk" = (
-/obj/structure/table/reinforced,
-/obj/machinery/computer/security/telescreen/entertainment{
- pixel_x = 32
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
},
-/obj/item/book/manual/wiki/barman_recipes,
-/obj/item/reagent_containers/rag,
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue,
+/obj/machinery/door/window/eastleft{
+ name = "Blue Corner"
+ },
+/obj/effect/turf_decal/tile/blue{
dir = 1
},
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
/turf/open/floor/plasteel,
-/area/crew_quarters/bar)
+/area/crew_quarters/locker)
"aXl" = (
-/obj/machinery/door/window/southright{
- name = "Bar Door";
- req_one_access_txt = "25;28"
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/structure/cable{
+ icon_state = "2-8"
},
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
- dir = 1
+/obj/structure/disposalpipe/junction,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
},
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
-/area/crew_quarters/bar)
+/area/crew_quarters/dorms)
"aXm" = (
/obj/effect/landmark/start/cook,
/turf/open/floor/plasteel/cafeteria,
@@ -21204,29 +22101,33 @@
/turf/open/floor/plasteel,
/area/hallway/primary/starboard)
"aXr" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 10
},
/turf/open/floor/plasteel,
/area/crew_quarters/locker)
"aXs" = (
-/obj/machinery/disposal/bin,
-/obj/structure/disposalpipe/trunk{
- dir = 4
+/obj/machinery/door/airlock/maintenance{
+ name = "Detective Maintenance";
+ req_access_txt = "4"
},
-/turf/open/floor/plasteel,
-/area/crew_quarters/locker)
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plating,
+/area/maintenance/port)
"aXt" = (
-/obj/effect/turf_decal/stripes/corner{
- dir = 2
+/obj/machinery/power/apc{
+ areastring = "/area/security/detectives_office";
+ dir = 4;
+ name = "Detective's Office APC";
+ pixel_x = 24
},
-/obj/item/twohanded/required/kirbyplants{
- icon_state = "plant-21";
- pixel_x = -3;
- pixel_y = 3
+/obj/structure/cable{
+ icon_state = "0-8"
},
-/turf/open/floor/plasteel,
-/area/crew_quarters/locker)
+/turf/open/floor/plasteel/grimy,
+/area/security/detectives_office)
"aXu" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -21234,20 +22135,45 @@
/turf/open/floor/carpet,
/area/library)
"aXv" = (
-/obj/structure/disposalpipe/segment{
- dir = 9
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/obj/structure/window{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
+ dir = 4
},
/turf/open/floor/plasteel,
/area/crew_quarters/locker)
"aXw" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 2
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/yellow{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/yellow{
+ dir = 8
},
/turf/open/floor/plasteel,
/area/crew_quarters/locker)
"aXx" = (
-/obj/structure/closet/secure_closet/personal,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
/turf/open/floor/plasteel,
/area/crew_quarters/locker)
"aXy" = (
@@ -21268,10 +22194,19 @@
/turf/open/floor/carpet,
/area/chapel/main)
"aXA" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/effect/turf_decal/stripes/corner{
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue,
+/obj/structure/window{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue{
dir = 1
},
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
/turf/open/floor/plasteel,
/area/crew_quarters/locker)
"aXB" = (
@@ -21305,19 +22240,24 @@
/turf/closed/wall,
/area/quartermaster/warehouse)
"aXF" = (
-/obj/effect/landmark/event_spawn,
-/obj/effect/turf_decal/tile/neutral{
+/obj/structure/table/reinforced,
+/obj/effect/turf_decal/tile/bar,
+/obj/effect/turf_decal/tile/bar{
dir = 1
},
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
+/obj/item/paper_bin/bundlenatural{
+ pixel_x = 6;
+ pixel_y = 4
},
-/obj/effect/turf_decal/tile/neutral{
+/obj/item/pen/fountain{
+ pixel_x = 6
+ },
+/obj/effect/turf_decal/stripes/line{
dir = 8
},
-/turf/open/floor/plasteel/dark,
-/area/crew_quarters/fitness)
+/obj/item/pen/fourcolor,
+/turf/open/floor/plasteel,
+/area/crew_quarters/bar)
"aXG" = (
/obj/machinery/light{
dir = 4
@@ -21330,6 +22270,10 @@
},
/turf/open/floor/plasteel,
/area/hallway/secondary/exit)
+"aXH" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on,
+/turf/open/floor/plasteel,
+/area/crew_quarters/dorms)
"aXI" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
@@ -21379,15 +22323,16 @@
/turf/open/floor/wood,
/area/security/vacantoffice)
"aXO" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
- dir = 1
+/obj/structure/cable{
+ icon_state = "4-8"
},
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
- dir = 1
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
},
+/obj/effect/turf_decal/tile/neutral,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/turf/open/floor/plasteel,
-/area/crew_quarters/bar)
+/area/crew_quarters/dorms)
"aXP" = (
/obj/machinery/portable_atmospherics/canister/air,
/turf/open/floor/plating,
@@ -21467,9 +22412,9 @@
/area/security/vacantoffice)
"aYa" = (
/obj/machinery/power/apc{
+ areastring = "/area/maintenance/port";
dir = 8;
name = "Port Maintenance APC";
- areastring = "/area/maintenance/port";
pixel_x = -27;
pixel_y = 2
},
@@ -21498,12 +22443,12 @@
/turf/open/floor/plating,
/area/maintenance/port)
"aYc" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 6
- },
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 6
+ },
/turf/closed/wall,
/area/quartermaster/warehouse)
"aYd" = (
@@ -21535,19 +22480,17 @@
/area/construction)
"aYh" = (
/obj/structure/disposalpipe/segment{
- dir = 4
+ dir = 10
},
-/obj/machinery/light/small{
- dir = 4
+/obj/machinery/button/door{
+ id = "kanyewest";
+ name = "Privacy Shutters";
+ pixel_y = 24
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
- },
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/turf/open/floor/plating,
-/area/maintenance/port)
+/obj/structure/rack,
+/obj/item/storage/briefcase,
+/turf/open/floor/plasteel/grimy,
+/area/security/detectives_office)
"aYi" = (
/obj/structure/closet/secure_closet/detective,
/obj/structure/disposalpipe/segment{
@@ -21559,15 +22502,8 @@
/turf/open/floor/plasteel/grimy,
/area/security/detectives_office)
"aYj" = (
-/obj/structure/table/wood,
-/obj/item/taperecorder,
-/obj/structure/disposalpipe/segment{
- dir = 10
- },
-/obj/machinery/button/door{
- id = "kanyewest";
- name = "Privacy Shutters";
- pixel_y = 24
+/obj/machinery/light/small{
+ dir = 8
},
/turf/open/floor/plasteel/grimy,
/area/security/detectives_office)
@@ -21764,9 +22700,8 @@
/area/hallway/primary/central)
"aYF" = (
/obj/machinery/power/apc{
- dir = 2;
- name = "Central Hall APC";
areastring = "/area/hallway/primary/central";
+ name = "Central Hall APC";
pixel_y = -24
},
/obj/structure/cable,
@@ -21784,28 +22719,24 @@
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"aYH" = (
-/obj/structure/table,
-/obj/item/razor,
-/obj/structure/window{
- dir = 1
+/obj/structure/table/wood,
+/obj/item/paper/fluff{
+ info = "Renovation Notice
The bar layout for the station is very old. We've decided to give it a facelift after our partnership with IKEA Intergalactic?.We added some sweet retro arcade machines and much more seating area. We removed the stage since it hasn't ever been used.You can run this place like a restaurant now that you have tables. Go whip up a menu with the Chef. You have a condiments table and your Requests Console has been moved so a noticeboard can be placed there. Take tickets from customers and pin them on the noticeboard for the Chef.We hope you like the new bar!";
+ name = "Renovation Notice - Bar";
+ pixel_x = -5;
+ pixel_y = 3
},
-/obj/effect/turf_decal/tile/blue{
+/obj/item/reagent_containers/food/drinks/shaker,
+/obj/item/stack/spacecash/c100,
+/obj/item/stack/spacecash/c100,
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
+"aYI" = (
+/obj/structure/chair/comfy/black{
dir = 4
},
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/turf/open/floor/plasteel/cafeteria,
-/area/crew_quarters/locker)
-"aYI" = (
-/obj/structure/chair/stool/bar,
-/obj/effect/landmark/start/assistant,
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
- dir = 1
- },
/turf/open/floor/plasteel,
-/area/crew_quarters/bar)
+/area/crew_quarters/dorms)
"aYJ" = (
/obj/machinery/light_switch{
pixel_y = -25
@@ -21853,9 +22784,9 @@
/turf/open/floor/plasteel,
/area/hydroponics)
"aYP" = (
-/obj/structure/reagent_dispensers/watertank/high,
+/obj/structure/table/wood/poker,
/turf/open/floor/plasteel,
-/area/hydroponics)
+/area/crew_quarters/dorms)
"aYQ" = (
/obj/machinery/hydroponics/constructable,
/obj/effect/turf_decal/tile/green{
@@ -21872,25 +22803,24 @@
/turf/open/floor/plasteel,
/area/hydroponics)
"aYS" = (
-/obj/structure/closet,
-/obj/item/clothing/under/suit_jacket/female{
- pixel_x = 3;
- pixel_y = 1
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 1;
+ pixel_x = 5
},
-/obj/item/clothing/under/suit_jacket/really_black{
- pixel_x = -2
- },
-/obj/structure/window{
- dir = 1
- },
-/obj/effect/turf_decal/tile/blue{
+/obj/machinery/light/small{
dir = 4
},
-/obj/effect/turf_decal/tile/blue{
- dir = 8
+/obj/structure/table/glass,
+/obj/item/razor{
+ pixel_x = 2;
+ pixel_y = 3
},
-/turf/open/floor/plasteel/cafeteria,
-/area/crew_quarters/locker)
+/obj/item/reagent_containers/rag/towel/random,
+/obj/item/reagent_containers/rag/towel/random,
+/obj/item/reagent_containers/rag/towel/random,
+/obj/item/reagent_containers/rag/towel/random,
+/turf/open/floor/mineral/titanium/blue,
+/area/crew_quarters/toilet)
"aYT" = (
/obj/machinery/camera{
c_tag = "Hydroponics South";
@@ -21910,11 +22840,17 @@
/turf/open/floor/carpet,
/area/library)
"aYX" = (
-/obj/structure/window/reinforced{
- dir = 8
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/effect/turf_decal/stripes/line{
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/yellow{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/yellow{
dir = 8
},
/turf/open/floor/plasteel,
@@ -21926,16 +22862,15 @@
/turf/open/floor/carpet,
/area/library)
"aYZ" = (
-/obj/structure/table/wood,
-/obj/item/storage/box/evidence,
-/obj/item/hand_labeler{
- pixel_x = 5
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+ dir = 8
},
-/obj/structure/disposalpipe/segment{
- dir = 4
+/obj/structure/closet/crate/freezer,
+/obj/machinery/light/small{
+ dir = 8
},
-/turf/open/floor/plasteel/grimy,
-/area/security/detectives_office)
+/turf/open/floor/plasteel,
+/area/quartermaster/warehouse)
"aZa" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 1
@@ -21943,16 +22878,10 @@
/turf/open/floor/plasteel/grimy,
/area/security/detectives_office)
"aZb" = (
-/obj/machinery/camera{
- c_tag = "Bar South";
- dir = 1
- },
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
- dir = 1
- },
+/obj/structure/table/wood/poker,
+/obj/item/toy/cards/deck,
/turf/open/floor/plasteel,
-/area/crew_quarters/bar)
+/area/crew_quarters/dorms)
"aZc" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable{
@@ -22043,15 +22972,14 @@
/turf/open/floor/wood,
/area/security/vacantoffice)
"aZo" = (
-/obj/structure/sink{
- dir = 4;
- pixel_x = 11
+/obj/structure/disposalpipe/segment{
+ dir = 4
},
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
- dir = 1
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
},
-/turf/open/floor/plasteel/freezer,
-/area/crew_quarters/toilet/locker)
+/turf/open/floor/plasteel/grimy,
+/area/security/detectives_office)
"aZp" = (
/obj/structure/rack,
/obj/item/electronics/apc,
@@ -22086,41 +23014,77 @@
/turf/open/floor/plating,
/area/maintenance/port)
"aZt" = (
-/obj/structure/toilet{
- pixel_y = 8
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+ dir = 1;
+ pixel_x = 5
},
-/obj/machinery/light/small{
- dir = 8
- },
-/turf/open/floor/plasteel/freezer,
-/area/crew_quarters/toilet/locker)
+/obj/machinery/light/small,
+/turf/open/floor/mineral/titanium/blue,
+/area/crew_quarters/toilet)
"aZu" = (
/obj/machinery/photocopier,
/turf/open/floor/wood,
/area/bridge/meeting_room)
"aZv" = (
-/obj/machinery/door/airlock{
- name = "Unit 1"
+/obj/machinery/firealarm{
+ dir = 4;
+ pixel_x = 24
},
-/turf/open/floor/plasteel/freezer,
-/area/crew_quarters/toilet/locker)
-"aZw" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel/freezer,
-/area/crew_quarters/toilet/locker)
-"aZx" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
+/obj/structure/table,
+/obj/machinery/chem_dispenser/drinks/beer{
dir = 8
},
-/turf/open/floor/plasteel/cafeteria,
+/obj/item/radio/intercom{
+ pixel_y = 25
+ },
+/obj/effect/turf_decal/tile/bar,
+/obj/effect/turf_decal/tile/bar{
+ dir = 1
+ },
+/turf/open/floor/plasteel,
+/area/crew_quarters/bar)
+"aZw" = (
+/obj/effect/turf_decal/tile/bar,
+/obj/effect/turf_decal/tile/bar{
+ dir = 1
+ },
+/obj/machinery/requests_console{
+ department = "Bar";
+ departmentType = 2;
+ pixel_x = -30;
+ pixel_y = 45;
+ receive_ore_updates = 1
+ },
+/turf/open/floor/plasteel,
+/area/crew_quarters/bar)
+"aZx" = (
+/obj/structure/closet{
+ name = "Suit Closet"
+ },
+/obj/item/clothing/under/suit_jacket/white,
+/obj/item/clothing/under/suit_jacket/tan,
+/obj/item/clothing/under/suit_jacket/red,
+/obj/item/clothing/under/suit_jacket/really_black,
+/obj/item/clothing/under/suit_jacket/navy,
+/obj/item/clothing/under/suit_jacket/green,
+/obj/item/clothing/under/suit_jacket/female,
+/obj/item/clothing/under/suit_jacket/checkered,
+/obj/item/clothing/under/suit_jacket/charcoal,
+/obj/item/clothing/under/suit_jacket/burgundy,
+/obj/item/clothing/under/suit_jacket,
+/obj/item/clothing/under/lawyer/black,
+/obj/item/clothing/under/lawyer/blacksuit,
+/obj/item/clothing/under/lawyer/blue,
+/obj/item/clothing/under/lawyer/bluesuit,
+/obj/item/clothing/under/lawyer/female,
+/obj/item/clothing/under/lawyer/purpsuit,
+/obj/item/clothing/under/lawyer/really_black,
+/obj/item/clothing/under/lawyer/red,
+/turf/open/floor/plasteel,
/area/crew_quarters/locker)
"aZy" = (
/obj/machinery/camera{
- c_tag = "Conference Room";
- dir = 2
+ c_tag = "Conference Room"
},
/turf/open/floor/wood,
/area/bridge/meeting_room)
@@ -22281,53 +23245,50 @@
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"aZZ" = (
-/obj/machinery/vending/cigarette,
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
+/obj/structure/chair/comfy/brown{
+ dir = 8
+ },
+/turf/open/floor/plasteel,
+/area/crew_quarters/dorms)
+"baa" = (
+/obj/structure/chair/comfy/brown{
dir = 1
},
/turf/open/floor/plasteel,
-/area/crew_quarters/bar)
+/area/crew_quarters/dorms)
"bab" = (
-/obj/machinery/light,
-/obj/machinery/firealarm{
- dir = 1;
- pixel_y = -24
- },
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
+/obj/structure/chair/comfy/black{
dir = 1
},
/turf/open/floor/plasteel,
-/area/crew_quarters/bar)
+/area/crew_quarters/dorms)
"bac" = (
-/obj/machinery/newscaster{
- pixel_y = -28
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
},
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
- dir = 1
+/obj/effect/turf_decal/tile/neutral,
+/obj/structure/cable{
+ icon_state = "4-8"
},
/turf/open/floor/plasteel,
-/area/crew_quarters/bar)
+/area/crew_quarters/dorms)
"bad" = (
-/obj/machinery/light,
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
- dir = 1
- },
-/turf/open/floor/plasteel,
-/area/crew_quarters/bar)
+/obj/structure/rack,
+/obj/item/tank/internals/emergency_oxygen,
+/obj/item/tank/internals/emergency_oxygen,
+/obj/item/clothing/mask/breath,
+/obj/item/clothing/mask/breath,
+/obj/effect/decal/cleanable/cobweb,
+/obj/item/clothing/under/color/grey,
+/turf/open/floor/plating,
+/area/maintenance/port/aft)
"bae" = (
-/obj/structure/noticeboard{
- pixel_y = -27
+/obj/effect/spawner/lootdrop/maintenance,
+/obj/structure/disposalpipe/segment{
+ dir = 5
},
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
- dir = 1
- },
-/turf/open/floor/plasteel,
-/area/crew_quarters/bar)
+/turf/open/floor/plating,
+/area/maintenance/starboard/aft)
"baf" = (
/obj/structure/disposalpipe/segment{
dir = 9
@@ -22341,28 +23302,29 @@
/turf/open/floor/wood,
/area/crew_quarters/heads/captain)
"bag" = (
-/obj/machinery/airalarm{
- dir = 1;
- pixel_y = -22
+/obj/structure/disposalpipe/segment{
+ dir = 10
},
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
- dir = 1
- },
-/turf/open/floor/plasteel,
-/area/crew_quarters/bar)
+/turf/open/floor/plating,
+/area/maintenance/starboard/aft)
"bah" = (
-/obj/structure/extinguisher_cabinet{
- pixel_y = -30
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
},
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
- dir = 1
+/obj/machinery/door/airlock/maintenance{
+ req_access_txt = "12"
},
-/turf/open/floor/plasteel,
-/area/crew_quarters/bar)
+/turf/open/floor/plating,
+/area/maintenance/starboard/aft)
"bai" = (
-/obj/machinery/light/small,
+/obj/machinery/camera{
+ c_tag = "Bar";
+ dir = 8
+ },
+/obj/structure/table,
+/obj/machinery/chem_dispenser/drinks{
+ dir = 8
+ },
/obj/effect/turf_decal/tile/bar,
/obj/effect/turf_decal/tile/bar{
dir = 1
@@ -22458,10 +23420,9 @@
/turf/open/floor/wood,
/area/library)
"bat" = (
-/obj/structure/table/wood,
-/obj/item/pen,
-/turf/open/floor/wood,
-/area/library)
+/obj/structure/reagent_dispensers/keg/semen,
+/turf/open/floor/plating,
+/area/maintenance/bar)
"bau" = (
/obj/structure/chair/comfy/black{
dir = 4
@@ -22479,15 +23440,16 @@
/turf/open/floor/wood,
/area/library)
"baw" = (
-/obj/structure/sink{
- dir = 4;
- pixel_x = 11
+/obj/structure/table/reinforced,
+/obj/machinery/door/firedoor,
+/obj/item/reagent_containers/food/snacks/pie/cream,
+/obj/structure/noticeboard{
+ desc = "Tickets for food orders will be placed here. The Chef should make the order and hand it to a waiter, waitress or just let the barkeep serve it.";
+ name = "Food Orders";
+ pixel_y = 26
},
-/obj/structure/mirror{
- pixel_x = 28
- },
-/turf/open/floor/plasteel/freezer,
-/area/crew_quarters/toilet/locker)
+/turf/open/floor/plasteel/cafeteria,
+/area/crew_quarters/kitchen)
"bax" = (
/obj/structure/chair/comfy/black{
dir = 4
@@ -22526,9 +23488,9 @@
/area/hallway/secondary/exit)
"baD" = (
/obj/machinery/power/apc{
+ areastring = "/area/hallway/secondary/exit";
dir = 8;
name = "Escape Hallway APC";
- areastring = "/area/hallway/secondary/exit";
pixel_x = -25
},
/obj/structure/cable{
@@ -22601,9 +23563,9 @@
icon_state = "1-2"
},
/obj/machinery/power/apc{
+ areastring = "/area/crew_quarters/toilet/locker";
dir = 4;
name = "Locker Restrooms APC";
- areastring = "/area/crew_quarters/toilet/locker";
pixel_x = 27;
pixel_y = 2
},
@@ -22619,8 +23581,28 @@
/turf/open/floor/plating,
/area/maintenance/port)
"baO" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel/freezer,
+/obj/structure/toilet{
+ dir = 4
+ },
+/obj/structure/mirror{
+ pixel_y = 32
+ },
+/obj/structure/sink{
+ dir = 1;
+ pixel_y = 25
+ },
+/obj/machinery/button/door{
+ id = "LockerShitter1";
+ name = "Door Bolt Control";
+ normaldoorcontrol = 1;
+ pixel_x = 14;
+ pixel_y = 38;
+ specialfunctions = 4
+ },
+/obj/machinery/light/small{
+ dir = 8
+ },
+/turf/open/floor/mineral/titanium/blue,
/area/crew_quarters/toilet/locker)
"baP" = (
/obj/structure/table/wood,
@@ -22811,24 +23793,28 @@
/turf/open/floor/plasteel/freezer,
/area/crew_quarters/toilet/locker)
"bbr" = (
-/obj/machinery/camera{
- c_tag = "Locker Room South";
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/yellow{
dir = 8
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/structure/window,
+/obj/structure/window{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/yellow{
+ dir = 4
+ },
/turf/open/floor/plasteel,
/area/crew_quarters/locker)
"bbs" = (
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/machinery/light,
+/obj/effect/landmark/event_spawn,
+/obj/effect/landmark/xmastree,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/turf/open/floor/plasteel,
-/area/crew_quarters/locker)
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
"bbt" = (
/obj/structure/closet/crate,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -22836,9 +23822,9 @@
/area/quartermaster/warehouse)
"bbu" = (
/obj/machinery/power/apc{
+ areastring = "/area/crew_quarters/heads/captain";
dir = 1;
name = "Captain's Office APC";
- areastring = "/area/crew_quarters/heads/captain";
pixel_y = 24
},
/obj/structure/cable{
@@ -22866,7 +23852,7 @@
/obj/machinery/door/airlock/public/glass{
name = "Diner"
},
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/dark,
/area/crew_quarters/bar)
"bby" = (
/obj/structure/sign/barsign,
@@ -22878,14 +23864,14 @@
},
/area/hallway/primary/starboard)
"bbA" = (
-/obj/machinery/camera{
- c_tag = "Starboard Primary Hallway 2";
- dir = 2
+/obj/machinery/vending/assist,
+/obj/structure/sign/poster/contraband/grey_tide{
+ desc = "A poster promoting a regression to ape-like intelligence for Assistants, suggesting they break, loot and murder enough to make even a caveman blush.";
+ pixel_x = -32;
+ poster_item_desc = "Nanotrasen does not condone such messages. Please don't regress to ape-level intelligence as this poster suggests."
},
-/turf/open/floor/plasteel/white/corner{
- dir = 1
- },
-/area/hallway/primary/starboard)
+/turf/open/floor/plasteel,
+/area/storage/primary)
"bbB" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/public/glass{
@@ -22934,9 +23920,9 @@
/area/hallway/secondary/exit)
"bbI" = (
/obj/machinery/power/apc{
+ areastring = "/area/security/vacantoffice";
dir = 8;
name = "Vacant Office APC";
- areastring = "/area/security/vacantoffice";
pixel_x = -24
},
/obj/structure/cable{
@@ -22963,9 +23949,10 @@
/area/maintenance/port)
"bbL" = (
/obj/machinery/door/airlock{
- name = "Unit 2"
+ id_tag = "LockerShitter1";
+ name = "Unit 1"
},
-/turf/open/floor/plasteel/freezer,
+/turf/open/floor/mineral/titanium/blue,
/area/crew_quarters/toilet/locker)
"bbM" = (
/obj/item/book/manual/wiki/security_space_law,
@@ -22973,16 +23960,20 @@
/turf/open/floor/carpet,
/area/bridge/meeting_room)
"bbN" = (
-/obj/machinery/washing_machine,
-/obj/machinery/light,
-/obj/effect/turf_decal/tile/blue{
- dir = 4
+/obj/machinery/button/door{
+ id = "Bath3";
+ name = "Door Bolt Control";
+ normaldoorcontrol = 1;
+ pixel_x = 14;
+ pixel_y = 38;
+ specialfunctions = 4
},
-/obj/effect/turf_decal/tile/blue{
+/obj/machinery/light/small{
dir = 8
},
-/turf/open/floor/plasteel/cafeteria,
-/area/crew_quarters/locker)
+/obj/machinery/recharge_station,
+/turf/open/floor/mineral/titanium/blue,
+/area/crew_quarters/toilet)
"bbO" = (
/obj/machinery/washing_machine,
/obj/effect/turf_decal/tile/blue{
@@ -23000,13 +23991,20 @@
/turf/open/floor/plasteel,
/area/quartermaster/warehouse)
"bbQ" = (
-/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/bottle/whiskey{
- pixel_x = 3
+/obj/item/paper_bin/bundlenatural{
+ pixel_x = 6;
+ pixel_y = 4
},
-/obj/item/lighter,
-/turf/open/floor/carpet,
-/area/security/detectives_office)
+/obj/item/paper_bin{
+ pixel_x = -6;
+ pixel_y = 4
+ },
+/obj/item/pen/fountain,
+/obj/structure/table,
+/obj/item/pen/fourcolor,
+/obj/item/stamp/hop,
+/turf/open/floor/plasteel,
+/area/crew_quarters/heads/hop)
"bbR" = (
/turf/open/floor/plasteel,
/area/quartermaster/office)
@@ -23023,12 +24021,19 @@
/turf/open/floor/carpet,
/area/security/detectives_office)
"bbU" = (
-/obj/machinery/door/airlock/maintenance{
- name = "Detective Maintenance";
- req_access_txt = "4"
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
},
-/turf/open/floor/plating,
-/area/maintenance/port)
+/obj/effect/turf_decal/tile/blue,
+/obj/structure/window,
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/crew_quarters/locker)
"bbV" = (
/obj/machinery/firealarm{
dir = 8;
@@ -23184,31 +24189,46 @@
/turf/open/floor/plasteel,
/area/hallway/primary/starboard)
"bcr" = (
-/obj/machinery/camera{
- c_tag = "Starboard Primary Hallway";
- dir = 2
+/obj/machinery/smartfridge/disks{
+ pixel_y = 2
+ },
+/obj/structure/table,
+/obj/item/radio/intercom{
+ pixel_y = 25
},
/turf/open/floor/plasteel,
-/area/hallway/primary/starboard)
+/area/hydroponics)
"bcs" = (
/obj/machinery/firealarm{
- dir = 2;
pixel_y = 24
},
/turf/open/floor/plasteel,
/area/hallway/primary/starboard)
"bct" = (
-/obj/effect/landmark/xeno_spawn,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/structure/sink{
+ dir = 4;
+ pixel_x = 11
+ },
+/obj/structure/mirror{
+ pixel_x = 28
+ },
/turf/open/floor/plasteel/freezer,
/area/crew_quarters/toilet/locker)
"bcu" = (
-/obj/machinery/door/airlock/maintenance{
- name = "Locker Room Maintenance";
- req_access_txt = "12"
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plating,
-/area/maintenance/port)
+/obj/structure/window,
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/crew_quarters/locker)
"bcv" = (
/obj/structure/extinguisher_cabinet{
pixel_x = -5;
@@ -23217,13 +24237,26 @@
/turf/open/floor/plasteel,
/area/hallway/primary/starboard)
"bcw" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/closed/wall,
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/obj/structure/window,
+/obj/structure/window{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/obj/effect/landmark/start/assistant,
+/turf/open/floor/plasteel,
/area/crew_quarters/locker)
"bcx" = (
/obj/machinery/camera{
- c_tag = "Starboard Primary Hallway 5";
- dir = 2
+ c_tag = "Starboard Primary Hallway 5"
},
/turf/open/floor/plasteel,
/area/hallway/primary/starboard)
@@ -23296,12 +24329,13 @@
/turf/open/floor/plating,
/area/maintenance/port)
"bcJ" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- dir = 8
+/obj/machinery/door/airlock{
+ desc = "To keep the station within regulations, space IKEA requires one storage cupboard for their Nanotrasen partnership to continue.";
+ id_tag = "MaintDorm1";
+ name = "Furniture Storage"
},
-/obj/structure/closet/crate/freezer,
-/turf/open/floor/plasteel,
-/area/quartermaster/warehouse)
+/turf/open/floor/plasteel/dark,
+/area/maintenance/port)
"bcK" = (
/obj/structure/rack,
/obj/effect/spawner/lootdrop/maintenance,
@@ -23329,12 +24363,21 @@
/turf/open/floor/carpet,
/area/bridge/meeting_room)
"bcO" = (
-/obj/structure/sink{
- dir = 4;
- pixel_x = 11
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
},
-/turf/open/floor/plasteel/freezer,
-/area/crew_quarters/toilet/locker)
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/turf/open/floor/plasteel,
+/area/crew_quarters/theatre)
"bcP" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 8
@@ -23354,21 +24397,20 @@
/turf/open/floor/plasteel,
/area/quartermaster/warehouse)
"bcS" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
+/obj/effect/landmark/blobstart,
+/turf/open/floor/plasteel/freezer,
+/area/crew_quarters/toilet/locker)
+"bcT" = (
+/obj/structure/window/reinforced{
+ dir = 8
},
+/obj/machinery/light,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/machinery/light/small{
- dir = 4
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
},
/turf/open/floor/plasteel,
-/area/quartermaster/warehouse)
-"bcT" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/turf/closed/wall,
-/area/quartermaster/warehouse)
+/area/crew_quarters/locker)
"bcU" = (
/obj/structure/table/wood,
/turf/open/floor/wood,
@@ -23382,6 +24424,14 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/plasteel/grimy,
/area/security/detectives_office)
+"bcW" = (
+/obj/structure/table/wood,
+/obj/machinery/airalarm{
+ dir = 1;
+ pixel_y = -22
+ },
+/turf/open/floor/wood,
+/area/security/vacantoffice)
"bcX" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/door/poddoor/preopen{
@@ -23413,18 +24463,14 @@
/area/bridge/meeting_room)
"bdb" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel/white/side{
- dir = 2
- },
+/turf/open/floor/plasteel/white/side,
/area/hallway/primary/starboard)
"bdc" = (
/obj/structure/extinguisher_cabinet{
pixel_y = -30
},
/obj/machinery/light,
-/turf/open/floor/plasteel/white/corner{
- dir = 2
- },
+/turf/open/floor/plasteel/white/corner,
/area/hallway/primary/starboard)
"bdd" = (
/obj/machinery/vending/cola/random,
@@ -23658,11 +24704,32 @@
/turf/open/floor/plating,
/area/maintenance/port)
"bdE" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
+/obj/machinery/airalarm{
+ dir = 4;
+ pixel_x = -22
+ },
+/obj/structure/closet/crate/wooden/toy,
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue{
dir = 8
},
-/turf/open/floor/plasteel/grimy,
-/area/security/detectives_office)
+/obj/structure/sign/poster/contraband/clown{
+ pixel_y = -32
+ },
+/obj/structure/sign/poster/contraband/clown{
+ pixel_y = -32
+ },
+/obj/structure/sign/poster/contraband/clown{
+ pixel_y = -32
+ },
+/turf/open/floor/plasteel,
+/area/crew_quarters/theatre)
"bdF" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 4
@@ -23686,8 +24753,15 @@
/turf/open/floor/carpet,
/area/bridge/meeting_room)
"bdJ" = (
-/obj/machinery/door/airlock{
- name = "Unit 3"
+/obj/structure/sink{
+ dir = 4;
+ pixel_x = 11
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 1
+ },
+/obj/structure/mirror{
+ pixel_x = 28
},
/turf/open/floor/plasteel/freezer,
/area/crew_quarters/toilet/locker)
@@ -23699,15 +24773,20 @@
/turf/open/floor/carpet,
/area/bridge/meeting_room)
"bdL" = (
-/obj/effect/landmark/blobstart,
-/obj/item/clothing/suit/ianshirt,
-/obj/structure/closet,
-/turf/open/floor/plating,
-/area/maintenance/port)
+/obj/machinery/camera{
+ c_tag = "Locker Room South";
+ dir = 8
+ },
+/obj/structure/closet/secure_closet/personal,
+/turf/open/floor/plasteel,
+/area/crew_quarters/locker)
"bdM" = (
-/obj/item/latexballon,
-/turf/open/floor/plating,
-/area/maintenance/port)
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/quartermaster/warehouse)
"bdN" = (
/obj/machinery/door/airlock/medical{
name = "Morgue";
@@ -23755,9 +24834,9 @@
/area/quartermaster/warehouse)
"bdT" = (
/obj/machinery/power/apc{
+ areastring = "/area/maintenance/disposal";
dir = 8;
name = "Disposal APC";
- areastring = "/area/maintenance/disposal";
pixel_x = -24
},
/obj/structure/cable{
@@ -23772,13 +24851,39 @@
/obj/structure/closet/crate/medical,
/turf/open/floor/plasteel,
/area/quartermaster/warehouse)
+"bdV" = (
+/obj/structure/toilet{
+ dir = 4
+ },
+/obj/structure/mirror{
+ pixel_y = 32
+ },
+/obj/structure/sink{
+ dir = 1;
+ pixel_y = 25
+ },
+/obj/machinery/button/door{
+ id = "LockerShitter2";
+ name = "Door Bolt Control";
+ normaldoorcontrol = 1;
+ pixel_x = 14;
+ pixel_y = 38;
+ specialfunctions = 4
+ },
+/obj/machinery/light/small{
+ dir = 8
+ },
+/turf/open/floor/mineral/titanium/blue,
+/area/crew_quarters/toilet/locker)
"bdW" = (
-/obj/item/clothing/gloves/color/rainbow,
-/obj/item/clothing/head/soft/rainbow,
-/obj/item/clothing/shoes/sneakers/rainbow,
-/obj/item/clothing/under/color/rainbow,
-/turf/open/floor/plating,
-/area/maintenance/port)
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/machinery/light/small{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/quartermaster/warehouse)
"bdX" = (
/obj/item/storage/fancy/donut_box,
/obj/structure/table,
@@ -23838,9 +24943,8 @@
/area/ai_monitored/turret_protected/ai_upload)
"bed" = (
/obj/machinery/power/apc/highcap/five_k{
- dir = 2;
- name = "Upload APC";
areastring = "/area/ai_monitored/turret_protected/ai_upload";
+ name = "Upload APC";
pixel_y = -24
},
/obj/structure/cable,
@@ -23874,9 +24978,7 @@
/obj/item/aiModule/supplied/oxygen,
/obj/item/aiModule/zeroth/oneHuman,
/obj/machinery/door/window{
- base_state = "left";
dir = 8;
- icon_state = "left";
name = "High-Risk Modules";
req_access_txt = "20"
},
@@ -23994,12 +25096,12 @@
/turf/open/floor/plasteel,
/area/hallway/primary/starboard)
"bev" = (
-/obj/machinery/light,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
+/obj/structure/chair/stool{
+ pixel_y = 8
},
-/turf/open/floor/plasteel,
-/area/hallway/primary/starboard)
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/plating,
+/area/maintenance/starboard/fore)
"bew" = (
/obj/structure/cable{
icon_state = "2-4"
@@ -24090,9 +25192,7 @@
/area/quartermaster/sorting)
"beG" = (
/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/tile/red{
- dir = 2
- },
+/obj/effect/turf_decal/tile/red,
/turf/open/floor/plasteel,
/area/hallway/secondary/exit)
"beH" = (
@@ -24261,14 +25361,17 @@
/area/medical/morgue)
"beZ" = (
/obj/machinery/mineral/stacking_unit_console{
- dir = 2;
machinedir = 8
},
/turf/closed/wall,
/area/maintenance/disposal)
"bfa" = (
-/turf/open/floor/plasteel/freezer,
-/area/crew_quarters/toilet/locker)
+/obj/structure/chair/sofa/left{
+ dir = 1
+ },
+/obj/effect/landmark/start/assistant,
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
"bfb" = (
/obj/structure/sign/warning/vacuum/external{
pixel_y = 32
@@ -24281,9 +25384,9 @@
/area/chapel/main)
"bfc" = (
/obj/machinery/power/apc{
+ areastring = "/area/crew_quarters/locker";
dir = 1;
name = "Locker Room APC";
- areastring = "/area/crew_quarters/locker";
pixel_y = 24
},
/obj/structure/cable{
@@ -24302,9 +25405,17 @@
/turf/open/floor/plating,
/area/maintenance/port)
"bfe" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
-/turf/open/floor/plating,
-/area/maintenance/port)
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/obj/structure/window{
+ dir = 1
+ },
+/turf/open/floor/plasteel/cafeteria,
+/area/crew_quarters/locker)
"bff" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 9
@@ -24346,9 +25457,8 @@
dir = 9
},
/obj/machinery/power/apc{
- dir = 2;
- name = "Cargo Bay APC";
areastring = "/area/quartermaster/storage";
+ name = "Cargo Bay APC";
pixel_x = 1;
pixel_y = -24
},
@@ -24534,9 +25644,8 @@
/area/hallway/primary/starboard)
"bfP" = (
/obj/machinery/power/apc{
- dir = 2;
- name = "Starboard Primary Hallway APC";
areastring = "/area/hallway/primary/starboard";
+ name = "Starboard Primary Hallway APC";
pixel_y = -24
},
/obj/structure/cable,
@@ -24684,13 +25793,17 @@
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"bgi" = (
-/obj/machinery/camera{
- c_tag = "Arrivals Bay 3 & 4";
- dir = 1
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/sign/poster/contraband/space_up{
+ pixel_y = -32
},
-/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
-/area/hallway/secondary/entry)
+/area/hallway/primary/central)
"bgj" = (
/obj/machinery/conveyor{
dir = 8;
@@ -24705,6 +25818,13 @@
},
/turf/open/floor/plating,
/area/maintenance/disposal)
+"bgl" = (
+/obj/machinery/door/airlock{
+ id_tag = "LockerShitter2";
+ name = "Unit 2"
+ },
+/turf/open/floor/mineral/titanium/blue,
+/area/crew_quarters/toilet/locker)
"bgm" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 10
@@ -24726,9 +25846,9 @@
icon_state = "1-2"
},
/obj/machinery/power/apc{
+ areastring = "/area/science/robotics/mechbay";
dir = 4;
name = "Mech Bay APC";
- areastring = "/area/science/robotics/mechbay";
pixel_x = 26
},
/obj/structure/cable{
@@ -24755,18 +25875,16 @@
/turf/open/floor/plating,
/area/maintenance/port)
"bgr" = (
-/obj/machinery/door/airlock{
- name = "Unit 4"
+/obj/machinery/camera{
+ c_tag = "Locker Room Toilets";
+ dir = 8
},
/turf/open/floor/plasteel/freezer,
/area/crew_quarters/toilet/locker)
"bgs" = (
-/obj/machinery/airalarm{
- dir = 1;
- pixel_y = -22
- },
-/turf/open/floor/plasteel/freezer,
-/area/crew_quarters/toilet/locker)
+/obj/item/chair/wood,
+/turf/open/floor/plating,
+/area/maintenance/port)
"bgt" = (
/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plating,
@@ -24796,6 +25914,11 @@
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
/turf/open/floor/plating,
/area/maintenance/port)
+"bgx" = (
+/obj/structure/closet/wardrobe/cargotech,
+/obj/item/radio/headset/headset_cargo,
+/turf/open/floor/plasteel,
+/area/quartermaster/storage)
"bgy" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 9
@@ -24996,9 +26119,9 @@
/area/hallway/primary/central)
"bgZ" = (
/obj/machinery/power/apc{
+ areastring = "/area/medical/chemistry";
dir = 1;
name = "Chemistry APC";
- areastring = "/area/medical/chemistry";
pixel_y = 24
},
/obj/structure/cable{
@@ -25022,11 +26145,9 @@
/area/medical/chemistry)
"bhc" = (
/obj/machinery/camera{
- c_tag = "Chemistry";
- dir = 2
+ c_tag = "Chemistry"
},
/obj/machinery/firealarm{
- dir = 2;
pixel_y = 24
},
/obj/machinery/chem_heater,
@@ -25068,8 +26189,7 @@
/area/security/checkpoint/medical)
"bhj" = (
/obj/machinery/camera{
- c_tag = "Security Post - Medbay";
- dir = 2
+ c_tag = "Security Post - Medbay"
},
/obj/machinery/requests_console{
department = "Security";
@@ -25146,9 +26266,9 @@
/area/medical/morgue)
"bhp" = (
/obj/machinery/power/apc{
+ areastring = "/area/medical/morgue";
dir = 1;
name = "Morgue APC";
- areastring = "/area/medical/morgue";
pixel_y = 24
},
/obj/structure/cable{
@@ -25358,6 +26478,11 @@
},
/turf/open/floor/plating,
/area/maintenance/disposal)
+"bhK" = (
+/obj/structure/table/wood/fancy/royalblue,
+/obj/item/crowbar/red,
+/turf/open/floor/plating,
+/area/maintenance/port)
"bhL" = (
/obj/machinery/mineral/stacking_machine{
input_dir = 1;
@@ -25387,12 +26512,32 @@
},
/turf/open/floor/plating,
/area/maintenance/port)
-"bhQ" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
+"bhP" = (
+/obj/structure/closet/crate,
+/obj/item/stack/sheet/mineral/wood/fifty{
+ amount = 20
},
-/turf/closed/wall,
-/area/crew_quarters/toilet/locker)
+/turf/open/floor/plating,
+/area/maintenance/port)
+"bhQ" = (
+/obj/structure/closet,
+/obj/item/stack/tile/carpet/royalblue{
+ amount = 24
+ },
+/obj/item/stack/tile/carpet/green{
+ amount = 24
+ },
+/obj/item/stack/tile/carpet/purple{
+ amount = 24
+ },
+/obj/item/stack/tile/carpet/orange{
+ amount = 24
+ },
+/obj/item/stack/tile/wood{
+ amount = 24
+ },
+/turf/open/floor/plating,
+/area/maintenance/port)
"bhR" = (
/obj/structure/grille,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -25453,7 +26598,6 @@
/area/quartermaster/storage)
"bhZ" = (
/obj/machinery/door/window/eastleft{
- dir = 4;
icon_state = "right";
name = "Incoming Mail";
req_access_txt = "50"
@@ -25475,8 +26619,6 @@
dir = 8
},
/obj/item/radio/intercom{
- freerange = 0;
- frequency = 1459;
name = "Station Intercom (General)";
pixel_x = 29
},
@@ -25630,9 +26772,16 @@
/turf/open/floor/plasteel/white,
/area/medical/chemistry)
"bit" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on,
-/turf/open/floor/plasteel/white,
-/area/medical/medbay/central)
+/obj/machinery/light,
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/obj/structure/bedsheetbin/color,
+/turf/open/floor/plasteel/cafeteria,
+/area/crew_quarters/locker)
"biu" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel/white,
@@ -25770,6 +26919,19 @@
"biL" = (
/turf/open/floor/plasteel/white,
/area/science/robotics/lab)
+"biM" = (
+/obj/machinery/button/door{
+ desc = "Alright, GAMER! Want to take your PWRGAME addiction to the MAX? Just smash this button with your chubby chetto encrusted hands an- oh, you broke the switch. Good job, idiot.";
+ id = "RIPFUN";
+ name = "Powerful Gamer Toggle";
+ normaldoorcontrol = 1;
+ pixel_x = -24;
+ pixel_y = 7;
+ specialfunctions = 4
+ },
+/obj/structure/table_frame/wood,
+/turf/open/floor/plating,
+/area/maintenance/port)
"biN" = (
/obj/effect/turf_decal/tile/red{
dir = 1
@@ -25782,11 +26944,9 @@
"biO" = (
/obj/machinery/camera{
c_tag = "Robotics Lab";
- dir = 2;
network = list("ss13","rd")
},
/obj/machinery/button/door{
- dir = 2;
id = "robotics";
name = "Shutters Control Button";
pixel_x = 6;
@@ -25833,8 +26993,7 @@
/area/science/research)
"biS" = (
/obj/machinery/camera{
- c_tag = "Research Division Access";
- dir = 2
+ c_tag = "Research Division Access"
},
/obj/structure/sink{
dir = 4;
@@ -25880,12 +27039,10 @@
"biX" = (
/obj/machinery/camera{
c_tag = "Research and Development";
- dir = 2;
network = list("ss13","rd");
pixel_x = 22
},
/obj/machinery/button/door{
- dir = 2;
id = "rnd";
name = "Shutters Control Button";
pixel_x = -6;
@@ -25905,6 +27062,10 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plating,
/area/maintenance/starboard)
+"biZ" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on,
+/turf/open/floor/plating,
+/area/maintenance/port)
"bja" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -26136,6 +27297,10 @@
/obj/structure/closet/wardrobe/black,
/turf/open/floor/plating,
/area/maintenance/central)
+"bjD" = (
+/obj/structure/bed,
+/turf/open/floor/plating,
+/area/maintenance/port)
"bjE" = (
/obj/machinery/airalarm{
dir = 4;
@@ -26271,9 +27436,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 6
},
-/obj/effect/turf_decal/tile/blue{
- dir = 2
- },
+/obj/effect/turf_decal/tile/blue,
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"bjV" = (
@@ -26286,6 +27449,11 @@
},
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
+"bjW" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
+/obj/structure/table/wood/fancy/purple,
+/turf/open/floor/plating,
+/area/maintenance/port)
"bjX" = (
/obj/structure/table,
/obj/machinery/recharger{
@@ -26330,8 +27498,8 @@
"bkb" = (
/obj/machinery/camera{
c_tag = "Medbay Morgue";
- network = list("ss13","medbay");
- dir = 8
+ dir = 8;
+ network = list("ss13","medbay")
},
/obj/machinery/airalarm{
dir = 8;
@@ -26347,10 +27515,23 @@
/obj/machinery/portable_atmospherics/canister/air,
/turf/open/floor/plating,
/area/storage/emergency/starboard)
+"bke" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/structure/disposalpipe/junction/flip,
+/turf/open/floor/plasteel,
+/area/hallway/primary/central)
"bkf" = (
/obj/structure/reagent_dispensers/watertank,
/turf/open/floor/plating,
/area/storage/emergency/starboard)
+"bkg" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/turf/closed/wall,
+/area/maintenance/port)
"bkh" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/circuit,
@@ -26375,7 +27556,6 @@
"bkj" = (
/obj/structure/closet/emcloset,
/obj/machinery/airalarm{
- dir = 2;
pixel_y = 24
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -26391,6 +27571,22 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/plasteel/white,
/area/science/robotics/lab)
+"bkl" = (
+/obj/effect/turf_decal/tile/blue{
+ alpha = 255
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue{
+ alpha = 255;
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/turf/open/floor/plasteel/white,
+/area/medical/medbay/central)
"bkm" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 10
@@ -26711,9 +27907,9 @@
/area/maintenance/central)
"bkX" = (
/obj/machinery/power/apc{
+ areastring = "/area/bridge/meeting_room";
dir = 4;
name = "Conference Room APC";
- areastring = "/area/bridge/meeting_room";
pixel_x = 24
},
/obj/structure/cable{
@@ -26870,8 +28066,8 @@
/obj/structure/table/reinforced,
/obj/machinery/camera{
c_tag = "Medbay Foyer";
- network = list("ss13","medbay");
- dir = 8
+ dir = 8;
+ network = list("ss13","medbay")
},
/obj/machinery/cell_charger,
/turf/open/floor/plasteel/white,
@@ -26884,9 +28080,9 @@
icon_state = "4-8"
},
/obj/machinery/power/apc{
+ areastring = "/area/storage/emergency/starboard";
dir = 1;
name = "Starboard Emergency Storage APC";
- areastring = "/area/storage/emergency/starboard";
pixel_y = 24
},
/obj/structure/cable{
@@ -26899,9 +28095,9 @@
/area/maintenance/department/medical/morgue)
"blp" = (
/obj/machinery/power/apc{
+ areastring = "/area/security/checkpoint/medical";
dir = 8;
name = "Medbay Security APC";
- areastring = "/area/security/checkpoint/medical";
pixel_x = -25
},
/obj/structure/cable{
@@ -26948,12 +28144,9 @@
/turf/open/floor/plasteel,
/area/science/robotics/mechbay)
"blt" = (
-/obj/machinery/recharge_station,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/turf/open/floor/plasteel,
-/area/science/robotics/mechbay)
+/obj/structure/sign/poster/contraband/tools,
+/turf/closed/wall,
+/area/storage/primary)
"blu" = (
/obj/machinery/computer/mech_bay_power_console{
dir = 4
@@ -27050,8 +28243,6 @@
/obj/item/healthanalyzer,
/obj/item/healthanalyzer,
/obj/item/radio/intercom{
- freerange = 0;
- frequency = 1459;
name = "Station Intercom (General)";
pixel_x = 29
},
@@ -27113,6 +28304,17 @@
/obj/effect/landmark/start/roboticist,
/turf/open/floor/plasteel,
/area/science/robotics/lab)
+"blN" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on,
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/blue{
+ alpha = 255;
+ dir = 1
+ },
+/turf/open/floor/plasteel/white,
+/area/medical/medbay/central)
"blO" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plating,
@@ -27305,6 +28507,16 @@
},
/turf/open/floor/plasteel,
/area/quartermaster/sorting)
+"bml" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
+/turf/open/floor/plating,
+/area/maintenance/port)
"bmm" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -27487,7 +28699,6 @@
"bmJ" = (
/obj/item/radio/intercom{
broadcasting = 1;
- freerange = 0;
frequency = 1485;
listening = 0;
name = "Station Intercom (Medbay)";
@@ -27646,6 +28857,38 @@
},
/turf/closed/wall/r_wall,
/area/science/robotics/mechbay)
+"bnd" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/blue{
+ alpha = 255;
+ dir = 1
+ },
+/turf/open/floor/plasteel/white,
+/area/medical/medbay/central)
+"bne" = (
+/obj/machinery/button/door{
+ desc = "A remote control switch for the genetics doors.";
+ id = "GeneticsDoor";
+ name = "Genetics Exit Button";
+ normaldoorcontrol = 1;
+ pixel_x = 8;
+ pixel_y = 24
+ },
+/obj/structure/table,
+/obj/item/book/manual/wiki/medical_cloning{
+ pixel_y = 6
+ },
+/obj/item/storage/box/rxglasses{
+ pixel_x = 3;
+ pixel_y = 3
+ },
+/obj/item/storage/box/bodybags,
+/obj/item/pen,
+/turf/open/floor/plasteel/white,
+/area/medical/genetics)
"bnf" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 10
@@ -27734,9 +28977,9 @@
},
/obj/item/stock_parts/scanning_module,
/obj/machinery/power/apc{
+ areastring = "/area/science/lab";
dir = 4;
name = "Research Lab APC";
- areastring = "/area/science/lab";
pixel_x = 26
},
/obj/structure/cable{
@@ -27782,8 +29025,12 @@
/turf/closed/wall,
/area/maintenance/starboard)
"bnt" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
+/obj/structure/rack,
+/obj/effect/decal/cleanable/cobweb/cobweb2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/effect/spawner/lootdrop/maintenance{
+ lootcount = 3;
+ name = "3maintenance loot spawner"
},
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
@@ -27949,9 +29196,7 @@
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"bnN" = (
-/obj/effect/turf_decal/tile/red{
- dir = 2
- },
+/obj/effect/turf_decal/tile/red,
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"bnO" = (
@@ -28079,10 +29324,15 @@
/turf/open/floor/carpet,
/area/crew_quarters/heads/captain)
"bnZ" = (
-/obj/structure/table/wood,
-/obj/item/flashlight/lamp/green,
-/turf/open/floor/carpet,
-/area/crew_quarters/heads/captain)
+/obj/machinery/navbeacon{
+ codes_txt = "patrol;next_patrol=HOP";
+ location = "CHE"
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/hallway/primary/central)
"boa" = (
/obj/structure/toilet{
dir = 4
@@ -28173,7 +29423,6 @@
pixel_y = -22
},
/obj/machinery/requests_console{
- announcementConsole = 0;
department = "Medbay";
departmentType = 1;
name = "Medbay RC";
@@ -28224,6 +29473,12 @@
},
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
+"bop" = (
+/obj/structure/closet/wardrobe/white,
+/obj/item/clothing/under/kilt,
+/obj/item/clothing/under/janimaid,
+/turf/open/floor/plasteel/white,
+/area/medical/genetics)
"boq" = (
/obj/structure/bed/roller,
/obj/effect/turf_decal/tile/blue,
@@ -28242,15 +29497,25 @@
"bos" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/power/apc{
+ areastring = "/area/science/robotics/lab";
dir = 8;
name = "Robotics Lab APC";
- areastring = "/area/science/robotics/lab";
pixel_x = -25
},
/obj/structure/cable,
/obj/structure/disposalpipe/segment,
/turf/open/floor/plasteel/white,
/area/science/robotics/lab)
+"bot" = (
+/obj/structure/closet/wardrobe/grey,
+/obj/item/clothing/head/beret/black,
+/obj/item/clothing/head/beret/black,
+/obj/item/clothing/head/beret,
+/obj/item/clothing/head/beret,
+/obj/item/clothing/under/assistantformal,
+/obj/item/clothing/under/skirt/black,
+/turf/open/floor/plasteel/white,
+/area/medical/genetics)
"bou" = (
/turf/open/floor/plasteel,
/area/science/robotics/lab)
@@ -28405,9 +29670,7 @@
/turf/open/floor/plasteel/dark,
/area/science/robotics/lab)
"boM" = (
-/turf/open/floor/plasteel/white/corner{
- dir = 2
- },
+/turf/open/floor/plasteel/white/corner,
/area/science/research)
"boN" = (
/obj/effect/turf_decal/tile/brown{
@@ -28417,9 +29680,7 @@
/area/quartermaster/office)
"boO" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel/white/side{
- dir = 2
- },
+/turf/open/floor/plasteel/white/side,
/area/science/research)
"boP" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -28495,20 +29756,16 @@
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"boY" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
+/obj/machinery/vending/cola/black,
+/obj/structure/sign/poster/contraband/sun_kist{
+ pixel_y = 32
},
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
- dir = 4
- },
-/turf/open/floor/plasteel,
-/area/hallway/primary/central)
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
"boZ" = (
/obj/structure/table/reinforced,
/obj/machinery/door/window/northleft{
dir = 8;
- icon_state = "left";
name = "Reception Window"
},
/obj/machinery/door/window/brigdoor{
@@ -28516,7 +29773,6 @@
dir = 4;
icon_state = "rightsecure";
name = "Head of Personnel's Desk";
- req_access = null;
req_access_txt = "57"
},
/obj/structure/disposalpipe/segment{
@@ -28622,13 +29878,18 @@
/turf/open/floor/carpet,
/area/crew_quarters/heads/captain)
"bpk" = (
-/obj/structure/closet/secure_closet/captains,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
- dir = 4
+/obj/machinery/camera{
+ c_tag = "Genetics Cloning";
+ dir = 4;
+ network = list("ss13","medbay")
},
-/turf/open/floor/carpet,
-/area/crew_quarters/heads/captain)
+/obj/machinery/firealarm{
+ dir = 8;
+ pixel_x = -24
+ },
+/obj/structure/closet/secure_closet/personal/patient,
+/turf/open/floor/plasteel/white,
+/area/medical/genetics)
"bpl" = (
/obj/structure/table/wood,
/obj/item/storage/box/matches,
@@ -28804,9 +30065,9 @@
/area/medical/chemistry)
"bpG" = (
/obj/machinery/power/apc{
+ areastring = "/area/medical/genetics";
dir = 1;
name = "Genetics APC";
- areastring = "/area/medical/genetics";
pixel_y = 24
},
/obj/structure/cable{
@@ -28820,7 +30081,6 @@
/obj/item/radio/headset/headset_medsci,
/obj/machinery/requests_console{
department = "Genetics";
- departmentType = 0;
name = "Genetics Requests Console";
pixel_y = 30
},
@@ -28985,6 +30245,12 @@
},
/turf/open/floor/plasteel/dark,
/area/science/robotics/lab)
+"bqb" = (
+/obj/structure/shuttle/engine/propulsion{
+ dir = 1
+ },
+/turf/open/space/basic,
+/area/space/nearstation)
"bqc" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/turf/open/floor/plasteel/white,
@@ -29186,16 +30452,14 @@
icon_state = "0-4"
},
/obj/machinery/power/apc{
+ areastring = "/area/engine/gravity_generator";
dir = 8;
name = "Gravity Generator APC";
- areastring = "/area/engine/gravity_generator";
pixel_x = -25;
pixel_y = 1
},
/obj/structure/table,
-/obj/item/paper/guides/jobs/engi/gravity_gen{
- layer = 3
- },
+/obj/item/paper/guides/jobs/engi/gravity_gen,
/obj/item/pen/blue,
/obj/item/radio/intercom{
name = "Station Intercom (General)";
@@ -29351,8 +30615,7 @@
},
/obj/machinery/camera{
c_tag = "Medbay West";
- network = list("ss13","medbay");
- dir = 2
+ network = list("ss13","medbay")
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -29457,9 +30720,7 @@
/obj/structure/cable{
icon_state = "1-8"
},
-/obj/effect/turf_decal/tile/blue{
- dir = 2
- },
+/obj/effect/turf_decal/tile/blue,
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"bri" = (
@@ -29490,6 +30751,12 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on,
/turf/open/floor/plasteel/white,
/area/medical/genetics)
+"brl" = (
+/obj/structure/shuttle/engine/heater{
+ dir = 1
+ },
+/turf/closed/wall/mineral/titanium,
+/area/space/nearstation)
"brm" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -29536,7 +30803,6 @@
"brq" = (
/obj/effect/turf_decal/stripes/line,
/obj/machinery/button/door{
- dir = 2;
id = "robotics2";
name = "Shutters Control Button";
pixel_x = 24;
@@ -29577,7 +30843,6 @@
/area/science/research)
"bru" = (
/obj/machinery/firealarm{
- dir = 2;
pixel_y = 24
},
/obj/structure/disposalpipe/segment{
@@ -29644,29 +30909,22 @@
/obj/item/pen,
/obj/machinery/camera{
c_tag = "Experimentor Lab";
- dir = 2;
network = list("ss13","rd")
},
/obj/item/hand_labeler,
/obj/item/stack/packageWrap,
-/turf/open/floor/plasteel/white/side{
- dir = 2
- },
+/turf/open/floor/plasteel/white/side,
/area/science/explab)
"brA" = (
/obj/structure/table,
/obj/item/paper_bin{
pixel_y = 6
},
-/turf/open/floor/plasteel/white/corner{
- dir = 2
- },
+/turf/open/floor/plasteel/white/corner,
/area/science/explab)
"brB" = (
/obj/structure/closet/l3closet/scientist,
-/turf/open/floor/plasteel/white/side{
- dir = 2
- },
+/turf/open/floor/plasteel/white/side,
/area/science/explab)
"brC" = (
/obj/structure/table,
@@ -29676,9 +30934,7 @@
pixel_y = 23
},
/obj/item/radio/off,
-/turf/open/floor/plasteel/white/side{
- dir = 2
- },
+/turf/open/floor/plasteel/white/side,
/area/science/explab)
"brD" = (
/obj/structure/closet/emcloset,
@@ -29818,6 +31074,9 @@
"brS" = (
/turf/open/floor/plasteel,
/area/crew_quarters/heads/hop)
+"brT" = (
+/turf/open/floor/plating,
+/area/space/nearstation)
"brU" = (
/obj/structure/sign/warning/electricshock{
pixel_y = -32
@@ -29947,7 +31206,6 @@
/area/teleporter)
"bsk" = (
/obj/machinery/firealarm{
- dir = 2;
pixel_y = 24
},
/obj/machinery/light{
@@ -29960,8 +31218,6 @@
/area/teleporter)
"bsl" = (
/obj/item/radio/intercom{
- broadcasting = 0;
- listening = 1;
name = "Station Intercom (General)";
pixel_y = 20
},
@@ -30014,10 +31270,7 @@
dir = 4
},
/obj/item/radio/intercom{
- broadcasting = 0;
- freerange = 0;
frequency = 1485;
- listening = 1;
name = "Station Intercom (Medbay)";
pixel_y = -30
},
@@ -30045,17 +31298,14 @@
/area/medical/medbay/central)
"bst" = (
/obj/item/radio/intercom{
- broadcasting = 0;
- freerange = 0;
frequency = 1485;
- listening = 1;
name = "Station Intercom (Medbay)";
pixel_x = 30
},
/obj/machinery/camera{
c_tag = "Medbay East";
- network = list("ss13","medbay");
dir = 8;
+ network = list("ss13","medbay");
pixel_y = -22
},
/turf/open/floor/plasteel/white,
@@ -30113,6 +31363,9 @@
dir = 9
},
/area/science/research)
+"bsB" = (
+/turf/closed/wall/mineral/titanium,
+/area/space/nearstation)
"bsC" = (
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
/turf/open/floor/plasteel/white,
@@ -30165,9 +31418,9 @@
/area/science/explab)
"bsI" = (
/obj/machinery/power/apc{
+ areastring = "/area/science/explab";
dir = 4;
name = "Experimentation Lab APC";
- areastring = "/area/science/explab";
pixel_x = 26
},
/obj/structure/cable,
@@ -30216,12 +31469,8 @@
/turf/open/floor/plasteel/dark,
/area/science/robotics/lab)
"bsP" = (
-/obj/structure/table/optable{
- name = "Robotics Operating Table"
- },
-/obj/effect/landmark/event_spawn,
-/turf/open/floor/plasteel/dark,
-/area/science/robotics/lab)
+/turf/open/floor/plating/foam,
+/area/space/nearstation)
"bsQ" = (
/turf/open/floor/plasteel/dark,
/area/science/robotics/lab)
@@ -30292,8 +31541,7 @@
dir = 4
},
/obj/machinery/camera{
- c_tag = "Research Division North";
- dir = 2
+ c_tag = "Research Division North"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -30335,7 +31583,6 @@
/area/science/research)
"btf" = (
/obj/machinery/requests_console{
- announcementConsole = 0;
department = "Medbay";
departmentType = 1;
name = "Medbay RC";
@@ -30358,9 +31605,9 @@
/turf/open/floor/plasteel/white,
/area/science/research)
"bti" = (
-/obj/structure/closet/secure_closet/personal/patient,
-/turf/open/floor/plasteel/white,
-/area/medical/genetics)
+/obj/effect/spawner/structure/window/shuttle,
+/turf/open/floor/plating,
+/area/space/nearstation)
"btj" = (
/obj/structure/disposalpipe/segment{
dir = 6
@@ -30371,9 +31618,9 @@
/turf/open/floor/plasteel/white,
/area/science/explab)
"btk" = (
-/obj/structure/closet/wardrobe/white,
-/turf/open/floor/plasteel/white,
-/area/medical/genetics)
+/obj/structure/grille/broken,
+/turf/open/floor/plating,
+/area/space/nearstation)
"btl" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
/turf/open/floor/plasteel/white,
@@ -30434,7 +31681,6 @@
pixel_y = -8
},
/obj/machinery/button/door{
- dir = 2;
id = "QMLoaddoor2";
layer = 4;
name = "Loading Doors";
@@ -30507,11 +31753,16 @@
/turf/open/floor/plasteel,
/area/science/research)
"bty" = (
-/obj/structure/chair{
- dir = 8
+/obj/structure/chair/sofa/right,
+/obj/structure/window{
+ dir = 1
},
-/turf/open/floor/plasteel,
-/area/quartermaster/office)
+/obj/structure/sign/poster/contraband/pwr_game{
+ pixel_x = -32
+ },
+/obj/effect/landmark/start/assistant,
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
"btz" = (
/obj/structure/disposalpipe/segment,
/obj/effect/turf_decal/tile/brown{
@@ -30521,8 +31772,7 @@
/area/hallway/primary/central)
"btA" = (
/obj/machinery/camera{
- c_tag = "Research Division West";
- dir = 2
+ c_tag = "Research Division West"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -30553,13 +31803,21 @@
"btD" = (
/obj/structure/table,
/obj/item/paper_bin{
- pixel_x = -3;
- pixel_y = 7
+ pixel_x = 1;
+ pixel_y = 9
},
/obj/item/pen,
-/obj/item/stamp/hop,
-/turf/open/floor/plasteel,
-/area/crew_quarters/heads/hop)
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/obj/item/folder/white,
+/obj/item/pen/fountain,
+/obj/item/stamp/rd{
+ pixel_x = 3;
+ pixel_y = -2
+ },
+/turf/open/floor/plasteel/cafeteria,
+/area/crew_quarters/heads/hor)
"btE" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -30594,9 +31852,9 @@
/area/teleporter)
"btI" = (
/obj/machinery/power/apc{
+ areastring = "/area/teleporter";
dir = 8;
name = "Teleporter APC";
- areastring = "/area/teleporter";
pixel_x = -24
},
/obj/structure/cable{
@@ -30682,7 +31940,6 @@
/area/medical/medbay/central)
"btS" = (
/obj/machinery/firealarm{
- dir = 2;
pixel_y = 24
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -30766,9 +32023,8 @@
"buc" = (
/obj/machinery/light,
/obj/machinery/power/apc{
- dir = 2;
- name = "Cargo Office APC";
areastring = "/area/quartermaster/office";
+ name = "Cargo Office APC";
pixel_x = 1;
pixel_y = -24
},
@@ -30776,9 +32032,7 @@
icon_state = "0-4"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/effect/turf_decal/tile/brown{
- dir = 2
- },
+/obj/effect/turf_decal/tile/brown,
/turf/open/floor/plasteel,
/area/quartermaster/office)
"bud" = (
@@ -30823,6 +32077,10 @@
},
/turf/open/floor/plasteel/white,
/area/medical/genetics)
+"buh" = (
+/obj/structure/girder,
+/turf/open/floor/plating,
+/area/space/nearstation)
"bui" = (
/obj/machinery/airalarm{
dir = 1;
@@ -30989,10 +32247,16 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/plating,
/area/maintenance/starboard)
+"buA" = (
+/obj/structure/frame/computer{
+ dir = 1
+ },
+/turf/open/floor/plating,
+/area/space/nearstation)
"buB" = (
/obj/machinery/conveyor_switch/oneway{
- id = "QMLoad";
- dir = 8
+ dir = 8;
+ id = "QMLoad"
},
/turf/open/floor/plasteel,
/area/quartermaster/storage)
@@ -31071,12 +32335,12 @@
/turf/open/floor/plasteel,
/area/quartermaster/office)
"buJ" = (
-/obj/structure/chair{
- dir = 8
+/obj/structure/chair/sofa,
+/obj/structure/window{
+ dir = 1
},
-/obj/machinery/light,
-/turf/open/floor/plasteel,
-/area/quartermaster/office)
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
"buK" = (
/obj/machinery/light{
dir = 4
@@ -31344,20 +32608,12 @@
/turf/open/floor/plasteel/white,
/area/medical/sleeper)
"bvn" = (
-/obj/machinery/button/door{
- desc = "A remote control switch for the genetics doors.";
- id = "GeneticsDoor";
- name = "Genetics Exit Button";
- normaldoorcontrol = 1;
- pixel_x = 8;
- pixel_y = 24
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
},
-/obj/structure/table,
-/obj/item/book/manual/wiki/medical_cloning{
- pixel_y = 6
- },
-/turf/open/floor/plasteel/white,
-/area/medical/genetics)
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/closed/wall,
+/area/maintenance/port)
"bvo" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 4
@@ -31465,8 +32721,8 @@
"bvB" = (
/obj/machinery/camera{
c_tag = "Genetics Access";
- network = list("ss13","medbay");
dir = 8;
+ network = list("ss13","medbay");
pixel_y = -22
},
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
@@ -31517,6 +32773,20 @@
},
/turf/open/floor/plasteel,
/area/quartermaster/qm)
+"bvG" = (
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/obj/machinery/light/small,
+/obj/structure/extinguisher_cabinet{
+ pixel_x = 5;
+ pixel_y = -32
+ },
+/turf/open/floor/plasteel/white/side{
+ dir = 1
+ },
+/area/crew_quarters/fitness)
"bvH" = (
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 4
@@ -31738,20 +33008,10 @@
/area/hallway/primary/central)
"bwi" = (
/obj/item/radio/intercom{
- dir = 8;
- name = "Station Intercom (General)";
- pixel_x = -28
+ pixel_x = -25
},
-/obj/structure/closet/secure_closet/hop,
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/turf/open/floor/plasteel,
-/area/crew_quarters/heads/hop)
+/turf/open/floor/mineral/titanium/blue,
+/area/crew_quarters/toilet)
"bwj" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 4
@@ -31928,8 +33188,7 @@
/obj/structure/table/glass,
/obj/machinery/camera{
c_tag = "Medbay Cryogenics";
- network = list("ss13","medbay");
- dir = 2
+ network = list("ss13","medbay")
},
/obj/item/reagent_containers/glass/beaker/cryoxadone,
/obj/item/reagent_containers/glass/beaker/cryoxadone,
@@ -31945,24 +33204,17 @@
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"bwL" = (
-/obj/machinery/camera{
- c_tag = "Genetics Cloning";
- network = list("ss13","medbay");
+/obj/machinery/airalarm{
+ dir = 8;
+ pixel_x = 24
+ },
+/obj/structure/closet/wardrobe/miner,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/obj/structure/table,
-/obj/machinery/firealarm{
- dir = 8;
- pixel_x = -24
- },
-/obj/item/storage/box/rxglasses{
- pixel_x = 3;
- pixel_y = 3
- },
-/obj/item/storage/box/bodybags,
-/obj/item/pen,
-/turf/open/floor/plasteel/white,
-/area/medical/genetics)
+/obj/item/radio/headset/headset_cargo/mining,
+/turf/open/floor/plasteel,
+/area/quartermaster/miningdock)
"bwM" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -32009,6 +33261,10 @@
dir = 9
},
/area/science/research)
+"bwP" = (
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
+/turf/closed/wall,
+/area/maintenance/port)
"bwQ" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -32191,6 +33447,14 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plating,
/area/maintenance/aft)
+"bxh" = (
+/obj/structure/table,
+/obj/effect/spawner/lootdrop/maintenance{
+ lootcount = 4;
+ name = "4maintenance loot spawner"
+ },
+/turf/open/floor/plating,
+/area/maintenance/starboard/fore)
"bxi" = (
/obj/machinery/computer/aifixer{
dir = 8
@@ -32278,9 +33542,7 @@
pixel_x = 25;
req_access_txt = "47"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel/white,
/area/science/explab)
"bxt" = (
@@ -32627,6 +33889,7 @@
pixel_x = -3;
pixel_y = 7
},
+/obj/item/pen/fountain,
/turf/open/floor/plasteel,
/area/quartermaster/qm)
"byh" = (
@@ -32796,9 +34059,9 @@
/area/quartermaster/qm)
"byA" = (
/obj/machinery/power/apc{
+ areastring = "/area/quartermaster/qm";
dir = 1;
name = "Quartermaster APC";
- areastring = "/area/quartermaster/qm";
pixel_y = 24
},
/obj/structure/cable{
@@ -32852,9 +34115,9 @@
/area/quartermaster/miningdock)
"byF" = (
/obj/machinery/power/apc{
+ areastring = "/area/quartermaster/miningdock";
dir = 1;
name = "Mining Dock APC";
- areastring = "/area/quartermaster/miningdock";
pixel_y = 24
},
/obj/structure/cable{
@@ -33019,6 +34282,9 @@
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"byV" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
/obj/structure/extinguisher_cabinet{
pixel_x = 5;
pixel_y = -32
@@ -33087,7 +34353,6 @@
/obj/item/stack/packageWrap,
/obj/item/pen,
/obj/machinery/requests_console{
- announcementConsole = 0;
department = "Medbay";
departmentType = 1;
name = "Medbay RC";
@@ -33212,8 +34477,8 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 4;
external_pressure_bound = 140;
- pressure_checks = 0;
- name = "server vent"
+ name = "server vent";
+ pressure_checks = 0
},
/turf/open/floor/circuit/telecomms/server,
/area/science/server)
@@ -33250,14 +34515,13 @@
"bzy" = (
/obj/machinery/camera{
c_tag = "Server Room";
- dir = 2;
network = list("ss13","rd");
pixel_x = 22
},
/obj/machinery/power/apc{
+ areastring = "/area/science/server";
dir = 1;
name = "Server Room APC";
- areastring = "/area/science/server";
pixel_y = 25
},
/obj/structure/cable{
@@ -33343,18 +34607,14 @@
name = "Central Access"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/tile/yellow{
- dir = 2
- },
+/obj/effect/turf_decal/tile/yellow,
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"bzH" = (
/obj/structure/table,
/obj/item/hemostat,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel/white/side{
- dir = 2
- },
+/turf/open/floor/plasteel/white/side,
/area/medical/sleeper)
"bzI" = (
/obj/structure/disposalpipe/segment,
@@ -33381,9 +34641,7 @@
/turf/open/floor/plasteel/white,
/area/medical/sleeper)
"bzL" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel/white,
/area/crew_quarters/heads/hor)
"bzM" = (
@@ -33455,9 +34713,7 @@
/area/quartermaster/qm)
"bzU" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
-/obj/effect/turf_decal/tile/blue{
- dir = 2
- },
+/obj/effect/turf_decal/tile/blue,
/turf/open/floor/plasteel/white,
/area/medical/sleeper)
"bzV" = (
@@ -33564,11 +34820,11 @@
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"bAj" = (
-/obj/machinery/navbeacon{
- codes_txt = "patrol;next_patrol=HOP";
- location = "CHE"
+/obj/structure/disposalpipe/trunk{
+ dir = 1
},
-/turf/open/floor/plasteel,
+/obj/machinery/disposal/bin,
+/turf/open/floor/plasteel/dark,
/area/hallway/primary/central)
"bAk" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
@@ -33616,9 +34872,9 @@
icon_state = "4-8"
},
/obj/machinery/power/apc{
+ areastring = "/area/security/checkpoint/supply";
dir = 1;
name = "Cargo Security APC";
- areastring = "/area/security/checkpoint/supply";
pixel_x = 1;
pixel_y = 24
},
@@ -33647,8 +34903,8 @@
},
/obj/machinery/camera{
c_tag = "Medbay Treatment Center";
- network = list("ss13","medbay");
- dir = 8
+ dir = 8;
+ network = list("ss13","medbay")
},
/turf/open/floor/plasteel,
/area/medical/sleeper)
@@ -33859,9 +35115,7 @@
"bAP" = (
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/tile/yellow{
- dir = 2
- },
+/obj/effect/turf_decal/tile/yellow,
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
"bAQ" = (
@@ -34016,6 +35270,10 @@
/obj/structure/cable{
icon_state = "1-8"
},
+/obj/item/radio/intercom{
+ name = "Station Intercom (General)";
+ pixel_y = -29
+ },
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"bBh" = (
@@ -34185,13 +35443,8 @@
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"bBz" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/plasteel,
+/obj/machinery/vending/cola/space_up,
+/turf/open/floor/plasteel/dark,
/area/hallway/primary/central)
"bBA" = (
/obj/structure/cable{
@@ -34203,14 +35456,20 @@
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"bBB" = (
-/obj/structure/cable{
- icon_state = "1-8"
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
},
-/obj/structure/disposalpipe/segment{
- dir = 9
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 4
},
/turf/open/floor/plasteel,
-/area/hallway/primary/central)
+/area/crew_quarters/fitness)
"bBC" = (
/obj/structure/disposalpipe/segment{
dir = 10
@@ -34238,9 +35497,7 @@
"bBF" = (
/obj/machinery/portable_atmospherics/scrubber,
/obj/item/storage/firstaid/toxin,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/machinery/airalarm/unlocked{
pixel_y = 24
},
@@ -34260,19 +35517,14 @@
/turf/closed/wall,
/area/quartermaster/miningdock)
"bBI" = (
-/obj/machinery/airalarm{
- dir = 8;
- pixel_x = 24
- },
-/obj/structure/closet/wardrobe/miner,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
- },
+/obj/structure/table,
+/obj/item/stack/packageWrap,
+/obj/item/stack/packageWrap,
+/obj/item/hand_labeler,
/turf/open/floor/plasteel,
-/area/quartermaster/miningdock)
+/area/hallway/secondary/service)
"bBJ" = (
/obj/machinery/firealarm{
- dir = 2;
pixel_y = 24
},
/turf/open/floor/plasteel/white,
@@ -34291,6 +35543,14 @@
},
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
+"bBM" = (
+/obj/structure/closet,
+/obj/effect/spawner/lootdrop/maintenance{
+ lootcount = 4;
+ name = "4maintenance loot spawner"
+ },
+/turf/open/floor/plating,
+/area/maintenance/starboard/fore)
"bBN" = (
/turf/closed/wall,
/area/crew_quarters/heads/cmo)
@@ -34350,6 +35610,18 @@
},
/turf/open/floor/circuit/telecomms/server,
/area/science/server)
+"bBT" = (
+/obj/effect/turf_decal/tile/green{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/green{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/green{
+ dir = 8
+ },
+/turf/open/floor/plasteel,
+/area/hallway/primary/starboard)
"bBU" = (
/obj/machinery/atmospherics/pipe/simple{
dir = 9
@@ -34411,9 +35683,8 @@
/area/security/checkpoint/science)
"bCa" = (
/obj/machinery/power/apc{
- dir = 2;
- name = "Science Security APC";
areastring = "/area/security/checkpoint/science";
+ name = "Science Security APC";
pixel_y = -24
},
/obj/structure/cable,
@@ -34475,9 +35746,9 @@
/area/maintenance/port/aft)
"bCf" = (
/obj/machinery/power/apc{
+ areastring = "/area/crew_quarters/heads/hor";
dir = 8;
name = "RD Office APC";
- areastring = "/area/crew_quarters/heads/hor";
pixel_x = -25
},
/obj/structure/cable,
@@ -34581,9 +35852,7 @@
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/tile/yellow{
- dir = 2
- },
+/obj/effect/turf_decal/tile/yellow,
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
"bCq" = (
@@ -34660,9 +35929,20 @@
/turf/open/floor/plating,
/area/maintenance/aft)
"bCA" = (
-/obj/machinery/vending/cigarette,
-/turf/open/floor/plasteel/dark,
-/area/hallway/primary/central)
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 5
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 5
+ },
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plating,
+/area/maintenance/port/aft)
"bCB" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -34688,9 +35968,7 @@
"bCD" = (
/obj/structure/table,
/obj/item/retractor,
-/turf/open/floor/plasteel/white/side{
- dir = 2
- },
+/turf/open/floor/plasteel/white/side,
/area/medical/sleeper)
"bCE" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -34725,12 +36003,14 @@
/turf/open/floor/plasteel/white,
/area/medical/sleeper)
"bCI" = (
-/obj/structure/chair/office/dark{
+/obj/effect/turf_decal/tile/green{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/green{
dir = 4
},
-/obj/effect/landmark/event_spawn,
-/turf/open/floor/wood,
-/area/library)
+/turf/open/floor/plasteel,
+/area/hallway/primary/starboard)
"bCJ" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -34747,8 +36027,7 @@
/obj/structure/closet/secure_closet/medical3,
/obj/machinery/camera{
c_tag = "Medbay Storage";
- network = list("ss13","medbay");
- dir = 2
+ network = list("ss13","medbay")
},
/turf/open/floor/plasteel/white,
/area/medical/sleeper)
@@ -34765,7 +36044,13 @@
/turf/open/floor/plasteel/white,
/area/medical/sleeper)
"bCO" = (
-/obj/machinery/bloodbankgen,
+/obj/structure/table,
+/obj/item/storage/box/bodybags{
+ pixel_x = 3;
+ pixel_y = 3
+ },
+/obj/item/storage/box/rxglasses,
+/obj/item/hand_labeler,
/turf/open/floor/plasteel/white,
/area/medical/sleeper)
"bCP" = (
@@ -34799,35 +36084,22 @@
/turf/open/floor/plasteel/white,
/area/medical/sleeper)
"bCT" = (
-/obj/structure/table,
-/obj/item/storage/belt/medical{
- pixel_y = 2
- },
-/obj/item/storage/belt/medical{
- pixel_y = 2
- },
-/obj/item/storage/belt/medical{
- pixel_y = 2
- },
-/obj/item/clothing/neck/stethoscope,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
+/obj/machinery/bloodbankgen,
/turf/open/floor/plasteel/white,
/area/medical/sleeper)
"bCU" = (
/obj/item/radio/intercom{
- broadcasting = 0;
- freerange = 0;
frequency = 1485;
- listening = 1;
name = "Station Intercom (Medbay)";
pixel_x = -30
},
/obj/machinery/camera{
c_tag = "Medbay South";
- network = list("ss13","medbay");
- dir = 4
+ dir = 4;
+ network = list("ss13","medbay")
},
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
@@ -34950,7 +36222,6 @@
/obj/item/pen,
/obj/machinery/requests_console{
department = "Mining";
- departmentType = 0;
pixel_x = -30
},
/obj/machinery/light{
@@ -34998,9 +36269,7 @@
pixel_x = 24
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/tile/yellow{
- dir = 2
- },
+/obj/effect/turf_decal/tile/yellow,
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
"bDq" = (
@@ -35022,9 +36291,15 @@
/turf/open/floor/plasteel,
/area/janitor)
"bDs" = (
-/obj/structure/reagent_dispensers/watertank,
+/obj/effect/turf_decal/tile/green{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/green{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/green,
/turf/open/floor/plasteel,
-/area/janitor)
+/area/hallway/primary/starboard)
"bDt" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 10
@@ -35042,6 +36317,13 @@
/turf/open/floor/plating,
/area/maintenance/aft)
"bDv" = (
+/obj/machinery/airalarm{
+ dir = 1;
+ pixel_y = -22
+ },
+/turf/open/floor/plasteel,
+/area/hallway/primary/starboard)
+"bDw" = (
/obj/structure/table,
/obj/item/flashlight{
pixel_x = 1;
@@ -35056,14 +36338,15 @@
/obj/machinery/status_display/ai{
pixel_x = -32
},
-/turf/open/floor/plating,
-/area/storage/tech)
-"bDw" = (
-/obj/structure/table,
-/obj/item/screwdriver{
- pixel_y = 16
+/obj/machinery/power/apc{
+ areastring = "/area/storage/tech";
+ dir = 1;
+ name = "Tech Storage APC";
+ pixel_y = 24
+ },
+/obj/structure/cable{
+ icon_state = "0-2"
},
-/obj/item/wirecutters,
/turf/open/floor/plating,
/area/storage/tech)
"bDx" = (
@@ -35076,33 +36359,28 @@
/turf/open/floor/plating,
/area/storage/tech)
"bDy" = (
-/obj/machinery/camera{
- c_tag = "Tech Storage";
- dir = 2
- },
-/obj/machinery/power/apc{
- dir = 1;
- name = "Tech Storage APC";
- areastring = "/area/storage/tech";
- pixel_y = 24
- },
-/obj/structure/cable{
- icon_state = "0-2"
+/obj/structure/table,
+/obj/item/screwdriver{
+ pixel_y = 16
},
+/obj/item/wirecutters,
/turf/open/floor/plating,
/area/storage/tech)
"bDz" = (
-/obj/machinery/airalarm{
- pixel_y = 23
+/obj/structure/table,
+/obj/item/aicard,
+/obj/item/aiModule/reset,
+/obj/structure/cable{
+ icon_state = "1-2"
},
/turf/open/floor/plating,
/area/storage/tech)
"bDA" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/power/apc{
+ areastring = "/area/medical/sleeper";
dir = 4;
name = "Treatment Center APC";
- areastring = "/area/medical/sleeper";
pixel_x = 26
},
/obj/structure/cable{
@@ -35142,8 +36420,8 @@
},
/obj/machinery/camera{
c_tag = "Medbay Recovery Room";
- network = list("ss13","medbay");
- dir = 8
+ dir = 8;
+ network = list("ss13","medbay")
},
/obj/machinery/iv_drip,
/turf/open/floor/plasteel/white,
@@ -35161,9 +36439,7 @@
/area/medical/medbay/central)
"bDG" = (
/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/tile/yellow{
- dir = 2
- },
+/obj/effect/turf_decal/tile/yellow,
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
"bDH" = (
@@ -35179,8 +36455,9 @@
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"bDJ" = (
-/obj/item/storage/box/lights/mixed,
-/obj/item/storage/box/lights/mixed,
+/obj/structure/sign/poster/contraband/lizard{
+ pixel_x = -32
+ },
/turf/open/floor/plasteel,
/area/janitor)
"bDK" = (
@@ -35194,8 +36471,17 @@
/turf/open/floor/plasteel,
/area/janitor)
"bDL" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
/turf/open/floor/plasteel,
-/area/janitor)
+/area/crew_quarters/fitness)
"bDM" = (
/obj/structure/disposalpipe/segment,
/turf/open/floor/plasteel,
@@ -35209,11 +36495,15 @@
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"bDO" = (
-/obj/structure/cable{
- icon_state = "2-4"
+/obj/machinery/vending/snack/orange,
+/obj/machinery/light{
+ dir = 1
},
-/turf/open/floor/plating,
-/area/maintenance/aft)
+/obj/structure/sign/poster/contraband/donut_corp{
+ pixel_y = 32
+ },
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
"bDP" = (
/obj/machinery/navbeacon{
codes_txt = "delivery;dir=8";
@@ -35287,6 +36577,13 @@
},
/turf/open/floor/plasteel/white,
/area/medical/sleeper)
+"bDX" = (
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
+/turf/open/floor/plating,
+/area/crew_quarters/abandoned_gambling_den)
"bDY" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -35415,8 +36712,8 @@
},
/obj/machinery/camera{
c_tag = "Chief Medical Office";
- network = list("ss13","medbay");
dir = 8;
+ network = list("ss13","medbay");
pixel_y = -22
},
/obj/effect/turf_decal/tile/blue{
@@ -35433,7 +36730,6 @@
"bEn" = (
/obj/machinery/camera{
c_tag = "Xenobiology Test Chamber";
- dir = 2;
network = list("xeno","rd")
},
/obj/machinery/light{
@@ -35456,9 +36752,9 @@
/area/science/storage)
"bEq" = (
/obj/machinery/power/apc{
+ areastring = "/area/science/research";
dir = 8;
name = "Misc Research APC";
- areastring = "/area/science/research";
pixel_x = -25
},
/obj/structure/cable{
@@ -35488,9 +36784,7 @@
/obj/machinery/light{
dir = 1
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel/white,
/area/science/mixing)
"bEv" = (
@@ -35498,9 +36792,7 @@
/obj/machinery/light_switch{
pixel_y = 28
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel/white,
/area/science/mixing)
"bEw" = (
@@ -35508,9 +36800,7 @@
/obj/item/radio/intercom{
pixel_y = 25
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel/white,
/area/science/mixing)
"bEx" = (
@@ -35519,17 +36809,13 @@
dir = 8
},
/obj/machinery/firealarm{
- dir = 2;
pixel_y = 24
},
/obj/machinery/camera{
c_tag = "Toxins Lab West";
- dir = 2;
network = list("ss13","rd")
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel/white,
/area/science/mixing)
"bEy" = (
@@ -35537,9 +36823,7 @@
/obj/structure/window/reinforced{
dir = 4
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel/white,
/area/science/mixing)
"bEz" = (
@@ -35685,15 +36969,8 @@
/turf/open/floor/plasteel,
/area/quartermaster/miningdock)
"bER" = (
-/obj/structure/cable{
- icon_state = "1-4"
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
- dir = 4
- },
+/obj/structure/rack,
+/obj/effect/spawner/lootdrop/techstorage/rnd,
/turf/open/floor/plating,
/area/storage/tech)
"bES" = (
@@ -35743,9 +37020,12 @@
/turf/open/floor/plating,
/area/storage/tech)
"bEX" = (
-/obj/structure/table,
-/obj/item/aicard,
-/obj/item/aiModule/reset,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
/turf/open/floor/plating,
/area/storage/tech)
"bEY" = (
@@ -35841,18 +37121,20 @@
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
"bFk" = (
-/obj/item/mop,
-/obj/item/reagent_containers/glass/bucket,
-/turf/open/floor/plasteel,
-/area/janitor)
+/obj/machinery/airalarm{
+ dir = 1;
+ pixel_y = -22
+ },
+/turf/open/floor/plating,
+/area/crew_quarters/abandoned_gambling_den)
"bFl" = (
/obj/structure/cable{
icon_state = "1-2"
},
/obj/machinery/power/apc{
+ areastring = "/area/janitor";
dir = 8;
name = "Custodial Closet APC";
- areastring = "/area/janitor";
pixel_x = -24
},
/obj/structure/cable{
@@ -35890,9 +37172,7 @@
/area/maintenance/aft)
"bFq" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/tile/yellow{
- dir = 2
- },
+/obj/effect/turf_decal/tile/yellow,
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
"bFr" = (
@@ -35986,21 +37266,14 @@
/turf/open/floor/plasteel,
/area/medical/sleeper)
"bFC" = (
-/obj/structure/table,
-/obj/item/reagent_containers/food/condiment/peppermill{
- pixel_x = 5;
- pixel_y = -2
+/obj/structure/door_assembly/door_assembly_mai,
+/obj/item/electronics/airlock,
+/obj/structure/cable{
+ icon_state = "1-2"
},
-/obj/item/reagent_containers/food/condiment/saltshaker{
- pixel_x = -2;
- pixel_y = 2
- },
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
- dir = 1
- },
-/turf/open/floor/plasteel,
-/area/crew_quarters/bar)
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/plating,
+/area/crew_quarters/abandoned_gambling_den)
"bFD" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -36224,12 +37497,8 @@
/obj/machinery/doppler_array/research/science{
dir = 4
},
-/obj/effect/turf_decal/bot{
- dir = 2
- },
-/turf/open/floor/plasteel{
- dir = 2
- },
+/obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
/area/science/mixing)
"bGe" = (
/turf/closed/wall,
@@ -36238,6 +37507,22 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating/airless,
/area/science/test_area)
+"bGg" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/plating,
+/area/maintenance/starboard/fore)
+"bGh" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/plating{
+ icon_state = "panelscorched"
+ },
+/area/maintenance/starboard/fore)
"bGi" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -36321,8 +37606,7 @@
/area/storage/tech)
"bGs" = (
/obj/machinery/camera{
- c_tag = "Secure Tech Storage";
- dir = 2
+ c_tag = "Secure Tech Storage"
},
/obj/structure/cable{
icon_state = "1-2"
@@ -36347,11 +37631,12 @@
/turf/open/floor/plating,
/area/storage/tech)
"bGw" = (
-/obj/structure/rack,
/obj/structure/cable{
- icon_state = "1-2"
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+ dir = 4
},
-/obj/effect/spawner/lootdrop/techstorage/rnd,
/turf/open/floor/plating,
/area/storage/tech)
"bGx" = (
@@ -36382,18 +37667,14 @@
/turf/open/floor/plasteel/white,
/area/science/mixing)
"bGB" = (
-/obj/structure/table,
-/obj/item/grenade/chem_grenade/cleaner,
-/obj/item/grenade/chem_grenade/cleaner,
-/obj/item/grenade/chem_grenade/cleaner,
-/obj/machinery/requests_console{
- department = "Janitorial";
- departmentType = 1;
- pixel_y = -29
+/obj/structure/cable{
+ icon_state = "2-4"
},
-/obj/item/reagent_containers/spray/cleaner,
-/turf/open/floor/plasteel,
-/area/janitor)
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+ dir = 8
+ },
+/turf/open/floor/plating,
+/area/maintenance/starboard/fore)
"bGC" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -36516,9 +37797,7 @@
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/tile/yellow{
- dir = 2
- },
+/obj/effect/turf_decal/tile/yellow,
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
"bGP" = (
@@ -36544,15 +37823,34 @@
/area/maintenance/aft)
"bGR" = (
/obj/structure/table,
-/obj/item/hand_labeler,
-/obj/item/storage/box/rxglasses,
-/obj/item/storage/box/bodybags{
- pixel_x = 3;
- pixel_y = 3
+/obj/item/storage/belt/medical{
+ pixel_y = 2
},
-/obj/item/gun/syringe,
+/obj/item/storage/belt/medical{
+ pixel_y = 2
+ },
+/obj/item/storage/belt/medical{
+ pixel_y = 2
+ },
+/obj/item/clothing/neck/stethoscope,
/turf/open/floor/plasteel/white,
/area/medical/sleeper)
+"bGS" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/plating,
+/area/maintenance/starboard/fore)
"bGT" = (
/obj/structure/table,
/obj/item/folder/white,
@@ -36649,9 +37947,9 @@
/area/maintenance/aft)
"bHe" = (
/obj/machinery/power/apc{
+ areastring = "/area/science/storage";
dir = 8;
name = "Toxins Storage APC";
- areastring = "/area/science/storage";
pixel_x = -25
},
/obj/structure/cable{
@@ -36671,6 +37969,22 @@
},
/turf/open/floor/plasteel/white,
/area/science/research)
+"bHg" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/structure/sign/departments/restroom{
+ pixel_y = -32
+ },
+/turf/open/floor/plasteel,
+/area/crew_quarters/dorms)
"bHh" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 4
@@ -36706,9 +38020,7 @@
"bHl" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden,
-/obj/effect/turf_decal/tile/yellow{
- dir = 2
- },
+/obj/effect/turf_decal/tile/yellow,
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
"bHm" = (
@@ -36764,9 +38076,7 @@
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/effect/turf_decal/stripes/corner{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/corner,
/turf/open/floor/plasteel,
/area/science/mixing)
"bHt" = (
@@ -36799,6 +38109,16 @@
},
/turf/open/floor/plating,
/area/science/test_area)
+"bHx" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 10
+ },
+/obj/structure/table,
+/obj/item/kitchen/rollingpin,
+/obj/item/shovel/spade,
+/obj/item/reagent_containers/glass/bucket,
+/turf/open/floor/plasteel,
+/area/hallway/secondary/service)
"bHy" = (
/obj/structure/closet/crate,
/obj/machinery/light/small{
@@ -36830,6 +38150,19 @@
},
/turf/open/floor/plasteel,
/area/quartermaster/miningdock)
+"bHB" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/structure/table,
+/obj/item/storage/box/beakers{
+ pixel_x = -3;
+ pixel_y = 7
+ },
+/obj/item/storage/box/beakers{
+ pixel_x = 2;
+ pixel_y = 2
+ },
+/turf/open/floor/plasteel,
+/area/hallway/secondary/service)
"bHC" = (
/obj/effect/landmark/blobstart,
/turf/open/floor/plating,
@@ -36845,12 +38178,17 @@
/turf/open/floor/plating,
/area/maintenance/port/aft)
"bHF" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/effect/landmark/event_spawn,
-/turf/open/floor/wood,
-/area/crew_quarters/theatre)
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plating,
+/area/maintenance/port/aft)
"bHG" = (
/obj/structure/rack,
/obj/machinery/light/small{
@@ -36927,9 +38265,7 @@
/turf/open/floor/plating,
/area/storage/tech)
"bHP" = (
-/obj/effect/turf_decal/tile/yellow{
- dir = 2
- },
+/obj/effect/turf_decal/tile/yellow,
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
"bHQ" = (
@@ -36972,9 +38308,9 @@
/area/maintenance/aft)
"bHV" = (
/obj/machinery/power/apc{
+ areastring = "/area/maintenance/aft";
dir = 8;
name = "Aft Maintenance APC";
- areastring = "/area/maintenance/aft";
pixel_x = -24
},
/obj/structure/cable{
@@ -37003,6 +38339,18 @@
},
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
+"bHZ" = (
+/obj/structure/table,
+/obj/item/book/manual/hydroponics_pod_people{
+ pixel_x = -4;
+ pixel_y = 5
+ },
+/obj/item/paper/guides/jobs/hydroponics{
+ pixel_x = -5;
+ pixel_y = 3
+ },
+/turf/open/floor/plasteel,
+/area/hydroponics)
"bIa" = (
/obj/structure/disposalpipe/segment{
dir = 5
@@ -37034,8 +38382,8 @@
},
/obj/machinery/camera{
c_tag = "Surgery Operating";
- network = list("ss13","medbay");
dir = 1;
+ network = list("ss13","medbay");
pixel_x = 22
},
/obj/machinery/light,
@@ -37133,6 +38481,9 @@
/obj/item/clothing/glasses/hud/health,
/obj/item/clothing/glasses/hud/health,
/obj/item/clothing/glasses/hud/health,
+/obj/item/hand_labeler,
+/obj/item/stack/packageWrap,
+/obj/item/stack/packageWrap,
/turf/open/floor/plasteel/white,
/area/medical/sleeper)
"bIk" = (
@@ -37474,9 +38825,7 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 8
},
-/obj/effect/turf_decal/stripes/corner{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/corner,
/turf/open/floor/plasteel,
/area/science/mixing)
"bIV" = (
@@ -37872,6 +39221,10 @@
},
/turf/closed/wall,
/area/science/storage)
+"bJS" = (
+/obj/structure/sign/departments/restroom,
+/turf/closed/wall,
+/area/crew_quarters/toilet)
"bJT" = (
/obj/machinery/vending/cigarette,
/turf/open/floor/plasteel/white,
@@ -37954,9 +39307,9 @@
/area/science/mixing)
"bKa" = (
/obj/machinery/power/apc{
+ areastring = "/area/science/mixing";
dir = 4;
name = "Toxins Lab APC";
- areastring = "/area/science/mixing";
pixel_x = 26
},
/obj/structure/cable,
@@ -38252,9 +39605,9 @@
icon_state = "0-8"
},
/obj/machinery/power/apc{
+ areastring = "/area/medical/medbay/central";
dir = 4;
name = "Medbay APC";
- areastring = "/area/medical/medbay/central";
pixel_x = 24
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -38331,9 +39684,9 @@
/area/medical/medbay/central)
"bKS" = (
/obj/machinery/power/apc{
+ areastring = "/area/crew_quarters/heads/cmo";
dir = 1;
name = "CM Office APC";
- areastring = "/area/crew_quarters/heads/cmo";
pixel_y = 24
},
/obj/structure/cable{
@@ -38377,9 +39730,7 @@
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
/area/science/xenobiology)
"bKX" = (
@@ -38408,9 +39759,7 @@
pixel_y = 2
},
/obj/structure/table/reinforced,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
/area/science/xenobiology)
"bKZ" = (
@@ -38431,18 +39780,14 @@
name = "Test Chamber";
req_access_txt = "55"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
/area/science/xenobiology)
"bLb" = (
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
/area/science/xenobiology)
"bLc" = (
@@ -38452,9 +39797,7 @@
/obj/item/clothing/glasses/science,
/obj/item/clothing/glasses/science,
/obj/structure/table,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
/area/science/xenobiology)
"bLd" = (
@@ -38568,10 +39911,18 @@
dir = 8
},
/turf/open/floor/plating{
- luminosity = 2;
- initial_gas_mix = "o2=0.01;n2=0.01"
+ initial_gas_mix = "o2=0.01;n2=0.01";
+ luminosity = 2
},
/area/science/test_area)
+"bLs" = (
+/obj/structure/reagent_dispensers/keg/milk,
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
+"bLt" = (
+/obj/structure/reagent_dispensers/keg/gargle,
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
"bLu" = (
/obj/structure/rack,
/obj/effect/spawner/lootdrop/maintenance,
@@ -38596,6 +39947,10 @@
/obj/item/stock_parts/subspace/treatment,
/obj/item/stock_parts/subspace/treatment,
/obj/item/stock_parts/subspace/treatment,
+/obj/machinery/airalarm{
+ dir = 1;
+ pixel_y = -22
+ },
/turf/open/floor/plating,
/area/storage/tech)
"bLy" = (
@@ -38627,6 +39982,10 @@
/obj/item/clothing/gloves/color/yellow,
/obj/item/t_scanner,
/obj/item/multitool,
+/obj/machinery/camera{
+ c_tag = "Tech Storage";
+ dir = 1
+ },
/turf/open/floor/plating,
/area/storage/tech)
"bLB" = (
@@ -38658,9 +40017,8 @@
"bLF" = (
/obj/structure/filingcabinet/filingcabinet,
/obj/machinery/power/apc{
- dir = 2;
- name = "Delivery Office APC";
areastring = "/area/quartermaster/sorting";
+ name = "Delivery Office APC";
pixel_x = 1;
pixel_y = -24
},
@@ -38857,9 +40215,9 @@
/area/science/misc_lab)
"bMg" = (
/obj/machinery/power/apc{
+ areastring = "/area/science/xenobiology";
dir = 8;
name = "Xenobiology APC";
- areastring = "/area/science/xenobiology";
pixel_x = -25
},
/obj/structure/cable{
@@ -38900,7 +40258,6 @@
"bMm" = (
/obj/machinery/monkey_recycler,
/obj/machinery/firealarm{
- dir = 2;
pixel_y = 24
},
/obj/effect/turf_decal/stripes/line{
@@ -38966,7 +40323,6 @@
/area/science/mixing)
"bMw" = (
/obj/machinery/sparker/toxmix{
- dir = 2;
pixel_x = 25
},
/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/toxins_mixing_output{
@@ -39041,6 +40397,10 @@
},
/turf/open/floor/plating/airless,
/area/science/test_area)
+"bMF" = (
+/obj/structure/reagent_dispensers/keg/mead,
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
"bMG" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -39103,7 +40463,6 @@
/area/engine/atmos)
"bMP" = (
/obj/machinery/firealarm{
- dir = 2;
pixel_y = 24
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -39144,9 +40503,7 @@
/turf/open/floor/plasteel,
/area/engine/atmos)
"bMV" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/visible{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/supply/visible,
/obj/machinery/meter/atmos/distro_loop,
/turf/open/floor/plasteel,
/area/engine/atmos)
@@ -39175,6 +40532,13 @@
},
/turf/open/floor/plasteel,
/area/engine/atmos)
+"bNa" = (
+/obj/machinery/door/firedoor,
+/obj/structure/sign/departments/evac{
+ pixel_y = 32
+ },
+/turf/open/floor/plasteel,
+/area/hallway/primary/starboard)
"bNb" = (
/obj/item/airlock_painter,
/obj/structure/lattice,
@@ -39339,9 +40703,7 @@
/turf/open/floor/engine,
/area/science/mixing)
"bNw" = (
-/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_toxmix{
- dir = 2
- },
+/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_toxmix,
/turf/open/floor/engine,
/area/science/mixing)
"bNx" = (
@@ -39406,9 +40768,7 @@
/turf/open/floor/plating/airless,
/area/science/test_area)
"bNF" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plating/airless,
/area/science/test_area)
"bNG" = (
@@ -39446,11 +40806,30 @@
/turf/open/floor/plasteel,
/area/quartermaster/office)
"bNL" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
/obj/machinery/airalarm{
- pixel_y = 23
+ dir = 1;
+ pixel_y = -22
},
/turf/open/floor/plating,
/area/construction)
+"bNM" = (
+/obj/machinery/light,
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/obj/structure/sign/directions/evac{
+ dir = 4;
+ pixel_y = -25
+ },
+/obj/structure/sign/directions/science{
+ dir = 4;
+ pixel_y = -32
+ },
+/turf/open/floor/plasteel,
+/area/hallway/primary/starboard)
"bNN" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -39472,8 +40851,6 @@
dir = 6
},
/obj/item/radio/intercom{
- freerange = 0;
- frequency = 1459;
name = "Station Intercom (General)";
pixel_x = -30
},
@@ -39494,8 +40871,7 @@
pixel_y = 23
},
/obj/machinery/camera{
- c_tag = "Atmospherics Monitoring";
- dir = 2
+ c_tag = "Atmospherics Monitoring"
},
/obj/machinery/light{
dir = 4
@@ -39662,8 +41038,7 @@
/obj/structure/closet/emcloset,
/obj/machinery/camera{
c_tag = "Virology Airlock";
- network = list("ss13","medbay");
- dir = 2
+ network = list("ss13","medbay")
},
/obj/effect/turf_decal/stripes/line{
dir = 5
@@ -39775,7 +41150,6 @@
/area/tcommsat/computer)
"bOE" = (
/obj/machinery/sparker/toxmix{
- dir = 2;
pixel_x = 25
},
/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/toxins_mixing_input{
@@ -39850,12 +41224,21 @@
/area/quartermaster/office)
"bOM" = (
/obj/structure/table,
-/obj/item/paper_bin,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 10
+/obj/item/clothing/head/welding{
+ pixel_x = -3;
+ pixel_y = 7
},
+/obj/item/clothing/head/welding{
+ pixel_x = -5;
+ pixel_y = 3
+ },
+/obj/machinery/light{
+ dir = 8
+ },
+/obj/item/multitool,
+/obj/item/clothing/glasses/welding,
/turf/open/floor/plasteel,
-/area/tcommsat/computer)
+/area/engine/atmos)
"bON" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/door/poddoor/shutters/preopen{
@@ -39866,9 +41249,9 @@
/area/security/detectives_office)
"bOO" = (
/obj/machinery/power/apc{
+ areastring = "/area/security/checkpoint/engineering";
dir = 8;
name = "Engineering Security APC";
- areastring = "/area/security/checkpoint/engineering";
pixel_x = -24
},
/obj/structure/cable{
@@ -39949,7 +41332,6 @@
/obj/effect/turf_decal/delivery,
/obj/machinery/door/window/northleft{
dir = 4;
- icon_state = "left";
name = "Atmospherics Desk";
req_access_txt = "24"
},
@@ -40181,6 +41563,13 @@
},
/turf/open/floor/plasteel/white,
/area/medical/virology)
+"bPv" = (
+/obj/machinery/door/firedoor,
+/obj/structure/sign/departments/evac{
+ pixel_y = -32
+ },
+/turf/open/floor/plasteel,
+/area/hallway/primary/starboard)
"bPw" = (
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 4
@@ -40416,6 +41805,36 @@
},
/turf/open/floor/plasteel,
/area/tcommsat/computer)
+"bPR" = (
+/obj/structure/sign/mining{
+ pixel_y = 7
+ },
+/turf/closed/wall,
+/area/quartermaster/miningdock)
+"bPS" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/sign/departments/custodian{
+ pixel_y = -32
+ },
+/turf/open/floor/plasteel,
+/area/hallway/primary/central)
+"bPT" = (
+/obj/structure/reagent_dispensers/foamtank,
+/obj/effect/turf_decal/tile/yellow{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/yellow{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/box,
+/turf/open/floor/plasteel,
+/area/engine/atmos)
"bPU" = (
/obj/item/shard,
/turf/open/floor/plating,
@@ -40784,7 +42203,6 @@
/obj/item/clothing/ears/earmuffs,
/obj/machinery/camera{
c_tag = "Testing Lab North";
- dir = 2;
network = list("ss13","rd")
},
/turf/open/floor/plasteel,
@@ -40793,7 +42211,6 @@
/obj/machinery/requests_console{
department = "Science";
departmentType = 2;
- dir = 2;
name = "Science Requests Console";
pixel_y = 30;
receive_ore_updates = 1
@@ -40824,6 +42241,21 @@
},
/turf/open/floor/engine,
/area/science/misc_lab)
+"bQX" = (
+/obj/structure/reagent_dispensers/watertank/high,
+/obj/effect/turf_decal/tile/yellow{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/yellow{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/box,
+/turf/open/floor/plasteel,
+/area/engine/atmos)
"bQY" = (
/obj/structure/table/reinforced,
/obj/item/integrated_circuit_printer,
@@ -40844,6 +42276,50 @@
/obj/item/stack/sheet/metal/ten,
/turf/open/floor/plasteel/white,
/area/science/circuit)
+"bRb" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/yellow,
+/obj/effect/turf_decal/tile/yellow{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/yellow{
+ dir = 8
+ },
+/obj/structure/sign/departments/engineering{
+ pixel_y = -32
+ },
+/turf/open/floor/plasteel,
+/area/hallway/primary/aft)
+"bRc" = (
+/obj/structure/sign/poster/contraband/space_cola{
+ pixel_x = -32
+ },
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
+"bRd" = (
+/obj/structure/sign/poster/contraband/space_up{
+ pixel_x = -32;
+ pixel_y = 32
+ },
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
+"bRe" = (
+/obj/machinery/computer/slot_machine{
+ balance = 15;
+ money = 500;
+ pixel_x = -5
+ },
+/obj/structure/sign/poster/contraband/robust_softdrinks{
+ pixel_x = -32
+ },
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
+"bRf" = (
+/obj/effect/landmark/start/assistant,
+/turf/open/floor/plasteel,
+/area/hallway/secondary/entry)
"bRg" = (
/obj/structure/rack,
/obj/effect/spawner/lootdrop/maintenance{
@@ -40957,7 +42433,6 @@
/obj/machinery/door/firedoor/heavy,
/obj/machinery/door/window/northleft{
dir = 4;
- icon_state = "left";
name = "Atmospherics Desk";
req_access_txt = "24"
},
@@ -41342,6 +42817,14 @@
/obj/effect/decal/cleanable/cobweb,
/turf/open/floor/plating,
/area/maintenance/port/aft)
+"bSr" = (
+/obj/structure/sign/poster/official/fruit_bowl{
+ pixel_y = 32
+ },
+/turf/open/floor/plasteel/white/corner{
+ dir = 1
+ },
+/area/hallway/primary/starboard)
"bSs" = (
/obj/structure/reagent_dispensers/watertank,
/turf/open/floor/plating,
@@ -41356,6 +42839,18 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel,
/area/tcommsat/computer)
+"bSu" = (
+/obj/machinery/camera{
+ c_tag = "Starboard Primary Hallway 2"
+ },
+/obj/structure/sign/poster/contraband/eat{
+ pixel_y = 32;
+ poster_item_desc = "This poster promotes obesity, it also promotes giving the Chef a reason to keep their job."
+ },
+/turf/open/floor/plasteel/white/corner{
+ dir = 1
+ },
+/area/hallway/primary/starboard)
"bSv" = (
/obj/machinery/camera{
c_tag = "Construction Area";
@@ -41459,20 +42954,13 @@
/area/engine/atmos)
"bSF" = (
/obj/structure/table,
-/obj/item/clothing/head/welding{
- pixel_x = -3;
- pixel_y = 7
+/obj/item/paper_bin,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 10
},
-/obj/item/clothing/head/welding{
- pixel_x = -5;
- pixel_y = 3
- },
-/obj/machinery/light{
- dir = 8
- },
-/obj/item/multitool,
+/obj/item/pen/fountain,
/turf/open/floor/plasteel,
-/area/engine/atmos)
+/area/tcommsat/computer)
"bSG" = (
/obj/structure/table,
/obj/item/stack/sheet/metal/fifty,
@@ -41513,6 +43001,12 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/engine/atmos)
+"bSL" = (
+/obj/structure/sign/poster/contraband/red_rum{
+ pixel_y = 32
+ },
+/turf/open/floor/plasteel,
+/area/hallway/primary/starboard)
"bSM" = (
/obj/machinery/atmospherics/pipe/simple/cyan/visible{
dir = 4
@@ -41528,6 +43022,15 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/engine/atmos)
+"bSO" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/structure/sign/poster/official/cohiba_robusto_ad{
+ pixel_y = -32
+ },
+/turf/open/floor/plasteel/grimy,
+/area/security/detectives_office)
"bSP" = (
/obj/machinery/atmospherics/pipe/manifold/cyan/visible{
dir = 4
@@ -41611,9 +43114,9 @@
/area/medical/virology)
"bSX" = (
/obj/machinery/power/apc/highcap/five_k{
+ areastring = "/area/medical/virology";
dir = 1;
name = "Virology APC";
- areastring = "/area/medical/virology";
pixel_y = 24
},
/obj/structure/cable{
@@ -41629,6 +43132,15 @@
/obj/machinery/vending/medical,
/turf/open/floor/plasteel/white,
/area/medical/virology)
+"bSZ" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 8
+ },
+/obj/structure/sign/poster/contraband/have_a_puff{
+ pixel_y = -32
+ },
+/turf/open/floor/plasteel/grimy,
+/area/security/detectives_office)
"bTa" = (
/obj/machinery/door/window/northleft{
dir = 4;
@@ -41810,6 +43322,13 @@
/obj/item/pen,
/turf/open/floor/plasteel/white,
/area/science/circuit)
+"bTq" = (
+/obj/structure/sign/poster/contraband/smoke{
+ desc = "This poster reminds us all that the Detective is a parasite. Year after year, they must get replacement lungs because of their addiction. ";
+ pixel_y = -32
+ },
+/turf/open/floor/plasteel/grimy,
+/area/security/detectives_office)
"bTr" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -41818,6 +43337,68 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
+"bTs" = (
+/obj/structure/sign/poster/official/help_others{
+ pixel_y = -32
+ },
+/turf/open/floor/plasteel,
+/area/hallway/primary/starboard)
+"bTt" = (
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
+/obj/structure/reagent_dispensers/watertank,
+/turf/open/floor/plating,
+/area/maintenance/port)
+"bTu" = (
+/obj/machinery/recharge_station,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/structure/sign/poster/official/state_laws{
+ pixel_y = -32
+ },
+/turf/open/floor/plasteel,
+/area/science/robotics/mechbay)
+"bTv" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
+ dir = 4
+ },
+/obj/structure/sign/poster/official/ian{
+ pixel_x = 32;
+ pixel_y = 32
+ },
+/turf/open/floor/plasteel,
+/area/hallway/primary/central)
+"bTw" = (
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/obj/structure/sign/poster/official/love_ian{
+ pixel_x = 32;
+ pixel_y = -32
+ },
+/turf/open/floor/plasteel,
+/area/hallway/primary/central)
+"bTx" = (
+/obj/effect/turf_decal/bot,
+/obj/structure/sign/poster/official/pda_ad{
+ pixel_y = -32
+ },
+/turf/open/floor/plasteel,
+/area/hallway/primary/central)
+"bTy" = (
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/obj/structure/sign/poster/contraband/hacking_guide{
+ pixel_y = 32
+ },
+/turf/open/floor/plating,
+/area/maintenance/aft)
"bTz" = (
/obj/machinery/door/airlock/maintenance{
req_access_txt = "12"
@@ -41903,9 +43484,9 @@
/area/tcommsat/computer)
"bTJ" = (
/obj/machinery/power/apc{
- name = "Aft Hall APC";
areastring = "/area/hallway/primary/aft";
dir = 8;
+ name = "Aft Hall APC";
pixel_x = -25;
pixel_y = 1
},
@@ -42226,6 +43807,21 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plating,
/area/maintenance/port/aft)
+"bUw" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/obj/structure/sign/poster/contraband/free_drone{
+ pixel_y = 32
+ },
+/turf/open/floor/plating,
+/area/maintenance/port/aft)
"bUx" = (
/obj/structure/disposalpipe/junction/yjunction{
dir = 1
@@ -42255,11 +43851,27 @@
},
/turf/open/floor/plating,
/area/maintenance/port/aft)
+"bUA" = (
+/obj/machinery/door/poddoor/preopen{
+ id = "Engineering";
+ name = "engineering security door"
+ },
+/obj/effect/turf_decal/delivery,
+/obj/machinery/shower{
+ dir = 8
+ },
+/obj/structure/sign/warning/enginesafety{
+ pixel_x = 32
+ },
+/obj/structure/sign/poster/official/safety_eye_protection{
+ pixel_y = -32
+ },
+/turf/open/floor/plasteel,
+/area/engine/engineering)
"bUB" = (
/obj/machinery/power/apc{
- dir = 2;
- name = "Telecomms Monitoring APC";
areastring = "/area/tcommsat/computer";
+ name = "Telecomms Monitoring APC";
pixel_y = -24
},
/obj/structure/cable{
@@ -42404,6 +44016,7 @@
/area/engine/atmos)
"bUU" = (
/obj/machinery/portable_atmospherics/canister/nitrous_oxide,
+/obj/machinery/atmospherics/miner/n2o,
/turf/open/floor/engine/n2o,
/area/engine/atmos)
"bUV" = (
@@ -42416,6 +44029,13 @@
},
/turf/open/floor/engine/n2o,
/area/engine/atmos)
+"bUX" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/obj/structure/sign/poster/official/safety_eye_protection,
+/turf/closed/wall/r_wall,
+/area/engine/engineering)
"bUY" = (
/obj/structure/disposalpipe/segment{
dir = 5
@@ -42511,7 +44131,6 @@
/area/hallway/primary/aft)
"bVg" = (
/obj/item/radio/intercom{
- broadcasting = 0;
name = "Station Intercom (General)";
pixel_y = 20
},
@@ -42634,10 +44253,12 @@
},
/turf/open/space,
/area/space/nearstation)
+"bVw" = (
+/obj/structure/sign/poster/official/safety_eye_protection,
+/turf/closed/wall/r_wall,
+/area/engine/engineering)
"bVx" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/on{
- dir = 2
- },
+/obj/machinery/atmospherics/components/unary/outlet_injector/on,
/turf/open/floor/plating/airless,
/area/maintenance/port/aft)
"bVy" = (
@@ -42709,6 +44330,19 @@
},
/turf/open/floor/plating,
/area/maintenance/port/aft)
+"bVH" = (
+/obj/machinery/camera{
+ c_tag = "Engineering Storage";
+ dir = 4
+ },
+/obj/machinery/rnd/production/protolathe/department/engineering,
+/obj/structure/sign/poster/contraband/power{
+ desc = "Lord Singuloth must feed. Annoyingly, it's really easy for people to sabotage containment and let Lord Singuloth eat the entire station.. For this reason, Nanotrasen prefers Supermatter reactors.";
+ pixel_x = -32;
+ poster_item_desc = "This poster depicts Lord Singuloth. Nanotrasen doesn't approve. Nanotrasen wants Supermatter over Singularities, as they are usually much safer."
+ },
+/turf/open/floor/plasteel,
+/area/engine/engineering)
"bVI" = (
/turf/closed/wall/r_wall,
/area/tcommsat/server)
@@ -42719,6 +44353,12 @@
/obj/machinery/vending/snack/random,
/turf/open/floor/plasteel,
/area/engine/break_room)
+"bVL" = (
+/obj/machinery/shower{
+ dir = 8
+ },
+/turf/open/floor/plasteel/freezer,
+/area/security/prison)
"bVM" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plating,
@@ -42902,6 +44542,13 @@
/obj/effect/spawner/structure/window,
/turf/open/floor/plating,
/area/medical/virology)
+"bWk" = (
+/obj/structure/chair{
+ dir = 8
+ },
+/obj/effect/landmark/start/assistant,
+/turf/open/floor/plasteel,
+/area/quartermaster/office)
"bWl" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -42959,9 +44606,7 @@
/turf/open/floor/plasteel,
/area/science/misc_lab)
"bWq" = (
-/obj/machinery/atmospherics/components/binary/pump{
- dir = 2
- },
+/obj/machinery/atmospherics/components/binary/pump,
/turf/open/floor/plasteel,
/area/science/misc_lab)
"bWr" = (
@@ -43040,9 +44685,9 @@
dir = 1
},
/obj/machinery/power/apc/highcap/five_k{
+ areastring = "/area/tcommsat/server";
dir = 1;
name = "Telecomms Server APC";
- areastring = "/area/tcommsat/server";
pixel_y = 25
},
/obj/structure/cable{
@@ -43156,8 +44801,6 @@
/area/security/checkpoint/engineering)
"bWR" = (
/obj/item/radio/intercom{
- freerange = 0;
- frequency = 1459;
name = "Station Intercom (General)";
pixel_x = -30
},
@@ -43447,6 +45090,17 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel,
/area/science/circuit)
+"bXu" = (
+/obj/machinery/camera{
+ c_tag = "Bar West";
+ dir = 4
+ },
+/obj/machinery/computer/arcade/orion_trail,
+/obj/structure/sign/poster/official/foam_force_ad{
+ pixel_x = -32
+ },
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
"bXv" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
@@ -43611,6 +45265,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 8
},
+/obj/item/cartridge/atmos,
/turf/open/floor/plasteel,
/area/engine/atmos)
"bXS" = (
@@ -43618,23 +45273,15 @@
dir = 4
},
/obj/machinery/portable_atmospherics/canister,
-/obj/effect/turf_decal/bot{
- dir = 2
- },
-/turf/open/floor/plasteel{
- dir = 2
- },
+/obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
/area/engine/atmos)
"bXT" = (
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
dir = 8
},
-/obj/effect/turf_decal/bot{
- dir = 2
- },
-/turf/open/floor/plasteel{
- dir = 2
- },
+/obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
/area/engine/atmos)
"bXU" = (
/obj/machinery/atmospherics/pipe/manifold/yellow/visible{
@@ -43773,12 +45420,8 @@
/area/science/misc_lab)
"bYk" = (
/obj/structure/reagent_dispensers/fueltank,
-/obj/effect/turf_decal/bot{
- dir = 2
- },
-/turf/open/floor/plasteel{
- dir = 2
- },
+/obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
/area/science/misc_lab)
"bYl" = (
/obj/structure/disposalpipe/segment,
@@ -43793,12 +45436,8 @@
/obj/structure/window/reinforced{
dir = 4
},
-/obj/effect/turf_decal/bot{
- dir = 2
- },
-/turf/open/floor/plasteel{
- dir = 2
- },
+/obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
/area/science/misc_lab)
"bYn" = (
/obj/structure/disposalpipe/segment,
@@ -43937,18 +45576,13 @@
/turf/open/floor/plasteel,
/area/tcommsat/computer)
"bYG" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/effect/turf_decal/tile/yellow,
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
- },
-/obj/effect/turf_decal/tile/yellow{
+/obj/structure/chair{
dir = 8
},
+/obj/machinery/light,
+/obj/effect/landmark/start/assistant,
/turf/open/floor/plasteel,
-/area/hallway/primary/aft)
+/area/quartermaster/office)
"bYH" = (
/turf/closed/wall,
/area/engine/break_room)
@@ -43957,9 +45591,7 @@
dir = 4;
pixel_x = 24
},
-/obj/effect/turf_decal/tile/yellow{
- dir = 2
- },
+/obj/effect/turf_decal/tile/yellow,
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
"bYJ" = (
@@ -44046,6 +45678,7 @@
/area/engine/atmos)
"bYU" = (
/obj/machinery/portable_atmospherics/canister/toxins,
+/obj/machinery/atmospherics/miner/toxins,
/turf/open/floor/engine/plasma,
/area/engine/atmos)
"bYV" = (
@@ -44121,6 +45754,22 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/engine/break_room)
+"bZf" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/obj/structure/chair{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/yellow{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/crew_quarters/fitness)
"bZg" = (
/obj/structure/disposalpipe/segment{
dir = 10
@@ -44256,13 +45905,17 @@
/area/engine/break_room)
"bZz" = (
/obj/structure/table,
-/obj/machinery/cell_charger,
/obj/machinery/light_switch{
pixel_x = -23
},
/obj/machinery/light{
dir = 8
},
+/obj/item/book/manual/wiki/engineering_hacking{
+ pixel_x = 3;
+ pixel_y = 3
+ },
+/obj/item/book/manual/wiki/engineering_construction,
/turf/open/floor/plasteel,
/area/engine/break_room)
"bZA" = (
@@ -44327,9 +45980,9 @@
/area/engine/break_room)
"bZF" = (
/obj/machinery/power/apc{
+ areastring = "/area/engine/atmos";
dir = 8;
name = "Atmospherics APC";
- areastring = "/area/engine/atmos";
pixel_x = -24
},
/obj/structure/cable{
@@ -44513,6 +46166,15 @@
},
/turf/open/floor/plasteel,
/area/science/misc_lab)
+"cab" = (
+/obj/structure/table,
+/obj/item/storage/pill_bottle/dice{
+ pixel_x = 4;
+ pixel_y = 4
+ },
+/obj/item/reagent_containers/food/snacks/cherrycupcake,
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
"cac" = (
/obj/structure/chair/stool,
/turf/open/floor/plating,
@@ -44555,6 +46217,18 @@
},
/turf/open/floor/circuit/telecomms/mainframe,
/area/tcommsat/server)
+"caj" = (
+/obj/structure/table,
+/obj/item/reagent_containers/food/drinks/soda_cans/starkist{
+ pixel_x = 5;
+ pixel_y = 7
+ },
+/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb{
+ pixel_x = -3;
+ pixel_y = 2
+ },
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
"cak" = (
/obj/machinery/telecomms/hub/preset,
/obj/effect/turf_decal/tile/neutral{
@@ -44592,6 +46266,18 @@
},
/turf/open/floor/plasteel/dark,
/area/tcommsat/computer)
+"cam" = (
+/obj/structure/table/reinforced,
+/obj/machinery/door/firedoor,
+/obj/machinery/door/poddoor/shutters/preopen{
+ id = "kitchen";
+ name = "kitchen shutters"
+ },
+/obj/item/reagent_containers/food/snacks/bluecherrycupcake{
+ pixel_y = 5
+ },
+/turf/open/floor/plasteel/cafeteria,
+/area/crew_quarters/kitchen)
"can" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
@@ -44690,13 +46376,20 @@
/area/hallway/primary/aft)
"caw" = (
/obj/structure/table,
+/obj/item/storage/box/lights/mixed,
/obj/item/clothing/glasses/meson,
-/obj/machinery/airalarm{
- dir = 4;
- pixel_x = -22
+/obj/item/clothing/glasses/meson,
+/obj/effect/turf_decal/tile/yellow{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/yellow{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/yellow{
+ dir = 8
},
/turf/open/floor/plasteel,
-/area/engine/break_room)
+/area/engine/engineering)
"cax" = (
/obj/structure/closet/wardrobe/black,
/obj/effect/decal/cleanable/cobweb,
@@ -44733,6 +46426,18 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/security/checkpoint/engineering)
+"caB" = (
+/obj/structure/table/reinforced,
+/obj/machinery/door/firedoor,
+/obj/machinery/door/poddoor/shutters/preopen{
+ id = "kitchen";
+ name = "kitchen shutters"
+ },
+/obj/item/reagent_containers/food/snacks/cheesynachos{
+ pixel_y = 5
+ },
+/turf/open/floor/plasteel/cafeteria,
+/area/crew_quarters/kitchen)
"caC" = (
/obj/structure/disposalpipe/segment{
dir = 9
@@ -44861,9 +46566,7 @@
/obj/machinery/atmospherics/components/binary/valve{
dir = 4
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plating,
/area/maintenance/aft)
"caQ" = (
@@ -45000,9 +46703,9 @@
/area/science/misc_lab)
"cbd" = (
/obj/machinery/power/apc{
+ areastring = "/area/science/misc_lab";
dir = 4;
name = "Testing Lab APC";
- areastring = "/area/science/misc_lab";
pixel_x = 26
},
/obj/structure/cable{
@@ -45100,13 +46803,11 @@
/turf/open/floor/plating,
/area/tcommsat/computer)
"cbp" = (
-/obj/structure/closet/secure_closet/engineering_chief{
- req_access_txt = "0"
- },
+/obj/structure/closet/secure_closet/engineering_chief,
/obj/machinery/power/apc/highcap/five_k{
+ areastring = "/area/crew_quarters/heads/chief";
dir = 4;
name = "CE Office APC";
- areastring = "/area/crew_quarters/heads/chief";
pixel_x = 24
},
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
@@ -45170,16 +46871,14 @@
dir = 8;
pixel_y = -22
},
-/obj/effect/turf_decal/tile/yellow{
- dir = 2
- },
+/obj/effect/turf_decal/tile/yellow,
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
"cbu" = (
/obj/machinery/power/apc{
+ areastring = "/area/engine/break_room";
dir = 8;
name = "Engineering Foyer APC";
- areastring = "/area/engine/break_room";
pixel_x = -24
},
/obj/structure/cable{
@@ -45196,33 +46895,37 @@
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
"cbw" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/structure/cable{
- icon_state = "2-8"
- },
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 5
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/structure/disposalpipe/sorting/mail/flip{
+ dir = 8;
+ sortType = 4
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
},
/turf/open/floor/plating,
/area/maintenance/port/aft)
"cbx" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
+ dir = 10
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 9
+ },
+/obj/structure/cable{
+ icon_state = "1-8"
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plating,
-/area/maintenance/port/aft)
-"cby" = (
/obj/structure/cable{
icon_state = "1-2"
},
+/turf/open/floor/plating,
+/area/maintenance/port/aft)
+"cby" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 10
- },
/turf/open/floor/plating,
/area/maintenance/port/aft)
"cbz" = (
@@ -45419,6 +47122,11 @@
},
/turf/open/floor/plasteel,
/area/science/misc_lab)
+"cbX" = (
+/obj/machinery/portable_atmospherics/canister/carbon_dioxide,
+/obj/machinery/atmospherics/miner/carbon_dioxide,
+/turf/open/floor/engine/co2,
+/area/engine/atmos)
"cbY" = (
/obj/structure/table/reinforced,
/obj/item/multitool,
@@ -45472,10 +47180,10 @@
/turf/open/space,
/area/solar/port/aft)
"ccd" = (
-/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance,
-/turf/open/floor/plating,
-/area/maintenance/port/aft)
+/obj/machinery/portable_atmospherics/canister/nitrogen,
+/obj/machinery/atmospherics/miner/nitrogen,
+/turf/open/floor/engine/n2,
+/area/engine/atmos)
"cce" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -45638,11 +47346,9 @@
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
"ccu" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/cable{
- icon_state = "1-4"
- },
-/obj/structure/disposalpipe/segment{
- dir = 5
+ icon_state = "1-2"
},
/turf/open/floor/plating,
/area/maintenance/port/aft)
@@ -45687,8 +47393,9 @@
/turf/open/floor/plasteel,
/area/engine/atmos)
"ccB" = (
-/obj/machinery/portable_atmospherics/canister/carbon_dioxide,
-/turf/open/floor/engine/co2,
+/obj/machinery/portable_atmospherics/canister/oxygen,
+/obj/machinery/atmospherics/miner/oxygen,
+/turf/open/floor/engine/o2,
/area/engine/atmos)
"ccC" = (
/obj/machinery/air_sensor/atmos/carbon_tank,
@@ -45720,6 +47427,11 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plating,
/area/maintenance/aft)
+"ccH" = (
+/obj/structure/table,
+/obj/item/paper/fluff/holodeck/disclaimer,
+/turf/open/floor/plasteel,
+/area/crew_quarters/fitness)
"ccI" = (
/obj/structure/disposalpipe/segment{
dir = 5
@@ -45802,13 +47514,23 @@
/area/science/xenobiology)
"ccR" = (
/obj/machinery/portable_atmospherics/pump,
-/obj/effect/turf_decal/bot{
- dir = 2
- },
-/turf/open/floor/plasteel{
- dir = 2
- },
+/obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
/area/science/misc_lab)
+"ccS" = (
+/obj/machinery/light{
+ dir = 8
+ },
+/obj/structure/window,
+/obj/structure/sign/poster/official/high_class_martini{
+ pixel_x = -32
+ },
+/obj/effect/landmark/start/assistant,
+/obj/structure/chair/sofa/left{
+ dir = 1
+ },
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
"ccT" = (
/obj/machinery/light{
dir = 4
@@ -45896,38 +47618,30 @@
/turf/open/floor/plasteel,
/area/tcommsat/computer)
"cdh" = (
-/obj/structure/disposalpipe/sorting/mail/flip{
- dir = 8;
- sortType = 4
+/obj/structure/lattice/catwalk,
+/obj/item/stack/marker_beacon{
+ anchored = 1;
+ icon_state = "markerburgundy-on";
+ light_power = 3;
+ light_range = 3;
+ name = "Docking Beacon";
+ picked_color = "Burgundy"
},
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plating,
-/area/maintenance/port/aft)
+/area/space/nearstation)
"cdi" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
+/obj/structure/grille,
+/obj/structure/lattice,
/turf/open/floor/plating,
-/area/maintenance/port/aft)
+/area/space/nearstation)
"cdj" = (
-/obj/structure/cable{
- icon_state = "1-8"
+/obj/structure/closet/crate/bin,
+/obj/effect/turf_decal/stripes/line{
+ dir = 10
},
-/obj/structure/disposalpipe/segment{
- dir = 9
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/turf/open/floor/plating,
-/area/maintenance/port/aft)
+/obj/item/cartridge/atmos,
+/turf/open/floor/engine,
+/area/engine/engineering)
"cdk" = (
/obj/machinery/computer/atmos_alert,
/obj/effect/turf_decal/tile/neutral{
@@ -45952,6 +47666,7 @@
/obj/item/paper/monitorkey,
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/item/pen/fountain,
/turf/open/floor/plasteel,
/area/crew_quarters/heads/chief)
"cdn" = (
@@ -45996,9 +47711,9 @@
/area/maintenance/starboard/aft)
"cds" = (
/obj/machinery/power/apc{
+ areastring = "/area/maintenance/starboard/aft";
dir = 8;
name = "Starboard Quarter Maintenance APC";
- areastring = "/area/maintenance/starboard/aft";
pixel_x = -25
},
/obj/structure/cable{
@@ -46165,6 +47880,13 @@
},
/turf/open/floor/plating,
/area/maintenance/aft)
+"cdM" = (
+/obj/structure/window,
+/obj/structure/chair/sofa/right{
+ dir = 1
+ },
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
"cdN" = (
/obj/structure/disposalpipe/segment{
dir = 9
@@ -46179,6 +47901,15 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
+"cdP" = (
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/turf/open/floor/plasteel,
+/area/crew_quarters/fitness)
"cdQ" = (
/obj/structure/closet/emcloset,
/obj/effect/decal/cleanable/cobweb,
@@ -46190,12 +47921,8 @@
/area/maintenance/starboard/aft)
"cdS" = (
/obj/machinery/portable_atmospherics/scrubber,
-/obj/effect/turf_decal/bot{
- dir = 2
- },
-/turf/open/floor/plasteel{
- dir = 2
- },
+/obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
/area/science/misc_lab)
"cdT" = (
/obj/effect/turf_decal/stripes/line{
@@ -46223,9 +47950,9 @@
/area/maintenance/starboard/aft)
"cdW" = (
/obj/machinery/power/apc{
+ areastring = "/area/maintenance/port/aft";
dir = 8;
name = "Port Quarter Maintenance APC";
- areastring = "/area/maintenance/port/aft";
pixel_x = -25;
pixel_y = 1
},
@@ -46242,6 +47969,13 @@
},
/turf/open/floor/plasteel/white,
/area/science/research)
+"cdY" = (
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue,
+/turf/open/floor/plasteel,
+/area/crew_quarters/fitness)
"cdZ" = (
/obj/machinery/telecomms/processor/preset_two,
/turf/open/floor/plasteel/dark/telecomms,
@@ -46316,16 +48050,18 @@
/turf/open/floor/plasteel,
/area/engine/engineering)
"cek" = (
-/obj/machinery/door/poddoor/preopen{
- id = "Engineering";
- name = "engineering security door"
- },
-/obj/effect/turf_decal/delivery,
-/obj/machinery/shower{
- dir = 8
+/obj/structure/closet/wardrobe/grey,
+/obj/machinery/requests_console{
+ department = "Locker Room";
+ pixel_x = -32
},
+/obj/item/clothing/under/assistantformal,
+/obj/item/clothing/under/assistantformal,
+/obj/item/clothing/under/assistantformal,
+/obj/item/clothing/under/color/grey,
+/obj/item/clothing/under/color/grey,
/turf/open/floor/plasteel,
-/area/engine/engineering)
+/area/crew_quarters/locker)
"cel" = (
/obj/machinery/door/poddoor/preopen{
id = "Engineering";
@@ -46402,6 +48138,18 @@
},
/turf/open/floor/plasteel,
/area/engine/engineering)
+"ceu" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/turf/open/floor/plasteel,
+/area/crew_quarters/fitness)
"cev" = (
/obj/effect/spawner/structure/window,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -46532,12 +48280,8 @@
/area/maintenance/starboard/aft)
"ceP" = (
/obj/machinery/portable_atmospherics/canister,
-/obj/effect/turf_decal/bot{
- dir = 2
- },
-/turf/open/floor/plasteel{
- dir = 2
- },
+/obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
/area/science/misc_lab)
"ceQ" = (
/obj/structure/cable{
@@ -46607,18 +48351,18 @@
"cfa" = (
/obj/structure/rack,
/obj/item/storage/belt/utility,
-/obj/item/wrench,
-/obj/item/weldingtool,
-/obj/item/clothing/head/welding{
- pixel_x = -3;
- pixel_y = 5
- },
/obj/effect/turf_decal/tile/yellow{
dir = 1
},
/obj/effect/turf_decal/tile/yellow{
dir = 4
},
+/obj/item/weldingtool/largetank,
+/obj/item/clothing/head/welding{
+ pixel_x = -3;
+ pixel_y = 5
+ },
+/obj/item/clothing/glasses/welding,
/turf/open/floor/plasteel,
/area/engine/engineering)
"cfb" = (
@@ -46661,6 +48405,16 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plating,
/area/maintenance/port/aft)
+"cff" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue,
+/turf/open/floor/plasteel,
+/area/crew_quarters/fitness)
"cfg" = (
/obj/structure/cable{
icon_state = "1-4"
@@ -46737,10 +48491,9 @@
/area/maintenance/aft)
"cfr" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
- dir = 2;
external_pressure_bound = 140;
- pressure_checks = 0;
- name = "killroom vent"
+ name = "killroom vent";
+ pressure_checks = 0
},
/obj/machinery/camera{
c_tag = "Xenobiology Kill Room";
@@ -46804,14 +48557,33 @@
},
/turf/open/floor/plasteel,
/area/engine/engineering)
-"cfB" = (
-/obj/structure/closet/secure_closet/engineering_personal,
-/obj/effect/turf_decal/tile/yellow,
+"cfA" = (
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
/obj/effect/turf_decal/tile/yellow{
+ dir = 8
+ },
+/turf/open/floor/plasteel,
+/area/crew_quarters/fitness)
+"cfB" = (
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/turf/open/floor/plasteel,
+/area/crew_quarters/fitness)
+"cfC" = (
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/blue{
dir = 4
},
/turf/open/floor/plasteel,
-/area/engine/engineering)
+/area/crew_quarters/fitness)
"cfD" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/door/airlock/maintenance{
@@ -46824,6 +48596,18 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plating,
/area/maintenance/port/aft)
+"cfE" = (
+/obj/machinery/button/door{
+ desc = "Bolts the doors to the Private Study.";
+ id = "PrivateStudy";
+ name = "Private Study Lock";
+ pixel_x = 25;
+ pixel_y = 25;
+ req_access_txt = "";
+ req_one_access_txt = "28;63"
+ },
+/turf/open/floor/wood,
+/area/library)
"cfF" = (
/obj/machinery/suit_storage_unit/ce,
/obj/effect/turf_decal/stripes/line{
@@ -46858,17 +48642,15 @@
/turf/open/floor/plasteel/dark,
/area/crew_quarters/heads/chief)
"cfI" = (
-/obj/structure/closet/secure_closet/engineering_personal,
-/obj/machinery/airalarm{
- dir = 8;
- pixel_x = 24
+/obj/structure/cable{
+ icon_state = "1-8"
},
-/obj/effect/turf_decal/tile/yellow,
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
+/obj/structure/disposalpipe/segment{
+ dir = 9
},
+/obj/effect/landmark/start/assistant,
/turf/open/floor/plasteel,
-/area/engine/engineering)
+/area/hallway/primary/central)
"cfJ" = (
/obj/machinery/light/small{
dir = 1
@@ -46932,6 +48714,14 @@
},
/turf/open/floor/plasteel,
/area/engine/atmos)
+"cfS" = (
+/obj/structure/closet,
+/obj/effect/spawner/lootdrop/maintenance{
+ lootcount = 8;
+ name = "8maintenance loot spawner"
+ },
+/turf/open/floor/plating,
+/area/maintenance/port/aft)
"cfT" = (
/obj/machinery/atmospherics/pipe/simple/green/visible{
dir = 9
@@ -46944,6 +48734,17 @@
},
/turf/closed/wall,
/area/maintenance/disposal/incinerator)
+"cfV" = (
+/obj/structure/table,
+/obj/machinery/airalarm{
+ dir = 4;
+ pixel_x = -22
+ },
+/obj/item/stack/packageWrap,
+/obj/item/stack/packageWrap,
+/obj/item/hand_labeler,
+/turf/open/floor/plasteel,
+/area/engine/break_room)
"cfW" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -46956,9 +48757,8 @@
/area/maintenance/aft)
"cfX" = (
/obj/machinery/power/apc{
- dir = 2;
- name = "Incinerator APC";
areastring = "/area/maintenance/disposal/incinerator";
+ name = "Incinerator APC";
pixel_y = -24
},
/obj/structure/cable,
@@ -47067,7 +48867,6 @@
/area/science/xenobiology)
"cgl" = (
/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{
- dir = 2;
external_pressure_bound = 120;
name = "killroom vent"
},
@@ -47097,11 +48896,11 @@
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
"cgp" = (
-/obj/structure/cable{
- icon_state = "2-8"
- },
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- dir = 1
+/obj/structure/rack,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/effect/spawner/lootdrop/maintenance{
+ lootcount = 4;
+ name = "4maintenance loot spawner"
},
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
@@ -47139,9 +48938,8 @@
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
"cgu" = (
-/obj/structure/rack,
-/obj/effect/decal/cleanable/cobweb/cobweb2,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/effect/spawner/structure/window,
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
"cgv" = (
@@ -47239,6 +49037,17 @@
},
/turf/open/floor/plating,
/area/maintenance/port/aft)
+"cgH" = (
+/obj/structure/closet/secure_closet/engineering_personal,
+/obj/effect/turf_decal/tile/yellow,
+/obj/effect/turf_decal/tile/yellow{
+ dir = 4
+ },
+/obj/item/clothing/under/overalls,
+/obj/item/clothing/under/overalls,
+/obj/item/radio/headset/headset_eng,
+/turf/open/floor/plasteel,
+/area/engine/engineering)
"cgI" = (
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 1
@@ -47266,6 +49075,34 @@
},
/turf/open/floor/engine,
/area/engine/engineering)
+"cgM" = (
+/obj/structure/closet/secure_closet/engineering_personal,
+/obj/machinery/airalarm{
+ dir = 8;
+ pixel_x = 24
+ },
+/obj/effect/turf_decal/tile/yellow,
+/obj/effect/turf_decal/tile/yellow{
+ dir = 4
+ },
+/obj/item/clothing/under/overalls,
+/obj/item/clothing/under/overalls,
+/obj/item/radio/headset/headset_eng,
+/turf/open/floor/plasteel,
+/area/engine/engineering)
+"cgN" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 10
+ },
+/obj/structure/closet/secure_closet/engineering_electrical,
+/obj/item/storage/toolbox/artistic{
+ icon_state = "yellow";
+ item_state = "toolbox_yellow";
+ name = "Cable Toolbox";
+ pixel_y = 6
+ },
+/turf/open/floor/plasteel,
+/area/engine/engineering)
"cgO" = (
/obj/structure/rack,
/obj/item/lighter,
@@ -47286,6 +49123,19 @@
},
/turf/open/floor/plasteel/dark,
/area/crew_quarters/heads/chief)
+"cgP" = (
+/obj/machinery/light{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 5
+ },
+/obj/structure/closet/secure_closet/engineering_welding,
+/obj/item/clothing/glasses/welding,
+/obj/item/clothing/glasses/welding,
+/obj/item/clothing/glasses/welding,
+/turf/open/floor/plasteel,
+/area/engine/engineering)
"cgQ" = (
/obj/machinery/camera{
c_tag = "Engineering East";
@@ -47486,7 +49336,6 @@
dir = 1
},
/obj/machinery/atmospherics/components/binary/pump{
- dir = 2;
name = "atmospherics mix pump"
},
/turf/open/floor/plasteel,
@@ -47726,12 +49575,10 @@
/turf/open/space,
/area/solar/port/aft)
"chM" = (
-/obj/structure/cable{
- icon_state = "0-4"
- },
-/obj/structure/lattice/catwalk,
-/turf/open/space,
-/area/solar/port/aft)
+/obj/structure/closet/secure_closet/engineering_personal,
+/obj/item/radio/headset/headset_eng,
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
"chN" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -47791,6 +49638,22 @@
},
/turf/open/floor/plating,
/area/maintenance/port/aft)
+"chU" = (
+/obj/structure/rack,
+/obj/item/storage/toolbox/artistic{
+ icon_state = "yellow";
+ item_state = "toolbox_yellow";
+ name = "Cable Toolbox";
+ pixel_y = 6
+ },
+/obj/item/storage/toolbox/artistic{
+ icon_state = "yellow";
+ item_state = "toolbox_yellow";
+ name = "Cable Toolbox";
+ pixel_y = -4
+ },
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
"chV" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -47809,6 +49672,22 @@
},
/turf/open/floor/engine,
/area/engine/engineering)
+"chW" = (
+/obj/item/wrench,
+/obj/structure/rack,
+/obj/item/weldingtool/hugetank,
+/obj/item/clothing/head/welding{
+ pixel_x = -3;
+ pixel_y = 5
+ },
+/obj/item/clothing/head/welding{
+ pixel_x = -3;
+ pixel_y = 5
+ },
+/obj/item/clothing/glasses/welding,
+/obj/item/clothing/glasses/welding,
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
"chX" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -47825,6 +49704,10 @@
/obj/machinery/shieldgen,
/turf/open/floor/plating,
/area/engine/engineering)
+"chZ" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/closed/wall,
+/area/crew_quarters/locker)
"cia" = (
/obj/effect/turf_decal/bot{
dir = 1
@@ -47837,6 +49720,14 @@
},
/turf/open/floor/plasteel,
/area/engine/engineering)
+"cib" = (
+/obj/structure/rack,
+/obj/effect/spawner/lootdrop/maintenance{
+ lootcount = 8;
+ name = "8maintenance loot spawner"
+ },
+/turf/open/floor/plating,
+/area/maintenance/port/aft)
"cic" = (
/obj/effect/turf_decal/bot{
dir = 1
@@ -47859,9 +49750,9 @@
},
/obj/structure/reagent_dispensers/watertank,
/obj/machinery/power/apc/highcap/fifteen_k{
+ areastring = "/area/engine/engineering";
dir = 1;
name = "Engineering APC";
- areastring = "/area/engine/engineering";
pixel_y = 25
},
/obj/structure/cable{
@@ -47903,6 +49794,10 @@
"cig" = (
/turf/closed/wall,
/area/engine/engineering)
+"cih" = (
+/obj/effect/spawner/lootdrop/keg,
+/turf/open/floor/plating,
+/area/maintenance/starboard/fore)
"cii" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -47958,6 +49853,13 @@
},
/turf/open/floor/plasteel/dark,
/area/crew_quarters/heads/chief)
+"cil" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/structure/light_construct{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/maintenance/starboard/fore)
"cim" = (
/turf/open/floor/plasteel,
/area/crew_quarters/heads/chief)
@@ -48029,6 +49931,12 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/engine/atmos)
+"ciw" = (
+/obj/structure/light_construct{
+ dir = 1
+ },
+/turf/open/floor/plating,
+/area/maintenance/starboard/fore)
"cix" = (
/obj/machinery/atmospherics/pipe/simple/cyan/visible,
/turf/closed/wall/r_wall,
@@ -48118,8 +50026,10 @@
},
/area/maintenance/starboard/aft)
"ciK" = (
-/obj/structure/rack,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/machinery/door/airlock/maintenance{
+ req_access_txt = "12"
+ },
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
"ciL" = (
@@ -48172,17 +50082,16 @@
/obj/machinery/power/solar_control{
dir = 4;
id = "portsolar";
- name = "Port Quarter Solar Control";
- track = 0
+ name = "Port Quarter Solar Control"
},
/obj/structure/cable,
/turf/open/floor/plating,
/area/maintenance/solars/port/aft)
"ciR" = (
/obj/machinery/power/apc{
+ areastring = "/area/maintenance/solars/port/aft";
dir = 4;
name = "Port Quarter Solar APC";
- areastring = "/area/maintenance/solars/port/aft";
pixel_x = 23;
pixel_y = 2
},
@@ -48207,22 +50116,27 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plating,
/area/maintenance/port/aft)
+"ciV" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/structure/light_construct{
+ dir = 8
+ },
+/turf/open/floor/plating,
+/area/maintenance/starboard/fore)
"ciW" = (
/obj/effect/landmark/blobstart,
/turf/open/floor/plating,
/area/engine/engineering)
"ciX" = (
-/obj/structure/closet/crate,
-/obj/item/stack/sheet/metal/fifty,
-/obj/item/stack/rods/fifty,
-/obj/item/stack/sheet/glass/fifty,
-/obj/item/electronics/airlock,
-/obj/item/electronics/airlock,
-/obj/item/stock_parts/cell/high/plus,
-/obj/item/stack/sheet/mineral/plasma{
- amount = 30
+/obj/machinery/light{
+ dir = 1
},
-/turf/open/floor/plating,
+/obj/effect/turf_decal/tile/yellow{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
/area/engine/engineering)
"ciY" = (
/obj/machinery/door/poddoor{
@@ -48698,6 +50612,11 @@
},
/turf/open/floor/plasteel,
/area/crew_quarters/heads/chief)
+"cjZ" = (
+/obj/structure/table,
+/obj/machinery/cell_charger,
+/turf/open/floor/plasteel,
+/area/engine/engineering)
"cka" = (
/obj/machinery/door/poddoor/preopen{
id = "testlab";
@@ -48807,14 +50726,22 @@
/turf/closed/wall,
/area/maintenance/starboard/aft)
"ckp" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/structure/rack,
/obj/effect/spawner/lootdrop/maintenance{
- lootcount = 2;
- name = "2maintenance loot spawner"
+ lootcount = 3;
+ name = "3maintenance loot spawner"
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
+"ckq" = (
+/obj/structure/table,
+/obj/item/stack/sheet/glass/fifty,
+/obj/item/stack/sheet/glass/fifty,
+/obj/item/stack/sheet/glass/fifty,
+/obj/item/stack/rods/fifty,
+/turf/open/floor/plasteel,
+/area/engine/engineering)
"ckr" = (
/obj/structure/reagent_dispensers/fueltank,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -48831,9 +50758,9 @@
/area/maintenance/solars/starboard/aft)
"ckt" = (
/obj/machinery/power/apc{
+ areastring = "/area/maintenance/solars/starboard/aft";
dir = 8;
name = "Starboard Quarter Solar APC";
- areastring = "/area/maintenance/solars/starboard/aft";
pixel_x = -26;
pixel_y = 3
},
@@ -48907,6 +50834,14 @@
},
/turf/open/floor/plasteel,
/area/engine/engineering)
+"ckE" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/machinery/door/airlock/maintenance{
+ name = "Locker Room Maintenance";
+ req_access_txt = "12"
+ },
+/turf/open/floor/plating,
+/area/maintenance/port)
"ckF" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel,
@@ -48931,6 +50866,15 @@
},
/turf/open/floor/plasteel,
/area/engine/engineering)
+"ckJ" = (
+/obj/structure/rack,
+/obj/effect/spawner/lootdrop/maintenance{
+ lootcount = 2;
+ name = "2maintenance loot spawner"
+ },
+/obj/item/storage/toolbox/electrical,
+/turf/open/floor/plating,
+/area/maintenance/department/medical/morgue)
"ckK" = (
/obj/structure/tank_dispenser,
/obj/effect/turf_decal/bot{
@@ -48995,10 +50939,27 @@
},
/turf/open/floor/plasteel,
/area/crew_quarters/heads/chief)
+"ckP" = (
+/obj/structure/noticeboard{
+ pixel_y = -27
+ },
+/obj/structure/chair/sofa/right{
+ dir = 1
+ },
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
"ckQ" = (
/obj/structure/closet/cardboard,
/turf/open/floor/plasteel,
/area/quartermaster/warehouse)
+"ckR" = (
+/obj/structure/closet,
+/obj/effect/spawner/lootdrop/maintenance,
+/obj/item/coin/gold,
+/obj/item/coin/gold,
+/obj/item/coin/gold,
+/turf/open/floor/plating,
+/area/maintenance/starboard/aft)
"ckS" = (
/obj/structure/closet/cardboard,
/turf/open/floor/plating,
@@ -49072,9 +51033,7 @@
/turf/open/floor/plasteel,
/area/maintenance/disposal/incinerator)
"cle" = (
-/obj/machinery/atmospherics/pipe/simple/general/visible{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/simple/general/visible,
/turf/open/floor/plasteel,
/area/maintenance/disposal/incinerator)
"clf" = (
@@ -49188,13 +51147,10 @@
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
"cls" = (
-/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance{
- lootcount = 3;
- name = "3maintenance loot spawner"
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 5
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plating,
+/turf/closed/wall,
/area/maintenance/starboard/aft)
"clt" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -49328,6 +51284,12 @@
},
/turf/open/floor/plasteel/dark,
/area/engine/engine_smes)
+"clH" = (
+/obj/structure/disposalpipe/segment,
+/obj/structure/rack,
+/obj/effect/spawner/lootdrop/maintenance,
+/turf/open/floor/plating,
+/area/maintenance/starboard/aft)
"clI" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -49342,23 +51304,33 @@
/obj/effect/spawner/structure/window,
/turf/open/floor/plating,
/area/engine/engineering)
-"clM" = (
-/obj/structure/table,
-/obj/item/crowbar/large,
-/obj/item/storage/box/lights/mixed,
-/obj/item/clothing/glasses/meson,
-/obj/item/clothing/glasses/meson,
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
+"clK" = (
+/obj/structure/closet/crate,
+/obj/item/stack/sheet/metal/fifty,
+/obj/item/stack/rods/fifty,
+/obj/item/stack/sheet/glass/fifty,
+/obj/item/electronics/airlock,
+/obj/item/electronics/airlock,
+/obj/item/stock_parts/cell/high/plus,
+/obj/item/stack/sheet/mineral/plasma{
+ amount = 30
},
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 8
- },
-/turf/open/floor/plasteel,
+/obj/item/lightreplacer,
+/obj/item/lightreplacer,
+/turf/open/floor/plating,
/area/engine/engineering)
+"clL" = (
+/obj/structure/table,
+/obj/effect/spawner/lootdrop/maintenance,
+/obj/item/coin/silver,
+/turf/open/floor/plating,
+/area/maintenance/starboard/fore)
+"clM" = (
+/obj/structure/rack,
+/obj/effect/spawner/lootdrop/maintenance,
+/obj/item/coin/silver,
+/turf/open/floor/plating,
+/area/maintenance/starboard/fore)
"clN" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/effect/turf_decal/tile/yellow{
@@ -49367,13 +51339,21 @@
/turf/open/floor/plasteel,
/area/engine/engineering)
"clO" = (
-/obj/machinery/vr_sleeper,
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
- dir = 4
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/effect/landmark/start/janitor,
+/mob/living/simple_animal/hostile/lizard{
+ name = "Wags-His-Tail";
+ real_name = "Wags-His-Tail"
},
/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
+/area/janitor)
+"clP" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/structure/reagent_dispensers/fueltank,
+/turf/open/floor/plating,
+/area/maintenance/port)
"clQ" = (
/obj/effect/turf_decal/tile/yellow{
dir = 1
@@ -49381,21 +51361,9 @@
/turf/open/floor/plasteel,
/area/engine/engineering)
"clR" = (
-/obj/machinery/light{
- dir = 1
- },
-/obj/structure/table,
-/obj/item/book/manual/wiki/engineering_hacking{
- pixel_x = 3;
- pixel_y = 3
- },
-/obj/item/book/manual/wiki/engineering_construction,
-/obj/item/clothing/glasses/meson,
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
- },
-/turf/open/floor/plasteel,
-/area/engine/engineering)
+/obj/machinery/portable_atmospherics/pump,
+/turf/open/floor/plating,
+/area/maintenance/starboard/aft)
"clS" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/obj/machinery/rnd/production/techfab/department/security,
@@ -49406,28 +51374,30 @@
/turf/open/floor/plasteel,
/area/security/main)
"clT" = (
-/obj/machinery/portable_atmospherics/canister/nitrogen,
-/turf/open/floor/engine/n2,
-/area/engine/atmos)
+/obj/machinery/portable_atmospherics/scrubber,
+/turf/open/floor/plating,
+/area/maintenance/starboard/aft)
"clU" = (
/turf/open/floor/engine/n2,
/area/engine/atmos)
"clV" = (
-/obj/machinery/portable_atmospherics/canister/oxygen,
-/turf/open/floor/engine/o2,
-/area/engine/atmos)
+/obj/item/radio/intercom{
+ pixel_y = 25
+ },
+/turf/open/floor/plasteel,
+/area/hallway/primary/central)
"clW" = (
/turf/open/floor/engine/o2,
/area/engine/atmos)
"clX" = (
-/obj/effect/landmark/event_spawn,
-/obj/effect/landmark/xmastree,
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
+/obj/machinery/light{
dir = 1
},
+/obj/item/radio/intercom{
+ pixel_y = 25
+ },
/turf/open/floor/plasteel,
-/area/crew_quarters/bar)
+/area/hallway/primary/central)
"clY" = (
/obj/effect/landmark/xeno_spawn,
/turf/open/floor/engine/air,
@@ -49435,17 +51405,28 @@
"clZ" = (
/turf/open/floor/engine/air,
/area/engine/atmos)
+"cma" = (
+/obj/machinery/hydroponics/constructable,
+/obj/item/radio/intercom{
+ name = "Station Intercom (General)";
+ pixel_x = 29
+ },
+/turf/open/floor/plasteel/dark,
+/area/hydroponics)
"cmb" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/maintenance/disposal/incinerator)
"cmc" = (
-/obj/machinery/atmospherics/pipe/simple/general/visible{
- dir = 2
+/obj/machinery/camera{
+ c_tag = "Starboard Primary Hallway"
},
-/turf/closed/wall/r_wall,
-/area/maintenance/disposal/incinerator)
+/obj/item/radio/intercom{
+ pixel_y = 25
+ },
+/turf/open/floor/plasteel,
+/area/hallway/primary/starboard)
"cmd" = (
/turf/closed/wall/r_wall,
/area/maintenance/disposal/incinerator)
@@ -49509,15 +51490,27 @@
},
/turf/open/floor/plasteel/showroomfloor,
/area/security/warden)
+"cmm" = (
+/obj/structure/table,
+/obj/item/reagent_containers/food/condiment/flour,
+/obj/item/kitchen/rollingpin,
+/turf/open/floor/plasteel/cafeteria,
+/area/crew_quarters/kitchen)
"cmn" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
-/area/maintenance/starboard/aft)
+/obj/structure/table/wood,
+/obj/item/storage/pill_bottle/dice,
+/turf/open/floor/plasteel,
+/area/security/prison)
"cmo" = (
/obj/structure/rack,
/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
+"cmp" = (
+/obj/structure/table/wood,
+/obj/item/toy/cards/deck,
+/turf/open/floor/plasteel,
+/area/security/prison)
"cmq" = (
/obj/effect/landmark/xeno_spawn,
/obj/structure/disposalpipe/segment,
@@ -49526,21 +51519,18 @@
},
/area/maintenance/starboard/aft)
"cmr" = (
-/obj/structure/closet/toolcloset,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 5
+/obj/structure/chair/comfy/brown{
+ dir = 8
},
-/turf/open/floor/plating,
-/area/maintenance/starboard/aft)
+/turf/open/floor/plasteel,
+/area/security/prison)
"cms" = (
-/obj/machinery/door/airlock/maintenance{
- req_access_txt = "12"
+/obj/structure/chair/comfy/brown{
+ color = "#66b266";
+ dir = 1
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
- },
-/turf/open/floor/plating,
-/area/maintenance/starboard/aft)
+/turf/open/floor/plasteel,
+/area/security/prison)
"cmt" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -49567,8 +51557,7 @@
/obj/machinery/power/solar_control{
dir = 1;
id = "starboardsolar";
- name = "Starboard Quarter Solar Control";
- track = 0
+ name = "Starboard Quarter Solar Control"
},
/obj/structure/cable{
icon_state = "0-4"
@@ -49648,6 +51637,13 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/engine/engineering)
+"cmE" = (
+/obj/structure/chair/comfy/brown{
+ color = "#596479";
+ dir = 1
+ },
+/turf/open/floor/plasteel,
+/area/security/prison)
"cmF" = (
/obj/effect/turf_decal/tile/yellow{
dir = 1
@@ -49676,6 +51672,34 @@
},
/turf/open/floor/plasteel,
/area/engine/engineering)
+"cmH" = (
+/obj/item/electropack/shockcollar,
+/obj/item/assembly/signaler,
+/turf/open/floor/plating,
+/area/security/prison)
+"cmI" = (
+/obj/structure/bed,
+/obj/effect/spawner/lootdrop/bedsheet,
+/turf/open/floor/plating,
+/area/security/prison)
+"cmJ" = (
+/obj/machinery/door/airlock/external{
+ name = "External Access";
+ req_access_txt = "13"
+ },
+/obj/effect/mapping_helpers/airlock/cyclelink_helper,
+/turf/open/floor/plating,
+/area/maintenance/starboard/aft)
+"cmK" = (
+/obj/machinery/door/airlock/external{
+ name = "External Access";
+ req_access_txt = "13"
+ },
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 1
+ },
+/turf/open/floor/plating,
+/area/maintenance/starboard/aft)
"cmL" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -49725,9 +51749,7 @@
/turf/open/floor/plasteel,
/area/construction)
"cmY" = (
-/obj/machinery/atmospherics/components/binary/pump/on{
- dir = 2
- },
+/obj/machinery/atmospherics/components/binary/pump/on,
/obj/machinery/light/small{
dir = 8
},
@@ -49877,9 +51899,6 @@
/area/engine/engine_smes)
"cnr" = (
/obj/machinery/door/window/southleft{
- base_state = "left";
- dir = 2;
- icon_state = "left";
name = "Engineering Delivery";
req_access_txt = "10"
},
@@ -49971,7 +51990,6 @@
/area/maintenance/aft)
"cnF" = (
/obj/machinery/atmospherics/components/binary/pump/on{
- dir = 2;
name = "Waste Out"
},
/obj/structure/disposalpipe/segment{
@@ -49996,11 +52014,6 @@
},
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
-"cnJ" = (
-/obj/structure/disposalpipe/segment,
-/obj/effect/spawner/lootdrop/maintenance,
-/turf/open/floor/plating,
-/area/maintenance/starboard/aft)
"cnK" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -50390,39 +52403,18 @@
pixel_x = 3;
pixel_y = -3
},
-/obj/effect/turf_decal/bot{
- dir = 2
- },
+/obj/effect/turf_decal/bot,
/obj/structure/window/reinforced{
dir = 1;
layer = 2.9
},
-/turf/open/floor/plasteel{
- dir = 2
- },
+/turf/open/floor/plasteel,
/area/ai_monitored/security/armory)
"coT" = (
/obj/machinery/atmospherics/pipe/simple/general/visible,
/obj/machinery/meter,
/turf/open/floor/engine,
/area/science/misc_lab)
-"coZ" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 10
- },
-/obj/structure/closet/secure_closet/engineering_electrical,
-/turf/open/floor/plasteel,
-/area/engine/engineering)
-"cpa" = (
-/obj/machinery/light{
- dir = 4
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 5
- },
-/obj/structure/closet/secure_closet/engineering_welding,
-/turf/open/floor/plasteel,
-/area/engine/engineering)
"cpb" = (
/obj/structure/closet/emcloset,
/obj/machinery/light/small{
@@ -50484,9 +52476,7 @@
/turf/open/floor/plasteel,
/area/engine/engine_smes)
"cpk" = (
-/obj/effect/turf_decal/stripes/corner{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/corner,
/turf/open/floor/plasteel,
/area/engine/engine_smes)
"cpl" = (
@@ -50542,13 +52532,6 @@
},
/turf/open/floor/plasteel,
/area/engine/engineering)
-"cps" = (
-/obj/structure/table,
-/obj/item/stack/sheet/glass/fifty,
-/obj/item/stack/sheet/glass/fifty,
-/obj/item/stack/sheet/glass/fifty,
-/turf/open/floor/plasteel,
-/area/engine/engineering)
"cpt" = (
/obj/structure/table,
/obj/item/clothing/gloves/color/yellow,
@@ -50648,7 +52631,6 @@
"cpO" = (
/obj/structure/lattice,
/obj/machinery/atmospherics/components/binary/pump/on{
- dir = 2;
name = "Incinerator Output Pump"
},
/turf/open/space,
@@ -50672,9 +52654,8 @@
"cpS" = (
/obj/structure/cable,
/obj/machinery/power/apc{
- dir = 2;
- name = "SMES room APC";
areastring = "/area/engine/engine_smes";
+ name = "SMES room APC";
pixel_y = -24
},
/obj/effect/turf_decal/stripes/line{
@@ -50705,25 +52686,12 @@
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
/area/engine/engine_smes)
-"cpV" = (
-/obj/machinery/camera{
- c_tag = "Engineering Storage";
- dir = 4
- },
-/obj/machinery/rnd/production/protolathe/department/engineering,
-/turf/open/floor/plasteel,
-/area/engine/engineering)
"cpW" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 1
},
/turf/open/floor/plasteel,
/area/engine/engineering)
-"cpX" = (
-/obj/structure/table,
-/obj/item/stack/rods/fifty,
-/turf/open/floor/plasteel,
-/area/engine/engineering)
"cpY" = (
/obj/structure/cable{
icon_state = "2-8"
@@ -50905,13 +52873,6 @@
/obj/machinery/door/poddoor/incinerator_atmos_main,
/turf/open/floor/engine/vacuum,
/area/maintenance/disposal/incinerator)
-"cqu" = (
-/obj/machinery/door/airlock/external{
- name = "External Access";
- req_access_txt = "13"
- },
-/turf/open/floor/plating,
-/area/maintenance/starboard/aft)
"cqv" = (
/obj/effect/decal/cleanable/cobweb/cobweb2,
/turf/open/floor/plating,
@@ -51025,11 +52986,6 @@
},
/turf/open/floor/plasteel/dark,
/area/ai_monitored/security/armory)
-"cqJ" = (
-/obj/structure/cable,
-/obj/structure/lattice/catwalk,
-/turf/open/space,
-/area/solar/starboard/aft)
"cqK" = (
/obj/structure/table,
/obj/effect/spawner/lootdrop/maintenance{
@@ -51044,12 +53000,6 @@
},
/turf/open/floor/plating,
/area/maintenance/port/aft)
-"cqM" = (
-/obj/structure/cable{
- icon_state = "2-4"
- },
-/turf/open/floor/plating,
-/area/maintenance/starboard/fore)
"cqN" = (
/obj/structure/table,
/obj/item/stack/sheet/metal/fifty,
@@ -51079,10 +53029,6 @@
},
/turf/open/floor/plasteel,
/area/engine/engineering)
-"cqQ" = (
-/obj/structure/reagent_dispensers/watertank,
-/turf/open/floor/plasteel,
-/area/engine/engineering)
"cqR" = (
/obj/structure/reagent_dispensers/fueltank,
/turf/open/floor/plasteel,
@@ -51131,7 +53077,6 @@
/area/engine/supermatter)
"crb" = (
/obj/machinery/atmospherics/components/binary/pump{
- dir = 2;
name = "Gas to Chamber"
},
/obj/effect/decal/cleanable/dirt,
@@ -51158,12 +53103,6 @@
},
/turf/open/floor/plating,
/area/engine/engineering)
-"cri" = (
-/obj/structure/disposalpipe/segment{
- dir = 5
- },
-/turf/open/floor/plating,
-/area/maintenance/starboard/aft)
"crk" = (
/obj/structure/lattice/catwalk,
/turf/open/space,
@@ -51252,9 +53191,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/effect/turf_decal/stripes/corner{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/corner,
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"crz" = (
@@ -51545,14 +53482,6 @@
/obj/machinery/atmospherics/pipe/heat_exchanging/simple,
/turf/open/space,
/area/space/nearstation)
-"csy" = (
-/obj/structure/table,
-/obj/item/weldingtool,
-/obj/structure/disposalpipe/segment{
- dir = 10
- },
-/turf/open/floor/plating,
-/area/maintenance/starboard/aft)
"csA" = (
/obj/machinery/door/poddoor/shutters/preopen{
id = "engsm";
@@ -51570,13 +53499,6 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/ai_monitored/turret_protected/aisat_interior)
-"csE" = (
-/obj/structure/cable{
- icon_state = "0-2"
- },
-/obj/structure/lattice/catwalk,
-/turf/open/space,
-/area/solar/starboard/aft)
"csH" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -51662,27 +53584,6 @@
},
/turf/open/floor/plating,
/area/ai_monitored/turret_protected/aisat_interior)
-"csY" = (
-/obj/structure/cable{
- icon_state = "0-2"
- },
-/obj/structure/cable{
- icon_state = "0-4"
- },
-/obj/structure/cable{
- icon_state = "0-8"
- },
-/obj/structure/cable,
-/obj/structure/lattice/catwalk,
-/turf/open/space,
-/area/solar/starboard/aft)
-"csZ" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/structure/lattice/catwalk,
-/turf/open/space,
-/area/solar/starboard/aft)
"cta" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
@@ -52034,9 +53935,9 @@
icon_state = "0-8"
},
/obj/machinery/power/apc{
+ areastring = "/area/ai_monitored/turret_protected/aisat_interior";
dir = 4;
name = "MiniSat Foyer APC";
- areastring = "/area/ai_monitored/turret_protected/aisat_interior";
pixel_x = 27
},
/obj/structure/chair,
@@ -52101,8 +54002,6 @@
"cud" = (
/obj/machinery/turretid{
control_area = "/area/ai_monitored/turret_protected/aisat_interior";
- enabled = 1;
- icon_state = "control_standby";
name = "Antechamber Turret Control";
pixel_y = -24;
req_access = null;
@@ -52181,7 +54080,6 @@
/area/ai_monitored/turret_protected/aisat/service)
"cun" = (
/obj/machinery/atmospherics/components/binary/pump{
- dir = 2;
name = "Mix to MiniSat"
},
/obj/effect/turf_decal/stripes/line,
@@ -52193,9 +54091,7 @@
dir = 8;
pixel_x = -24
},
-/obj/effect/turf_decal/stripes/corner{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/corner,
/turf/open/floor/plating,
/area/ai_monitored/turret_protected/aisat/atmos)
"cup" = (
@@ -52347,8 +54243,6 @@
},
/obj/machinery/turretid{
control_area = "/area/ai_monitored/turret_protected/aisat/atmos";
- enabled = 1;
- icon_state = "control_standby";
name = "Atmospherics Turret Control";
pixel_x = -27;
req_access = null;
@@ -52374,8 +54268,6 @@
},
/obj/machinery/turretid{
control_area = "/area/ai_monitored/turret_protected/aisat/service";
- enabled = 1;
- icon_state = "control_standby";
name = "Service Bay Turret Control";
pixel_x = 27;
req_access = null;
@@ -52464,9 +54356,9 @@
/area/ai_monitored/turret_protected/aisat/atmos)
"cuM" = (
/obj/machinery/power/apc{
+ areastring = "/area/ai_monitored/turret_protected/aisat/atmos";
dir = 8;
name = "MiniSat Atmospherics APC";
- areastring = "/area/ai_monitored/turret_protected/aisat/atmos";
pixel_x = -27
},
/obj/structure/cable{
@@ -52590,9 +54482,9 @@
/area/ai_monitored/turret_protected/aisat/service)
"cuX" = (
/obj/machinery/power/apc{
+ areastring = "/area/ai_monitored/turret_protected/aisat/service";
dir = 4;
name = "MiniSat Service Bay APC";
- areastring = "/area/ai_monitored/turret_protected/aisat/service";
pixel_x = 27
},
/obj/structure/cable{
@@ -52677,8 +54569,6 @@
},
/obj/machinery/turretid{
control_area = "/area/ai_monitored/turret_protected/aisat/hallway";
- enabled = 1;
- icon_state = "control_standby";
name = "Chamber Hallway Turret Control";
pixel_x = 32;
pixel_y = -24;
@@ -52796,23 +54686,18 @@
"cvx" = (
/obj/effect/landmark/start/ai/secondary,
/obj/item/radio/intercom{
- anyai = 1;
freerange = 1;
listening = 0;
name = "Custom Channel";
pixel_y = 28
},
/obj/item/radio/intercom{
- broadcasting = 0;
freerange = 1;
- listening = 1;
name = "Common Channel";
pixel_x = -27;
pixel_y = 5
},
/obj/item/radio/intercom{
- anyai = 1;
- broadcasting = 0;
freerange = 1;
frequency = 1447;
name = "Private Channel";
@@ -52835,23 +54720,18 @@
"cvA" = (
/obj/effect/landmark/start/ai/secondary,
/obj/item/radio/intercom{
- anyai = 1;
freerange = 1;
listening = 0;
name = "Custom Channel";
pixel_y = 28
},
/obj/item/radio/intercom{
- broadcasting = 0;
freerange = 1;
- listening = 1;
name = "Common Channel";
pixel_x = 27;
pixel_y = 5
},
/obj/item/radio/intercom{
- anyai = 1;
- broadcasting = 0;
freerange = 1;
frequency = 1447;
name = "Private Channel";
@@ -53047,9 +54927,9 @@
"cwa" = (
/obj/structure/cable,
/obj/machinery/power/apc{
+ areastring = "/area/ai_monitored/turret_protected/aisat/hallway";
dir = 4;
name = "MiniSat Chamber Hallway APC";
- areastring = "/area/ai_monitored/turret_protected/aisat/hallway";
pixel_x = 27
},
/turf/open/floor/circuit,
@@ -53246,13 +55126,6 @@
},
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/ai)
-"cwy" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/table_frame,
-/obj/item/wirerod,
-/obj/effect/spawner/lootdrop/maintenance,
-/turf/open/floor/plating,
-/area/maintenance/starboard/aft)
"cwz" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 5
@@ -53312,9 +55185,8 @@
icon_state = "0-8"
},
/obj/machinery/power/apc/highcap/five_k{
- dir = 2;
- name = "AI Chamber APC";
areastring = "/area/ai_monitored/turret_protected/ai";
+ name = "AI Chamber APC";
pixel_y = -24
},
/obj/machinery/flasher{
@@ -53454,14 +55326,6 @@
},
/turf/open/floor/plating,
/area/security/processing)
-"cxW" = (
-/obj/effect/mapping_helpers/airlock/cyclelink_helper,
-/obj/machinery/door/airlock/external{
- name = "External Access";
- req_access_txt = "13"
- },
-/turf/open/floor/plating,
-/area/maintenance/starboard/fore)
"cxY" = (
/obj/machinery/camera{
c_tag = "Arrivals Escape Pod 1";
@@ -53740,15 +55604,6 @@
/obj/effect/landmark/event_spawn,
/turf/open/floor/plasteel,
/area/hallway/secondary/exit)
-"czP" = (
-/obj/structure/chair/stool/bar,
-/obj/effect/landmark/event_spawn,
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
- dir = 1
- },
-/turf/open/floor/plasteel,
-/area/crew_quarters/bar)
"czQ" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/disposalpipe/segment,
@@ -53995,15 +55850,6 @@
/obj/structure/closet/secure_closet/freezer/kitchen/maintenance,
/turf/open/floor/plating,
/area/maintenance/port/aft)
-"cAz" = (
-/obj/structure/disposalpipe/segment{
- dir = 5
- },
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- dir = 8
- },
-/turf/open/floor/plasteel/dark,
-/area/chapel/office)
"cAA" = (
/obj/machinery/light/small{
dir = 1
@@ -54049,9 +55895,8 @@
icon_state = "4-8"
},
/obj/machinery/power/apc{
- dir = 2;
- name = "Head of Personnel APC";
areastring = "/area/crew_quarters/heads/hop";
+ name = "Head of Personnel APC";
pixel_y = -24
},
/obj/structure/cable{
@@ -54079,14 +55924,6 @@
/obj/machinery/light/small,
/turf/open/floor/plating,
/area/maintenance/port/aft)
-"cAL" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/mob/living/simple_animal/hostile/lizard{
- name = "Wags-His-Tail";
- real_name = "Wags-His-Tail"
- },
-/turf/open/floor/plasteel,
-/area/janitor)
"cAN" = (
/obj/machinery/door/airlock/maintenance{
name = "Security Maintenance";
@@ -54125,23 +55962,18 @@
"cAS" = (
/obj/effect/landmark/start/ai,
/obj/item/radio/intercom{
- broadcasting = 0;
freerange = 1;
- listening = 1;
name = "Common Channel";
pixel_x = -27;
pixel_y = -9
},
/obj/item/radio/intercom{
- anyai = 1;
freerange = 1;
listening = 0;
name = "Custom Channel";
pixel_y = -31
},
/obj/item/radio/intercom{
- anyai = 1;
- broadcasting = 0;
freerange = 1;
frequency = 1447;
name = "Private Channel";
@@ -54236,7 +56068,6 @@
"cBb" = (
/obj/machinery/camera/motion{
c_tag = "MiniSat AI Chamber South";
- dir = 2;
network = list("aicore")
},
/turf/open/floor/circuit,
@@ -54268,7 +56099,6 @@
"cBf" = (
/obj/machinery/camera{
c_tag = "MiniSat External South";
- dir = 2;
network = list("minisat");
start_active = 1
},
@@ -54318,14 +56148,6 @@
/obj/effect/landmark/event_spawn,
/turf/open/floor/plasteel,
/area/hallway/primary/starboard)
-"cBn" = (
-/obj/machinery/camera{
- c_tag = "Locker Room Toilets";
- dir = 8
- },
-/obj/effect/landmark/event_spawn,
-/turf/open/floor/plasteel/freezer,
-/area/crew_quarters/toilet/locker)
"cBo" = (
/obj/effect/landmark/event_spawn,
/turf/open/floor/wood,
@@ -54401,7 +56223,6 @@
/area/science/xenobiology)
"cBA" = (
/obj/machinery/button/massdriver{
- dir = 2;
id = "toxinsdriver";
pixel_y = 24
},
@@ -54540,18 +56361,6 @@
/obj/effect/landmark/event_spawn,
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/aisat/hallway)
-"cBT" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/light/small{
- dir = 4
- },
-/turf/open/floor/plating,
-/area/maintenance/starboard/aft)
-"cBU" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/closet/emcloset,
-/turf/open/floor/plating,
-/area/maintenance/starboard/aft)
"cBV" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/security{
@@ -54626,31 +56435,6 @@
},
/turf/closed/wall,
/area/security/detectives_office)
-"cCl" = (
-/obj/structure/cable{
- icon_state = "2-8"
- },
-/turf/open/floor/plating,
-/area/maintenance/port)
-"cCm" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/turf/open/floor/plating,
-/area/maintenance/port)
-"cCn" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/obj/machinery/power/apc{
- dir = 4;
- name = "Detective's Office APC";
- areastring = "/area/security/detectives_office";
- pixel_x = 24
- },
-/obj/structure/cable,
-/turf/open/floor/plating,
-/area/maintenance/port)
"cCo" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -55187,7 +56971,6 @@
"cEu" = (
/obj/machinery/camera{
c_tag = "Supermatter Chamber";
- dir = 2;
network = list("engine");
pixel_x = 23
},
@@ -55382,7 +57165,6 @@
icon_state = "1-4"
},
/obj/machinery/atmospherics/components/binary/pump{
- dir = 2;
name = "Cooling Loop Bypass"
},
/turf/open/floor/engine,
@@ -55547,7 +57329,6 @@
},
/obj/machinery/camera{
c_tag = "Engineering Supermatter Aft";
- dir = 2;
network = list("ss13","engine");
pixel_x = 23
},
@@ -55599,13 +57380,6 @@
},
/turf/open/floor/plasteel/dark,
/area/engine/engineering)
-"cGd" = (
-/obj/structure/closet/crate/bin,
-/obj/effect/turf_decal/stripes/line{
- dir = 10
- },
-/turf/open/floor/engine,
-/area/engine/engineering)
"cGe" = (
/obj/structure/cable{
icon_state = "2-8"
@@ -55654,10 +57428,6 @@
/obj/machinery/light,
/turf/open/floor/plasteel/dark,
/area/engine/engineering)
-"cGl" = (
-/obj/structure/closet/secure_closet/engineering_personal,
-/turf/open/floor/plasteel/dark,
-/area/engine/engineering)
"cGr" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 5
@@ -55913,7 +57683,6 @@
/area/science/robotics/mechbay)
"cHF" = (
/obj/machinery/button/door{
- dir = 2;
id = "Skynet_launch";
name = "Mech Bay Door Control";
pixel_x = 6;
@@ -56262,9 +58031,9 @@
/area/quartermaster/sorting)
"cNL" = (
/obj/machinery/power/apc{
+ areastring = "/area/maintenance/central";
dir = 1;
name = "Central Maintenance APC";
- areastring = "/area/maintenance/central";
pixel_y = 24
},
/obj/structure/cable{
@@ -56299,9 +58068,9 @@
/area/maintenance/starboard)
"cNS" = (
/obj/machinery/power/apc{
+ areastring = "/area/maintenance/starboard";
dir = 4;
name = "Starboard Maintenance APC";
- areastring = "/area/maintenance/starboard";
pixel_x = 26
},
/obj/structure/cable{
@@ -56430,12 +58199,6 @@
},
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
-"cSz" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/turf/closed/wall,
-/area/chapel/main)
"cSA" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -56528,7 +58291,6 @@
"cSM" = (
/obj/machinery/computer/station_alert,
/obj/item/radio/intercom{
- broadcasting = 0;
name = "Station Intercom (General)";
pixel_y = 20
},
@@ -56727,7 +58489,6 @@
icon_state = "4-8"
},
/obj/machinery/requests_console{
- announcementConsole = 0;
department = "Engineering";
departmentType = 4;
name = "Engineering RC";
@@ -56746,9 +58507,9 @@
icon_state = "1-2"
},
/obj/machinery/power/apc{
+ areastring = "/area/maintenance/central/secondary";
dir = 8;
name = "Central Maintenance APC";
- areastring = "/area/maintenance/central/secondary";
pixel_x = -24
},
/obj/structure/cable{
@@ -56772,12 +58533,6 @@
},
/turf/open/floor/plating,
/area/maintenance/port/aft)
-"cTI" = (
-/obj/machinery/door/airlock/maintenance/abandoned{
- req_access_txt = "12"
- },
-/turf/open/floor/plating,
-/area/maintenance/starboard/aft)
"cTJ" = (
/obj/machinery/door/airlock/maintenance{
req_access_txt = "12"
@@ -56808,9 +58563,9 @@
/area/medical/morgue)
"cTM" = (
/obj/machinery/power/apc{
+ areastring = "/area/maintenance/department/medical/morgue";
dir = 4;
name = "Morgue Maintenance APC";
- areastring = "/area/maintenance/department/medical/morgue";
pixel_x = 26
},
/obj/structure/cable{
@@ -57015,13 +58770,6 @@
icon_state = "wood-broken4"
},
/area/maintenance/bar)
-"fGf" = (
-/obj/machinery/smartfridge/disks{
- pixel_y = 2
- },
-/obj/structure/table,
-/turf/open/floor/plasteel,
-/area/hydroponics)
"fKl" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/effect/landmark/event_spawn,
@@ -57032,17 +58780,10 @@
dir = 4
},
/obj/machinery/firealarm{
- dir = 2;
pixel_y = 24
},
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
-"gbq" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/open/floor/plating,
-/area/construction)
"gbT" = (
/obj/structure/table,
/obj/item/stack/sheet/metal/fifty,
@@ -57058,18 +58799,6 @@
"gjl" = (
/turf/closed/wall,
/area/quartermaster/warehouse)
-"gsz" = (
-/obj/machinery/camera{
- c_tag = "Fitness Room South";
- dir = 1
- },
-/obj/machinery/vr_sleeper,
-/obj/effect/turf_decal/tile/green,
-/obj/effect/turf_decal/tile/green{
- dir = 4
- },
-/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
"gwd" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -57098,12 +58827,6 @@
},
/turf/open/floor/wood,
/area/maintenance/bar)
-"gOZ" = (
-/obj/machinery/door/airlock/maintenance{
- req_access_txt = "12"
- },
-/turf/open/floor/plating,
-/area/crew_quarters/fitness)
"gWd" = (
/obj/structure/cable{
icon_state = "1-4"
@@ -57128,9 +58851,9 @@
icon_state = "1-2"
},
/obj/machinery/power/apc{
+ areastring = "/area/quartermaster/warehouse";
dir = 4;
name = "Cargo Warehouse APC";
- areastring = "/area/quartermaster/warehouse";
pixel_x = 26
},
/obj/structure/cable{
@@ -57138,10 +58861,6 @@
},
/turf/open/floor/plating,
/area/maintenance/port)
-"hwu" = (
-/obj/machinery/vr_sleeper,
-/turf/open/floor/plasteel,
-/area/security/prison)
"hEm" = (
/obj/item/twohanded/required/kirbyplants{
icon_state = "plant-22"
@@ -57159,13 +58878,6 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel/white,
/area/science/circuit)
-"ihn" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/machinery/vr_sleeper,
-/turf/open/floor/plasteel,
-/area/security/prison)
"iiW" = (
/turf/open/floor/wood,
/area/maintenance/bar)
@@ -57255,12 +58967,6 @@
/obj/machinery/rnd/production/techfab/department/cargo,
/turf/open/floor/plasteel,
/area/quartermaster/office)
-"jnR" = (
-/obj/machinery/atmospherics/components/binary/valve{
- dir = 4
- },
-/turf/open/floor/plating,
-/area/maintenance/starboard/fore)
"jqv" = (
/obj/structure/chair/wood/normal{
dir = 1
@@ -57311,15 +59017,6 @@
},
/turf/open/floor/wood,
/area/maintenance/port/aft)
-"jMY" = (
-/obj/structure/table,
-/obj/item/stack/cable_coil{
- pixel_x = 3;
- pixel_y = -7
- },
-/obj/item/stack/cable_coil,
-/turf/open/floor/plasteel/dark,
-/area/engine/engineering)
"jSO" = (
/obj/machinery/light{
dir = 4
@@ -57338,14 +59035,6 @@
},
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
-"khb" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 10
- },
-/obj/structure/table,
-/obj/item/kitchen/rollingpin,
-/turf/open/floor/plasteel,
-/area/hallway/secondary/service)
"khB" = (
/obj/machinery/door/airlock/external{
req_access_txt = "13"
@@ -57390,14 +59079,6 @@
},
/turf/open/floor/plasteel,
/area/hallway/secondary/service)
-"kQk" = (
-/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance{
- lootcount = 2;
- name = "2maintenance loot spawner"
- },
-/turf/open/floor/plating,
-/area/maintenance/department/medical/morgue)
"kQq" = (
/obj/effect/turf_decal/stripes/line,
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
@@ -57437,14 +59118,6 @@
/obj/effect/spawner/structure/window,
/turf/open/floor/plating,
/area/science/circuit)
-"mjr" = (
-/obj/machinery/vending/wardrobe/bar_wardrobe,
-/turf/open/floor/wood,
-/area/crew_quarters/bar)
-"moD" = (
-/obj/effect/landmark/barthpot,
-/turf/open/floor/wood,
-/area/library)
"mpI" = (
/obj/structure/table/wood,
/turf/open/floor/wood{
@@ -57500,8 +59173,8 @@
/area/engine/engineering)
"nxv" = (
/obj/machinery/power/apc{
- name = "Construction Area APC";
areastring = "/area/construction";
+ name = "Construction Area APC";
pixel_y = -24
},
/obj/structure/cable{
@@ -57560,7 +59233,6 @@
/area/science/circuit)
"oKh" = (
/obj/structure/chair/wood/normal{
- icon_state = "wooden_chair";
dir = 8
},
/turf/open/floor/wood,
@@ -57601,9 +59273,7 @@
pixel_y = -3
},
/obj/item/radio/intercom{
- freerange = 0;
frequency = 1485;
- listening = 1;
name = "Station Intercom (Medbay)";
pixel_x = 30
},
@@ -57672,12 +59342,6 @@
/obj/item/reagent_containers/food/drinks/beer,
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
-"rsp" = (
-/obj/machinery/atmospherics/components/unary/tank/air{
- dir = 4
- },
-/turf/open/floor/plating,
-/area/maintenance/starboard/fore)
"rBq" = (
/obj/item/clothing/head/kitty,
/obj/item/clothing/under/maid,
@@ -57736,12 +59400,6 @@
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/turf/open/floor/plating,
/area/maintenance/department/medical/morgue)
-"sxs" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/structure/table,
-/obj/item/shovel/spade,
-/turf/open/floor/plasteel,
-/area/hallway/secondary/service)
"sAM" = (
/turf/open/floor/wood{
icon_state = "wood-broken6"
@@ -57821,7 +59479,6 @@
dir = 4
},
/obj/machinery/firealarm{
- dir = 2;
pixel_y = 24
},
/turf/open/floor/carpet,
@@ -57836,10 +59493,6 @@
/obj/item/restraints/handcuffs/fake,
/turf/open/floor/plating,
/area/maintenance/bar)
-"tyO" = (
-/obj/item/clothing/under/color/grey,
-/turf/open/floor/plating,
-/area/maintenance/bar)
"tMl" = (
/obj/effect/turf_decal/loading_area,
/turf/open/floor/plasteel/showroomfloor,
@@ -57889,16 +59542,6 @@
/obj/item/flashlight,
/turf/open/floor/plasteel/dark,
/area/engine/engineering)
-"uhH" = (
-/obj/item/wrench,
-/obj/item/weldingtool,
-/obj/item/clothing/head/welding{
- pixel_x = -3;
- pixel_y = 5
- },
-/obj/structure/rack,
-/turf/open/floor/plasteel/dark,
-/area/engine/engineering)
"ujF" = (
/obj/machinery/cryopod{
dir = 4
@@ -57952,9 +59595,7 @@
/turf/open/floor/plasteel,
/area/science/circuit)
"uPT" = (
-/obj/machinery/atmospherics/pipe/simple/general/visible{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/simple/general/visible,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
@@ -58005,13 +59646,6 @@
},
/turf/open/floor/wood,
/area/maintenance/bar)
-"vpY" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 10
- },
-/obj/machinery/meter,
-/turf/open/floor/plating,
-/area/maintenance/starboard/fore)
"vsM" = (
/obj/machinery/power/apc/auto_name/south,
/obj/structure/cable,
@@ -58123,11 +59757,6 @@
},
/turf/closed/wall/r_wall,
/area/maintenance/disposal/incinerator)
-"wUY" = (
-/obj/structure/table,
-/obj/item/reagent_containers/glass/bucket,
-/turf/open/floor/plasteel,
-/area/hallway/secondary/service)
"xgF" = (
/obj/structure/chair/stool/bar,
/turf/open/floor/wood{
@@ -64211,6 +65840,11 @@ aaa
aaa
aaa
aaa
+cdh
+aaa
+aaa
+aaa
+cdh
aaa
aaa
aaa
@@ -64223,12 +65857,7 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+aVw
aaa
aaa
aaa
@@ -64462,23 +66091,23 @@ aaa
aaa
aaa
aaa
+cdh
+aaa
+cdh
aaa
aaa
aaa
+gXs
aaa
aaa
aaa
+gXs
aaa
aaa
aaa
+cdh
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+cdh
aaa
aaa
aaa
@@ -64719,23 +66348,23 @@ aaa
aaa
aaa
aaa
+gXs
+aaa
+gXs
aaa
aaa
+gXs
+apv
+gXs
+gXs
+gXs
+apv
+gXs
aaa
aaa
+gXs
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+gXs
aaa
aaa
aaa
@@ -64975,25 +66604,25 @@ aaa
aaa
aaa
aaa
+apv
+apv
+gXs
+aag
+apv
+gXs
+gXs
aaa
aaa
aaa
aaa
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aae
-aaa
+gXs
+gXs
+apv
+apv
+aQd
+aag
+apv
aaa
aaa
aaa
@@ -65232,25 +66861,25 @@ aaa
aaa
aaa
aaa
+aGk
+aQe
+aaa
+aQe
+aRx
+gXs
+aoV
aaa
aaa
aaa
aaa
aaa
aaa
+gXs
+aGk
+aQe
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+aQe
+aRx
aaa
aaa
aaa
@@ -65489,10 +67118,11 @@ aaa
aaa
aaa
aaa
-aaa
+aab
aaa
cpe
aaa
+asL
aaa
aaa
aaa
@@ -65502,12 +67132,11 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
+aab
aaa
cwV
aaa
-aaa
+asL
aaa
aaa
aaa
@@ -65745,14 +67374,12 @@ aaa
aaa
aaa
aae
-aaf
+alN
+gXs
aaa
aaa
aaa
-aaa
-aaa
-aaa
-aae
+gXs
aaa
aaa
aaa
@@ -65762,9 +67389,11 @@ aaa
aaa
aaa
aaa
+gXs
aaa
aaa
aaa
+gXs
aaa
aaa
aaa
@@ -66002,14 +67631,12 @@ aaa
aaa
aaa
aaa
-aaf
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+alN
+gXs
+aaa
+aaa
+aaa
+gXs
aaa
aaa
aaa
@@ -66019,9 +67646,11 @@ aaa
aaa
aaa
aaa
+gXs
aaa
aaa
aaa
+gXs
aaa
aaa
aaa
@@ -66259,14 +67888,12 @@ aaa
aaa
aaa
aaa
-aaf
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+alN
+gXs
+aaa
+aaa
+aaa
+gXs
aaa
aaa
aaa
@@ -66276,9 +67903,11 @@ aaa
aaa
aaa
aaa
+gXs
aaa
aaa
aaa
+gXs
aaa
aaa
aaa
@@ -66516,11 +68145,12 @@ aaa
aaa
aaa
aaa
-aaf
-aaa
+alN
+gXs
aaa
cqq
aaa
+gXs
aaa
aaa
aaa
@@ -66530,12 +68160,11 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
+gXs
aaa
cqq
aaa
-aaa
+gXs
aaa
aaa
aaa
@@ -66773,7 +68402,7 @@ aaf
aaf
aaf
aaa
-aaf
+alN
arB
asE
cyb
@@ -68846,7 +70475,7 @@ aaa
awW
aOh
ayl
-ayl
+bRf
aRY
awW
aaa
@@ -68858,7 +70487,7 @@ awW
awZ
ayl
ayl
-bgi
+aQR
awW
aaa
aaa
@@ -71423,7 +73052,7 @@ aUO
aUy
aWm
aWf
-aUQ
+bcW
czK
bhN
bcl
@@ -71706,7 +73335,7 @@ aaa
aaa
aaa
aaa
-aae
+aaa
aaa
aaa
aaa
@@ -71962,7 +73591,7 @@ aaa
aaa
aaa
aaa
-aaa
+aae
aaa
aaa
aaa
@@ -72190,7 +73819,7 @@ aPa
aQn
ayl
czK
-aUP
+aUO
aUO
aXL
aXZ
@@ -72441,7 +74070,7 @@ aHy
ayl
aKk
aLA
-aNf
+aHD
aNf
aLA
aQD
@@ -74467,8 +76096,8 @@ ady
ady
ady
ady
-ady
ajq
+aTp
ajW
akB
alh
@@ -74493,7 +76122,7 @@ aBG
aAQ
aAQ
aAQ
-aBM
+aAQ
aAQ
aKn
aLE
@@ -74509,11 +76138,11 @@ aXQ
aXQ
aXQ
aXQ
-aXQ
-aXQ
-aXQ
-aXQ
-bhQ
+aPz
+aPz
+bcJ
+aPz
+bkg
bjj
bkF
aaa
@@ -74763,14 +76392,14 @@ aPA
aPA
aPA
aXQ
-aZt
+baO
aXQ
-aZt
-aXQ
-aZt
-aXQ
-aZt
-bhQ
+bdV
+aPz
+axS
+bgs
+biM
+bkg
bjj
bkF
aaa
@@ -75015,20 +76644,20 @@ aNm
aOl
aPA
aQO
-aSh
aTw
aUU
+cek
aWn
aXQ
-aZv
-aXQ
bbL
aXQ
-bdJ
-aXQ
-bgr
-bhQ
-bjj
+bgl
+aPz
+aEb
+bhK
+biZ
+bvn
+bml
bkF
aaa
aaa
@@ -75253,7 +76882,7 @@ alU
amC
arM
alU
-atT
+avc
asO
avV
atO
@@ -75261,7 +76890,7 @@ ayw
atN
aAV
aBQ
-aDh
+bbA
aDo
aFQ
aHe
@@ -75278,13 +76907,13 @@ aUn
aTy
aWy
aYe
-aZw
-aZw
bbq
-bct
-bfa
-bfa
-bhQ
+bcS
+aPz
+aEc
+bhP
+bjD
+bkg
bjk
bkE
aaa
@@ -75528,20 +77157,20 @@ aLk
aNo
aOo
aPA
-aQQ
+aQS
aQN
aSV
aUo
aUX
aXp
-baO
-aZo
-baw
-bcO
-baw
-cBn
-bgs
+bct
+bdJ
+bgr
+aPz
+aSG
bhQ
+bjW
+bwP
bjk
bkF
aaa
@@ -75785,20 +77414,20 @@ aLE
aLE
aOn
aPA
-aQP
+aQQ
aQN
-aTx
-aUV
+aTz
+aUt
aWo
aXQ
aXQ
aXQ
aXQ
-aXQ
-aXQ
-aXQ
-aXQ
-bhQ
+aPz
+aPz
+aPz
+aPz
+bkg
bjk
aPz
aaa
@@ -75842,7 +77471,7 @@ ccb
ccb
ccb
aaa
-chL
+aUf
aaa
ccb
ccb
@@ -76034,26 +77663,26 @@ aAY
aBQ
aDl
bxk
-aFS
+aDo
aDo
aIX
-aBQ
+blt
aLE
aLE
aOp
aPA
-aQR
+aMg
aQN
-aTA
-aUq
+aQN
+aUt
aWq
-aXs
-aYH
-aZx
+aQN
+aQN
+aQN
+aQN
+bfe
bbO
aPA
-bdM
-aPz
bgt
bhS
bjk
@@ -76099,7 +77728,7 @@ aaa
aaf
aaa
aaa
-chL
+aUg
aaa
aaa
aaf
@@ -76301,16 +77930,16 @@ aOl
aPC
aQN
aQN
-aTz
-aUp
-aWq
-aXr
-aZx
+aTB
+aUq
+aUV
+aXv
+bbr
+aQN
+aQN
cBh
-bbN
+bit
aPA
-bdL
-aPz
bgt
bhR
bjk
@@ -76356,7 +77985,7 @@ aaf
aaf
aaf
aaf
-chM
+aUg
aaf
aaf
aaf
@@ -76549,25 +78178,25 @@ aBQ
aDn
aDo
aDo
-aHD
+aFU
aIZ
aBQ
aLE
aLE
aOq
aPD
-aQT
-aQT
+aQV
+aQN
aTC
-aUs
+aUr
aUY
-aXv
-aYS
-aZx
+aXw
+bbU
+aQN
+aQN
+bfe
bbO
aPA
-bdM
-aPz
aSg
bhT
bjk
@@ -76797,7 +78426,7 @@ amC
amC
amC
alU
-aqO
+avc
amC
atJ
atO
@@ -76808,23 +78437,23 @@ aDo
aDo
aDo
aIY
-aBQ
+blt
aLE
aLE
aOl
aPA
-aQS
+aQX
aQN
-aTB
+aTC
aUr
-aWq
-aXt
+aYX
+aXx
+bcu
+aQN
+aQN
aPA
aPA
aPA
-aPA
-aPA
-aPz
bel
bfI
bgq
@@ -77051,7 +78680,7 @@ aaf
alU
alU
alU
-alU
+amC
amC
alU
atM
@@ -77062,7 +78691,7 @@ aAY
aBQ
aDp
aDo
-aFU
+aFS
aDo
aJb
aKp
@@ -77070,15 +78699,15 @@ aLE
aLE
aOl
aPE
-aQV
+aQY
+aQN
+aTC
+aUs
+aWB
+aXx
+bcu
+aQN
aQN
-aSi
-aUu
-aWq
-aXw
-aZB
-aZB
-aZB
aZB
aPA
bfc
@@ -77307,8 +78936,8 @@ alU
aaf
aaH
alU
-arO
-alU
+aQT
+amC
amC
avc
atO
@@ -77327,15 +78956,15 @@ aLH
aLE
aOl
aPA
-aQU
+aSX
+aQN
+aTD
+aUu
+aXk
+aXA
+bcw
aQN
aQN
-aUt
-aWq
-aXw
-aZA
-aZA
-aZA
aZA
aPA
aWv
@@ -77584,17 +79213,17 @@ aLK
aLK
aOr
aPA
-aQX
-aQN
+aTx
aQN
+aSi
aUv
aWp
-aXA
-aYX
-aYX
-aYX
-bbs
-bcw
+aTy
+aTy
+aTy
+aTy
+bcT
+chZ
bfd
bgw
aZE
@@ -77841,18 +79470,18 @@ aLJ
aLE
aOl
aPA
-aQW
-aQW
-aTD
-aQW
+aTA
+aQN
+aUp
aUZ
-aXx
+aXr
aYU
aYU
aYU
-bbr
-bcu
-bfe
+aYU
+aYU
+ckE
+bTt
aYb
aZE
bjm
@@ -78102,14 +79731,14 @@ aPG
aPG
aPG
aPG
+aZx
+aQW
+aQW
+aQW
+aQW
+bdL
aPA
-aPA
-aPA
-aPA
-aPA
-aPA
-aPA
-aWv
+clP
aYb
aZE
bjp
@@ -78355,19 +79984,19 @@ aLL
bDe
aOl
aPF
-aQY
-aSk
+aSh
+aQt
aTE
aPG
-aWu
-aYa
-aZD
-aZD
-hcE
-aZD
-aZD
-bff
-bfk
+aPA
+aPA
+aPA
+aPA
+aPA
+aPA
+aPA
+aWv
+aYb
aZE
bjo
bjr
@@ -78616,17 +80245,17 @@ aRa
aRa
aTG
aPG
-aWw
-aYc
-aZF
-aZF
-aZF
-aZF
-aZF
-aZF
-bgy
+aWu
+aYa
+aZD
+aZD
+hcE
+aZD
+aZD
+bff
+bfk
aZE
-bjr
+bgx
bjr
ama
bmh
@@ -78668,7 +80297,7 @@ bHE
bUs
ceY
bCq
-bHE
+bJP
bUs
bHE
bLu
@@ -78873,15 +80502,15 @@ aQZ
aRa
aTF
aPG
-aSX
-aWC
-baS
-aZI
-baS
-baS
-bdS
-bdU
-ckQ
+aWw
+aYc
+aZF
+aZF
+aZF
+aZF
+aZF
+aZF
+bgy
gjl
bjq
bjr
@@ -79135,7 +80764,7 @@ aXJ
bgA
aZp
baY
-bcJ
+aYZ
bcF
bfg
bgA
@@ -79424,7 +81053,7 @@ aoV
bCq
bHE
bHE
-bSq
+bad
cdb
bCq
bVE
@@ -79649,7 +81278,7 @@ aXM
bfi
cBi
bbS
-bcS
+bdM
bbt
bfi
beD
@@ -79903,14 +81532,14 @@ aTH
aPK
aWz
aWC
+baS
+baS
+baS
+bcR
+baS
+baS
+baS
gjl
-gjl
-gjl
-bcT
-gjl
-gjl
-gjl
-aZE
bju
biv
bmf
@@ -79951,14 +81580,14 @@ mrR
dKP
odx
rBq
-tur
+bat
bCq
bUs
bLv
aaa
bLv
bJf
-ccd
+cfS
bCq
aaa
aaa
@@ -80158,16 +81787,16 @@ aRc
aSm
aTJ
aPK
-cCl
-aYh
-cCm
-cCm
-cCm
-cCn
-aPz
+aWA
+aWC
+baS
+aZI
+baS
bdW
-aSg
-aZE
+bdS
+bdU
+ckQ
+gjl
bgz
biT
boU
@@ -80178,7 +81807,7 @@ bbR
btu
bbR
bOL
-bxy
+bPR
byF
bwW
bGm
@@ -80415,11 +82044,11 @@ aPK
aSm
aTI
aPK
-aWB
+aXs
cCj
apd
apd
-bbU
+apd
cCk
apd
aZK
@@ -80464,7 +82093,7 @@ iiW
dfL
dKP
mqZ
-tyO
+tur
wfR
bCq
bUs
@@ -80672,9 +82301,9 @@ aPK
aSn
aTK
aPK
-apd
-cCj
-asW
+aXt
+aZo
+aYj
baW
bLE
bLG
@@ -80933,8 +82562,8 @@ apd
aYi
aqW
aqW
-bbQ
-bLG
+aVT
+bSO
apd
aZH
aZK
@@ -81212,7 +82841,7 @@ bwY
byJ
bwe
bAc
-bBI
+bwL
bGn
bGn
bGn
@@ -81448,7 +83077,7 @@ aWG
aZa
baX
bcH
-bdE
+bSZ
apd
aZH
bnL
@@ -81646,9 +83275,9 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
-aaa
+gXs
+gXs
+brT
abc
abu
abu
@@ -81731,7 +83360,7 @@ bCq
bHD
bJe
bCq
-bLu
+cib
bHE
bHE
bHE
@@ -81902,10 +83531,10 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
-aaa
-aaa
+gXs
+aai
+aai
+aai
abb
abt
aca
@@ -81958,11 +83587,11 @@ aSa
aSr
aSr
apd
-aYZ
+asW
bLE
aqW
aqW
-bLE
+bTq
apd
beA
bqp
@@ -82160,9 +83789,9 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
-aaa
+aai
+cmH
+aay
abe
abw
acc
@@ -82215,7 +83844,7 @@ aTL
aTP
aWD
apd
-aYj
+aYh
aZL
baU
baU
@@ -82231,8 +83860,8 @@ bnJ
bbR
bbR
bbR
-bty
-buJ
+bWk
+bYG
bwe
bxE
byM
@@ -82416,10 +84045,10 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
-aaa
-aaa
+gXs
+aai
+cmI
+aay
abd
abv
acb
@@ -82523,8 +84152,8 @@ bLw
bLw
bLw
caq
-cbw
-ccu
+bCA
+bHE
ciT
bCq
bSs
@@ -82674,11 +84303,11 @@ aaa
aaa
aaf
aaf
-aaH
-aai
-aai
-abg
-aby
+ctv
+acd
+aaM
+aaP
+aaY
aby
aby
aby
@@ -82780,10 +84409,10 @@ bVI
bVI
bVI
bTA
-bEP
-cdi
-bCq
-bCq
+bHF
+bHE
+bHE
+bHE
bHE
bHE
cmD
@@ -82791,7 +84420,7 @@ cnr
cnU
chD
cpq
-cpV
+bVH
cqw
cqO
crp
@@ -82932,10 +84561,10 @@ aaf
aaf
aai
aai
-aai
-aaU
abf
-abx
+aat
+aaU
+abg
acd
acC
ada
@@ -83037,8 +84666,8 @@ bWB
bWB
bVI
cax
-cbx
-cdh
+cbw
+cby
ciU
cjK
ckA
@@ -83189,7 +84818,7 @@ aai
aai
aai
aaI
-aaM
+aat
aat
aat
aat
@@ -83256,12 +84885,12 @@ aYl
bBi
aLY
bnN
-boY
+bTv
bqw
aJq
aJq
aYl
-aKF
+bTw
aLX
aJq
aJq
@@ -83294,8 +84923,8 @@ cdd
cea
bVI
caz
-cby
-cdj
+cbx
+ccu
cdv
cem
cem
@@ -83444,8 +85073,8 @@ aaf
aai
aan
aaw
-aaB
-aat
+aaD
+aaL
aaJ
aat
abh
@@ -83699,9 +85328,9 @@ aaa
aag
aaa
aak
-aap
-aay
-aaD
+aao
+aaz
+aaE
aat
aat
aat
@@ -83738,7 +85367,7 @@ ats
atY
auo
axy
-ayN
+ayM
azE
aAW
aCa
@@ -83775,7 +85404,7 @@ bqy
cBr
bqy
buK
-bqy
+bTx
aJw
aJq
aJq
@@ -83807,10 +85436,10 @@ bWB
bWB
cec
bVI
-cay
+bUw
ccw
chY
-ciX
+clK
cjM
ckB
ckB
@@ -83821,7 +85450,7 @@ coH
cgR
cgR
cqx
-cqR
+cgR
crp
crJ
crT
@@ -83956,9 +85585,9 @@ aaa
aag
aaf
aaj
-aao
-aax
-aaC
+aap
+aaB
+aaF
aat
aat
adO
@@ -83995,7 +85624,7 @@ atu
cCi
awg
axy
-ayM
+ayN
azs
aAR
aBP
@@ -84075,10 +85704,10 @@ ckC
ccw
cnX
coH
-cps
-cpX
+cjZ
+ckq
cqz
-cqQ
+cqR
ccw
crH
crT
@@ -84213,13 +85842,13 @@ aaa
aag
aaa
aal
-aar
-aay
-aaF
-aat
-aaO
-aaW
+aaq
+aax
+aaN
aat
+aaV
+cmn
+cms
abB
acf
abM
@@ -84289,11 +85918,11 @@ bqA
brW
btB
buM
-bwi
+aOJ
bmr
aMm
aJq
-bBi
+byV
bCs
bCs
bEY
@@ -84470,13 +86099,13 @@ aaa
aag
aaf
aaj
-aaq
-aay
-aaE
-aaJ
-aaN
-aaV
+aar
+aaC
+aaO
aat
+aaW
+cmp
+cmE
aat
acd
abL
@@ -84552,11 +86181,11 @@ aMn
aJq
bBi
bCs
-bDv
+bDw
+bDz
+bFb
bEX
bFa
-bHH
-bFa
bKt
bLx
bCs
@@ -84727,13 +86356,13 @@ aaa
aag
aaa
aal
-aat
-aay
+aau
aat
aat
-aaJ
aat
aat
+cmr
+aat
abD
acd
acd
@@ -84801,7 +86430,7 @@ bnR
bpe
bqB
bqq
-btD
+bbQ
buO
bwk
bmr
@@ -84985,7 +86614,7 @@ aag
aaf
aaj
aas
-aaz
+aat
aat
aat
aat
@@ -85033,7 +86662,7 @@ aGq
aHO
aJl
ayW
-aJq
+clV
aJq
aOE
aJn
@@ -85066,7 +86695,7 @@ byP
aJq
bBi
bCs
-bDw
+bDy
bEZ
bGv
bHH
@@ -85078,7 +86707,7 @@ bNJ
bNJ
bKx
cjL
-gbq
+bNL
bNI
bUz
bVJ
@@ -85244,10 +86873,10 @@ aam
aav
aav
aav
-aaL
-aaQ
-aaY
-ihn
+aav
+aav
+aav
+aav
abE
acg
acJ
@@ -85323,7 +86952,7 @@ byR
bnM
bBl
bCs
-bDz
+bFa
bFa
bFa
bHH
@@ -85331,7 +86960,7 @@ bFa
bFa
bFa
bCs
-bNL
+bNJ
bNJ
apV
cjL
@@ -85370,7 +86999,7 @@ cEL
cFb
cFu
cFI
-cGd
+cdj
cGs
cGr
ccw
@@ -85498,14 +87127,14 @@ aaa
aag
aaf
aai
-aau
+aaA
aaA
aaG
-aaK
-aaP
+aaA
+aaQ
aaX
-hwu
-aat
+abj
+abG
acd
acD
acY
@@ -85580,10 +87209,10 @@ byQ
aJq
aJq
bCs
-bDy
-bFb
-bGw
+bFa
+bFa
bER
+bGw
bJk
bFa
bLA
@@ -85615,7 +87244,7 @@ cTa
ceZ
clQ
cgR
-cgx
+bUX
coM
cpv
cqb
@@ -85630,11 +87259,11 @@ cqb
cAo
cGt
cgx
-jMY
+chU
csd
cHa
csd
-uhH
+chW
ccw
aaa
aaT
@@ -85761,8 +87390,8 @@ aai
aai
aai
aai
-abj
-abG
+abx
+abF
acd
acd
acd
@@ -85835,7 +87464,7 @@ aaa
aJn
aXf
aJq
-byV
+aJq
bCs
bAM
bFa
@@ -85854,7 +87483,7 @@ bNI
bEP
bVJ
bVJ
-bOM
+bSF
bQd
bQP
bSt
@@ -86019,7 +87648,7 @@ aaa
aaf
aai
abi
-abF
+bVL
ach
acK
adf
@@ -86540,11 +88169,11 @@ cpg
acv
adi
adi
-aaZ
+arl
aeW
agQ
ahv
-ahQ
+agX
aiI
aiH
ajB
@@ -86557,7 +88186,7 @@ anw
anz
aov
aph
-aph
+ayY
ard
ard
ard
@@ -86797,7 +88426,7 @@ acl
ajC
acL
adi
-aaZ
+anq
agp
agT
ahx
@@ -86812,7 +88441,7 @@ afM
amR
anw
anz
-aov
+aJN
apk
anw
anw
@@ -86821,9 +88450,9 @@ anw
aVh
avj
awl
-axC
-ayY
-azZ
+ayZ
+aCf
+aDh
azZ
azZ
azZ
@@ -87326,7 +88955,7 @@ agj
amS
anx
anz
-aoz
+aKS
apm
aqd
anA
@@ -87335,9 +88964,9 @@ atd
anA
avk
awk
-axE
-ayZ
-aAa
+aCe
+aCV
+aHZ
aBu
aAa
aAa
@@ -87572,7 +89201,7 @@ aeY
agt
agt
ahz
-aie
+ahQ
aiN
ajc
ajI
@@ -87660,7 +89289,7 @@ bYH
bYH
bVg
bXn
-bYG
+bRb
cfb
cfF
cfb
@@ -87668,7 +89297,7 @@ cik
cjg
cjU
cfb
-clM
+caw
cfz
cgR
ccw
@@ -87894,7 +89523,7 @@ aJq
bBu
bCv
bAT
-bDL
+bDJ
bDq
bCv
bJs
@@ -87913,7 +89542,7 @@ bWO
bXK
bYH
bZz
-caw
+cfV
bYH
bVo
bXq
@@ -88152,7 +89781,7 @@ bBt
bCv
bDH
bFf
-bGB
+aNJ
bCv
bJs
bKy
@@ -88341,7 +89970,7 @@ adg
aeu
alt
agu
-agX
+agt
ahB
aij
agn
@@ -88358,14 +89987,14 @@ aoB
aod
aqe
arf
-aqa
-atf
+aqU
+awy
arf
-aqa
-atf
+aqU
+awy
arf
-aqa
-atf
+aqU
+awy
dgz
tqg
ujF
@@ -88615,13 +90244,13 @@ aoz
aod
aqe
arf
-apY
+ari
ate
arf
-apY
+ari
ath
arf
-apY
+ari
ath
dgz
fvY
@@ -88662,9 +90291,9 @@ bsh
bqH
aJq
aJq
-aXf
+bPS
bCv
-bDJ
+aNI
bCt
bGD
bCv
@@ -88699,7 +90328,7 @@ ckO
ckH
cja
cny
-ccw
+bVw
cip
cnx
cDx
@@ -88910,7 +90539,7 @@ bjF
blc
bmz
bnY
-bpk
+aOH
bqJ
bsj
btI
@@ -88953,7 +90582,7 @@ ciq
cfb
cfb
cfb
-clR
+ciX
cgR
cgR
cMm
@@ -89123,7 +90752,7 @@ akY
afM
amp
aiX
-anA
+axC
anz
aoC
aod
@@ -89133,19 +90762,19 @@ asd
atg
arf
asd
-awo
+axT
arf
asd
-aAb
+aFe
dgz
iVU
aDK
vHj
eVC
dgz
+aBM
+aEs
aJv
-aKG
-aMg
bHt
aOE
aJn
@@ -89179,7 +90808,7 @@ aJq
aXf
bCv
bAU
-cAL
+clO
bFg
bFs
bJt
@@ -89386,18 +91015,18 @@ aoF
apo
aqh
arh
-asg
+auA
atj
aul
-auR
+axQ
atj
-aul
+azl
+aNH
+atj
+aJQ
azc
atj
-aAX
-azc
-atj
-aFe
+aMq
aul
aHT
aJy
@@ -89423,7 +91052,7 @@ bim
bjG
aZV
bmB
-bnZ
+aDH
bpl
bqH
bsl
@@ -89436,8 +91065,8 @@ aLY
bBx
bCv
apG
-bFk
-bDs
+aPZ
+aQa
bCv
bJs
bHo
@@ -89646,15 +91275,15 @@ aun
asf
ati
auk
-aux
-avt
-axL
+arQ
+aus
+aJk
bbl
-azT
-auk
-auk
-aDG
-aFd
+avt
+aJR
+aya
+aLs
+aMr
auk
aHH
aJg
@@ -89704,8 +91333,8 @@ bNT
bOV
bQj
bRw
-bSF
-bOd
+bOM
+bPT
bTP
bRA
bWQ
@@ -89721,12 +91350,12 @@ cap
ctR
ccn
cdo
-cek
+bUA
ccw
cet
cfd
-cfB
-cfI
+cgH
+cgM
cgQ
cjS
cjN
@@ -89739,7 +91368,7 @@ cEW
cse
cse
csu
-cGl
+chM
ccw
aaa
aaa
@@ -89903,15 +91532,15 @@ arf
arf
arf
arf
-auU
-avG
+arf
+auC
+aKg
awr
awr
-azV
+aKr
+aAh
aAh
aAh
-aFg
-aFh
aAh
aAh
aAh
@@ -89945,7 +91574,7 @@ btL
buY
buY
bqH
-aJq
+clV
aJq
aXf
bCv
@@ -89962,7 +91591,7 @@ bOV
bQo
bRz
bSH
-bOd
+bQX
bTP
bRA
bWQ
@@ -90157,23 +91786,23 @@ aoG
cSA
aqe
arf
-aqo
-asp
+auu
+atm
+atm
arf
-auS
-avv
-awu
-awr
aAd
+auW
+awr
+aXH
+aXO
aAh
-aCm
-aDL
-aFf
-aGk
-aHU
-alN
+aSp
aAh
-aLQ
+aUP
+aAh
+bbN
+aAh
+aOL
aJq
aOE
aJn
@@ -90206,7 +91835,7 @@ aJq
aJq
bBy
bzs
-bDO
+bTy
bFl
bGH
bHU
@@ -90219,7 +91848,7 @@ bOV
bQj
bRy
bSG
-bOd
+bPT
bUK
bVT
bWR
@@ -90414,23 +92043,23 @@ aoH
cSA
aqe
arf
-asm
+aqC
blU
-atQ
-avg
-awp
-axN
+blU
+awA
+auy
+aKh
awr
-aAg
+awr
+aKJ
aAh
-aDO
-aDQ
-aFi
-aGl
-aBy
-aBy
+apH
aAh
-aMn
+apQ
+aAh
+aqt
+aAh
+clX
aJq
aOE
aJn
@@ -90499,7 +92128,7 @@ clU
clU
bOh
ccw
-coZ
+cgN
cgU
cgU
cDK
@@ -90671,21 +92300,21 @@ ajo
cSA
aqe
arf
-ari
+aqD
+ask
asu
aun
-auW
-avR
-axM
-awu
-aAf
+awv
+aKg
+aYI
+awr
+bHg
aAh
-aCn
-aDM
-aGx
-aAh
-aAh
-aBy
+aop
+bwi
+aop
+aop
+aop
aAh
aMm
aJq
@@ -90718,7 +92347,7 @@ bqH
bqH
aJq
bHt
-bBz
+bgi
bzs
bzs
bFm
@@ -90752,11 +92381,11 @@ bMQ
aaf
bQA
ckU
-clT
+ccd
cmU
bOh
ccw
-cpa
+cgP
cjc
cqo
cDL
@@ -90931,19 +92560,19 @@ arf
arf
arf
arf
-avm
-aws
-axP
-azb
-aAi
-aAh
-aCn
-aDM
-aGx
-aGm
-aHV
-aBy
-aAh
+arf
+auC
+aKN
+aYP
+baa
+aKM
+aKP
+aFE
+aDY
+aLQ
+aYS
+aop
+aMw
aJq
aJq
aJq
@@ -90974,9 +92603,9 @@ bva
bwu
bwu
bwu
-bwu
-bBB
-aJv
+bke
+cfI
+bBz
bzs
bFp
bGJ
@@ -91185,21 +92814,21 @@ ajo
app
aqi
arf
-ask
+ars
+atm
atm
arf
-avl
-awq
-axO
-aza
+aHt
+aKO
+aZb
+bab
+aSj
aAh
aAh
aAh
-aDS
-aGx
aAh
aAh
-aDN
+aMu
aAh
aMo
aNC
@@ -91231,7 +92860,7 @@ aJq
aJq
aJq
aJq
-bAj
+bnZ
aJq
aKG
bzs
@@ -91442,22 +93071,22 @@ ajo
aps
aqk
arf
-asm
+auv
+blU
aHw
-aup
-avn
-awv
-axX
-aze
+awX
+axR
+aKq
+aZZ
+awr
+bac
aAh
-aBz
-aBz
-aDU
-aGx
-aGn
-aHW
-aBy
+aVK
+azm
+azm
aAh
+aAZ
+bJS
aJq
aJq
aJq
@@ -91488,9 +93117,9 @@ aJq
aJq
bxL
byX
-aJq
-aJq
-bCA
+aXh
+bmE
+bAj
bzs
bCC
bDA
@@ -91699,31 +93328,31 @@ ajo
apr
aqj
arf
-ark
-asL
+ary
+ask
+aua
aun
-avu
-awt
-axV
-azd
-azX
-aAZ
-aCe
-aDT
-aGx
+axU
+awr
+awr
+axW
+aHb
+aLh
+aUj
+aMv
+aMv
+aMx
+aZt
aAh
-aAh
-aBy
-aAh
-aCr
-aCr
-aCr
aJC
+aJC
+aJC
+aQg
bYP
-aQg
aJC
aQg
aJC
+aJC
aQg
aJC
aJC
@@ -91780,7 +93409,7 @@ bMQ
aaf
bQA
ckX
-clV
+ccB
cmV
bOh
cig
@@ -91954,35 +93583,35 @@ ajp
ajp
ajo
apt
-aqm
-arj
-arj
-arj
-arj
-avx
-awz
-axR
-avx
+arn
+arf
+arf
+arf
+arf
+arf
+asX
+awr
+awr
+avG
+axP
aAh
-aBA
-aBA
-aDP
-aBx
-aGp
-aHX
-aBy
+aCh
+azo
+azo
aAh
-aMq
-adq
-aQb
-aPZ
-aRu
-aQc
-aUf
-aQc
-aXi
-aQc
-amB
+aAM
+aMH
+bRc
+bRe
+bty
+aFj
+ccS
+bXu
+aKR
+aFd
+aDM
+cab
+bfa
aJC
bcq
bcq
@@ -92211,16 +93840,17 @@ ajo
aoa
ajo
apt
-aql
-apv
-arl
-asM
-atV
-avw
-awy
-axQ
-azj
-arj
+aqr
+aoJ
+aoJ
+aoJ
+aoJ
+arr
+auN
+awr
+awr
+avG
+aNt
aAh
aAh
aAh
@@ -92228,19 +93858,18 @@ aAh
aAh
aAh
aAh
-aAh
-aMp
-aMr
-aOH
-aPY
-aQc
-aRx
-aQc
-aQc
-aPY
-aQc
-aZZ
-aJC
+aKR
+aKR
+buJ
+aDU
+aDX
+aEt
+aKR
+aFf
+aDN
+aDU
+aFF
+aQg
aYV
aYV
aYV
@@ -92468,35 +94097,35 @@ ahT
anb
ahT
anZ
-apu
-arj
-asb
-asV
-aus
-aus
-awA
-axT
-azl
-aAl
-arj
-aCq
-aDR
+aqo
+arf
+arf
+arf
+arf
+arf
+aDW
+avl
+avm
+avg
+awE
+aCr
+azP
aFl
aGD
-aHZ
+bdE
aCr
-aKJ
-aMr
-aMr
-aOH
-aQc
-aQd
-aQa
-aRv
-aPY
-aVw
-aPY
-bac
+boY
+bRd
+aKR
+aDO
+aFC
+cdM
+aEu
+aKR
+aFg
+aDO
+caj
+ckP
aJC
aYV
aYV
@@ -92718,44 +94347,44 @@ aif
aif
aif
aif
-aif
-aif
-alK
-aif
bkV
-anc
-anD
-aoI
-apX
-arn
-asN
-aur
-avy
-avy
-axS
-azk
-aAk
-arj
-aCf
-aDY
-aFj
+adq
+amB
+aif
+aif
+apw
+aqH
+aqI
+arf
+apu
+atl
+avw
+aut
+axM
+avx
+avn
+awp
+aNG
+aCr
+aLS
+aUC
aGr
aHI
-aJk
-aMr
-aMr
-aNt
-aOH
-aQc
-aQc
-aSq
-aQc
-aQc
-aPY
-aQc
-bab
+aOK
+aKR
+aKR
+aKR
+aKR
+aKR
+aKR
+aKR
+aKR
+aKR
+aKR
+aKR
+asq
aJC
-aYV
+bSL
aYV
ber
bfF
@@ -92967,11 +94596,7 @@ abp
afo
abp
abp
-ahn
-ahn
-aiA
-aiA
-aiA
+aSq
ahn
aiA
aiA
@@ -92983,38 +94608,42 @@ aod
ahn
apx
ahn
-arj
-asr
-asN
-aut
-avz
-aXF
-axU
-azn
-aAn
-arj
-aCh
-aEc
-aFk
-aGw
+ahn
+ahn
+ahn
+ahn
+arf
+aoI
+aqF
+awo
+arf
+aoY
+awr
+awr
+awt
+aXj
+aCr
+aQb
+aVA
+bcO
aHK
aCr
-aKr
-aMr
-bHF
-aOH
-aQc
-aQc
-aSo
-clX
-aVx
-aQc
-aQc
-aQc
+bDO
+aKR
+aKR
+aDP
+aDP
+aEo
+aKR
+aKR
+aKR
+aDP
+aKR
+aKR
bbx
aYV
aYV
-aYV
+bTs
bfF
bhd
bis
@@ -93220,16 +94849,12 @@ aaf
aaf
aaf
abp
-aaa
+aRw
afp
-aaa
+aRw
abp
-aaa
-aaa
-aaa
-aaf
-aaf
-aaf
+aqa
+ahn
aaa
aaf
aaf
@@ -93238,36 +94863,40 @@ ahn
anE
aod
aoK
-apw
+amI
aqp
-arj
-asq
-asN
-aut
-avz
-avz
-axU
-azm
-aAm
-arj
+ahn
+anc
+anr
+anM
+aqF
+aqF
+aqF
+aur
+aun
+aEr
+awr
+awr
+awt
+aSo
aCr
-aEb
aCr
+aVD
aGv
aCr
aCr
-aKq
-aLS
-aNF
-aOH
-aQc
-aQc
-aSH
-aQc
-aQc
-aRx
-aQc
-aQc
+aCm
+aKR
+aDu
+aDT
+aDV
+aEp
+aHX
+aKR
+aIs
+atT
+aFD
+aKR
aQg
aYV
aYV
@@ -93481,12 +95110,8 @@ aaa
aaa
aaa
adR
-aaa
-aaa
-aaa
-aaf
-aaf
-aaa
+ahn
+ahn
aaa
aaa
aaa
@@ -93497,43 +95122,47 @@ aoe
aoL
apy
aqq
-arj
-ast
-asN
-auv
-avA
-avA
-axW
-azo
-aAp
+ahn
+aql
+aqN
+arf
+aqE
+ark
+aqF
+axN
+arf
+aKi
+avm
+aAn
+aIG
+aXl
aBC
aCt
aEA
-aCt
aGz
aIb
aCr
-aKN
-aMv
-aNH
-aOJ
-aQc
-aPY
-aSG
-aPY
-aUg
-bFC
-aRw
-aQc
+aCn
+aKR
+aKR
+axV
+aFh
+arC
+aKR
+aKR
+aNn
+avR
+aFD
+aKR
bbx
aYV
aYV
bet
bfH
bhf
+bkl
bhh
-bhh
-bhh
+bkl
bmJ
bof
bpu
@@ -93733,15 +95362,11 @@ aaa
aaa
aaa
aaa
+gXs
aaa
aaa
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+gXs
aaa
aaa
aaa
@@ -93754,43 +95379,47 @@ ahn
ahn
ahn
ahn
-arj
-ass
-asX
-auu
-att
-att
-att
-azf
+ahn
+arf
+arf
+arf
+asd
+arf
+arf
+arf
+arf
+aMJ
+azn
aAo
-apX
+aJz
+amP
aBB
aBB
aBB
aGy
aIa
cNE
-aKM
-aMu
-aNG
-aKM
-aKM
-aKM
-aSp
-aQc
-aQc
-aSq
-aQc
-bad
+aQP
+awB
+awB
+aDQ
+aFi
+awB
+awB
+awB
+aIi
+aOu
+aKR
+asD
bby
aYV
aYV
bet
bfG
bhe
-bit
+blN
bjS
-bli
+bnd
bli
boe
bli
@@ -93990,15 +95619,11 @@ aaa
aaa
aaa
aaa
+gXs
aaa
aaa
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+gXs
aaa
aaa
aaa
@@ -94008,37 +95633,41 @@ aaa
aag
aag
aag
-aaa
-aaa
-aaf
-arj
-clO
-asZ
-aua
-clO
-awB
-axY
-azh
-gsz
-arj
-aaf
-aaa
+arf
+amJ
+axO
+arf
+apu
+acN
+amP
+atz
+axL
+atQ
+awu
+aEv
+azj
+aAb
+aAr
+amN
+amN
+aza
+azX
alP
aGI
aId
aJD
-aKP
-aMx
-aNJ
-aQe
-aOL
-aOL
-aOL
-aOL
-aOL
-aOL
-aXO
-aZb
+aCx
+awC
+awC
+bbs
+aHW
+awC
+awC
+awC
+awC
+aIw
+aKR
+asG
aJC
aYV
aYV
@@ -94247,10 +95876,11 @@ aaa
aaa
aaa
aaa
-aaa
+aab
aaa
aqG
aaa
+asL
aaa
aaa
aaa
@@ -94260,44 +95890,43 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aqr
-arm
-arm
-asY
+arf
+amO
+anr
+anM
+aqF
+alK
+arf
+axZ
+amN
atZ
-auB
-auB
-atZ
-azg
-azp
-azp
-aCu
-aaf
+amN
+amN
+bBB
+cdP
+ceu
+cfA
+amN
+azb
+aUk
alP
aGH
aIc
aJC
-aKO
-aMw
-aNI
-aMw
-aOK
-acN
-acN
-acN
-acN
-acN
-aQc
-bae
+aCy
+aTN
+aDS
+aKR
+aKR
+aEq
+aEq
+aEq
+aEq
+aEq
+aKR
+aKR
aJC
-bcr
+cmc
aYV
bet
bfG
@@ -94340,7 +95969,7 @@ bYU
bXW
bOh
cbH
-ccB
+cbX
cbH
bOh
aaf
@@ -94504,6 +96133,11 @@ aaa
aaa
aaa
aaa
+aac
+apK
+aaa
+apK
+atX
aaa
aaa
aaa
@@ -94513,30 +96147,25 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aqs
-aro
-aro
-aro
-aro
-aro
-aro
-aro
-aro
-aro
-aro
-aCv
-aaa
+arf
+arf
+arf
+arf
+aoI
+anD
+arj
+art
+amN
+amN
+amN
+amN
+bDL
+amN
+aAX
+cfB
+amN
+azd
+aAf
alP
aGJ
aIe
@@ -94546,13 +96175,13 @@ aJC
aJC
aJC
aJC
-aXj
-aVy
-aSY
-aVy
-aVy
-aYI
-bah
+aXF
+aEw
+aEx
+aEw
+aNF
+aEq
+aHU
aJC
aYV
bdo
@@ -94761,8 +96390,11 @@ aaa
aaa
aaa
aaa
-aaa
-aae
+apv
+apv
+gXs
+apv
+apv
aaa
aaa
aaa
@@ -94774,42 +96406,39 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aqs
-aro
-aro
-aro
-aro
-aro
-aro
-aro
-aro
-aro
-aro
-aCv
-aaf
+arf
+aqm
+aqF
+axX
+arf
+asb
+asr
+avu
+amN
+amN
+bDL
+amN
+aAX
+cfB
+amN
+aze
+aAg
alP
aGJ
aIe
-aJE
-aKQ
+asm
aLU
-aNu
+aKQ
+aYH
aJC
aPw
-aQc
+aZw
aQc
aSZ
aQc
-aVy
-czP
-bag
+aFk
+aEq
+aHV
aJC
aYV
aYV
@@ -95019,6 +96648,9 @@ aaa
aaa
aaa
aaa
+gXs
+aaa
+gXs
aaa
aaa
aaa
@@ -95031,26 +96663,23 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aqs
-aro
-aro
-aro
-aro
-aro
-aro
-aro
-aro
-aro
-aro
-aCv
-aaa
+arf
+ast
+arD
+apX
+arf
+arO
+aup
+atV
+amN
+asg
+bZf
+cdY
+cff
+cfC
+amN
+azb
+bvG
alP
aGA
aHS
@@ -95064,9 +96693,9 @@ aRz
aSF
aQc
aQc
-aXl
-aQc
-bai
+aFp
+aKR
+atk
aJC
aYV
aYV
@@ -95276,9 +96905,9 @@ aaa
aaa
aaa
aaa
+apT
aaa
-aaa
-aaa
+apT
aaa
aaa
aaa
@@ -95291,43 +96920,43 @@ aaa
aae
aaa
aaa
-aaa
-aaa
-aaa
-aaa
-aqs
-aro
-aro
-aro
-aro
-aro
-aro
-aro
-aro
-aro
-aro
-aCv
-aaf
+arf
+arf
+arf
+arf
+arf
+asZ
+att
+avA
+awq
+aVy
+aVG
+amN
+aRu
+aVP
+aXi
+azV
+aPj
alP
aGL
aHM
-aJm
+asp
aKz
-mjr
+bLs
aND
aJC
-aab
+aZv
aRg
aQc
-aac
-aQc
-aXk
-aQc
+bai
aQc
+aFt
+aKR
+aKR
aJC
aYV
aYV
-bev
+bNM
bfK
bhi
bhi
@@ -95525,6 +97154,7 @@ aaa
aaa
aaa
aaa
+aae
aaa
aaa
aaa
@@ -95550,34 +97180,33 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
+gXs
aqs
-aro
-aro
-aro
-aro
-aro
-aro
-aro
-aro
-aro
-aro
+asY
+asY
+auB
+aws
+avy
+avy
+aws
+azp
+aCu
+aCu
aCv
-aaa
+auR
alP
aGL
aIe
aJC
-aKS
-aMC
+atf
+bLt
aJC
aJC
aJI
aJI
aSI
aJI
-aVA
+baw
aJI
aYK
aJI
@@ -95807,27 +97436,27 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
+gXs
+gXs
aqu
-arm
-arm
-arm
-auy
-auB
-auB
-axZ
-azp
-azp
-azp
+aro
+aro
+aro
+aro
+aro
+aro
+aro
+aro
+aro
+aro
aCw
-aaf
+aaa
alP
aGL
aIg
aJH
aKR
-aMB
+bMF
aJC
aOP
aJI
@@ -95838,7 +97467,7 @@ aVz
aVz
aYJ
aJI
-bbz
+bSr
aYV
aYV
aYV
@@ -96063,22 +97692,22 @@ aaa
aaa
aaa
aaa
+gXs
+gXs
aaa
+aqu
+aro
+aro
+aro
+aro
+aro
+aro
+aro
+aro
+aro
+aro
+aCw
aaf
-aaf
-aaf
-arj
-arj
-arj
-auA
-avD
-awC
-ayb
-arj
-alP
-alP
-aaa
-aaa
alP
aGL
aIe
@@ -96319,23 +97948,23 @@ aaa
aaa
aaa
aaa
+gXs
+gXs
+aaa
+aaa
+aqu
+aro
+aro
+aro
+aro
+aro
+aro
+aro
+aro
+aro
+aro
+aCw
aaa
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-arj
-auz
-avC
-avC
-aya
-arj
-arA
-alP
-alP
-alP
alP
aGN
aIh
@@ -96355,7 +97984,7 @@ baj
bbz
aYV
bdp
-aYV
+bDv
bfK
bfK
bfK
@@ -96408,7 +98037,7 @@ cle
cli
uPT
cmY
-cmc
+cme
cop
cmd
cmd
@@ -96575,24 +98204,24 @@ aaa
aaa
aaa
aaa
+gXs
+gXs
aaa
+aaa
+aaa
+aqu
+aro
+aro
+aro
+aro
+aro
+aro
+aro
+aro
+aro
+aro
+aCw
aaf
-aaf
-aaa
-aaa
-aaa
-aaa
-aaf
-arj
-auB
-auB
-arj
-gOZ
-arj
-anf
-anf
-rsp
-rsp
alP
aGB
aIf
@@ -96604,11 +98233,11 @@ aON
aQk
aRD
aSM
-aVD
+aEy
aVE
aXm
aVz
-bak
+cam
bbz
aYV
bdp
@@ -96831,25 +98460,25 @@ aaa
aaa
aaa
aaa
-aaa
-aaf
-aaf
-aaa
-aaa
-aaa
-aaa
-aaa
-aaf
-aaa
gXs
-aoV
-alP
-anf
-anf
-anf
-anf
-aDW
-aDV
+gXs
+aaa
+aaa
+aaa
+aaa
+aqu
+aro
+aro
+aro
+aro
+aro
+aro
+aro
+aro
+aro
+aro
+aCw
+aaa
alP
aGL
aHY
@@ -96861,7 +98490,7 @@ aOM
aQj
aRB
aSL
-aTN
+cmm
cCq
aVz
cAg
@@ -97087,7 +98716,6 @@ aaa
aaa
aaa
aaa
-aaa
aaf
aaf
aaa
@@ -97095,18 +98723,19 @@ aaa
aaa
aaa
aaa
-aaa
-aaf
-aaa
-gXs
-aoV
-alP
-awD
-anf
-anf
-anf
-aCy
-jnR
+arm
+asY
+asY
+asY
+awz
+avy
+avy
+aAm
+aCu
+aCu
+aCu
+aVx
+auR
alP
aGL
avI
@@ -97122,7 +98751,7 @@ aTO
cCq
aVz
aVz
-bak
+caB
bbz
aYV
bdp
@@ -97138,8 +98767,8 @@ boo
bqQ
bhg
bua
-bvn
-bwL
+bne
+bpk
bxX
bsL
bua
@@ -97343,7 +98972,6 @@ aaS
aaS
aaS
aaS
-aaa
aaf
aaf
aaa
@@ -97351,21 +98979,22 @@ aaa
aaa
aaa
aaa
-aaf
-aaf
-alO
-alO
-alO
+aaa
+aaa
+aaa
+aaa
+auR
+azg
+avz
+ccH
+aAX
+aAp
+aAk
+aAl
+aCq
+aDR
alP
-alP
-alP
-alP
-alP
-alP
-alP
-vpY
-aFn
-aGP
+aGJ
avI
aJI
aJI
@@ -97380,7 +99009,7 @@ aVF
aVF
aYM
aJI
-bbA
+bSu
aYV
bdr
bdb
@@ -97601,26 +99230,26 @@ aaf
aaa
aaS
aaf
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
aaf
-aaa
-aaa
-aaa
-aaa
-aaa
-aag
-alO
-arp
-alO
-awD
-anf
-anf
-awD
-anf
-aoP
-alP
-aBE
-alP
-aDX
+aaf
+auR
+auS
+ayb
+azk
+atZ
+amN
+amN
+aAs
+amN
+amN
alP
aGJ
avI
@@ -97652,7 +99281,7 @@ boq
boq
brj
bpE
-btk
+bop
bum
bvq
bzn
@@ -97857,22 +99486,22 @@ adS
aeG
aaa
aaS
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
aaf
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aag
-cxW
-anf
-aqv
-anf
-anf
-anf
-aEl
-anf
+aaf
+alO
+auR
+auR
+auR
+azT
+aAi
cVb
cVb
cVb
@@ -97909,7 +99538,7 @@ bpE
bpE
bpE
bpE
-bti
+bot
bul
bvp
bzm
@@ -98123,11 +99752,11 @@ aaa
aaa
aag
alO
-alO
+arp
alO
anf
-auC
-alP
+anf
+anf
anf
anf
cVb
@@ -98149,7 +99778,7 @@ aSR
aUi
aVJ
aOX
-aYP
+aPP
bal
bam
aYV
@@ -98378,20 +100007,20 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
-aaa
-alO
-aqy
-anf
-alP
-awE
+aag
+ass
anf
+aqv
+ayf
+aux
+auU
+avv
+avC
cVb
vCb
-wUY
-khb
-sxs
+bBI
+bHx
+bHB
tal
aCI
aIj
@@ -98635,15 +100264,15 @@ aaf
aaf
aaf
aaf
-aaf
-apC
-apC
-apC
-apC
-apC
-apC
+aag
+alO
+anf
+alO
+aud
+auz
alP
anf
+aCG
cVb
cVb
cVb
@@ -98656,12 +100285,12 @@ aIq
aKK
aMy
aIp
-aOX
+arg
aQm
-aRJ
-aRJ
-aRJ
-aVK
+aBx
+aGp
+aGp
+aHc
aRJ
aRJ
aRJ
@@ -98894,18 +100523,18 @@ aof
aof
aof
aof
-arq
-asv
-atv
-auD
-apC
-awF
-anf
alP
-arA
-anf
+alP
+alP
+alP
+alP
+awF
+aCG
+alP
+bBM
+aBE
aCz
-asw
+aQU
aCJ
aGT
aIn
@@ -98915,10 +100544,10 @@ aMt
aIp
aOW
aQm
-aRJ
-aSS
-aUj
-aRJ
+aGm
+aGw
+aGP
+aHr
aRJ
aYQ
cBg
@@ -99151,35 +100780,35 @@ aoh
aoN
apA
aof
-ars
-anf
-arx
-anf
-apC
+arq
+asv
+atv
+auD
+alP
aoQ
-cqM
-asw
-asw
-asw
-aCA
-anf
-aFp
+avD
+ayg
+ayg
+ayg
+azf
+aFn
+aAq
aGW
anf
aIp
-fGf
+bcr
aMA
aIp
aOX
aQm
-aRJ
-aST
-aUk
-aRJ
+aGm
+aGx
+aGR
+aHr
aRJ
aYQ
bam
-aYV
+bBT
aYV
aYV
aYV
@@ -99396,10 +101025,10 @@ adU
adU
adU
adU
-adU
-adU
-adU
alg
+aTq
+aTq
+aTq
acx
amv
ane
@@ -99408,11 +101037,11 @@ aog
aoM
apz
aqw
-arr
+asM
asw
asw
auE
-apC
+alP
awG
auF
alP
@@ -99429,14 +101058,14 @@ aMz
aNQ
aOX
aQm
-aRJ
-aRJ
-aRJ
-aRJ
+aGn
+aGK
+aGK
+aHs
aRJ
aYR
ban
-aYV
+bCI
aYV
aYV
bez
@@ -99493,7 +101122,7 @@ bAw
cmk
cnf
bzs
-aaa
+aaf
aaa
aaa
aaa
@@ -99665,22 +101294,22 @@ aoi
aoO
apB
aqx
-art
+asN
anf
anf
auF
-apC
+alP
awH
auF
alP
-aAr
-anf
+axd
+aBF
alP
aaa
aFq
aGX
aIp
-aJO
+bHZ
aKU
aME
aNN
@@ -99693,13 +101322,13 @@ aXo
aXo
aYO
bap
-aYV
+bCI
aYV
bci
beB
bfS
bfS
-kQk
+ckJ
ipA
gbT
cTO
@@ -99922,35 +101551,35 @@ aof
aof
aof
aof
-anf
+asV
aoP
atw
auF
-apC
+alP
aoP
auF
azr
-anf
+aRv
atw
alP
alP
aFo
aGV
aIp
-aJN
+aJO
aLd
aMN
aNQ
aOZ
aOX
aOX
-aOX
+cma
aUz
aVM
aOX
aYT
bam
-aYV
+bDs
baR
bcb
bdl
@@ -100007,7 +101636,7 @@ bAw
bAw
clp
aag
-aaa
+apv
aaa
aaa
aaa
@@ -100183,9 +101812,9 @@ anf
anf
aty
auF
-apC
alP
-auF
+aAt
+aAu
alP
alP
alP
@@ -100264,7 +101893,7 @@ bPn
bPn
bPn
aag
-aaa
+gXs
aaa
aaa
aaa
@@ -100436,16 +102065,16 @@ aaa
aaa
apC
anf
-anf
+aRv
alP
atx
auF
-apC
+alP
auD
auF
-alP
-aAs
-anf
+apE
+axJ
+awL
alP
aCG
aFr
@@ -100519,9 +102148,9 @@ czY
cOT
aaa
aaa
+gXs
aaa
-aaa
-aaa
+gXs
aaa
aaa
aaa
@@ -100697,13 +102326,13 @@ alP
alP
apE
auG
-apC
-aoP
+alP
+clM
auF
apE
anf
anf
-alP
+azh
aCG
aDZ
aFu
@@ -100776,9 +102405,9 @@ czY
cOT
aaa
aaa
+gXs
aaa
-aaa
-aaa
+gXs
aaa
aaa
aaa
@@ -100964,12 +102593,12 @@ aCB
aEB
aFs
bbE
-aIr
+amd
bav
aLf
-aIt
-aNS
-aPb
+aCU
+aDG
+aRO
aQp
aRN
aIt
@@ -100991,7 +102620,7 @@ bls
bfT
boD
bpY
-bsP
+aPY
box
btw
buT
@@ -101032,11 +102661,11 @@ cQB
czY
cOT
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+apv
+apv
+apv
+apv
+apv
aaa
aaa
aaa
@@ -101209,24 +102838,24 @@ apC
alP
alP
alP
-anf
+ciw
auH
avF
awI
ayc
+ciV
asw
-aAu
asw
aCD
aEa
aFv
aGG
aIu
-aJQ
-bCI
+aBA
aIt
aIt
-aPb
+aDG
+aRO
aIt
aRN
aIt
@@ -101472,17 +103101,17 @@ avE
anf
anf
awD
-aAt
+anf
aty
aCC
aDZ
+anf
aFu
-aFu
-aIs
-aJP
-aLg
-aMH
+aBy
+aJJ
+aCA
aIt
+aDJ
aYW
aYW
aYW
@@ -101501,7 +103130,7 @@ cHJ
cHL
blw
bjP
-blt
+bTu
bfT
boG
bqa
@@ -101549,10 +103178,10 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
-aaa
-aaa
+bsP
+bti
+btk
+buh
aaa
aaa
aaa
@@ -101734,12 +103363,12 @@ alP
aCE
aDZ
aFu
-aHc
-aIw
+aFu
+aBz
aJS
-aJS
-aMJ
+aCS
aNP
+aDL
aOS
aOS
aOS
@@ -101802,15 +103431,15 @@ cOT
cQB
cAa
cOT
+gXs
+bqb
+brl
aaa
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+bsP
+bsP
+bsP
+buh
aaa
aaa
aaa
@@ -101978,7 +103607,7 @@ aaf
aaf
alO
aqA
-anf
+arz
alP
anf
anf
@@ -101987,25 +103616,25 @@ awJ
anf
alP
aAv
-anf
+cih
aCE
aDZ
aFu
-aHb
+aIy
aIv
-aJR
-aJR
+aBD
aIt
aIt
+aDG
+aRO
+aIt
aPd
aIt
-aRO
-aRO
-aUC
-aVP
+aPb
+aIt
aXu
aYW
-bat
+aVS
bbD
aYV
aXq
@@ -102060,14 +103689,14 @@ czU
czZ
cOT
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+apv
+brT
+brT
+bsP
+bsP
+bsP
+buA
+bti
aaa
aaa
aaa
@@ -102251,15 +103880,15 @@ aFu
aHd
aIx
aJF
-aLh
+aQq
+aNS
+aDG
+aRO
aIt
-aNV
aPd
aIt
-aRO
-aRO
+aPb
aIt
-aVQ
aXu
aYW
aVQ
@@ -102316,15 +103945,15 @@ cOT
cgm
czY
cOT
+gXs
+bqb
+brl
+bsB
+brT
+brT
aaa
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+bsB
aaa
aaa
aaa
@@ -102489,8 +104118,8 @@ aaf
aaf
aaa
aaa
-alO
-apD
+alP
+aie
aEl
anf
arx
@@ -102504,22 +104133,22 @@ alP
alP
aCF
aDZ
+alP
aFw
aFw
aFw
aFw
aFw
-aFw
-aFw
+aFu
aPf
aQq
aRP
+cfE
aIt
aIt
-moD
aWd
aXV
-aIt
+aGl
bbD
aYV
aXq
@@ -102576,11 +104205,11 @@ cNW
aaa
aaa
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+bsB
+bsB
+bti
+bsP
+gXs
aaa
aaa
aaa
@@ -102746,15 +104375,15 @@ aaa
aaf
aaf
aaa
-alP
+alO
anf
anf
arw
-asA
-asA
+bxh
+clL
anf
alP
-awL
+aqB
anf
anf
apE
@@ -102763,17 +104392,17 @@ aCH
aED
aFy
aGO
-aIB
-aJJ
+aIA
+aJM
aKZ
-aMW
aFw
aFu
aFu
aFu
+aFu
aTc
aUD
-aVS
+aSk
aYW
aYW
bax
@@ -102837,10 +104466,10 @@ aaa
aaa
aaa
aaa
-cOT
-cOT
-cOT
-aag
+aaa
+aaa
+aaa
+aaa
aaa
aaa
aaa
@@ -103020,17 +104649,17 @@ aCk
aEC
aFx
aGM
-aIy
+aIB
aJG
-cAz
aMK
aFw
-aPg
+aMW
+aPi
aQr
aFu
aTb
aIt
-aVR
+aLg
aYW
aYW
aUD
@@ -103091,13 +104720,13 @@ aaa
aaa
aaa
aaa
+apv
+apv
+apv
+apv
aaa
aaa
aaa
-cOT
-cOe
-cqu
-aag
aaa
aaa
aaa
@@ -103259,16 +104888,16 @@ aaa
aaa
aaa
aaa
+gXs
alP
-alP
-alP
-aqB
-arx
-anf
-anf
-anf
-alP
-awM
+apD
+ayf
+bev
+cil
+aFn
+aFn
+aBB
+bGB
ayg
ayg
ayg
@@ -103281,9 +104910,9 @@ aFw
aLo
aLb
aFw
-aFw
-aPi
-aQt
+aPg
+aYW
+aYW
aRQ
aIt
aUF
@@ -103344,17 +104973,17 @@ cOT
cgm
czY
cOT
-aaf
-aaf
-aaf
-aaf
-aaf
-cNW
-cNW
-cOT
-cqu
-cOT
-aag
+aaa
+aaa
+aaa
+aaa
+gXs
+aaa
+aaa
+gXs
+aaa
+aaa
+aaa
aaa
aaa
aaa
@@ -103515,13 +105144,13 @@ aaa
aaa
aaa
aaa
-aaa
-alP
-aoP
-alP
-alP
-apE
-alP
+amx
+amx
+amx
+amx
+aMB
+amx
+amx
atB
alP
alP
@@ -103535,16 +105164,16 @@ aEd
aFw
aHf
aIz
-aJM
+aJP
aLa
-cBZ
aFw
aPh
+aYW
aQs
aFu
aTd
aUE
-aVT
+aVR
aYW
aYW
aZd
@@ -103604,13 +105233,13 @@ cOT
aaa
aaa
aaa
-aaf
-aaf
-cNW
-cwy
-cmn
-cmn
-cOT
+aaa
+gXs
+aaa
+aaa
+gXs
+aaa
+aaa
aaa
aaa
aaa
@@ -103765,36 +105394,35 @@ aaa
aaa
aaa
aaa
-aaf
-aaf
-aaf
-aaf
-alP
-alP
-alP
-alP
-alP
-anf
-anf
-anf
-anf
-anf
-anf
-aty
-anf
-awx
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+amx
+axE
+aIr
+aJm
+aNV
+bDX
+bFC
+bGg
+bGh
+bGg
+bGS
avI
asA
apE
-arx
aCo
+aCG
aEf
aFw
aGU
aIC
aJU
aLe
-aMX
aFw
aCR
aCR
@@ -103802,6 +105430,7 @@ aCR
aCR
aCR
aCR
+aCR
aWe
aWe
aCR
@@ -103864,10 +105493,10 @@ cNW
cNW
cNW
cNW
-cmn
-cmn
-cmn
cOT
+cOT
+aag
+aaa
aaa
aaa
aaa
@@ -104026,15 +105655,15 @@ aaa
aaa
aaa
aaa
-alO
-amx
-anf
-anf
-anf
-anf
-alP
-alP
-alP
+aaa
+aaa
+aaa
+apY
+aIr
+aIr
+aIr
+aIr
+aMC
asB
asB
asB
@@ -104048,13 +105677,13 @@ aCK
aEf
aFw
aHg
-aIA
+cBZ
aJT
aLc
-aMX
aFw
aFz
aFz
+aFz
aRR
aTe
aUG
@@ -104118,14 +105747,14 @@ cko
clq
cmq
ciI
-cnJ
-cri
-cTI
-cmn
-cBT
-cBU
-cOT
-aaa
+bae
+cmJ
+cOe
+cOe
+cmK
+aag
+gXs
+apv
aaa
aaa
aaa
@@ -104283,15 +105912,15 @@ aaa
aaa
aaa
aaa
-alP
-alP
-alP
-alP
-alP
-anf
-alP
-aqD
-arz
+aaa
+aaa
+aaa
+apY
+aIr
+aIr
+aIr
+aIr
+aNu
asB
atD
auJ
@@ -104308,8 +105937,8 @@ aGY
aII
aJW
aMX
-aMX
aNW
+aFz
aPl
aQv
aPl
@@ -104375,13 +106004,13 @@ cNW
cOx
cBL
cOe
-cOe
cvO
cNW
cNW
-cNW
-cNW
-cNW
+cOT
+cOT
+aag
+aaa
aaa
aaa
aaa
@@ -104538,17 +106167,17 @@ aaa
aaa
aaa
aaa
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-alP
-anf
-alP
-aqC
-ary
+aaa
+aaa
+aaa
+aaa
+aaa
+amx
+aIr
+aIr
+aIr
+aIr
+aIr
asB
atC
auI
@@ -104566,7 +106195,7 @@ aHi
aJV
aFw
aFw
-aFw
+aFz
aPk
aQu
aPk
@@ -104631,9 +106260,9 @@ cNW
cNW
cNW
cNW
-cNW
cOe
-csy
+bag
+clH
cko
cAf
aaa
@@ -104800,12 +106429,12 @@ aaa
aaa
aaa
aaa
-aaf
-alP
-anf
-alP
-alP
-alP
+apY
+aIr
+aIr
+aIr
+aIr
+aIr
asB
atE
auI
@@ -104815,7 +106444,7 @@ avM
azv
aAA
asB
-cSz
+aCE
aEi
aFw
aHl
@@ -104883,14 +106512,14 @@ ceO
cNW
cgm
chw
-ciK
+cgp
cjC
+cgu
ckp
cls
-cmr
-cNW
cOe
-cmo
+cOe
+cou
cNW
aaf
aaf
@@ -105055,20 +106684,20 @@ aaa
aaa
aaa
aaa
-aaf
-aaf
-aaf
-alP
-anf
-apE
-anf
-anf
+aaa
+aaa
+apY
+aIr
+aIr
+aIr
+aIr
+aIr
asB
asB
asB
avL
awR
-auI
+aMp
azu
aAz
asB
@@ -105108,7 +106737,7 @@ buo
bvJ
bCk
byo
-aDH
+btD
bxP
bCf
bvK
@@ -105138,16 +106767,16 @@ bQZ
cdR
ceN
cNW
-cgp
+axY
chv
ciJ
cbf
-cbf
+ciK
clr
-bnt
-cNW
+bah
cOe
-cou
+cOe
+bMB
cOT
aaa
aaa
@@ -105314,12 +106943,12 @@ aaa
aaa
aaa
aaa
-aaf
-alP
-aoQ
-alP
-aqE
-arA
+amx
+awM
+aIr
+aJE
+aIr
+bFk
asB
atG
auL
@@ -105401,10 +107030,10 @@ cNW
cNW
cNW
clt
-bnt
-cNW
+cQw
cOe
-bMB
+cOe
+bNA
cOT
aaa
aaa
@@ -105570,13 +107199,13 @@ aaa
aaa
aaa
aaa
-aaf
-aaf
-alP
-alP
-alP
-alP
-alP
+aaa
+amx
+amx
+amx
+amx
+amx
+amx
asB
atF
auK
@@ -105657,11 +107286,11 @@ chx
cNW
aaa
cNW
-cgr
-cms
+clt
+cQw
+cNW
+cNW
cNW
-cOe
-bNA
cNW
aaf
aaf
@@ -105862,9 +107491,9 @@ aXB
aZh
baB
aCR
-bcq
+bNa
bdx
-bcq
+bPv
bgc
bgc
biX
@@ -105915,10 +107544,10 @@ cOT
aaa
cOT
clt
-bnt
+cQw
+cOe
cOe
cOe
-cNW
cNW
aaa
aaa
@@ -106173,18 +107802,18 @@ aaa
cOT
clt
cQw
-cNW
-cNW
-cNW
-aaa
-aaa
-aaS
-aaS
-aaS
-aaS
-aaS
-aaS
-aaS
+cOe
+cOe
+cOe
+cOe
+sQX
+cdi
+cdi
+cdi
+cdi
+cdi
+cdi
+cdi
aaS
aaS
aba
@@ -106370,7 +107999,7 @@ aCR
aCR
aCR
aTl
-amd
+aUL
aVW
aXD
aZj
@@ -106423,17 +108052,17 @@ ccT
bSc
bSc
cfu
-cgu
+bnt
chA
cNW
aaa
cNW
clt
cQw
-aaf
-aaf
-aaf
-aaf
+cOe
+cOe
+cOe
+cNW
aaf
aaS
aaa
@@ -106687,10 +108316,10 @@ cNW
cNW
clt
cQw
-aaa
-aaa
-aaa
-aaa
+cOe
+cOe
+cOe
+cNW
aaa
aaS
aaa
@@ -106936,18 +108565,18 @@ cbZ
bSl
cmo
cNW
-cOx
+ckR
cNW
chC
ciL
cOe
cOe
clv
-cmt
-aaa
-aaa
-aaa
-aaa
+cQw
+cNW
+cNW
+cNW
+cNW
aaa
aba
aaf
@@ -107203,7 +108832,7 @@ clu
cmt
aaa
aaa
-aaa
+gXs
aaa
aaa
aaf
@@ -107717,7 +109346,7 @@ cjD
cjD
cnj
aaa
-aaa
+gXs
aaa
aaa
aaf
@@ -107988,7 +109617,7 @@ crD
aaa
aaa
aaa
-csZ
+aSY
aaa
aaa
aaa
@@ -108235,18 +109864,18 @@ cyU
cpi
cpi
cpi
-cqJ
+aSH
+aSS
crk
crk
crk
crk
crk
+aST
+aSH
+aSS
crk
-crk
-csE
-cpi
-csY
-cpi
+aST
cpi
cpi
ctB
@@ -108502,7 +110131,7 @@ crF
aaa
aaa
aaa
-csZ
+aTa
aaa
aaa
aaa
@@ -108983,8 +110612,8 @@ cbf
cbf
cbf
cbf
-cbf
bYr
+cbf
clr
cad
cbi
@@ -109241,7 +110870,7 @@ cNW
cNW
cNW
cNW
-cNW
+clR
clt
cac
cbh
@@ -109507,7 +111136,7 @@ cbf
cbf
ceT
cNW
-cOe
+clT
chH
cNW
aaf
diff --git a/code/__DEFINES/components.dm b/code/__DEFINES/components.dm
index 9dad2926f8..a8c623a889 100644
--- a/code/__DEFINES/components.dm
+++ b/code/__DEFINES/components.dm
@@ -8,7 +8,13 @@
#define ELEMENT_INCOMPATIBLE 1 // Return value to cancel attaching
// /datum/element flags
+/// Causes the detach proc to be called when the host object is being deleted
#define ELEMENT_DETACH (1 << 0)
+/**
+ * Only elements created with the same arguments given after `id_arg_index` share an element instance
+ * The arguments are the same when the text and number values are the same and all other values have the same ref
+ */
+#define ELEMENT_BESPOKE (1 << 1)
// How multiple components of the exact same type are handled in the same datum
@@ -153,6 +159,7 @@
#define COMSIG_MOB_HUD_CREATED "mob_hud_created" //from base of mob/create_mob_hud(): ()
#define COMSIG_MOB_ATTACK_HAND "mob_attack_hand" //from base of
#define COMSIG_MOB_ITEM_ATTACK "mob_item_attack" //from base of /obj/item/attack(): (mob/M, mob/user)
+ #define COMPONENT_ITEM_NO_ATTACK 1
#define COMSIG_MOB_ITEM_AFTERATTACK "mob_item_afterattack" //from base of obj/item/afterattack(): (atom/target, mob/user, proximity_flag, click_parameters)
#define COMSIG_MOB_ATTACK_RANGED "mob_attack_ranged" //from base of mob/RangedAttack(): (atom/A, params)
#define COMSIG_MOB_THROW "mob_throw" //from base of /mob/throw_item(): (atom/target)
@@ -318,3 +325,11 @@
//Ouch my toes!
#define CALTROP_BYPASS_SHOES 1
#define CALTROP_IGNORE_WALKERS 2
+
+//Xenobio hotkeys
+#define COMSIG_XENO_SLIME_CLICK_CTRL "xeno_slime_click_ctrl" //from slime CtrlClickOn(): (/mob)
+#define COMSIG_XENO_SLIME_CLICK_ALT "xeno_slime_click_alt" //from slime AltClickOn(): (/mob)
+#define COMSIG_XENO_SLIME_CLICK_SHIFT "xeno_slime_click_shift" //from slime ShiftClickOn(): (/mob)
+#define COMSIG_XENO_TURF_CLICK_SHIFT "xeno_turf_click_shift" //from turf ShiftClickOn(): (/mob)
+#define COMSIG_XENO_TURF_CLICK_CTRL "xeno_turf_click_alt" //from turf AltClickOn(): (/mob)
+#define COMSIG_XENO_MONKEY_CLICK_CTRL "xeno_monkey_click_ctrl" //from monkey CtrlClickOn(): (/mob)
diff --git a/code/__DEFINES/say.dm b/code/__DEFINES/say.dm
index 4073f12c0e..beeee22df9 100644
--- a/code/__DEFINES/say.dm
+++ b/code/__DEFINES/say.dm
@@ -75,6 +75,10 @@
#define LINGHIVE_LING 2
#define LINGHIVE_LINK 3
+//whether the emote is visible or audible.
+#define EMOTE_VISIBLE 1
+#define EMOTE_AUDIBLE 2
+
//Don't set this very much higher then 1024 unless you like inviting people in to dos your server with message spam
#define MAX_MESSAGE_LEN 2048 //Citadel edit: What's the WORST that could happen?
#define MAX_NAME_LEN 42
diff --git a/code/__DEFINES/status_effects.dm b/code/__DEFINES/status_effects.dm
index 0f1a36d663..f9360117bb 100644
--- a/code/__DEFINES/status_effects.dm
+++ b/code/__DEFINES/status_effects.dm
@@ -58,6 +58,8 @@
#define MAX_MANIA_SEVERITY 100 //how high the mania severity can go
#define MANIA_DAMAGE_TO_CONVERT 90 //how much damage is required before it'll convert affected targets
+#define STATUS_EFFECT_CHOKINGSTRAND /datum/status_effect/strandling //Choking Strand
+
#define STATUS_EFFECT_HISWRATH /datum/status_effect/his_wrath //His Wrath.
#define STATUS_EFFECT_SUMMONEDGHOST /datum/status_effect/cultghost //is a cult ghost and can't use manifest runes
diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm
index d3e9131226..14dbd97ffa 100644
--- a/code/__DEFINES/traits.dm
+++ b/code/__DEFINES/traits.dm
@@ -120,8 +120,9 @@
#define TRAIT_UNINTELLIGIBLE_SPEECH "unintelligible-speech"
#define TRAIT_SOOTHED_THROAT "soothed-throat"
#define TRAIT_LAW_ENFORCEMENT_METABOLISM "law-enforcement-metabolism"
-#define TRAIT_STRONG_GRABBER "strong_grabber"
-#define TRAIT_CALCIUM_HEALER "calcium_healer"
+#define TRAIT_STRONG_GRABBER "strong_grabber"
+#define TRAIT_CALCIUM_HEALER "calcium_healer"
+#define TRAIT_MAGIC_CHOKE "magic_choke"
#define TRAIT_CAPTAIN_METABOLISM "captain-metabolism"
#define TRAIT_ABDUCTOR_TRAINING "abductor-training"
#define TRAIT_ABDUCTOR_SCIENTIST_TRAINING "abductor-scientist-training"
diff --git a/code/__HELPERS/cmp.dm b/code/__HELPERS/cmp.dm
index c0501b4e41..87f3a32b0d 100644
--- a/code/__HELPERS/cmp.dm
+++ b/code/__HELPERS/cmp.dm
@@ -85,6 +85,9 @@ GLOBAL_VAR_INIT(cmp_field, "name")
/proc/cmp_job_display_asc(datum/job/A, datum/job/B)
return A.display_order - B.display_order
+/proc/cmp_uplink_items_dsc(datum/uplink_item/A, datum/uplink_item/B)
+ return sorttext(initial(B.name), initial(A.name))
+
/proc/cmp_numbered_displays_name_asc(datum/numbered_display/A, datum/numbered_display/B)
return sorttext(A.sample_object.name, B.sample_object.name)
diff --git a/code/__HELPERS/global_lists.dm b/code/__HELPERS/global_lists.dm
index 7852251230..a7bf5da17f 100644
--- a/code/__HELPERS/global_lists.dm
+++ b/code/__HELPERS/global_lists.dm
@@ -97,6 +97,16 @@
var/datum/emote/E = new path()
E.emote_list[E.key] = E
+ //Uplink Items
+ for(var/path in subtypesof(/datum/uplink_item))
+ var/datum/uplink_item/I = path
+ if(!initial(I.item)) //We add categories to a separate list.
+ GLOB.uplink_categories |= initial(I.category)
+ continue
+ GLOB.uplink_items += path
+ //(sub)typesof entries are listed by the order they are loaded in the code, so we'll have to rearrange them here.
+ GLOB.uplink_items = sortList(GLOB.uplink_items, /proc/cmp_uplink_items_dsc)
+
init_subtypes(/datum/crafting_recipe, GLOB.crafting_recipes)
//creates every subtype of prototype (excluding prototype) and adds it to list L.
diff --git a/code/_globalvars/lists/objects.dm b/code/_globalvars/lists/objects.dm
index 14c752613b..fa68fab85f 100644
--- a/code/_globalvars/lists/objects.dm
+++ b/code/_globalvars/lists/objects.dm
@@ -19,6 +19,8 @@ GLOBAL_LIST(chemical_reagents_list) //list of all /datum/reagent datums index
GLOBAL_LIST_EMPTY(materials_list) //list of all /datum/material datums indexed by material id.
GLOBAL_LIST_EMPTY(tech_list) //list of all /datum/tech datums indexed by id.
GLOBAL_LIST_EMPTY(surgeries_list) //list of all surgeries by name, associated with their path.
+GLOBAL_LIST_EMPTY(uplink_items) //list of all uplink item typepaths, ascendingly sorted by their initial name.
+GLOBAL_LIST_EMPTY(uplink_categories) //list of all uplink categories, listed by the order they are loaded in code. Be careful.
GLOBAL_LIST_EMPTY(crafting_recipes) //list of all table craft recipes
GLOBAL_LIST_EMPTY(rcd_list) //list of Rapid Construction Devices.
GLOBAL_LIST_EMPTY(apcs_list) //list of all Area Power Controller machines, separate from machines for powernet speeeeeeed.
diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm
index 3a45e9bf60..9cb0c52b9a 100644
--- a/code/_onclick/item_attack.dm
+++ b/code/_onclick/item_attack.dm
@@ -39,23 +39,12 @@
if(..())
return TRUE
user.changeNext_move(CLICK_CD_MELEE)
- if(user.a_intent == INTENT_HARM && stat == DEAD && (butcher_results || guaranteed_butcher_results)) //can we butcher it?
- var/datum/component/butchering/butchering = I.GetComponent(/datum/component/butchering)
- if(butchering && butchering.butchering_enabled)
- to_chat(user, "You begin to butcher [src]...")
- playsound(loc, butchering.butcher_sound, 50, TRUE, -1)
- if(do_mob(user, src, butchering.speed) && Adjacent(I))
- butchering.Butcher(user, src)
- return 1
- else if(I.get_sharpness() && !butchering) //give sharp objects butchering functionality, for consistency
- I.AddComponent(/datum/component/butchering, 80 * I.toolspeed)
- attackby(I, user, params) //call the attackby again to refresh and do the butchering check again
- return
return I.attack(src, user)
/obj/item/proc/attack(mob/living/M, mob/living/user)
- SEND_SIGNAL(src, COMSIG_ITEM_ATTACK, M, user)
+ if(SEND_SIGNAL(src, COMSIG_ITEM_ATTACK, M, user) & COMPONENT_ITEM_NO_ATTACK)
+ return
SEND_SIGNAL(user, COMSIG_MOB_ITEM_ATTACK, M, user)
if(item_flags & NOBLUDGEON)
return
diff --git a/code/controllers/subsystem/dcs.dm b/code/controllers/subsystem/dcs.dm
index e94f233f04..faf95fd319 100644
--- a/code/controllers/subsystem/dcs.dm
+++ b/code/controllers/subsystem/dcs.dm
@@ -6,10 +6,22 @@ PROCESSING_SUBSYSTEM_DEF(dcs)
/datum/controller/subsystem/processing/dcs/Recover()
comp_lookup = SSdcs.comp_lookup
-/datum/controller/subsystem/processing/dcs/proc/GetElement(eletype)
- . = elements_by_type[eletype]
+/datum/controller/subsystem/processing/dcs/proc/GetElement(datum/element/eletype, ...)
+ var/element_id = eletype
+
+ if(initial(eletype.element_flags) & ELEMENT_BESPOKE)
+ var/list/fullid = list("[eletype]")
+ for(var/i in initial(eletype.id_arg_index) to length(args))
+ var/argument = args[i]
+ if(istext(argument) || isnum(argument))
+ fullid += "[argument]"
+ else
+ fullid += "[REF(argument)]"
+ element_id = fullid.Join("&")
+
+ . = elements_by_type[element_id]
if(.)
return
if(!ispath(eletype, /datum/element))
CRASH("Attempted to instantiate [eletype] as a /datum/element")
- . = elements_by_type[eletype] = new eletype
\ No newline at end of file
+ . = elements_by_type[element_id] = new eletype
\ No newline at end of file
diff --git a/code/datums/brain_damage/hypnosis.dm b/code/datums/brain_damage/hypnosis.dm
index f937c19658..37aee6df7e 100644
--- a/code/datums/brain_damage/hypnosis.dm
+++ b/code/datums/brain_damage/hypnosis.dm
@@ -68,4 +68,4 @@
new /datum/hallucination/chat(owner, TRUE, FALSE, "[hypnotic_phrase]")
/datum/brain_trauma/hypnosis/handle_hearing(datum/source, list/hearing_args)
- hearing_args[HEARING_MESSAGE] = target_phrase.Replace(hearing_args[HEARING_MESSAGE], "$1")
+ hearing_args[HEARING_RAW_MESSAGE] = target_phrase.Replace(hearing_args[HEARING_RAW_MESSAGE], "$1")
diff --git a/code/datums/brain_damage/mild.dm b/code/datums/brain_damage/mild.dm
index 012f771a29..235417d62c 100644
--- a/code/datums/brain_damage/mild.dm
+++ b/code/datums/brain_damage/mild.dm
@@ -241,7 +241,7 @@
if(prob(25))
var/deja_vu = pick_n_take(hear_dejavu)
var/static/regex/quoted_spoken_message = regex("\".+\"", "gi")
- hearing_args[HEARING_MESSAGE] = quoted_spoken_message.Replace(hearing_args[HEARING_MESSAGE], "\"[deja_vu]\"") //Quotes included to avoid cases where someone says part of their name
+ hearing_args[HEARING_RAW_MESSAGE] = quoted_spoken_message.Replace(hearing_args[HEARING_RAW_MESSAGE], "\"[deja_vu]\"") //Quotes included to avoid cases where someone says part of their name
return
if(hear_dejavu.len >= 15)
if(prob(50))
diff --git a/code/datums/brain_damage/phobia.dm b/code/datums/brain_damage/phobia.dm
index 034f2baaaf..80a1bd2470 100644
--- a/code/datums/brain_damage/phobia.dm
+++ b/code/datums/brain_damage/phobia.dm
@@ -88,7 +88,7 @@
if(findtext(hearing_args[HEARING_RAW_MESSAGE], reg))
addtimer(CALLBACK(src, .proc/freak_out, null, word), 10) //to react AFTER the chat message
- hearing_args[HEARING_MESSAGE] = reg.Replace(hearing_args[HEARING_MESSAGE], "$1")
+ hearing_args[HEARING_RAW_MESSAGE] = reg.Replace(hearing_args[HEARING_RAW_MESSAGE], "$1")
break
/datum/brain_trauma/mild/phobia/handle_speech(datum/source, list/speech_args)
diff --git a/code/datums/brain_damage/split_personality.dm b/code/datums/brain_damage/split_personality.dm
index dfe63ce141..a1284319f1 100644
--- a/code/datums/brain_damage/split_personality.dm
+++ b/code/datums/brain_damage/split_personality.dm
@@ -198,9 +198,9 @@
/datum/brain_trauma/severe/split_personality/brainwashing/handle_hearing(datum/source, list/hearing_args)
if(HAS_TRAIT(owner, TRAIT_DEAF) || owner == hearing_args[HEARING_SPEAKER])
return
- var/message = hearing_args[HEARING_MESSAGE]
+ var/message = hearing_args[HEARING_RAW_MESSAGE]
if(findtext(message, codeword))
- hearing_args[HEARING_MESSAGE] = replacetext(message, codeword, "[codeword]")
+ hearing_args[HEARING_RAW_MESSAGE] = replacetext(message, codeword, "[codeword]")
addtimer(CALLBACK(src, /datum/brain_trauma/severe/split_personality.proc/switch_personalities), 10)
/datum/brain_trauma/severe/split_personality/brainwashing/handle_speech(datum/source, list/speech_args)
diff --git a/code/datums/components/_component.dm b/code/datums/components/_component.dm
index fbe94cbb9e..f938a70308 100644
--- a/code/datums/components/_component.dm
+++ b/code/datums/components/_component.dm
@@ -184,6 +184,7 @@
// The type arg is casted so initial works, you shouldn't be passing a real instance into this
/datum/proc/GetComponent(datum/component/c_type)
+ RETURN_TYPE(c_type)
if(initial(c_type.dupe_mode) == COMPONENT_DUPE_ALLOWED)
stack_trace("GetComponent was called to get a component of which multiple copies could be on an object. This can easily break and should be changed. Type: \[[c_type]\]")
var/list/dc = datum_components
diff --git a/code/datums/components/butchering.dm b/code/datums/components/butchering.dm
index 372fa8e283..1518a84456 100644
--- a/code/datums/components/butchering.dm
+++ b/code/datums/components/butchering.dm
@@ -4,8 +4,9 @@
var/bonus_modifier = 0 //percentage increase to bonus item chance
var/butcher_sound = 'sound/weapons/slice.ogg' //sound played when butchering
var/butchering_enabled = TRUE
+ var/can_be_blunt = FALSE
-/datum/component/butchering/Initialize(_speed, _effectiveness, _bonus_modifier, _butcher_sound, disabled)
+/datum/component/butchering/Initialize(_speed, _effectiveness, _bonus_modifier, _butcher_sound, disabled, _can_be_blunt)
if(_speed)
speed = _speed
if(_effectiveness)
@@ -16,6 +17,22 @@
butcher_sound = _butcher_sound
if(disabled)
butchering_enabled = FALSE
+ if(_can_be_blunt)
+ can_be_blunt = _can_be_blunt
+ if(isitem(parent))
+ RegisterSignal(parent, COMSIG_ITEM_ATTACK, .proc/onItemAttack)
+
+/datum/component/butchering/proc/onItemAttack(obj/item/source, mob/living/M, mob/living/user)
+ if(user.a_intent == INTENT_HARM && M.stat == DEAD && (M.butcher_results || M.guaranteed_butcher_results)) //can we butcher it?
+ if(butchering_enabled && (can_be_blunt || source.get_sharpness()))
+ INVOKE_ASYNC(src, .proc/startButcher, source, M, user)
+ return COMPONENT_ITEM_NO_ATTACK
+
+/datum/component/butchering/proc/startButcher(obj/item/source, mob/living/M, mob/living/user)
+ to_chat(user, "You begin to butcher [M]...")
+ playsound(M.loc, butcher_sound, 50, TRUE, -1)
+ if(do_mob(user, M, speed) && M.Adjacent(source))
+ Butcher(user, M)
/datum/component/butchering/proc/Butcher(mob/living/butcher, mob/living/meat)
var/turf/T = meat.drop_location()
@@ -50,3 +67,23 @@
/datum/component/butchering/proc/ButcherEffects(mob/living/meat) //extra effects called on butchering, override this via subtypes
return
+
+///Special snowflake component only used for the recycler.
+/datum/component/butchering/recycler
+
+/datum/component/butchering/recycler/Initialize(_speed, _effectiveness, _bonus_modifier, _butcher_sound, disabled, _can_be_blunt)
+ if(!istype(parent, /obj/machinery/recycler)) //EWWW
+ return COMPONENT_INCOMPATIBLE
+ . = ..()
+ if(. == COMPONENT_INCOMPATIBLE)
+ return
+ RegisterSignal(parent, COMSIG_MOVABLE_CROSSED, .proc/onCrossed)
+
+/datum/component/butchering/recycler/proc/onCrossed(datum/source, mob/living/L)
+ if(!istype(L))
+ return
+ var/obj/machinery/recycler/eater = parent
+ if(eater.safety_mode || (eater.stat & (BROKEN|NOPOWER))) //I'm so sorry.
+ return
+ if(L.stat == DEAD && (L.butcher_results || L.guaranteed_butcher_results))
+ Butcher(parent, L)
\ No newline at end of file
diff --git a/code/datums/dog_fashion.dm b/code/datums/dog_fashion.dm
index c798f35218..b9e774aa50 100644
--- a/code/datums/dog_fashion.dm
+++ b/code/datums/dog_fashion.dm
@@ -174,3 +174,13 @@
/datum/dog_fashion/back/deathsquad
name = "Trooper REAL_NAME"
desc = "That's not red paint. That's real corgi blood."
+
+/datum/dog_fashion/head/colour
+ name = "Stylish REAL_NAME"
+ desc = "From the tips of their paws to the top of their head, they look like a made bed."
+ emote_see = list("tries to tap dances.","looks sadly at others outfits...","barks at bad fashion!")
+
+/datum/dog_fashion/head/telegram
+ name = "Messenger REAL_NAME"
+ desc = "Dont shoot the messenger..."
+ emote_see = list("licks an envelope.","looks ready to set off to send a letter...","works on barking!")
diff --git a/code/datums/elements/_element.dm b/code/datums/elements/_element.dm
index f12835d2e2..8f9b97db22 100644
--- a/code/datums/elements/_element.dm
+++ b/code/datums/elements/_element.dm
@@ -1,5 +1,11 @@
/datum/element
var/element_flags = NONE
+ /**
+ * The index of the first attach argument to consider for duplicate elements
+ * Is only used when flags contains ELEMENT_BESPOKE
+ * This is infinity so you must explicitly set this
+ */
+ var/id_arg_index = INFINITY
/datum/element/proc/Attach(datum/target)
if(type == /datum/element)
@@ -19,11 +25,15 @@
//DATUM PROCS
/datum/proc/AddElement(eletype, ...)
- var/datum/element/ele = SSdcs.GetElement(eletype)
+ var/datum/element/ele = SSdcs.GetElement(arglist(args))
args[1] = src
if(ele.Attach(arglist(args)) == ELEMENT_INCOMPATIBLE)
CRASH("Incompatible [eletype] assigned to a [type]! args: [json_encode(args)]")
-/datum/proc/RemoveElement(eletype)
- var/datum/element/ele = SSdcs.GetElement(eletype)
- ele.Detach(src)
+/**
+ * Finds the singleton for the element type given and detaches it from src
+ * You only need additional arguments beyond the type if you're using ELEMENT_BESPOKE
+ */
+/datum/proc/RemoveElement(eletype, ...)
+ var/datum/element/ele = SSdcs.GetElement(arglist(args))
+ ele.Detach(src)
\ No newline at end of file
diff --git a/code/datums/emotes.dm b/code/datums/emotes.dm
index 6c91cc3a7d..f0fca5db5a 100644
--- a/code/datums/emotes.dm
+++ b/code/datums/emotes.dm
@@ -1,6 +1,3 @@
-#define EMOTE_VISIBLE 1
-#define EMOTE_AUDIBLE 2
-
/datum/emote
var/key = "" //What calls the emote
var/key_third_person = "" //This will also call the emote
diff --git a/code/datums/status_effects/debuffs.dm b/code/datums/status_effects/debuffs.dm
index 84ed012b82..ac2d2f37ab 100644
--- a/code/datums/status_effects/debuffs.dm
+++ b/code/datums/status_effects/debuffs.dm
@@ -541,6 +541,38 @@
icon_state = "ichorial_stain"
alerttooltipstyle = "clockcult"
+
+//GOLEM GANG
+
+/datum/status_effect/strandling //get it, strand as in durathread strand + strangling = strandling hahahahahahahahahahhahahaha i want to die
+ id = "strandling"
+ status_type = STATUS_EFFECT_UNIQUE
+ alert_type = /obj/screen/alert/status_effect/strandling
+
+/datum/status_effect/strandling/on_apply()
+ ADD_TRAIT(owner, TRAIT_MAGIC_CHOKE, "dumbmoron")
+ return ..()
+
+/datum/status_effect/strandling/on_remove()
+ REMOVE_TRAIT(owner, TRAIT_MAGIC_CHOKE, "dumbmoron")
+ return ..()
+
+/obj/screen/alert/status_effect/strandling
+ name = "Choking strand"
+ desc = "A magical strand of Durathread is wrapped around your neck, preventing you from breathing! Click this icon to remove the strand."
+ icon_state = "his_grace"
+ alerttooltipstyle = "hisgrace"
+
+/obj/screen/alert/status_effect/strandling/Click(location, control, params)
+ . = ..()
+ to_chat(mob_viewer, "You attempt to remove the durathread strand from around your neck.")
+ if(do_after(mob_viewer, 35, null, mob_viewer))
+ if(isliving(mob_viewer))
+ var/mob/living/L = mob_viewer
+ to_chat(mob_viewer, "You succesfuly remove the durathread strand.")
+ L.remove_status_effect(STATUS_EFFECT_CHOKINGSTRAND)
+
+
datum/status_effect/pacify
id = "pacify"
status_type = STATUS_EFFECT_REPLACE
diff --git a/code/game/machinery/recycler.dm b/code/game/machinery/recycler.dm
index d39de4d37d..c8beeb8c83 100644
--- a/code/game/machinery/recycler.dm
+++ b/code/game/machinery/recycler.dm
@@ -18,8 +18,8 @@
var/item_recycle_sound = 'sound/items/welder.ogg'
/obj/machinery/recycler/Initialize()
+ AddComponent(/datum/component/butchering/recycler, 1, amount_produced,amount_produced/5)
AddComponent(/datum/component/material_container, list(MAT_METAL, MAT_GLASS, MAT_PLASMA, MAT_SILVER, MAT_GOLD, MAT_DIAMOND, MAT_URANIUM, MAT_BANANIUM, MAT_TITANIUM, MAT_BLUESPACE, MAT_PLASTIC), INFINITY, FALSE, null, null, null, TRUE)
- AddComponent(/datum/component/butchering, 1, amount_produced,amount_produced/5)
. = ..()
update_icon()
req_one_access = get_all_accesses() + get_all_centcom_access()
@@ -35,7 +35,7 @@
var/datum/component/material_container/materials = GetComponent(/datum/component/material_container)
materials.max_amount = mat_mod
amount_produced = min(50, amt_made) + 50
- var/datum/component/butchering/butchering = GetComponent(/datum/component/butchering)
+ var/datum/component/butchering/butchering = GetComponent(/datum/component/butchering/recycler)
butchering.effectiveness = amount_produced
butchering.bonus_modifier = amount_produced/5
@@ -83,20 +83,24 @@
is_powered = FALSE
icon_state = icon_name + "[is_powered]" + "[(blood ? "bld" : "")]" // add the blood tag at the end
-/obj/machinery/recycler/Bumped(atom/movable/AM)
-
- if(stat & (BROKEN|NOPOWER))
- return
+/obj/machinery/recycler/CanPass(atom/movable/AM)
+ . = ..()
if(!anchored)
return
- if(safety_mode)
- return
var/move_dir = get_dir(loc, AM.loc)
if(move_dir == eat_dir)
- eat(AM)
+ return TRUE
+
+/obj/machinery/recycler/Crossed(atom/movable/AM)
+ eat(AM)
+ . = ..()
/obj/machinery/recycler/proc/eat(atom/AM0, sound=TRUE)
+ if(stat & (BROKEN|NOPOWER))
+ return
+ if(safety_mode)
+ return
var/list/to_eat
if(isitem(AM0))
to_eat = AM0.GetAllContentsIgnoring(GLOB.typecache_mob)
@@ -194,9 +198,6 @@
// Instantly lie down, also go unconscious from the pain, before you die.
L.Unconscious(100)
L.adjustBruteLoss(crush_damage)
- if(L.stat == DEAD && (L.butcher_results || L.guaranteed_butcher_results))
- var/datum/component/butchering/butchering = GetComponent(/datum/component/butchering)
- butchering.Butcher(src,L)
/obj/machinery/recycler/deathtrap
name = "dangerous old crusher"
diff --git a/code/game/mecha/equipment/tools/mining_tools.dm b/code/game/mecha/equipment/tools/mining_tools.dm
index 4044951c42..812a9b0834 100644
--- a/code/game/mecha/equipment/tools/mining_tools.dm
+++ b/code/game/mecha/equipment/tools/mining_tools.dm
@@ -20,7 +20,7 @@
/obj/item/mecha_parts/mecha_equipment/drill/Initialize()
. = ..()
- AddComponent(/datum/component/butchering, 50, 100)
+ AddComponent(/datum/component/butchering, 50, 100, null, null, TRUE)
/obj/item/mecha_parts/mecha_equipment/drill/action(atom/target)
if(!action_checks(target))
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index a9056975b1..c5d198c05f 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -81,6 +81,7 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
var/flags_cover = 0 //for flags such as GLASSESCOVERSEYES
var/heat = 0
+ ///All items with sharpness of IS_SHARP or higher will automatically get the butchering component.
var/sharpness = IS_BLUNT
var/tool_behaviour = NONE
@@ -139,6 +140,9 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
else if (!istype(embedding, /datum/embedding_behavior))
stack_trace("Invalid type [embedding.type] found in .embedding during /obj/item Initialize()")
+ if(sharpness) //give sharp objects butchering functionality, for consistency
+ AddComponent(/datum/component/butchering, 80 * toolspeed)
+
/obj/item/Destroy()
item_flags &= ~DROPDEL //prevent reqdels
if(ismob(loc))
diff --git a/code/game/objects/items/devices/PDA/cart.dm b/code/game/objects/items/devices/PDA/cart.dm
index 8be18a5f61..a44b41482b 100644
--- a/code/game/objects/items/devices/PDA/cart.dm
+++ b/code/game/objects/items/devices/PDA/cart.dm
@@ -689,15 +689,16 @@ Code:
active_bot = null
if("summon") //Args are in the correct order, they are stated here just as an easy reminder.
- active_bot.bot_control(command= "summon", user_turf= get_turf(usr), user_access= host_pda.GetAccess())
+ active_bot.bot_control("summon", usr, host_pda.GetAccess())
else //Forward all other bot commands to the bot itself!
- active_bot.bot_control(command= href_list["op"], user= usr)
+ active_bot.bot_control(href_list["op"], usr)
playsound(src, 'sound/machines/terminal_select.ogg', 50, 1)
if(href_list["mule"]) //MULEbots are special snowflakes, and need different args due to how they work.
-
- active_bot.bot_control(href_list["mule"], usr, TRUE)
+ var/mob/living/simple_animal/bot/mulebot/mule = active_bot
+ if (istype(mule))
+ active_bot.bot_control(href_list["mule"], usr, TRUE)
if(!host_pda)
return
diff --git a/code/game/objects/items/inducer.dm b/code/game/objects/items/inducer.dm
index 19dbf4fea3..079e0d79e9 100644
--- a/code/game/objects/items/inducer.dm
+++ b/code/game/objects/items/inducer.dm
@@ -205,3 +205,7 @@
/obj/item/inducer/sci/combat/Initialize()
. = ..()
update_icon()
+
+/obj/item/inducer/sci/supply
+ opened = FALSE
+ cell_type = /obj/item/stock_parts/cell/inducer_supply
diff --git a/code/game/objects/items/melee/transforming.dm b/code/game/objects/items/melee/transforming.dm
index 7eb35ed06b..5bccf91868 100644
--- a/code/game/objects/items/melee/transforming.dm
+++ b/code/game/objects/items/melee/transforming.dm
@@ -23,8 +23,8 @@
else
if(attack_verb_off.len)
attack_verb = attack_verb_off
- if(get_sharpness())
- AddComponent(/datum/component/butchering, 50, 100, 0, hitsound, !active)
+ if(sharpness)
+ AddComponent(/datum/component/butchering, 50, 100, 0, hitsound)
/obj/item/melee/transforming/attack_self(mob/living/carbon/user)
if(transform_weapon(user))
@@ -65,13 +65,6 @@
icon_state = initial(icon_state)
w_class = initial(w_class)
total_mass = initial(total_mass)
- if(get_sharpness())
- var/datum/component/butchering/BT = LoadComponent(/datum/component/butchering)
- BT.butchering_enabled = TRUE
- else
- var/datum/component/butchering/BT = GetComponent(/datum/component/butchering)
- if(BT)
- BT.butchering_enabled = FALSE
transform_messages(user, supress_message_text)
add_fingerprint(user)
return TRUE
diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm
index 3fc9bd9535..18acb5e14d 100644
--- a/code/game/objects/items/stacks/tiles/tile_types.dm
+++ b/code/game/objects/items/stacks/tiles/tile_types.dm
@@ -82,6 +82,55 @@
item_state = "tile-fairygrass"
turf_type = /turf/open/floor/grass/fairy
resistance_flags = FLAMMABLE
+ color = "#33CCFF"
+
+/obj/item/stack/tile/fairygrass/white
+ name = "white fairygrass tile"
+ singular_name = "white fairygrass floor tile"
+ desc = "A patch of odd, glowing white grass."
+ turf_type = /turf/open/floor/grass/fairy/white
+ color = "#FFFFFF"
+
+/obj/item/stack/tile/fairygrass/red
+ name = "red fairygrass tile"
+ singular_name = "red fairygrass floor tile"
+ desc = "A patch of odd, glowing red grass."
+ turf_type = /turf/open/floor/grass/fairy/red
+ color = "#FF3333"
+
+/obj/item/stack/tile/fairygrass/yellow
+ name = "yellow fairygrass tile"
+ singular_name = "yellow fairygrass floor tile"
+ desc = "A patch of odd, glowing yellow grass."
+ turf_type = /turf/open/floor/grass/fairy/yellow
+ color = "#FFFF66"
+
+/obj/item/stack/tile/fairygrass/green
+ name = "green fairygrass tile"
+ singular_name = "green fairygrass floor tile"
+ desc = "A patch of odd, glowing green grass."
+ turf_type = /turf/open/floor/grass/fairy/green
+ color = "#99FF99"
+
+/obj/item/stack/tile/fairygrass/blue
+ name = "blue fairygrass tile"
+ singular_name = "blue fairygrass floor tile"
+ desc = "A patch of odd, glowing blue grass."
+ turf_type = /turf/open/floor/grass/fairy/blue
+
+/obj/item/stack/tile/fairygrass/purple
+ name = "purple fairygrass tile"
+ singular_name = "purple fairygrass floor tile"
+ desc = "A patch of odd, glowing purple grass."
+ turf_type = /turf/open/floor/grass/fairy/purple
+ color = "#D966FF"
+
+/obj/item/stack/tile/fairygrass/pink
+ name = "pink fairygrass tile"
+ singular_name = "pink fairygrass floor tile"
+ desc = "A patch of odd, glowing pink grass."
+ turf_type = /turf/open/floor/grass/fairy/pink
+ color = "#FFB3DA"
//Wood
/obj/item/stack/tile/wood
diff --git a/code/game/objects/items/storage/wallets.dm b/code/game/objects/items/storage/wallets.dm
index 891a4689d0..2dbe42c159 100644
--- a/code/game/objects/items/storage/wallets.dm
+++ b/code/game/objects/items/storage/wallets.dm
@@ -37,7 +37,15 @@
/obj/item/screwdriver,
/obj/item/valentine,
/obj/item/stamp,
- /obj/item/key))
+ /obj/item/key,
+ /obj/item/cartridge,
+ /obj/item/camera_film,
+ /obj/item/stack/ore/bluespace_crystal,
+ /obj/item/reagent_containers/food/snacks/grown/poppy,
+ /obj/item/instrument/harmonica,
+ /obj/item/mining_voucher,
+ /obj/item/suit_voucher,
+ /obj/item/reagent_containers/pill))
/obj/item/storage/wallet/Exited(atom/movable/AM)
. = ..()
diff --git a/code/game/objects/items/tools/wirecutters.dm b/code/game/objects/items/tools/wirecutters.dm
index fe8b4b2d56..e4b95a5073 100644
--- a/code/game/objects/items/tools/wirecutters.dm
+++ b/code/game/objects/items/tools/wirecutters.dm
@@ -122,12 +122,21 @@
user.put_in_active_hand(pryjaws)
/obj/item/wirecutters/power/attack(mob/living/carbon/C, mob/user)
- if(istype(C) && C.handcuffed)
- user.visible_message("[user] cuts [C]'s restraints with [src]!")
- qdel(C.handcuffed)
- return
- else
- ..()
+ if(istype(C))
+ if(C.handcuffed)
+ user.visible_message("[user] cuts [C]'s restraints with [src]!")
+ qdel(C.handcuffed)
+ return
+ else if(C.has_status_effect(STATUS_EFFECT_CHOKINGSTRAND))
+ var/man = C == user ? "your" : "[C]'\s"
+ user.visible_message("[user] attempts to remove the durathread strand from around [man] neck.", \
+ "You attempt to remove the durathread strand from around [man] neck.")
+ if(do_after(user, 15, null, C))
+ user.visible_message("[user] succesfuly removes the durathread strand.",
+ "You succesfuly remove the durathread strand.")
+ C.remove_status_effect(STATUS_EFFECT_CHOKINGSTRAND)
+ return
+ ..()
/obj/item/wirecutters/advanced
name = "advanced wirecutters"
diff --git a/code/game/objects/structures/beds_chairs/chair.dm b/code/game/objects/structures/beds_chairs/chair.dm
index d19e76d238..9643ff7e07 100644
--- a/code/game/objects/structures/beds_chairs/chair.dm
+++ b/code/game/objects/structures/beds_chairs/chair.dm
@@ -498,7 +498,7 @@
var/mutable_appearance/armrest
/obj/structure/chair/sofa/Initialize()
- armrest = mutable_appearance(icon, "[icon_state]_armrest")
+ armrest = mutable_appearance(icon, "[icon_state]_armrest", ABOVE_MOB_LAYER)
return ..()
/obj/structure/chair/sofa/post_buckle_mob(mob/living/M)
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm
index 9ee34b084a..376abef33e 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm
@@ -49,6 +49,7 @@
new /obj/item/storage/backpack/satchel/leather/withwallet( src )
new /obj/item/instrument/piano_synth(src)
new /obj/item/radio/headset( src )
+ new /obj/item/clothing/head/colour(src)
/obj/structure/closet/secure_closet/personal/attackby(obj/item/W, mob/user, params)
var/obj/item/card/id/I = W.GetID()
diff --git a/code/game/objects/structures/ghost_role_spawners.dm b/code/game/objects/structures/ghost_role_spawners.dm
index e3585b601e..688006a6e3 100644
--- a/code/game/objects/structures/ghost_role_spawners.dm
+++ b/code/game/objects/structures/ghost_role_spawners.dm
@@ -151,6 +151,9 @@
log_admin("[key_name(new_spawn)] possessed a golem shell enslaved to [key_name(owner)].")
if(ishuman(new_spawn))
var/mob/living/carbon/human/H = new_spawn
+ if(has_owner)
+ var/datum/species/golem/G = H.dna.species
+ G.owner = owner
H.set_cloned_appearance()
if(!name)
if(has_owner)
@@ -321,8 +324,9 @@
/datum/outfit/hotelstaff
name = "Hotel Staff"
- uniform = /obj/item/clothing/under/assistantformal
+ uniform = /obj/item/clothing/under/telegram
shoes = /obj/item/clothing/shoes/laceup
+ head = /obj/item/clothing/head/hotel
r_pocket = /obj/item/radio/off
back = /obj/item/storage/backpack
implants = list(/obj/item/implant/mindshield)
diff --git a/code/game/objects/structures/loom.dm b/code/game/objects/structures/loom.dm
index f8db99f5e6..28427469ba 100644
--- a/code/game/objects/structures/loom.dm
+++ b/code/game/objects/structures/loom.dm
@@ -1,5 +1,7 @@
-//Loom, turns raw cotton and durathread into their respective fabrics.
+#define FABRIC_PER_SHEET 4
+
+///This is a loom. It's usually made out of wood and used to weave fabric like durathread or cotton into their respective cloth types.
/obj/structure/loom
name = "loom"
desc = "A simple device used to weave cloth and other thread-based fabrics together into usable material."
@@ -8,14 +10,35 @@
density = TRUE
anchored = TRUE
-/obj/structure/loom/attackby(obj/item/stack/sheet/W, mob/user)
- if(W.is_fabric && W.amount > 1)
- user.show_message("You start weaving the [W.name] through the loom..", MSG_VISUAL)
- if(W.use_tool(src, user, W.pull_effort))
- new W.loom_result(drop_location())
- user.show_message("You weave the [W.name] into a workable fabric.", MSG_VISUAL)
- W.amount = (W.amount - 2)
- if(W.amount < 1)
- qdel(W)
- else
- user.show_message("You need a valid fabric and at least 2 of said fabric before using this.", MSG_VISUAL)
\ No newline at end of file
+/obj/structure/loom/attackby(obj/item/I, mob/user)
+ if(weave(I, user))
+ return
+ return ..()
+
+/obj/structure/loom/wrench_act(mob/living/user, obj/item/I)
+ ..()
+ default_unfasten_wrench(user, I, 5)
+ return TRUE
+
+///Handles the weaving.
+/obj/structure/loom/proc/weave(obj/item/stack/sheet/S, mob/user)
+ if(!istype(S) || !S.is_fabric)
+ return FALSE
+ if(!anchored)
+ user.show_message("The loom needs to be wrenched down.", MSG_VISUAL)
+ return FALSE
+ if(S.amount < FABRIC_PER_SHEET)
+ user.show_message("You need at least [FABRIC_PER_SHEET] units of fabric before using this.", 1)
+ return FALSE
+ user.show_message("You start weaving \the [S.name] through the loom..", MSG_VISUAL)
+ if(S.use_tool(src, user, S.pull_effort))
+ if(S.amount >= FABRIC_PER_SHEET)
+ new S.loom_result(drop_location())
+ S.use(FABRIC_PER_SHEET)
+ user.show_message("You weave \the [S.name] into a workable fabric.", MSG_VISUAL)
+ return TRUE
+
+/obj/structure/loom/unanchored
+ anchored = FALSE
+
+#undef FABRIC_PER_SHEET
\ No newline at end of file
diff --git a/code/game/turfs/simulated/floor/fancy_floor.dm b/code/game/turfs/simulated/floor/fancy_floor.dm
index a8e6baf3fb..82f1a88253 100644
--- a/code/game/turfs/simulated/floor/fancy_floor.dm
+++ b/code/game/turfs/simulated/floor/fancy_floor.dm
@@ -104,6 +104,47 @@
light_range = 2
light_power = 0.80
light_color = "#33CCFF"
+ color = "#33CCFF"
+
+/turf/open/floor/grass/fairy/white
+ name = "white fairygrass patch"
+ light_color = "#FFFFFF"
+ color = "#FFFFFF"
+ floor_tile = /obj/item/stack/tile/fairygrass/white
+
+/turf/open/floor/grass/fairy/red
+ name = "red fairygrass patch"
+ light_color = "#FF3333"
+ color = "#FF3333"
+ floor_tile = /obj/item/stack/tile/fairygrass/red
+
+/turf/open/floor/grass/fairy/yellow
+ name = "yellow fairygrass patch"
+ light_color = "#FFFF66"
+ color = "#FFFF66"
+ floor_tile = /obj/item/stack/tile/fairygrass/yellow
+
+/turf/open/floor/grass/fairy/green
+ name = "green fairygrass patch"
+ light_color = "#99FF99"
+ color = "#99FF99"
+ floor_tile = /obj/item/stack/tile/fairygrass/green
+
+/turf/open/floor/grass/fairy/blue
+ name = "blue fairygrass patch"
+ floor_tile = /obj/item/stack/tile/fairygrass/blue
+
+/turf/open/floor/grass/fairy/purple
+ name = "purple fairygrass patch"
+ light_color = "#D966FF"
+ color = "#D966FF"
+ floor_tile = /obj/item/stack/tile/fairygrass/purple
+
+/turf/open/floor/grass/fairy/pink
+ name = "pink fairygrass patch"
+ light_color = "#FFB3DA"
+ color = "#FFB3DA"
+ floor_tile = /obj/item/stack/tile/fairygrass/pink
/turf/open/floor/grass/snow
gender = PLURAL
diff --git a/code/modules/antagonists/blob/blob/theblob.dm b/code/modules/antagonists/blob/blob/theblob.dm
index b37c007664..953b876b35 100644
--- a/code/modules/antagonists/blob/blob/theblob.dm
+++ b/code/modules/antagonists/blob/blob/theblob.dm
@@ -244,6 +244,7 @@
return ..()
/obj/structure/blob/proc/chemeffectreport()
+ RETURN_TYPE(/list)
. = list()
if(overmind)
. += "Material: [overmind.blob_reagent_datum.name]."
@@ -253,6 +254,7 @@
. += "No Material Detected!
"
/obj/structure/blob/proc/typereport()
+ RETURN_TYPE(/list)
. = list("Blob Type: [uppertext(initial(name))]")
. += "Health: [obj_integrity]/[max_integrity]"
. += "Effects: [scannerreport()]"
diff --git a/code/modules/antagonists/traitor/datum_traitor.dm b/code/modules/antagonists/traitor/datum_traitor.dm
index e1e3a69e66..ac19df3631 100644
--- a/code/modules/antagonists/traitor/datum_traitor.dm
+++ b/code/modules/antagonists/traitor/datum_traitor.dm
@@ -23,7 +23,6 @@
owner.special_role = special_role
if(give_objectives)
forge_traitor_objectives()
- RegisterSignal(owner.current, COMSIG_MOVABLE_HEAR, .proc/handle_hearing)
finalize_traitor()
..()
@@ -49,7 +48,6 @@
A.verbs -= /mob/living/silicon/ai/proc/choose_modules
A.malf_picker.remove_malf_verbs(A)
qdel(A.malf_picker)
- UnregisterSignal(owner.current, COMSIG_MOVABLE_HEAR, .proc/handle_hearing)
SSticker.mode.traitors -= owner
if(!silent && owner.current)
to_chat(owner.current," You are no longer the [special_role]! ")
@@ -57,10 +55,10 @@
. = ..()
/datum/antagonist/traitor/proc/handle_hearing(datum/source, list/hearing_args)
- var/message = hearing_args[HEARING_MESSAGE]
+ var/message = hearing_args[HEARING_RAW_MESSAGE]
message = GLOB.syndicate_code_phrase_regex.Replace(message, "$1")
message = GLOB.syndicate_code_response_regex.Replace(message, "$1")
- hearing_args[HEARING_MESSAGE] = message
+ hearing_args[HEARING_RAW_MESSAGE] = message
/datum/antagonist/traitor/proc/add_objective(datum/objective/O)
objectives += O
@@ -262,16 +260,20 @@
/datum/antagonist/traitor/apply_innate_effects(mob/living/mob_override)
. = ..()
update_traitor_icons_added()
- var/mob/living/silicon/ai/A = mob_override || owner.current
- if(istype(A) && traitor_kind == TRAITOR_AI)
+ var/mob/M = mob_override || owner.current
+ if(isAI(M) && traitor_kind == TRAITOR_AI)
+ var/mob/living/silicon/ai/A = M
A.hack_software = TRUE
+ RegisterSignal(M, COMSIG_MOVABLE_HEAR, .proc/handle_hearing)
/datum/antagonist/traitor/remove_innate_effects(mob/living/mob_override)
. = ..()
update_traitor_icons_removed()
- var/mob/living/silicon/ai/A = mob_override || owner.current
- if(istype(A) && traitor_kind == TRAITOR_AI)
+ var/mob/M = mob_override || owner.current
+ if(isAI(M) && traitor_kind == TRAITOR_AI)
+ var/mob/living/silicon/ai/A = M
A.hack_software = FALSE
+ UnregisterSignal(M, COMSIG_MOVABLE_HEAR)
/datum/antagonist/traitor/proc/give_codewords()
if(!owner.current)
diff --git a/code/modules/atmospherics/environmental/LINDA_turf_tile.dm b/code/modules/atmospherics/environmental/LINDA_turf_tile.dm
index cafdafb671..196bf70fdc 100644
--- a/code/modules/atmospherics/environmental/LINDA_turf_tile.dm
+++ b/code/modules/atmospherics/environmental/LINDA_turf_tile.dm
@@ -72,11 +72,13 @@
air.copy_from(copy)
/turf/return_air()
+ RETURN_TYPE(/datum/gas_mixture)
var/datum/gas_mixture/GM = new
GM.copy_from_turf(src)
return GM
/turf/open/return_air()
+ RETURN_TYPE(/datum/gas_mixture)
return air
/turf/temperature_expose()
diff --git a/code/modules/cargo/packs/engineering.dm b/code/modules/cargo/packs/engineering.dm
index 19cb53489e..b226ac7a94 100644
--- a/code/modules/cargo/packs/engineering.dm
+++ b/code/modules/cargo/packs/engineering.dm
@@ -91,15 +91,11 @@
crate_name = "insulated gloves crate"
crate_type = /obj/structure/closet/crate/engineering/electrical
-/obj/item/stock_parts/cell/inducer_supply
- maxcharge = 5000
- charge = 5000
-
/datum/supply_pack/engineering/inducers
name = "NT-75 Electromagnetic Power Inducers Crate"
desc = "No rechargers? No problem, with the NT-75 EPI, you can recharge any standard cell-based equipment anytime, anywhere. Contains two Inducers."
cost = 2300
- contains = list(/obj/item/inducer/sci {cell_type = /obj/item/stock_parts/cell/inducer_supply; opened = 0}, /obj/item/inducer/sci {cell_type = /obj/item/stock_parts/cell/inducer_supply; opened = 0}) //FALSE doesn't work in modified type paths apparently.
+ contains = list(/obj/item/inducer/sci/supply, /obj/item/inducer/sci/supply)
crate_name = "inducer crate"
crate_type = /obj/structure/closet/crate/engineering/electrical
@@ -121,18 +117,6 @@
crate_name = "power cell crate"
crate_type = /obj/structure/closet/crate/engineering/electrical
-
-/datum/supply_pack/engineering/siezedpower
- name = "Siezed Power Cell Crate"
- desc = "We took the means of power! Contains three high-voltage plus power cells."
- cost = 1300
- contraband = TRUE
- contains = list(/obj/item/stock_parts/cell/high/plus,
- /obj/item/stock_parts/cell/high/plus,
- /obj/item/stock_parts/cell/high/plus)
- crate_name = "siezed crate"
- crate_type = /obj/structure/closet/crate/engineering/electrical
-
/datum/supply_pack/engineering/shuttle_engine
name = "Shuttle Engine Crate"
desc = "Through advanced bluespace-shenanigans, our engineers have managed to fit an entire shuttle engine into one tiny little crate. Requires CE access to open."
@@ -142,22 +126,6 @@
crate_name = "shuttle engine crate"
crate_type = /obj/structure/closet/crate/secure/engineering
-/datum/supply_pack/engineering/siezedproduction
- name = "The Means of Production"
- desc = "We will win for we have took over the production! S five metal sheets, five wire, three matter bins, one manipulater and one sheet of glass."
- cost = 1500
- contraband = TRUE
- contains = list(/obj/item/stock_parts/cell/high/plus,
- /obj/item/circuitboard/machine/autolathe,
- /obj/item/stack/cable_coil/random/five,
- /obj/item/stack/sheet/metal/five,
- /obj/item/stock_parts/matter_bin,
- /obj/item/stock_parts/matter_bin,
- /obj/item/stock_parts/matter_bin,
- /obj/item/stock_parts/manipulator,
- /obj/item/stack/sheet/glass,)
- crate_name = "siezed crate"
-
/datum/supply_pack/engineering/tools
name = "Toolbox Crate"
desc = "Any robust spaceman is never far from their trusty toolbox. Contains three electrical toolboxes and three mechanical toolboxes."
diff --git a/code/modules/cargo/packs/materials.dm b/code/modules/cargo/packs/materials.dm
index 615fbfe827..8bee679b9d 100644
--- a/code/modules/cargo/packs/materials.dm
+++ b/code/modules/cargo/packs/materials.dm
@@ -195,7 +195,7 @@
name = "Loom"
desc = "A large pre-made loom."
cost = 1000
- contains = list(/obj/structure/loom)
+ contains = list(/obj/structure/loom/unanchored)
crate_name = "loom crate"
crate_type = /obj/structure/closet/crate/large
diff --git a/code/modules/cargo/packs/medical.dm b/code/modules/cargo/packs/medical.dm
index 656474cc1d..44c9958849 100644
--- a/code/modules/cargo/packs/medical.dm
+++ b/code/modules/cargo/packs/medical.dm
@@ -30,9 +30,10 @@
/datum/supply_pack/medical/bloodpacks
name = "Blood Pack Variety Crate"
- desc = "Contains ten different blood packs for reintroducing blood to patients."
+ desc = "Contains nine different blood packs for reintroducing blood to patients, plus two universal synthetic blood packs."
cost = 3000
- contains = list(/obj/item/reagent_containers/blood/random,
+ contains = list(/obj/item/reagent_containers/blood/synthetics,
+ /obj/item/reagent_containers/blood/synthetics,
/obj/item/reagent_containers/blood/random,
/obj/item/reagent_containers/blood/APlus,
/obj/item/reagent_containers/blood/AMinus,
@@ -46,18 +47,6 @@
crate_name = "blood freezer"
crate_type = /obj/structure/closet/crate/freezer
-/datum/supply_pack/medical/bloodpackssynth
- name = "Synthetics Blood Pack Crate"
- desc = "Contains five synthetics blood packs for reintroducing blood to patients."
- cost = 3000
- contains = list(/obj/item/reagent_containers/blood/synthetics,
- /obj/item/reagent_containers/blood/synthetics,
- /obj/item/reagent_containers/blood/synthetics,
- /obj/item/reagent_containers/blood/synthetics,
- /obj/item/reagent_containers/blood/synthetics)
- crate_name = "blood freezer"
- crate_type = /obj/structure/closet/crate/freezer
-
/datum/supply_pack/medical/defibs
name = "Defibrillator Crate"
desc = "Contains two defibrillators for bringing the recently deceased back to life."
diff --git a/code/modules/cargo/packs/misc.dm b/code/modules/cargo/packs/misc.dm
index c380d5411e..5945a454b2 100644
--- a/code/modules/cargo/packs/misc.dm
+++ b/code/modules/cargo/packs/misc.dm
@@ -204,19 +204,6 @@
)
crate_name = "religious supplies crate"
-/datum/supply_pack/misc/randomised/promiscuous
- name = "Promiscuous Organs"
- desc = "Do YOU want to have more genital? Well we have just the thing for you~. This crate has two autosurgeon, that will let you have a new sex, organ to impress that hot stud and or chick."
- cost = 4000 //Only get 2!
- contraband = TRUE
- var/num_contained = 2
- contains = list(/obj/item/autosurgeon/penis,
- /obj/item/autosurgeon/testicles,
- /obj/item/autosurgeon/vagina,
- /obj/item/autosurgeon/breasts,
- /obj/item/autosurgeon/womb)
- crate_name = "promiscuous organs"
-
/datum/supply_pack/misc/toner
name = "Toner Crate"
desc = "Spent too much ink printing butt pictures? Fret not, with these six toner refills, you'll be printing butts 'till the cows come home!'"
diff --git a/code/modules/cargo/packs/service.dm b/code/modules/cargo/packs/service.dm
index 14bde519e1..502b81ffcb 100644
--- a/code/modules/cargo/packs/service.dm
+++ b/code/modules/cargo/packs/service.dm
@@ -33,32 +33,6 @@
/obj/item/stack/packageWrap)
crate_name = "cargo supplies crate"
-/datum/supply_pack/service/carpet_exotic
- name = "Exotic Carpet Crate"
- desc = "Exotic carpets straight from Space Russia, for all your decorating needs. Contains 100 tiles each of 10 different flooring patterns."
- cost = 7000
- contains = list(/obj/item/stack/tile/carpet/blue/fifty,
- /obj/item/stack/tile/carpet/blue/fifty,
- /obj/item/stack/tile/carpet/cyan/fifty,
- /obj/item/stack/tile/carpet/cyan/fifty,
- /obj/item/stack/tile/carpet/green/fifty,
- /obj/item/stack/tile/carpet/green/fifty,
- /obj/item/stack/tile/carpet/orange/fifty,
- /obj/item/stack/tile/carpet/orange/fifty,
- /obj/item/stack/tile/carpet/purple/fifty,
- /obj/item/stack/tile/carpet/purple/fifty,
- /obj/item/stack/tile/carpet/red/fifty,
- /obj/item/stack/tile/carpet/red/fifty,
- /obj/item/stack/tile/carpet/royalblue/fifty,
- /obj/item/stack/tile/carpet/royalblue/fifty,
- /obj/item/stack/tile/carpet/royalblack/fifty,
- /obj/item/stack/tile/carpet/royalblack/fifty,
- /obj/item/stack/tile/carpet/blackred/fifty,
- /obj/item/stack/tile/carpet/blackred/fifty,
- /obj/item/stack/tile/carpet/monochrome/fifty,
- /obj/item/stack/tile/carpet/monochrome/fifty)
- crate_name = "exotic carpet crate"
-
/datum/supply_pack/service/food_cart
name = "Food Cart Crate"
desc = "Want to sell food on the go? Cook lost their cart? Well we just so happen to have a few carts to spare!"
@@ -179,23 +153,39 @@
/datum/supply_pack/service/carpet
name = "Premium Carpet Crate"
- desc = "Plasteel floor tiles getting on your nerves? These stacks of extra soft carpet will tie any room together. Contains the classics."
+ desc = "Plasteel floor tiles getting on your nerves? These stacks of extra soft carpet will tie any room together. Contains one of each pattern: classic, black, black-red and monochrome."
cost = 1000
contains = list(/obj/item/stack/tile/carpet/fifty,
- /obj/item/stack/tile/carpet/fifty,
+ /obj/item/stack/tile/carpet/blackred/fifty,
/obj/item/stack/tile/carpet/black/fifty,
- /obj/item/stack/tile/carpet/black/fifty)
+ /obj/item/stack/tile/carpet/monochrome/fifty)
crate_name = "premium carpet crate"
-/datum/supply_pack/service/carpet2
- name = "Premium Carpet Crate #2"
- desc = "Plasteel floor tiles getting on your nerves? These stacks of extra soft carpet will tie any room together. Contains red, and monochrome"
- cost = 1000
- contains = list(/obj/item/stack/tile/carpet/blackred/fifty,
+/datum/supply_pack/service/carpet_exotic
+ name = "Exotic Carpet Crate"
+ desc = "Exotic carpets straight from Space Russia, for all your decorating needs. Contains 100 tiles each of 10 different flooring patterns."
+ cost = 7000
+ contains = list(/obj/item/stack/tile/carpet/blue/fifty,
+ /obj/item/stack/tile/carpet/blue/fifty,
+ /obj/item/stack/tile/carpet/cyan/fifty,
+ /obj/item/stack/tile/carpet/cyan/fifty,
+ /obj/item/stack/tile/carpet/green/fifty,
+ /obj/item/stack/tile/carpet/green/fifty,
+ /obj/item/stack/tile/carpet/orange/fifty,
+ /obj/item/stack/tile/carpet/orange/fifty,
+ /obj/item/stack/tile/carpet/purple/fifty,
+ /obj/item/stack/tile/carpet/purple/fifty,
+ /obj/item/stack/tile/carpet/red/fifty,
+ /obj/item/stack/tile/carpet/red/fifty,
+ /obj/item/stack/tile/carpet/royalblue/fifty,
+ /obj/item/stack/tile/carpet/royalblue/fifty,
+ /obj/item/stack/tile/carpet/royalblack/fifty,
+ /obj/item/stack/tile/carpet/royalblack/fifty,
+ /obj/item/stack/tile/carpet/blackred/fifty,
/obj/item/stack/tile/carpet/blackred/fifty,
/obj/item/stack/tile/carpet/monochrome/fifty,
/obj/item/stack/tile/carpet/monochrome/fifty)
- crate_name = "premium carpet crate #2"
+ crate_name = "exotic carpet crate"
/datum/supply_pack/service/lightbulbs
name = "Replacement Lights"
diff --git a/code/modules/clothing/head/collectable.dm b/code/modules/clothing/head/collectable.dm
index 90c0690534..dc7e1df15f 100644
--- a/code/modules/clothing/head/collectable.dm
+++ b/code/modules/clothing/head/collectable.dm
@@ -27,7 +27,6 @@
icon_state = "chef"
item_state = "chef"
dynamic_hair_suffix = ""
-
dog_fashion = /datum/dog_fashion/head/chef
/obj/item/clothing/head/collectable/paper
diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm
index 909d23e49b..dabfaf06cd 100644
--- a/code/modules/clothing/head/misc.dm
+++ b/code/modules/clothing/head/misc.dm
@@ -113,10 +113,8 @@
desc = "Wearing these makes you look useless, and only good for your sex appeal."
icon_state = "bunny"
dynamic_hair_suffix = ""
-
dog_fashion = /datum/dog_fashion/head/rabbit
-
/obj/item/clothing/head/flatcap
name = "flat cap"
desc = "A working man's cap."
@@ -205,7 +203,6 @@
item_state = "sombrero"
desc = "You can practically taste the fiesta."
flags_inv = HIDEHAIR
-
dog_fashion = /datum/dog_fashion/head/sombrero
/obj/item/clothing/head/sombrero/green
@@ -369,3 +366,17 @@
item_state = "assu_helmet"
desc = "A cheap replica of old riot helmet without visor. It has \"D.A.B.\" written on the front."
flags_inv = HIDEHAIR
+
+/obj/item/clothing/head/hotel
+ name = "Telegram cap"
+ desc = "A bright red cap warn by hotel staff. Or people who want to be a singing telegram"
+ icon_state = "telegramhat"
+ item_color = "telegramhat"
+ dog_fashion = null
+
+/obj/item/clothing/head/colour
+ name = "Singer cap"
+ desc = "A light white hat that has bands of color. Just makes you want to sing and dance!"
+ icon_state = "colour"
+ item_color = "colour"
+ dog_fashion = /datum/dog_fashion/head/colour
\ No newline at end of file
diff --git a/code/modules/clothing/head/soft_caps.dm b/code/modules/clothing/head/soft_caps.dm
index 8754c89511..4daa737877 100644
--- a/code/modules/clothing/head/soft_caps.dm
+++ b/code/modules/clothing/head/soft_caps.dm
@@ -139,4 +139,4 @@
flags_inv = HIDEEYES|HIDEFACE
armor = list("melee" = 35, "bullet" = 35, "laser" = 25, "energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 20, "acid" = 90)
strip_delay = 90 //You dont take a Major Leage cap
- dog_fashion = null
\ No newline at end of file
+ dog_fashion = null
diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm
index d150cb5ca8..b67fda421e 100644
--- a/code/modules/clothing/suits/miscellaneous.dm
+++ b/code/modules/clothing/suits/miscellaneous.dm
@@ -505,6 +505,21 @@
min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
flags_inv = HIDEHAIR|HIDEEARS
+/obj/item/clothing/suit/hooded/wintercoat/centcom
+ name = "centcom winter coat"
+ icon_state = "coatcentcom"
+ item_state = "coatcentcom"
+ armor = list("melee" = 40, "bullet" = 45, "laser" = 45, "energy" = 35, "bomb" = 40, "bio" = 25, "rad" = 25, "fire" = 35, "acid" = 50)
+ hoodtype = /obj/item/clothing/head/hooded/winterhood/centcom
+
+/obj/item/clothing/suit/hooded/wintercoat/centcom/Initialize()
+ . = ..()
+ allowed = GLOB.security_wintercoat_allowed
+
+/obj/item/clothing/head/hooded/winterhood/centcom
+ icon_state = "winterhood_centcom"
+ armor = list("melee" = 40, "bullet" = 45, "laser" = 45, "energy" = 35, "bomb" = 40, "bio" = 25, "rad" = 25, "fire" = 35, "acid" = 50)
+
/obj/item/clothing/suit/hooded/wintercoat/captain
name = "captain's winter coat"
icon_state = "coatcaptain"
@@ -723,6 +738,15 @@
/obj/item/clothing/head/hooded/winterhood/qm
icon_state = "winterhood_qm"
+/obj/item/clothing/suit/hooded/wintercoat/aformal
+ name = "assistant's formal winter coat"
+ icon_state = "coataformal"
+ item_state = "coataformal"
+ hoodtype = /obj/item/clothing/head/hooded/winterhood/aformal
+
+/obj/item/clothing/head/hooded/winterhood/aformal
+ icon_state = "winterhood_aformal"
+
/obj/item/clothing/suit/hooded/wintercoat/miner
name = "mining winter coat"
icon_state = "coatminer"
@@ -734,6 +758,27 @@
/obj/item/clothing/head/hooded/winterhood/miner
icon_state = "winterhood_miner"
+/obj/item/clothing/suit/hooded/wintercoat/ratvar
+ name = "ratvarian winter coat"
+ icon_state = "coatratvar"
+ item_state = "coatratvar"
+ hoodtype = /obj/item/clothing/head/hooded/winterhood/ratvar
+
+/obj/item/clothing/head/hooded/winterhood/ratvar
+ icon_state = "winterhood_ratvar"
+ light_range = 3
+ light_power = 1
+ light_color = "#B18B25" //clockwork slab background top color
+
+/obj/item/clothing/suit/hooded/wintercoat/narsie
+ name = "narsian winter coat"
+ icon_state = "coatnarsie"
+ item_state = "coatnarsie"
+ hoodtype = /obj/item/clothing/head/hooded/winterhood/narsie
+
+/obj/item/clothing/head/hooded/winterhood/narsie
+ icon_state = "winterhood_narsie"
+
/obj/item/clothing/suit/spookyghost
name = "spooky ghost"
desc = "This is obviously just a bedsheet, but maybe try it on?"
diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm
index b4ad844f4d..51e34c7b3e 100644
--- a/code/modules/clothing/under/miscellaneous.dm
+++ b/code/modules/clothing/under/miscellaneous.dm
@@ -5,6 +5,7 @@
item_color = "red_pyjamas"
item_state = "w_suit"
can_adjust = FALSE
+
/obj/item/clothing/under/pj/blue
name = "blue pj's"
desc = "Sleepwear."
@@ -12,6 +13,7 @@
item_color = "blue_pyjamas"
item_state = "w_suit"
can_adjust = FALSE
+
/obj/item/clothing/under/patriotsuit
name = "Patriotic Suit"
desc = "Motorcycle not included."
@@ -19,6 +21,7 @@
item_state = "ek"
item_color = "ek"
can_adjust = FALSE
+
/obj/item/clothing/under/scratch
name = "white suit"
desc = "A white suit, suitable for an excellent host."
@@ -43,6 +46,7 @@
icon_state = "sl_suit"
item_color = "sl_suit"
can_adjust = FALSE
+
/obj/item/clothing/under/roman
name = "\improper Roman armor"
desc = "Ancient Roman armor. Made of metallic and leather straps."
@@ -52,6 +56,7 @@
can_adjust = FALSE
strip_delay = 100
resistance_flags = NONE
+
/obj/item/clothing/under/waiter
name = "waiter's outfit"
desc = "It's a very smart uniform with a special pocket for tip."
@@ -59,6 +64,7 @@
item_state = "waiter"
item_color = "waiter"
can_adjust = FALSE
+
/obj/item/clothing/under/rank/prisoner
name = "prison jumpsuit"
desc = "It's standardised Nanotrasen prisoner-wear. Its suit sensors are stuck in the \"Fully On\" position."
@@ -85,12 +91,14 @@
icon_state = "mailman"
item_state = "b_suit"
item_color = "mailman"
+
/obj/item/clothing/under/rank/psyche
name = "psychedelic jumpsuit"
desc = "Groovy!"
icon_state = "psyche"
item_state = "p_suit"
item_color = "psyche"
+
/obj/item/clothing/under/rank/clown/sexy
name = "sexy-clown suit"
desc = "It makes you look HONKable!"
@@ -98,6 +106,7 @@
item_state = "sexyclown"
item_color = "sexyclown"
can_adjust = FALSE
+
/obj/item/clothing/under/jabroni
name = "Jabroni Outfit"
desc = "The leather club is two sectors down."
@@ -105,6 +114,7 @@
item_state = "darkholme"
item_color = "darkholme"
can_adjust = FALSE
+
/obj/item/clothing/under/rank/vice
name = "vice officer's jumpsuit"
desc = "It's the standard issue pretty-boy outfit, as seen on Holo-Vision."
@@ -112,6 +122,7 @@
item_state = "gy_suit"
item_color = "vice"
can_adjust = FALSE
+
/obj/item/clothing/under/rank/centcom_officer
desc = "It's a jumpsuit worn by CentCom Officers."
name = "\improper CentCom officer's jumpsuit"
@@ -119,12 +130,14 @@
item_state = "g_suit"
item_color = "officer"
alt_covers_chest = TRUE
+
/obj/item/clothing/under/rank/centcom_commander
desc = "It's a jumpsuit worn by CentCom's highest-tier Commanders."
name = "\improper CentCom officer's jumpsuit"
icon_state = "centcom"
item_state = "dg_suit"
item_color = "centcom"
+
/obj/item/clothing/under/space
name = "\improper NASA jumpsuit"
desc = "It has a NASA logo on it and is made of space-proofed materials."
@@ -141,6 +154,7 @@
max_heat_protection_temperature = SPACE_SUIT_MAX_TEMP_PROTECT
can_adjust = FALSE
resistance_flags = NONE
+
/obj/item/clothing/under/acj
name = "administrative cybernetic jumpsuit"
icon_state = "syndicate"
@@ -157,24 +171,28 @@
max_heat_protection_temperature = SPACE_SUIT_MAX_TEMP_PROTECT
can_adjust = FALSE
resistance_flags = FIRE_PROOF | ACID_PROOF
+
/obj/item/clothing/under/owl
name = "owl uniform"
desc = "A soft brown jumpsuit made of synthetic feathers and strong conviction."
icon_state = "owl"
item_color = "owl"
can_adjust = FALSE
+
/obj/item/clothing/under/griffin
name = "griffon uniform"
desc = "A soft brown jumpsuit with a white feather collar made of synthetic feathers and a lust for mayhem."
icon_state = "griffin"
item_color = "griffin"
can_adjust = FALSE
+
/obj/item/clothing/under/cloud
name = "cloud"
desc = "cloud"
icon_state = "cloud"
item_color = "cloud"
can_adjust = FALSE
+
/obj/item/clothing/under/gimmick/rank/captain/suit
name = "captain's suit"
desc = "A green suit and yellow necktie. Exemplifies authority."
@@ -218,18 +236,21 @@
item_state = "bl_suit"
item_color = "black_suit"
can_adjust = FALSE
+
/obj/item/clothing/under/suit_jacket/really_black
name = "executive suit"
desc = "A formal black suit and red tie, intended for the station's finest."
icon_state = "really_black_suit"
item_state = "bl_suit"
item_color = "really_black_suit"
+
/obj/item/clothing/under/suit_jacket/female
name = "executive suit"
desc = "A formal trouser suit for women, intended for the station's finest."
icon_state = "black_suit_fem"
item_state = "black_suit_fem"
item_color = "black_suit_fem"
+
/obj/item/clothing/under/suit_jacket/green
name = "green suit"
desc = "A green suit and yellow necktie. Baller."
@@ -237,48 +258,56 @@
item_state = "dg_suit"
item_color = "green_suit"
can_adjust = FALSE
+
/obj/item/clothing/under/suit_jacket/red
name = "red suit"
desc = "A red suit and blue tie. Somewhat formal."
icon_state = "red_suit"
item_state = "r_suit"
item_color = "red_suit"
+
/obj/item/clothing/under/suit_jacket/charcoal
name = "charcoal suit"
desc = "A charcoal suit and red tie. Very professional."
icon_state = "charcoal_suit"
item_state = "charcoal_suit"
item_color = "charcoal_suit"
+
/obj/item/clothing/under/suit_jacket/navy
name = "navy suit"
desc = "A navy suit and red tie, intended for the station's finest."
icon_state = "navy_suit"
item_state = "navy_suit"
item_color = "navy_suit"
+
/obj/item/clothing/under/suit_jacket/burgundy
name = "burgundy suit"
desc = "A burgundy suit and black tie. Somewhat formal."
icon_state = "burgundy_suit"
item_state = "burgundy_suit"
item_color = "burgundy_suit"
+
/obj/item/clothing/under/suit_jacket/checkered
name = "checkered suit"
desc = "That's a very nice suit you have there. Shame if something were to happen to it, eh?"
icon_state = "checkered_suit"
item_state = "checkered_suit"
item_color = "checkered_suit"
+
/obj/item/clothing/under/suit_jacket/tan
name = "tan suit"
desc = "A tan suit with a yellow tie. Smart, but casual."
icon_state = "tan_suit"
item_state = "tan_suit"
item_color = "tan_suit"
+
/obj/item/clothing/under/suit_jacket/white
name = "white suit"
desc = "A white suit and jacket with a blue shirt. You wanna play rough? OKAY!"
icon_state = "white_suit"
item_state = "white_suit"
item_color = "white_suit"
+
/obj/item/clothing/under/burial
name = "burial garments"
desc = "Traditional burial garments from the early 22nd century."
@@ -286,6 +315,7 @@
item_state = "burial"
item_color = "burial"
has_sensor = NO_SENSORS
+
/obj/item/clothing/under/skirt/black
name = "black skirt"
desc = "A black skirt, very fancy!"
@@ -294,6 +324,7 @@
body_parts_covered = CHEST|GROIN|ARMS
fitted = FEMALE_UNIFORM_TOP
can_adjust = FALSE
+
/obj/item/clothing/under/skirt/blue
name = "blue skirt"
desc = "A blue, casual skirt."
@@ -303,6 +334,7 @@
body_parts_covered = CHEST|GROIN|ARMS
fitted = FEMALE_UNIFORM_TOP
can_adjust = FALSE
+
/obj/item/clothing/under/skirt/red
name = "red skirt"
desc = "A red, casual skirt."
@@ -312,6 +344,7 @@
body_parts_covered = CHEST|GROIN|ARMS
fitted = FEMALE_UNIFORM_TOP
can_adjust = FALSE
+
/obj/item/clothing/under/skirt/purple
name = "purple skirt"
desc = "A purple, casual skirt."
@@ -321,6 +354,7 @@
body_parts_covered = CHEST|GROIN|ARMS
fitted = FEMALE_UNIFORM_TOP
can_adjust = FALSE
+
/obj/item/clothing/under/schoolgirl
name = "blue schoolgirl uniform"
desc = "It's just like one of my Japanese animes!"
@@ -330,21 +364,25 @@
body_parts_covered = CHEST|GROIN|ARMS
fitted = FEMALE_UNIFORM_TOP
can_adjust = FALSE
+
/obj/item/clothing/under/schoolgirl/red
name = "red schoolgirl uniform"
icon_state = "schoolgirlred"
item_state = "schoolgirlred"
item_color = "schoolgirlred"
+
/obj/item/clothing/under/schoolgirl/green
name = "green schoolgirl uniform"
icon_state = "schoolgirlgreen"
item_state = "schoolgirlgreen"
item_color = "schoolgirlgreen"
+
/obj/item/clothing/under/schoolgirl/orange
name = "orange schoolgirl uniform"
icon_state = "schoolgirlorange"
item_state = "schoolgirlorange"
item_color = "schoolgirlorange"
+
/obj/item/clothing/under/overalls
name = "laborer's overalls"
desc = "A set of durable overalls for getting the job done."
@@ -352,6 +390,7 @@
item_state = "lb_suit"
item_color = "overalls"
can_adjust = FALSE
+
/obj/item/clothing/under/pirate
name = "pirate outfit"
desc = "Yarr."
@@ -359,6 +398,7 @@
item_state = "pirate"
item_color = "pirate"
can_adjust = FALSE
+
/obj/item/clothing/under/soviet
name = "soviet uniform"
desc = "For the Motherland!"
@@ -366,6 +406,7 @@
item_state = "soviet"
item_color = "soviet"
can_adjust = FALSE
+
/obj/item/clothing/under/redcoat
name = "redcoat uniform"
desc = "Looks old."
@@ -373,6 +414,7 @@
item_state = "redcoat"
item_color = "redcoat"
can_adjust = FALSE
+
/obj/item/clothing/under/kilt
name = "kilt"
desc = "Includes shoes and plaid."
@@ -382,6 +424,7 @@
body_parts_covered = CHEST|GROIN|LEGS|FEET
fitted = FEMALE_UNIFORM_TOP
can_adjust = FALSE
+
/obj/item/clothing/under/kilt/highlander
desc = "You're the only one worthy of this kilt."
@@ -398,6 +441,7 @@
body_parts_covered = CHEST|GROIN|LEGS
fitted = FEMALE_UNIFORM_TOP
can_adjust = FALSE
+
/obj/item/clothing/under/gladiator
name = "gladiator uniform"
desc = "Are you not entertained? Is that not why you are here?"
@@ -408,9 +452,11 @@
fitted = NO_FEMALE_UNIFORM
can_adjust = FALSE
resistance_flags = NONE
+
/obj/item/clothing/under/gladiator/ash_walker
desc = "This gladiator uniform appears to be covered in ash and fairly dated."
has_sensor = NO_SENSORS
+
/obj/item/clothing/under/sundress
name = "sundress"
desc = "Makes you want to frolic in a field of daisies."
@@ -420,6 +466,7 @@
body_parts_covered = CHEST|GROIN
fitted = FEMALE_UNIFORM_TOP
can_adjust = FALSE
+
/obj/item/clothing/under/captainparade
name = "captain's parade uniform"
desc = "A captain's luxury-wear, for special occasions."
@@ -427,6 +474,7 @@
item_state = "by_suit"
item_color = "captain_parade"
can_adjust = FALSE
+
/obj/item/clothing/under/hosparademale
name = "head of security's parade uniform"
desc = "A male head of security's luxury-wear, for special occasions."
@@ -434,6 +482,7 @@
item_state = "r_suit"
item_color = "hos_parade_male"
can_adjust = FALSE
+
/obj/item/clothing/under/hosparadefem
name = "head of security's parade uniform"
desc = "A female head of security's luxury-wear, for special occasions."
@@ -442,6 +491,7 @@
item_color = "hos_parade_fem"
fitted = FEMALE_UNIFORM_TOP
can_adjust = FALSE
+
/obj/item/clothing/under/assistantformal
name = "assistant's formal uniform"
desc = "An assistant's formal-wear. Why an assistant needs formal-wear is still unknown."
@@ -449,6 +499,7 @@
item_state = "gy_suit"
item_color = "assistant_formal"
can_adjust = FALSE
+
/obj/item/clothing/under/blacktango
name = "black tango dress"
desc = "Filled with Latin fire."
@@ -457,6 +508,7 @@
item_color = "black_tango"
fitted = FEMALE_UNIFORM_TOP
can_adjust = FALSE
+
/obj/item/clothing/under/stripeddress
name = "striped dress"
desc = "Fashion in space."
@@ -466,6 +518,7 @@
body_parts_covered = CHEST|GROIN|ARMS
fitted = FEMALE_UNIFORM_FULL
can_adjust = FALSE
+
/obj/item/clothing/under/sailordress
name = "sailor dress"
desc = "Formal wear for a leading lady."
@@ -475,6 +528,7 @@
body_parts_covered = CHEST|GROIN|ARMS
fitted = FEMALE_UNIFORM_TOP
can_adjust = FALSE
+
/obj/item/clothing/under/redeveninggown
name = "red evening gown"
desc = "Fancy dress for space bar singers."
@@ -483,6 +537,7 @@
item_color = "red_evening_gown"
fitted = FEMALE_UNIFORM_TOP
can_adjust = FALSE
+
/obj/item/clothing/under/maid
name = "maid costume"
desc = "Maid in China."
@@ -492,10 +547,12 @@
body_parts_covered = CHEST|GROIN
fitted = FEMALE_UNIFORM_TOP
can_adjust = FALSE
+
/obj/item/clothing/under/maid/Initialize()
. = ..()
var/obj/item/clothing/accessory/maidapron/A = new (src)
attach_accessory(A)
+
/obj/item/clothing/under/janimaid
name = "maid uniform"
desc = "A simple maid uniform for housekeeping."
@@ -505,6 +562,7 @@
body_parts_covered = CHEST|GROIN
fitted = FEMALE_UNIFORM_TOP
can_adjust = FALSE
+
/obj/item/clothing/under/plaid_skirt
name = "red plaid skirt"
desc = "A preppy red skirt with a white blouse."
@@ -514,6 +572,7 @@
fitted = FEMALE_UNIFORM_TOP
can_adjust = TRUE
alt_covers_chest = TRUE
+
/obj/item/clothing/under/plaid_skirt/blue
name = "blue plaid skirt"
desc = "A preppy blue skirt with a white blouse."
@@ -523,6 +582,7 @@
fitted = FEMALE_UNIFORM_TOP
can_adjust = TRUE
alt_covers_chest = TRUE
+
/obj/item/clothing/under/plaid_skirt/purple
name = "purple plaid skirt"
desc = "A preppy purple skirt with a white blouse."
@@ -532,6 +592,7 @@
fitted = FEMALE_UNIFORM_TOP
can_adjust = TRUE
alt_covers_chest = TRUE
+
/obj/item/clothing/under/singery
name = "yellow performer's outfit"
desc = "Just looking at this makes you want to sing."
@@ -542,6 +603,7 @@
fitted = NO_FEMALE_UNIFORM
alternate_worn_layer = ABOVE_SHOES_LAYER
can_adjust = FALSE
+
/obj/item/clothing/under/singerb
name = "blue performer's outfit"
desc = "Just looking at this makes you want to sing."
@@ -552,6 +614,7 @@
alternate_worn_layer = ABOVE_SHOES_LAYER
fitted = FEMALE_UNIFORM_TOP
can_adjust = FALSE
+
/obj/item/clothing/under/plaid_skirt/green
name = "green plaid skirt"
desc = "A preppy green skirt with a white blouse."
@@ -561,14 +624,17 @@
fitted = FEMALE_UNIFORM_TOP
can_adjust = TRUE
alt_covers_chest = TRUE
+
/obj/item/clothing/under/jester
name = "jester suit"
desc = "A jolly dress, well suited to entertain your master, nuncle."
icon_state = "jester"
item_color = "jester"
can_adjust = FALSE
+
/obj/item/clothing/under/jester/alt
icon_state = "jester2"
+
/obj/item/clothing/under/geisha
name = "geisha suit"
desc = "Cute space ninja senpai not included."
@@ -576,12 +642,14 @@
item_color = "geisha"
body_parts_covered = CHEST|GROIN|ARMS
can_adjust = FALSE
+
/obj/item/clothing/under/villain
name = "villain suit"
desc = "A change of wardrobe is necessary if you ever want to catch a real superhero."
icon_state = "villain"
item_color = "villain"
can_adjust = FALSE
+
/obj/item/clothing/under/sailor
name = "sailor suit"
desc = "Skipper's in the wardroom drinkin gin'."
@@ -650,6 +718,7 @@
icon_state = "hostanclothes"
item_state = "hostanclothes"
item_color = "hostanclothes"
+
/obj/item/clothing/under/mummy
name = "mummy wrapping"
desc = "Return the slab or suffer my stale references."
@@ -660,6 +729,7 @@
fitted = NO_FEMALE_UNIFORM
can_adjust = FALSE
resistance_flags = NONE
+
/obj/item/clothing/under/scarecrow
name = "scarecrow clothes"
desc = "Perfect camouflage for hiding in botany."
@@ -670,6 +740,7 @@
fitted = NO_FEMALE_UNIFORM
can_adjust = FALSE
resistance_flags = NONE
+
/obj/item/clothing/under/draculass
name = "draculass coat"
desc = "A dress inspired by the ancient \"Victorian\" era."
@@ -679,6 +750,7 @@
body_parts_covered = CHEST|GROIN|ARMS
fitted = FEMALE_UNIFORM_TOP
can_adjust = FALSE
+
/obj/item/clothing/under/drfreeze
name = "doctor freeze's jumpsuit"
desc = "A modified scientist jumpsuit to look extra cool."
@@ -686,6 +758,7 @@
item_state = "drfreeze"
item_color = "drfreeze"
can_adjust = FALSE
+
/obj/item/clothing/under/lobster
name = "foam lobster suit"
desc = "Who beheaded the college mascot?"
@@ -694,6 +767,7 @@
item_color = "lobster"
fitted = NO_FEMALE_UNIFORM
can_adjust = FALSE
+
/obj/item/clothing/under/gondola
name = "gondola hide suit"
desc = "Now you're cooking."
@@ -701,6 +775,7 @@
item_state = "lb_suit"
item_color = "gondola"
can_adjust = FALSE
+
/obj/item/clothing/under/skeleton
name = "skeleton jumpsuit"
desc = "A black jumpsuit with a white bone pattern printed on it. Spooky!"
@@ -720,6 +795,14 @@
body_parts_covered = CHEST|GROIN
can_adjust = FALSE
+/obj/item/clothing/under/telegram
+ name = "telegram suit"
+ desc = "Bright and red, hard to miss. Mostly warn by hotel staff or singing telegram."
+ icon_state = "telegram"
+ item_state = "telegram"
+ body_parts_covered = CHEST|GROIN
+ can_adjust = FALSE
+
/obj/item/clothing/under/durathread
name = "durathread jumpsuit"
desc = "A jumpsuit made from durathread, its resilient fibres provide some protection to the wearer."
diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm
index b5f02b79d7..f5262742e2 100644
--- a/code/modules/flufftext/Hallucination.dm
+++ b/code/modules/flufftext/Hallucination.dm
@@ -21,7 +21,8 @@ GLOBAL_LIST_INIT(hallucination_list, list(
/datum/hallucination/delusion = 2,
/datum/hallucination/shock = 1,
/datum/hallucination/death = 1,
- /datum/hallucination/oh_yeah = 1
+ /datum/hallucination/oh_yeah = 1,
+ /datum/hallucination/sleeping_carp = 1
))
@@ -1294,3 +1295,26 @@ GLOBAL_LIST_INIT(hallucination_list, list(
H.preparePixelProjectile(target, start)
H.fire()
qdel(src)
+
+/datum/hallucination/sleeping_carp
+
+/datum/hallucination/sleeping_carp/New(mob/living/carbon/C, forced = TRUE)
+ set waitfor = FALSE
+ ..()
+ var/list/mobsyup
+ for (var/mob/living/carbon/A in orange(C,1))
+ if (get_dist(C,A) < 2)
+ LAZYADD(mobsyup,A)
+ if (!LAZYLEN(mobsyup))
+ qdel(src)
+ return
+ var/mob/living/carbon/G = pick(mobsyup)
+ if (prob(50))
+ C.visible_message("[C] falls to the ground screaming and clutching [C.p_their()] wrist!", \
+ "[G] grabs your wrist and violently wrenches it to the side!")
+ C.emote("scream")
+ C.dropItemToGround(C.get_active_held_item())
+ C.Knockdown(60)
+ else
+ to_chat(C,"[G] violently grabs you!")
+ qdel(src)
diff --git a/code/modules/food_and_drinks/food/snacks.dm b/code/modules/food_and_drinks/food/snacks.dm
index d838b31aba..b8a63afb7f 100644
--- a/code/modules/food_and_drinks/food/snacks.dm
+++ b/code/modules/food_and_drinks/food/snacks.dm
@@ -319,13 +319,13 @@ All foods are distributed among various categories. Use common sense.
if(iscorgi(M))
var/mob/living/L = M
if(bitecount == 0 || prob(50))
- M.emote("me", 1, "nibbles away at \the [src]")
+ M.emote("me", EMOTE_VISIBLE, "nibbles away at \the [src]")
bitecount++
L.taste(reagents) // why should carbons get all the fun?
if(bitecount >= 5)
var/sattisfaction_text = pick("burps from enjoyment", "yaps for more", "woofs twice", "looks at the area where \the [src] was")
if(sattisfaction_text)
- M.emote("me", 1, "[sattisfaction_text]")
+ M.emote("me", EMOTE_VISIBLE, "[sattisfaction_text]")
qdel(src)
// //////////////////////////////////////////////Store////////////////////////////////////////
diff --git a/code/modules/holiday/halloween/halloween.dm b/code/modules/holiday/halloween/halloween.dm
index 5b9b2ac21d..24225c1a20 100644
--- a/code/modules/holiday/halloween/halloween.dm
+++ b/code/modules/holiday/halloween/halloween.dm
@@ -252,12 +252,11 @@
// Spooky Uplink Items //
/////////////////////////
-/datum/uplink_item/dangerous/crossbow/candy
+/datum/uplink_item/stealthy_weapons/crossbow/candy
name = "Candy Corn Crossbow"
desc = "A standard miniature energy crossbow that uses a hard-light projector to transform bolts into candy corn. Happy Halloween!"
category = "Holiday"
item = /obj/item/gun/energy/kinetic_accelerator/crossbow/halloween
- cost = 12
surplus = 0
/datum/uplink_item/device_tools/emag/hack_o_lantern
diff --git a/code/modules/hydroponics/grown/grass_carpet.dm b/code/modules/hydroponics/grown/grass_carpet.dm
index 08ce71ad37..8fc141e152 100644
--- a/code/modules/hydroponics/grown/grass_carpet.dm
+++ b/code/modules/hydroponics/grown/grass_carpet.dm
@@ -56,11 +56,41 @@
/obj/item/reagent_containers/food/snacks/grown/grass/fairy
seed = /obj/item/seeds/grass/fairy
name = "fairygrass"
- desc = "Blue, glowing, and smells fainly of mushrooms."
+ desc = "Glowing, and smells fainly of mushrooms."
icon_state = "fairygrassclump"
filling_color = "#3399ff"
stacktype = /obj/item/stack/tile/fairygrass
+/obj/item/reagent_containers/food/snacks/grown/grass/fairy/attack_self(mob/user)
+ var/datum/plant_gene/trait/glow/G = null
+ for(var/datum/plant_gene/trait/glow/gene in seed.genes)
+ G = gene
+ break
+
+ stacktype = initial(stacktype)
+
+ if(G)
+ switch(G.type)
+ if(/datum/plant_gene/trait/glow/white)
+ stacktype = /obj/item/stack/tile/fairygrass/white
+ if(/datum/plant_gene/trait/glow/red)
+ stacktype = /obj/item/stack/tile/fairygrass/red
+ if(/datum/plant_gene/trait/glow/yellow)
+ stacktype = /obj/item/stack/tile/fairygrass/yellow
+ if(/datum/plant_gene/trait/glow/green)
+ stacktype = /obj/item/stack/tile/fairygrass/green
+ if(/datum/plant_gene/trait/glow/blue)
+ stacktype = /obj/item/stack/tile/fairygrass/blue
+ if(/datum/plant_gene/trait/glow/purple)
+ stacktype = /obj/item/stack/tile/fairygrass/purple
+ if(/datum/plant_gene/trait/glow/pink)
+ stacktype = /obj/item/stack/tile/fairygrass/pink
+
+ . = ..()
+
+
+
+
// Carpet
/obj/item/seeds/grass/carpet
name = "pack of carpet seeds"
diff --git a/code/modules/hydroponics/grown/misc.dm b/code/modules/hydroponics/grown/misc.dm
index 9d91d028ba..16992b3e96 100644
--- a/code/modules/hydroponics/grown/misc.dm
+++ b/code/modules/hydroponics/grown/misc.dm
@@ -226,9 +226,12 @@
/obj/item/reagent_containers/food/snacks/grown/cherry_bomb/proc/prime()
icon_state = "cherry_bomb_lit"
playsound(src, 'sound/effects/fuse.ogg', seed.potency, 0)
+ addtimer(CALLBACK(src, /obj/item/reagent_containers/food/snacks/grown/cherry_bomb/proc/detonate), rand(50, 100))
+
+/obj/item/reagent_containers/food/snacks/grown/cherry_bomb/proc/detonate()
reagents.chem_temp = 1000 //Sets off the black powder
reagents.handle_reactions()
-
+
// Lavaland cactus
/obj/item/seeds/lavaland/cactus
diff --git a/code/modules/hydroponics/plant_genes.dm b/code/modules/hydroponics/plant_genes.dm
index 74185e9b3f..3597ed5be6 100644
--- a/code/modules/hydroponics/plant_genes.dm
+++ b/code/modules/hydroponics/plant_genes.dm
@@ -299,7 +299,7 @@
rate = 0.04
glow_color = "#AAD84B"
-datum/plant_gene/trait/glow/white
+/datum/plant_gene/trait/glow/white
name = "White Bioluminescence"
glow_color = "#FFFFFF"
diff --git a/code/modules/mob/living/carbon/alien/damage_procs.dm b/code/modules/mob/living/carbon/alien/damage_procs.dm
index 2f8ffb4c01..f5d210b94b 100644
--- a/code/modules/mob/living/carbon/alien/damage_procs.dm
+++ b/code/modules/mob/living/carbon/alien/damage_procs.dm
@@ -7,9 +7,9 @@
/* CIT CHANGE - Pffffffffffffhahahahahhaha-- No.
//aliens are immune to stamina damage.
-/mob/living/carbon/alien/adjustStaminaLoss(amount, updating_stamina = 1)
+/mob/living/carbon/alien/adjustStaminaLoss(amount, updating_health = 1)
return
-/mob/living/carbon/alien/setStaminaLoss(amount, updating_stamina = 1)
+/mob/living/carbon/alien/setStaminaLoss(amount, updating_health = 1)
return
*/
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index 9eab9054f5..3ae2e3bdbd 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -1043,6 +1043,21 @@
/mob/living/carbon/human/species/golem/plastic
race = /datum/species/golem/plastic
+/mob/living/carbon/human/species/golem/bronze
+ race = /datum/species/golem/bronze
+
+/mob/living/carbon/human/species/golem/cardboard
+ race = /datum/species/golem/cardboard
+
+/mob/living/carbon/human/species/golem/leather
+ race = /datum/species/golem/leather
+
+/mob/living/carbon/human/species/golem/bone
+ race = /datum/species/golem/bone
+
+/mob/living/carbon/human/species/golem/durathread
+ race = /datum/species/golem/durathread
+
/mob/living/carbon/human/species/golem/clockwork
race = /datum/species/golem/clockwork
diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm
index 327ad6760c..f9fa5d84da 100644
--- a/code/modules/mob/living/carbon/human/human_defense.dm
+++ b/code/modules/mob/living/carbon/human/human_defense.dm
@@ -661,6 +661,12 @@
if(health >= 0)
if(src == M)
+ if(has_status_effect(STATUS_EFFECT_CHOKINGSTRAND))
+ to_chat(src, "You attempt to remove the durathread strand from around your neck.")
+ if(do_after(src, 35, null, src))
+ to_chat(src, "You succesfuly remove the durathread strand.")
+ remove_status_effect(STATUS_EFFECT_CHOKINGSTRAND)
+ return
var/to_send = ""
visible_message("[src] examines [p_them()]self.", \
"You check yourself for injuries.")
diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm
index 7ff4f355d5..ba7acf76d7 100644
--- a/code/modules/mob/living/carbon/human/species.dm
+++ b/code/modules/mob/living/carbon/human/species.dm
@@ -1537,6 +1537,7 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
target.lastattacker = user.real_name
target.lastattackerckey = user.ckey
+ user.dna.species.spec_unarmedattacked(user, target)
if(user.limb_destroyer)
target.dismembering_strike(user, affecting.body_zone)
@@ -1550,6 +1551,9 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
else if(target.lying)
target.forcesay(GLOB.hit_appends)
+/datum/species/proc/spec_unarmedattacked(mob/living/carbon/human/user, mob/living/carbon/human/target)
+ return
+
/datum/species/proc/disarm(mob/living/carbon/human/user, mob/living/carbon/human/target, datum/martial_art/attacker_style)
// CITADEL EDIT slap mouthy gits and booty
var/aim_for_mouth = user.zone_selected == "mouth"
diff --git a/code/modules/mob/living/carbon/human/species_types/golems.dm b/code/modules/mob/living/carbon/human/species_types/golems.dm
index d8fcb1330d..48ce55a052 100644
--- a/code/modules/mob/living/carbon/human/species_types/golems.dm
+++ b/code/modules/mob/living/carbon/human/species_types/golems.dm
@@ -944,6 +944,21 @@
grab_sound = 'sound/weapons/whipgrab.ogg'
attack_sound = 'sound/weapons/whip.ogg'
+/datum/species/golem/durathread
+ name = "Durathread Golem"
+ id = "durathread golem"
+ prefix = "Durathread"
+ limbs_id = "d_golem"
+ special_names = list("Boll","Weave")
+ species_traits = list(NOBLOOD,NO_UNDERWEAR,NOEYES)
+ fixed_mut_color = null
+ inherent_traits = list(TRAIT_NOBREATH, TRAIT_RESISTCOLD,TRAIT_RESISTHIGHPRESSURE,TRAIT_RESISTLOWPRESSURE,TRAIT_NOGUNS,TRAIT_RADIMMUNE,TRAIT_PIERCEIMMUNE,TRAIT_NODISMEMBER)
+ info_text = "As a Durathread Golem, your strikes will cause those your targets to start choking, but your woven body won't withstand fire as well."
+
+/datum/species/golem/durathread/spec_unarmedattacked(mob/living/carbon/human/user, mob/living/carbon/human/target)
+ . = ..()
+ target.apply_status_effect(STATUS_EFFECT_CHOKINGSTRAND)
+
/datum/species/golem/bone
name = "Bone Golem"
id = "bone golem"
diff --git a/code/modules/mob/living/carbon/inventory.dm b/code/modules/mob/living/carbon/inventory.dm
index bc2d6132e1..eed3a17c34 100644
--- a/code/modules/mob/living/carbon/inventory.dm
+++ b/code/modules/mob/living/carbon/inventory.dm
@@ -85,7 +85,7 @@
return not_handled
-/mob/living/carbon/doUnEquip(obj/item/I)
+/mob/living/carbon/doUnEquip(obj/item/I, force, newloc, no_move, invdrop = TRUE)
. = ..() //Sets the default return value to what the parent returns.
if(!. || !I) //We don't want to set anything to null if the parent returned 0.
return
diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm
index 3c587a05dd..16a9f07ceb 100644
--- a/code/modules/mob/living/carbon/life.dm
+++ b/code/modules/mob/living/carbon/life.dm
@@ -98,7 +98,7 @@
var/datum/gas_mixture/breath
if(!getorganslot(ORGAN_SLOT_BREATHING_TUBE))
- if(health <= HEALTH_THRESHOLD_FULLCRIT || (pulledby && pulledby.grab_state >= GRAB_KILL) || (lungs && lungs.organ_flags & ORGAN_FAILING))
+ if(health <= HEALTH_THRESHOLD_FULLCRIT || (pulledby && pulledby.grab_state >= GRAB_KILL) || HAS_TRAIT(src, TRAIT_MAGIC_CHOKE) || (lungs && lungs.organ_flags & ORGAN_FAILING))
losebreath++ //You can't breath at all when in critical or when being choked, so you're going to miss a breath
else if(health <= crit_threshold)
diff --git a/code/modules/mob/living/carbon/monkey/monkey.dm b/code/modules/mob/living/carbon/monkey/monkey.dm
index f9c2e2dd3d..025c1a2f75 100644
--- a/code/modules/mob/living/carbon/monkey/monkey.dm
+++ b/code/modules/mob/living/carbon/monkey/monkey.dm
@@ -63,8 +63,6 @@
var/amount
if(reagents.has_reagent("morphine"))
amount = -1
- if(reagents.has_reagent("nuka_cola"))
- amount = -1
if(amount)
add_movespeed_modifier(MOVESPEED_ID_MONKEY_REAGENT_SPEEDMOD, TRUE, 100, override = TRUE, multiplicative_slowdown = amount)
diff --git a/code/modules/mob/living/damage_procs.dm b/code/modules/mob/living/damage_procs.dm
index dc43ab8b07..57b65a53f7 100644
--- a/code/modules/mob/living/damage_procs.dm
+++ b/code/modules/mob/living/damage_procs.dm
@@ -225,10 +225,10 @@
/mob/living/proc/getStaminaLoss()
return staminaloss
-/mob/living/proc/adjustStaminaLoss(amount, updating_stamina = TRUE, forced = FALSE)
+/mob/living/proc/adjustStaminaLoss(amount, updating_health = TRUE, forced = FALSE)
return
-/mob/living/proc/setStaminaLoss(amount, updating_stamina = TRUE, forced = FALSE)
+/mob/living/proc/setStaminaLoss(amount, updating_health = TRUE, forced = FALSE)
return
// heal ONE external organ, organ gets randomly selected from damaged ones.
diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm
index 44ddf56096..660a866271 100644
--- a/code/modules/mob/living/say.dm
+++ b/code/modules/mob/living/say.dm
@@ -232,14 +232,10 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
// Recompose message for AI hrefs, language incomprehension.
message = compose_message(speaker, message_language, raw_message, radio_freq, spans, message_mode)
- message = hear_intercept(message, speaker, message_language, raw_message, radio_freq, spans, message_mode)
show_message(message, MSG_AUDIBLE, deaf_message, deaf_type)
return message
-/mob/living/proc/hear_intercept(message, atom/movable/speaker, datum/language/message_language, raw_message, radio_freq, list/spans, message_mode)
- return message
-
/mob/living/send_speech(message, message_range = 6, obj/source = src, bubble_type = bubble_icon, list/spans, datum/language/message_language=null, message_mode)
var/static/list/eavesdropping_modes = list(MODE_WHISPER = TRUE, MODE_WHISPER_CRIT = TRUE)
var/eavesdrop_range = 0
diff --git a/code/modules/mob/living/silicon/damage_procs.dm b/code/modules/mob/living/silicon/damage_procs.dm
index 8fbd7afbdd..91a6709bc9 100644
--- a/code/modules/mob/living/silicon/damage_procs.dm
+++ b/code/modules/mob/living/silicon/damage_procs.dm
@@ -30,10 +30,10 @@
/mob/living/silicon/setCloneLoss(amount, updating_health = TRUE, forced = FALSE)
return FALSE
-/mob/living/silicon/adjustStaminaLoss(amount, updating_stamina = 1, forced = FALSE)//immune to stamina damage.
+/mob/living/silicon/adjustStaminaLoss(amount, updating_health = 1, forced = FALSE)//immune to stamina damage.
return FALSE
-/mob/living/silicon/setStaminaLoss(amount, updating_stamina = 1)
+/mob/living/silicon/setStaminaLoss(amount, updating_health = 1)
return FALSE
/mob/living/silicon/adjustOrganLoss(slot, amount, maximum = 500)
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 4f844151a2..0484e39c1a 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -1295,6 +1295,6 @@
bellyup = 1
update_icons()
-/mob/living/silicon/robot/adjustStaminaLossBuffered(amount, updating_stamina = 1)
+/mob/living/silicon/robot/adjustStaminaLossBuffered(amount, updating_health = 1)
if(istype(cell))
cell.charge -= amount*5
\ No newline at end of file
diff --git a/code/modules/mob/living/simple_animal/bot/bot.dm b/code/modules/mob/living/simple_animal/bot/bot.dm
index 105cdaf5b0..e61cfad068 100644
--- a/code/modules/mob/living/simple_animal/bot/bot.dm
+++ b/code/modules/mob/living/simple_animal/bot/bot.dm
@@ -674,11 +674,11 @@ Pass a positive integer as an argument to override a bot's default speed.
destination = nearest_beacon
//PDA control. Some bots, especially MULEs, may have more parameters.
-/mob/living/simple_animal/bot/proc/bot_control(command, mob/user, turf/user_turf, list/user_access = list())
+/mob/living/simple_animal/bot/proc/bot_control(command, mob/user, list/user_access = list())
if(!on || emagged == 2 || remote_disabled) //Emagged bots do not respect anyone's authority! Bots with their remote controls off cannot get commands.
return TRUE //ACCESS DENIED
if(client)
- bot_control_message(command,user,user_turf,user_access)
+ bot_control_message(command, user)
// process control input
switch(command)
if("patroloff")
@@ -690,7 +690,7 @@ Pass a positive integer as an argument to override a bot's default speed.
if("summon")
bot_reset()
- summon_target = user_turf
+ summon_target = get_turf(user)
if(user_access.len != 0)
access_card.access = user_access + prev_access //Adds the user's access, if any.
mode = BOT_SUMMON
@@ -702,15 +702,14 @@ Pass a positive integer as an argument to override a bot's default speed.
return
//
-/mob/living/simple_animal/bot/proc/bot_control_message(command,user,user_turf,user_access)
+/mob/living/simple_animal/bot/proc/bot_control_message(command, user)
switch(command)
if("patroloff")
to_chat(src, "STOP PATROL")
if("patrolon")
to_chat(src, "START PATROL")
if("summon")
- var/area/a = get_area(user_turf)
- to_chat(src, "PRIORITY ALERT:[user] in [a.name]!")
+ to_chat(src, "PRIORITY ALERT:[user] in [get_area_name(user)]!")
if("stop")
to_chat(src, "STOP!")
diff --git a/code/modules/mob/living/simple_animal/bot/mulebot.dm b/code/modules/mob/living/simple_animal/bot/mulebot.dm
index 72f255137d..426de81da0 100644
--- a/code/modules/mob/living/simple_animal/bot/mulebot.dm
+++ b/code/modules/mob/living/simple_animal/bot/mulebot.dm
@@ -218,7 +218,7 @@
bot_control(action, usr) // Kill this later.
. = TRUE
-/mob/living/simple_animal/bot/mulebot/bot_control(command, mob/user, pda = 0, turf/user_turf, list/user_access = list())
+/mob/living/simple_animal/bot/mulebot/bot_control(command, mob/user, pda = FALSE)
if(pda && wires.is_cut(WIRE_RX)) // MULE wireless is controlled by wires.
return
diff --git a/code/modules/mob/living/simple_animal/friendly/cat.dm b/code/modules/mob/living/simple_animal/friendly/cat.dm
index 58d8a3ccca..73fd2b5569 100644
--- a/code/modules/mob/living/simple_animal/friendly/cat.dm
+++ b/code/modules/mob/living/simple_animal/friendly/cat.dm
@@ -169,40 +169,40 @@
/mob/living/simple_animal/pet/cat/Life()
if(!stat && !buckled && !client)
if(prob(1))
- emote("me", 1, pick("stretches out for a belly rub.", "wags its tail.", "lies down."))
+ emote("me", EMOTE_VISIBLE, pick("stretches out for a belly rub.", "wags its tail.", "lies down."))
icon_state = "[icon_living]_rest"
collar_type = "[initial(collar_type)]_rest"
resting = 1
update_canmove()
else if (prob(1))
- emote("me", 1, pick("sits down.", "crouches on its hind legs.", "looks alert."))
+ emote("me", EMOTE_VISIBLE, pick("sits down.", "crouches on its hind legs.", "looks alert."))
icon_state = "[icon_living]_sit"
collar_type = "[initial(collar_type)]_sit"
resting = 1
update_canmove()
else if (prob(1))
if (resting)
- emote("me", 1, pick("gets up and meows.", "walks around.", "stops resting."))
+ emote("me", EMOTE_VISIBLE, pick("gets up and meows.", "walks around.", "stops resting."))
icon_state = "[icon_living]"
collar_type = "[initial(collar_type)]"
resting = 0
update_canmove()
else
- emote("me", 1, pick("grooms its fur.", "twitches its whiskers.", "shakes out its coat."))
+ emote("me", EMOTE_VISIBLE, pick("grooms its fur.", "twitches its whiskers.", "shakes out its coat."))
//MICE!
if((src.loc) && isturf(src.loc))
if(!stat && !resting && !buckled)
for(var/mob/living/simple_animal/mouse/M in view(1,src))
if(!M.stat && Adjacent(M))
- emote("me", 1, "splats \the [M]!")
+ emote("me", EMOTE_VISIBLE, "splats \the [M]!")
M.splat()
movement_target = null
stop_automated_movement = 0
break
for(var/obj/item/toy/cattoy/T in view(1,src))
if (T.cooldown < (world.time - 400))
- emote("me", 1, "bats \the [T] around with its paw!")
+ emote("me", EMOTE_VISIBLE, "bats \the [T] around with its paw!")
T.cooldown = world.time
..()
@@ -241,10 +241,10 @@
if(change > 0)
if(M && stat != DEAD)
new /obj/effect/temp_visual/heart(loc)
- emote("me", 1, "purrs!")
+ emote("me", EMOTE_VISIBLE, "purrs!")
else
if(M && stat != DEAD)
- emote("me", 1, "hisses!")
+ emote("me", EMOTE_VISIBLE, "hisses!")
/mob/living/simple_animal/pet/cat/cak //I told you I'd do it, Remie
name = "Keeki"
diff --git a/code/modules/mob/living/simple_animal/friendly/dog.dm b/code/modules/mob/living/simple_animal/friendly/dog.dm
index c194233c42..eb7129181d 100644
--- a/code/modules/mob/living/simple_animal/friendly/dog.dm
+++ b/code/modules/mob/living/simple_animal/friendly/dog.dm
@@ -459,10 +459,10 @@
movement_target.attack_animal(src)
else if(ishuman(movement_target.loc) )
if(prob(20))
- emote("me", 1, "stares at [movement_target.loc]'s [movement_target] with a sad puppy-face")
+ emote("me", EMOTE_VISIBLE, "stares at [movement_target.loc]'s [movement_target] with a sad puppy-face")
if(prob(1))
- emote("me", 1, pick("dances around.","chases its tail!"))
+ emote("me", EMOTE_VISIBLE, pick("dances around.","chases its tail!"))
spawn(0)
for(var/i in list(1,2,4,8,4,2,1,2,4,8,4,2,1,2,4,8,4,2))
setDir(i)
@@ -618,7 +618,7 @@
if(!stat && !resting && !buckled)
if(prob(1))
- emote("me", 1, pick("dances around.","chases her tail."))
+ emote("me", EMOTE_VISIBLE, pick("dances around.","chases her tail."))
spawn(0)
for(var/i in list(1,2,4,8,4,2,1,2,4,8,4,2,1,2,4,8,4,2))
setDir(i)
@@ -629,7 +629,7 @@
if(!stat && !resting && !buckled)
if(prob(1))
- emote("me", 1, pick("chases its tail."))
+ emote("me", EMOTE_VISIBLE, pick("chases its tail."))
spawn(0)
for(var/i in list(1,2,4,8,4,2,1,2,4,8,4,2,1,2,4,8,4,2))
setDir(i)
@@ -648,8 +648,8 @@
if(change > 0)
if(M && stat != DEAD) // Added check to see if this mob (the dog) is dead to fix issue 2454
new /obj/effect/temp_visual/heart(loc)
- emote("me", 1, "yaps happily!")
+ emote("me", EMOTE_VISIBLE, "yaps happily!")
SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "pet_corgi", /datum/mood_event/pet_corgi)
else
if(M && stat != DEAD) // Same check here, even though emote checks it as well (poor form to check it only in the help case)
- emote("me", 1, "growls!")
+ emote("me", EMOTE_VISIBLE, "growls!")
diff --git a/code/modules/mob/living/simple_animal/guardian/types/charger.dm b/code/modules/mob/living/simple_animal/guardian/types/charger.dm
index 3ece5d4e27..49514d0d12 100644
--- a/code/modules/mob/living/simple_animal/guardian/types/charger.dm
+++ b/code/modules/mob/living/simple_animal/guardian/types/charger.dm
@@ -3,8 +3,8 @@
ranged = 1 //technically
ranged_message = "charges"
ranged_cooldown_time = 20
- damage_coeff = list(BRUTE = 0, BURN = 0.5, TOX = 0.5, CLONE = 0.5, STAMINA = 0, OXY = 0.5)
- playstyle_string = "As a charger type you do medium damage, take half damage, immunity to brute damage, move very fast, and can charge at a location, damaging any target hit and forcing them to drop any items they are holding."
+ damage_coeff = list(BRUTE = 0.2, BURN = 0.5, TOX = 0.5, CLONE = 0.5, STAMINA = 0, OXY = 0.5)
+ playstyle_string = "As a charger type you do medium damage, take half damage, have near immunity to brute damage, move very fast, and can charge at a location, damaging any target hit and forcing them to drop any items they are holding."
magic_fluff_string = "..And draw the Hunter, an alien master of rapid assault."
tech_fluff_string = "Boot sequence complete. Charge modules loaded. Holoparasite swarm online."
carp_fluff_string = "CARP CARP CARP! Caught one! It's a charger carp, that likes running at people. But it doesn't have any legs..."
diff --git a/code/modules/mob/living/simple_animal/guardian/types/fire.dm b/code/modules/mob/living/simple_animal/guardian/types/fire.dm
index b111caae50..718bfd71af 100644
--- a/code/modules/mob/living/simple_animal/guardian/types/fire.dm
+++ b/code/modules/mob/living/simple_animal/guardian/types/fire.dm
@@ -6,8 +6,8 @@
attack_sound = 'sound/items/welder.ogg'
attacktext = "ignites"
melee_damage_type = BURN
- damage_coeff = list(BRUTE = 0.7, BURN = 0, TOX = 0.7, CLONE = 0.7, STAMINA = 0, OXY = 0.7)
- playstyle_string = "As a chaos type, you take 30% damage reduction to all but burn, which you are immune to. You will ignite any enemy you bump into. in addition, your melee attacks will cause human targets to see everyone as you."
+ damage_coeff = list(BRUTE = 0.7, BURN = 0.1, TOX = 0.7, CLONE = 0.7, STAMINA = 0, OXY = 0.7)
+ playstyle_string = "As a chaos type, you take 30% damage reduction to all but burn, which you are almost immune to. You will ignite any enemy you bump into. in addition, your melee attacks will cause human targets to see everyone as you."
magic_fluff_string = "..And draw the Wizard, bringer of endless chaos!"
tech_fluff_string = "Boot sequence complete. Crowd control modules activated. Holoparasite swarm online."
carp_fluff_string = "CARP CARP CARP! You caught one! OH GOD, EVERYTHING'S ON FIRE. Except you and the fish."
diff --git a/code/modules/mob/living/simple_animal/hostile/hostile.dm b/code/modules/mob/living/simple_animal/hostile/hostile.dm
index 9cd0504315..0377efd16e 100644
--- a/code/modules/mob/living/simple_animal/hostile/hostile.dm
+++ b/code/modules/mob/living/simple_animal/hostile/hostile.dm
@@ -364,7 +364,7 @@
/mob/living/simple_animal/hostile/proc/Aggro()
vision_range = aggro_vision_range
if(target && emote_taunt.len && prob(taunt_chance))
- emote("me", 1, "[pick(emote_taunt)] at [target].")
+ emote("me", EMOTE_VISIBLE, "[pick(emote_taunt)] at [target].")
taunt_chance = max(taunt_chance-7,2)
diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm
index 5f9c8700bd..12bc41d9c5 100644
--- a/code/modules/mob/living/simple_animal/parrot.dm
+++ b/code/modules/mob/living/simple_animal/parrot.dm
@@ -437,7 +437,7 @@
//Search for item to steal
parrot_interest = search_for_item()
if(parrot_interest)
- emote("me", 1, "looks in [parrot_interest]'s direction and takes flight.")
+ emote("me", EMOTE_VISIBLE, "looks in [parrot_interest]'s direction and takes flight.")
parrot_state = PARROT_SWOOP | PARROT_STEAL
icon_state = icon_living
return
@@ -459,7 +459,7 @@
if(AM)
if(istype(AM, /obj/item) || isliving(AM)) //If stealable item
parrot_interest = AM
- emote("me", 1, "turns and flies towards [parrot_interest].")
+ emote("me", EMOTE_VISIBLE, "turns and flies towards [parrot_interest].")
parrot_state = PARROT_SWOOP | PARROT_STEAL
return
else //Else it's a perch
@@ -760,7 +760,7 @@
held_item = null
if(health < maxHealth)
adjustBruteLoss(-10)
- emote("me", 1, "[src] eagerly downs the cracker.")
+ emote("me", EMOTE_VISIBLE, "[src] eagerly downs the cracker.")
return 1
diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm
index ea86ac8963..52e58aea4e 100644
--- a/code/modules/mob/living/simple_animal/simple_animal.dm
+++ b/code/modules/mob/living/simple_animal/simple_animal.dm
@@ -185,16 +185,16 @@
say(pick(speak), forced = "poly")
else
if(!(emote_hear && emote_hear.len) && (emote_see && emote_see.len))
- emote("me", 1, pick(emote_see))
+ emote("me", EMOTE_VISIBLE, pick(emote_see))
if((emote_hear && emote_hear.len) && !(emote_see && emote_see.len))
- emote("me", 2, pick(emote_hear))
+ emote("me", EMOTE_AUDIBLE, pick(emote_hear))
if((emote_hear && emote_hear.len) && (emote_see && emote_see.len))
var/length = emote_hear.len + emote_see.len
var/pick = rand(1,length)
if(pick <= emote_see.len)
- emote("me", 1, pick(emote_see))
+ emote("me", EMOTE_VISIBLE, pick(emote_see))
else
- emote("me", 2, pick(emote_hear))
+ emote("me", EMOTE_AUDIBLE, pick(emote_hear))
/mob/living/simple_animal/proc/environment_is_safe(datum/gas_mixture/environment, check_temp = FALSE)
diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm
index fece60f268..7567fc1a52 100644
--- a/code/modules/paperwork/pen.dm
+++ b/code/modules/paperwork/pen.dm
@@ -174,11 +174,15 @@
*/
/obj/item/pen/edagger
attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") //these wont show up if the pen is off
+ sharpness = IS_SHARP
var/on = FALSE
/obj/item/pen/edagger/Initialize()
. = ..()
- AddComponent(/datum/component/butchering, 60, 100, 0, 'sound/weapons/blade1.ogg', TRUE)
+ AddComponent(/datum/component/butchering, 60, 100, 0, 'sound/weapons/blade1.ogg')
+
+/obj/item/pen/edagger/get_sharpness()
+ return on * sharpness
/obj/item/pen/edagger/attack_self(mob/living/user)
if(on)
@@ -201,8 +205,6 @@
throwforce = 35
playsound(user, 'sound/weapons/saberon.ogg', 5, 1)
to_chat(user, "[src] is now active.")
- var/datum/component/butchering/butchering = src.GetComponent(/datum/component/butchering)
- butchering.butchering_enabled = on
update_icon()
/obj/item/pen/edagger/update_icon()
diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm
index 2855e3c321..ded99d6fa6 100644
--- a/code/modules/power/cell.dm
+++ b/code/modules/power/cell.dm
@@ -360,3 +360,7 @@
var/area/A = get_area(src)
if(!A.lightswitch || !A.light_power)
charge = 0 //For naturally depowered areas, we start with no power
+
+//found inside the inducers ordered from cargo.
+/obj/item/stock_parts/cell/inducer_supply
+ maxcharge = 5000
diff --git a/code/modules/reagents/chemistry/reagents/drink_reagents.dm b/code/modules/reagents/chemistry/reagents/drink_reagents.dm
index 80dac84f18..08594dee5b 100644
--- a/code/modules/reagents/chemistry/reagents/drink_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/drink_reagents.dm
@@ -407,10 +407,6 @@
glass_name = "glass of Nuka Cola"
glass_desc = "Don't cry, Don't raise your eye, It's only nuclear wasteland."
-/datum/reagent/consumable/nuka_cola/on_mob_metabolize(mob/living/L)
- ..()
- L.add_movespeed_modifier(id, update=TRUE, priority=100, multiplicative_slowdown=-1, blacklisted_movetypes=(FLYING|FLOATING))
-
/datum/reagent/consumable/nuka_cola/on_mob_end_metabolize(mob/living/L)
L.remove_movespeed_modifier(id)
..()
diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
index e3962e89c2..f31613702c 100644
--- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
@@ -881,40 +881,49 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
/datum/reagent/medicine/strange_reagent
name = "Strange Reagent"
id = "strange_reagent"
- description = "A miracle drug capable of bringing the dead back to life. Only functions if the target has less than 100 brute and burn damage (independent of one another), and causes slight damage to the living."
+ description = "A miracle drug capable of bringing the dead back to life. Only functions when applied by patch or spray, if the target has less than 100 brute and burn damage (independent of one another) and hasn't been husked. Causes slight damage to the living."
reagent_state = LIQUID
color = "#A0E85E"
metabolization_rate = 0.5 * REAGENTS_METABOLISM
taste_description = "magnets"
pH = 0
-/datum/reagent/medicine/strange_reagent/reaction_mob(mob/living/carbon/human/M, method=TOUCH, reac_volume)
+/datum/reagent/medicine/strange_reagent/reaction_mob(mob/living/M, method=TOUCH, reac_volume)
if(M.stat == DEAD)
- if(M.getBruteLoss() >= 100 || M.getFireLoss() >= 100)
- M.visible_message("[M]'s body convulses a bit, and then falls still once more.")
+ if(M.suiciding || M.hellbound) //they are never coming back
+ M.visible_message("[M]'s body does not react...")
return
- M.visible_message("[M]'s body convulses a bit.")
- if(!M.suiciding && !(HAS_TRAIT(M, TRAIT_NOCLONE)) && !M.hellbound)
- if(!M)
- return
- if(M.notify_ghost_cloning(source = M))
- spawn (100) //so the ghost has time to re-enter
- return
+ if(M.getBruteLoss() >= 100 || M.getFireLoss() >= 100 || HAS_TRAIT(M, TRAIT_HUSK)) //body is too damaged to be revived
+ M.visible_message("[M]'s body convulses a bit, and then falls still once more.")
+ M.do_jitter_animation(10)
+ return
+ else
+ M.visible_message("[M]'s body starts convulsing!")
+ M.notify_ghost_cloning(source = M)
+ M.do_jitter_animation(10)
+ addtimer(CALLBACK(M, /mob/living/carbon.proc/do_jitter_animation, 10), 40) //jitter immediately, then again after 4 and 8 seconds
+ addtimer(CALLBACK(M, /mob/living/carbon.proc/do_jitter_animation, 10), 80)
+
+ spawn(100) //so the ghost has time to re-enter
+ if(iscarbon(M))
+ var/mob/living/carbon/C = M
+ if(!(C.dna && C.dna.species && (NOBLOOD in C.dna.species.species_traits)))
+ C.blood_volume = max(C.blood_volume, BLOOD_VOLUME_NORMAL*C.blood_ratio) //so you don't instantly re-die from a lack of blood
+ for(var/organ in C.internal_organs)
+ var/obj/item/organ/O = organ
+ if(O.damage > O.maxHealth/2)
+ O.setOrganDamage(O.maxHealth/2) //so you don't instantly die from organ damage when being revived
- else
M.adjustOxyLoss(-20, 0)
M.adjustToxLoss(-20, 0)
- var/mob/living/carbon/H = M
- for(var/organ in H.internal_organs)
- var/obj/item/organ/O = organ
- O.setOrganDamage(0)
M.updatehealth()
-
if(M.revive())
+ M.grab_ghost()
M.emote("gasp")
log_combat(M, M, "revived", src)
..()
+
/datum/reagent/medicine/strange_reagent/on_mob_life(mob/living/carbon/M)
M.adjustBruteLoss(0.5*REM, 0)
M.adjustFireLoss(0.5*REM, 0)
@@ -1524,5 +1533,5 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
/datum/reagent/medicine/polypyr/overdose_process(mob/living/M)
M.adjustOrganLoss(ORGAN_SLOT_LUNGS, 0.5)
..()
- . = 1
+ . = 1
diff --git a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm
index b29a1c6809..ad1efc1da7 100644
--- a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm
+++ b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm
@@ -99,7 +99,6 @@
/datum/chemical_reaction/reagent_explosion/blackpowder_explosion/on_reaction(datum/reagents/holder, created_volume)
var/turf/T = get_turf(holder.my_atom)
- sleep(rand(50,100))
..(holder, created_volume, T)
/datum/chemical_reaction/thermite
diff --git a/code/modules/research/xenobiology/xenobio_camera.dm b/code/modules/research/xenobiology/xenobio_camera.dm
index c143c4fb2d..205603e12e 100644
--- a/code/modules/research/xenobiology/xenobio_camera.dm
+++ b/code/modules/research/xenobiology/xenobio_camera.dm
@@ -28,6 +28,7 @@
var/datum/action/innate/monkey_recycle/monkey_recycle_action
var/datum/action/innate/slime_scan/scan_action
var/datum/action/innate/feed_potion/potion_action
+ var/datum/action/innate/hotkey_help/hotkey_help
var/list/stored_slimes
var/obj/item/slimepotion/slime/current_potion
@@ -48,6 +49,7 @@
monkey_recycle_action = new
scan_action = new
potion_action = new
+ hotkey_help = new
stored_slimes = list()
RegisterSignal(src, COMSIG_ATOM_CONTENTS_DEL, .proc/on_contents_del)
@@ -100,6 +102,27 @@
potion_action.Grant(user)
actions += potion_action
+ if(hotkey_help)
+ hotkey_help.target = src
+ hotkey_help.Grant(user)
+ actions += hotkey_help
+
+ RegisterSignal(user, COMSIG_XENO_SLIME_CLICK_CTRL, .proc/XenoSlimeClickCtrl)
+ RegisterSignal(user, COMSIG_XENO_SLIME_CLICK_ALT, .proc/XenoSlimeClickAlt)
+ RegisterSignal(user, COMSIG_XENO_SLIME_CLICK_SHIFT, .proc/XenoSlimeClickShift)
+ RegisterSignal(user, COMSIG_XENO_TURF_CLICK_SHIFT, .proc/XenoTurfClickShift)
+ RegisterSignal(user, COMSIG_XENO_TURF_CLICK_CTRL, .proc/XenoTurfClickCtrl)
+ RegisterSignal(user, COMSIG_XENO_MONKEY_CLICK_CTRL, .proc/XenoMonkeyClickCtrl)
+
+/obj/machinery/computer/camera_advanced/xenobio/remove_eye_control(mob/living/user)
+ UnregisterSignal(user, COMSIG_XENO_SLIME_CLICK_CTRL)
+ UnregisterSignal(user, COMSIG_XENO_SLIME_CLICK_ALT)
+ UnregisterSignal(user, COMSIG_XENO_SLIME_CLICK_SHIFT)
+ UnregisterSignal(user, COMSIG_XENO_TURF_CLICK_SHIFT)
+ UnregisterSignal(user, COMSIG_XENO_TURF_CLICK_CTRL)
+ UnregisterSignal(user, COMSIG_XENO_MONKEY_CLICK_CTRL)
+ ..()
+
/obj/machinery/computer/camera_advanced/xenobio/proc/on_contents_del(atom/deleted)
if(current_potion == deleted)
current_potion = null
@@ -169,7 +192,7 @@
S.visible_message("[S] warps in!")
X.stored_slimes -= S
else
- to_chat(owner, "Target is not near a camera. Cannot proceed.")
+ to_chat(owner, "Target is not near a camera. Cannot proceed.")
/datum/action/innate/slime_pick_up
name = "Pick up Slime"
@@ -194,7 +217,7 @@
S.forceMove(X)
X.stored_slimes += S
else
- to_chat(owner, "Target is not near a camera. Cannot proceed.")
+ to_chat(owner, "Target is not near a camera. Cannot proceed.")
/datum/action/innate/feed_slime
@@ -215,9 +238,11 @@
if (!QDELETED(food))
food.LAssailant = C
X.monkeys --
- to_chat(owner, "[X] now has [X.monkeys] monkeys left.")
+ to_chat(owner, "[X] now has [X.monkeys] monkey(s) left.")
+ else
+ to_chat(owner, "[X] needs to have at least 1 monkey stored. Currently has [X.monkeys] monkeys stored.")
else
- to_chat(owner, "Target is not near a camera. Cannot proceed.")
+ to_chat(owner, "Target is not near a camera. Cannot proceed.")
/datum/action/innate/monkey_recycle
@@ -239,7 +264,7 @@
X.monkeys = round(X.monkeys + 0.2,0.1)
qdel(M)
else
- to_chat(owner, "Target is not near a camera. Cannot proceed.")
+ to_chat(owner, "Target is not near a camera. Cannot proceed.")
/datum/action/innate/slime_scan
name = "Scan Slime"
@@ -256,7 +281,7 @@
for(var/mob/living/simple_animal/slime/S in remote_eye.loc)
slime_scan(S, C)
else
- to_chat(owner, "Target is not near a camera. Cannot proceed.")
+ to_chat(owner, "Target is not near a camera. Cannot proceed.")
/datum/action/innate/feed_potion
name = "Apply Potion"
@@ -280,7 +305,10 @@
X.current_potion.attack(S, C)
break
else
- to_chat(owner, "Target is not near a camera. Cannot proceed.")
+ to_chat(owner, "Target is not near a camera. Cannot proceed.")
+
+
+//Demodularized Code
/obj/item/disk/xenobio_console_upgrade
name = "Xenobiology console upgrade disk"
@@ -307,3 +335,169 @@
name = "Xenobiology console advanced slime upgrade disk"
desc = "This disk will add the ability to remotely feed slimes potions via the Xenobiology console, and lift the restrictions on the number of slimes that can be stored inside the Xenobiology console. This includes the contents of the basic slime upgrade disk."
upgradetypes = list(XENOBIO_UPGRADE_SLIMEBASIC, XENOBIO_UPGRADE_SLIMEADV)
+
+
+//Xenobio Hotkeys Port
+
+/datum/action/innate/hotkey_help
+ name = "Hotkey Help"
+ icon_icon = 'icons/mob/actions/actions_silicon.dmi'
+ button_icon_state = "hotkey_help"
+
+/datum/action/innate/hotkey_help/Activate()
+ if(!target || !isliving(owner))
+ return
+ to_chat(owner, "Click shortcuts:")
+ to_chat(owner, "Shift-click a slime to pick it up, or the floor to drop all held slimes. (Requires Basic Slime Console upgrade)")
+ to_chat(owner, "Ctrl-click a slime to scan it.")
+ to_chat(owner, "Alt-click a slime to feed it a potion. (Requires Advanced Slime Console upgrade)")
+ to_chat(owner, "Ctrl-click on a dead monkey to recycle it, or the floor to place a new monkey. (Requires Monkey Console upgrade)")
+
+//
+// Alternate clicks for slime, monkey and open turf if using a xenobio console
+
+// Scans slime
+/mob/living/simple_animal/slime/CtrlClick(mob/user)
+ SEND_SIGNAL(user, COMSIG_XENO_SLIME_CLICK_CTRL, src)
+ ..()
+
+//Feeds a potion to slime
+/mob/living/simple_animal/slime/AltClick(mob/user)
+ SEND_SIGNAL(user, COMSIG_XENO_SLIME_CLICK_ALT, src)
+ ..()
+
+//Picks up slime
+/mob/living/simple_animal/slime/ShiftClick(mob/user)
+ SEND_SIGNAL(user, COMSIG_XENO_SLIME_CLICK_SHIFT, src)
+ ..()
+
+//Place slimes
+/turf/open/ShiftClick(mob/user)
+ SEND_SIGNAL(user, COMSIG_XENO_TURF_CLICK_SHIFT, src)
+ ..()
+
+//Place monkey
+/turf/open/CtrlClick(mob/user)
+ SEND_SIGNAL(user, COMSIG_XENO_TURF_CLICK_CTRL, src)
+ ..()
+
+//Pick up monkey
+/mob/living/carbon/monkey/CtrlClick(mob/user)
+ SEND_SIGNAL(user, COMSIG_XENO_MONKEY_CLICK_CTRL, src)
+ ..()
+
+// Scans slime
+/obj/machinery/computer/camera_advanced/xenobio/proc/XenoSlimeClickCtrl(mob/living/user, mob/living/simple_animal/slime/S)
+ if(!GLOB.cameranet.checkTurfVis(S.loc))
+ to_chat(user, "Target is not near a camera. Cannot proceed.")
+ return
+ var/mob/living/C = user
+ var/mob/camera/aiEye/remote/xenobio/E = C.remote_control
+ var/area/mobarea = get_area(S.loc)
+ if(mobarea.name == E.allowed_area || mobarea.xenobiology_compatible)
+ slime_scan(S, C)
+
+//Feeds a potion to slime
+/obj/machinery/computer/camera_advanced/xenobio/proc/XenoSlimeClickAlt(mob/living/user, mob/living/simple_animal/slime/S)
+ if(!(upgradetier & XENOBIO_UPGRADE_SLIMEADV)) //CIT CHANGE - makes slime-related actions require XENOBIO_UPGRADE_SLIMEADV
+ to_chat(user, "This console does not have the advanced slime upgrade.")
+ return
+ if(!GLOB.cameranet.checkTurfVis(S.loc))
+ to_chat(user, "Target is not near a camera. Cannot proceed.")
+ return
+ var/mob/living/C = user
+ var/mob/camera/aiEye/remote/xenobio/E = C.remote_control
+ var/obj/machinery/computer/camera_advanced/xenobio/X = E.origin
+ var/area/mobarea = get_area(S.loc)
+ if(QDELETED(X.current_potion))
+ to_chat(C, "No potion loaded.")
+ return
+ if(mobarea.name == E.allowed_area || mobarea.xenobiology_compatible)
+ X.current_potion.attack(S, C)
+
+//Picks up slime
+/obj/machinery/computer/camera_advanced/xenobio/proc/XenoSlimeClickShift(mob/living/user, mob/living/simple_animal/slime/S)
+ if(!(upgradetier & XENOBIO_UPGRADE_SLIMEBASIC)) //CIT CHANGE - makes slime-related actions require XENOBIO_UPGRADE_SLIMEBASIC
+ to_chat(user, "This console does not have the basic slime upgrade.")
+ return
+ if(!GLOB.cameranet.checkTurfVis(S.loc))
+ to_chat(user, "Target is not near a camera. Cannot proceed.")
+ return
+ var/mob/living/C = user
+ var/mob/camera/aiEye/remote/xenobio/E = C.remote_control
+ var/obj/machinery/computer/camera_advanced/xenobio/X = E.origin
+ var/area/mobarea = get_area(S.loc)
+ if(mobarea.name == E.allowed_area || mobarea.xenobiology_compatible)
+ if(X.stored_slimes.len >= X.max_slimes)
+ to_chat(C, "Slime storage is full.")
+ return
+ if(S.ckey)
+ to_chat(C, "The slime wiggled free!")
+ return
+ if(S.buckled)
+ S.Feedstop(silent = TRUE)
+ S.visible_message("[S] vanishes in a flash of light!")
+ S.forceMove(X)
+ X.stored_slimes += S
+
+//Place slimes
+/obj/machinery/computer/camera_advanced/xenobio/proc/XenoTurfClickShift(mob/living/user, turf/open/T)
+ if(!(upgradetier & XENOBIO_UPGRADE_SLIMEBASIC)) //CIT CHANGE - makes slime-related actions require XENOBIO_UPGRADE_SLIMEBASIC
+ to_chat(user, "This console does not have the basic slime upgrade.")
+ return
+ if(!GLOB.cameranet.checkTurfVis(T))
+ to_chat(user, "Target is not near a camera. Cannot proceed.")
+ return
+ var/mob/living/C = user
+ var/mob/camera/aiEye/remote/xenobio/E = C.remote_control
+ var/obj/machinery/computer/camera_advanced/xenobio/X = E.origin
+ var/area/turfarea = get_area(T)
+ if(turfarea.name == E.allowed_area || turfarea.xenobiology_compatible)
+ for(var/mob/living/simple_animal/slime/S in X.stored_slimes)
+ S.forceMove(T)
+ S.visible_message("[S] warps in!")
+ X.stored_slimes -= S
+
+//Place monkey
+/obj/machinery/computer/camera_advanced/xenobio/proc/XenoTurfClickCtrl(mob/living/user, turf/open/T)
+ if(!(upgradetier & XENOBIO_UPGRADE_MONKEYS)) // CIT CHANGE - makes monkey-related actions require XENOBIO_UPGRADE_MONKEYS
+ to_chat(user, "This console does not have the monkey upgrade.")
+ return
+ if(!GLOB.cameranet.checkTurfVis(T))
+ to_chat(user, "Target is not near a camera. Cannot proceed.")
+ return
+ var/mob/living/C = user
+ var/mob/camera/aiEye/remote/xenobio/E = C.remote_control
+ var/obj/machinery/computer/camera_advanced/xenobio/X = E.origin
+ var/area/turfarea = get_area(T)
+ if(turfarea.name == E.allowed_area || turfarea.xenobiology_compatible)
+ if(X.monkeys >= 1)
+ var/mob/living/carbon/monkey/food = new /mob/living/carbon/monkey(T, TRUE, C)
+ if (!QDELETED(food))
+ food.LAssailant = C
+ X.monkeys--
+ X.monkeys = round(X.monkeys, 0.1) //Prevents rounding errors
+ to_chat(C, "[X] now has [X.monkeys] monkey(s) stored.")
+ else
+ to_chat(C, "[X] needs to have at least 1 monkey stored. Currently has [X.monkeys] monkeys stored.")
+
+//Pick up monkey
+/obj/machinery/computer/camera_advanced/xenobio/proc/XenoMonkeyClickCtrl(mob/living/user, mob/living/carbon/monkey/M)
+ if(!(upgradetier & XENOBIO_UPGRADE_MONKEYS)) // CIT CHANGE - makes monkey-related actions require XENOBIO_UPGRADE_MONKEYS
+ to_chat(user, "This console does not have the monkey upgrade.")
+ return
+ if(!GLOB.cameranet.checkTurfVis(M.loc))
+ to_chat(user, "Target is not near a camera. Cannot proceed.")
+ return
+ var/mob/living/C = user
+ var/mob/camera/aiEye/remote/xenobio/E = C.remote_control
+ var/obj/machinery/computer/camera_advanced/xenobio/X = E.origin
+ var/area/mobarea = get_area(M.loc)
+ if(mobarea.name == E.allowed_area || mobarea.xenobiology_compatible)
+ if(!M.stat)
+ return
+ M.visible_message("[M] vanishes as [p_theyre()] reclaimed for recycling!")
+ X.monkeys = round(X.monkeys + 0.2,0.1)
+ qdel(M)
+ if (X.monkeys == (round(X.monkeys,1)))
+ to_chat(C, "[X] now has [X.monkeys] monkey(s) available.")
diff --git a/code/modules/ruins/lavaland_ruin_code.dm b/code/modules/ruins/lavaland_ruin_code.dm
index d12195cc52..b6e0db2646 100644
--- a/code/modules/ruins/lavaland_ruin_code.dm
+++ b/code/modules/ruins/lavaland_ruin_code.dm
@@ -85,7 +85,8 @@
/obj/item/stack/tile/bronze = /datum/species/golem/bronze,
/obj/item/stack/sheet/cardboard = /datum/species/golem/cardboard,
/obj/item/stack/sheet/leather = /datum/species/golem/leather,
- /obj/item/stack/sheet/bone = /datum/species/golem/bone)
+ /obj/item/stack/sheet/bone = /datum/species/golem/bone,
+ /obj/item/stack/sheet/cotton/durathread = /datum/species/golem/durathread)
if(istype(I, /obj/item/stack))
var/obj/item/stack/O = I
diff --git a/code/modules/surgery/organs/vocal_cords.dm b/code/modules/surgery/organs/vocal_cords.dm
index 83b0eb4d17..dedff3ae04 100644
--- a/code/modules/surgery/organs/vocal_cords.dm
+++ b/code/modules/surgery/organs/vocal_cords.dm
@@ -754,7 +754,7 @@
var/static/regex/punish_words = regex("bad boy|bad girl|bad pet|bad job|spot of bother|gone and done it now|blast it|buggered it up")
//phase 0
var/static/regex/saymyname_words = regex("say my name|who am i|whoami")
- var/static/regex/wakeup_words = regex("revert|awaken|snap|attention")
+ var/static/regex/wakeup_words = regex("revert|awaken|snap|attention")
//phase1
var/static/regex/petstatus_words = regex("how are you|what is your status|are you okay")
var/static/regex/silence_words = regex("shut up|silence|be silent|ssh|quiet|hush")
@@ -1143,7 +1143,7 @@
switch(E.phase)
if(2 to INFINITY)
playsound(get_turf(H), pick('sound/effects/meow1.ogg', 'modular_citadel/sound/voice/nya.ogg'), 50, 1, -1) //I'm very tempted to write a Fermis clause that makes them merowr.ogg if it's me. But, I also don't think snowflakism is okay. I would've gotten away for it too, if it wern't for my morals.
- H.emote("me", 1, "lets out a nya!")
+ H.emote("me", EMOTE_VISIBLE, "lets out a nya!")
E.cooldown += 1
//SLEEP
@@ -1230,7 +1230,7 @@
var/datum/status_effect/chem/enthrall/E = C.has_status_effect(/datum/status_effect/chem/enthrall)
if (E.phase == 3)
var/speaktrigger = ""
- C.emote("me", 1, "whispers something quietly.")
+ C.emote("me", EMOTE_VISIBLE, "whispers something quietly.")
if (get_dist(user, C) > 1)//Requires user to be next to their pet.
to_chat(user, "You need to be next to your pet to hear them!")
continue
@@ -1253,7 +1253,7 @@
to_chat(user, "[H] seems incapable of being implanted with triggers.")
continue
else
- user.emote("me", 1, "puts their hands upon [H.name]'s head and looks deep into their eyes, whispering something to them.")
+ user.emote("me", EMOTE_VISIBLE, "puts their hands upon [H.name]'s head and looks deep into their eyes, whispering something to them.")
user.SetStun(1000)//Hands are handy, so you have to stay still
H.SetStun(1000)
if (E.mental_capacity >= 5)
@@ -1294,7 +1294,7 @@
to_chat(user, "[H] seems incapable of being implanted with an echoing phrase.")
continue
else
- user.emote("me", 1, "puts their hands upon [H.name]'s head and looks deep into their eyes, whispering something to them.")
+ user.emote("me", EMOTE_VISIBLE, "puts their hands upon [H.name]'s head and looks deep into their eyes, whispering something to them.")
user.SetStun(1000)//Hands are handy, so you have to stay still
H.SetStun(1000)
var/trigger = stripped_input(user, "Enter the loop phrase", MAX_MESSAGE_LEN)
@@ -1317,7 +1317,7 @@
to_chat(user, "You need to be next to your pet to give them a new objective!")
continue
else
- user.emote("me", 1, "puts their hands upon [H.name]'s head and looks deep into their eyes, whispering something to them.'")
+ user.emote("me", EMOTE_VISIBLE, "puts their hands upon [H.name]'s head and looks deep into their eyes, whispering something to them.'")
user.SetStun(1000)//So you can't run away!
H.SetStun(1000)
if (E.mental_capacity >= 200)
diff --git a/code/modules/uplink/uplink_items.dm b/code/modules/uplink/uplink_items.dm
index aef3b31895..cf663e353f 100644
--- a/code/modules/uplink/uplink_items.dm
+++ b/code/modules/uplink/uplink_items.dm
@@ -1,13 +1,9 @@
-GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
-
-/proc/get_uplink_items(var/datum/game_mode/gamemode = null, allow_sales = TRUE, allow_restricted = TRUE)
- var/list/filtered_uplink_items = list()
+/proc/get_uplink_items(datum/game_mode/gamemode, allow_sales = TRUE, allow_restricted = TRUE)
+ var/list/filtered_uplink_items = GLOB.uplink_categories.Copy() // list of uplink categories without associated values.
var/list/sale_items = list()
for(var/path in GLOB.uplink_items)
var/datum/uplink_item/I = new path
- if(!I.item)
- continue
if(I.include_modes.len)
if(!gamemode && SSticker.mode && !(SSticker.mode.type in I.include_modes))
continue
@@ -23,9 +19,8 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
if (I.restricted && !allow_restricted)
continue
- if(!filtered_uplink_items[I.category])
- filtered_uplink_items[I.category] = list()
- filtered_uplink_items[I.category][I.name] = I
+ LAZYSET(filtered_uplink_items[I.category], I.name, I)
+
if(I.limited_stock < 0 && !I.cant_discount && I.item && I.cost > 1)
sale_items += I
if(allow_sales)
@@ -45,9 +40,12 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
A.desc += " Normally costs [initial(A.cost)] TC. All sales final. [pick(disclaimer)]"
A.item = I.item
- if(!filtered_uplink_items[A.category])
- filtered_uplink_items[A.category] = list()
- filtered_uplink_items[A.category][A.name] = A
+ LAZYSET(filtered_uplink_items[A.category], A.name, A)
+
+ for(var/category in filtered_uplink_items)
+ if(!filtered_uplink_items[category]) //empty categories with no associated uplink item. Remove.
+ filtered_uplink_items -= category
+
return filtered_uplink_items
@@ -106,16 +104,77 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
to_chat(user, "[A] materializes onto the floor.")
return A
-//Discounts (dynamically filled above)
-/datum/uplink_item/discounts
- category = "Discounted Gear"
+/*
+ Uplink Categories:
+ Due to how the typesof() in-built byond proc works, it should be kept in mind
+ the order categories are displayed in the uplink UI is same to the order they are loaded in the code.
+ I trust no extra filter is needed as long as they are all contained within the following lines.
+ When adding new uplink categories, please keep them separate from their sub paths here and without set item.
+ Failure to comply may result in the new categories being listed at the bottom of the UI.
+*/
+
+/datum/uplink_item/holiday
+ category = "Holiday"
-//All bundles and telecrystals
/datum/uplink_item/bundles_TC
category = "Bundles and Telecrystals"
surplus = 0
cant_discount = TRUE
+/datum/uplink_item/dangerous
+ category = "Conspicuous and Dangerous Weapons"
+
+/datum/uplink_item/stealthy_weapons
+ category = "Stealthy and Inconspicuous Weapons"
+
+/datum/uplink_item/ammo
+ category = "Ammunition"
+ surplus = 40
+
+/datum/uplink_item/explosives
+ category = "Grenades and Explosives"
+
+/datum/uplink_item/support
+ category = "Support and Mechanized Exosuits"
+ surplus = 0
+ include_modes = list(/datum/game_mode/nuclear)
+
+/datum/uplink_item/suits
+ category = "Space Suits, Hardsuits and Clothing"
+ surplus = 40
+
+/datum/uplink_item/stealthy_tools
+ category = "Stealth and Camouflage Items"
+
+/datum/uplink_item/device_tools
+ category = "Devices and Tools"
+
+/datum/uplink_item/implants
+ category = "Implants"
+ surplus = 50
+
+/datum/uplink_item/role_restricted
+ category = "Role-Restricted"
+ exclude_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
+ surplus = 0
+
+/datum/uplink_item/badass
+ category = "(Pointless) Badassery"
+ surplus = 0
+
+//Discounts (dynamically filled above)
+/datum/uplink_item/discounts
+ category = "Discounted Gear"
+
+
+/*
+ Uplink Items:
+ Unlike categories, uplink item entries are automatically sorted alphabetically on server init in a global list,
+ When adding new entries to the file, please keep them sorted by category.
+*/
+
+//All bundles and telecrystals
+
/datum/uplink_item/bundles_TC/chemical
name = "Bioterror bundle"
desc = "For the madman: Contains a handheld Bioterror chem sprayer, a Bioterror foam grenade, a box of lethal chemicals, a dart pistol, \
@@ -288,8 +347,6 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
cost = 20
// Dangerous Items
-/datum/uplink_item/dangerous
- category = "Conspicuous and Dangerous Weapons"
/datum/uplink_item/dangerous/pistol
name = "Stechkin Pistol"
@@ -544,8 +601,6 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
surplus = 10
// Stealthy Weapons
-/datum/uplink_item/stealthy_weapons
- category = "Stealthy and Inconspicuous Weapons"
/datum/uplink_item/stealthy_weapons/combatglovesplus
name = "Combat Gloves Plus"
@@ -564,12 +619,6 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
cost = 13
surplus = 0
-/datum/uplink_item/dangerous/phantomthief
- name = "Syndicate Mask"
- desc = "A cheap plastic mask fitted with an adrenaline autoinjector, which can be used by simply tensing your muscles"
- item = /obj/item/clothing/glasses/phantomthief/syndicate
- cost = 2
-
/datum/uplink_item/stealthy_weapons/dart_pistol
name = "Dart Pistol"
desc = "A miniaturized version of a normal syringe gun. It is very quiet when fired and can fit into any \
@@ -671,9 +720,6 @@ datum/uplink_item/stealthy_weapons/taeclowndo_shoes
cost = 6
// Ammunition
-/datum/uplink_item/ammo
- category = "Ammunition"
- surplus = 40
/datum/uplink_item/ammo/pistol
name = "10mm Handgun Magazine"
@@ -923,8 +969,7 @@ datum/uplink_item/stealthy_weapons/taeclowndo_shoes
cost = 1
include_modes = list(/datum/game_mode/nuclear)
-/datum/uplink_item/explosives
- category = "Grenades and Explosives"
+//Grenades and Explosives
/datum/uplink_item/explosives/bioterrorfoam
name = "Bioterror Foam Grenade"
@@ -1081,10 +1126,6 @@ datum/uplink_item/stealthy_weapons/taeclowndo_shoes
//Support and Mechs
-/datum/uplink_item/support
- category = "Support and Mechanized Exosuits"
- surplus = 0
- include_modes = list(/datum/game_mode/nuclear)
/datum/uplink_item/support/clown_reinforcement
name = "Clown Reinforcements"
@@ -1155,8 +1196,6 @@ datum/uplink_item/stealthy_weapons/taeclowndo_shoes
cost = 140
// Stealth Items
-/datum/uplink_item/stealthy_tools
- category = "Stealth and Camouflage Items"
/datum/uplink_item/stealthy_tools/agent_card
name = "Agent Identification Card"
@@ -1266,17 +1305,6 @@ datum/uplink_item/stealthy_weapons/taeclowndo_shoes
item = /obj/item/jammer
cost = 5
-/*/datum/uplink_item/stealthy_tools/syndi_borer
- name = "Syndicate Brain Slug"
- desc = "A small cortical borer, modified to be completely loyal to the owner. \
- Genetically infertile, these brain slugs can assist medically in a support role, or take direct action \
- to assist their host."
- item = /obj/item/antag_spawner/syndi_borer
- refundable = TRUE
- cost = 10
- surplus = 20 //Let's not have this be too common
- exclude_modes = list(/datum/game_mode/nuclear) */
-
/datum/uplink_item/stealthy_tools/smugglersatchel
name = "Smuggler's Satchel"
desc = "This satchel is thin enough to be hidden in the gap between plating and tiling; great for stashing \
@@ -1287,9 +1315,6 @@ datum/uplink_item/stealthy_weapons/taeclowndo_shoes
surplus = 30
//Space Suits and Hardsuits
-/datum/uplink_item/suits
- category = "Space Suits, Hardsuits and Clothing"
- surplus = 40
/datum/uplink_item/suits/turtlenck
name = "Tactical Turtleneck"
@@ -1364,8 +1389,6 @@ datum/uplink_item/stealthy_weapons/taeclowndo_shoes
exclude_modes = list()
// Devices and Tools
-/datum/uplink_item/device_tools
- category = "Devices and Tools"
/datum/uplink_item/device_tools/emag
name = "Cryptographic Sequencer"
@@ -1380,6 +1403,12 @@ datum/uplink_item/stealthy_weapons/taeclowndo_shoes
item = /obj/item/emagrecharge
cost = 2
+/datum/uplink_item/device_tools/phantomthief
+ name = "Syndicate Mask"
+ desc = "A cheap plastic mask fitted with an adrenaline autoinjector, which can be used by simply tensing your muscles"
+ item = /obj/item/clothing/glasses/phantomthief/syndicate
+ cost = 2
+
/datum/uplink_item/device_tools/cutouts
name = "Adaptive Cardboard Cutouts"
desc = "These cardboard cutouts are coated with a thin material that prevents discoloration and makes the images on them appear more lifelike. \
@@ -1599,9 +1628,6 @@ datum/uplink_item/stealthy_weapons/taeclowndo_shoes
// Implants
-/datum/uplink_item/implants
- category = "Implants"
- surplus = 50
/datum/uplink_item/implants/adrenal
name = "Adrenal Implant"
@@ -1698,10 +1724,6 @@ datum/uplink_item/stealthy_weapons/taeclowndo_shoes
include_modes = list(/datum/game_mode/nuclear)
// Role-specific items
-/datum/uplink_item/role_restricted
- category = "Role-Restricted"
- exclude_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
- surplus = 0
/datum/uplink_item/role_restricted/ancient_jumpsuit
name = "Ancient Jumpsuit"
@@ -1929,10 +1951,7 @@ datum/uplink_item/stealthy_weapons/taeclowndo_shoes
item = /obj/item/gun/energy/emitter
restricted_roles = list("Chief Engineer", "Station Engineer", "Atmospheric Technician")
-// Pointless
-/datum/uplink_item/badass
- category = "(Pointless) Badassery"
- surplus = 0
+// Pointless (Badassery)
/datum/uplink_item/badass/costumes/obvious_chameleon
name = "Broken Chameleon Kit"
@@ -1986,12 +2005,6 @@ datum/uplink_item/stealthy_weapons/taeclowndo_shoes
item = /obj/item/storage/secure/briefcase/syndie
cost = 1
-/datum/uplink_item/badass/phantomthief
- name = "Syndicate Mask"
- desc = "A cheap plastic mask fitted with an adrenaline autoinjector, which can be used by simply tensing your muscles"
- item = /obj/item/clothing/glasses/phantomthief/syndicate
- cost = 2
-
/datum/uplink_item/badass/syndiecards
name = "Syndicate Playing Cards"
desc = "A special deck of space-grade playing cards with a mono-molecular edge and metal reinforcement, \
diff --git a/code/modules/vehicles/_vehicle.dm b/code/modules/vehicles/_vehicle.dm
index e4cb090448..ac7fa879f4 100644
--- a/code/modules/vehicles/_vehicle.dm
+++ b/code/modules/vehicles/_vehicle.dm
@@ -60,6 +60,7 @@
.++
/obj/vehicle/proc/return_controllers_with_flag(flag)
+ RETURN_TYPE(/list/mob)
. = list()
for(var/i in occupants)
if(occupants[i] & flag)
diff --git a/html/changelogs/AutoChangeLog-pr-10008.yml b/html/changelogs/AutoChangeLog-pr-10008.yml
new file mode 100644
index 0000000000..9a4090ad28
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10008.yml
@@ -0,0 +1,4 @@
+author: "Seris02"
+delete-after: True
+changes:
+ - rscadd: "added sleeping carp hallucination"
diff --git a/html/changelogs/AutoChangeLog-pr-10019.yml b/html/changelogs/AutoChangeLog-pr-10019.yml
new file mode 100644
index 0000000000..b28d90e39e
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10019.yml
@@ -0,0 +1,4 @@
+author: "Seris02"
+delete-after: True
+changes:
+ - rscadd: "Centcom + Assistant's formal winter coat + loadout + narsian + ratvarian winter coats"
diff --git a/html/changelogs/AutoChangeLog-pr-10025.yml b/html/changelogs/AutoChangeLog-pr-10025.yml
new file mode 100644
index 0000000000..b690e4e7b5
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10025.yml
@@ -0,0 +1,4 @@
+author: "Linzolle"
+delete-after: True
+changes:
+ - code_imp: "butchering component update"
diff --git a/html/changelogs/AutoChangeLog-pr-10033.yml b/html/changelogs/AutoChangeLog-pr-10033.yml
new file mode 100644
index 0000000000..0a2fa85469
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10033.yml
@@ -0,0 +1,5 @@
+author: "Ghommie"
+delete-after: True
+changes:
+ - bugfix: "Fixed traitor codewords highlight and some other hear signal hooks spans highlight (phobias, split personality, hypnosis) or modifiers (mind echo)"
+ - bugfix: "Fixed traitor codewords highlight not passing down with the mind datum and stickying to the first mob."
diff --git a/html/changelogs/AutoChangeLog-pr-10042.yml b/html/changelogs/AutoChangeLog-pr-10042.yml
new file mode 100644
index 0000000000..cabf698030
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10042.yml
@@ -0,0 +1,4 @@
+author: "Ghommie"
+delete-after: True
+changes:
+ - bugfix: "Fixed sofa overlays doing nothing, because their layer wasn't properly set."
diff --git a/html/changelogs/AutoChangeLog-pr-10045.yml b/html/changelogs/AutoChangeLog-pr-10045.yml
new file mode 100644
index 0000000000..39fdba4fda
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10045.yml
@@ -0,0 +1,4 @@
+author: "Trilbyspaceclone"
+delete-after: True
+changes:
+ - rscadd: "wallets are known for now holding more items"
diff --git a/html/changelogs/AutoChangeLog-pr-10049.yml b/html/changelogs/AutoChangeLog-pr-10049.yml
new file mode 100644
index 0000000000..34d8c2947a
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10049.yml
@@ -0,0 +1,5 @@
+author: "Useroth"
+delete-after: True
+changes:
+ - rscadd: "Colored fairygrass variants."
+ - bugfix: "Added a missing cherrybulb seedpack sprite"
diff --git a/html/changelogs/AutoChangeLog-pr-9372.yml b/html/changelogs/AutoChangeLog-pr-9372.yml
new file mode 100644
index 0000000000..923200ce11
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-9372.yml
@@ -0,0 +1,13 @@
+author: "Weblure"
+delete-after: True
+changes:
+ - rscadd: "Button added to slime console that prints out the hotkey commands to the user. [Includes DMI update]"
+ - rscadd: "Shift-click a slime to pick it up, or the floor to drop all held slimes. (Requires Basic Slime Console upgrade)"
+ - rscadd: "Ctrl-click a slime to scan it."
+ - rscadd: "Alt-click a slime to feed it a potion. (Requires Advanced Slime Console upgrade)"
+ - rscadd: "Ctrl-click on a dead monkey to recycle it, or the floor to place a new monkey. (Requires Monkey Console upgrade)"
+ - rscadd: "If the console does not have the required upgrade, an error message will print to the user."
+ - rscadd: "You can now pick up a single slime from a pile, instead of all of them at once."
+ - tweak: "When recycling monkeys, the console will now report how many monkeys it has (will not report decimal increases)."
+ - tweak: "Console now alerts you when you're out of monkeys and reports your current decimal amount."
+ - tweak: "Console messages are now styled consistently."
diff --git a/html/changelogs/AutoChangeLog-pr-9575.yml b/html/changelogs/AutoChangeLog-pr-9575.yml
new file mode 100644
index 0000000000..76b71da82b
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-9575.yml
@@ -0,0 +1,24 @@
+author: "KathrinBailey"
+delete-after: True
+changes:
+ - rscadd: "Two extra 'luxury' dorms rooms!"
+ - rscadd: "Gas miners to atmos."
+ - rscadd: "Posters around the station."
+ - rscadd: "Vacant room added to the Starboard Bow with it's own APC, above electrical maintenance."
+ - rscadd: "New trendy clothes to the locker room, giving variety and bringing fashion back onto Nanotrasen stations."
+ - rscadd: "Coloured bedsheet and towel bin."
+ - rscadd: "Maid uniforms for the janitor."
+ - tweak: "Completely reworked bar. Milk kegs added in bar office. The bar has been changed for a homey restaurant feel just in time for Christmas! You can now run it as an actual restaurant! Local Bartender Icktsie III loved it so much he rolled around on the new floor smiling happily."
+ - tweak: "Dorms rework. Fitness room now has lots of costumes and outfits."
+ - tweak: "Junk removed from engineering, welding goggles added."
+ - tweak: "Welding tools in engineering replaced with industrial welding tools."
+ - tweak: "Package wrappers and hand labellers now in major departments."
+ - tweak: "Cell charger moved from engineering lobby to the protolathe room, just like how it is in all of the other maps and just where the cell charger is actually needed."
+ - tweak: "Library redesigned to have a private room and a 3x3 private study that is cleaned up."
+ - tweak: "Paper bins have gone big or gone home, with premium stationery scattered around. Engineering and security now have a labeller and packaging supplies."
+ - bugfix: "Dark spot top left of Botany fixed."
+ - bugfix: "Huge galactic-sized dark spot in bar fixed."
+ - bugfix: "Light replacers now are less horrifically overpowered and PTSD-inducing for the server."
+ - bugfix: "Fixes issue 9706: https://github.com/Citadel-Station-13/Citadel-Station-13/issues/9706 Part of maint getting hit by radstorms.
+
+_Kathrin's Box Beautification:_"
diff --git a/html/changelogs/AutoChangeLog-pr-9805.yml b/html/changelogs/AutoChangeLog-pr-9805.yml
new file mode 100644
index 0000000000..6f74b934f0
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-9805.yml
@@ -0,0 +1,5 @@
+author: "Ghommie"
+delete-after: True
+changes:
+ - tweak: "Moved the `Stealth and Camouflage Items` uplink category next to `Devices and Tools`."
+ - bugfix: "Deleted a duplicate phatom thief mask entry from the uplink."
diff --git a/html/changelogs/AutoChangeLog-pr-9884.yml b/html/changelogs/AutoChangeLog-pr-9884.yml
new file mode 100644
index 0000000000..598fd7f4e6
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-9884.yml
@@ -0,0 +1,5 @@
+author: "Useroth"
+delete-after: True
+changes:
+ - bugfix: "resolves the issues revolving around blackpowder exploding where the reaction happened, instead of where it actually is through making it explode instantly"
+ - tweak: "the explosion delay moved from blackpowder directly into bomb cherries, to keep them functioning as intended"
diff --git a/html/changelogs/AutoChangeLog-pr-9913.yml b/html/changelogs/AutoChangeLog-pr-9913.yml
new file mode 100644
index 0000000000..64b97f8828
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-9913.yml
@@ -0,0 +1,4 @@
+author: "Trilbyspaceclone"
+delete-after: True
+changes:
+ - rscadd: "new clothing for the hotel staff and a hat"
diff --git a/html/changelogs/AutoChangeLog-pr-9975.yml b/html/changelogs/AutoChangeLog-pr-9975.yml
new file mode 100644
index 0000000000..ea0ca116b5
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-9975.yml
@@ -0,0 +1,6 @@
+author: "Ghommie"
+delete-after: True
+changes:
+ - rscdel: "Removed a few useless supply packs: \"Siezed\" power cells, means of production and promiscous organs."
+ - tweak: "Merged the synthetic blood supply pack into the standard blood supply pack, effectively removing a random type blood pack in favor of two synthetic ones."
+ - tweak: "Merged together premium carpet pack n°1 and n°2 to hold one of each standard pattern."
diff --git a/html/changelogs/AutoChangeLog-pr-9990.yml b/html/changelogs/AutoChangeLog-pr-9990.yml
new file mode 100644
index 0000000000..1e3de0164c
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-9990.yml
@@ -0,0 +1,5 @@
+author: "Linzolle"
+delete-after: True
+changes:
+ - bugfix: "strange reagent being unable to revive simplemobs"
+ - rscadd: "jitter animation and more clear text to strange reagent revival"
diff --git a/html/changelogs/AutoChangeLog-pr-9993.yml b/html/changelogs/AutoChangeLog-pr-9993.yml
new file mode 100644
index 0000000000..980d82bbdc
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-9993.yml
@@ -0,0 +1,8 @@
+author: "nemvar, ShizCalev, Qustinnus/Floyd, Ghommie"
+delete-after: True
+changes:
+ - rscadd: "You can now unfasten the loom."
+ - tweak: "it now takes 4 strands to make one piece of durathread cloth"
+ - bugfix: "Looms can now be attacked."
+ - rscadd: "Durathread golem weaves his magic"
+ - tweak: "Supply ordered looms are unanchored. Bring a wrench."
diff --git a/icons/mob/actions/actions_silicon.dmi b/icons/mob/actions/actions_silicon.dmi
index cd997a25ac..cf3d7a2a95 100644
Binary files a/icons/mob/actions/actions_silicon.dmi and b/icons/mob/actions/actions_silicon.dmi differ
diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi
index 900a4e8230..d27e02a4f2 100644
Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ
diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi
index 8074830c5a..61168860d8 100644
Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ
diff --git a/icons/mob/suit_digi.dmi b/icons/mob/suit_digi.dmi
index a5d37ba4a2..58dd2f5700 100644
Binary files a/icons/mob/suit_digi.dmi and b/icons/mob/suit_digi.dmi differ
diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi
index 072511b444..1141c4b8c9 100644
Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ
diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi
index d88fb99b9e..c6b261d9a2 100644
Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ
diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi
index bd100cfd91..5d243f93b8 100644
Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ
diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi
index 50f9e0a207..a980fd4177 100644
Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ
diff --git a/icons/obj/hydroponics/seeds.dmi b/icons/obj/hydroponics/seeds.dmi
index 7bc9ac1fe3..d8fcaa6258 100644
Binary files a/icons/obj/hydroponics/seeds.dmi and b/icons/obj/hydroponics/seeds.dmi differ
diff --git a/icons/obj/tiles.dmi b/icons/obj/tiles.dmi
index 90d648d0be..2de24e2499 100644
Binary files a/icons/obj/tiles.dmi and b/icons/obj/tiles.dmi differ
diff --git a/icons/turf/floors.dmi b/icons/turf/floors.dmi
index 18ebd6b91e..87d5e88cc9 100644
Binary files a/icons/turf/floors.dmi and b/icons/turf/floors.dmi differ
diff --git a/modular_citadel/code/modules/client/loadout/suit.dm b/modular_citadel/code/modules/client/loadout/suit.dm
index d3a8258fc0..72387b622a 100644
--- a/modular_citadel/code/modules/client/loadout/suit.dm
+++ b/modular_citadel/code/modules/client/loadout/suit.dm
@@ -64,6 +64,11 @@
category = SLOT_WEAR_SUIT
path = /obj/item/clothing/suit/hooded/wintercoat
+/datum/gear/coat/aformal
+ name = "Assistant's formal winter coat"
+ category = SLOT_WEAR_SUIT
+ path = /obj/item/clothing/suit/hooded/wintercoat/aformal
+
/* Commented out until it is "balanced"
/datum/gear/coat/sec
name = "Security winter coat"
@@ -77,45 +82,43 @@
category = SLOT_WEAR_SUIT
path = /obj/item/clothing/suit/hooded/wintercoat/medical
restricted_roles = list("Chief Medical Officer", "Medical Doctor") // Reserve it to Medical Doctors and their boss, the Chief Medical Officer
-
-/* Commented out until there is a Chemistry Winter Coat
-/datum/gear/coat/med/chem
- name = "Chemistry winter coat"
+
+/datum/gear/coat/robotics
+ name = "Robotics winter coat"
category = SLOT_WEAR_SUIT
- path = /obj/item/clothing/suit/hooded/wintercoat/medical/chemistry
- restricted_roles = list("Chief Medical Officer", "Chemist") // Reserve it to Chemists and their boss, the Chief Medical Officer
-*/
+ path = /obj/item/clothing/suit/hooded/wintercoat/robotics
+ restricted_roles = list("Research Director", "Roboticist")
/datum/gear/coat/sci
name = "Science winter coat"
category = SLOT_WEAR_SUIT
path = /obj/item/clothing/suit/hooded/wintercoat/science
restricted_roles = list("Research Director", "Scientist", "Roboticist") // Reserve it to the Science Departement
-
+
/datum/gear/coat/eng
name = "Engineering winter coat"
category = SLOT_WEAR_SUIT
path = /obj/item/clothing/suit/hooded/wintercoat/engineering
restricted_roles = list("Chief Engineer", "Station Engineer") // Reserve it to Station Engineers and their boss, the Chief Engineer
-
+
/datum/gear/coat/eng/atmos
name = "Atmospherics winter coat"
category = SLOT_WEAR_SUIT
path = /obj/item/clothing/suit/hooded/wintercoat/engineering/atmos
restricted_roles = list("Chief Engineer", "Atmospheric Technician") // Reserve it to Atmos Techs and their boss, the Chief Engineer
-
+
/datum/gear/coat/hydro
name = "Hydroponics winter coat"
category = SLOT_WEAR_SUIT
path = /obj/item/clothing/suit/hooded/wintercoat/hydro
restricted_roles = list("Head of Personnel", "Botanist") // Reserve it to Botanists and their boss, the Head of Personnel
-
+
/datum/gear/coat/cargo
name = "Cargo winter coat"
category = SLOT_WEAR_SUIT
path = /obj/item/clothing/suit/hooded/wintercoat/cargo
restricted_roles = list("Quartermaster", "Cargo Technician") // Reserve it to Cargo Techs and their boss, the Quartermaster
-
+
/datum/gear/coat/miner
name = "Mining winter coat"
category = SLOT_WEAR_SUIT
diff --git a/modular_citadel/code/modules/mob/living/carbon/damage_procs.dm b/modular_citadel/code/modules/mob/living/carbon/damage_procs.dm
index 7264d95bae..eaf5899d82 100644
--- a/modular_citadel/code/modules/mob/living/carbon/damage_procs.dm
+++ b/modular_citadel/code/modules/mob/living/carbon/damage_procs.dm
@@ -1,4 +1,4 @@
-/mob/living/carbon/adjustStaminaLossBuffered(amount, updating_stamina = 1)
+/mob/living/carbon/adjustStaminaLossBuffered(amount, updating_health = 1)
if(status_flags & GODMODE)
return 0
if(CONFIG_GET(flag/disable_stambuffer))
@@ -8,7 +8,7 @@
adjustStaminaLoss(directstamloss)
bufferedstam = CLAMP(bufferedstam + amount, 0, stambuffer)
stambufferregentime = world.time + 10
- if(updating_stamina)
+ if(updating_health)
update_health_hud()
/mob/living/carbon/adjustStaminaLoss(amount, updating_health = TRUE, forced = FALSE, affected_zone = BODY_ZONE_CHEST)
diff --git a/modular_citadel/code/modules/mob/living/damage_procs.dm b/modular_citadel/code/modules/mob/living/damage_procs.dm
index ce81c7aae7..c2ce8fd24c 100644
--- a/modular_citadel/code/modules/mob/living/damage_procs.dm
+++ b/modular_citadel/code/modules/mob/living/damage_procs.dm
@@ -1,4 +1,4 @@
-/mob/living/proc/adjustStaminaLossBuffered(amount, updating_stamina = TRUE, forced = FALSE)
+/mob/living/proc/adjustStaminaLossBuffered(amount, updating_health = TRUE, forced = FALSE)
return
/mob/living/proc/doSprintLossTiles(amount)