diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm
index 83d926fbfb60..e8c0cb77cd02 100644
--- a/_maps/map_files/Delta/delta.dmm
+++ b/_maps/map_files/Delta/delta.dmm
@@ -2641,7 +2641,7 @@
/area/station/maintenance/electrical_shop)
"aqx" = (
/obj/structure/table/wood,
-/obj/item/storage/box/matches,
+/obj/item/storage/fancy/matches,
/turf/simulated/floor/plasteel/dark,
/area/station/maintenance/electrical_shop)
"aqy" = (
@@ -9183,7 +9183,7 @@
pixel_y = 5
},
/obj/item/storage/fancy/cigarettes/cigpack_random,
-/obj/item/storage/box/matches,
+/obj/item/storage/fancy/matches,
/turf/simulated/floor/plasteel/dark,
/area/station/service/bar)
"aGG" = (
@@ -67421,7 +67421,7 @@
"dEV" = (
/obj/structure/table/wood,
/obj/item/clothing/mask/cigarette/pipe,
-/obj/item/storage/box/matches,
+/obj/item/storage/fancy/matches,
/obj/structure/sign/poster/official/random{
pixel_y = 32
},
@@ -85195,7 +85195,7 @@
"naA" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/rack,
-/obj/item/storage/box/matches,
+/obj/item/storage/fancy/matches,
/obj/item/storage/fancy/cigarettes/cigpack_robust,
/obj/effect/spawner/lootdrop/maintenance/three,
/turf/simulated/floor/plating,
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index 30469b847cec..ad71eb77a9b0 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -221,6 +221,16 @@
},
/turf/simulated/floor/carpet,
/area/station/security/detective)
+"acS" = (
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "darkgrey"
+ },
+/area/station/science/toxins/mixing)
"adc" = (
/obj/structure/closet/secure_closet/clown,
/obj/item/reagent_containers/food/snacks/pie,
@@ -237,18 +247,13 @@
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
/area/station/maintenance/xenobio_south)
-"adu" = (
-/obj/structure/closet,
-/obj/item/assembly/prox_sensor{
- pixel_x = 2;
- pixel_y = -2
- },
-/obj/item/assembly/signaler{
- pixel_x = -2;
- pixel_y = 5
+"adp" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light/small{
+ dir = 1
},
-/turf/simulated/floor/plating,
-/area/station/maintenance/asmaint)
+/turf/simulated/floor/plasteel,
+/area/station/maintenance/aft2)
"adv" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/security/glass,
@@ -275,11 +280,6 @@
icon_state = "cult"
},
/area/station/legal/lawoffice)
-"adB" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/plating,
-/area/station/maintenance/aft2)
"adG" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable{
@@ -369,24 +369,6 @@
/obj/structure/lattice/catwalk,
/turf/space,
/area/space/nearstation)
-"aeg" = (
-/obj/effect/spawner/lootdrop{
- loot = list(/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes);
- name = "trash spawner"
- },
-/obj/effect/landmark/damageturf,
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 8;
- icon_state = "1-8"
- },
-/turf/simulated/floor/plating,
-/area/station/maintenance/asmaint)
"aen" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 8
@@ -456,37 +438,15 @@
/turf/simulated/floor/mineral/tranquillite,
/area/station/service/mime)
"aeA" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/structure/closet/firecloset,
-/turf/simulated/floor/plating,
-/area/station/maintenance/asmaint)
-"aeF" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
+/obj/effect/turf_decal/delivery,
+/obj/machinery/disposal,
+/obj/structure/disposalpipe/trunk{
+ dir = 8
},
/turf/simulated/floor/plasteel{
- icon_state = "whitepurple"
+ icon_state = "white"
},
-/area/station/science/research)
+/area/station/science/explab)
"aeN" = (
/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
@@ -682,6 +642,14 @@
"agH" = (
/turf/simulated/floor/plating/airless,
/area/station/engineering/solar/auxstarboard)
+"agK" = (
+/obj/machinery/door/poddoor{
+ id_tag = "ToxinsVenting";
+ name = "Toxins Venting Bay Door";
+ power_state = 0
+ },
+/turf/space,
+/area/station/science/toxins/mixing)
"agM" = (
/obj/structure/lattice/catwalk,
/turf/space,
@@ -833,10 +801,6 @@
"air" = (
/turf/simulated/floor/engine,
/area/holodeck/alphadeck)
-"aiz" = (
-/obj/machinery/atmospherics/pipe/simple/hidden,
-/turf/simulated/wall/r_wall,
-/area/station/maintenance/aft2)
"aiE" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -873,25 +837,6 @@
/obj/structure/closet/emcloset,
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
-"aiM" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/turf/simulated/floor/plasteel{
- icon_state = "white"
- },
-/area/station/science/explab)
"aiN" = (
/obj/item/radio/intercom{
name = "west bump";
@@ -1000,33 +945,6 @@
icon_state = "neutralcorner"
},
/area/station/public/fitness)
-"ajr" = (
-/obj/structure/table/wood,
-/obj/structure/mirror{
- pixel_x = -27
- },
-/obj/item/toy/figure/mech/honk{
- pixel_y = 12
- },
-/obj/item/toy/figure/crew/assistant,
-/obj/item/lipstick/purple{
- pixel_x = -2;
- pixel_y = -2
- },
-/obj/item/lipstick/jade{
- pixel_x = 2;
- pixel_y = 2
- },
-/obj/item/lipstick/black,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 5
- },
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
- },
-/turf/simulated/floor/wood,
-/area/station/service/theatre)
"ajs" = (
/obj/structure/lattice,
/obj/item/wirecutters,
@@ -1189,6 +1107,18 @@
icon_state = "neutralcorner"
},
/area/station/public/fitness)
+"akr" = (
+/obj/machinery/power/apc{
+ dir = 1;
+ name = "north bump";
+ pixel_y = 24
+ },
+/obj/structure/cable/yellow{
+ d2 = 2;
+ icon_state = "0-2"
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard2)
"akt" = (
/turf/simulated/wall,
/area/station/maintenance/disposal)
@@ -1228,23 +1158,15 @@
"aky" = (
/turf/simulated/wall/r_wall,
/area/station/maintenance/fpmaint)
-"akA" = (
-/obj/structure/table,
-/obj/machinery/processor{
- pixel_y = 12
- },
-/obj/structure/extinguisher_cabinet{
- name = "east bump";
- pixel_x = 27
- },
-/obj/effect/turf_decal/delivery/hollow,
-/turf/simulated/floor/plasteel{
- icon_state = "bar"
- },
-/area/station/service/kitchen)
"akD" = (
/turf/simulated/wall,
/area/station/security/brig)
+"akH" = (
+/turf/simulated/floor/plasteel{
+ dir = 9;
+ icon_state = "whitepurple"
+ },
+/area/station/science/research)
"akN" = (
/obj/structure/closet/secure_closet/brig,
/turf/simulated/floor/plasteel{
@@ -1463,34 +1385,16 @@
icon_state = "cult"
},
/area/station/legal/lawoffice)
-"alG" = (
-/obj/structure/table,
-/obj/item/stack/cable_coil,
-/obj/item/stack/cable_coil,
-/obj/item/stock_parts/capacitor,
-/obj/item/stock_parts/scanning_module{
- pixel_x = 2;
- pixel_y = 3
- },
-/obj/item/stock_parts/manipulator,
-/obj/item/stock_parts/manipulator,
-/turf/simulated/floor/plasteel{
- icon_state = "white"
- },
-/area/station/science/rnd)
"alI" = (
-/obj/structure/closet/secure_closet/freezer/kitchen,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 10
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 10
+/obj/machinery/chem_master/condimaster{
+ name = "CondiMaster Neo";
+ pixel_x = -5
},
-/obj/effect/turf_decal/tile/bar{
+/obj/machinery/light/small{
dir = 1
},
/turf/simulated/floor/plasteel{
- icon_state = "whitecorner"
+ icon_state = "showroomfloor"
},
/area/station/service/kitchen)
"alW" = (
@@ -1656,6 +1560,20 @@
},
/turf/simulated/floor/plasteel,
/area/station/public/fitness)
+"amV" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/firealarm{
+ dir = 1;
+ name = "south bump";
+ pixel_y = -24
+ },
+/turf/simulated/floor/plasteel{
+ dir = 0;
+ icon_state = "green"
+ },
+/area/station/service/hydroponics)
"amW" = (
/obj/structure/cable/yellow{
d2 = 8;
@@ -2122,18 +2040,6 @@
icon_state = "dark"
},
/area/station/engineering/gravitygenerator)
-"aoN" = (
-/obj/machinery/light/small{
- dir = 1
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/sign/securearea{
- pixel_x = -32
- },
-/turf/simulated/floor/plasteel{
- icon_state = "white"
- },
-/area/station/science/toxins/mixing)
"aoS" = (
/obj/machinery/conveyor/north{
id = "garbage"
@@ -2166,17 +2072,6 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/disposal)
-"aoW" = (
-/obj/structure/closet/crate/freezer,
-/obj/machinery/light_switch{
- name = "custom placement";
- pixel_x = 6;
- pixel_y = 24
- },
-/turf/simulated/floor/plasteel{
- icon_state = "showroomfloor"
- },
-/area/station/service/kitchen)
"aoX" = (
/obj/structure/girder,
/turf/simulated/floor/plating,
@@ -2199,15 +2094,6 @@
icon_state = "showroomfloor"
},
/area/station/medical/coldroom)
-"apa" = (
-/obj/structure/chair/stool{
- dir = 4
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/simulated/floor/wood,
-/area/station/service/bar)
"apb" = (
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
@@ -2431,11 +2317,6 @@
icon_state = "dark"
},
/area/station/security/main)
-"aqe" = (
-/obj/structure/reagent_dispensers/watertank,
-/obj/effect/turf_decal/stripes/line,
-/turf/simulated/floor/plating,
-/area/station/maintenance/aft2)
"aqh" = (
/obj/machinery/gravity_generator/main/station,
/turf/simulated/floor/plasteel{
@@ -2627,8 +2508,10 @@
},
/area/station/public/fitness)
"arr" = (
-/obj/machinery/space_heater,
-/turf/simulated/floor/plating,
+/obj/structure/bookcase{
+ name = "Holy Bookcase"
+ },
+/turf/simulated/floor/wood,
/area/station/maintenance/starboard)
"ars" = (
/obj/structure/disposalpipe/segment{
@@ -2773,13 +2656,6 @@
/obj/item/vending_refill/cola,
/turf/simulated/floor/plating,
/area/station/maintenance/fpmaint)
-"asv" = (
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
- },
-/turf/simulated/floor/plating,
-/area/station/maintenance/aft2)
"asy" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -3263,11 +3139,16 @@
/turf/simulated/floor/plating,
/area/station/maintenance/auxsolarstarboard)
"aub" = (
-/obj/effect/spawner/lootdrop{
- loot = list(/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes);
- name = "trash spawner"
+/obj/item/book/manual/random,
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 6
},
-/turf/simulated/floor/plating,
+/obj/structure/cable/yellow{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
+/turf/simulated/floor/wood,
/area/station/maintenance/starboard)
"aud" = (
/obj/machinery/atmospherics/pipe/manifold/visible{
@@ -3548,6 +3429,10 @@
"avr" = (
/turf/simulated/wall,
/area/station/public/mrchangs)
+"avs" = (
+/obj/effect/spawner/random_spawners/grille_maybe,
+/turf/simulated/floor/plating,
+/area/station/maintenance/aft2)
"avv" = (
/turf/simulated/wall,
/area/station/public/sleep)
@@ -3595,8 +3480,12 @@
},
/area/station/security/brig)
"avC" = (
-/obj/effect/landmark/spawner/xeno,
-/turf/simulated/floor/plating,
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 4
+ },
+/turf/simulated/floor/wood{
+ icon_state = "wood-broken6"
+ },
/area/station/maintenance/starboard)
"avD" = (
/obj/structure/dispenser,
@@ -3997,25 +3886,6 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/fpmaint)
-"awL" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/turf/simulated/floor/plasteel{
- icon_state = "whitepurple"
- },
-/area/station/science/research)
"awM" = (
/obj/structure/closet/crate,
/obj/effect/spawner/lootdrop/maintenance,
@@ -4292,8 +4162,8 @@
/turf/simulated/floor/plasteel,
/area/station/supply/office)
"axy" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 6
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 4
},
/turf/simulated/floor/plasteel{
dir = 1;
@@ -4561,9 +4431,6 @@
dir = 4
},
/obj/effect/landmark/start/atmospheric,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
/turf/simulated/floor/plasteel,
/area/station/engineering/atmos)
"ayF" = (
@@ -4780,9 +4647,11 @@
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
"azy" = (
-/obj/structure/reagent_dispensers/fueltank,
-/turf/simulated/floor/plating,
-/area/station/public/storage/emergency)
+/obj/machinery/light/small{
+ dir = 8
+ },
+/turf/simulated/floor/wood,
+/area/station/service/bar)
"azz" = (
/obj/structure/table,
/obj/machinery/recharger{
@@ -5064,8 +4933,21 @@
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
"aAL" = (
-/obj/machinery/door/airlock/maintenance,
-/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
+/obj/structure/extinguisher_cabinet{
+ name = "north bump";
+ pixel_y = 30
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 4
+ },
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
"aAM" = (
@@ -5075,6 +4957,11 @@
icon_state = "dark"
},
/area/station/legal/courtroom)
+"aAO" = (
+/obj/structure/closet/crate/freezer,
+/obj/effect/spawner/lootdrop/maintenance,
+/turf/simulated/floor/plating,
+/area/station/maintenance/asmaint)
"aAP" = (
/obj/structure/closet,
/obj/effect/spawner/lootdrop/maintenance,
@@ -5589,10 +5476,6 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
-"aDa" = (
-/obj/item/wrench,
-/turf/simulated/floor/plating,
-/area/station/maintenance/starboard)
"aDb" = (
/obj/machinery/door/airlock/highsecurity{
name = "Gravity Generator Foyer"
@@ -6294,18 +6177,11 @@
},
/area/station/public/dorms)
"aFL" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 10
},
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/landmark/start/scientist,
-/turf/simulated/floor/engine,
-/area/station/science/explab/chamber)
+/turf/simulated/floor/plasteel,
+/area/station/maintenance/starboard2)
"aFM" = (
/obj/effect/spawner/random_spawners/grille_often,
/obj/structure/cable/yellow{
@@ -6595,22 +6471,6 @@
},
/turf/simulated/floor/plasteel,
/area/station/security/brig)
-"aGW" = (
-/obj/structure/sign/poster/contraband/random{
- pixel_x = 32
- },
-/obj/machinery/light/small{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 9
- },
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
- },
-/turf/simulated/floor/wood,
-/area/station/service/theatre)
"aGX" = (
/obj/machinery/computer/security/telescreen/entertainment{
pixel_y = -29
@@ -6901,6 +6761,9 @@
/obj/effect/turf_decal/stripes/line{
dir = 6
},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 9
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -7824,11 +7687,6 @@
pixel_y = 5
},
/obj/item/storage/box/pillbottles,
-/obj/structure/cable/yellow{
- d1 = 2;
- d2 = 8;
- icon_state = "2-8"
- },
/obj/machinery/requests_console{
department = "Science";
departmentType = 2;
@@ -8094,15 +7952,6 @@
},
/turf/simulated/floor/plasteel,
/area/station/engineering/hardsuitstorage)
-"aLr" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 6
- },
-/turf/simulated/floor/plasteel,
-/area/station/service/hydroponics)
"aLu" = (
/obj/structure/table,
/obj/item/stack/cable_coil{
@@ -8172,8 +8021,21 @@
/turf/simulated/floor/plating,
/area/station/public/construction)
"aLC" = (
-/turf/simulated/wall,
-/area/station/public/storage/emergency)
+/obj/machinery/alarm{
+ dir = 4;
+ name = "custom placement";
+ pixel_x = -34
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 6
+ },
+/turf/simulated/floor/wood{
+ icon_state = "wood-broken5"
+ },
+/area/station/service/bar)
"aLD" = (
/obj/structure/table,
/obj/effect/spawner/lootdrop/maintenance/two,
@@ -8204,15 +8066,6 @@
/obj/structure/closet/toolcloset,
/turf/simulated/floor/plasteel,
/area/station/public/construction)
-"aLH" = (
-/obj/structure/disposalpipe/junction{
- dir = 8;
- icon_state = "pipe-j2"
- },
-/turf/simulated/floor/plasteel{
- icon_state = "white"
- },
-/area/station/science/research)
"aLK" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/landmark/start/cargo_technician,
@@ -8415,11 +8268,10 @@
/turf/simulated/wall/r_wall,
/area/station/hallway/primary/fore)
"aMh" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/light/small{
- dir = 1
- },
-/turf/simulated/floor/plasteel,
+/obj/machinery/atmospherics/portable/canister/air,
+/obj/effect/turf_decal/delivery/white/hollow,
+/obj/effect/spawner/random_spawners/cobweb_left_frequent,
+/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
"aMi" = (
/obj/structure/cable/yellow{
@@ -9039,14 +8891,10 @@
/area/station/hallway/secondary/garden)
"aNR" = (
/obj/effect/decal/cleanable/dirt,
-/obj/structure/disposalpipe/segment,
-/obj/machinery/firealarm{
- dir = 4;
- name = "east bump";
- pixel_x = 24
+/turf/simulated/floor/plasteel{
+ icon_state = "showroomfloor"
},
-/turf/simulated/floor/wood,
-/area/station/service/theatre)
+/area/station/maintenance/starboard)
"aNS" = (
/obj/machinery/field/generator{
state = 2
@@ -9190,7 +9038,13 @@
/turf/simulated/floor/plasteel,
/area/station/supply/storage)
"aOx" = (
-/obj/effect/decal/cleanable/blood/old,
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -9200,6 +9054,12 @@
icon_state = "brown"
},
/area/station/supply/lobby)
+"aOz" = (
+/obj/structure/computerframe,
+/obj/item/shard,
+/obj/effect/decal/cleanable/glass,
+/turf/simulated/floor/bluespace,
+/area/station/maintenance/starboard)
"aOA" = (
/turf/simulated/wall,
/area/station/public/storage/tools)
@@ -9567,22 +9427,6 @@
},
/turf/simulated/floor/plating,
/area/station/supply/storage)
-"aPF" = (
-/obj/structure/table/wood/poker,
-/obj/item/deck/cards{
- pixel_y = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/wood,
-/area/station/service/bar)
-"aPG" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- icon_state = "bar"
- },
-/area/station/service/bar)
"aPH" = (
/obj/structure/table/wood,
/obj/machinery/firealarm{
@@ -9977,25 +9821,13 @@
/turf/simulated/floor/plating,
/area/station/engineering/secure_storage)
"aQT" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 4
+ dir = 5
},
-/obj/structure/disposalpipe/segment{
- dir = 4
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
},
/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
@@ -10138,6 +9970,21 @@
icon_state = "red"
},
/area/station/security/prisonlockers)
+"aRy" = (
+/obj/structure/table,
+/obj/item/reagent_containers/food/snacks/mint,
+/obj/item/kitchen/rollingpin,
+/obj/item/reagent_containers/glass/beaker{
+ pixel_x = 5
+ },
+/obj/item/reagent_containers/food/condiment/enzyme,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "cafeteria"
+ },
+/area/station/service/kitchen)
"aRz" = (
/obj/machinery/door/poddoor{
id_tag = "QMLoaddoor";
@@ -10271,20 +10118,6 @@
},
/turf/simulated/floor/carpet,
/area/station/legal/courtroom)
-"aRW" = (
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 9
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 9
- },
-/turf/simulated/floor/plating,
-/area/station/maintenance/aft2)
"aRX" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -10632,18 +10465,6 @@
"aTd" = (
/turf/simulated/floor/carpet,
/area/station/legal/courtroom)
-"aTg" = (
-/obj/structure/cable/yellow{
- d2 = 8;
- icon_state = "0-8"
- },
-/obj/machinery/power/apc{
- dir = 4;
- name = "east bump";
- pixel_x = 24
- },
-/turf/simulated/floor/plating,
-/area/station/maintenance/starboard2)
"aTh" = (
/obj/effect/decal/cleanable/dirt,
/obj/item/kirbyplants{
@@ -10699,15 +10520,6 @@
/obj/structure/chair/stool,
/turf/simulated/floor/plasteel,
/area/station/public/locker)
-"aTr" = (
-/obj/machinery/atmospherics/pipe/simple/visible/yellow{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 9
- },
-/turf/simulated/floor/plasteel,
-/area/station/engineering/atmos)
"aTt" = (
/obj/effect/landmark/lightsout,
/obj/effect/decal/cleanable/dirt,
@@ -11342,13 +11154,14 @@
/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/pod_1)
"aUX" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/tile/bar{
- dir = 1
+/obj/item/kirbyplants{
+ icon_state = "plant-21"
+ },
+/obj/structure/sign/botany{
+ pixel_x = 32
},
/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "neutralcorner"
+ icon_state = "redcorner"
},
/area/station/hallway/primary/central)
"aUY" = (
@@ -12362,9 +12175,15 @@
/turf/space,
/area/space/nearstation)
"aXP" = (
-/obj/item/crowbar,
-/obj/effect/landmark/damageturf,
-/turf/simulated/floor/plating,
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 9
+ },
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
+/turf/simulated/floor/wood,
/area/station/maintenance/starboard)
"aXQ" = (
/obj/structure/cable/yellow{
@@ -12833,6 +12652,13 @@
/obj/structure/sign/radiation/rad_area,
/turf/simulated/wall/r_wall,
/area/station/engineering/control)
+"aZi" = (
+/obj/machinery/door/airlock/research{
+ name = "Toxins Loop Observation"
+ },
+/obj/effect/mapping_helpers/airlock/access/all/science/tox,
+/turf/simulated/floor/plating,
+/area/station/maintenance/asmaint)
"aZj" = (
/obj/machinery/door/airlock/external{
name = "Escape Pod One"
@@ -13189,43 +13015,6 @@
/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
/area/station/service/hydroponics)
-"bak" = (
-/obj/structure/closet/crate/hydroponics/prespawned,
-/obj/item/shovel/spade,
-/obj/item/wrench,
-/obj/item/reagent_containers/glass/bucket,
-/obj/item/cultivator,
-/obj/item/wirecutters,
-/obj/machinery/alarm{
- dir = 1;
- name = "south bump";
- pixel_y = -24
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/machinery/atmospherics/unary/vent_pump/on{
- dir = 1
- },
-/turf/simulated/floor/plasteel,
-/area/station/service/hydroponics)
-"bal" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "greenblue"
- },
-/area/station/service/hydroponics)
"bam" = (
/turf/simulated/wall/r_wall,
/area/station/command/office/ce)
@@ -13907,11 +13696,6 @@
icon_state = "darkgrey"
},
/area/station/turret_protected/ai_upload/foyer)
-"bcm" = (
-/obj/structure/closet/secure_closet/hydroponics,
-/obj/effect/turf_decal/stripes/line,
-/turf/simulated/floor/plasteel,
-/area/station/service/hydroponics)
"bcn" = (
/obj/structure/cable/yellow{
d1 = 1;
@@ -14004,18 +13788,21 @@
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/entry)
"bcC" = (
-/obj/effect/turf_decal/tile/purple,
-/obj/effect/turf_decal/tile/purple{
- dir = 1
- },
-/obj/structure/chair/comfy{
- dir = 4
- },
/obj/item/radio/intercom{
name = "south bump";
pixel_y = -28
},
-/turf/simulated/floor/plasteel,
+/obj/machinery/atmospherics/binary/pump{
+ dir = 8
+ },
+/obj/machinery/camera{
+ c_tag = "Science Hallway - Xenobio Acess";
+ dir = 10;
+ network = list("Research","SS13")
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "purple"
+ },
/area/station/science/research)
"bcF" = (
/obj/machinery/door/firedoor,
@@ -14218,10 +14005,11 @@
},
/area/station/hallway/primary/central)
"bdc" = (
-/obj/effect/turf_decal/tile/bar,
+/obj/structure/sign/poster/random{
+ pixel_x = 32
+ },
/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "neutralcorner"
+ icon_state = "redcorner"
},
/area/station/hallway/primary/central)
"bde" = (
@@ -15850,10 +15638,11 @@
/turf/simulated/floor/plasteel,
/area/station/supply/storage)
"bgD" = (
-/obj/machinery/door/airlock/maintenance,
-/obj/effect/mapping_helpers/airlock/autoname,
-/obj/effect/mapping_helpers/airlock/access/all/science/tox_storage,
-/turf/simulated/floor/plating,
+/obj/effect/decal/cleanable/blood,
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 4
+ },
+/turf/simulated/floor/engine,
/area/station/maintenance/asmaint)
"bgF" = (
/obj/item/radio/intercom{
@@ -15897,7 +15686,6 @@
dir = 4
},
/obj/structure/window/reinforced,
-/obj/effect/turf_decal/delivery/hollow,
/obj/machinery/atmospherics/portable/pump,
/turf/simulated/floor/plasteel{
dir = 10;
@@ -15958,8 +15746,13 @@
/turf/space,
/area/space/nearstation)
"bgV" = (
-/obj/effect/landmark/damageturf,
-/turf/simulated/floor/plating,
+/obj/item/kirbyplants{
+ icon_state = "plant-22"
+ },
+/obj/effect/spawner/random_spawners/cobweb_left_rare,
+/turf/simulated/floor/wood{
+ icon_state = "wood-broken3"
+ },
/area/station/maintenance/starboard)
"bgW" = (
/obj/structure/cable/yellow{
@@ -16140,6 +15933,7 @@
dir = 6
},
/obj/effect/spawner/window/reinforced,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/station/engineering/atmos/control)
"bhw" = (
@@ -16724,14 +16518,6 @@
},
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/bridge)
-"biM" = (
-/obj/structure/chair/wood/wings{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/carpet,
-/area/station/service/theatre)
"biN" = (
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
@@ -16762,14 +16548,10 @@
/turf/simulated/floor/bluegrid,
/area/station/turret_protected/ai)
"biW" = (
-/obj/structure/chair/stool/bar,
-/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/woodsiding{
- dir = 9
- },
-/turf/simulated/floor/plasteel{
- icon_state = "bar"
+/obj/machinery/computer/security/telescreen/entertainment{
+ pixel_y = -32
},
+/turf/simulated/floor/wood,
/area/station/service/bar)
"biX" = (
/obj/structure/disposalpipe/segment,
@@ -17583,7 +17365,6 @@
dir = 1
},
/obj/machinery/atmospherics/portable/scrubber,
-/obj/effect/turf_decal/delivery/hollow,
/turf/simulated/floor/plasteel{
dir = 9;
icon_state = "redyellow"
@@ -17603,9 +17384,6 @@
/obj/machinery/atmospherics/pipe/simple/visible{
dir = 6
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 9
- },
/turf/simulated/floor/plasteel,
/area/station/maintenance/turbine)
"bkZ" = (
@@ -17656,26 +17434,6 @@
icon_state = "yellowcorner"
},
/area/station/hallway/primary/central)
-"bli" = (
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
- },
-/obj/structure/cable/yellow{
- d1 = 2;
- d2 = 8;
- icon_state = "2-8"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 10
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 10
- },
-/turf/simulated/floor/plasteel{
- icon_state = "whitepurplecorner"
- },
-/area/station/science/explab)
"blk" = (
/obj/structure/cable/yellow{
d1 = 4;
@@ -17715,12 +17473,6 @@
icon_state = "darkgrey"
},
/area/station/hallway/primary/starboard)
-"bln" = (
-/obj/machinery/door/airlock/maintenance,
-/obj/effect/mapping_helpers/airlock/autoname,
-/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
-/turf/simulated/floor/plating,
-/area/station/maintenance/starboard)
"blo" = (
/turf/simulated/wall,
/area/station/hallway/primary/starboard)
@@ -17791,16 +17543,18 @@
},
/area/station/medical/medbay)
"blx" = (
-/obj/machinery/hologram/holopad,
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 4
+/obj/machinery/newscaster{
+ dir = 1;
+ name = "south bump";
+ pixel_y = -28
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 10
+/obj/machinery/chem_master/condimaster{
+ name = "CondiMaster Neo"
},
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/wood,
-/area/station/service/bar)
+/turf/simulated/floor/plasteel{
+ icon_state = "cafeteria"
+ },
+/area/station/service/kitchen)
"bly" = (
/obj/item/radio/intercom{
name = "south bump";
@@ -18273,11 +18027,6 @@
/mob/living/simple_animal/mouse,
/turf/simulated/floor/plating,
/area/station/maintenance/fpmaint)
-"bmB" = (
-/obj/machinery/door/airlock,
-/obj/effect/mapping_helpers/airlock/autoname,
-/turf/simulated/floor/plating,
-/area/station/public/storage/emergency)
"bmC" = (
/obj/structure/cable/yellow{
d1 = 4;
@@ -18465,17 +18214,13 @@
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/central)
"bnc" = (
-/obj/machinery/light/small{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 10
- },
-/obj/effect/landmark/spawner/xeno,
-/turf/simulated/floor/plasteel{
- icon_state = "showroomfloor"
+/obj/machinery/door/airlock/maintenance{
+ name = "Hydroponics Garden"
},
-/area/station/service/kitchen)
+/obj/effect/mapping_helpers/airlock/access/any/service/hydroponics,
+/obj/effect/mapping_helpers/airlock/access/any/service/kitchen,
+/turf/simulated/floor/plating,
+/area/station/service/hydroponics)
"bnd" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/public/glass,
@@ -18605,19 +18350,6 @@
},
/turf/simulated/floor/plating/airless,
/area/space/nearstation)
-"bnx" = (
-/obj/machinery/atmospherics/binary/pump{
- dir = 8;
- layer = 3.3;
- name = "Cooling loop return"
- },
-/obj/machinery/alarm{
- dir = 1;
- name = "south bump";
- pixel_y = -24
- },
-/turf/simulated/floor/plasteel,
-/area/station/science/toxins/mixing)
"bnA" = (
/obj/machinery/status_display{
layer = 4;
@@ -18629,18 +18361,12 @@
/turf/simulated/floor/carpet,
/area/station/command/office/captain/bedroom)
"bnB" = (
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 8;
- icon_state = "1-8"
+/obj/item/radio/beacon,
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+ dir = 4
},
-/turf/simulated/floor/plating,
-/area/station/maintenance/asmaint)
+/turf/simulated/floor/engine,
+/area/station/science/test_chamber)
"bnE" = (
/obj/structure/dresser,
/obj/structure/sign/bobross{
@@ -18776,6 +18502,13 @@
/obj/machinery/atmospherics/pipe/simple/visible/cyan{
dir = 4
},
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 6
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "caution"
@@ -18963,7 +18696,6 @@
/turf/simulated/floor/plasteel,
/area/station/service/janitor)
"bow" = (
-/obj/effect/turf_decal/delivery/hollow,
/obj/machinery/atmospherics/portable/canister/nitrogen,
/obj/machinery/atmospherics/pipe/simple/hidden/purple{
dir = 4
@@ -19155,28 +18887,16 @@
},
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/starboard)
-"boS" = (
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/structure/cable/yellow{
- d1 = 2;
- d2 = 8;
- icon_state = "2-8"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
+"boR" = (
+/obj/machinery/status_display{
+ dir = 4;
+ pixel_y = -32
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
+/obj/machinery/atmospherics/unary/portables_connector{
+ dir = 8
},
/turf/simulated/floor/plasteel,
-/area/station/hallway/primary/starboard)
+/area/station/science/toxins/mixing)
"boV" = (
/obj/structure/cable/yellow{
d1 = 4;
@@ -19256,29 +18976,6 @@
},
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/starboard)
-"bpd" = (
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/structure/cable/yellow{
- d1 = 2;
- d2 = 4;
- icon_state = "2-4"
- },
-/obj/structure/disposalpipe/junction{
- dir = 8;
- icon_state = "pipe-j2"
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 1
- },
-/turf/simulated/floor/plasteel,
-/area/station/hallway/primary/starboard)
"bpf" = (
/turf/simulated/floor/plasteel,
/area/station/maintenance/fsmaint)
@@ -19291,15 +18988,22 @@
},
/area/station/turret_protected/ai)
"bpj" = (
-/obj/structure/reagent_dispensers/fueltank,
-/turf/simulated/floor/plasteel,
-/area/station/maintenance/starboard)
-"bpm" = (
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 4
+ },
+/obj/structure/cable/yellow{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
+ },
/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "whitebluecorner"
+ dir = 4;
+ icon_state = "greenblue"
},
-/area/station/science/explab)
+/area/station/service/hydroponics)
"bpn" = (
/turf/simulated/floor/plasteel,
/area/station/engineering/break_room)
@@ -19459,14 +19163,12 @@
},
/area/station/hallway/primary/port)
"bpI" = (
-/obj/effect/turf_decal/tile/bar,
/obj/structure/extinguisher_cabinet{
name = "east bump";
pixel_x = 27
},
/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "neutralcorner"
+ icon_state = "redcorner"
},
/area/station/hallway/primary/central)
"bpJ" = (
@@ -19759,7 +19461,7 @@
pixel_y = 17
},
/obj/structure/mirror{
- pixel_y = -34
+ pixel_y = 34
},
/turf/simulated/floor/plasteel{
icon_state = "white"
@@ -19800,18 +19502,6 @@
},
/turf/simulated/floor/wood,
/area/station/command/office/captain/bedroom)
-"bqr" = (
-/obj/machinery/power/apc{
- cell_type = 5000;
- name = "south bump Important Area";
- pixel_y = -24
- },
-/obj/structure/cable/yellow{
- d2 = 8;
- icon_state = "0-8"
- },
-/turf/simulated/floor/wood,
-/area/station/command/office/captain/bedroom)
"bqs" = (
/obj/machinery/alarm{
dir = 1;
@@ -19840,10 +19530,8 @@
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/public/glass,
/obj/effect/mapping_helpers/airlock/autoname,
-/obj/effect/turf_decal/tile/bar,
/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "neutralcorner"
+ icon_state = "redcorner"
},
/area/station/hallway/primary/starboard)
"bqx" = (
@@ -19852,25 +19540,9 @@
icon_state = "cautioncorner"
},
/area/station/hallway/primary/starboard)
-"bqy" = (
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "cautioncorner"
- },
-/area/station/hallway/primary/starboard)
"bqA" = (
-/obj/effect/turf_decal/tile/bar,
/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "neutralcorner"
+ icon_state = "redcorner"
},
/area/station/hallway/primary/starboard)
"bqB" = (
@@ -19898,10 +19570,8 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/effect/turf_decal/tile/bar,
/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "neutralcorner"
+ icon_state = "redcorner"
},
/area/station/hallway/primary/starboard)
"bqE" = (
@@ -19914,10 +19584,8 @@
c_tag = "Starboard Primary Hallway - Auxiliary Tool Storage";
dir = 1
},
-/obj/effect/turf_decal/tile/bar,
/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "neutralcorner"
+ icon_state = "redcorner"
},
/area/station/hallway/primary/starboard)
"bqG" = (
@@ -19944,8 +19612,10 @@
pixel_y = -32
},
/obj/item/kirbyplants,
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
- dir = 4
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -19964,11 +19634,12 @@
/turf/simulated/floor/plating,
/area/station/maintenance/port)
"bqR" = (
-/obj/structure/disposalpipe/junction{
- dir = 2;
- icon_state = "pipe-y"
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel{
icon_state = "neutralcorner"
@@ -20842,15 +20513,6 @@
icon_state = "neutralcorner"
},
/area/station/hallway/primary/port)
-"btC" = (
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
- },
-/turf/simulated/floor/plasteel{
- icon_state = "greencorner"
- },
-/area/station/hallway/primary/central)
"btD" = (
/obj/item/radio/intercom{
name = "north bump";
@@ -21237,10 +20899,7 @@
/area/station/command/bridge)
"bus" = (
/obj/machinery/disposal,
-/obj/effect/turf_decal/delivery/hollow,
-/obj/structure/disposalpipe/trunk{
- dir = 8
- },
+/obj/structure/disposalpipe/trunk,
/turf/simulated/floor/wood,
/area/station/service/bar)
"but" = (
@@ -21262,13 +20921,36 @@
/turf/simulated/floor/plasteel,
/area/station/command/bridge)
"buy" = (
-/obj/structure/closet/firecloset,
+/obj/structure/closet/emcloset,
+/obj/effect/spawner/lootdrop/maintenance,
+/obj/machinery/light/small{
+ dir = 4
+ },
/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
"buz" = (
-/obj/structure/closet/firecloset,
-/turf/simulated/floor/plating,
-/area/station/public/storage/emergency)
+/obj/structure/table/wood,
+/obj/item/stack/packageWrap{
+ pixel_x = 2;
+ pixel_y = -3
+ },
+/obj/item/stack/packageWrap,
+/obj/item/stack/packageWrap{
+ pixel_x = -3;
+ pixel_y = 5
+ },
+/obj/item/gun/projectile/revolver/doublebarrel{
+ pixel_x = 6;
+ pixel_y = 5
+ },
+/obj/item/eftpos,
+/obj/machinery/firealarm{
+ dir = 8;
+ name = "west bump";
+ pixel_x = -24
+ },
+/turf/simulated/floor/wood,
+/area/station/service/bar)
"buB" = (
/obj/item/radio/off,
/obj/effect/turf_decal/stripes/line{
@@ -21277,9 +20959,18 @@
/turf/simulated/floor/plating,
/area/station/maintenance/maintcentral)
"buC" = (
-/obj/item/coin/iron,
-/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 9
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 9
+ },
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
"buD" = (
@@ -21344,11 +21035,14 @@
},
/area/station/service/barber)
"buI" = (
-/obj/effect/turf_decal/stripes/line{
+/obj/structure/closet/secure_closet/bar{
+ req_access_txt = "25"
+ },
+/obj/machinery/light/small{
dir = 1
},
-/turf/simulated/floor/plating,
-/area/station/public/storage/emergency)
+/turf/simulated/floor/wood,
+/area/station/service/bar)
"buN" = (
/obj/structure/transit_tube_pod,
/obj/structure/window/reinforced{
@@ -22183,91 +21877,35 @@
/turf/simulated/floor/wood,
/area/station/command/office/captain)
"bwz" = (
-/obj/machinery/atmospherics/unary/vent_pump/on,
-/turf/simulated/floor/wood,
-/area/station/service/bar)
-"bwA" = (
-/obj/effect/mapping_helpers/airlock/autoname,
-/obj/effect/mapping_helpers/airlock/access/all/service/hydroponics,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/obj/machinery/door/airlock/maintenance,
-/turf/simulated/floor/plasteel,
-/area/station/maintenance/starboard)
-"bwC" = (
-/obj/effect/landmark/start/assistant,
-/turf/simulated/floor/wood,
-/area/station/service/bar)
-"bwD" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 6
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 6
- },
-/obj/structure/cable/yellow{
- d1 = 2;
- d2 = 4;
- icon_state = "2-4"
- },
-/obj/effect/turf_decal/stripes/line{
+/obj/structure/disposalpipe/junction{
dir = 8
},
-/turf/simulated/floor/plating,
-/area/station/maintenance/starboard)
-"bwE" = (
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 8;
- icon_state = "1-8"
+/turf/simulated/floor/wood,
+/area/station/service/bar)
+"bwC" = (
+/obj/effect/landmark/start/assistant,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
},
+/turf/simulated/floor/wood,
+/area/station/service/bar)
+"bwG" = (
/obj/structure/disposalpipe/segment{
- dir = 1;
+ dir = 2;
icon_state = "pipe-c"
},
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plating,
-/area/station/maintenance/starboard)
-"bwG" = (
-/obj/structure/chair/stool{
- dir = 1
- },
-/obj/machinery/light{
- dir = 4
- },
-/obj/machinery/power/apc{
- dir = 4;
+/obj/machinery/newscaster{
+ dir = 8;
name = "east bump";
- pixel_x = 24
- },
-/obj/structure/cable/yellow{
- d2 = 2;
- icon_state = "0-2"
+ pixel_x = 28
},
/turf/simulated/floor/wood,
/area/station/service/bar)
-"bwI" = (
-/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/plating,
-/area/station/maintenance/starboard2)
"bwL" = (
/obj/structure/showcase{
density = 0;
@@ -22285,24 +21923,20 @@
"bwM" = (
/turf/space,
/area/space/nearstation)
-"bwN" = (
-/obj/machinery/light/small,
-/obj/effect/landmark/damageturf,
-/turf/simulated/floor/plating,
-/area/station/public/storage/emergency)
"bwO" = (
-/obj/item/storage/box/lights/mixed,
-/turf/simulated/floor/plating,
-/area/station/public/storage/emergency)
+/turf/simulated/floor/wood{
+ icon_state = "wood-broken"
+ },
+/area/station/service/bar)
"bwP" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/disposalpipe/segment,
-/obj/effect/spawner/lootdrop{
- loot = list(/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes);
- name = "trash spawner"
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/effect/landmark/burnturf,
+/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
/area/station/maintenance/starboard2)
"bwR" = (
@@ -22322,11 +21956,9 @@
},
/area/station/service/barber)
"bwS" = (
-/obj/effect/turf_decal/tile/bar,
/obj/machinery/door/firedoor,
/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "neutralcorner"
+ icon_state = "redcorner"
},
/area/station/hallway/primary/central)
"bwV" = (
@@ -22364,9 +21996,9 @@
/area/station/telecomms/computer)
"bxe" = (
/obj/machinery/economy/slot_machine,
-/obj/machinery/alarm{
+/obj/structure/extinguisher_cabinet{
name = "north bump";
- pixel_y = 24
+ pixel_y = 30
},
/turf/simulated/floor/wood,
/area/station/service/bar)
@@ -23090,13 +22722,6 @@
icon_state = "neutralcorner"
},
/area/station/hallway/primary/central)
-"byI" = (
-/obj/structure/chair/stool{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/wood,
-/area/station/service/bar)
"byJ" = (
/obj/machinery/light/small{
dir = 4
@@ -23115,25 +22740,14 @@
/area/station/command/office/captain)
"byK" = (
/obj/effect/landmark/lightsout,
-/turf/simulated/floor/wood,
-/area/station/service/bar)
-"byL" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
+ dir = 6
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "greencorner"
+ dir = 10
},
-/area/station/service/hydroponics)
+/turf/simulated/floor/wood,
+/area/station/service/bar)
"byM" = (
/obj/structure/table/wood/poker,
/obj/item/storage/bag/dice,
@@ -23603,9 +23217,14 @@
},
/area/station/command/bridge)
"bAk" = (
-/obj/machinery/atmospherics/unary/vent_pump/on{
- dir = 8
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
},
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel{
icon_state = "darkgrey"
},
@@ -23651,13 +23270,6 @@
},
/turf/simulated/floor/carpet,
/area/station/command/office/captain)
-"bAu" = (
-/obj/machinery/hologram/holopad,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/simulated/floor/wood,
-/area/station/service/bar)
"bAv" = (
/obj/structure/chair/stool{
dir = 4
@@ -23665,23 +23277,36 @@
/turf/simulated/floor/wood,
/area/station/service/bar)
"bAx" = (
-/obj/machinery/light{
- dir = 1
+/obj/effect/turf_decal/woodsiding{
+ dir = 8
+ },
+/obj/structure/chair/stool/bar{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "bar"
},
-/turf/simulated/floor/wood,
/area/station/service/bar)
"bAy" = (
-/obj/machinery/computer/arcade,
-/obj/machinery/camera{
- c_tag = "Bar - Starboard"
+/obj/machinery/disposal,
+/obj/structure/disposalpipe/trunk{
+ dir = 8
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "bar"
},
-/turf/simulated/floor/wood,
/area/station/service/bar)
"bAz" = (
-/obj/machinery/computer/security/telescreen/entertainment{
- pixel_y = 32
+/obj/machinery/economy/vending/boozeomat,
+/obj/machinery/light{
+ dir = 1
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "bar"
},
-/turf/simulated/floor/wood,
/area/station/service/bar)
"bAA" = (
/obj/machinery/alarm{
@@ -23702,15 +23327,12 @@
/area/station/turret_protected/aisat/interior)
"bAB" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/snacks/pie,
-/obj/machinery/light/small{
- dir = 1
- },
+/obj/machinery/bottler,
/obj/structure/sign/poster/random{
- pixel_y = 32
+ pixel_y = -32
},
/turf/simulated/floor/wood,
-/area/station/service/theatre)
+/area/station/service/bar)
"bAC" = (
/turf/simulated/floor/plating/airless,
/area/station/engineering/solar/auxport)
@@ -23865,6 +23487,13 @@
/obj/machinery/atmospherics/portable/canister/air,
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint)
+"bBh" = (
+/obj/machinery/atmospherics/pipe/simple/heat_exchanging{
+ dir = 4
+ },
+/obj/structure/lattice,
+/turf/space,
+/area/space/nearstation)
"bBi" = (
/obj/structure/window/reinforced,
/obj/machinery/firealarm{
@@ -23898,6 +23527,17 @@
icon_state = "darkbluecorners"
},
/area/station/turret_protected/aisat/interior)
+"bBk" = (
+/obj/structure/table/glass,
+/obj/item/reagent_containers/food/snacks/grown/wheat,
+/obj/item/reagent_containers/food/snacks/grown/watermelon,
+/obj/item/reagent_containers/food/snacks/grown/citrus/orange,
+/obj/item/reagent_containers/food/snacks/grown/grapes,
+/turf/simulated/floor/plasteel{
+ dir = 5;
+ icon_state = "green"
+ },
+/area/station/hallway/primary/central)
"bBl" = (
/turf/simulated/wall/r_wall,
/area/station/telecomms/computer)
@@ -24279,6 +23919,9 @@
"bCk" = (
/obj/structure/table/wood,
/obj/item/nullrod/fedora,
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+ dir = 4
+ },
/turf/simulated/floor/wood,
/area/station/service/bar)
"bCl" = (
@@ -24298,8 +23941,7 @@
/area/station/command/office/hop)
"bCm" = (
/obj/machinery/economy/vending/cigarette{
- pixel_y = 2;
- products = list(/obj/item/storage/fancy/cigarettes/cigpack_syndicate=7,/obj/item/storage/fancy/cigarettes/cigpack_uplift=3,/obj/item/storage/fancy/cigarettes/cigpack_robust=2,/obj/item/storage/fancy/cigarettes/cigpack_carp=3,/obj/item/storage/fancy/cigarettes/cigpack_midori=1,/obj/item/storage/box/matches=10,/obj/item/lighter/random=4)
+ products = list(/obj/item/storage/fancy/cigarettes/cigpack_syndicate=7,/obj/item/storage/fancy/cigarettes/cigpack_uplift=3,/obj/item/storage/fancy/cigarettes/cigpack_robust=2,/obj/item/storage/fancy/cigarettes/cigpack_carp=3,/obj/item/storage/fancy/cigarettes/cigpack_midori=1,/obj/item/storage/fancy/matches=10,/obj/item/lighter/random=4)
},
/turf/simulated/floor/wood,
/area/station/command/office/captain)
@@ -24357,21 +23999,28 @@
},
/turf/simulated/floor/plating,
/area/station/engineering/atmos/control)
-"bCv" = (
-/obj/structure/chair/stool{
- dir = 4
+"bCx" = (
+/obj/structure/table,
+/obj/item/surgicaldrill{
+ pixel_x = 17;
+ pixel_y = 4
},
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
+/obj/item/stack/medical/bruise_pack/advanced{
+ pixel_x = -4;
+ pixel_y = 4
},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
+/obj/structure/window/reinforced{
+ dir = 8
},
-/turf/simulated/floor/wood,
-/area/station/service/bar)
+/obj/item/cautery,
+/obj/machinery/light{
+ dir = 1
+ },
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "whitepurple"
+ },
+/area/station/science/robotics)
"bCy" = (
/turf/simulated/floor/plasteel{
icon_state = "bar"
@@ -24406,19 +24055,12 @@
},
/area/station/hallway/primary/central)
"bCC" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
+/obj/machinery/status_display{
+ pixel_y = 32
},
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
+/turf/simulated/floor/plasteel{
+ icon_state = "bar"
},
-/obj/structure/chair/stool,
-/turf/simulated/floor/wood,
/area/station/service/bar)
"bCD" = (
/obj/machinery/status_display{
@@ -24433,23 +24075,6 @@
},
/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/pod_3)
-"bCF" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/structure/chair/stool{
- dir = 1
- },
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 1
- },
-/turf/simulated/floor/wood,
-/area/station/service/bar)
"bCG" = (
/obj/machinery/door/firedoor,
/obj/structure/disposalpipe/segment{
@@ -24464,13 +24089,6 @@
/obj/structure/chair/stool,
/turf/simulated/floor/wood,
/area/station/service/bar)
-"bCJ" = (
-/obj/structure/extinguisher_cabinet{
- name = "north bump";
- pixel_y = 30
- },
-/turf/simulated/floor/wood,
-/area/station/service/bar)
"bCM" = (
/turf/simulated/wall/r_wall,
/area/station/engineering/atmos)
@@ -24939,21 +24557,20 @@
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/entry)
"bDV" = (
+/obj/structure/disposalpipe/segment{
+ dir = 2;
+ icon_state = "pipe-c"
+ },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
+ dir = 10
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
+ dir = 10
},
-/obj/effect/decal/cleanable/dirt,
/obj/structure/cable/yellow{
- d1 = 4;
+ d1 = 2;
d2 = 8;
- icon_state = "4-8"
- },
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
+ icon_state = "2-8"
},
/turf/simulated/floor/wood,
/area/station/service/bar)
@@ -25084,21 +24701,6 @@
},
/turf/simulated/floor/carpet,
/area/station/command/office/captain)
-"bEo" = (
-/obj/structure/table/wood,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/turf/simulated/floor/wood,
-/area/station/service/bar)
"bEp" = (
/obj/machinery/firealarm{
dir = 8;
@@ -25110,23 +24712,6 @@
icon_state = "neutralcorner"
},
/area/station/hallway/primary/central)
-"bEq" = (
-/obj/structure/chair/stool{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/turf/simulated/floor/wood,
-/area/station/service/bar)
"bEr" = (
/obj/structure/dresser,
/obj/structure/sign/poster/official/random{
@@ -25136,12 +24721,6 @@
icon_state = "barber"
},
/area/station/public/dorms)
-"bEs" = (
-/mob/living/carbon/human/monkey/punpun,
-/turf/simulated/floor/plasteel{
- icon_state = "bar"
- },
-/area/station/service/bar)
"bEv" = (
/turf/simulated/floor/wood,
/area/station/service/bar)
@@ -25152,51 +24731,12 @@
},
/turf/simulated/floor/wood,
/area/station/service/bar)
-"bED" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/carpet,
-/area/station/service/theatre)
-"bEF" = (
-/obj/structure/table/wood,
-/obj/structure/sign/poster/random{
- pixel_x = 32
- },
-/obj/item/clothing/head/sombrero,
-/turf/simulated/floor/wood,
-/area/station/service/theatre)
"bEG" = (
-/turf/simulated/wall,
-/area/station/service/theatre)
-"bEO" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 1
- },
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/wood,
-/area/station/service/bar)
-"bEP" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/turf/simulated/floor/wood,
-/area/station/service/bar)
+/obj/structure/rack,
+/obj/item/storage/box/donkpockets,
+/obj/item/book/manual/wiki/chef_recipes,
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard)
"bES" = (
/obj/machinery/camera{
c_tag = "Arrivals - Middle Arm";
@@ -25261,6 +24801,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/station/engineering/atmos/control)
"bFi" = (
@@ -25501,9 +25044,7 @@
name = "east bump";
pixel_x = 24
},
-/obj/machinery/economy/vending/cigarette{
- pixel_x = 2
- },
+/obj/machinery/economy/vending/cigarette,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -25589,15 +25130,18 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/port)
-"bGc" = (
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/wood,
-/area/station/service/bar)
"bGd" = (
-/obj/structure/table/reinforced,
-/turf/simulated/floor/plasteel{
- icon_state = "bar"
+/obj/structure/disposalpipe/segment{
+ dir = 4
},
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/wood,
/area/station/service/bar)
"bGi" = (
/obj/effect/decal/cleanable/dirt,
@@ -25611,32 +25155,6 @@
icon_state = "white"
},
/area/station/science/research)
-"bGq" = (
-/obj/structure/table/wood,
-/obj/machinery/light/small{
- dir = 4
- },
-/obj/structure/sign/poster/random{
- pixel_x = 32
- },
-/obj/item/lipstick{
- pixel_y = 5
- },
-/obj/item/instrument/guitar,
-/obj/machinery/camera{
- c_tag = "Theatre - Stage";
- dir = 8
- },
-/turf/simulated/floor/wood,
-/area/station/service/theatre)
-"bGv" = (
-/obj/structure/table/wood/poker,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/wood,
-/area/station/service/bar)
"bGE" = (
/obj/machinery/atmospherics/pipe/manifold/visible/yellow{
dir = 4
@@ -25710,12 +25228,6 @@
/obj/machinery/atmospherics/meter,
/turf/simulated/floor/plasteel,
/area/station/engineering/atmos/distribution)
-"bGW" = (
-/obj/structure/closet/crate,
-/obj/effect/turf_decal/stripes/line,
-/obj/effect/spawner/lootdrop/maintenance/two,
-/turf/simulated/floor/plating,
-/area/station/maintenance/aft2)
"bHb" = (
/obj/machinery/atmospherics/unary/vent_pump/on,
/obj/structure/cable/yellow{
@@ -25813,10 +25325,6 @@
icon_state = "neutralcorner"
},
/area/station/hallway/secondary/garden)
-"bHo" = (
-/obj/effect/decal/cleanable/vomit,
-/turf/simulated/floor/plating,
-/area/station/maintenance/asmaint)
"bHp" = (
/obj/structure/rack,
/obj/item/flashlight,
@@ -25908,12 +25416,12 @@
},
/area/station/command/bridge)
"bHE" = (
-/obj/structure/disposalpipe/segment,
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/sign/poster/contraband/random{
- pixel_x = 32
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
},
/turf/simulated/floor/plating,
/area/station/maintenance/starboard2)
@@ -25925,11 +25433,20 @@
/turf/simulated/floor/carpet,
/area/station/command/office/captain)
"bHI" = (
-/obj/item/kirbyplants{
- level = 4.1
+/obj/item/reagent_containers/dropper{
+ pixel_x = -7;
+ pixel_y = -1
},
-/obj/machinery/light,
-/obj/effect/turf_decal/woodsiding{
+/obj/structure/table,
+/obj/item/reagent_containers/food/drinks/shaker{
+ pixel_x = -6
+ },
+/obj/machinery/reagentgrinder{
+ pixel_x = 6;
+ pixel_y = 6
+ },
+/obj/machinery/camera{
+ c_tag = "Bar - Counter";
dir = 1
},
/turf/simulated/floor/plasteel{
@@ -26012,7 +25529,7 @@
dir = 1
},
/turf/simulated/floor/plasteel{
- icon_state = "bar"
+ icon_state = "cafeteria"
},
/area/station/service/bar)
"bHP" = (
@@ -26024,7 +25541,7 @@
/area/station/service/bar)
"bHQ" = (
/obj/structure/table/reinforced,
-/obj/item/storage/box/matches{
+/obj/item/storage/fancy/matches{
pixel_y = 5
},
/turf/simulated/floor/plasteel{
@@ -26032,58 +25549,58 @@
},
/area/station/service/bar)
"bHR" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/tile/bar{
- dir = 1
- },
-/obj/machinery/light_switch{
- dir = 4;
- name = "west bump";
- pixel_x = -24
+/obj/structure/closet/secure_closet/freezer/fridge,
+/obj/machinery/door_control{
+ id = "kitchen_counter";
+ name = "Kitchen Counter Shutters";
+ pixel_x = -6;
+ pixel_y = 24;
+ req_access_txt = "28"
},
/turf/simulated/floor/plasteel{
- icon_state = "whitecorner"
+ icon_state = "cafeteria"
},
/area/station/service/kitchen)
"bHS" = (
+/obj/structure/closet/secure_closet/freezer/kitchen,
+/turf/simulated/floor/plasteel{
+ icon_state = "cafeteria"
+ },
+/area/station/service/kitchen)
+"bHU" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 6
+ dir = 9
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 6
- },
-/obj/structure/disposalpipe/segment,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/tile/bar{
- dir = 1
+ dir = 9
},
/turf/simulated/floor/plasteel{
- icon_state = "whitecorner"
- },
-/area/station/service/kitchen)
-"bHU" = (
-/obj/structure/window/reinforced{
- dir = 8
+ icon_state = "bar"
},
-/turf/simulated/floor/carpet,
-/area/station/service/theatre)
+/area/station/service/bar)
"bHW" = (
-/turf/simulated/floor/carpet,
-/area/station/service/theatre)
+/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{
+ dir = 1
+ },
+/obj/structure/grille/broken,
+/obj/item/stack/rods,
+/obj/effect/decal/cleanable/glass,
+/obj/item/shard,
+/turf/simulated/floor/light,
+/area/station/maintenance/starboard)
"bHX" = (
-/obj/machinery/atmospherics/unary/vent_pump/on{
- dir = 8
+/obj/machinery/atmospherics/pipe/simple/hidden,
+/obj/effect/spawner/lootdrop{
+ loot = list(/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes);
+ name = "trash spawner"
},
-/turf/simulated/floor/carpet,
-/area/station/service/theatre)
+/obj/item/shard,
+/turf/simulated/floor/bluegrid,
+/area/station/maintenance/starboard)
"bHY" = (
-/obj/structure/table/wood,
-/obj/structure/sign/poster/random{
- pixel_x = 32
- },
-/obj/item/soap/nanotrasen,
-/turf/simulated/floor/wood,
-/area/station/service/theatre)
+/obj/machinery/computer,
+/turf/simulated/floor/bluespace,
+/area/station/maintenance/starboard)
"bIf" = (
/turf/simulated/wall,
/area/station/engineering/hardsuitstorage)
@@ -26092,21 +25609,15 @@
name = "Xenobiology Maintenance"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/effect/mapping_helpers/airlock/access/all/science/xenobio,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plating,
/area/station/science/xenobiology)
-"bIm" = (
-/obj/machinery/door/airlock/maintenance,
-/obj/effect/mapping_helpers/airlock/autoname,
-/obj/effect/mapping_helpers/airlock/access/all/science/tox,
-/turf/simulated/floor/plating,
-/area/station/maintenance/aft2)
"bIu" = (
/obj/structure/lattice,
/obj/machinery/atmospherics/pipe/simple/visible/yellow{
@@ -26158,16 +25669,15 @@
},
/area/station/telecomms/computer)
"bID" = (
-/obj/item/kirbyplants{
- icon_state = "plant-10"
- },
/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/woodsiding{
- dir = 1
- },
-/turf/simulated/floor/plasteel{
- icon_state = "bar"
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
},
+/turf/simulated/floor/wood,
/area/station/service/bar)
"bIE" = (
/obj/machinery/door/airlock/public/glass,
@@ -26185,16 +25695,6 @@
icon_state = "whitepurple"
},
/area/station/science/research)
-"bIL" = (
-/obj/structure/chair/stool/bar,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/woodsiding{
- dir = 5
- },
-/turf/simulated/floor/plasteel{
- icon_state = "bar"
- },
-/area/station/service/bar)
"bIO" = (
/obj/effect/turf_decal/stripes/corner{
dir = 4
@@ -26666,73 +26166,29 @@
},
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/central)
-"bJH" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on,
-/turf/simulated/floor/plasteel{
- icon_state = "bar"
- },
-/area/station/service/bar)
-"bJI" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/landmark/start/botanist,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 10
+"bJM" = (
+/obj/machinery/light,
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 1
},
-/turf/simulated/floor/plasteel,
-/area/station/service/hydroponics)
-"bJJ" = (
-/obj/effect/landmark/start/bartender,
/turf/simulated/floor/plasteel{
icon_state = "bar"
},
/area/station/service/bar)
-"bJM" = (
-/obj/machinery/computer/security/telescreen/entertainment{
- pixel_x = 32;
- pixel_y = -28
- },
-/obj/structure/chair/stool/bar,
-/obj/effect/turf_decal/woodsiding{
- dir = 1
+"bJO" = (
+/obj/machinery/chem_master/condimaster{
+ name = "HoochMaster Deluxe"
},
/turf/simulated/floor/plasteel{
icon_state = "bar"
},
/area/station/service/bar)
-"bJN" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
- },
-/turf/simulated/floor/wood,
-/area/station/service/theatre)
-"bJO" = (
-/obj/structure/chair/wood/wings{
- dir = 8
- },
-/turf/simulated/floor/wood,
-/area/station/service/theatre)
"bJP" = (
-/obj/structure/table/wood,
-/obj/machinery/light/small,
-/obj/structure/sign/poster/random{
- pixel_y = -32
- },
-/obj/item/instrument/violin,
-/obj/item/clothing/glasses/regular/hipster{
- name = "Hipster Glasses"
- },
-/obj/item/radio/intercom{
- name = "east bump";
- pixel_x = 28
+/obj/machinery/atmospherics/pipe/simple/hidden{
+ dir = 10
},
-/turf/simulated/floor/wood,
-/area/station/service/theatre)
+/turf/simulated/floor/bluegrid,
+/area/station/maintenance/starboard)
"bJR" = (
/obj/machinery/firealarm{
dir = 4;
@@ -27147,49 +26603,22 @@
icon_state = "redcorner"
},
/area/station/security/brig)
-"bLv" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
- dir = 8
- },
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 8;
- icon_state = "1-8"
- },
-/turf/simulated/floor/carpet,
-/area/station/service/theatre)
-"bLw" = (
-/obj/structure/table,
-/obj/item/reagent_containers/glass/rag,
-/turf/simulated/floor/plasteel{
- icon_state = "bar"
- },
-/area/station/service/bar)
-"bLx" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/plasteel{
- icon_state = "bar"
- },
-/area/station/service/bar)
"bLA" = (
-/obj/machinery/light{
- dir = 4
+/obj/structure/table/reinforced,
+/obj/machinery/door/window/classic/reversed{
+ name = "Kitchen"
},
-/obj/machinery/light_switch{
- dir = 8;
- name = "east bump";
- pixel_x = 24
+/obj/effect/mapping_helpers/airlock/autoname,
+/obj/machinery/door/firedoor,
+/obj/machinery/door/poddoor/shutters/preopen{
+ dir = 2;
+ id_tag = "kitchen_counter";
+ name = "Kitchen Counter Shutters"
},
-/turf/simulated/floor/plasteel{
- icon_state = "bar"
+/obj/effect/mapping_helpers/airlock/windoor/access/all/service/kitchen,
+/obj/structure/window/reinforced{
+ dir = 4
},
-/area/station/service/bar)
-"bLB" = (
-/obj/machinery/door/airlock,
-/obj/machinery/door/firedoor,
-/obj/effect/mapping_helpers/airlock/autoname,
-/obj/effect/mapping_helpers/airlock/access/all/service/kitchen,
-/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
icon_state = "cafeteria"
},
@@ -27225,9 +26654,18 @@
},
/area/station/medical/surgery/primary)
"bLI" = (
-/obj/structure/chair/wood/wings,
-/turf/simulated/floor/carpet,
-/area/station/service/theatre)
+/obj/structure/table,
+/obj/machinery/chem_dispenser/soda{
+ dir = 8
+ },
+/obj/item/radio/intercom{
+ name = "east bump";
+ pixel_x = 28
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "bar"
+ },
+/area/station/service/bar)
"bLK" = (
/obj/structure/closet/crate,
/obj/item/poster/random_official,
@@ -27269,6 +26707,22 @@
icon_state = "neutralcorner"
},
/area/station/hallway/secondary/bridge)
+"bMg" = (
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 4
+ },
+/obj/machinery/alarm{
+ name = "north bump";
+ pixel_y = 24
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel,
+/area/station/science/toxins/mixing)
"bMj" = (
/obj/structure/lattice,
/obj/machinery/atmospherics/pipe/simple/visible/green{
@@ -27364,11 +26818,8 @@
/turf/simulated/floor/carpet,
/area/station/public/vacant_office)
"bME" = (
-/obj/effect/landmark/damageturf,
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/turf/simulated/floor/plating,
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plasteel,
/area/station/maintenance/asmaint)
"bMF" = (
/obj/item/radio/intercom{
@@ -27614,90 +27065,32 @@
},
/area/station/medical/cryo)
"bNA" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plating,
-/area/station/maintenance/starboard)
+/obj/machinery/atmospherics/unary/vent_pump/on,
+/turf/simulated/floor/plasteel,
+/area/station/service/hydroponics)
"bNB" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
+/obj/machinery/hydroponics/soil,
+/obj/machinery/firealarm{
+ dir = 8;
+ name = "west bump";
+ pixel_x = -24
},
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel,
-/area/station/maintenance/starboard)
+/turf/simulated/floor/grass,
+/area/station/service/hydroponics)
"bNC" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 10
- },
-/obj/structure/cable/yellow{
- d1 = 2;
- d2 = 8;
- icon_state = "2-8"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 10
- },
-/turf/simulated/floor/plasteel,
-/area/station/maintenance/starboard)
-"bND" = (
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/turf/simulated/floor/plasteel,
-/area/station/maintenance/starboard)
-"bNE" = (
-/obj/machinery/disposal,
-/obj/structure/disposalpipe/trunk{
- dir = 8
- },
-/obj/effect/turf_decal/delivery/hollow,
-/turf/simulated/floor/wood,
-/area/station/service/theatre)
-"bNF" = (
-/obj/effect/spawner/lootdrop{
- loot = list(/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes);
- name = "trash spawner"
- },
-/obj/machinery/light/small{
- dir = 8
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "greenblue"
},
-/turf/simulated/floor/plasteel,
-/area/station/maintenance/starboard)
+/area/station/service/hydroponics)
"bNG" = (
-/obj/machinery/hydroponics/soil,
-/obj/item/seeds/eggplant,
-/turf/simulated/floor/grass/no_creep,
+/obj/machinery/atmospherics/pipe/simple/hidden,
+/obj/item/stack/sheet/cardboard{
+ amount = 2
+ },
+/turf/simulated/floor/plating,
/area/station/maintenance/asmaint)
"bNH" = (
/obj/machinery/light{
@@ -27719,24 +27112,17 @@
},
/area/station/engineering/solar/starboard)
"bNK" = (
-/obj/structure/sign/poster/official/random{
- pixel_y = -32
- },
-/obj/structure/table/glass,
-/obj/item/reagent_containers/spray/plantbgone{
- pixel_x = 2;
- pixel_y = 6
- },
-/obj/item/reagent_containers/spray/plantbgone{
- pixel_x = 7;
- pixel_y = 3
- },
-/obj/item/reagent_containers/spray/plantbgone{
- pixel_x = -6;
- pixel_y = 1
+/obj/structure/closet/crate/hydroponics/prespawned,
+/obj/item/shovel/spade,
+/obj/item/wrench,
+/obj/item/reagent_containers/glass/bucket,
+/obj/item/cultivator,
+/obj/item/wirecutters,
+/obj/machinery/alarm{
+ dir = 1;
+ name = "south bump";
+ pixel_y = -24
},
-/obj/item/watertank,
-/obj/item/grenade/chem_grenade/antiweed,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -27954,18 +27340,12 @@
/turf/simulated/floor/plating,
/area/station/hallway/secondary/entry)
"bOy" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/effect/landmark/start/chef,
-/obj/effect/turf_decal/tile/bar{
- dir = 1
+/obj/machinery/atmospherics/unary/vent_scrubber/on,
+/obj/structure/sink/kitchen{
+ pixel_y = 25
},
/turf/simulated/floor/plasteel{
- icon_state = "whitecorner"
+ icon_state = "showroomfloor"
},
/area/station/service/kitchen)
"bOz" = (
@@ -28150,16 +27530,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel,
/area/station/maintenance/spacehut)
-"bPa" = (
-/obj/structure/table,
-/obj/machinery/chem_dispenser/soda{
- dir = 1;
- pixel_y = 6
- },
-/turf/simulated/floor/plasteel{
- icon_state = "bar"
- },
-/area/station/service/bar)
"bPb" = (
/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
dir = 4
@@ -28188,44 +27558,42 @@
icon_state = "neutral"
},
/area/station/hallway/secondary/garden)
-"bPd" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/plasteel{
- icon_state = "cafeteria"
- },
-/area/station/service/kitchen)
"bPe" = (
-/obj/structure/table,
-/obj/machinery/light{
+/obj/machinery/navbeacon{
+ codes_txt = "delivery";
+ dir = 8;
+ location = "Kitchen"
+ },
+/obj/structure/plasticflaps{
+ opacity = 1
+ },
+/obj/machinery/door/window/classic/normal{
+ name = "Kitchen Delivery";
dir = 4
},
-/obj/effect/turf_decal/tile/bar,
-/obj/item/eftpos/register{
- dir = 8
+/obj/effect/mapping_helpers/airlock/windoor/access/any/supply/mule_bot{
+ dir = 4
+ },
+/obj/effect/mapping_helpers/airlock/windoor/access/any/service/kitchen{
+ dir = 4
},
/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "whitecorner"
+ icon_state = "bot"
},
/area/station/service/kitchen)
"bPg" = (
-/obj/structure/sign/poster/contraband/random{
- pixel_x = -32
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light/small{
+ dir = 1
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 5
+/turf/simulated/floor/plasteel{
+ icon_state = "showroomfloor"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/wood,
-/area/station/service/theatre)
+/area/station/maintenance/starboard)
"bPh" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
- dir = 8
- },
-/turf/simulated/floor/wood,
-/area/station/service/theatre)
+/obj/structure/kitchenspike,
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard)
"bPi" = (
/obj/structure/extinguisher_cabinet{
name = "west bump";
@@ -28252,35 +27620,15 @@
},
/area/station/ai_monitored/storage/eva)
"bPj" = (
-/obj/effect/landmark/spawner/xeno,
-/obj/machinery/atmospherics/pipe/manifold/visible/cyan,
-/obj/machinery/atmospherics/meter,
+/obj/item/wrench,
/turf/simulated/floor/plating,
-/area/station/maintenance/starboard)
+/area/station/maintenance/starboard2)
"bPl" = (
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/turf/simulated/floor/plating,
-/area/station/maintenance/asmaint)
-"bPm" = (
-/obj/item/radio/intercom{
- name = "south bump";
- pixel_y = -28
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
},
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "whitepurple"
- },
-/area/station/science/research)
+/turf/simulated/floor/engine,
+/area/station/maintenance/asmaint)
"bPn" = (
/obj/machinery/light{
dir = 1
@@ -28348,15 +27696,6 @@
/obj/item/hand_tele,
/turf/simulated/floor/plasteel,
/area/station/command/teleporter)
-"bPy" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
- dir = 8
- },
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/plasteel{
- icon_state = "white"
- },
-/area/station/science/research)
"bPB" = (
/obj/structure/table/wood,
/obj/item/reagent_containers/food/drinks/cans/ale,
@@ -28366,18 +27705,19 @@
/turf/simulated/floor/engine/n20,
/area/station/engineering/atmos)
"bPI" = (
-/obj/machinery/light/small{
- dir = 8
- },
-/obj/effect/landmark/spawner/nukedisc_respawn,
+/obj/structure/barricade/wooden,
+/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint)
"bPO" = (
-/obj/machinery/smartfridge/foodcart,
-/turf/simulated/floor/plasteel{
- icon_state = "showroomfloor"
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
},
-/area/station/service/kitchen)
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/turf/simulated/floor/grass,
+/area/station/service/hydroponics)
"bPP" = (
/obj/machinery/light/small,
/obj/machinery/atmospherics/unary/vent_scrubber/on{
@@ -28609,14 +27949,18 @@
},
/area/station/service/expedition)
"bQC" = (
-/obj/structure/sign/monkey_paint{
- pixel_y = -28
+/obj/structure/table,
+/obj/machinery/kitchen_machine/microwave,
+/obj/machinery/requests_console{
+ department = "Kitchen";
+ departmentType = 2;
+ name = "Kitchen Requests Console";
+ pixel_x = -30
},
-/obj/machinery/economy/vending/boozeomat,
/turf/simulated/floor/plasteel{
- icon_state = "bar"
+ icon_state = "cafeteria"
},
-/area/station/service/bar)
+/area/station/service/kitchen)
"bQD" = (
/obj/structure/table,
/obj/item/storage/firstaid/regular,
@@ -28625,14 +27969,6 @@
icon_state = "dark"
},
/area/station/service/expedition)
-"bQE" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel{
- icon_state = "bar"
- },
-/area/station/service/bar)
"bQF" = (
/obj/machinery/door/firedoor,
/turf/simulated/floor/plasteel{
@@ -28662,48 +27998,12 @@
icon_state = "cafeteria"
},
/area/station/service/kitchen)
-"bQM" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/disposalpipe/segment,
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel{
- icon_state = "cafeteria"
- },
-/area/station/service/kitchen)
-"bQO" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
- },
-/turf/simulated/floor/plasteel{
- icon_state = "cafeteria"
- },
-/area/station/service/kitchen)
-"bQP" = (
-/obj/structure/table,
-/obj/item/reagent_containers/food/snacks/mint,
-/obj/item/kitchen/rollingpin,
-/obj/item/reagent_containers/glass/beaker{
- pixel_x = 5
- },
-/obj/item/reagent_containers/food/condiment/enzyme,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- icon_state = "cafeteria"
- },
-/area/station/service/kitchen)
"bQQ" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
+/obj/machinery/light/small{
+ dir = 8
},
-/obj/machinery/kitchen_machine/oven,
/turf/simulated/floor/plasteel{
- icon_state = "cafeteria"
+ icon_state = "showroomfloor"
},
/area/station/service/kitchen)
"bQR" = (
@@ -28728,37 +28028,16 @@
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/starboard)
"bQS" = (
-/obj/machinery/cooker/deepfryer,
-/obj/structure/extinguisher_cabinet{
- name = "south bump";
- pixel_y = -30
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/delivery/hollow,
/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "whitecorner"
+ icon_state = "showroomfloor"
},
/area/station/service/kitchen)
"bQT" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/delivery/hollow,
-/obj/machinery/kitchen_machine/candy_maker,
-/obj/machinery/light_switch{
- dir = 1;
- name = "custom placement";
- pixel_x = 6;
- pixel_y = -24
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 1
},
/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "whitecorner"
+ icon_state = "showroomfloor"
},
/area/station/service/kitchen)
"bQV" = (
@@ -29147,13 +28426,9 @@
/turf/simulated/floor/plasteel,
/area/station/ai_monitored/storage/eva)
"bSj" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/effect/turf_decal/tile/bar,
+/obj/effect/landmark/spawner/xeno,
/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "whitecorner"
+ icon_state = "showroomfloor"
},
/area/station/service/kitchen)
"bSk" = (
@@ -29192,6 +28467,9 @@
pixel_x = 7;
pixel_y = 4
},
+/obj/machinery/camera{
+ c_tag = "Hydroponics - Foyer"
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -29217,41 +28495,12 @@
},
/area/station/hallway/secondary/bridge)
"bSt" = (
-/obj/structure/table/wood,
-/obj/item/stack/packageWrap{
- pixel_x = 2;
- pixel_y = -3
- },
-/obj/item/stack/packageWrap,
-/obj/item/stack/packageWrap{
- pixel_x = -3;
- pixel_y = 5
- },
-/obj/item/gun/projectile/revolver/doublebarrel{
- pixel_x = 6;
- pixel_y = 5
- },
-/obj/machinery/alarm{
- dir = 1;
- name = "south bump";
- pixel_y = -24
- },
-/obj/item/eftpos,
-/obj/machinery/firealarm{
- dir = 8;
- name = "west bump";
- pixel_x = -24
- },
-/turf/simulated/floor/wood,
-/area/station/service/bar)
-"bSv" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on,
-/obj/structure/extinguisher_cabinet{
- name = "north bump";
- pixel_y = 30
+/obj/machinery/light,
+/obj/machinery/economy/vending/chefdrobe,
+/turf/simulated/floor/plasteel{
+ icon_state = "cafeteria"
},
-/turf/simulated/floor/wood,
-/area/station/service/bar)
+/area/station/service/kitchen)
"bSw" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable{
@@ -29272,37 +28521,20 @@
/turf/space,
/area/station/engineering/solar/port)
"bSx" = (
-/obj/machinery/economy/vending/dinnerware,
-/obj/structure/cable/yellow{
- d2 = 4;
- icon_state = "0-4"
- },
-/obj/effect/turf_decal/tile/bar{
- dir = 1
+/obj/machinery/kitchen_machine/candy_maker,
+/obj/machinery/light_switch{
+ dir = 1;
+ name = "custom placement";
+ pixel_x = 6;
+ pixel_y = -24
},
-/obj/effect/turf_decal/delivery/hollow,
-/obj/machinery/power/apc{
- dir = 8;
- name = "west bump";
- pixel_x = -24
+/obj/structure/disposalpipe/segment{
+ dir = 4
},
/turf/simulated/floor/plasteel{
- icon_state = "whitecorner"
+ icon_state = "cafeteria"
},
/area/station/service/kitchen)
-"bSy" = (
-/obj/structure/closet/crate,
-/obj/item/storage/box/drinkingglasses,
-/obj/item/storage/box/donkpockets,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/tile/bar{
- dir = 1
- },
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "neutralcorner"
- },
-/area/station/maintenance/starboard)
"bSz" = (
/obj/machinery/light_switch{
dir = 8;
@@ -29322,14 +28554,19 @@
},
/area/station/service/library)
"bSB" = (
-/obj/structure/table/wood,
-/obj/item/clothing/mask/pig,
-/obj/machinery/camera{
- c_tag = "Theatre - Backstage";
- dir = 1
+/obj/structure/table,
+/obj/item/clipboard{
+ pixel_x = 4
},
-/turf/simulated/floor/wood,
-/area/station/service/theatre)
+/obj/item/folder/yellow{
+ pixel_x = 4;
+ pixel_y = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plasteel{
+ icon_state = "showroomfloor"
+ },
+/area/station/maintenance/starboard)
"bSD" = (
/obj/machinery/economy/vending/medical,
/turf/simulated/floor/plasteel{
@@ -29346,13 +28583,19 @@
/turf/simulated/floor/carpet,
/area/station/service/library)
"bSG" = (
-/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/machinery/atmospherics/portable/pump,
+/obj/effect/turf_decal/delivery/white/hollow,
+/obj/effect/spawner/random_spawners/cobweb_right_rare,
+/obj/machinery/light/small{
+ dir = 1
+ },
/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
"bSI" = (
-/obj/item/stack/sheet/glass,
-/turf/simulated/floor/plating,
+/obj/structure/bookcase{
+ name = "bookcase (Non-Fiction)"
+ },
+/turf/simulated/floor/wood,
/area/station/maintenance/starboard)
"bSJ" = (
/obj/machinery/atmospherics/unary/portables_connector{
@@ -29387,6 +28630,9 @@
dir = 4
},
/obj/effect/landmark/start/atmospheric,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/station/engineering/atmos/control)
"bSU" = (
@@ -29429,18 +28675,16 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/port)
-"bTc" = (
-/obj/machinery/atmospherics/unary/portables_connector{
- dir = 1
- },
-/turf/simulated/floor/plating,
-/area/station/maintenance/starboard)
"bTd" = (
-/obj/structure/chair/wood/wings{
- dir = 1
+/obj/machinery/light_switch{
+ dir = 8;
+ name = "east bump";
+ pixel_x = 24
},
-/turf/simulated/floor/carpet,
-/area/station/service/theatre)
+/turf/simulated/floor/plasteel{
+ icon_state = "bar"
+ },
+/area/station/service/bar)
"bTe" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/medical{
@@ -29646,14 +28890,20 @@
},
/area/station/hallway/primary/central)
"bTD" = (
-/obj/structure/closet/secure_closet/bar{
- req_access_txt = "25"
+/obj/machinery/economy/vending/dinnerware,
+/obj/structure/cable/yellow{
+ d2 = 4;
+ icon_state = "0-4"
},
-/obj/machinery/light/small{
- dir = 8
+/obj/machinery/power/apc{
+ dir = 8;
+ name = "west bump";
+ pixel_x = -24
},
-/turf/simulated/floor/wood,
-/area/station/service/bar)
+/turf/simulated/floor/plasteel{
+ icon_state = "cafeteria"
+ },
+/area/station/service/kitchen)
"bTE" = (
/obj/structure/chair,
/turf/simulated/floor/carpet/royalblack,
@@ -29717,23 +28967,14 @@
/turf/simulated/floor/carpet,
/area/station/science/robotics/showroom)
"bTP" = (
-/obj/structure/table/wood,
-/obj/structure/sign/poster/contraband/random{
- pixel_x = -32
- },
-/obj/machinery/alarm{
- dir = 1;
- name = "south bump";
- pixel_y = -24
- },
-/obj/item/clothing/mask/horsehead,
-/obj/item/clothing/mask/cigarette/pipe,
-/obj/machinery/light/small{
- dir = 8
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/table,
+/obj/item/paper_bin,
+/obj/item/pen,
+/turf/simulated/floor/plasteel{
+ icon_state = "showroomfloor"
},
-/obj/item/clothing/mask/fakemoustache,
-/turf/simulated/floor/wood,
-/area/station/service/theatre)
+/area/station/maintenance/starboard)
"bTR" = (
/obj/structure/chair,
/obj/machinery/firealarm{
@@ -29807,52 +29048,6 @@
icon_state = "cafeteria"
},
/area/station/service/kitchen)
-"bUe" = (
-/obj/machinery/light,
-/obj/machinery/economy/vending/chefdrobe,
-/obj/effect/turf_decal/delivery/hollow,
-/turf/simulated/floor/plasteel{
- icon_state = "bar"
- },
-/area/station/service/kitchen)
-"bUf" = (
-/obj/machinery/door_control{
- id = "kitchen_service";
- name = "Service Shutter Control";
- pixel_x = -24;
- pixel_y = -24;
- req_access_txt = "28"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/tile/bar,
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "whitecorner"
- },
-/area/station/service/kitchen)
-"bUh" = (
-/obj/machinery/newscaster{
- dir = 1;
- name = "south bump";
- pixel_y = -28
- },
-/obj/machinery/chem_master/condimaster{
- name = "CondiMaster Neo"
- },
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/delivery/hollow,
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "whitecorner"
- },
-/area/station/service/kitchen)
"bUi" = (
/obj/machinery/gibber,
/turf/simulated/floor/plasteel{
@@ -29860,36 +29055,22 @@
},
/area/station/service/kitchen)
"bUj" = (
-/obj/machinery/camera{
- c_tag = "Kitchen Freezer";
- dir = 4
- },
-/obj/machinery/light/small{
- dir = 8
- },
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- icon_state = "showroomfloor"
- },
-/area/station/service/kitchen)
-"bUk" = (
-/mob/living/simple_animal/hostile/retaliate/goat/chef,
-/obj/structure/sink/kitchen{
- dir = 8;
- pixel_x = 12
+/obj/machinery/hydroponics/soil,
+/obj/machinery/alarm{
+ name = "north bump";
+ pixel_y = 24
},
+/turf/simulated/floor/grass,
+/area/station/service/hydroponics)
+"bUl" = (
+/obj/structure/closet/crate/freezer,
+/obj/item/reagent_containers/food/condiment/enzyme,
+/obj/item/reagent_containers/food/condiment/enzyme,
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
+/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
icon_state = "showroomfloor"
},
-/area/station/service/kitchen)
-"bUl" = (
-/turf/simulated/floor/wood,
-/area/station/service/theatre)
-"bUr" = (
-/obj/machinery/atmospherics/unary/portables_connector,
-/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
"bUu" = (
/obj/effect/spawner/window/reinforced,
@@ -29909,7 +29090,13 @@
/turf/simulated/floor/plating/airless,
/area/station/engineering/solar/auxstarboard)
"bUy" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 8
},
/turf/simulated/floor/plasteel{
@@ -29917,8 +29104,10 @@
},
/area/station/science/research)
"bUz" = (
-/obj/effect/landmark/spawner/xeno,
-/turf/simulated/floor/plating,
+/obj/machinery/atmospherics/unary/vent_pump/on,
+/turf/simulated/floor/wood{
+ icon_state = "wood-broken4"
+ },
/area/station/maintenance/starboard2)
"bUA" = (
/obj/item/apc_electronics,
@@ -29945,6 +29134,15 @@
/obj/structure/table/wood,
/turf/simulated/floor/carpet,
/area/station/public/vacant_office)
+"bUG" = (
+/obj/structure/rack,
+/obj/effect/spawner/lootdrop/maintenance,
+/obj/machinery/atmospherics/pipe/simple/hidden,
+/obj/machinery/light/small{
+ dir = 8
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/asmaint)
"bUI" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/glass{
@@ -30166,37 +29364,16 @@
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
"bVj" = (
-/obj/machinery/shower{
- dir = 8
- },
-/obj/effect/turf_decal/siding{
- dir = 10
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 10
- },
-/obj/effect/turf_decal/siding{
- dir = 10
+/obj/machinery/light{
+ dir = 4
},
-/obj/item/radio/intercom{
- name = "east bump";
- pixel_x = 28
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 8
},
/turf/simulated/floor/plasteel{
- icon_state = "darkgreycheck"
+ icon_state = "white"
},
/area/station/science/research)
-"bVk" = (
-/obj/machinery/light/small{
- dir = 1
- },
-/obj/effect/landmark/damageturf,
-/turf/simulated/floor/plating,
-/area/station/maintenance/aft2)
-"bVl" = (
-/obj/effect/turf_decal/tile/bar,
-/turf/simulated/floor/plasteel,
-/area/station/hallway/primary/central)
"bVm" = (
/obj/machinery/computer/secure_data{
dir = 8
@@ -30220,103 +29397,73 @@
icon_state = "neutralcorner"
},
/area/station/hallway/primary/central)
-"bVp" = (
-/obj/structure/table,
-/obj/item/radio/intercom{
- name = "south bump";
- pixel_y = -28
- },
-/obj/machinery/reagentgrinder{
- pixel_x = 6;
- pixel_y = 6
- },
-/obj/effect/turf_decal/tile/bar,
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "whitecorner"
- },
-/area/station/service/kitchen)
"bVs" = (
-/obj/effect/landmark/start/bartender,
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/wood,
-/area/station/service/bar)
-"bVy" = (
-/obj/structure/table,
-/obj/machinery/chem_dispenser/beer{
- dir = 1;
- pixel_y = 6
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
- icon_state = "bar"
+ icon_state = "cafeteria"
},
-/area/station/service/bar)
+/area/station/service/kitchen)
"bVA" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel{
- icon_state = "showroomfloor"
+/obj/machinery/hydroponics/soil,
+/obj/machinery/light{
+ dir = 1
},
-/area/station/service/kitchen)
+/turf/simulated/floor/grass,
+/area/station/service/hydroponics)
"bVB" = (
-/obj/machinery/firealarm{
- name = "north bump";
- pixel_y = 24
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- icon_state = "showroomfloor"
- },
-/area/station/service/kitchen)
-"bVC" = (
-/obj/effect/turf_decal/stripes/white/line{
- dir = 8
- },
-/obj/item/radio/intercom{
- name = "south bump";
- pixel_y = -28
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel,
-/area/station/science/toxins/mixing)
-"bVD" = (
-/obj/machinery/alarm{
- name = "north bump";
- pixel_y = 24
+/obj/machinery/camera{
+ c_tag = "Hydroponics Pasture"
},
+/obj/effect/turf_decal/delivery,
/turf/simulated/floor/plasteel{
- icon_state = "showroomfloor"
+ icon_state = "darkgreenfull"
},
-/area/station/service/kitchen)
+/area/station/service/hydroponics)
"bVF" = (
/obj/effect/turf_decal/stripes/line,
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
"bVG" = (
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/spawner/random_spawners/oil_maybe,
/turf/simulated/floor/plating,
/area/station/maintenance/starboard2)
"bVL" = (
-/obj/machinery/atmospherics/unary/portables_connector{
- dir = 4
+/obj/item/book/manual/random,
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 10
},
-/turf/simulated/floor/plating,
+/obj/structure/cable/yellow{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
+/turf/simulated/floor/wood,
/area/station/maintenance/starboard)
"bVM" = (
-/obj/machinery/atmospherics/trinary/filter{
- req_access = "0"
+/obj/machinery/power/apc{
+ dir = 4;
+ name = "east bump";
+ pixel_x = 24
+ },
+/obj/structure/cable/yellow{
+ d2 = 8;
+ icon_state = "0-8"
+ },
+/turf/simulated/floor/wood{
+ icon_state = "wood-broken6"
},
-/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
"bVN" = (
/obj/machinery/atmospherics/unary/portables_connector{
@@ -30384,11 +29531,6 @@
/area/station/maintenance/fsmaint)
"bVZ" = (
/obj/effect/landmark/start/scientist,
-/obj/structure/cable/yellow{
- d1 = 2;
- d2 = 4;
- icon_state = "2-4"
- },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "whitepurple"
@@ -30749,15 +29891,6 @@
/obj/structure/disposalpipe/trunk,
/turf/simulated/floor/wood,
/area/station/command/office/blueshield)
-"bWT" = (
-/obj/item/cigbutt,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/turf/simulated/floor/plasteel,
-/area/station/maintenance/starboard)
"bWV" = (
/obj/structure/cable/yellow{
d2 = 4;
@@ -30838,73 +29971,56 @@
/turf/simulated/floor/plating,
/area/station/maintenance/maintcentral)
"bXb" = (
-/obj/effect/mapping_helpers/airlock/autoname,
-/obj/machinery/door/airlock/maintenance,
-/obj/effect/mapping_helpers/airlock/access/all/service/kitchen,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel{
- icon_state = "cafeteria"
+/obj/machinery/plantgenes,
+/obj/effect/turf_decal/stripes/line,
+/obj/structure/extinguisher_cabinet{
+ name = "north bump";
+ pixel_y = 30
},
-/area/station/maintenance/starboard)
+/turf/simulated/floor/plasteel,
+/area/station/service/hydroponics)
"bXi" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/obj/effect/decal/cleanable/insectguts,
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "whitepurple"
},
/area/station/science/research)
-"bXk" = (
-/obj/structure/table,
-/obj/machinery/light/small{
- dir = 1
- },
-/obj/item/paper_bin{
- pixel_x = -2;
- pixel_y = 2
- },
-/obj/item/pen{
- pixel_x = -3;
- pixel_y = 5
- },
-/obj/effect/turf_decal/tile/bar{
- dir = 1
- },
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "neutralcorner"
- },
-/area/station/maintenance/starboard)
"bXl" = (
-/obj/structure/table,
-/obj/item/reagent_containers/glass/rag,
-/obj/item/kitchen/rollingpin,
-/obj/effect/turf_decal/tile/bar{
- dir = 1
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 6
},
/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "neutralcorner"
+ dir = 5;
+ icon_state = "greenblue"
},
-/area/station/maintenance/starboard)
+/area/station/service/hydroponics)
"bXn" = (
-/obj/structure/closet/secure_closet/freezer/meat,
-/turf/simulated/floor/plasteel{
- icon_state = "showroomfloor"
+/obj/structure/flora/ausbushes/ywflowers,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
},
-/area/station/service/kitchen)
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/turf/simulated/floor/grass,
+/area/station/service/hydroponics)
"bXo" = (
/obj/machinery/icemachine,
/turf/simulated/floor/plasteel{
@@ -30912,30 +30028,31 @@
},
/area/station/service/kitchen)
"bXq" = (
-/obj/machinery/atmospherics/unary/vent_pump/on{
- dir = 1
+/obj/machinery/navbeacon{
+ codes_txt = "delivery";
+ dir = 1;
+ location = "Hydroponics"
},
-/obj/structure/kitchenspike,
-/turf/simulated/floor/plasteel{
- icon_state = "showroomfloor"
+/obj/machinery/door/window/classic/reversed{
+ dir = 4;
+ name = "Botany Delivery"
},
-/area/station/service/kitchen)
-"bXr" = (
-/obj/item/radio/intercom{
- name = "east bump";
- pixel_x = 28
+/obj/effect/mapping_helpers/airlock/windoor/access/any/supply/mule_bot{
+ dir = 4
},
-/obj/structure/kitchenspike,
-/turf/simulated/floor/plasteel{
- icon_state = "showroomfloor"
+/obj/effect/mapping_helpers/airlock/windoor/access/any/service/hydroponics{
+ dir = 4
},
-/area/station/service/kitchen)
+/obj/structure/plasticflaps{
+ opacity = 1
+ },
+/turf/simulated/floor/plasteel,
+/area/station/service/hydroponics)
"bXt" = (
-/obj/machinery/atmospherics/unary/portables_connector{
- dir = 1
+/obj/structure/bookcase{
+ name = "bookcase (Fiction)"
},
-/obj/machinery/atmospherics/portable/canister,
-/turf/simulated/floor/plating,
+/turf/simulated/floor/wood,
/area/station/maintenance/starboard)
"bXu" = (
/obj/machinery/door/firedoor,
@@ -30992,11 +30109,12 @@
/turf/simulated/floor/engine/plasma,
/area/station/engineering/atmos)
"bXC" = (
-/obj/machinery/atmospherics/binary/valve{
- dir = 4
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light{
+ dir = 1
},
-/turf/simulated/floor/plating,
-/area/station/maintenance/starboard)
+/turf/simulated/floor/plasteel,
+/area/station/maintenance/starboard2)
"bXD" = (
/obj/machinery/status_display/supply_display{
pixel_y = -32
@@ -31151,25 +30269,6 @@
},
/turf/simulated/floor/carpet/royalblack,
/area/station/command/office/ntrep)
-"bXX" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/obj/effect/turf_decal/tile/bar{
- dir = 1
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "neutralcorner"
- },
-/area/station/maintenance/starboard)
"bXY" = (
/obj/structure/table/wood,
/obj/item/ashtray/glass{
@@ -31259,7 +30358,7 @@
/area/station/science/robotics/showroom)
"bYg" = (
/obj/structure/table/wood,
-/obj/item/storage/box/matches{
+/obj/item/storage/fancy/matches{
pixel_x = -2;
pixel_y = 3
},
@@ -31372,14 +30471,6 @@
icon_state = "neutralcorner"
},
/area/station/hallway/primary/central)
-"bYs" = (
-/obj/machinery/door/airlock/maintenance,
-/obj/effect/mapping_helpers/airlock/autoname,
-/obj/effect/mapping_helpers/airlock/access/all/service/bar,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/wood,
-/area/station/maintenance/starboard)
"bYv" = (
/obj/machinery/photocopier,
/obj/machinery/computer/security/telescreen/entertainment{
@@ -31415,24 +30506,26 @@
/turf/simulated/floor/plasteel,
/area/station/service/hydroponics)
"bYB" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
+/obj/machinery/disposal,
+/obj/structure/disposalpipe/trunk{
dir = 8
},
+/obj/machinery/alarm{
+ dir = 1;
+ name = "south bump";
+ pixel_y = -24
+ },
/turf/simulated/floor/plasteel{
icon_state = "cafeteria"
},
/area/station/service/kitchen)
"bYC" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 9
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 9
- },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
/obj/structure/cable/yellow{
d1 = 1;
- d2 = 8;
- icon_state = "1-8"
+ d2 = 2;
+ icon_state = "1-2"
},
/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
@@ -31442,24 +30535,6 @@
/obj/item/bodybag,
/turf/simulated/floor/plating,
/area/station/maintenance/medmaint)
-"bYE" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel,
-/area/station/maintenance/starboard)
"bYJ" = (
/obj/structure/table/wood,
/obj/item/storage/secure/briefcase{
@@ -31541,61 +30616,18 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/port)
-"bYX" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/closet/emcloset,
-/turf/simulated/floor/plasteel{
- icon_state = "purplefull"
- },
-/area/station/hallway/primary/aft)
"bYZ" = (
/obj/machinery/photocopier{
pixel_y = 3
},
/turf/simulated/floor/carpet,
/area/station/command/office/hop)
-"bZb" = (
-/obj/machinery/door/airlock/maintenance,
-/obj/effect/mapping_helpers/airlock/autoname,
-/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel,
-/area/station/maintenance/starboard)
"bZc" = (
/obj/structure/chair/office/dark{
dir = 4
},
/turf/simulated/floor/wood,
/area/station/service/library)
-"bZd" = (
-/obj/structure/sign/poster/random{
- pixel_y = -32
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel,
-/area/station/maintenance/starboard)
"bZe" = (
/obj/item/deck/cards,
/obj/structure/table/wood,
@@ -31644,23 +30676,6 @@
icon_state = "redcorner"
},
/area/station/hallway/primary/central)
-"bZj" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel{
- icon_state = "greenblue"
- },
-/area/station/maintenance/starboard)
"bZl" = (
/turf/simulated/wall/r_wall,
/area/station/command/office/blueshield)
@@ -31708,32 +30723,22 @@
},
/turf/simulated/floor/plasteel,
/area/station/ai_monitored/storage/eva)
+"bZy" = (
+/obj/machinery/atmospherics/pipe/simple/hidden{
+ dir = 4
+ },
+/obj/structure/closet/emcloset,
+/obj/effect/spawner/lootdrop/maintenance,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "whitepurple"
+ },
+/area/station/maintenance/asmaint)
"bZz" = (
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
/area/station/service/expedition)
-"bZB" = (
-/obj/structure/table/glass,
-/obj/machinery/smartfridge/disks,
-/obj/structure/sign/poster/random{
- pixel_x = 32
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/machinery/camera{
- c_tag = "Hydroponics";
- dir = 8
- },
-/turf/simulated/floor/plasteel,
-/area/station/service/hydroponics)
-"bZC" = (
-/turf/simulated/floor/plasteel{
- dir = 6;
- icon_state = "greenblue"
- },
-/area/station/service/hydroponics)
"bZD" = (
/obj/machinery/light_switch{
dir = 8;
@@ -31752,22 +30757,9 @@
},
/area/station/service/expedition)
"bZH" = (
-/obj/item/clothing/suit/storage/hazardvest,
-/turf/simulated/floor/plating,
-/area/station/maintenance/starboard)
-"bZI" = (
-/obj/machinery/atmospherics/unary/portables_connector{
- dir = 8
- },
-/turf/simulated/floor/plating,
-/area/station/maintenance/starboard)
-"bZJ" = (
-/obj/machinery/light_switch{
- name = "north bump";
- pixel_y = 24
- },
+/obj/structure/bookcase,
/turf/simulated/floor/wood,
-/area/station/service/theatre)
+/area/station/maintenance/starboard)
"bZP" = (
/turf/simulated/wall,
/area/station/maintenance/apmaint)
@@ -31919,22 +30911,6 @@
},
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/central)
-"cap" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/light/small,
-/turf/simulated/floor/plating,
-/area/station/maintenance/starboard)
"car" = (
/turf/simulated/floor/plasteel{
dir = 1;
@@ -32034,27 +31010,6 @@
icon_state = "neutralcorner"
},
/area/station/public/locker)
-"caI" = (
-/obj/structure/sign/poster/random{
- pixel_y = 32
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel,
-/area/station/maintenance/starboard)
"caJ" = (
/obj/structure/cable{
d2 = 2;
@@ -32150,11 +31105,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel,
/area/station/service/hydroponics)
-"caT" = (
-/obj/structure/closet/emcloset,
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel,
-/area/station/maintenance/starboard)
"caW" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -32192,19 +31142,6 @@
icon_state = "C11"
},
/area/station/hallway/primary/central)
-"cba" = (
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel{
- icon_state = "greenblue"
- },
-/area/station/maintenance/starboard)
"cbb" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
@@ -32217,19 +31154,16 @@
/turf/simulated/wall/r_wall,
/area/station/maintenance/fsmaint)
"cbd" = (
-/obj/structure/table/glass,
-/obj/machinery/reagentgrinder{
- pixel_y = 4
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
},
-/obj/machinery/door_control{
- id = "hydro_service";
- name = "Service Shutter Control";
- pixel_x = -24;
- pixel_y = 24;
- req_access_txt = "35"
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
},
-/obj/effect/turf_decal/stripes/line{
- dir = 6
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel,
/area/station/service/hydroponics)
@@ -32275,14 +31209,6 @@
"cbl" = (
/turf/simulated/floor/engine/co2,
/area/station/engineering/atmos)
-"cbm" = (
-/obj/effect/turf_decal/delivery,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/sign/poster/official/random{
- pixel_x = 32
- },
-/turf/simulated/floor/plasteel,
-/area/station/service/hydroponics)
"cbn" = (
/obj/machinery/chem_master{
name = "SapMaster XP"
@@ -32327,6 +31253,18 @@
/turf/simulated/floor/plating,
/area/station/maintenance/port2)
"cbt" = (
+/obj/machinery/hydroponics/constructable,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/obj/effect/turf_decal/delivery/hollow,
/turf/simulated/floor/plasteel,
/area/station/service/hydroponics)
@@ -32399,11 +31337,21 @@
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/central)
"cbD" = (
-/obj/machinery/economy/vending/hydroseeds,
-/obj/structure/noticeboard{
- pixel_y = 28
+/obj/structure/chair/office/dark{
+ dir = 8
+ },
+/obj/effect/landmark/start/botanist,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 6
+ },
+/obj/structure/cable/yellow{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
},
-/obj/effect/turf_decal/stripes/line,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "green"
@@ -32467,16 +31415,13 @@
d2 = 8;
icon_state = "2-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "green"
@@ -32487,74 +31432,13 @@
icon_state = "greenfull"
},
/area/station/hallway/primary/central)
-"cbN" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "greenblue"
- },
-/area/station/service/hydroponics)
-"cbO" = (
-/obj/structure/window/reinforced{
- dir = 4
- },
-/obj/structure/reagent_dispensers/watertank/high,
-/obj/item/reagent_containers/glass/bucket,
-/obj/effect/turf_decal/stripes/line,
-/turf/simulated/floor/plasteel,
-/area/station/service/hydroponics)
-"cbP" = (
-/obj/structure/sink{
- pixel_y = 22
- },
-/obj/effect/turf_decal/delivery/hollow,
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel{
- dir = 5;
- icon_state = "greenblue"
- },
-/area/station/service/hydroponics)
-"cbT" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/turf/simulated/floor/plasteel,
-/area/station/service/hydroponics)
-"cbW" = (
-/obj/effect/turf_decal/delivery,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/turf/simulated/floor/plasteel,
-/area/station/service/hydroponics)
"cbX" = (
-/obj/structure/closet/emcloset,
-/obj/machinery/power/apc{
- dir = 4;
- name = "east bump";
- pixel_x = 24
- },
-/obj/structure/cable/yellow{
- d2 = 2;
- icon_state = "0-2"
+/obj/structure/sign/poster/random{
+ pixel_y = 32
},
-/turf/simulated/floor/plating,
-/area/station/public/storage/emergency)
+/obj/machinery/economy/vending/bardrobe,
+/turf/simulated/floor/wood,
+/area/station/service/bar)
"cbY" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -32852,10 +31736,19 @@
},
/area/station/hallway/primary/central)
"ccZ" = (
-/obj/structure/chair/office/dark{
- dir = 8
+/obj/machinery/requests_console{
+ department = "Hydroponics";
+ departmentType = 2;
+ name = "Hydroponics Requests Console";
+ pixel_x = -32
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
},
-/obj/effect/landmark/start/botanist,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "green"
@@ -32868,22 +31761,12 @@
},
/area/station/service/hydroponics)
"cdb" = (
-/obj/machinery/hydroponics/constructable,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 5
- },
-/obj/effect/turf_decal/delivery/hollow,
-/turf/simulated/floor/plasteel,
-/area/station/service/hydroponics)
-"cde" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 1
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
+/turf/simulated/floor/plasteel{
+ icon_state = "greenblue"
},
-/obj/machinery/hologram/holopad,
-/turf/simulated/floor/plasteel,
/area/station/service/hydroponics)
"cdi" = (
/obj/structure/table/reinforced,
@@ -32923,14 +31806,12 @@
/turf/simulated/floor/plasteel,
/area/station/science/robotics)
"cdk" = (
-/obj/effect/turf_decal/delivery,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel,
/area/station/service/hydroponics)
"cdl" = (
@@ -32941,52 +31822,24 @@
},
/area/station/medical/chemistry)
"cdm" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
+/obj/structure/rack,
+/obj/item/clothing/mask/gas,
+/obj/effect/spawner/lootdrop/maintenance,
+/turf/simulated/floor/plasteel{
+ dir = 10;
+ icon_state = "caution"
},
-/obj/effect/landmark/damageturf,
-/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
"cdn" = (
/obj/structure/reagent_dispensers/watertank,
/turf/simulated/floor/plating,
/area/station/public/storage/emergency/port)
"cdp" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/structure/cable/yellow{
- d1 = 2;
- d2 = 8;
- icon_state = "2-8"
- },
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 1
- },
-/obj/structure/sign/poster/contraband/random{
- pixel_y = 32
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
},
/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
@@ -33002,15 +31855,11 @@
icon_state = "dark"
},
/area/station/medical/paramedic)
-"cdr" = (
-/obj/effect/landmark/start/botanist,
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "greenblue"
- },
-/area/station/service/hydroponics)
"cds" = (
-/obj/structure/disposalpipe/segment{
+/obj/machinery/door/airlock/maintenance,
+/obj/effect/mapping_helpers/airlock/autoname,
+/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/structure/cable/yellow{
@@ -33018,18 +31867,6 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/door/airlock/maintenance,
-/obj/effect/mapping_helpers/airlock/autoname,
-/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos,
/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
"cdw" = (
@@ -33067,9 +31904,6 @@
name = "south bump";
pixel_y = -30
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/turf/simulated/floor/plasteel{
icon_state = "neutralcorner"
},
@@ -33093,26 +31927,6 @@
/obj/item/flashlight,
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
-"cdI" = (
-/obj/machinery/firealarm{
- name = "north bump";
- pixel_y = 24
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/light{
- dir = 1
- },
-/turf/simulated/floor/plasteel{
- dir = 5;
- icon_state = "greenblue"
- },
-/area/station/service/hydroponics)
"cdJ" = (
/obj/structure/lattice,
/obj/item/reagent_containers/food/drinks/bottle/goldschlager,
@@ -33120,13 +31934,12 @@
/area/space/nearstation)
"cdM" = (
/obj/structure/window/reinforced{
- dir = 8
+ dir = 1
},
/obj/structure/window/reinforced,
/obj/structure/flora/ausbushes/palebush,
/obj/structure/flora/ausbushes/fernybush,
-/obj/structure/flora/ausbushes/fullgrass,
-/obj/structure/flora/ausbushes/brflowers,
+/obj/structure/flora/ausbushes/ppflowers,
/turf/simulated/floor/grass/no_creep,
/area/station/science/research)
"cdN" = (
@@ -33151,15 +31964,11 @@
/area/station/public/locker)
"cdQ" = (
/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
- },
/obj/machinery/door/airlock/atmos,
/obj/effect/mapping_helpers/airlock/autoname,
/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos,
/turf/simulated/floor/plasteel{
- dir = 10;
- icon_state = "caution"
+ icon_state = "cautionfull"
},
/area/station/engineering/atmos/control)
"cdT" = (
@@ -33287,10 +32096,14 @@
"cek" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/door/airlock/maintenance,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/effect/mapping_helpers/airlock/autoname,
/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plating,
/area/station/maintenance/starboard2)
"cel" = (
@@ -33318,22 +32131,20 @@
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
"cen" = (
-/obj/structure/table/glass,
-/obj/machinery/requests_console{
- department = "Hydroponics";
- departmentType = 2;
- name = "Hydroponics Requests Console";
- pixel_x = -32
+/obj/effect/turf_decal/delivery,
+/obj/structure/disposalpipe/segment{
+ dir = 4;
+ icon_state = "pipe-c"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
},
-/obj/item/stack/packageWrap,
-/obj/item/stack/packageWrap,
-/obj/item/stack/packageWrap,
-/obj/item/stack/packageWrap,
-/obj/item/stack/packageWrap,
-/obj/item/hand_labeler,
-/obj/item/book/manual/wiki/sop_service,
/turf/simulated/floor/plasteel{
- dir = 8;
+ dir = 10;
icon_state = "green"
},
/area/station/service/hydroponics)
@@ -33362,25 +32173,39 @@
/obj/structure/closet/emcloset,
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
-"cev" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "greenblue"
+"cew" = (
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 6
},
-/area/station/service/hydroponics)
+/obj/machinery/atmospherics/unary/portables_connector,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/plasteel,
+/area/station/science/toxins/mixing)
"cex" = (
-/obj/effect/turf_decal/delivery,
-/obj/structure/sink{
- dir = 8;
- pixel_x = -12;
- pixel_y = 2
- },
-/obj/structure/sign/poster/official/cleanliness{
+/obj/structure/sign/poster/official/random{
pixel_y = -32
},
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/light/small,
+/obj/structure/table/glass,
+/obj/item/reagent_containers/spray/plantbgone{
+ pixel_x = 2;
+ pixel_y = 6
+ },
+/obj/item/reagent_containers/spray/plantbgone{
+ pixel_x = 7;
+ pixel_y = 3
+ },
+/obj/item/reagent_containers/spray/plantbgone{
+ pixel_x = -6;
+ pixel_y = 1
+ },
+/obj/item/watertank,
+/obj/item/grenade/chem_grenade/antiweed,
+/obj/effect/turf_decal/stripes/line{
+ dir = 9
+ },
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 1
+ },
/turf/simulated/floor/plasteel,
/area/station/service/hydroponics)
"ceE" = (
@@ -33427,16 +32252,13 @@
},
/area/station/service/chapel/office)
"ceP" = (
-/obj/machinery/seed_extractor,
-/obj/effect/turf_decal/stripes/line{
- dir = 9
- },
-/obj/machinery/light_switch{
+/obj/effect/turf_decal/delivery,
+/obj/structure/sink{
dir = 8;
- name = "custom placement";
- pixel_x = 24;
- pixel_y = 6
+ pixel_x = -12;
+ pixel_y = 2
},
+/obj/machinery/light/small,
/turf/simulated/floor/plasteel,
/area/station/service/hydroponics)
"ceS" = (
@@ -33670,23 +32492,8 @@
/turf/simulated/wall,
/area/station/science/research)
"cfy" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
+/obj/effect/decal/cleanable/dirt,
+/obj/item/wrench,
/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
"cfz" = (
@@ -33701,71 +32508,58 @@
},
/area/station/medical/paramedic)
"cfA" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 9
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 5
- },
/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plasteel{
- icon_state = "greenfull"
+ dir = 6;
+ icon_state = "green"
},
/area/station/hallway/primary/central)
"cfB" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
- dir = 8
- },
-/obj/structure/table/glass,
-/obj/item/cultivator,
-/obj/item/crowbar,
-/obj/item/plant_analyzer,
-/obj/item/reagent_containers/glass/bucket,
/turf/simulated/floor/plasteel{
dir = 10;
icon_state = "green"
},
/area/station/hallway/primary/central)
"cfC" = (
-/obj/structure/sink{
+/obj/machinery/door/airlock/public/glass,
+/obj/machinery/door/firedoor,
+/obj/effect/mapping_helpers/airlock/autoname,
+/obj/effect/mapping_helpers/airlock/access/all/service/hydroponics,
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/plasteel{
dir = 8;
- pixel_x = -12;
- pixel_y = 2
+ icon_state = "green"
},
-/obj/effect/turf_decal/delivery/hollow,
-/turf/simulated/floor/plasteel,
/area/station/service/hydroponics)
"cfD" = (
-/obj/machinery/economy/vending/bardrobe,
-/obj/structure/sign/poster/random{
- pixel_y = 32
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
},
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/wood,
-/area/station/service/bar)
+/turf/simulated/floor/plasteel{
+ icon_state = "cafeteria"
+ },
+/area/station/service/kitchen)
"cfF" = (
/turf/simulated/floor/plasteel{
icon_state = "whitebluecorner"
},
/area/station/medical/medbay)
-"cfG" = (
-/obj/machinery/atmospherics/unary/vent_pump/on{
- dir = 4
- },
-/obj/structure/table/glass,
-/obj/structure/extinguisher_cabinet{
- name = "west bump";
- pixel_x = -27
- },
-/obj/item/reagent_containers/food/snacks/grown/wheat,
-/obj/item/reagent_containers/food/snacks/grown/watermelon,
-/obj/item/reagent_containers/food/snacks/grown/citrus/orange,
-/obj/item/reagent_containers/food/snacks/grown/grapes,
-/turf/simulated/floor/plasteel{
- dir = 6;
- icon_state = "green"
- },
-/area/station/hallway/primary/central)
"cfI" = (
/obj/structure/disposalpipe/segment,
/obj/effect/landmark/lightsout,
@@ -33801,35 +32595,14 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/door/airlock/atmos{
name = "Turbine Access"
},
/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos,
/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
-"cfR" = (
-/obj/machinery/plantgenes,
-/obj/structure/extinguisher_cabinet{
- name = "east bump";
- pixel_x = 27
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/machinery/light{
- dir = 4
- },
-/turf/simulated/floor/plasteel,
-/area/station/service/hydroponics)
-"cfS" = (
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "greenblue"
- },
-/area/station/service/hydroponics)
"cfV" = (
/obj/structure/sink/puddle,
/obj/structure/flora/junglebush/large{
@@ -33867,16 +32640,6 @@
icon_state = "darkblue"
},
/area/station/medical/surgery/secondary)
-"cgd" = (
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/turf/simulated/floor/plasteel{
- icon_state = "bluecorner"
- },
-/area/station/service/hydroponics)
"cgh" = (
/obj/structure/cable/yellow{
d1 = 2;
@@ -33917,19 +32680,6 @@
icon_state = "caution"
},
/area/station/engineering/atmos/control)
-"cgo" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/effect/landmark/damageturf,
-/turf/simulated/floor/plating,
-/area/station/maintenance/asmaint)
"cgp" = (
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/garden)
@@ -34048,14 +32798,8 @@
},
/area/station/science/research)
"cgG" = (
-/obj/machinery/door/poddoor/shutters{
- id_tag = "toxinaccess"
- },
-/obj/machinery/door/firedoor/heavy{
- opacity = 0
- },
-/turf/simulated/floor/plasteel,
-/area/station/science/toxins/mixing)
+/turf/simulated/wall/r_wall,
+/area/station/science/explab)
"cgH" = (
/obj/item/bonegel{
pixel_x = 6;
@@ -34090,20 +32834,6 @@
icon_state = "whiteblue"
},
/area/station/medical/surgery/primary)
-"cgK" = (
-/obj/structure/table,
-/obj/item/paper_bin{
- pixel_x = -2;
- pixel_y = 5
- },
-/obj/item/pen{
- pixel_x = -3;
- pixel_y = 5
- },
-/turf/simulated/floor/plasteel{
- icon_state = "greenfull"
- },
-/area/station/hallway/primary/central)
"cgL" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -34115,26 +32845,27 @@
icon_state = "grimy"
},
/area/station/service/chapel/office)
-"cgM" = (
+"cgN" = (
/obj/machinery/firealarm{
dir = 8;
name = "west bump";
pixel_x = -24
},
-/obj/structure/sink{
- dir = 8;
- pixel_x = -12;
- pixel_y = 2
- },
-/turf/simulated/floor/plasteel{
- icon_state = "greenfull"
- },
-/area/station/hallway/primary/central)
-"cgN" = (
/obj/structure/disposalpipe/segment{
dir = 1;
icon_state = "pipe-c"
},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 5
+ },
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
/turf/simulated/floor/plasteel{
icon_state = "greenfull"
},
@@ -34143,31 +32874,63 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel{
icon_state = "greenfull"
},
/area/station/hallway/primary/central)
"cgP" = (
-/obj/machinery/door/airlock/public/glass,
-/obj/machinery/door/firedoor,
-/obj/effect/mapping_helpers/airlock/autoname,
-/obj/effect/mapping_helpers/airlock/access/all/service/hydroponics,
+/obj/machinery/camera{
+ c_tag = "Hydroponics - Foyer"
+ },
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "green"
+ icon_state = "greenfull"
},
-/area/station/service/hydroponics)
+/area/station/hallway/primary/central)
"cgQ" = (
-/obj/effect/turf_decal/delivery,
/obj/structure/disposalpipe/segment{
- dir = 2;
+ dir = 8;
icon_state = "pipe-c"
},
-/turf/simulated/floor/plasteel,
-/area/station/service/hydroponics)
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 9
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 9
+ },
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "greenfull"
+ },
+/area/station/hallway/primary/central)
"cgT" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel,
@@ -34190,14 +32953,6 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/aft)
-"cgV" = (
-/obj/item/book/manual/hydroponics_pod_people,
-/obj/effect/turf_decal/stripes/corner{
- dir = 1
- },
-/obj/structure/table/glass,
-/turf/simulated/floor/plasteel,
-/area/station/service/hydroponics)
"cgW" = (
/obj/structure/cable/yellow{
d1 = 4;
@@ -34258,13 +33013,16 @@
},
/area/station/science/explab)
"chb" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light/small{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
"chf" = (
@@ -34296,6 +33054,11 @@
},
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/starboard)
+"chk" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/girder,
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard)
"chm" = (
/turf/simulated/floor/plasteel{
icon_state = "greenblue"
@@ -34318,29 +33081,14 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/aft)
-"chr" = (
-/obj/item/seeds/wheat,
-/obj/item/seeds/sugarcane,
-/obj/item/seeds/potato,
-/obj/item/seeds/apple,
-/obj/item/grown/corncob,
-/obj/item/reagent_containers/food/snacks/grown/carrot,
-/obj/item/reagent_containers/food/snacks/grown/wheat,
-/obj/item/reagent_containers/food/snacks/grown/pumpkin{
- pixel_y = 5
- },
-/obj/machinery/light,
-/obj/effect/turf_decal/stripes/line{
- dir = 9
- },
-/obj/structure/table/glass,
-/turf/simulated/floor/plasteel,
-/area/station/service/hydroponics)
"chs" = (
/obj/effect/decal/cleanable/cobweb,
/obj/structure/reagent_dispensers/watertank,
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/delivery,
+/obj/machinery/light{
+ dir = 1
+ },
/turf/simulated/floor/plasteel,
/area/station/maintenance/turbine)
"chw" = (
@@ -34428,6 +33176,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/disposalpipe/segment,
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plasteel{
icon_state = "greenfull"
},
@@ -34453,17 +33206,11 @@
},
/area/station/medical/virology)
"chQ" = (
-/obj/machinery/light{
- dir = 1
- },
/obj/structure/cable/yellow{
d2 = 4;
icon_state = "0-4"
},
/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
/obj/machinery/power/apc{
dir = 1;
name = "north bump";
@@ -34598,7 +33345,10 @@
},
/area/station/science/research)
"cig" = (
-/obj/machinery/door/airlock/maintenance,
+/obj/machinery/door/airlock/research,
+/obj/machinery/door/firedoor,
+/obj/effect/mapping_helpers/airlock/autoname,
+/obj/effect/mapping_helpers/airlock/access/all/science/robotics,
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -34607,10 +33357,10 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/effect/mapping_helpers/airlock/autoname,
-/obj/effect/mapping_helpers/airlock/access/all/science/robotics,
-/turf/simulated/floor/plating,
-/area/station/maintenance/aft2)
+/turf/simulated/floor/plasteel{
+ icon_state = "whitepurplefull"
+ },
+/area/station/science/robotics)
"cii" = (
/obj/structure/extinguisher_cabinet{
name = "west bump";
@@ -34651,13 +33401,6 @@
icon_state = "whiteblue"
},
/area/station/medical/medbay)
-"cio" = (
-/obj/machinery/economy/vending/hydroseeds,
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "green"
- },
-/area/station/hallway/primary/central)
"cip" = (
/obj/structure/table,
/obj/item/book/manual/hydroponics_pod_people,
@@ -34672,31 +33415,6 @@
icon_state = "green"
},
/area/station/hallway/primary/central)
-"ciq" = (
-/obj/machinery/economy/vending/hydronutrients,
-/obj/machinery/camera{
- c_tag = "Hydroponics - Foyer";
- dir = 1
- },
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "green"
- },
-/area/station/hallway/primary/central)
-"cir" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/turf/simulated/floor/plating,
-/area/station/maintenance/starboard)
"ciu" = (
/obj/structure/cable/yellow{
d1 = 1;
@@ -34714,8 +33432,7 @@
pixel_y = 26
},
/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
/turf/simulated/floor/plasteel,
/area/station/maintenance/turbine)
"ciz" = (
@@ -34743,12 +33460,12 @@
},
/area/station/medical/reception)
"ciC" = (
-/obj/effect/turf_decal/delivery,
+/obj/machinery/economy/vending/hydroseeds,
/turf/simulated/floor/plasteel{
- dir = 10;
- icon_state = "greenblue"
+ dir = 9;
+ icon_state = "green"
},
-/area/station/service/hydroponics)
+/area/station/hallway/primary/central)
"ciD" = (
/obj/machinery/atmospherics/unary/thermomachine/heater/on,
/turf/simulated/floor/plasteel{
@@ -34769,9 +33486,6 @@
/area/station/engineering/atmos/control)
"ciF" = (
/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 6
- },
/obj/structure/sink/kitchen{
desc = "A sink used for washing one's hands and face. It looks rusty and home-made";
name = "old sink";
@@ -34786,12 +33500,9 @@
icon_state = "1-8"
},
/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
dir = 5
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 9
- },
/turf/simulated/floor/plasteel,
/area/station/maintenance/turbine)
"ciJ" = (
@@ -34849,28 +33560,6 @@
/obj/effect/landmark/start/engineer,
/turf/simulated/floor/plasteel,
/area/station/engineering/control)
-"ciZ" = (
-/obj/machinery/disposal,
-/obj/structure/disposalpipe/trunk{
- dir = 1
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 5
- },
-/obj/machinery/light_switch{
- dir = 1;
- name = "custom placement";
- pixel_x = 6;
- pixel_y = -24
- },
-/turf/simulated/floor/plasteel,
-/area/station/service/hydroponics)
-"cjf" = (
-/obj/machinery/light,
-/turf/simulated/floor/plasteel{
- icon_state = "greenblue"
- },
-/area/station/service/hydroponics)
"cjh" = (
/obj/machinery/atmospherics/unary/thermomachine/freezer{
dir = 1
@@ -35085,18 +33774,6 @@
},
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/aft)
-"cjL" = (
-/obj/structure/extinguisher_cabinet{
- name = "north bump";
- pixel_y = 30
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- icon_state = "whitepurple"
- },
-/area/station/science/research)
"cjM" = (
/obj/structure/disposalpipe/segment{
dir = 2;
@@ -35107,15 +33784,9 @@
},
/area/station/science/research)
"cjN" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 8
- },
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+ dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel{
icon_state = "whitehall"
},
@@ -35138,12 +33809,6 @@
},
/turf/simulated/floor/plasteel,
/area/station/security/brig)
-"cjV" = (
-/obj/machinery/door/airlock/maintenance,
-/obj/effect/mapping_helpers/airlock/autoname,
-/obj/effect/mapping_helpers/airlock/access/all/service/hydroponics,
-/turf/simulated/floor/plating,
-/area/station/maintenance/starboard2)
"cjX" = (
/obj/structure/cable{
d1 = 1;
@@ -35235,23 +33900,6 @@
/turf/space,
/area/space/nearstation)
"ckq" = (
-/obj/structure/table,
-/obj/item/assembly/igniter{
- pixel_x = -5;
- pixel_y = 3
- },
-/obj/item/assembly/igniter{
- pixel_x = 5;
- pixel_y = -4
- },
-/obj/item/assembly/igniter{
- pixel_x = 2;
- pixel_y = 6
- },
-/obj/item/assembly/igniter{
- pixel_x = 2;
- pixel_y = -1
- },
/obj/machinery/alarm{
dir = 8;
name = "east bump";
@@ -35260,13 +33908,13 @@
/obj/machinery/atmospherics/pipe/simple/hidden/purple{
dir = 4
},
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 8;
- icon_state = "1-8"
+/obj/machinery/camera{
+ c_tag = "Xenobiology Lab - Special Containment";
+ dir = 8;
+ network = list("Research","SS13","Containmentssss")
},
/turf/simulated/floor/engine,
-/area/station/science/test_chamber)
+/area/station/science/xenobiology)
"ckr" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -35293,15 +33941,6 @@
/obj/item/clothing/head/snowman,
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
-"cku" = (
-/obj/machinery/camera{
- c_tag = "Hydroponics - Aft";
- dir = 1
- },
-/turf/simulated/floor/plasteel{
- icon_state = "greenblue"
- },
-/area/station/service/hydroponics)
"ckv" = (
/obj/structure/closet/firecloset,
/turf/simulated/floor/plating,
@@ -35320,20 +33959,6 @@
},
/turf/simulated/floor/plasteel,
/area/station/maintenance/apmaint)
-"ckz" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 10
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 10
- },
-/obj/structure/cable/yellow{
- d1 = 2;
- d2 = 8;
- icon_state = "2-8"
- },
-/turf/simulated/floor/plating,
-/area/station/maintenance/starboard2)
"ckB" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/disposalpipe/segment{
@@ -35448,16 +34073,6 @@
/obj/machinery/computer/mech_bay_power_console,
/turf/simulated/floor/bluegrid,
/area/station/maintenance/apmaint)
-"ckS" = (
-/obj/machinery/newscaster{
- dir = 1;
- name = "south bump";
- pixel_y = -28
- },
-/turf/simulated/floor/plasteel{
- icon_state = "greenblue"
- },
-/area/station/service/hydroponics)
"ckZ" = (
/obj/effect/turf_decal/stripes/line,
/turf/simulated/floor/plasteel{
@@ -35539,6 +34154,7 @@
/obj/structure/sign/poster/random{
pixel_y = -32
},
+/obj/effect/spawner/lootdrop/maintenance/two,
/turf/simulated/floor/plasteel{
icon_state = "greenblue"
},
@@ -35552,44 +34168,21 @@
},
/area/station/service/chapel/office)
"cln" = (
-/obj/structure/cable/yellow{
- d1 = 2;
- d2 = 8;
- icon_state = "2-8"
- },
-/obj/machinery/atmospherics/pipe/simple/visible{
- dir = 4
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/turf/simulated/floor/plating,
+/obj/item/reagent_containers/food/snacks/monkeycube,
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
+/turf/simulated/floor/plasteel,
/area/station/maintenance/asmaint)
"clp" = (
/turf/simulated/wall,
/area/station/maintenance/spacehut)
-"clq" = (
+"clr" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 6
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 6
+ dir = 10
},
/obj/structure/cable/yellow{
- d1 = 2;
- d2 = 4;
- icon_state = "2-4"
- },
-/obj/effect/spawner/lootdrop{
- loot = list(/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes);
- name = "trash spawner"
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plating,
-/area/station/maintenance/starboard)
-"clr" = (
-/obj/machinery/atmospherics/unary/vent_pump/on{
- dir = 8
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
icon_state = "white"
@@ -35602,11 +34195,6 @@
},
/turf/simulated/floor/plasteel,
/area/station/maintenance/turbine)
-"clz" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/plasteel,
-/area/station/maintenance/turbine)
"clA" = (
/turf/simulated/wall/r_wall,
/area/station/maintenance/turbine)
@@ -35632,8 +34220,9 @@
/turf/simulated/floor/plating,
/area/station/maintenance/port)
"clG" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
- dir = 1
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 5
},
/turf/simulated/floor/plasteel{
icon_state = "cafeteria"
@@ -35778,9 +34367,9 @@
/area/station/maintenance/apmaint)
"cmg" = (
/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
+/obj/structure/closet/firecloset,
+/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random_spawners/cobweb_right_rare,
/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
"cmi" = (
@@ -35855,23 +34444,6 @@
"cmB" = (
/turf/simulated/wall/r_wall,
/area/station/maintenance/starboard2)
-"cmE" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- icon_state = "caution"
- },
-/area/station/engineering/atmos/control)
-"cmF" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/closet/radiation,
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
- dir = 4
- },
-/obj/effect/turf_decal/delivery,
-/turf/simulated/floor/plasteel,
-/area/station/maintenance/turbine)
"cmG" = (
/obj/machinery/atmospherics/pipe/simple/visible,
/obj/machinery/atmospherics/pipe/simple/visible{
@@ -36012,12 +34584,6 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
-"cnh" = (
-/obj/item/chair/stool{
- dir = 8
- },
-/turf/simulated/floor/plating,
-/area/station/maintenance/aft2)
"cnj" = (
/obj/machinery/light,
/turf/simulated/floor/plasteel{
@@ -36084,6 +34650,9 @@
/obj/machinery/atmospherics/pipe/simple/visible/cyan{
dir = 4
},
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel,
/area/station/engineering/atmos)
"cns" = (
@@ -36093,29 +34662,20 @@
},
/area/station/hallway/primary/aft)
"cnt" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/turf/simulated/floor/plating,
-/area/station/maintenance/asmaint)
-"cnu" = (
/obj/structure/disposalpipe/junction{
dir = 1
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 1
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
},
-/turf/simulated/floor/plating,
-/area/station/maintenance/asmaint)
+/area/station/science/explab)
"cnw" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -36126,31 +34686,9 @@
/obj/effect/turf_decal/stripes/corner{
dir = 1
},
-/obj/effect/decal/cleanable/dirt,
/obj/machinery/recharge_station,
/turf/simulated/floor/plasteel,
/area/station/science/robotics/chargebay)
-"cnA" = (
-/obj/effect/turf_decal/delivery,
-/obj/effect/turf_decal/siding{
- dir = 8
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/effect/turf_decal/siding{
- dir = 8
- },
-/obj/structure/closet/emcloset,
-/obj/machinery/camera{
- c_tag = "Science - Entry";
- dir = 1;
- network = list("Research","SS13")
- },
-/turf/simulated/floor/plasteel{
- icon_state = "darkgreycheck"
- },
-/area/station/science/research)
"cnB" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel{
@@ -36159,23 +34697,17 @@
},
/area/station/hallway/primary/central)
"cnF" = (
-/obj/effect/turf_decal/delivery,
-/obj/machinery/disposal,
-/obj/machinery/light_switch{
- name = "custom placement";
- pixel_x = -6;
- pixel_y = 24
- },
-/obj/machinery/light{
- dir = 1
- },
-/obj/structure/disposalpipe/trunk{
- dir = 8
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
},
-/turf/simulated/floor/plasteel{
- icon_state = "white"
+/obj/effect/spawner/random_spawners/grille_often,
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
},
-/area/station/science/explab)
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard2)
"cnG" = (
/obj/machinery/firealarm{
dir = 8;
@@ -36191,6 +34723,9 @@
/obj/machinery/atmospherics/pipe/manifold/visible/purple{
dir = 4
},
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel,
/area/station/engineering/atmos)
"cnJ" = (
@@ -36213,41 +34748,12 @@
"cnK" = (
/turf/simulated/floor/engine,
/area/station/science/explab/chamber)
-"cnL" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood/old,
-/obj/item/extinguisher{
- pixel_x = 4;
- pixel_y = 4
- },
-/turf/simulated/floor/plasteel{
- icon_state = "darkgrey"
- },
-/area/station/maintenance/aft2)
-"cnO" = (
-/obj/structure/chair,
-/turf/simulated/floor/plating,
-/area/station/maintenance/aft2)
"cnQ" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/turf/simulated/floor/plating,
/area/station/maintenance/engimaint)
-"cnR" = (
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/machinery/atmospherics/unary/vent_pump/on{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/turf/simulated/floor/plasteel{
- icon_state = "white"
- },
-/area/station/science/rnd)
"cnS" = (
/obj/structure/cable/yellow{
d1 = 4;
@@ -36283,10 +34789,6 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
-"cnW" = (
-/obj/item/target/alien,
-/turf/simulated/floor/plating,
-/area/station/maintenance/asmaint)
"cob" = (
/obj/structure/window/reinforced{
dir = 8
@@ -36461,16 +34963,7 @@
},
/area/station/medical/break_room)
"coB" = (
-/obj/structure/rack,
-/obj/item/storage/bag/plants/portaseeder,
-/obj/item/plant_analyzer,
-/obj/item/cultivator,
-/obj/item/reagent_containers/glass/bucket,
-/obj/item/vending_refill/hydroseeds,
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/turf/simulated/floor/plating,
+/turf/simulated/floor/plasteel,
/area/station/maintenance/asmaint)
"coC" = (
/turf/simulated/wall,
@@ -36541,35 +35034,23 @@
/turf/simulated/floor/plasteel,
/area/station/science/robotics/chargebay)
"coI" = (
-/obj/machinery/light/small{
- dir = 8
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
},
-/obj/structure/mopbucket{
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
dir = 4
},
-/obj/item/mop,
/turf/simulated/floor/plating,
/area/station/maintenance/starboard2)
"coM" = (
-/obj/structure/closet/crate,
-/obj/item/stack/cable_coil/random,
-/obj/effect/spawner/lootdrop/maintenance,
/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
+/obj/machinery/light/small,
/turf/simulated/floor/plating,
-/area/station/maintenance/starboard)
-"coN" = (
-/obj/structure/closet/crate,
-/obj/item/cane,
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/turf/simulated/floor/plasteel,
-/area/station/maintenance/starboard)
+/area/station/maintenance/starboard2)
"coQ" = (
/obj/structure/reagent_dispensers/fueltank,
/turf/simulated/floor/plating,
@@ -36596,16 +35077,25 @@
/turf/space,
/area/station/engineering/solar/auxstarboard)
"coU" = (
-/obj/effect/spawner/lootdrop{
- loot = list(/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes);
- name = "trash spawner"
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
},
-/turf/simulated/floor/plating,
-/area/station/maintenance/aft2)
-"coX" = (
-/obj/machinery/light/small,
-/turf/simulated/floor/plating,
-/area/station/maintenance/starboard)
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
+/turf/simulated/floor/plasteel{
+ icon_state = "darkgrey"
+ },
+/area/station/science/toxins/mixing)
"cpb" = (
/turf/simulated/floor/plasteel{
icon_state = "white"
@@ -36860,12 +35350,9 @@
/turf/simulated/floor/plating,
/area/station/maintenance/aft)
"cqi" = (
-/obj/effect/decal/cleanable/ash,
-/obj/structure/chair/stool{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- icon_state = "showroomfloor"
+/obj/item/shovel/spade,
+/turf/simulated/floor/wood{
+ icon_state = "wood-broken7"
},
/area/station/maintenance/starboard2)
"cqj" = (
@@ -36902,40 +35389,43 @@
/turf/simulated/floor/plating,
/area/station/science/rnd)
"cqo" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/light_switch{
- name = "north bump";
- pixel_y = 24
- },
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "whitepurple"
- },
-/area/station/science/rnd)
-"cqp" = (
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/machinery/light,
-/obj/structure/table,
-/obj/item/storage/toolbox/mechanical,
-/turf/simulated/floor/plasteel{
- icon_state = "whitepurple"
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
},
-/area/station/science/rnd)
-"cqv" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 6
+ dir = 5
},
/obj/structure/cable/yellow{
d1 = 1;
- d2 = 2;
- icon_state = "1-2"
+ d2 = 4;
+ icon_state = "1-4"
+ },
+/turf/simulated/floor/plasteel,
+/area/station/maintenance/starboard2)
+"cqv" = (
+/obj/structure/rack,
+/obj/item/stock_parts/micro_laser,
+/obj/item/stock_parts/matter_bin,
+/obj/item/stack/cable_coil,
+/obj/item/stock_parts/matter_bin{
+ pixel_x = 3;
+ pixel_y = 3
+ },
+/obj/item/stock_parts/scanning_module{
+ pixel_x = 2;
+ pixel_y = 3
+ },
+/obj/item/stock_parts/capacitor,
+/obj/item/stock_parts/capacitor,
+/obj/item/stock_parts/capacitor,
+/obj/item/stock_parts/manipulator,
+/obj/item/stock_parts/manipulator,
+/obj/item/stack/cable_coil,
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 4
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -36943,24 +35433,17 @@
},
/area/station/science/rnd)
"cqC" = (
-/obj/effect/decal/cleanable/cobweb,
-/obj/structure/computerframe{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- icon_state = "showroomfloor"
- },
+/obj/effect/spawner/random_spawners/cobweb_left_rare,
+/obj/machinery/constructable_frame/machine_frame,
+/obj/item/stack/cable_coil/five,
+/turf/simulated/floor/plating,
/area/station/maintenance/starboard2)
"cqE" = (
-/obj/effect/decal/cleanable/blood/old,
-/obj/structure/sink/kitchen{
- desc = "A sink used for washing one's hands and face. It looks rusty and home-made";
- name = "old sink";
- pixel_y = 25
- },
-/turf/simulated/floor/plasteel{
- icon_state = "showroomfloor"
+/obj/machinery/seed_extractor,
+/obj/machinery/light/small{
+ dir = 1
},
+/turf/simulated/floor/wood,
/area/station/maintenance/starboard2)
"cqF" = (
/obj/item/folder/red,
@@ -36971,17 +35454,15 @@
/turf/simulated/floor/carpet,
/area/station/legal/lawoffice)
"cqG" = (
-/obj/item/reagent_containers/glass/bottle/toxin{
- pixel_x = 4;
- pixel_y = 2
- },
-/obj/structure/table,
-/obj/machinery/reagentgrinder{
- pixel_y = 4
- },
-/obj/effect/decal/cleanable/cobweb2,
-/turf/simulated/floor/plasteel{
- icon_state = "showroomfloor"
+/obj/structure/rack,
+/obj/item/storage/bag/plants/portaseeder,
+/obj/item/plant_analyzer,
+/obj/item/cultivator,
+/obj/item/reagent_containers/glass/bucket,
+/obj/item/vending_refill/hydroseeds,
+/obj/effect/spawner/random_spawners/cobweb_right_rare,
+/turf/simulated/floor/wood{
+ icon_state = "wood-broken3"
},
/area/station/maintenance/starboard2)
"cqK" = (
@@ -37177,9 +35658,12 @@
/turf/simulated/floor/plating,
/area/station/maintenance/starboard2)
"crr" = (
-/obj/effect/spawner/lootdrop{
- loot = list(/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes);
- name = "trash spawner"
+/obj/structure/girder,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
},
/turf/simulated/floor/plating,
/area/station/maintenance/starboard2)
@@ -37259,19 +35743,8 @@
},
/area/station/hallway/primary/aft)
"crN" = (
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/effect/landmark/damageturf,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/turf/simulated/floor/plating,
+/obj/effect/decal/cleanable/fungus,
+/turf/simulated/wall,
/area/station/maintenance/aft2)
"crP" = (
/obj/structure/flora/ausbushes/sunnybush,
@@ -37281,9 +35754,10 @@
/turf/simulated/floor/grass/no_creep,
/area/station/medical/virology)
"crQ" = (
-/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance/three,
/obj/effect/turf_decal/stripes/white/line,
+/obj/structure/closet/emcloset,
+/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random_spawners/cobweb_left_frequent,
/turf/simulated/floor/plating,
/area/station/maintenance/starboard2)
"crR" = (
@@ -37291,6 +35765,7 @@
/obj/item/assembly/infra,
/obj/effect/spawner/lootdrop/maintenance,
/obj/effect/turf_decal/stripes/white/line,
+/obj/machinery/atmospherics/unary/vent_pump/on,
/turf/simulated/floor/plating,
/area/station/maintenance/starboard2)
"crT" = (
@@ -37338,76 +35813,44 @@
/obj/structure/reagent_dispensers/fueltank,
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint)
-"csc" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
+"csf" = (
+/obj/machinery/door/airlock/maintenance,
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
/obj/structure/cable/yellow{
- d1 = 2;
- d2 = 4;
- icon_state = "2-4"
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/aft2)
-"csf" = (
-/obj/machinery/atmospherics/portable/canister,
-/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
"csg" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
+/obj/effect/spawner/window/reinforced/tinted,
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
/turf/simulated/floor/plating,
/area/station/maintenance/starboard2)
"csh" = (
-/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
-/obj/machinery/door/airlock/maintenance,
-/turf/simulated/floor/plating,
-/area/station/maintenance/starboard2)
-"csi" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
+/obj/structure/door_assembly/door_assembly_mai{
+ name = "broken maintenance access";
+ move_force = 10000;
+ move_resist = 10000;
+ anchored = 1
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+/obj/structure/barricade/wooden/crude,
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
dir = 4
},
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/turf/simulated/floor/plating,
-/area/station/maintenance/aft2)
-"csk" = (
-/obj/structure/rack,
-/obj/item/clothing/suit/chef/classic,
-/obj/item/clothing/mask/surgical,
-/turf/simulated/floor/plasteel{
- icon_state = "showroomfloor"
- },
-/area/station/maintenance/starboard2)
-"csl" = (
-/obj/machinery/constructable_frame/machine_frame,
-/obj/item/circuitboard/chem_master/condi_master,
-/turf/simulated/floor/plasteel{
- icon_state = "showroomfloor"
- },
/area/station/maintenance/starboard2)
"csn" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 9
+ },
/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
},
-/obj/effect/turf_decal/stripes/line,
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint)
"cso" = (
@@ -37475,8 +35918,11 @@
/area/station/supply/lobby)
"csB" = (
/obj/structure/rack,
-/obj/item/clothing/suit/storage/hazardvest,
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/item/radio{
+ pixel_x = 7;
+ pixel_y = 4
+ },
+/obj/effect/spawner/lootdrop/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
"csG" = (
@@ -37549,21 +35995,29 @@
},
/area/station/hallway/primary/aft)
"csV" = (
-/obj/structure/reagent_dispensers/watertank,
-/obj/effect/spawner/lootdrop{
- loot = list(/obj/item/storage/box/mousetraps,/obj/item/storage/box/lights/tubes,/obj/item/storage/box/lights/mixed,/obj/item/storage/box/lights/bulbs);
- name = "Janitor Supplies Spawner"
+/obj/structure/table/glass,
+/obj/item/reagent_containers/spray/plantbgone{
+ pixel_x = 2;
+ pixel_y = 6
},
-/turf/simulated/floor/plating,
-/area/station/maintenance/starboard)
-"csW" = (
-/obj/structure/rack,
-/obj/item/seeds/cannabis,
-/obj/item/seeds/cannabis,
-/obj/item/seeds/cannabis,
+/obj/item/reagent_containers/spray/plantbgone{
+ pixel_x = 7;
+ pixel_y = 3
+ },
+/obj/item/reagent_containers/spray/plantbgone{
+ pixel_x = -6;
+ pixel_y = 1
+ },
+/obj/item/watertank,
+/obj/item/grenade/chem_grenade/antiweed,
/obj/effect/turf_decal/stripes/line{
- dir = 4
+ dir = 9
},
+/turf/simulated/floor/plasteel,
+/area/station/maintenance/starboard2)
+"csW" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
+/obj/item/reagent_containers/food/snacks/monkeycube,
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint)
"csX" = (
@@ -37607,10 +36061,6 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
-"csZ" = (
-/obj/item/caution,
-/turf/simulated/floor/plating,
-/area/station/maintenance/starboard2)
"cta" = (
/obj/structure/table,
/obj/machinery/firealarm{
@@ -37624,18 +36074,19 @@
},
/obj/item/clipboard,
/obj/item/toy/figure/crew/scientist,
+/obj/item/camera,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "whitepurple"
},
/area/station/science/rnd)
"ctb" = (
-/obj/structure/table,
-/obj/item/camera,
-/turf/simulated/floor/plasteel{
- icon_state = "whitepurple"
+/obj/machinery/optable{
+ name = "Robotics Operating Table"
},
-/area/station/science/rnd)
+/obj/item/storage/firstaid/machine,
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard2)
"cte" = (
/turf/simulated/wall,
/area/station/maintenance/starboard2)
@@ -37655,9 +36106,6 @@
name = "east bump";
pixel_x = 24
},
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
/obj/structure/cable/yellow{
d1 = 2;
d2 = 8;
@@ -37674,21 +36122,12 @@
icon_state = "whitepurplecorner"
},
/area/station/science/research)
-"ctp" = (
-/obj/structure/rack,
-/obj/item/clothing/under/color/white,
-/obj/item/clothing/head/soft/mime,
-/obj/item/clothing/under/color/white,
-/obj/item/clothing/head/soft/mime,
-/obj/item/clothing/mask/surgical,
-/obj/item/clothing/mask/surgical,
-/turf/simulated/floor/plasteel{
- icon_state = "showroomfloor"
- },
-/area/station/maintenance/starboard2)
"ctr" = (
-/obj/machinery/chem_heater,
-/turf/simulated/floor/plating,
+/obj/machinery/light/small{
+ dir = 4
+ },
+/obj/machinery/hydroponics/soil,
+/turf/simulated/floor/grass/no_creep,
/area/station/maintenance/starboard2)
"ctt" = (
/obj/machinery/atmospherics/pipe/simple/visible/yellow{
@@ -37919,25 +36358,6 @@
/obj/item/laser_pointer/red,
/turf/space,
/area/space/nearstation)
-"cuj" = (
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 8;
- icon_state = "1-8"
- },
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/turf/simulated/floor/plating,
-/area/station/maintenance/aft2)
"cuk" = (
/obj/structure/lattice,
/obj/item/tank/internals/oxygen/empty,
@@ -37953,21 +36373,24 @@
/turf/simulated/floor/plating/airless,
/area/station/science/toxins/test)
"cup" = (
+/obj/effect/landmark/spawner/nukedisc_respawn,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/obj/structure/cable/yellow{
- d1 = 4;
+ d1 = 1;
d2 = 8;
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
+ icon_state = "1-8"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
},
-/obj/effect/landmark/spawner/nukedisc_respawn,
-/obj/structure/disposalpipe/segment{
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -37993,50 +36416,18 @@
},
/area/station/engineering/solar/starboard)
"cut" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 10
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 10
- },
-/obj/structure/disposalpipe/segment,
-/obj/structure/cable/yellow{
- d1 = 2;
- d2 = 8;
- icon_state = "2-8"
- },
-/turf/simulated/floor/plasteel{
- icon_state = "whitepurple"
- },
-/area/station/science/rnd)
-"cuu" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/structure/sign/vacuum/external{
- pixel_x = 32
- },
-/turf/simulated/floor/plating,
-/area/station/maintenance/aft2)
-"cuv" = (
/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 4
- },
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
-/obj/machinery/newscaster{
- dir = 8;
- name = "east bump";
- pixel_x = 28
- },
/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "whitepurplecorner"
+ icon_state = "whitepurple"
},
-/area/station/science/research)
+/area/station/science/rnd)
"cuw" = (
/obj/structure/cable/yellow{
d1 = 1;
@@ -38086,7 +36477,7 @@
},
/obj/structure/lattice/catwalk,
/turf/space,
-/area/station/science/test_chamber)
+/area/station/science/xenobiology)
"cuF" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/medical,
@@ -38107,28 +36498,12 @@
icon_state = "darkbluefull"
},
/area/station/medical/surgery/secondary)
-"cuG" = (
-/obj/structure/table,
-/obj/item/folder/white,
-/obj/item/reagent_containers/iv_bag/blood/random,
-/obj/item/reagent_containers/iv_bag/blood/random,
-/obj/item/reagent_containers/iv_bag{
- pixel_x = -3;
- pixel_y = -3
- },
-/obj/item/reagent_containers/iv_bag{
- pixel_x = -3;
- pixel_y = -3
- },
-/turf/simulated/floor/plating,
-/area/station/maintenance/starboard2)
"cuH" = (
-/obj/effect/decal/cleanable/blood/old,
-/turf/simulated/floor/plating,
-/area/station/maintenance/starboard2)
-"cuI" = (
-/obj/machinery/sleeper,
-/turf/simulated/floor/plating,
+/obj/item/seeds/tomato,
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 9
+ },
+/turf/simulated/floor/wood,
/area/station/maintenance/starboard2)
"cuL" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -38209,6 +36584,20 @@
},
/turf/simulated/floor/engine/vacuum,
/area/station/maintenance/turbine)
+"cuR" = (
+/obj/effect/turf_decal/delivery,
+/obj/machinery/disposal,
+/obj/structure/disposalpipe/trunk{
+ dir = 4
+ },
+/obj/machinery/light_switch{
+ name = "north bump";
+ pixel_y = 24
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/science/toxins/mixing)
"cuS" = (
/obj/structure/table/glass,
/obj/item/circular_saw,
@@ -38329,27 +36718,34 @@
/turf/simulated/wall/r_wall,
/area/station/maintenance/medmaint)
"cvu" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 5
+/obj/machinery/alarm{
+ name = "north bump";
+ pixel_y = 24
},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 8
+/obj/structure/window/reinforced{
+ dir = 4
},
+/obj/structure/flora/ausbushes/fernybush,
+/obj/structure/flora/ausbushes/ppflowers,
+/turf/simulated/floor/grass/no_creep,
+/area/station/science/research)
+"cvw" = (
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/cable/yellow{
d1 = 1;
- d2 = 4;
- icon_state = "1-4"
- },
-/turf/simulated/floor/plasteel{
- icon_state = "whitepurplecorner"
+ d2 = 2;
+ icon_state = "1-2"
},
-/area/station/science/research)
-"cvw" = (
-/obj/effect/turf_decal/stripes/line{
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
+/obj/machinery/light/small{
dir = 4
},
-/turf/simulated/floor/plating,
-/area/station/maintenance/aft2)
+/turf/simulated/floor/plasteel{
+ icon_state = "darkgrey"
+ },
+/area/station/science/toxins/mixing)
"cvE" = (
/obj/structure/cable/yellow{
d1 = 1;
@@ -38360,7 +36756,6 @@
/turf/simulated/floor/plating,
/area/station/maintenance/aft)
"cvH" = (
-/obj/structure/filingcabinet/chestdrawer,
/obj/structure/cable/yellow{
d2 = 4;
icon_state = "0-4"
@@ -38429,8 +36824,13 @@
/turf/simulated/floor/plating,
/area/station/medical/chemistry)
"cvV" = (
-/obj/structure/barricade/wooden,
-/obj/structure/girder,
+/obj/machinery/door/airlock{
+ name = "Abandoned Hydroponics"
+ },
+/obj/effect/mapping_helpers/airlock/access/all/service/hydroponics,
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 4
+ },
/turf/simulated/floor/plating,
/area/station/maintenance/starboard2)
"cvW" = (
@@ -38456,16 +36856,16 @@
},
/area/station/hallway/primary/fore)
"cvY" = (
-/obj/effect/turf_decal/delivery,
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
},
-/turf/simulated/floor/plasteel{
- dir = 5;
- icon_state = "whitepurple"
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
},
-/area/station/science/rnd)
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard2)
"cwa" = (
/obj/structure/sink{
dir = 4;
@@ -38501,8 +36901,12 @@
/turf/simulated/floor/engine,
/area/station/science/misc_lab)
"cwd" = (
-/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plating,
/area/station/maintenance/starboard2)
"cwf" = (
@@ -38524,21 +36928,6 @@
},
/turf/space,
/area/station/engineering/solar/port)
-"cwg" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/effect/landmark/burnturf,
-/turf/simulated/floor/plating,
-/area/station/maintenance/starboard2)
"cwi" = (
/obj/effect/turf_decal/stripes/line,
/obj/machinery/door_control{
@@ -38591,12 +36980,11 @@
/turf/simulated/floor/wood,
/area/station/science/robotics/showroom)
"cww" = (
-/obj/structure/table,
-/obj/item/paper_bin{
- pixel_y = 6
+/obj/machinery/light/small{
+ dir = 8
},
-/obj/item/pen,
-/turf/simulated/floor/plating,
+/obj/machinery/hydroponics/soil,
+/turf/simulated/floor/grass/no_creep,
/area/station/maintenance/starboard2)
"cwy" = (
/obj/structure/bookcase{
@@ -38638,23 +37026,6 @@
icon_state = "purplefull"
},
/area/station/hallway/primary/aft)
-"cwF" = (
-/obj/effect/decal/cleanable/blood/oil,
-/obj/machinery/status_display{
- dir = 4;
- pixel_y = -32
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "whitepurple"
- },
-/area/station/science/research)
"cwG" = (
/turf/simulated/floor/plating,
/area/station/maintenance/starboard2)
@@ -38677,22 +37048,6 @@
icon_state = "whitepurple"
},
/area/station/command/office/rd)
-"cwI" = (
-/obj/structure/rack,
-/obj/item/storage/firstaid/regular,
-/obj/item/stack/medical/bruise_pack,
-/obj/item/stack/medical/bruise_pack,
-/obj/item/stack/medical/ointment,
-/obj/item/clothing/glasses/hud/health,
-/obj/effect/turf_decal/tile/green,
-/obj/effect/turf_decal/tile/green{
- dir = 8
- },
-/obj/effect/decal/cleanable/blood/gibs/limb,
-/turf/simulated/floor/plasteel{
- icon_state = "showroomfloor"
- },
-/area/station/maintenance/starboard2)
"cwO" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -38711,7 +37066,9 @@
/turf/simulated/floor/plating,
/area/station/maintenance/aft)
"cwQ" = (
-/obj/structure/closet/emcloset,
+/obj/structure/closet/firecloset,
+/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random_spawners/cobweb_right_frequent,
/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
"cwR" = (
@@ -38721,16 +37078,16 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 1
- },
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 6
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
+ dir = 6
+ },
+/obj/structure/cable/yellow{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
},
/turf/simulated/floor/plasteel{
icon_state = "whitepurplecorner"
@@ -38771,38 +37128,6 @@
icon_state = "whitepurple"
},
/area/station/command/office/rd)
-"cxe" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "whitepurple"
- },
-/area/station/science/rnd)
-"cxj" = (
-/obj/structure/bed,
-/obj/effect/decal/cleanable/blood/old,
-/obj/item/bedsheet/medical,
-/obj/effect/turf_decal/tile/green,
-/obj/effect/turf_decal/tile/green{
- dir = 8
- },
-/obj/effect/turf_decal/tile/green{
- dir = 1
- },
-/obj/effect/turf_decal/tile/green{
- dir = 4
- },
-/obj/effect/decal/cleanable/blood/gibs/old,
-/turf/simulated/floor/plasteel{
- icon_state = "showroomfloor"
- },
-/area/station/maintenance/starboard2)
"cxl" = (
/obj/machinery/light{
dir = 4
@@ -39011,11 +37336,21 @@
/area/station/science/research)
"cxP" = (
/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
- dir = 5;
+ dir = 1;
icon_state = "whitepurple"
},
/area/station/science/research)
@@ -39031,11 +37366,6 @@
icon_state = "grimy"
},
/area/station/service/chapel/office)
-"cxS" = (
-/turf/simulated/floor/plasteel{
- icon_state = "whitepurplecorner"
- },
-/area/station/science/explab)
"cxT" = (
/obj/machinery/atmospherics/pipe/simple/heat_exchanging{
dir = 5
@@ -39069,42 +37399,33 @@
/turf/simulated/floor/plating/airless,
/area/station/engineering/solar/auxstarboard)
"cyd" = (
-/obj/structure/table,
-/obj/structure/bedsheetbin{
- pixel_x = 2
- },
-/obj/item/clothing/mask/muzzle,
+/obj/structure/rack,
+/obj/item/seeds/cannabis,
+/obj/item/seeds/cannabis,
+/obj/item/seeds/cannabis,
/turf/simulated/floor/plating,
/area/station/maintenance/starboard2)
"cye" = (
-/obj/structure/table,
-/obj/item/restraints/handcuffs/cable/white,
-/turf/simulated/floor/plating,
+/obj/structure/rack,
+/obj/item/seeds/sugarcane,
+/obj/item/seeds/corn,
+/obj/item/seeds/banana,
+/obj/item/seeds/chanter,
+/obj/item/seeds/chili,
+/turf/simulated/floor/wood{
+ icon_state = "wood-broken7"
+ },
/area/station/maintenance/starboard2)
"cyf" = (
-/obj/structure/rack,
-/obj/item/hatchet,
-/obj/item/shard,
-/obj/item/reagent_containers/iv_bag/blood/random,
+/obj/structure/table,
+/obj/item/clothing/suit/cyborg_suit,
+/obj/item/clothing/mask/gas/cyborg,
+/obj/machinery/light/small,
/turf/simulated/floor/plating,
/area/station/maintenance/starboard2)
"cyh" = (
-/obj/structure/rack,
-/obj/item/tank/internals/anesthetic,
-/obj/item/clothing/mask/gas,
-/obj/effect/turf_decal/tile/green,
-/obj/effect/turf_decal/tile/green{
- dir = 8
- },
-/obj/effect/turf_decal/tile/green{
- dir = 1
- },
-/obj/effect/turf_decal/tile/green{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- icon_state = "showroomfloor"
- },
+/obj/machinery/hydroponics/soil,
+/turf/simulated/floor/grass/no_creep,
/area/station/maintenance/starboard2)
"cyi" = (
/obj/structure/cable/yellow{
@@ -39136,31 +37457,6 @@
icon_state = "whiteblue"
},
/area/station/medical/surgery/primary)
-"cyr" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/structure/cable/yellow{
- d2 = 8;
- icon_state = "0-8"
- },
-/obj/machinery/power/apc{
- dir = 1;
- name = "north bump";
- pixel_y = 24
- },
-/turf/simulated/floor/plasteel{
- icon_state = "whitepurple"
- },
-/area/station/science/research)
"cyt" = (
/obj/effect/turf_decal/stripes/corner{
dir = 1
@@ -39172,10 +37468,10 @@
/turf/simulated/wall/r_wall,
/area/station/maintenance/turbine)
"cyv" = (
-/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance/two,
-/obj/effect/landmark/burnturf,
-/turf/simulated/floor/plating,
+/obj/structure/bookcase{
+ name = "bookcase (Reference)"
+ },
+/turf/simulated/floor/wood,
/area/station/maintenance/starboard)
"cyw" = (
/obj/structure/closet/crate/can,
@@ -39350,25 +37646,13 @@
/turf/simulated/floor/plasteel/dark/telecomms,
/area/station/science/server/coldroom)
"cyT" = (
-/obj/structure/bed/roller,
+/obj/item/toy/plushie/shark,
+/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/landmark/spawner/rev,
/obj/effect/decal/cleanable/blood/old,
-/obj/effect/landmark/damageturf,
-/obj/item/toy/plushie/snakeplushie,
+/obj/structure/closet/crate,
/turf/simulated/floor/plating,
/area/station/maintenance/starboard2)
-"cyV" = (
-/obj/structure/disposalpipe/trunk{
- dir = 4
- },
-/obj/machinery/disposal,
-/obj/machinery/door_control{
- id = "thisdoesntwork";
- name = "Broken Button";
- pixel_x = -26;
- pixel_y = 7
- },
-/turf/simulated/floor/plating,
-/area/station/maintenance/aft2)
"czb" = (
/obj/machinery/atmospherics/air_sensor{
autolink_id = "n2o_sensor"
@@ -39387,17 +37671,6 @@
/obj/structure/grille,
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
-"czj" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- icon_state = "white"
- },
-/area/station/science/toxins/launch)
"czl" = (
/obj/structure/rack,
/obj/item/gun/energy/laser/practice{
@@ -39613,13 +37886,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/wood,
/area/station/science/robotics/showroom)
-"czO" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/machinery/atmospherics/pipe/simple/visible{
- dir = 6
- },
-/turf/simulated/floor/plating,
-/area/station/maintenance/aft2)
"czR" = (
/obj/structure/chair{
dir = 8
@@ -39652,24 +37918,6 @@
/obj/machinery/light/small,
/turf/simulated/floor/engine,
/area/station/command/office/rd)
-"czZ" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel,
-/area/station/maintenance/starboard)
"cAa" = (
/obj/structure/displaycase/labcage,
/turf/simulated/floor/engine,
@@ -39740,14 +37988,8 @@
/turf/simulated/floor/grass/no_creep,
/area/station/medical/virology)
"cAu" = (
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/effect/landmark/damageturf,
+/obj/structure/rack,
+/obj/effect/spawner/lootdrop/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/starboard2)
"cAw" = (
@@ -39784,11 +38026,6 @@
/obj/effect/turf_decal/delivery,
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/exit)
-"cAC" = (
-/obj/machinery/hydroponics/soil,
-/obj/item/seeds/corn,
-/turf/simulated/floor/grass/no_creep,
-/area/station/maintenance/asmaint)
"cAD" = (
/obj/structure/chair{
dir = 4
@@ -39821,7 +38058,12 @@
/obj/item/stack/sheet/metal{
amount = 50
},
-/obj/machinery/alarm{
+/obj/structure/cable/yellow{
+ d2 = 2;
+ icon_state = "0-2"
+ },
+/obj/machinery/power/apc{
+ dir = 1;
name = "north bump";
pixel_y = 24
},
@@ -39829,25 +38071,6 @@
icon_state = "dark"
},
/area/station/science/misc_lab)
-"cAH" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/turf/simulated/floor/plasteel{
- icon_state = "whitepurple"
- },
-/area/station/science/research)
"cAI" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -39876,17 +38099,6 @@
icon_state = "darkred"
},
/area/station/security/evidence)
-"cAK" = (
-/obj/machinery/atmospherics/pipe/simple/visible{
- dir = 4
- },
-/obj/machinery/power/apc{
- name = "south bump";
- pixel_y = -24
- },
-/obj/structure/cable/yellow,
-/turf/simulated/floor/plating,
-/area/station/maintenance/aft2)
"cAL" = (
/obj/effect/spawner/window/reinforced,
/obj/machinery/door/poddoor{
@@ -39912,20 +38124,17 @@
/turf/simulated/wall,
/area/station/maintenance/asmaint)
"cAP" = (
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/effect/turf_decal/stripes/line,
+/obj/effect/spawner/random_spawners/grille_often,
/turf/simulated/floor/plating,
/area/station/maintenance/starboard2)
"cAS" = (
-/obj/structure/closet/firecloset,
-/turf/simulated/floor/plating,
-/area/station/maintenance/asmaint)
+/obj/machinery/atmospherics/unary/outlet_injector{
+ dir = 1;
+ autolink_id = "air_in";
+ on = 1
+ },
+/turf/simulated/floor/engine,
+/area/station/science/test_chamber)
"cAT" = (
/obj/machinery/door/airlock/medical,
/obj/effect/mapping_helpers/airlock/autoname,
@@ -39983,20 +38192,17 @@
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/exit)
"cBj" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
+/obj/machinery/door/airlock/maintenance,
+/obj/effect/mapping_helpers/airlock/autoname,
+/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
-/obj/machinery/door/airlock/maintenance,
-/obj/effect/mapping_helpers/airlock/autoname,
-/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
/turf/simulated/floor/plating,
/area/station/maintenance/aft2)
"cBo" = (
@@ -40134,8 +38340,10 @@
/turf/simulated/floor/plating,
/area/station/medical/storage)
"cBG" = (
-/obj/machinery/atmospherics/portable/canister/oxygen,
-/turf/simulated/floor/plating,
+/obj/structure/bookcase{
+ name = "bookcase (Religious)"
+ },
+/turf/simulated/floor/wood,
/area/station/maintenance/starboard)
"cBJ" = (
/turf/simulated/wall,
@@ -40168,15 +38376,11 @@
/turf/simulated/floor/plating,
/area/station/maintenance/aft)
"cBO" = (
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "darkpurple"
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 6
},
+/turf/simulated/floor/plating,
/area/station/maintenance/aft2)
"cBP" = (
/obj/effect/turf_decal/stripes/white/line,
@@ -40189,9 +38393,21 @@
},
/area/station/science/research)
"cBQ" = (
-/obj/machinery/hydroponics/soil,
-/obj/item/seeds/tomato,
-/turf/simulated/floor/grass/no_creep,
+/obj/machinery/atmospherics/pipe/simple/hidden,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 4
+ },
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/structure/grille/broken,
+/turf/simulated/floor/plasteel,
/area/station/maintenance/asmaint)
"cBR" = (
/turf/simulated/wall/r_wall,
@@ -40217,17 +38433,25 @@
},
/area/station/science/server)
"cBT" = (
-/obj/machinery/economy/vending/cola,
-/turf/simulated/floor/plasteel{
- icon_state = "white"
+/obj/structure/table,
+/obj/item/retractor{
+ pixel_x = -6;
+ pixel_y = 6
},
-/area/station/science/research)
-"cBV" = (
-/obj/machinery/photocopier,
+/obj/item/bonegel,
+/obj/item/hemostat{
+ pixel_x = 6
+ },
+/obj/machinery/firealarm{
+ name = "north bump";
+ pixel_y = 24
+ },
+/obj/machinery/atmospherics/unary/vent_scrubber/on,
/turf/simulated/floor/plasteel{
- icon_state = "white"
+ dir = 1;
+ icon_state = "whitepurple"
},
-/area/station/science/research)
+/area/station/science/robotics)
"cBX" = (
/obj/machinery/light/small{
dir = 1
@@ -40341,12 +38565,11 @@
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
"cCr" = (
-/obj/machinery/atmospherics/unary/portables_connector,
-/obj/effect/spawner/lootdrop{
- loot = list(/obj/item/storage/box/mousetraps,/obj/item/storage/box/lights/tubes,/obj/item/storage/box/lights/mixed,/obj/item/storage/box/lights/bulbs);
- name = "Janitor Supplies Spawner"
- },
-/turf/simulated/floor/plating,
+/obj/structure/table/wood,
+/obj/item/book/manual/random,
+/obj/item/paicard,
+/obj/effect/spawner/random_spawners/cobweb_right_frequent,
+/turf/simulated/floor/wood,
/area/station/maintenance/starboard)
"cCs" = (
/obj/structure/sign/kiddieplaque/remembrance{
@@ -40518,14 +38741,13 @@
},
/area/station/medical/surgery/primary)
"cDa" = (
-/obj/effect/turf_decal/tile/purple{
- dir = 1
- },
-/obj/effect/turf_decal/tile/purple,
/obj/structure/window/reinforced{
dir = 1
},
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "purple"
+ },
/area/station/science/research)
"cDc" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -40558,10 +38780,12 @@
/area/station/medical/surgery/observation)
"cDi" = (
/obj/machinery/disposal,
-/obj/structure/disposalpipe/trunk,
/obj/machinery/atmospherics/pipe/simple/visible/purple{
dir = 4
},
+/obj/structure/disposalpipe/trunk{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -40591,11 +38815,30 @@
/turf/space,
/area/station/medical/virology)
"cDq" = (
-/obj/effect/turf_decal/stripes/line{
+/obj/structure/table/reinforced,
+/obj/item/assembly/prox_sensor{
+ pixel_x = -8;
+ pixel_y = 4
+ },
+/obj/item/assembly/prox_sensor{
+ pixel_x = 2;
+ pixel_y = -2
+ },
+/obj/item/assembly/prox_sensor{
+ pixel_x = -4;
+ pixel_y = 1
+ },
+/obj/item/assembly/prox_sensor{
+ pixel_x = 5;
+ pixel_y = 7
+ },
+/obj/machinery/light{
dir = 1
},
-/turf/simulated/floor/plating/airless,
-/area/space/nearstation)
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/science/toxins/launch)
"cDr" = (
/obj/item/toolbox_tiles{
desc = "Why won't it work?";
@@ -40638,12 +38881,6 @@
/obj/effect/landmark/damageturf,
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
-"cDz" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/simulated/floor/wood,
-/area/station/service/bar)
"cDA" = (
/obj/effect/turf_decal/tile/purple{
dir = 1
@@ -40687,20 +38924,18 @@
/turf/simulated/floor/plating,
/area/station/maintenance/aft)
"cDD" = (
-/obj/machinery/hydroponics/soil,
-/obj/item/seeds/chili,
-/turf/simulated/floor/grass/no_creep,
+/obj/machinery/light/small{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel,
/area/station/maintenance/asmaint)
"cDE" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
},
+/obj/machinery/hologram/holopad,
/turf/simulated/floor/engine,
/area/station/science/misc_lab)
-"cDG" = (
-/obj/structure/reagent_dispensers/fueltank,
-/turf/simulated/floor/plating,
-/area/station/maintenance/aft2)
"cDI" = (
/obj/structure/cable/yellow{
d1 = 4;
@@ -40730,40 +38965,6 @@
icon_state = "white"
},
/area/station/command/office/rd)
-"cDM" = (
-/obj/machinery/door/airlock/research,
-/obj/machinery/door/firedoor,
-/obj/structure/disposalpipe/segment,
-/obj/effect/mapping_helpers/airlock/autoname,
-/obj/effect/mapping_helpers/airlock/access/all/science/robotics,
-/turf/simulated/floor/plasteel{
- icon_state = "whitepurplefull"
- },
-/area/station/science/robotics)
-"cDN" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/command,
-/obj/effect/mapping_helpers/airlock/autoname,
-/obj/effect/mapping_helpers/airlock/access/all/science/rd,
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 4;
- icon_state = "1-4"
- },
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 8;
- icon_state = "1-8"
- },
-/turf/simulated/floor/plasteel{
- icon_state = "whitepurplefull"
- },
-/area/station/command/office/rd)
"cDO" = (
/turf/simulated/floor/plasteel{
dir = 5;
@@ -40854,9 +39055,6 @@
},
/area/station/science/genetics)
"cEd" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
@@ -40972,19 +39170,6 @@
icon_state = "neutralcorner"
},
/area/station/hallway/primary/aft)
-"cEy" = (
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/structure/window/reinforced{
- dir = 1
- },
-/obj/structure/flora/ausbushes/palebush,
-/obj/structure/flora/ausbushes/fernybush,
-/obj/structure/flora/ausbushes/fullgrass,
-/obj/structure/flora/ausbushes/brflowers,
-/turf/simulated/floor/grass/no_creep,
-/area/station/science/research)
"cEz" = (
/obj/structure/table/glass,
/obj/item/storage/box/bodybags{
@@ -41030,35 +39215,38 @@
icon_state = "whiteblue"
},
/area/station/medical/cloning)
-"cEF" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel{
- icon_state = "darkgrey"
- },
-/area/station/maintenance/aft2)
"cEG" = (
-/obj/machinery/hydroponics/soil,
-/obj/item/seeds/chanter,
-/turf/simulated/floor/grass/no_creep,
-/area/station/maintenance/asmaint)
-"cEI" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/disposalpipe/segment{
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/turf/simulated/floor/wood,
-/area/station/service/bar)
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 4
+ },
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/effect/decal/cleanable/blood/drip,
+/turf/simulated/floor/plasteel,
+/area/station/maintenance/asmaint)
"cEK" = (
/turf/simulated/wall/r_wall,
/area/station/science/toxins/mixing)
"cEN" = (
-/obj/structure/cable/yellow{
- d1 = 2;
- d2 = 8;
- icon_state = "2-8"
+/obj/structure/table/reinforced,
+/obj/machinery/firealarm{
+ dir = 1;
+ name = "south bump";
+ pixel_y = -24
},
-/turf/simulated/floor/plating,
-/area/station/maintenance/asmaint)
+/obj/item/clipboard,
+/obj/item/hand_labeler,
+/obj/structure/window/reinforced{
+ dir = 1
+ },
+/turf/simulated/floor/engine,
+/area/station/science/test_chamber)
"cEP" = (
/obj/machinery/door/airlock/medical/glass,
/obj/machinery/door/firedoor,
@@ -41170,26 +39358,24 @@
/area/station/science/toxins/test)
"cFc" = (
/obj/structure/cable/yellow{
- d1 = 1;
+ d1 = 2;
d2 = 4;
- icon_state = "1-4"
- },
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
+ icon_state = "2-4"
},
/obj/structure/cable/yellow{
- d1 = 1;
+ d1 = 2;
d2 = 8;
- icon_state = "1-8"
+ icon_state = "2-8"
},
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 1
},
-/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
-/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "whitepurple"
@@ -41199,12 +39385,16 @@
/turf/simulated/wall,
/area/station/medical/break_room)
"cFe" = (
-/obj/effect/turf_decal/delivery/hollow,
-/obj/machinery/atmospherics/portable/canister/oxygen,
+/obj/machinery/atmospherics/pipe/simple/hidden{
+ dir = 4
+ },
+/obj/structure/closet/firecloset,
+/obj/effect/spawner/lootdrop/maintenance,
/turf/simulated/floor/plasteel{
- icon_state = "darkgrey"
+ dir = 1;
+ icon_state = "whitepurple"
},
-/area/station/science/storage)
+/area/station/maintenance/asmaint)
"cFf" = (
/obj/structure/table/wood,
/obj/item/flashlight/lamp/green{
@@ -41239,21 +39429,6 @@
"cFm" = (
/turf/simulated/floor/mech_bay_recharge_floor,
/area/station/science/robotics/chargebay)
-"cFq" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plating,
-/area/station/maintenance/starboard)
"cFr" = (
/obj/machinery/iv_drip,
/turf/simulated/floor/plasteel{
@@ -41262,39 +39437,29 @@
},
/area/station/medical/virology)
"cFs" = (
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 10
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 10
+/obj/structure/window/reinforced{
+ dir = 1
},
-/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "whitepurplecorner"
+/obj/structure/window/reinforced,
+/obj/structure/window/reinforced{
+ dir = 8
},
+/obj/structure/flora/ausbushes/palebush,
+/obj/structure/flora/ausbushes/fernybush,
+/obj/structure/flora/ausbushes/ppflowers,
+/turf/simulated/floor/grass/no_creep,
/area/station/science/research)
+"cFt" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 8
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/aft2)
"cFv" = (
/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
/area/station/medical/virology)
-"cFx" = (
-/obj/structure/chair/office/light{
- dir = 8
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "darkpurple"
- },
-/area/station/maintenance/aft2)
"cFz" = (
/obj/structure/table/wood,
/obj/structure/cable/yellow{
@@ -41310,23 +39475,8 @@
},
/area/station/service/chapel/office)
"cFB" = (
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/structure/table,
-/obj/item/stack/sheet/metal/fifty{
- pixel_y = -3;
- pixel_x = 4
- },
-/obj/item/stack/sheet/glass/fifty{
- pixel_x = -10;
- pixel_y = 4
- },
-/turf/simulated/floor/plasteel{
- dir = 6;
- icon_state = "whitepurple"
- },
-/area/station/science/rnd)
+/turf/simulated/floor/plasteel,
+/area/station/maintenance/starboard2)
"cFD" = (
/obj/structure/table/wood,
/turf/simulated/floor/plasteel{
@@ -41342,23 +39492,14 @@
},
/area/station/medical/virology)
"cFG" = (
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
- },
-/obj/machinery/space_heater,
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 4;
- icon_state = "1-4"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 5
+/obj/effect/spawner/lootdrop{
+ loot = list(/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes);
+ name = "trash spawner"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 5
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 8
},
-/turf/simulated/floor/plating,
+/turf/simulated/floor/bluegrid,
/area/station/maintenance/starboard)
"cFH" = (
/turf/simulated/wall,
@@ -41373,18 +39514,6 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/starboardsolar)
-"cFN" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 9
- },
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 8;
- icon_state = "1-8"
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
-/turf/simulated/floor/plating,
-/area/station/maintenance/starboard)
"cFO" = (
/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
@@ -41497,9 +39626,13 @@
},
/area/station/science/genetics)
"cGi" = (
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
+/obj/structure/chair/stool{
+ dir = 8
+ },
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
},
/turf/simulated/floor/wood,
/area/station/service/bar)
@@ -41588,13 +39721,22 @@
},
/area/station/medical/virology)
"cGs" = (
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 4;
- icon_state = "1-4"
+/obj/structure/table/reinforced,
+/obj/machinery/alarm{
+ dir = 1;
+ name = "south bump";
+ pixel_y = -24
},
-/turf/simulated/floor/plating,
-/area/station/maintenance/asmaint)
+/obj/item/clothing/mask/gas,
+/obj/machinery/door/window/classic/reversed{
+ dir = 1;
+ name = "Area control access"
+ },
+/obj/effect/mapping_helpers/airlock/windoor/access/any/science/research{
+ dir = 1
+ },
+/turf/simulated/floor/engine,
+/area/station/science/test_chamber)
"cGt" = (
/obj/structure/cable,
/turf/simulated/floor/plating/airless,
@@ -41611,19 +39753,6 @@
/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
/area/station/medical/cryo)
-"cGx" = (
-/obj/structure/window/reinforced{
- dir = 4
- },
-/obj/structure/window/reinforced{
- dir = 1
- },
-/obj/structure/flora/ausbushes/palebush,
-/obj/structure/flora/ausbushes/fernybush,
-/obj/structure/flora/ausbushes/fullgrass,
-/obj/structure/flora/ausbushes/brflowers,
-/turf/simulated/floor/grass/no_creep,
-/area/station/science/research)
"cGy" = (
/obj/item/radio/beacon,
/obj/effect/turf_decal/stripes/line{
@@ -41639,17 +39768,12 @@
name = "west bump";
pixel_x = -27
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 5
- },
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
- },
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "whitepurplecorner"
+/obj/structure/window/reinforced{
+ dir = 4
},
+/obj/structure/flora/ausbushes/fernybush,
+/obj/structure/flora/ausbushes/ppflowers,
+/turf/simulated/floor/grass/no_creep,
/area/station/science/research)
"cGA" = (
/obj/structure/chair/comfy/black{
@@ -41725,11 +39849,10 @@
},
/area/station/science/xenobiology)
"cGV" = (
-/obj/machinery/atmospherics/pipe/manifold/visible{
- dir = 8
+/obj/machinery/door/airlock/maintenance,
+/turf/simulated/floor/plasteel{
+ icon_state = "cult"
},
-/obj/machinery/atmospherics/meter,
-/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
"cGX" = (
/obj/machinery/economy/vending/coffee,
@@ -41906,9 +40029,12 @@
},
/area/station/medical/virology)
"cHq" = (
-/obj/structure/closet/wardrobe/grey,
-/turf/simulated/floor/plating,
-/area/station/maintenance/asmaint)
+/obj/structure/disposaloutlet,
+/obj/structure/disposalpipe/trunk{
+ dir = 4
+ },
+/turf/simulated/floor/engine,
+/area/station/science/test_chamber)
"cHr" = (
/obj/structure/cable/yellow{
d1 = 2;
@@ -41973,16 +40099,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel,
/area/station/security/prison/cell_block/A)
-"cHx" = (
-/obj/machinery/atmospherics/unary/vent_pump/on{
- dir = 4
- },
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "whitepurplecorner"
- },
-/area/station/science/research)
"cHy" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/landmark/burnturf,
@@ -41993,11 +40109,6 @@
icon_state = "C4"
},
/area/station/hallway/primary/central)
-"cHD" = (
-/obj/machinery/hydroponics/soil,
-/obj/item/seeds/berry,
-/turf/simulated/floor/grass/no_creep,
-/area/station/maintenance/asmaint)
"cHJ" = (
/obj/structure/bed,
/obj/item/bedsheet/medical,
@@ -42070,11 +40181,8 @@
},
/area/station/service/chapel/office)
"cHV" = (
-/obj/machinery/iv_drip,
-/obj/structure/bed/roller,
-/turf/simulated/floor/plasteel{
- icon_state = "showroomfloor"
- },
+/obj/item/reagent_containers/glass/bucket,
+/turf/simulated/floor/wood,
/area/station/maintenance/starboard2)
"cHX" = (
/obj/structure/chair,
@@ -42083,8 +40191,8 @@
},
/area/station/service/chapel)
"cHY" = (
-/obj/machinery/biogenerator,
-/turf/simulated/floor/plating,
+/obj/effect/spawner/random_spawners/fungus_maybe,
+/turf/simulated/wall,
/area/station/maintenance/asmaint)
"cHZ" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
@@ -42306,13 +40414,15 @@
/area/station/maintenance/aft)
"cIE" = (
/obj/structure/window/reinforced{
- dir = 4
+ dir = 1
},
/obj/structure/window/reinforced,
+/obj/structure/window/reinforced{
+ dir = 4
+ },
/obj/structure/flora/ausbushes/palebush,
/obj/structure/flora/ausbushes/fernybush,
-/obj/structure/flora/ausbushes/fullgrass,
-/obj/structure/flora/ausbushes/brflowers,
+/obj/structure/flora/ausbushes/ppflowers,
/turf/simulated/floor/grass/no_creep,
/area/station/science/research)
"cIF" = (
@@ -42324,14 +40434,14 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
-"cIH" = (
-/obj/item/plant_analyzer,
-/turf/simulated/floor/plating,
-/area/station/maintenance/asmaint)
"cIM" = (
-/obj/machinery/hydroponics/soil,
-/obj/item/seeds/banana,
-/turf/simulated/floor/grass/no_creep,
+/obj/machinery/shower{
+ pixel_y = 8;
+ on = 1
+ },
+/obj/effect/turf_decal/box,
+/mob/living/carbon/human/monkey,
+/turf/simulated/floor/plasteel,
/area/station/maintenance/asmaint)
"cIP" = (
/mob/living/simple_animal/slime,
@@ -42376,17 +40486,6 @@
icon_state = "whiteblue"
},
/area/station/medical/reception)
-"cIW" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 1
- },
-/turf/simulated/floor/plasteel{
- icon_state = "white"
- },
-/area/station/science/toxins/mixing)
"cIX" = (
/obj/machinery/hologram/holopad,
/obj/effect/turf_decal/delivery/blue/hollow,
@@ -42446,21 +40545,6 @@
/obj/machinery/atmospherics/portable/canister,
/turf/simulated/floor/plasteel,
/area/station/engineering/atmos)
-"cJd" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel,
-/area/station/maintenance/starboard)
"cJj" = (
/obj/structure/chair/comfy/black{
dir = 8
@@ -42475,21 +40559,32 @@
},
/area/station/service/chapel)
"cJk" = (
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
+/obj/machinery/atmospherics/binary/valve/open{
+ dir = 4
},
+/obj/effect/landmark/spawner/xeno,
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint)
"cJl" = (
-/obj/machinery/constructable_frame/machine_frame,
-/obj/machinery/light_construct{
+/obj/structure/disposalpipe/segment{
+ dir = 8;
+ icon_state = "pipe-c"
+ },
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/obj/item/broken_device,
-/obj/effect/landmark/damageturf,
-/turf/simulated/floor/plating,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "whitehall"
+ },
/area/station/maintenance/aft2)
"cJm" = (
/obj/machinery/power/smes,
@@ -42517,22 +40612,6 @@
"cJp" = (
/turf/simulated/wall,
/area/station/science/robotics)
-"cJu" = (
-/obj/structure/window/reinforced{
- dir = 1
- },
-/turf/simulated/floor/grass/no_creep,
-/area/station/maintenance/aft2)
-"cJv" = (
-/obj/item/stock_parts/cell/high,
-/turf/simulated/floor/plating,
-/area/station/maintenance/starboard)
-"cJz" = (
-/obj/structure/table,
-/obj/item/toy/figure/crew/geneticist,
-/obj/effect/spawner/lootdrop/maintenance,
-/turf/simulated/floor/plating,
-/area/station/maintenance/aft2)
"cJA" = (
/obj/machinery/computer/secure_data{
dir = 4
@@ -42548,19 +40627,6 @@
icon_state = "darkgrey"
},
/area/station/medical/morgue)
-"cJD" = (
-/obj/structure/sink{
- dir = 8;
- pixel_x = -12
- },
-/obj/structure/sign/poster/contraband/random{
- pixel_x = -32
- },
-/obj/effect/turf_decal/stripes/corner{
- dir = 8
- },
-/turf/simulated/floor/plating,
-/area/station/maintenance/asmaint)
"cJF" = (
/obj/effect/turf_decal/stripes/corner,
/turf/simulated/floor/plating/airless,
@@ -42711,9 +40777,25 @@
},
/area/station/science/xenobiology)
"cKi" = (
-/obj/structure/reagent_dispensers/watertank,
-/turf/simulated/floor/plating,
-/area/station/maintenance/asmaint)
+/obj/structure/table,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/cell/high,
+/obj/item/radio/intercom{
+ name = "north bump";
+ pixel_y = 28
+ },
+/obj/machinery/firealarm{
+ dir = 8;
+ name = "west bump";
+ pixel_x = -24
+ },
+/obj/machinery/light{
+ dir = 1
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/science/explab)
"cKj" = (
/obj/effect/turf_decal/delivery/blue/partial,
/obj/effect/turf_decal/stripes/line,
@@ -42799,11 +40881,6 @@
icon_state = "neutralcorner"
},
/area/station/hallway/primary/aft)
-"cKr" = (
-/obj/structure/closet/crate/hydroponics,
-/obj/effect/spawner/lootdrop/maintenance/two,
-/turf/simulated/floor/plating,
-/area/station/maintenance/asmaint)
"cKu" = (
/obj/machinery/r_n_d/experimentor,
/turf/simulated/floor/engine,
@@ -42829,7 +40906,18 @@
},
/area/station/command/office/rd)
"cKx" = (
-/obj/machinery/light{
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/turf/simulated/floor/plasteel{
@@ -42896,24 +40984,30 @@
},
/area/station/maintenance/aft)
"cKG" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 1
+/obj/machinery/atmospherics/pipe/simple/hidden{
+ dir = 4
},
+/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
-/area/station/maintenance/aft2)
+/area/station/maintenance/asmaint)
"cKI" = (
/turf/simulated/wall,
/area/space/nearstation)
"cKJ" = (
-/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/machinery/door_control{
+ pixel_x = -26;
+ id = "maintcham";
+ name = "Containment Control"
+ },
+/obj/item/storage/bag/bio,
+/obj/item/slime_extract,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint)
"cKL" = (
@@ -42947,6 +41041,16 @@
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/carpet,
/area/station/science/robotics/showroom)
+"cKS" = (
+/obj/item/transfer_valve{
+ pixel_x = -6;
+ pixel_y = 6
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 10
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/aft2)
"cKV" = (
/obj/structure/cable/yellow,
/obj/machinery/power/apc{
@@ -43066,7 +41170,9 @@
},
/area/station/medical/surgery/secondary)
"cLl" = (
-/turf/simulated/floor/grass,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
+/turf/simulated/floor/plasteel,
/area/station/maintenance/aft2)
"cLm" = (
/obj/item/kirbyplants{
@@ -43075,27 +41181,30 @@
/obj/machinery/light/small{
dir = 8
},
-/obj/effect/turf_decal/tile/purple,
-/obj/effect/turf_decal/tile/purple{
- dir = 1
- },
/obj/structure/window/reinforced{
dir = 1
},
-/turf/simulated/floor/plasteel,
+/obj/structure/extinguisher_cabinet{
+ name = "west bump";
+ pixel_x = -27
+ },
+/turf/simulated/floor/plasteel{
+ dir = 9;
+ icon_state = "purple"
+ },
/area/station/science/research)
"cLn" = (
/obj/effect/turf_decal/delivery,
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/exit)
"cLr" = (
-/obj/structure/reagent_dispensers/fueltank,
-/obj/effect/spawner/lootdrop{
- loot = list(/obj/item/storage/box/mousetraps,/obj/item/storage/box/lights/tubes,/obj/item/storage/box/lights/mixed,/obj/item/storage/box/lights/bulbs);
- name = "Janitor Supplies Spawner"
+/obj/structure/closet/firecloset,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/spawner/lootdrop/maintenance,
+/turf/simulated/floor/plasteel{
+ dir = 6;
+ icon_state = "caution"
},
-/obj/effect/landmark/damageturf,
-/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
"cLt" = (
/obj/effect/turf_decal/stripes/end,
@@ -43148,7 +41257,7 @@
},
/area/station/hallway/primary/central)
"cLF" = (
-/obj/effect/landmark/damageturf,
+/obj/structure/table_frame/wood,
/turf/simulated/floor/plating,
/area/station/maintenance/starboard2)
"cLI" = (
@@ -43230,13 +41339,6 @@
icon_state = "whitebluefull"
},
/area/station/medical/break_room)
-"cLV" = (
-/obj/structure/sign/greencross{
- pixel_y = 32
- },
-/obj/machinery/optable,
-/turf/simulated/floor/plating,
-/area/station/maintenance/starboard2)
"cLX" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -43255,6 +41357,20 @@
icon_state = "whitebluecorner"
},
/area/station/medical/medbay)
+"cLY" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/science/research)
"cMb" = (
/turf/simulated/floor/plating,
/area/station/maintenance/medmaint)
@@ -43273,6 +41389,9 @@
dir = 4
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/central)
"cMi" = (
@@ -43462,8 +41581,16 @@
/turf/simulated/floor/plating,
/area/station/public/storage/emergency/port)
"cNc" = (
-/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/light/small{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
"cNe" = (
@@ -43474,13 +41601,15 @@
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
"cNf" = (
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 4;
- icon_state = "1-4"
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/power/apc{
+ dir = 1;
+ name = "north bump";
+ pixel_y = 24
},
-/obj/machinery/atmospherics/pipe/simple/visible{
- dir = 6
+/obj/structure/cable/yellow{
+ d2 = 2;
+ icon_state = "0-2"
},
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint)
@@ -43585,8 +41714,17 @@
/area/station/maintenance/medmaint)
"cNy" = (
/obj/item/kirbyplants,
-/obj/machinery/atmospherics/unary/vent_pump/on{
- dir = 1
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 9
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 8;
+ icon_state = "pipe-c"
+ },
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
},
/turf/simulated/floor/plasteel{
dir = 1;
@@ -43645,15 +41783,15 @@
dir = 8;
network = list("Research","SS13")
},
-/obj/machinery/atmospherics/unary/vent_pump/on{
- dir = 1
- },
/obj/structure/disposalpipe/segment,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -43806,17 +41944,6 @@
icon_state = "whiteblue"
},
/area/station/medical/surgery/secondary)
-"cOc" = (
-/obj/machinery/power/apc{
- name = "south bump";
- pixel_y = -24
- },
-/obj/structure/cable/yellow{
- d2 = 4;
- icon_state = "0-4"
- },
-/turf/simulated/floor/plating,
-/area/station/maintenance/asmaint)
"cOf" = (
/obj/structure/cable/yellow{
d1 = 1;
@@ -43832,25 +41959,24 @@
},
/area/station/hallway/primary/aft)
"cOh" = (
-/obj/structure/closet/crate/plastic,
+/obj/structure/closet/crate/freezer,
/obj/effect/spawner/lootdrop/maintenance,
-/turf/simulated/floor/plating,
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plasteel{
+ dir = 5;
+ icon_state = "whitepurple"
+ },
/area/station/maintenance/asmaint)
"cOi" = (
+/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
/turf/simulated/floor/plating,
/area/station/maintenance/aft2)
"cOk" = (
@@ -43860,31 +41986,26 @@
/obj/machinery/light/small{
dir = 4
},
-/obj/effect/turf_decal/tile/purple,
-/obj/effect/turf_decal/tile/purple{
- dir = 1
- },
/obj/structure/window/reinforced{
dir = 1
},
-/turf/simulated/floor/plasteel,
+/obj/machinery/atmospherics/unary/vent_pump/on,
+/turf/simulated/floor/plasteel{
+ dir = 5;
+ icon_state = "purple"
+ },
/area/station/science/research)
"cOm" = (
-/obj/effect/spawner/window/reinforced,
-/turf/simulated/floor/plating,
-/area/station/science/research)
+/obj/structure/chair/comfy/black{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "cafeteria"
+ },
+/area/station/science/break_room)
"cOp" = (
/turf/simulated/wall/r_wall,
/area/station/maintenance/aft2)
-"cOt" = (
-/obj/structure/table,
-/obj/item/clothing/suit/cyborg_suit,
-/obj/item/clothing/mask/gas/cyborg,
-/obj/machinery/light/small{
- dir = 8
- },
-/turf/simulated/floor/plating,
-/area/station/maintenance/asmaint)
"cOy" = (
/obj/structure/fans/tiny,
/obj/machinery/door/poddoor{
@@ -43940,6 +42061,10 @@
/obj/structure/flora/rock/jungle,
/turf/simulated/floor/grass/no_creep,
/area/station/medical/virology)
+"cOJ" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard)
"cOL" = (
/obj/effect/spawner/window/reinforced/tinted,
/turf/simulated/floor/plating,
@@ -43988,6 +42113,9 @@
pixel_x = -32
},
/obj/structure/table/reinforced,
+/obj/machinery/light{
+ dir = 1
+ },
/turf/simulated/floor/engine,
/area/station/science/misc_lab)
"cOT" = (
@@ -44038,27 +42166,6 @@
"cPc" = (
/turf/simulated/wall,
/area/station/maintenance/asmaint)
-"cPd" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/effect/spawner/lootdrop{
- loot = list(/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes);
- name = "trash spawner"
- },
-/turf/simulated/floor/plating,
-/area/station/maintenance/starboard)
"cPe" = (
/obj/machinery/camera{
c_tag = "Xenobiology Lab - Central Fore";
@@ -44077,22 +42184,24 @@
},
/area/station/science/xenobiology)
"cPf" = (
-/obj/structure/chair/comfy{
- dir = 8
+/obj/structure/table/reinforced,
+/obj/machinery/ignition_switch{
+ id = "testigniter";
+ pixel_x = 3;
+ pixel_y = -3
},
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
- dir = 1
+/obj/machinery/door_control{
+ id = "RnDChem";
+ name = "Chamber Blast Doors";
+ pixel_x = 3;
+ pixel_y = 5
},
-/obj/effect/turf_decal/tile/purple,
-/obj/effect/turf_decal/tile/purple{
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 1
},
-/obj/machinery/alarm{
- dir = 1;
- name = "south bump";
- pixel_y = -24
+/turf/simulated/floor/plasteel{
+ icon_state = "purple"
},
-/turf/simulated/floor/plasteel,
/area/station/science/research)
"cPh" = (
/obj/structure/cable/yellow{
@@ -44283,23 +42392,6 @@
icon_state = "neutralcorner"
},
/area/station/hallway/secondary/exit)
-"cPQ" = (
-/obj/structure/sign/poster/contraband/random{
- pixel_y = 32
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/turf/simulated/floor/plating,
-/area/station/maintenance/starboard2)
"cPT" = (
/obj/structure/cable/yellow{
d1 = 4;
@@ -44457,14 +42549,21 @@
icon_state = "dark"
},
/area/station/medical/surgery/secondary)
-"cQE" = (
-/obj/machinery/hydroponics/soil,
-/obj/item/seeds/sugarcane,
-/turf/simulated/floor/grass/no_creep,
-/area/station/maintenance/asmaint)
"cQF" = (
-/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/machinery/door/airlock/maintenance,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
+/obj/effect/mapping_helpers/airlock/autoname,
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 4
+ },
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
"cQG" = (
@@ -44497,6 +42596,12 @@
/area/station/maintenance/disposal)
"cQK" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "whitepurple"
@@ -44603,6 +42708,20 @@
},
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/exit)
+"cRo" = (
+/obj/machinery/optable{
+ name = "Robotics Operating Table"
+ },
+/obj/item/storage/firstaid/machine,
+/obj/structure/extinguisher_cabinet{
+ name = "south bump";
+ pixel_y = -30
+ },
+/obj/effect/decal/cleanable/blood/old,
+/turf/simulated/floor/plasteel{
+ icon_state = "whitepurple"
+ },
+/area/station/science/robotics)
"cRp" = (
/obj/structure/table/glass,
/obj/item/circular_saw,
@@ -44690,13 +42809,15 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 4;
icon_state = "1-4"
},
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/exit)
"cRB" = (
@@ -44716,12 +42837,18 @@
/obj/machinery/light/small{
dir = 4
},
-/obj/effect/turf_decal/tile/purple,
-/obj/effect/turf_decal/tile/purple{
- dir = 1
+/obj/machinery/alarm{
+ dir = 1;
+ name = "south bump";
+ pixel_y = -24
+ },
+/obj/machinery/atmospherics/unary/portables_connector{
+ dir = 8
+ },
+/turf/simulated/floor/plasteel{
+ dir = 6;
+ icon_state = "purple"
},
-/obj/structure/table,
-/turf/simulated/floor/plasteel,
/area/station/science/research)
"cRJ" = (
/obj/structure/chair{
@@ -44824,24 +42951,12 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/medmaint)
-"cRX" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+"cSa" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
dir = 4
},
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/effect/landmark/damageturf,
-/turf/simulated/floor/plating,
-/area/station/maintenance/starboard2)
-"cSa" = (
-/turf/simulated/floor/plasteel{
- icon_state = "showroomfloor"
+/turf/simulated/floor/wood{
+ icon_state = "wood-broken4"
},
/area/station/maintenance/starboard2)
"cSg" = (
@@ -45064,20 +43179,7 @@
icon_state = "darkgrey"
},
/area/station/service/chapel)
-"cSV" = (
-/obj/machinery/door/airlock/maintenance,
-/obj/effect/mapping_helpers/airlock/autoname,
-/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel,
-/area/station/maintenance/starboard)
"cSX" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
@@ -45086,26 +43188,17 @@
/obj/effect/turf_decal/stripes/line{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/exit)
"cSY" = (
-/obj/effect/landmark/spawner/nukedisc_respawn,
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 1
},
/turf/simulated/floor/plating,
/area/station/maintenance/aft2)
-"cSZ" = (
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/obj/effect/landmark/burnturf,
-/turf/simulated/floor/plating,
-/area/station/maintenance/asmaint)
"cTc" = (
/obj/structure/cable/yellow{
d1 = 1;
@@ -45139,8 +43232,14 @@
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/exit)
"cTk" = (
-/obj/machinery/seed_extractor,
-/turf/simulated/floor/plating,
+/obj/effect/decal/remains/human{
+ desc = "This guy seemed to have died in terrible way! Half his remains are dust.";
+ name = "Human remains"
+ },
+/turf/simulated/floor/plasteel{
+ dir = 10;
+ icon_state = "vault"
+ },
/area/station/maintenance/asmaint)
"cTo" = (
/obj/structure/cable/yellow{
@@ -45252,17 +43351,9 @@
/turf/simulated/floor/carpet,
/area/station/service/chapel)
"cTI" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 10
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/obj/effect/turf_decal/stripes/corner{
dir = 1
},
@@ -45355,10 +43446,19 @@
},
/area/station/medical/medbay)
"cUf" = (
-/obj/structure/closet/crate/sci,
-/obj/effect/spawner/lootdrop/maintenance,
-/turf/simulated/floor/plating,
-/area/station/maintenance/asmaint)
+/obj/machinery/power/apc{
+ dir = 8;
+ name = "west bump";
+ pixel_x = -24
+ },
+/obj/structure/cable/yellow{
+ d2 = 4;
+ icon_state = "0-4"
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/science/explab)
"cUg" = (
/obj/machinery/door/morgue{
name = "Chapel Garden"
@@ -45446,18 +43546,10 @@
pixel_x = -15;
pixel_y = 4
},
-/obj/machinery/light{
- dir = 1
- },
-/obj/structure/cable/yellow{
- d2 = 4;
- icon_state = "0-4"
- },
/obj/effect/turf_decal/stripes/line{
dir = 4
},
-/obj/machinery/power/apc{
- dir = 1;
+/obj/machinery/alarm{
name = "north bump";
pixel_y = 24
},
@@ -45561,33 +43653,31 @@
icon_state = "red"
},
/area/station/security/permabrig)
-"cUN" = (
-/obj/structure/sign/securearea{
- pixel_y = -32
- },
-/turf/simulated/floor/plasteel{
- icon_state = "white"
- },
-/area/station/maintenance/aft2)
"cUQ" = (
-/obj/machinery/hologram/holopad,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 10
+ },
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
/area/station/science/misc_lab)
"cUT" = (
/obj/machinery/disposal,
-/obj/effect/turf_decal/tile/purple,
-/obj/effect/turf_decal/tile/purple{
- dir = 1
- },
/obj/effect/turf_decal/delivery,
/obj/structure/disposalpipe/trunk,
/obj/structure/window/reinforced{
dir = 1
},
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "purple"
+ },
/area/station/science/research)
"cUV" = (
/obj/machinery/hologram/holopad,
@@ -45679,11 +43769,6 @@
/obj/structure/railing,
/turf/simulated/floor/plating/airless,
/area/space/nearstation)
-"cVn" = (
-/obj/structure/closet,
-/obj/item/storage/box/lights/mixed,
-/turf/simulated/floor/plating,
-/area/station/maintenance/asmaint)
"cVo" = (
/obj/structure/reagent_dispensers/fueltank/chem{
pixel_x = 32
@@ -45692,6 +43777,9 @@
pixel_y = 7
},
/obj/structure/table/reinforced,
+/obj/machinery/light{
+ dir = 1
+ },
/turf/simulated/floor/engine,
/area/station/science/misc_lab)
"cVp" = (
@@ -45998,18 +44086,6 @@
icon_state = "white"
},
/area/station/medical/virology)
-"cWz" = (
-/obj/effect/spawner/lootdrop{
- loot = list(/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes);
- name = "trash spawner"
- },
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/turf/simulated/floor/plating,
-/area/station/maintenance/asmaint)
"cWB" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -46024,10 +44100,15 @@
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/exit)
"cWF" = (
-/obj/item/chair{
- dir = 1
+/obj/structure/closet/secure_closet/personal,
+/obj/effect/spawner/lootdrop/maintenance,
+/obj/item/clothing/suit/storage/labcoat/science,
+/obj/item/clothing/under/rank/rnd/scientist,
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "whitehall"
},
-/turf/simulated/floor/plating,
/area/station/maintenance/aft2)
"cWG" = (
/obj/structure/disposalpipe/segment{
@@ -46154,8 +44235,17 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 1
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/structure/cable/yellow{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
+/obj/structure/disposalpipe/junction{
+ dir = 2;
+ icon_state = "pipe-y"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 1
@@ -46216,12 +44306,6 @@
/obj/effect/spawner/random_spawners/cobweb_right_rare,
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
-"cXx" = (
-/obj/structure/closet,
-/obj/item/wirerod,
-/obj/effect/spawner/lootdrop/maintenance/three,
-/turf/simulated/floor/plating,
-/area/station/maintenance/starboard2)
"cXz" = (
/obj/machinery/door/airlock/external{
id_tag = "emergency_home";
@@ -46298,15 +44382,6 @@
/obj/effect/turf_decal/delivery/hollow,
/turf/simulated/floor/plasteel,
/area/station/maintenance/fsmaint)
-"cXN" = (
-/obj/effect/spawner/airlock,
-/turf/simulated/wall/r_wall,
-/area/station/maintenance/aft2)
-"cXO" = (
-/obj/structure/rack,
-/obj/item/clothing/mask/gas,
-/turf/simulated/floor/plating,
-/area/station/maintenance/aft2)
"cXQ" = (
/obj/structure/table/wood,
/obj/structure/disposalpipe/segment,
@@ -46325,12 +44400,6 @@
icon_state = "white"
},
/area/station/science/xenobiology)
-"cXW" = (
-/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/effect/landmark/damageturf,
-/turf/simulated/floor/plating,
-/area/station/maintenance/asmaint)
"cXX" = (
/obj/structure/chair/comfy/black{
dir = 8
@@ -46417,21 +44486,6 @@
icon_state = "grimy"
},
/area/station/service/chapel/office)
-"cYm" = (
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/turf/simulated/floor/plating,
-/area/station/maintenance/starboard2)
"cYq" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/greenglow,
@@ -46464,10 +44518,10 @@
/turf/simulated/floor/plating/airless,
/area/station/science/toxins/test)
"cYB" = (
-/obj/machinery/atmospherics/unary/tank/air,
-/obj/effect/decal/cleanable/cobweb2,
-/turf/simulated/floor/plating,
-/area/station/maintenance/starboard)
+/obj/machinery/economy/vending/hydrodrobe,
+/obj/effect/spawner/random_spawners/cobweb_right_frequent,
+/turf/simulated/floor/plasteel,
+/area/station/maintenance/starboard2)
"cYC" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 9
@@ -46534,25 +44588,10 @@
icon_state = "whiteblue"
},
/area/station/medical/surgery/secondary)
-"cYT" = (
-/obj/structure/table_frame,
-/obj/structure/extinguisher_cabinet/empty{
- icon_state = "extinguisher_empty";
- opened = 1;
- pixel_x = 27
- },
-/obj/item/stack/sheet/metal,
-/turf/simulated/floor/grass,
-/area/station/maintenance/aft2)
-"cYZ" = (
-/obj/structure/table,
-/obj/item/storage/box{
- pixel_x = 2;
- pixel_y = 4
- },
-/obj/item/clothing/gloves/color/latex,
+"cYQ" = (
+/obj/effect/spawner/window,
/turf/simulated/floor/plating,
-/area/station/maintenance/aft2)
+/area/station/service/hydroponics)
"cZa" = (
/obj/machinery/camera{
c_tag = "Bomb Test Site";
@@ -46645,23 +44684,6 @@
"cZr" = (
/turf/simulated/wall,
/area/station/science/xenobiology)
-"cZs" = (
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/turf/simulated/floor/plating,
-/area/station/maintenance/aft2)
"cZw" = (
/obj/machinery/alarm{
name = "north bump";
@@ -46694,18 +44716,9 @@
/turf/simulated/floor/plating,
/area/station/maintenance/starboardsolar)
"cZD" = (
-/obj/structure/disposalpipe/segment,
/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
+/obj/structure/closet/emcloset,
+/obj/effect/spawner/lootdrop/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
"cZI" = (
@@ -46730,13 +44743,6 @@
},
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/port)
-"cZS" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
- dir = 8
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel,
-/area/station/service/hydroponics)
"cZX" = (
/obj/machinery/light{
dir = 8
@@ -46751,15 +44757,8 @@
},
/area/station/service/chapel)
"cZY" = (
-/obj/structure/reagent_dispensers/watertank,
-/turf/simulated/floor/plating,
+/turf/simulated/floor/mech_bay_recharge_floor,
/area/station/maintenance/starboard2)
-"daa" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel{
- icon_state = "purplefull"
- },
-/area/station/hallway/primary/aft)
"dac" = (
/obj/structure/chair{
dir = 8
@@ -46819,20 +44818,29 @@
/turf/simulated/floor/plating,
/area/station/maintenance/aft)
"dag" = (
-/obj/structure/rack,
-/obj/item/wrench,
-/turf/simulated/floor/plating,
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/plasteel,
/area/station/maintenance/aft2)
"dak" = (
/obj/effect/decal/cleanable/cobweb2,
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
-"dam" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/delivery/hollow,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
+"dal" = (
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 1
},
+/turf/simulated/floor/plasteel{
+ icon_state = "darkgrey"
+ },
+/area/station/science/toxins/launch)
+"dam" = (
+/obj/effect/turf_decal/delivery/white/hollow,
/turf/simulated/floor/plasteel{
icon_state = "darkgrey"
},
@@ -46907,22 +44915,17 @@
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/exit)
"daw" = (
-/obj/structure/table,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/high,
-/obj/item/radio/intercom{
- name = "north bump";
- pixel_y = 28
- },
-/obj/machinery/firealarm{
- dir = 8;
- name = "west bump";
- pixel_x = -24
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
},
-/turf/simulated/floor/plasteel{
- icon_state = "white"
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
},
-/area/station/science/explab)
+/turf/simulated/floor/plasteel,
+/area/station/maintenance/starboard2)
"dax" = (
/obj/structure/chair/sofa/corp/left,
/obj/machinery/light{
@@ -46956,20 +44959,24 @@
},
/area/station/hallway/secondary/bridge)
"daG" = (
-/obj/machinery/light{
- dir = 8
+/obj/effect/turf_decal/siding{
+ dir = 10
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 8
+/obj/item/radio/intercom{
+ name = "west bump";
+ pixel_x = -28
},
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
+/obj/effect/turf_decal/stripes/line{
+ dir = 6
+ },
+/obj/effect/turf_decal/siding{
+ dir = 6
+ },
+/obj/machinery/shower{
+ dir = 4
},
/turf/simulated/floor/plasteel{
- icon_state = "white"
+ icon_state = "darkgreycheck"
},
/area/station/science/research)
"daL" = (
@@ -47017,15 +45024,6 @@
icon_state = "white"
},
/area/station/medical/medbay)
-"daQ" = (
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/structure/girder,
-/turf/simulated/floor/plating,
-/area/station/maintenance/asmaint)
"daS" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -47056,16 +45054,6 @@
icon_state = "dark"
},
/area/station/security/permabrig)
-"daZ" = (
-/obj/machinery/economy/vending/autodrobe,
-/obj/structure/sign/poster/contraband/random{
- pixel_y = 32
- },
-/obj/structure/sign/poster/contraband/clown{
- pixel_x = 32
- },
-/turf/simulated/floor/wood,
-/area/station/service/theatre)
"dbb" = (
/obj/structure/closet/emcloset,
/turf/simulated/floor/plasteel{
@@ -47079,20 +45067,25 @@
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/exit)
"dbl" = (
-/obj/effect/spawner/lootdrop{
- loot = list(/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes);
- name = "trash spawner"
+/obj/structure/table,
+/obj/item/tank/internals/anesthetic{
+ pixel_x = 2
},
-/obj/effect/turf_decal/stripes/line,
-/turf/simulated/floor/plating,
-/area/station/maintenance/aft2)
-"dbp" = (
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
+/obj/item/reagent_containers/spray/cleaner{
+ desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back.";
+ name = "Surgery Cleaner";
+ pixel_x = -10;
+ pixel_y = 1
},
-/turf/simulated/floor/wood,
-/area/station/service/bar)
+/obj/item/clothing/mask/breath/medical,
+/obj/machinery/light{
+ dir = 8
+ },
+/turf/simulated/floor/plasteel{
+ dir = 10;
+ icon_state = "whitepurple"
+ },
+/area/station/science/robotics)
"dbv" = (
/obj/structure/window/reinforced{
dir = 8
@@ -47126,13 +45119,11 @@
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
"dbC" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/universal{
- dir = 4
- },
-/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
-/obj/machinery/door/airlock/maintenance,
-/turf/simulated/floor/plating,
-/area/station/maintenance/starboard)
+/obj/effect/spawner/random_spawners/cobweb_left_rare,
+/obj/structure/closet/crate/secure/loot,
+/obj/item/circuitboard/biogenerator,
+/turf/simulated/floor/plasteel,
+/area/station/maintenance/starboard2)
"dbE" = (
/obj/docking_port/stationary{
dheight = 9;
@@ -47167,26 +45158,15 @@
/turf/simulated/floor/plating,
/area/station/maintenance/aft)
"dbI" = (
-/obj/effect/spawner/lootdrop/maintenance,
-/turf/simulated/floor/plating,
-/area/station/maintenance/starboard)
-"dbK" = (
-/obj/machinery/light_construct{
- dir = 4
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
},
-/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance,
-/turf/simulated/floor/grass,
-/area/station/maintenance/aft2)
-"dbV" = (
-/obj/structure/rack,
-/obj/item/extinguisher,
-/obj/item/storage/belt/utility,
-/obj/effect/spawner/lootdrop{
- loot = list(/obj/item/storage/box/mousetraps,/obj/item/storage/box/lights/tubes,/obj/item/storage/box/lights/mixed,/obj/item/storage/box/lights/bulbs);
- name = "Janitor Supplies Spawner"
+/turf/simulated/floor/wood{
+ icon_state = "wood-broken3"
},
-/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
"dcd" = (
/obj/effect/turf_decal/stripes/line{
@@ -47197,6 +45177,10 @@
},
/turf/simulated/floor/plating/airless,
/area/station/science/toxins/test)
+"dce" = (
+/obj/structure/dispenser,
+/turf/simulated/floor/plasteel,
+/area/station/science/toxins/mixing)
"dch" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable{
@@ -47212,15 +45196,11 @@
/turf/space,
/area/station/engineering/solar/auxstarboard)
"dcj" = (
-/obj/machinery/light/small{
- dir = 8
- },
+/obj/structure/chair/sofa/left,
+/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random_spawners/cobweb_right_rare,
/turf/simulated/floor/plating,
/area/station/maintenance/starboard2)
-"dck" = (
-/obj/machinery/atmospherics/unary/tank/air,
-/turf/simulated/floor/plating,
-/area/station/maintenance/starboard)
"dcq" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable{
@@ -47258,21 +45238,29 @@
},
/area/station/science/server)
"dct" = (
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/machinery/computer/mech_bay_power_console{
+ dir = 8
+ },
/turf/simulated/floor/plating,
/area/station/maintenance/starboard2)
"dcu" = (
-/obj/effect/landmark/spawner/xeno,
-/obj/effect/landmark/damageturf,
-/turf/simulated/floor/plating,
+/obj/machinery/atmospherics/pipe/simple/hidden,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "whitepurple"
+ },
/area/station/maintenance/asmaint)
"dcx" = (
/obj/effect/spawner/random_spawners/fungus_probably,
/turf/simulated/wall,
/area/station/maintenance/starboard)
"dcC" = (
-/obj/structure/chair,
-/obj/item/toy/plushie/nukeplushie,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/spawner/random_spawners/grille_maybe,
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint)
"dcD" = (
@@ -47283,14 +45271,6 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/xenobio_south)
-"dcE" = (
-/obj/structure/table,
-/obj/item/paper_bin{
- pixel_x = -2;
- pixel_y = 6
- },
-/turf/simulated/floor/plating,
-/area/station/maintenance/starboard)
"dcK" = (
/obj/machinery/door/airlock/medical/glass,
/obj/machinery/door/firedoor,
@@ -47340,22 +45320,15 @@
/turf/space,
/area/space)
"dcX" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+/obj/machinery/door/airlock/maintenance,
+/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
dir = 4
},
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "whitepurplecorner"
- },
-/area/station/science/explab)
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard2)
"dcY" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 1
@@ -47392,6 +45365,21 @@
},
/turf/simulated/floor/plasteel,
/area/station/science/robotics/chargebay)
+"ddv" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 6
+ },
+/obj/structure/cable/yellow{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
+/turf/simulated/floor/plasteel{
+ dir = 9;
+ icon_state = "whitepurple"
+ },
+/area/station/maintenance/asmaint)
"ddz" = (
/obj/machinery/alarm{
dir = 8;
@@ -47432,15 +45420,15 @@
d2 = 8;
icon_state = "2-8"
},
-/obj/effect/landmark/spawner/xeno,
-/obj/effect/landmark/damageturf,
/turf/simulated/floor/plating,
/area/station/maintenance/starboardsolar)
-"ddK" = (
-/obj/structure/reagent_dispensers/watertank,
-/obj/item/reagent_containers/glass/bucket,
-/turf/simulated/floor/plating,
-/area/station/maintenance/asmaint)
+"ddG" = (
+/obj/machinery/atmospherics/portable/canister/toxins,
+/obj/effect/turf_decal/delivery/red/hollow,
+/turf/simulated/floor/plasteel{
+ icon_state = "darkgrey"
+ },
+/area/station/science/storage)
"ddM" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -47460,20 +45448,12 @@
/turf/space,
/area/space)
"ddR" = (
-/obj/structure/computerframe{
- dir = 8
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
+/obj/structure/closet/secure_closet/personal,
+/obj/effect/spawner/lootdrop/maintenance,
+/obj/item/clothing/suit/storage/labcoat/science,
+/obj/item/clothing/under/rank/rnd/scientist,
/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "darkpurple"
- },
+/turf/simulated/floor/plating,
/area/station/maintenance/aft2)
"ddU" = (
/obj/structure/table,
@@ -47635,7 +45615,6 @@
/obj/machinery/light{
dir = 4
},
-/obj/effect/turf_decal/tile/bar,
/obj/structure/sign/directions/medical{
pixel_x = 32;
pixel_y = 8
@@ -47648,8 +45627,7 @@
pixel_y = -8
},
/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "neutralcorner"
+ icon_state = "redcorner"
},
/area/station/hallway/primary/central)
"deE" = (
@@ -47751,13 +45729,6 @@
},
/turf/simulated/floor/carpet,
/area/station/service/chapel)
-"deT" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/plasteel{
- icon_state = "darkgrey"
- },
-/area/station/maintenance/aft2)
"deX" = (
/obj/machinery/atmospherics/pipe/simple/heat_exchanging{
dir = 10
@@ -47794,17 +45765,14 @@
/turf/simulated/floor/plasteel,
/area/station/security/permabrig)
"dfg" = (
-/obj/structure/disposalpipe/segment,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/effect/turf_decal/stripes/line{
- dir = 8
+/obj/effect/spawner/random_spawners/oil_maybe,
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
},
/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
@@ -47941,6 +45909,12 @@
},
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/entry)
+"dgn" = (
+/obj/machinery/door/airlock/maintenance,
+/obj/effect/mapping_helpers/airlock/autoname,
+/obj/effect/mapping_helpers/airlock/access/all/service/hydroponics,
+/turf/simulated/floor/plating,
+/area/station/service/hydroponics)
"dgp" = (
/obj/effect/spawner/window/reinforced/grilled,
/obj/structure/cable/yellow{
@@ -47974,6 +45948,21 @@
/obj/machinery/atmospherics/pipe/simple/hidden/universal,
/turf/simulated/wall/r_wall,
/area/station/medical/virology)
+"dgD" = (
+/obj/structure/girder,
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/aft2)
"dgG" = (
/obj/machinery/iv_drip,
/obj/machinery/firealarm{
@@ -48038,10 +46027,9 @@
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
"dhl" = (
-/obj/structure/flora/ausbushes/leafybush,
-/obj/structure/flora/ausbushes/ywflowers,
-/obj/structure/window/full/basic,
-/turf/simulated/floor/grass/no_creep,
+/obj/effect/spawner/lootdrop/maintenance,
+/obj/structure/rack,
+/turf/simulated/floor/plating,
/area/station/maintenance/asmaint)
"dhm" = (
/obj/structure/cable/yellow{
@@ -48094,6 +46082,12 @@
icon_state = "darkblue"
},
/area/station/medical/surgery/secondary)
+"dhw" = (
+/obj/structure/flora/ausbushes/fernybush,
+/obj/structure/flora/ausbushes/ywflowers,
+/obj/structure/window/full/basic,
+/turf/simulated/floor/grass/no_creep,
+/area/station/maintenance/starboard2)
"dhx" = (
/obj/effect/turf_decal/tile/blue{
dir = 4
@@ -48188,9 +46182,13 @@
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
"dhG" = (
-/obj/structure/closet/crate/sci,
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/machinery/light/small,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plating,
/area/station/maintenance/starboard2)
"dhI" = (
@@ -48225,6 +46223,10 @@
},
/turf/simulated/floor/plasteel,
/area/station/security/prison/cell_block/A)
+"dif" = (
+/obj/effect/spawner/airlock,
+/turf/simulated/wall,
+/area/station/maintenance/aft2)
"dig" = (
/obj/structure/cable/yellow{
d2 = 4;
@@ -48268,29 +46270,18 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/medmaint)
+"diY" = (
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
+/turf/simulated/floor/plasteel,
+/area/station/science/toxins/mixing)
"djx" = (
/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
/area/station/medical/exam_room)
-"djO" = (
-/obj/structure/table,
-/obj/item/tank/internals/anesthetic{
- pixel_x = 2
- },
-/obj/item/reagent_containers/spray/cleaner{
- desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back.";
- name = "Surgery Cleaner";
- pixel_x = -10;
- pixel_y = 1
- },
-/obj/item/clothing/mask/breath/medical,
-/obj/machinery/light{
- dir = 1
- },
-/turf/simulated/floor/plasteel{
- icon_state = "white"
- },
-/area/station/science/robotics)
"djP" = (
/obj/machinery/light{
dir = 4
@@ -48337,6 +46328,16 @@
},
/turf/simulated/floor/plasteel,
/area/station/engineering/atmos/distribution)
+"dlb" = (
+/obj/effect/decal/cleanable/blood/old,
+/obj/machinery/atmospherics/pipe/manifold/hidden/cyan{
+ dir = 4
+ },
+/obj/machinery/light/small{
+ dir = 4
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard2)
"dlq" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel{
@@ -48344,6 +46345,14 @@
icon_state = "whiteblue"
},
/area/station/command/office/cmo)
+"dlD" = (
+/obj/machinery/sparker{
+ id = "testigniter";
+ name = "Test Igniter";
+ pixel_x = -25
+ },
+/turf/simulated/floor/engine,
+/area/station/science/test_chamber)
"dmg" = (
/obj/structure/cable{
d1 = 1;
@@ -48424,12 +46433,41 @@
icon_state = "white"
},
/area/station/science/xenobiology)
+"dnm" = (
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 4
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard)
+"dnE" = (
+/obj/item/target/alien,
+/obj/item/target/syndicate,
+/obj/structure/closet/crate/secure{
+ desc = "A secure crate containing various materials for building a customised test-site.";
+ name = "Test Site Materials Crate";
+ req_access_txt = "8"
+ },
+/obj/item/target/alien,
+/obj/item/target/syndicate,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/science/toxins/launch)
"dnH" = (
/obj/machinery/mass_driver{
id_tag = "toxinsdriver"
},
/turf/simulated/floor/plating,
/area/station/science/toxins/launch)
+"dnI" = (
+/obj/machinery/kitchen_machine/grill,
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "cafeteria"
+ },
+/area/station/service/kitchen)
"dnN" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -48506,6 +46544,41 @@
icon_state = "whitepurple"
},
/area/station/command/office/rd)
+"dpk" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 4
+ },
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "whitepurple"
+ },
+/area/station/science/research)
+"dpE" = (
+/obj/machinery/status_display{
+ dir = 4;
+ pixel_y = -32
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "whitepurple"
+ },
+/area/station/science/research)
+"dpM" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
+/turf/simulated/floor/plating,
+/area/station/maintenance/aft2)
"dpZ" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -48581,6 +46654,13 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
+"drp" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 10
+ },
+/turf/simulated/floor/plasteel,
+/area/station/maintenance/aft2)
"dru" = (
/obj/structure/cable/yellow{
d1 = 4;
@@ -48592,32 +46672,12 @@
},
/turf/simulated/floor/engine,
/area/station/science/explab/chamber)
-"drv" = (
-/obj/item/kirbyplants{
- level = 4.1
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/simulated/floor/wood,
-/area/station/service/bar)
"drL" = (
/obj/machinery/shower{
dir = 4
},
/turf/simulated/floor/noslip,
/area/station/engineering/control)
-"drN" = (
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/obj/machinery/light/small{
- dir = 8
- },
-/turf/simulated/floor/plating,
-/area/station/maintenance/aft2)
"dsf" = (
/obj/machinery/atmospherics/binary/pump{
dir = 1;
@@ -48652,6 +46712,38 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
+"dsr" = (
+/obj/structure/disposalpipe/sortjunction{
+ dir = 1;
+ name = "Bar Junction";
+ sort_type_txt = "19"
+ },
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/structure/cable/yellow{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
+ },
+/turf/simulated/floor/wood,
+/area/station/service/bar)
+"dtC" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 4
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard2)
"dtE" = (
/turf/simulated/wall/r_wall,
/area/station/medical/virology)
@@ -48711,7 +46803,6 @@
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
"dwp" = (
-/obj/effect/turf_decal/tile/bar,
/obj/machinery/door/firedoor,
/obj/machinery/newscaster{
dir = 8;
@@ -48719,8 +46810,7 @@
pixel_x = 28
},
/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "neutralcorner"
+ icon_state = "redcorner"
},
/area/station/hallway/primary/central)
"dwC" = (
@@ -48779,6 +46869,22 @@
/obj/effect/mapping_helpers/airlock/autoname,
/turf/simulated/floor/catwalk,
/area/station/maintenance/fore)
+"dxi" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/structure/cable/yellow{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/science/xenobiology)
"dxD" = (
/obj/structure/chair/sofa/corp/left{
dir = 1
@@ -48863,16 +46969,19 @@
},
/area/station/medical/reception)
"dAy" = (
-/obj/machinery/firealarm{
- dir = 1;
- name = "south bump";
- pixel_y = -24
+/obj/structure/disposalpipe/junction/reversed{
+ dir = 8
},
-/obj/structure/disposalpipe/segment{
- dir = 4
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+ dir = 1
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 10
+ },
+/obj/structure/cable/yellow{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
},
/turf/simulated/floor/plasteel{
dir = 1;
@@ -48893,19 +47002,6 @@
/obj/structure/cable/yellow,
/turf/simulated/floor/plating,
/area/station/hallway/secondary/exit)
-"dAO" = (
-/obj/structure/cable/yellow{
- d2 = 2;
- icon_state = "0-2"
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/power/apc{
- dir = 1;
- name = "north bump";
- pixel_y = 24
- },
-/turf/simulated/floor/plasteel,
-/area/station/maintenance/starboard)
"dBe" = (
/obj/machinery/atmospherics/pipe/simple/visible,
/obj/effect/spawner/window/reinforced/grilled,
@@ -49190,6 +47286,17 @@
icon_state = "darkbluecorners"
},
/area/station/engineering/break_room)
+"dIQ" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/science/toxins/launch)
"dJx" = (
/obj/structure/filingcabinet,
/turf/simulated/floor/plasteel{
@@ -49239,6 +47346,12 @@
/obj/structure/reagent_dispensers/fueltank,
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
+"dKN" = (
+/obj/machinery/hydroponics/constructable,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/effect/turf_decal/delivery/hollow,
+/turf/simulated/floor/plasteel,
+/area/station/service/hydroponics)
"dLg" = (
/obj/item/rack_parts,
/obj/effect/spawner/lootdrop/maintenance,
@@ -49469,43 +47582,35 @@
dir = 4
},
/turf/simulated/floor/engine,
-/area/station/science/test_chamber)
-"dSp" = (
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
+/area/station/science/xenobiology)
+"dSv" = (
+/obj/effect/decal/cleanable/fungus,
+/turf/simulated/wall,
+/area/station/maintenance/starboard)
+"dSx" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 9
},
-/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
-/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 4
},
-/obj/effect/decal/cleanable/dirt,
/obj/structure/cable/yellow{
- d1 = 2;
- d2 = 4;
- icon_state = "2-4"
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
},
-/turf/simulated/floor/plasteel{
- icon_state = "white"
+/turf/simulated/floor/plasteel,
+/area/station/maintenance/asmaint)
+"dSF" = (
+/obj/effect/decal/cleanable/blood/writing{
+ dir = 8
},
-/area/station/science/toxins/mixing)
-"dSv" = (
-/obj/machinery/door/airlock/maintenance,
-/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/disposalpipe/segment,
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
+/turf/simulated/floor/plasteel{
+ dir = 6;
+ icon_state = "vault"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/plating,
-/area/station/maintenance/starboard)
+/area/station/maintenance/asmaint)
"dSK" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
@@ -49523,10 +47628,6 @@
icon_state = "white"
},
/area/station/medical/reception)
-"dTn" = (
-/obj/machinery/atmospherics/pipe/simple/hidden,
-/turf/simulated/floor/plating,
-/area/station/maintenance/aft2)
"dTt" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -49553,11 +47654,10 @@
/turf/simulated/wall/r_wall,
/area/station/engineering/atmos)
"dTX" = (
-/obj/machinery/atmospherics/pipe/simple/insulated,
-/obj/machinery/atmospherics/pipe/simple/heat_exchanging{
- dir = 10
+/obj/machinery/light{
+ dir = 4
},
-/turf/simulated/floor/engine/vacuum,
+/turf/simulated/floor/plasteel,
/area/station/science/toxins/mixing)
"dUb" = (
/obj/machinery/atmospherics/pipe/simple/hidden{
@@ -49593,6 +47693,13 @@
},
/turf/simulated/floor/plating,
/area/station/hallway/secondary/entry)
+"dUG" = (
+/obj/structure/chair/office/dark{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plating,
+/area/station/maintenance/aft2)
"dUJ" = (
/obj/structure/window/reinforced,
/obj/effect/turf_decal/delivery,
@@ -49612,6 +47719,13 @@
icon_state = "white"
},
/area/station/medical/medbay)
+"dVl" = (
+/obj/machinery/atmospherics/pipe/simple/hidden{
+ dir = 10
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plating,
+/area/station/maintenance/asmaint)
"dVn" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on,
/turf/simulated/floor/plasteel{
@@ -49659,6 +47773,9 @@
/obj/machinery/atmospherics/pipe/simple/visible/purple{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/station/engineering/atmos)
"dWN" = (
@@ -49667,6 +47784,14 @@
},
/turf/simulated/floor/wood,
/area/station/legal/courtroom)
+"dWQ" = (
+/obj/structure/chair/office/light{
+ dir = 8
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/science/toxins/launch)
"dWX" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -49686,18 +47811,6 @@
/obj/effect/turf_decal/stripes/line,
/turf/simulated/floor/engine,
/area/station/engineering/control)
-"dXu" = (
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 6
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 6
- },
-/turf/simulated/floor/plasteel{
- icon_state = "white"
- },
-/area/station/science/research)
"dXJ" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -49715,6 +47828,14 @@
icon_state = "red"
},
/area/station/security/brig)
+"dXZ" = (
+/obj/item/transfer_valve{
+ pixel_x = 4;
+ pixel_y = -4
+ },
+/obj/effect/spawner/random_spawners/blood_often,
+/turf/simulated/floor/plating,
+/area/station/maintenance/aft2)
"dYi" = (
/obj/effect/spawner/window/reinforced,
/obj/machinery/atmospherics/pipe/simple/visible/yellow,
@@ -49849,18 +47970,11 @@
},
/area/station/science/research)
"dZI" = (
-/obj/machinery/atmospherics/unary/vent_pump/on{
- dir = 1
- },
-/obj/structure/extinguisher_cabinet{
- name = "south bump";
- pixel_y = -30
- },
-/obj/machinery/light,
-/turf/simulated/floor/plasteel{
- icon_state = "greenblue"
+/obj/machinery/atmospherics/unary/tank/air{
+ dir = 4
},
-/area/station/service/hydroponics)
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard2)
"dZL" = (
/obj/structure/closet/secure_closet/warden,
/obj/structure/cable/yellow{
@@ -49966,6 +48080,12 @@
icon_state = "freezerfloor"
},
/area/station/public/toilet/lockerroom)
+"ech" = (
+/obj/effect/spawner/lootdrop/maintenance,
+/obj/structure/table,
+/obj/effect/spawner/random_spawners/cobweb_left_rare,
+/turf/simulated/floor/plating,
+/area/station/maintenance/aft2)
"edg" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/public/glass,
@@ -50045,18 +48165,6 @@
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
-"eeu" = (
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/structure/reagent_dispensers/watertank/high,
-/obj/item/reagent_containers/glass/bucket,
-/obj/machinery/light{
- dir = 1
- },
-/obj/effect/turf_decal/stripes/line,
-/turf/simulated/floor/plasteel,
-/area/station/service/hydroponics)
"eey" = (
/obj/structure/cable/yellow{
d1 = 1;
@@ -50071,18 +48179,6 @@
},
/turf/simulated/floor/plasteel,
/area/station/security/brig)
-"eeL" = (
-/obj/structure/chair/wood/wings{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/simulated/floor/wood,
-/area/station/service/theatre)
"efd" = (
/obj/machinery/light/small{
dir = 1
@@ -50109,32 +48205,6 @@
},
/turf/simulated/floor/plating,
/area/station/engineering/atmos)
-"efG" = (
-/obj/machinery/alarm{
- name = "north bump";
- pixel_y = 24
- },
-/obj/machinery/light{
- dir = 1
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/turf/simulated/floor/plasteel{
- icon_state = "white"
- },
-/area/station/science/research)
"efR" = (
/obj/machinery/door/airlock/external/glass{
id_tag = "aisat_door_ext";
@@ -50158,6 +48228,22 @@
icon_state = "dark"
},
/area/station/security/permabrig)
+"egq" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "whitepurple"
+ },
+/area/station/maintenance/asmaint)
+"egC" = (
+/obj/item/slime_extract/oil,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/blood/oil,
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "whitepurple"
+ },
+/area/station/maintenance/asmaint)
"ehh" = (
/obj/machinery/door/poddoor/preopen{
id_tag = "Secure Gate";
@@ -50332,6 +48418,23 @@
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/wood,
/area/station/science/robotics/showroom)
+"ekg" = (
+/obj/machinery/atmospherics/portable/canister/oxygen,
+/obj/machinery/alarm{
+ dir = 8;
+ name = "east bump";
+ pixel_x = 24
+ },
+/obj/effect/turf_decal/delivery/blue/hollow,
+/turf/simulated/floor/plasteel{
+ icon_state = "darkgrey"
+ },
+/area/station/science/storage)
+"eki" = (
+/obj/structure/reagent_dispensers/fueltank,
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plating,
+/area/station/maintenance/aft2)
"ekt" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -50344,6 +48447,12 @@
},
/turf/simulated/floor/engine,
/area/station/engineering/control)
+"ekF" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 10
+ },
+/turf/simulated/floor/plasteel,
+/area/station/maintenance/aft2)
"elx" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
@@ -50497,7 +48606,16 @@
dir = 1
},
/turf/simulated/floor/engine,
-/area/station/science/test_chamber)
+/area/station/science/xenobiology)
+"eqI" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard)
"eqS" = (
/obj/item/crutches{
pixel_x = -2;
@@ -50533,23 +48651,6 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
-"ers" = (
-/obj/effect/turf_decal/delivery/hollow,
-/obj/machinery/navbeacon{
- codes_txt = "delivery";
- dir = 1;
- location = "Hydroponics"
- },
-/obj/structure/plasticflaps{
- opacity = 1
- },
-/obj/machinery/door/window/classic/reversed{
- name = "Botany Delivery"
- },
-/obj/effect/mapping_helpers/airlock/windoor/access/any/supply/mule_bot,
-/obj/effect/mapping_helpers/airlock/windoor/access/any/service/hydroponics,
-/turf/simulated/floor/plasteel,
-/area/station/maintenance/starboard)
"erv" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 1
@@ -50559,7 +48660,6 @@
},
/area/station/legal/courtroom)
"erC" = (
-/obj/effect/turf_decal/delivery/white/hollow,
/obj/structure/window/reinforced{
dir = 8
},
@@ -50674,21 +48774,18 @@
/turf/simulated/wall/r_wall,
/area/station/security/range)
"esJ" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
+/obj/structure/disposalpipe/segment{
+ dir = 8;
+ icon_state = "pipe-c"
},
/obj/structure/cable/yellow{
- d1 = 4;
+ d1 = 1;
d2 = 8;
- icon_state = "4-8"
- },
-/turf/simulated/floor/plasteel{
- icon_state = "white"
+ icon_state = "1-8"
},
-/area/station/science/rnd)
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plasteel,
+/area/station/maintenance/starboard2)
"etj" = (
/obj/machinery/light_switch{
dir = 4;
@@ -50727,43 +48824,18 @@
},
/turf/simulated/floor/plasteel,
/area/station/engineering/atmos)
-"euy" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
+"etR" = (
+/obj/item/kirbyplants{
+ icon_state = "plant-22"
},
-/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
- icon_state = "white"
+ icon_state = "cult"
},
-/area/station/science/toxins/mixing)
+/area/station/maintenance/starboard)
"euB" = (
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
/area/station/engineering/atmos)
-"euD" = (
-/obj/structure/table/reinforced,
-/obj/machinery/door/window/classic/normal{
- name = "Kitchen"
- },
-/obj/effect/mapping_helpers/airlock/autoname,
-/obj/machinery/door/firedoor,
-/obj/structure/disposalpipe/segment,
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/machinery/door/poddoor/shutters/preopen{
- dir = 2;
- id_tag = "kitchen_counter";
- name = "Kitchen Counter Shutters"
- },
-/obj/effect/mapping_helpers/airlock/windoor/access/all/service/kitchen,
-/turf/simulated/floor/plasteel{
- icon_state = "cafeteria"
- },
-/area/station/service/kitchen)
"euU" = (
/obj/machinery/economy/vending/virodrobe,
/obj/item/radio/intercom{
@@ -50786,6 +48858,12 @@
},
/turf/simulated/floor/plasteel/dark,
/area/station/service/cafeteria)
+"evj" = (
+/obj/machinery/atmospherics/pipe/manifold/hidden/cyan{
+ dir = 4
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/aft2)
"evl" = (
/obj/machinery/alarm{
name = "north bump";
@@ -50822,34 +48900,16 @@
"evr" = (
/turf/simulated/wall/r_wall,
/area/station/maintenance/xenobio_south)
-"evD" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
- },
+"evt" = (
/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "whitepurple"
+ icon_state = "white"
},
/area/station/science/rnd)
-"evK" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 8
- },
-/turf/simulated/floor/carpet,
-/area/station/service/theatre)
"evR" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -50874,6 +48934,17 @@
"ewk" = (
/turf/simulated/floor/grass/no_creep,
/area/station/medical/virology)
+"ewt" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/wood,
+/area/station/service/bar)
"exm" = (
/obj/effect/spawner/window/reinforced/grilled,
/obj/structure/cable/yellow{
@@ -50896,7 +48967,6 @@
},
/area/station/medical/virology)
"exZ" = (
-/obj/effect/turf_decal/delivery/hollow,
/obj/structure/table,
/obj/item/stack/sheet/glass/fifty,
/obj/item/stack/sheet/glass/fifty,
@@ -51052,6 +49122,38 @@
/obj/effect/decal/cleanable/blood/oil,
/turf/simulated/floor/engine,
/area/station/science/explab/chamber)
+"eAC" = (
+/obj/structure/table/reinforced,
+/obj/item/assembly/signaler{
+ pixel_x = -2;
+ pixel_y = -2
+ },
+/obj/item/assembly/signaler{
+ pixel_x = 6;
+ pixel_y = 5
+ },
+/obj/item/assembly/signaler{
+ pixel_x = -8;
+ pixel_y = 5
+ },
+/obj/item/assembly/signaler{
+ pixel_y = 8
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/science/toxins/launch)
+"eAL" = (
+/obj/machinery/camera{
+ c_tag = "Secure Lab - Test Chamber";
+ dir = 8;
+ network = list("TestChamber","SS13","Research")
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/purple{
+ dir = 10
+ },
+/turf/simulated/floor/engine,
+/area/station/science/test_chamber)
"eAU" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -51075,6 +49177,10 @@
/obj/effect/landmark/damageturf,
/turf/simulated/floor/plating,
/area/station/maintenance/port)
+"eBq" = (
+/obj/effect/spawner/random_spawners/fungus_maybe,
+/turf/simulated/wall/r_wall,
+/area/station/maintenance/starboard)
"eBr" = (
/obj/machinery/atmospherics/unary/thermomachine/freezer/on{
dir = 8;
@@ -51172,6 +49278,16 @@
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel,
/area/station/security/prison/cell_block/A)
+"eDj" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard2)
"eDk" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/showcase/machinery/oldpod{
@@ -51182,10 +49298,6 @@
icon_state = "white"
},
/area/station/maintenance/aft)
-"eDv" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/engine,
-/area/station/science/explab/chamber)
"eDx" = (
/obj/machinery/hologram/holopad,
/obj/effect/turf_decal/delivery/blue/hollow,
@@ -51220,6 +49332,21 @@
},
/turf/simulated/floor/plasteel,
/area/station/supply/storage)
+"eEC" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
+/turf/simulated/floor/wood,
+/area/station/service/bar)
"eFw" = (
/obj/machinery/door/firedoor,
/obj/effect/turf_decal/stripes/line{
@@ -51247,6 +49374,11 @@
dir = 8;
icon_state = "pipe-j2"
},
+/obj/structure/cable/yellow{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
+ },
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/starboard)
"eFF" = (
@@ -51278,6 +49410,14 @@
icon_state = "darkgrey"
},
/area/station/public/locker)
+"eGn" = (
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/science/toxins/launch)
"eGw" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 1
@@ -51308,6 +49448,34 @@
},
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/entry)
+"eIa" = (
+/mob/living/carbon/human/monkey,
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/engine,
+/area/station/science/test_chamber)
+"eIe" = (
+/obj/machinery/firealarm{
+ dir = 4;
+ name = "east bump";
+ pixel_x = 24
+ },
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "whitepurple"
+ },
+/area/station/science/research)
"eIg" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -51342,31 +49510,36 @@
/obj/effect/mapping_helpers/airlock/windoor/access/all/command/captain,
/turf/simulated/floor/wood,
/area/station/command/office/captain)
-"eJg" = (
-/obj/effect/turf_decal/stripes/white/line,
-/obj/effect/turf_decal/delivery/white/hollow,
-/obj/machinery/atmospherics/portable/scrubber/huge,
-/turf/simulated/floor/plasteel{
- icon_state = "darkgrey"
+"eIC" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 5
},
-/area/station/science/storage)
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 6
+ },
+/obj/structure/cable/yellow{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
+/turf/simulated/floor/plasteel,
+/area/station/maintenance/aft2)
+"eIY" = (
+/obj/machinery/door/poddoor/preopen{
+ name = "Biohazard Shutter";
+ id_tag = "RnDChem"
+ },
+/obj/effect/spawner/window/reinforced/plasma,
+/obj/machinery/atmospherics/pipe/simple/insulated,
+/turf/simulated/floor/engine,
+/area/station/science/test_chamber)
"eJh" = (
/obj/machinery/atmospherics/unary/thermomachine/heater/on{
dir = 1
},
/turf/simulated/floor/plasteel,
/area/station/engineering/atmos/distribution)
-"eJr" = (
-/obj/structure/chair/office/light{
- dir = 8
- },
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
- dir = 1
- },
-/turf/simulated/floor/plasteel{
- icon_state = "darkgrey"
- },
-/area/station/science/toxins/launch)
"eJG" = (
/obj/structure/disposalpipe/segment{
dir = 1;
@@ -51389,9 +49562,6 @@
},
/area/station/security/permabrig)
"eJN" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
@@ -51400,7 +49570,7 @@
d2 = 8;
icon_state = "4-8"
},
-/turf/simulated/floor/plating,
+/turf/simulated/floor/plasteel,
/area/station/maintenance/aft2)
"eKV" = (
/obj/structure/lattice/catwalk,
@@ -51448,10 +49618,14 @@
icon_state = "darkblue"
},
/area/station/medical/surgery/primary)
+"eLT" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/purple{
+ dir = 4
+ },
+/obj/effect/spawner/random_spawners/wall_rusted_maybe,
+/turf/simulated/wall/r_wall,
+/area/station/science/test_chamber)
"eMh" = (
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
@@ -51460,6 +49634,8 @@
/obj/machinery/light/small{
dir = 8
},
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "whitepurple"
@@ -51476,18 +49652,7 @@
/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
-"eMF" = (
-/obj/effect/turf_decal/tile/bar,
-/obj/machinery/atmospherics/unary/vent_pump/on{
- dir = 8
- },
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "neutralcorner"
- },
-/area/station/hallway/primary/central)
"eMG" = (
-/obj/effect/turf_decal/delivery/white/hollow,
/obj/structure/closet/l3closet/scientist,
/obj/structure/cable/yellow{
d1 = 1;
@@ -51537,6 +49702,14 @@
/obj/machinery/atmospherics/unary/portables_connector,
/turf/simulated/floor/plasteel,
/area/station/science/toxins/mixing)
+"eOA" = (
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+ dir = 8
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "darkgrey"
+ },
+/area/station/science/robotics)
"eOZ" = (
/obj/effect/turf_decal/stripes/white/line,
/obj/machinery/firealarm{
@@ -51570,13 +49743,11 @@
icon_state = "grimy"
},
/area/station/hallway/primary/port)
-"ePS" = (
-/obj/structure/closet/crate,
-/obj/effect/decal/cleanable/cobweb,
-/obj/effect/spawner/lootdrop/maintenance/two,
-/obj/machinery/atmospherics/pipe/simple/hidden,
-/turf/simulated/floor/plating,
-/area/station/maintenance/aft2)
+"ePK" = (
+/turf/simulated/floor/wood{
+ icon_state = "wood-broken3"
+ },
+/area/station/maintenance/starboard2)
"ePT" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -51586,21 +49757,6 @@
icon_state = "dark"
},
/area/station/security/execution)
-"eQb" = (
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/plasteel{
- icon_state = "white"
- },
-/area/station/science/rnd)
-"eQc" = (
-/obj/machinery/atmospherics/unary/vent_pump/on{
- dir = 8
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel{
- icon_state = "white"
- },
-/area/station/science/explab)
"eQf" = (
/obj/structure/table/wood,
/obj/structure/sign/kiddieplaque/perfect_drone{
@@ -51831,6 +49987,22 @@
},
/turf/simulated/floor/plating,
/area/station/hallway/secondary/exit)
+"eUt" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/spawner/random_spawners/oil_maybe,
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 4
+ },
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard)
"eUz" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 1
@@ -51866,6 +50038,22 @@
icon_state = "dark"
},
/area/station/security/armory/secure)
+"eUU" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard2)
+"eVa" = (
+/obj/structure/table,
+/obj/item/paper/crumpled/bloody/hacker,
+/turf/simulated/floor/bluespace,
+/area/station/maintenance/starboard)
"eVb" = (
/obj/machinery/status_display{
pixel_y = 32
@@ -51898,22 +50086,60 @@
icon_state = "whiteblue"
},
/area/station/medical/reception)
+"eVy" = (
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard)
"eVz" = (
/obj/structure/table,
/obj/item/storage/fancy/rollingpapers,
-/obj/item/storage/box/matches,
+/obj/item/storage/fancy/matches,
/obj/item/seeds/tobacco,
/turf/simulated/floor/plasteel,
/area/station/security/permabrig)
+"eVJ" = (
+/obj/machinery/door/airlock/maintenance,
+/obj/effect/mapping_helpers/airlock/autoname,
+/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/plasteel,
+/area/station/maintenance/starboard)
+"eVM" = (
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 8
+ },
+/obj/machinery/door/firedoor,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "darkgrey"
+ },
+/area/station/science/research)
"eVO" = (
/obj/machinery/light,
-/obj/machinery/door_control{
- id = "roboticsprivacy2";
- name = "Robotics Shutters";
- pixel_x = -7;
- pixel_y = -24;
- req_access_txt = "29"
- },
/obj/structure/closet/secure_closet/roboticist,
/turf/simulated/floor/plasteel{
icon_state = "darkgrey"
@@ -51974,25 +50200,18 @@
/turf/simulated/floor/plating,
/area/station/maintenance/fpmaint)
"eYA" = (
+/obj/machinery/door/airlock/maintenance,
+/obj/effect/mapping_helpers/airlock/autoname,
+/obj/effect/mapping_helpers/airlock/access/all/science/research,
/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
- },
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 8;
- icon_state = "1-8"
+ dir = 4
},
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
-/turf/simulated/floor/plasteel{
- icon_state = "white"
- },
+/turf/simulated/floor/plating,
/area/station/science/rnd)
"eYE" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -52025,36 +50244,12 @@
/turf/simulated/floor/plasteel,
/area/station/security/prison/cell_block/A)
"eZr" = (
-/obj/structure/table/reinforced,
-/obj/effect/turf_decal/delivery/hollow,
-/obj/item/assembly/prox_sensor{
- pixel_x = -8;
- pixel_y = 4
- },
-/obj/item/assembly/prox_sensor{
- pixel_x = 2;
- pixel_y = -2
- },
-/obj/item/assembly/prox_sensor{
- pixel_x = -4;
- pixel_y = 1
- },
-/obj/item/assembly/prox_sensor{
- pixel_x = 5;
- pixel_y = 7
- },
-/obj/machinery/light{
- dir = 1
- },
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/turf/simulated/floor/plasteel{
- icon_state = "white"
+/obj/structure/closet/l3closet/scientist,
+/obj/machinery/atmospherics/pipe/simple/hidden{
+ dir = 4
},
-/area/station/science/toxins/launch)
+/turf/simulated/floor/plating,
+/area/station/maintenance/asmaint)
"eZE" = (
/obj/item/radio/intercom{
name = "south bump";
@@ -52071,6 +50266,18 @@
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel,
/area/station/security/range)
+"eZG" = (
+/obj/structure/table,
+/obj/item/storage/bag/dice,
+/turf/simulated/floor/plasteel{
+ icon_state = "cafeteria"
+ },
+/area/station/science/break_room)
+"eZR" = (
+/obj/effect/spawner/random_spawners/blood_often,
+/obj/item/clothing/mask/gas,
+/turf/simulated/floor/plating,
+/area/station/maintenance/aft2)
"eZW" = (
/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
@@ -52141,6 +50348,23 @@
/obj/structure/cable/yellow,
/turf/simulated/floor/plating,
/area/station/security/brig)
+"fbQ" = (
+/obj/item/reagent_containers/food/snacks/monkeycube,
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 4
+ },
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/asmaint)
"fbR" = (
/obj/effect/turf_decal/delivery,
/turf/simulated/floor/engine,
@@ -52226,10 +50450,11 @@
/turf/simulated/floor/plating,
/area/station/engineering/secure_storage)
"fdt" = (
-/obj/machinery/atmospherics/unary/thermomachine/freezer{
- dir = 1
+/obj/machinery/atmospherics/pipe/simple/heat_exchanging{
+ dir = 6
},
-/turf/simulated/floor/plasteel,
+/obj/machinery/atmospherics/pipe/simple/insulated,
+/turf/simulated/floor/engine/vacuum,
/area/station/science/toxins/mixing)
"fdu" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
@@ -52246,6 +50471,17 @@
},
/turf/simulated/floor/plasteel,
/area/station/supply/office)
+"feu" = (
+/obj/machinery/power/apc{
+ name = "south bump";
+ pixel_y = -24
+ },
+/obj/structure/cable/yellow{
+ d2 = 8;
+ icon_state = "0-8"
+ },
+/turf/simulated/floor/wood,
+/area/station/command/office/captain/bedroom)
"feD" = (
/turf/simulated/floor/plasteel{
icon_state = "C10"
@@ -52284,24 +50520,6 @@
/obj/effect/mapping_helpers/airlock/access/all/engineering/construction,
/turf/simulated/floor/plasteel,
/area/station/engineering/break_room)
-"fgb" = (
-/obj/structure/plasticflaps{
- opacity = 1
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/tile/bar{
- dir = 1
- },
-/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance,
-/obj/machinery/door/window/classic/reversed{
- dir = 8;
- name = "Glass Door"
- },
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "neutralcorner"
- },
-/area/station/maintenance/starboard)
"fgj" = (
/obj/machinery/atmospherics/trinary/filter{
dir = 1;
@@ -52376,11 +50594,6 @@
},
/area/station/hallway/primary/fore)
"fhR" = (
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 4;
- icon_state = "1-4"
- },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "whitepurple"
@@ -52399,21 +50612,12 @@
/turf/space,
/area/space/nearstation)
"fiU" = (
-/obj/effect/turf_decal/delivery/hollow,
-/obj/machinery/atmospherics/portable/canister/sleeping_agent,
-/obj/structure/extinguisher_cabinet{
- name = "east bump";
- pixel_x = 27
- },
-/obj/machinery/camera{
- c_tag = "Science - Toxins Secure - Starboard";
- dir = 8;
- network = list("Research","SS13")
- },
-/turf/simulated/floor/plasteel{
- icon_state = "darkgrey"
+/obj/effect/spawner/lootdrop/maintenance,
+/obj/machinery/light/small{
+ dir = 8
},
-/area/station/science/storage)
+/turf/simulated/floor/engine,
+/area/station/maintenance/asmaint)
"fiV" = (
/obj/structure/cable/yellow{
d2 = 8;
@@ -52432,6 +50636,18 @@
},
/turf/simulated/floor/plasteel,
/area/station/supply/office)
+"fjj" = (
+/obj/item/radio/intercom{
+ name = "south bump";
+ pixel_y = -28
+ },
+/obj/structure/chair/comfy/black{
+ dir = 8
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "cafeteria"
+ },
+/area/station/science/break_room)
"fjl" = (
/obj/structure/table,
/obj/item/stack/sheet/glass/fifty{
@@ -52447,6 +50663,20 @@
icon_state = "brown"
},
/area/station/supply/office)
+"fjy" = (
+/obj/effect/landmark/start/chef,
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "cafeteria"
+ },
+/area/station/service/kitchen)
"fjU" = (
/obj/machinery/atmospherics/pipe/simple/insulated,
/obj/machinery/atmospherics/pipe/simple/heat_exchanging{
@@ -52454,19 +50684,15 @@
},
/turf/simulated/floor/engine/vacuum,
/area/station/science/toxins/mixing)
-"fjV" = (
-/obj/effect/landmark/start/roboticist,
-/turf/simulated/floor/plasteel{
- icon_state = "white"
- },
-/area/station/science/robotics)
"fkr" = (
/obj/structure/table,
/obj/item/flashlight/lamp,
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
"fkv" = (
-/obj/machinery/atmospherics/unary/vent_pump/on,
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 8
+ },
/turf/simulated/floor/plasteel,
/area/station/engineering/atmos)
"fkN" = (
@@ -52492,16 +50718,8 @@
/turf/simulated/floor/plasteel,
/area/station/ai_monitored/storage/eva)
"flh" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/turf/simulated/floor/plating,
+/mob/living/simple_animal/slime,
+/turf/simulated/floor/engine,
/area/station/maintenance/asmaint)
"flr" = (
/obj/structure/window/plasmareinforced{
@@ -52627,16 +50845,6 @@
},
/turf/simulated/wall/r_wall,
/area/station/engineering/atmos)
-"fno" = (
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 5
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
-/turf/simulated/floor/plasteel{
- icon_state = "white"
- },
-/area/station/science/toxins/launch)
"fnv" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
@@ -52659,10 +50867,13 @@
/turf/simulated/floor/plasteel,
/area/station/supply/office)
"fnS" = (
-/obj/machinery/kitchen_machine/grill,
-/obj/structure/disposalpipe/segment{
+/obj/structure/table,
+/obj/machinery/light{
dir = 4
},
+/obj/item/eftpos/register{
+ dir = 8
+ },
/turf/simulated/floor/plasteel{
icon_state = "cafeteria"
},
@@ -52672,18 +50883,6 @@
/obj/item/instrument/harmonica,
/turf/simulated/floor/plasteel,
/area/station/security/permabrig)
-"foP" = (
-/obj/structure/cable/yellow{
- d2 = 2;
- icon_state = "0-2"
- },
-/obj/machinery/power/apc{
- dir = 1;
- name = "north bump";
- pixel_y = 24
- },
-/turf/simulated/floor/plasteel,
-/area/station/science/toxins/mixing)
"foR" = (
/obj/structure/cable/yellow{
d1 = 4;
@@ -52727,6 +50926,24 @@
},
/turf/simulated/floor/engine/n20,
/area/station/engineering/atmos)
+"fpM" = (
+/obj/effect/turf_decal/delivery,
+/obj/structure/closet/emcloset,
+/obj/machinery/camera{
+ c_tag = "Science - Entry";
+ dir = 10;
+ network = list("Research","SS13")
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "darkgreycheck"
+ },
+/area/station/science/research)
"fpR" = (
/obj/structure/sign/pods{
pixel_x = 32
@@ -52756,6 +50973,40 @@
},
/turf/simulated/floor/plasteel,
/area/station/science/xenobiology)
+"fqn" = (
+/obj/machinery/atmospherics/pipe/simple/hidden{
+ dir = 4
+ },
+/obj/structure/girder,
+/turf/simulated/floor/plating,
+/area/station/maintenance/asmaint)
+"fqp" = (
+/obj/machinery/atmospherics/pipe/simple/hidden{
+ dir = 4
+ },
+/turf/simulated/wall/r_wall,
+/area/station/science/toxins/mixing)
+"fqz" = (
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 6
+ },
+/obj/structure/cable/yellow{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 8
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/asmaint)
"fqO" = (
/obj/machinery/atmospherics/pipe/simple/visible{
dir = 4
@@ -52798,6 +51049,12 @@
icon_state = "white"
},
/area/station/science/xenobiology)
+"fru" = (
+/obj/machinery/atmospherics/pipe/simple/visible{
+ dir = 9
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard2)
"frx" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -52814,26 +51071,37 @@
icon_state = "cult"
},
/area/station/legal/magistrate)
+"fsh" = (
+/obj/structure/disposalpipe/segment{
+ dir = 8;
+ icon_state = "pipe-c"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
+/turf/simulated/floor/wood,
+/area/station/service/bar)
"fsj" = (
+/obj/structure/lattice/catwalk,
/obj/machinery/atmospherics/unary/outlet_injector/on{
dir = 4
},
-/obj/structure/lattice/catwalk,
/turf/space,
-/area/station/maintenance/xenobio_north)
+/area/space/nearstation)
"fsT" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 4
},
/turf/simulated/floor/wood,
/area/station/command/office/ntrep)
-"fsW" = (
-/obj/structure/table,
-/obj/item/clothing/head/that,
-/turf/simulated/floor/plasteel{
- icon_state = "bar"
- },
-/area/station/service/bar)
"fsY" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -52999,40 +51267,17 @@
icon_state = "white"
},
/area/station/science/toxins/launch)
-"fuQ" = (
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/machinery/door/airlock/maintenance,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden{
- dir = 4
- },
-/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
-/turf/simulated/floor/plating,
-/area/station/maintenance/aft2)
-"fvH" = (
-/obj/machinery/light/small{
- dir = 1
- },
-/obj/effect/turf_decal/stripes/line,
-/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
-/turf/simulated/floor/plating,
-/area/station/maintenance/aft2)
"fvN" = (
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
/area/station/science/xenobiology)
"fvO" = (
-/obj/effect/landmark/burnturf,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 10
+ },
+/obj/machinery/light/small{
+ dir = 4
+ },
/turf/simulated/floor/plating,
/area/station/maintenance/starboard2)
"fvU" = (
@@ -53078,6 +51323,23 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
+"fwz" = (
+/obj/effect/turf_decal/delivery,
+/obj/structure/closet/firecloset,
+/obj/machinery/alarm{
+ name = "north bump";
+ pixel_y = 24
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "darkgreycheck"
+ },
+/area/station/science/research)
"fwJ" = (
/obj/effect/turf_decal/delivery/hollow,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -53101,6 +51363,13 @@
icon_state = "freezerfloor"
},
/area/station/security/permabrig)
+"fxt" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 1
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/aft2)
"fxB" = (
/obj/machinery/light/small,
/obj/machinery/light_switch{
@@ -53184,23 +51453,19 @@
/turf/simulated/floor/plating,
/area/station/maintenance/medmaint)
"fza" = (
-/obj/effect/turf_decal/delivery/hollow,
-/obj/structure/sink{
- pixel_y = 22
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
+ dir = 5
},
-/obj/structure/cable/yellow{
- d1 = 2;
- d2 = 8;
- icon_state = "2-8"
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 5
},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 1
+/obj/machinery/power/apc{
+ name = "south bump";
+ pixel_y = -24
},
+/obj/structure/cable/yellow,
/turf/simulated/floor/plasteel{
- dir = 1;
+ dir = 6;
icon_state = "greenblue"
},
/area/station/service/hydroponics)
@@ -53294,6 +51559,17 @@
/obj/effect/mapping_helpers/airlock/windoor/access/any/engineering/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/disposal)
+"fAN" = (
+/obj/effect/turf_decal/stripes/corner{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/science/xenobiology)
"fAU" = (
/obj/structure/table/glass,
/obj/item/radio/intercom{
@@ -53359,35 +51635,21 @@
},
/area/station/security/permabrig)
"fCO" = (
-/obj/effect/turf_decal/delivery/hollow,
-/obj/machinery/atmospherics/portable/canister/toxins,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/hidden{
+ dir = 10
+ },
+/obj/machinery/light/small{
+ dir = 8
+ },
/turf/simulated/floor/plasteel{
- icon_state = "darkgrey"
+ icon_state = "white"
},
-/area/station/science/storage)
+/area/station/maintenance/asmaint)
"fCQ" = (
/obj/machinery/door/firedoor,
/turf/simulated/floor/plasteel,
/area/station/supply/lobby)
-"fCW" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 1
- },
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/turf/simulated/floor/plasteel{
- icon_state = "white"
- },
-/area/station/science/research)
"fDi" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -53405,6 +51667,12 @@
icon_state = "brown"
},
/area/station/supply/office)
+"fDE" = (
+/obj/machinery/atmospherics/binary/valve{
+ dir = 1
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard2)
"fDO" = (
/obj/machinery/atmospherics/pipe/simple/visible/purple,
/obj/machinery/light{
@@ -53469,6 +51737,41 @@
icon_state = "dark"
},
/area/station/aisat)
+"fEZ" = (
+/obj/item/assembly/prox_sensor{
+ pixel_x = 5;
+ pixel_y = 7
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plating,
+/area/station/maintenance/aft2)
+"fFi" = (
+/obj/structure/table,
+/obj/item/wirecutters,
+/obj/item/reagent_containers/glass/bottle/reagent/acid{
+ pixel_y = 10;
+ pixel_x = 10
+ },
+/obj/item/reagent_containers/syringe{
+ pixel_y = 10;
+ pixel_x = -5
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plasteel{
+ dir = 10;
+ icon_state = "vault"
+ },
+/area/station/maintenance/asmaint)
+"fFl" = (
+/obj/structure/chair/office/dark{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 6
+ },
+/obj/effect/decal/cleanable/blood,
+/turf/simulated/floor/bluegrid,
+/area/station/maintenance/starboard)
"fFL" = (
/obj/machinery/atmospherics/meter,
/obj/machinery/atmospherics/pipe/simple/visible/yellow,
@@ -53553,9 +51856,19 @@
},
/area/station/medical/chemistry)
"fGH" = (
-/obj/structure/sign/explosives,
-/turf/simulated/wall/r_wall,
-/area/station/science/storage)
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 4
+ },
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/asmaint)
"fGO" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -53570,6 +51883,14 @@
icon_state = "brown"
},
/area/station/supply/storage)
+"fHu" = (
+/obj/machinery/atmospherics/pipe/simple/hidden{
+ dir = 5
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/maintenance/asmaint)
"fHw" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/medical/glass,
@@ -53615,20 +51936,22 @@
/turf/simulated/floor/engine,
/area/station/engineering/control)
"fHG" = (
-/obj/machinery/light{
- dir = 8
+/obj/machinery/firealarm{
+ dir = 8;
+ name = "west bump";
+ pixel_x = -24
},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 8
+/obj/effect/turf_decal/stripes/line{
+ dir = 5
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
+/obj/effect/turf_decal/siding{
+ dir = 5
+ },
+/obj/machinery/shower{
+ dir = 4
},
/turf/simulated/floor/plasteel{
- icon_state = "white"
+ icon_state = "darkgreycheck"
},
/area/station/science/research)
"fHQ" = (
@@ -53665,15 +51988,6 @@
/obj/effect/mapping_helpers/airlock/autoname,
/turf/simulated/floor/plating,
/area/station/maintenance/auxsolarport)
-"fIA" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "whitepurple"
- },
-/area/station/science/research)
"fJd" = (
/obj/machinery/door/airlock/security/glass{
name = "Brig"
@@ -53725,14 +52039,15 @@
},
/area/station/security/main)
"fJu" = (
-/obj/effect/decal/cleanable/blood/oil,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 4
},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 1
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 9
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
},
-/turf/simulated/floor/plasteel,
/area/station/science/toxins/mixing)
"fKW" = (
/obj/item/kirbyplants{
@@ -53761,30 +52076,12 @@
},
/area/station/medical/medbay)
"fLw" = (
-/obj/effect/turf_decal/delivery/hollow,
/obj/machinery/atmospherics/portable/canister/nitrogen,
/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
dir = 4
},
/turf/simulated/floor/plasteel,
/area/station/engineering/atmos/control)
-"fLJ" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/turf/simulated/floor/plating,
-/area/station/maintenance/starboard2)
"fLK" = (
/obj/structure/table,
/obj/structure/bedsheetbin,
@@ -53819,6 +52116,10 @@
icon_state = "escape"
},
/area/station/engineering/atmos)
+"fNl" = (
+/obj/effect/landmark/spawner/xeno,
+/turf/simulated/floor/wood,
+/area/station/maintenance/starboard2)
"fNn" = (
/obj/structure/window/reinforced{
dir = 1
@@ -53840,6 +52141,21 @@
/obj/effect/turf_decal/stripes/line,
/turf/simulated/floor/plasteel,
/area/station/science/toxins/mixing)
+"fNQ" = (
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 6
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/science/rnd)
"fOf" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel{
@@ -53945,6 +52261,14 @@
icon_state = "yellow"
},
/area/station/engineering/break_room)
+"fQl" = (
+/obj/item/kirbyplants{
+ icon_state = "plant-24"
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "cafeteria"
+ },
+/area/station/science/break_room)
"fQr" = (
/obj/machinery/power/apc{
dir = 8;
@@ -53977,24 +52301,12 @@
icon_state = "white"
},
/area/station/science/explab)
-"fRj" = (
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
- },
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/turf/simulated/floor/plating,
-/area/station/maintenance/asmaint)
"fRl" = (
/obj/machinery/atmospherics/pipe/simple/hidden/purple{
dir = 4
},
/turf/simulated/wall/r_wall,
-/area/station/science/test_chamber)
+/area/station/science/xenobiology)
"fRm" = (
/obj/structure/closet,
/obj/effect/spawner/lootdrop/maintenance/two,
@@ -54015,6 +52327,21 @@
icon_state = "red"
},
/area/station/security/warden)
+"fSa" = (
+/obj/machinery/atmospherics/pipe/simple/hidden,
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 4
+ },
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/asmaint)
"fSb" = (
/turf/simulated/floor/plasteel{
icon_state = "darkredcorners"
@@ -54053,15 +52380,22 @@
},
/area/station/security/permabrig)
"fTs" = (
-/obj/structure/table,
-/obj/item/mmi,
-/obj/item/mmi,
-/obj/item/mmi,
-/obj/item/robotanalyzer,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel{
- icon_state = "white"
+ dir = 1;
+ icon_state = "whitepurple"
},
-/area/station/science/robotics)
+/area/station/science/research)
"fTt" = (
/obj/structure/filingcabinet/chestdrawer,
/turf/simulated/floor/plasteel{
@@ -54094,6 +52428,11 @@
icon_state = "whitehall"
},
/area/station/science/research)
+"fTV" = (
+/turf/simulated/floor/wood{
+ icon_state = "wood-broken3"
+ },
+/area/station/maintenance/starboard)
"fUf" = (
/obj/structure/rack,
/obj/effect/spawner/lootdrop/maintenance,
@@ -54148,19 +52487,6 @@
},
/turf/simulated/floor/plasteel,
/area/station/security/permabrig)
-"fVO" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 6
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 6
- },
-/obj/effect/spawner/lootdrop{
- loot = list(/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes);
- name = "trash spawner"
- },
-/turf/simulated/floor/plating,
-/area/station/maintenance/asmaint)
"fVW" = (
/obj/structure/disposaloutlet{
dir = 4
@@ -54171,6 +52497,23 @@
/obj/structure/lattice/catwalk,
/turf/space,
/area/space/nearstation)
+"fVX" = (
+/obj/machinery/atmospherics/pipe/simple/hidden{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/maintenance/asmaint)
+"fWa" = (
+/obj/item/book/manual/hydroponics_pod_people,
+/obj/structure/table/glass,
+/obj/structure/sign/poster/random{
+ pixel_y = 32
+ },
+/obj/effect/turf_decal/stripes/line,
+/turf/simulated/floor/plasteel,
+/area/station/service/hydroponics)
"fWg" = (
/obj/structure/chair/stool{
dir = 1
@@ -54178,37 +52521,15 @@
/turf/simulated/floor/plasteel,
/area/station/public/locker)
"fWB" = (
-/obj/machinery/computer/area_atmos{
+/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 4
},
-/obj/effect/turf_decal/delivery/white/hollow,
-/obj/item/radio/intercom{
- name = "custom placement";
- pixel_x = -26;
- pixel_y = -10
- },
-/obj/machinery/light_switch{
- dir = 4;
- name = "custom placement";
- pixel_x = -36;
- pixel_y = 9
- },
-/obj/machinery/door_control{
- id = "toxinaccess";
- name = "Toxins Access";
- pixel_x = -26;
- pixel_y = 8;
- req_access_txt = "8"
- },
-/obj/machinery/camera{
- c_tag = "Science - Toxins Secure - Port";
- dir = 4;
- network = list("Research","SS13")
- },
+/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
- icon_state = "white"
+ dir = 1;
+ icon_state = "whitepurple"
},
-/area/station/science/storage)
+/area/station/maintenance/asmaint)
"fWD" = (
/obj/effect/turf_decal/delivery/hollow,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
@@ -54232,6 +52553,20 @@
},
/turf/simulated/wall/r_wall,
/area/station/engineering/atmos/distribution)
+"fWN" = (
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "whitepurplecorner"
+ },
+/area/station/science/research)
"fWS" = (
/obj/effect/turf_decal/stripes/line,
/obj/machinery/camera{
@@ -54243,13 +52578,15 @@
"fWW" = (
/turf/simulated/floor/plasteel,
/area/station/engineering/atmos)
-"fXj" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 1
+"fXd" = (
+/obj/structure/chair/stool{
+ dir = 8
},
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel,
-/area/station/science/robotics/chargebay)
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/turf/simulated/floor/wood,
+/area/station/service/bar)
"fXy" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable/yellow{
@@ -54259,6 +52596,17 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
+"fYb" = (
+/obj/machinery/atmospherics/pipe/simple/visible/cyan{
+ dir = 10
+ },
+/obj/machinery/alarm{
+ name = "north bump";
+ pixel_y = 24
+ },
+/obj/effect/spawner/random_spawners/cobweb_right_frequent,
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard2)
"fYk" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
@@ -54340,19 +52688,6 @@
/obj/machinery/tcomms/core/station,
/turf/simulated/floor/bluegrid,
/area/station/telecomms/chamber)
-"gaa" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
- dir = 1
- },
-/turf/simulated/floor/plasteel,
-/area/station/service/hydroponics)
-"gar" = (
-/obj/structure/lattice,
-/obj/machinery/atmospherics/pipe/simple/heat_exchanging{
- dir = 10
- },
-/turf/space,
-/area/space/nearstation)
"gas" = (
/turf/simulated/floor/plasteel{
icon_state = "brown"
@@ -54519,6 +52854,31 @@
icon_state = "white"
},
/area/station/security/permabrig)
+"gei" = (
+/obj/structure/disposalpipe/segment{
+ dir = 1;
+ icon_state = "pipe-c"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 5
+ },
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/cyan,
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plasteel{
+ icon_state = "darkgrey"
+ },
+/area/station/science/toxins/mixing)
"geC" = (
/obj/item/kirbyplants{
icon_state = "plant-24"
@@ -54531,10 +52891,10 @@
dir = 2;
icon_state = "pipe-c"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
},
/obj/structure/cable/yellow{
@@ -54611,22 +52971,33 @@
icon_state = "red"
},
/area/station/security/prison/cell_block/A)
+"gft" = (
+/obj/machinery/atmospherics/unary/tank/air{
+ dir = 8
+ },
+/obj/machinery/light{
+ dir = 4
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/asmaint)
"gfy" = (
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/effect/turf_decal/stripes/line{
dir = 8
},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -54730,13 +53101,21 @@
/turf/simulated/floor/plasteel,
/area/station/science/robotics)
"ggT" = (
-/obj/effect/turf_decal/delivery/hollow,
-/obj/machinery/atmospherics/portable/canister,
-/obj/machinery/light,
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 6
+ },
+/obj/structure/cable/yellow{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 6
+ },
/turf/simulated/floor/plasteel{
- icon_state = "darkgrey"
+ icon_state = "white"
},
-/area/station/science/storage)
+/area/station/maintenance/asmaint)
"ghF" = (
/obj/structure/sign/securearea{
pixel_x = 32;
@@ -54776,11 +53155,6 @@
/area/station/maintenance/fsmaint)
"giv" = (
/obj/structure/chair/sofa/corp/right,
-/obj/structure/cable/yellow{
- d1 = 2;
- d2 = 4;
- icon_state = "2-4"
- },
/obj/effect/landmark/start/scientist,
/turf/simulated/floor/plasteel{
icon_state = "cafeteria"
@@ -54810,6 +53184,13 @@
},
/turf/simulated/floor/plating,
/area/station/security/permabrig)
+"gkl" = (
+/obj/structure/chair/stool,
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 8
+ },
+/turf/simulated/floor/wood,
+/area/station/service/bar)
"gkn" = (
/obj/machinery/camera{
c_tag = "Prison Solitary Confinemessssnt 1";
@@ -54862,6 +53243,18 @@
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
/area/station/security/storage)
+"glQ" = (
+/obj/structure/table,
+/obj/machinery/computer/security/telescreen{
+ desc = "Used for watching the test chamber.";
+ layer = 4;
+ name = "Test Chamber Telescreen";
+ network = list("Toxins")
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "darkgrey"
+ },
+/area/station/science/toxins/launch)
"glS" = (
/turf/simulated/floor/plasteel{
dir = 1;
@@ -54899,17 +53292,6 @@
"gnd" = (
/turf/simulated/floor/noslip,
/area/station/engineering/control)
-"gnJ" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/unary/vent_pump/on{
- dir = 1
- },
-/turf/simulated/floor/plasteel{
- icon_state = "whitehall"
- },
-/area/station/science/research)
"gnQ" = (
/obj/structure/table,
/obj/item/storage/firstaid/regular,
@@ -54923,6 +53305,11 @@
icon_state = "whiteblue"
},
/area/station/medical/reception)
+"gnS" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/spawner/random_spawners/cobweb_left_frequent,
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard2)
"gnZ" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
@@ -54964,6 +53351,11 @@
/obj/machinery/status_display,
/turf/simulated/wall/r_wall,
/area/station/engineering/engine/supermatter)
+"gpR" = (
+/obj/machinery/atmospherics/pipe/simple/hidden,
+/obj/effect/spawner/window/reinforced/tinted/grilled,
+/turf/simulated/floor/plating,
+/area/station/maintenance/asmaint)
"gpT" = (
/obj/structure/cable/yellow{
d1 = 2;
@@ -55013,6 +53405,14 @@
icon_state = "darkgrey"
},
/area/station/science/toxins/launch)
+"gqi" = (
+/obj/structure/closet/crate,
+/obj/effect/spawner/lootdrop/maintenance,
+/obj/machinery/light/small{
+ dir = 8
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard2)
"gqj" = (
/obj/structure/disposalpipe/segment{
dir = 2;
@@ -55032,42 +53432,29 @@
/turf/simulated/floor/plasteel,
/area/station/engineering/break_room)
"gqt" = (
-/obj/item/target/alien,
-/obj/item/target/syndicate,
-/obj/structure/closet/crate/secure{
- desc = "A secure crate containing various materials for building a customised test-site.";
- name = "Test Site Materials Crate";
- req_access_txt = "8"
- },
-/obj/item/target/alien,
-/obj/item/target/syndicate,
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/effect/turf_decal/delivery/hollow,
-/turf/simulated/floor/plasteel{
- icon_state = "white"
+/obj/structure/closet/l3closet/scientist,
+/obj/machinery/atmospherics/pipe/simple/hidden{
+ dir = 5
},
-/area/station/science/toxins/launch)
+/turf/simulated/floor/plating,
+/area/station/maintenance/asmaint)
"gqv" = (
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "redcorner"
},
/area/station/security/main)
+"gqC" = (
+/obj/machinery/atmospherics/pipe/simple/hidden{
+ dir = 4
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/asmaint)
"gqF" = (
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel,
/area/station/supply/storage)
"gqN" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
/obj/structure/disposalpipe/segment{
dir = 4
},
@@ -55081,29 +53468,58 @@
},
/area/station/science/rnd)
"gqQ" = (
-/obj/structure/chair/comfy{
+/obj/structure/disposalpipe/trunk{
dir = 4
},
+/obj/machinery/disposal/deliveryChute{
+ dir = 1
+ },
+/obj/structure/window/reinforced{
+ dir = 4
+ },
+/obj/machinery/door/window/classic/reversed{
+ dir = 1
+ },
+/obj/effect/mapping_helpers/airlock/windoor/access/any/science/tox{
+ dir = 1
+ },
/obj/machinery/light/small{
dir = 8
},
-/obj/machinery/camera{
- c_tag = "Science Hallway - Xenobio Acess";
- dir = 4;
- network = list("Research","SS13")
+/obj/machinery/firealarm{
+ dir = 1;
+ name = "south bump";
+ pixel_y = -24
},
-/obj/effect/turf_decal/tile/purple{
- dir = 1
+/turf/simulated/floor/plasteel{
+ dir = 10;
+ icon_state = "purple"
},
-/obj/effect/turf_decal/tile/purple,
-/turf/simulated/floor/plasteel,
/area/station/science/research)
+"grl" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/machinery/atmospherics/unary/vent_pump/on,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/science/xenobiology)
"grn" = (
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "darkbluecorners"
},
/area/station/command/bridge)
+"gry" = (
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/plasteel{
+ icon_state = "bar"
+ },
+/area/station/service/bar)
"grE" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on,
/obj/structure/cable/yellow{
@@ -55162,6 +53578,10 @@
/obj/structure/lattice,
/turf/space,
/area/space/nearstation)
+"gty" = (
+/obj/effect/spawner/random_spawners/wall_rusted_probably,
+/turf/simulated/wall/r_wall,
+/area/station/maintenance/aft2)
"gtW" = (
/obj/machinery/light/small{
dir = 8
@@ -55206,6 +53626,12 @@
icon_state = "white"
},
/area/station/science/rnd)
+"gwd" = (
+/obj/structure/sign/poster/official/cleanliness{
+ pixel_y = -32
+ },
+/turf/simulated/floor/plasteel,
+/area/station/service/hydroponics)
"gwG" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/closet/cardboard,
@@ -55230,6 +53656,20 @@
/obj/effect/mapping_helpers/airlock/autoname,
/turf/simulated/floor/plating,
/area/station/maintenance/auxsolarstarboard)
+"gxn" = (
+/obj/machinery/atmospherics/pipe/simple/hidden{
+ dir = 4
+ },
+/obj/item/slime_extract/pink,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/asmaint)
"gxC" = (
/obj/machinery/light/small{
dir = 4
@@ -55285,7 +53725,6 @@
/turf/space,
/area/space/nearstation)
"gzU" = (
-/obj/effect/turf_decal/delivery/white/hollow,
/obj/structure/window/reinforced{
dir = 8
},
@@ -55378,12 +53817,10 @@
icon_state = "whitebluefull"
},
/area/station/medical/reception)
-"gBM" = (
-/obj/item/shard,
-/obj/effect/turf_decal/stripes/line,
-/obj/effect/decal/cleanable/glass,
-/turf/simulated/floor/plating,
-/area/station/maintenance/aft2)
+"gBL" = (
+/obj/effect/spawner/random_spawners/wall_rusted_maybe,
+/turf/simulated/wall/r_wall,
+/area/station/science/test_chamber)
"gCo" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable/yellow{
@@ -55499,7 +53936,6 @@
},
/area/station/service/chapel)
"gDW" = (
-/obj/effect/turf_decal/delivery/hollow,
/obj/machinery/atmospherics/portable/canister/oxygen,
/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
dir = 5
@@ -55526,21 +53962,15 @@
/turf/simulated/floor/carpet,
/area/station/science/robotics/showroom)
"gEt" = (
-/obj/structure/disposalpipe/sortjunction{
- dir = 2;
- icon_state = "pipe-j2s";
- name = "RD Junction";
- sort_type_txt = "13"
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 4;
- icon_state = "1-4"
+/obj/structure/table/glass,
+/obj/item/paper/crumpled,
+/obj/structure/extinguisher_cabinet{
+ name = "north bump";
+ pixel_y = 30
},
/turf/simulated/floor/plasteel{
- icon_state = "white"
+ dir = 5;
+ icon_state = "whitepurple"
},
/area/station/science/research)
"gEK" = (
@@ -55553,6 +53983,22 @@
},
/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/pod_2)
+"gEX" = (
+/obj/structure/table,
+/obj/item/flashlight/lamp,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/spawner/random_spawners/cobweb_left_frequent,
+/turf/simulated/floor/plating,
+/area/station/maintenance/aft2)
+"gFf" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/science/toxins/launch)
"gFk" = (
/obj/structure/table/glass,
/obj/structure/window/reinforced{
@@ -55575,8 +54021,18 @@
icon_state = "darkblue"
},
/area/station/medical/storage)
+"gFz" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "bar"
+ },
+/area/station/service/bar)
"gFQ" = (
-/obj/effect/turf_decal/delivery/white/hollow,
/obj/machinery/monkey_recycler,
/obj/structure/cable/yellow{
d1 = 1;
@@ -55587,12 +54043,32 @@
icon_state = "purple"
},
/area/station/science/xenobiology)
+"gFT" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 6
+ },
+/obj/structure/cable/yellow{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 6
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "darkgrey"
+ },
+/area/station/science/toxins/mixing)
"gGe" = (
-/obj/structure/disposalpipe/segment,
+/obj/effect/turf_decal/stripes/white/line,
+/obj/machinery/atmospherics/portable/pump,
+/obj/machinery/light{
+ dir = 1
+ },
/turf/simulated/floor/plasteel{
- icon_state = "white"
+ icon_state = "darkgrey"
},
-/area/station/science/toxins/launch)
+/area/station/science/storage)
"gGi" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -55620,6 +54096,14 @@
icon_state = "dark"
},
/area/station/aisat)
+"gHd" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 5
+ },
+/obj/effect/decal/cleanable/dirt,
+/mob/living/simple_animal/mouse,
+/turf/simulated/floor/plasteel,
+/area/station/maintenance/starboard2)
"gHh" = (
/obj/structure/cable/yellow{
d1 = 1;
@@ -55670,6 +54154,13 @@
/obj/item/wirecutters,
/turf/simulated/floor/plating,
/area/station/maintenance/fpmaint)
+"gHV" = (
+/obj/machinery/atmospherics/pipe/simple/heat_exchanging,
+/obj/effect/spawner/random_spawners/cobweb_left_frequent,
+/obj/machinery/constructable_frame/machine_frame,
+/obj/item/stack/cable_coil/five,
+/turf/simulated/floor/bluegrid,
+/area/station/maintenance/starboard)
"gHX" = (
/obj/structure/closet/secure_closet/brig{
id = "Cell 3";
@@ -55728,21 +54219,6 @@
icon_state = "whiteblue"
},
/area/station/medical/paramedic)
-"gIN" = (
-/obj/machinery/light/small,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 5
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 5
- },
-/obj/machinery/firealarm{
- dir = 1;
- name = "south bump";
- pixel_y = -24
- },
-/turf/simulated/floor/wood,
-/area/station/service/theatre)
"gIS" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 4
@@ -55753,15 +54229,11 @@
},
/area/station/security/armory/secure)
"gJg" = (
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plasteel{
+ icon_state = "darkgrey"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/plating,
-/area/station/maintenance/aft2)
+/area/station/science/toxins/mixing)
"gJt" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -55836,6 +54308,10 @@
icon_state = "yellow"
},
/area/station/engineering/break_room)
+"gLZ" = (
+/obj/effect/spawner/random_spawners/oil_often,
+/turf/simulated/floor/plating,
+/area/station/maintenance/aft2)
"gMh" = (
/obj/structure/cable/yellow{
d1 = 4;
@@ -55851,6 +54327,10 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/starboard)
+"gMo" = (
+/obj/machinery/atmospherics/pipe/manifold/visible/cyan,
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard2)
"gMp" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -55862,19 +54342,6 @@
icon_state = "freezerfloor"
},
/area/station/security/permabrig)
-"gME" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel{
- icon_state = "white"
- },
-/area/station/science/toxins/mixing)
"gMG" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on,
/obj/machinery/firealarm{
@@ -55888,24 +54355,6 @@
icon_state = "white"
},
/area/station/science/xenobiology)
-"gMS" = (
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 4;
- icon_state = "1-4"
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel{
- icon_state = "greenblue"
- },
-/area/station/maintenance/starboard)
"gMT" = (
/obj/structure/table/glass,
/obj/item/slime_scanner,
@@ -55962,8 +54411,13 @@
/obj/effect/turf_decal/delivery,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/purple,
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 4
+ dir = 8
},
/turf/simulated/floor/plasteel{
icon_state = "caution"
@@ -55979,12 +54433,6 @@
},
/turf/simulated/floor/engine,
/area/station/science/explab/chamber)
-"gNG" = (
-/obj/machinery/atmospherics/pipe/simple/insulated{
- dir = 4
- },
-/turf/simulated/wall/r_wall,
-/area/station/science/toxins/mixing)
"gNO" = (
/obj/item/wirecutters,
/obj/machinery/light/small{
@@ -55992,6 +54440,24 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
+"gOq" = (
+/obj/machinery/light_switch{
+ dir = 1;
+ name = "south bump";
+ pixel_y = -24
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 9
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/turf/simulated/floor/wood,
+/area/station/service/bar)
+"gOT" = (
+/obj/effect/spawner/random_spawners/wall_rusted_maybe,
+/turf/simulated/wall/r_wall,
+/area/station/science/research)
"gOU" = (
/obj/machinery/door/window/classic/reversed{
name = "Desk Door";
@@ -56029,6 +54495,31 @@
},
/turf/simulated/floor/plating,
/area/station/command/office/ce)
+"gQc" = (
+/obj/machinery/atmospherics/unary/passive_vent{
+ dir = 4
+ },
+/obj/structure/lattice/catwalk,
+/obj/structure/window/plasmareinforced{
+ dir = 4
+ },
+/turf/space,
+/area/space/nearstation)
+"gQu" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/light/small,
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 4
+ },
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard)
"gRm" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -56064,6 +54555,12 @@
/obj/effect/mapping_helpers/airlock/windoor/access/all/engineering/atmos,
/turf/simulated/floor/plating,
/area/station/engineering/atmos/control)
+"gRz" = (
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 8
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard)
"gRF" = (
/obj/structure/closet/secure_closet{
anchored = 1;
@@ -56130,13 +54627,9 @@
},
/area/station/science/xenobiology)
"gSO" = (
-/obj/effect/spawner/window/reinforced,
-/obj/machinery/door/poddoor/shutters/preopen{
- id_tag = "rdrnd";
- name = "Research and Development Shutters"
- },
-/turf/simulated/floor/plating,
-/area/station/science/rnd)
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plasteel,
+/area/station/maintenance/starboard2)
"gSU" = (
/obj/structure/disposaloutlet{
dir = 1
@@ -56146,7 +54639,7 @@
},
/obj/machinery/light/small,
/turf/simulated/floor/engine,
-/area/station/science/test_chamber)
+/area/station/science/xenobiology)
"gTn" = (
/obj/structure/rack,
/obj/item/lightreplacer{
@@ -56199,12 +54692,13 @@
/turf/simulated/floor/plating,
/area/station/turret_protected/ai_upload)
"gTS" = (
+/obj/machinery/alarm{
+ name = "north bump";
+ pixel_y = 24
+ },
/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
+ dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -56255,6 +54749,22 @@
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
/area/station/hallway/secondary/exit)
+"gVk" = (
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/maintenance/asmaint)
"gVr" = (
/obj/structure/cable,
/obj/machinery/power/solar{
@@ -56289,78 +54799,80 @@
},
/turf/simulated/floor/engine,
/area/station/engineering/control)
-"gVL" = (
-/obj/structure/flora/ausbushes/fernybush,
-/obj/structure/flora/ausbushes/brflowers,
-/obj/structure/window/full/basic,
-/turf/simulated/floor/grass/no_creep,
-/area/station/maintenance/asmaint)
"gVS" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 5
+ },
+/obj/machinery/hologram/holopad,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 5
},
-/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
icon_state = "darkgrey"
},
/area/station/science/robotics)
"gVX" = (
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/structure/window/reinforced{
- dir = 1
+/obj/structure/table/reinforced,
+/obj/machinery/door/firedoor,
+/obj/machinery/door/window/classic/normal{
+ name = "Robotics Desk";
+ dir = 4
},
-/obj/structure/rack,
-/obj/item/storage/box/bodybags{
- pixel_x = -4;
- pixel_y = -4
+/obj/item/paper_bin,
+/obj/item/pen,
+/obj/machinery/door/poddoor/shutters/preopen{
+ id_tag = "roboticsprivacy2";
+ name = "Robotics Shutters"
},
-/obj/item/storage/box/gloves{
- pixel_x = 4;
- pixel_y = 4
+/obj/effect/mapping_helpers/airlock/windoor/access/all/science/robotics{
+ dir = 4
},
-/obj/item/storage/box/masks,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
/area/station/science/robotics)
+"gWk" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/cyan,
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/plasteel,
+/area/station/maintenance/aft2)
"gWz" = (
/obj/effect/decal/cleanable/dirt,
/mob/living/simple_animal/mouse,
/turf/simulated/floor/plasteel,
/area/station/maintenance/fsmaint)
"gWE" = (
-/obj/structure/table/reinforced,
-/obj/effect/turf_decal/delivery/hollow,
-/obj/item/assembly/signaler{
- pixel_x = -2;
- pixel_y = -2
- },
-/obj/item/assembly/signaler{
- pixel_x = 6;
- pixel_y = 5
- },
-/obj/item/assembly/signaler{
- pixel_x = -8;
- pixel_y = 5
+/obj/machinery/atmospherics/pipe/simple/hidden{
+ dir = 4
},
-/obj/item/assembly/signaler{
- pixel_y = 8
+/obj/effect/spawner/window/reinforced/tinted/grilled,
+/turf/simulated/floor/plating,
+/area/station/maintenance/asmaint)
+"gXg" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
},
/obj/structure/cable/yellow{
- d2 = 8;
- icon_state = "0-8"
- },
-/obj/machinery/power/apc{
- dir = 1;
- name = "north bump";
- pixel_y = 24
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
},
/turf/simulated/floor/plasteel{
- icon_state = "white"
+ icon_state = "cafeteria"
},
-/area/station/science/toxins/launch)
+/area/station/service/kitchen)
"gXj" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/hatch{
@@ -56417,6 +54929,11 @@
},
/turf/simulated/floor/grass/no_creep,
/area/station/hallway/secondary/garden)
+"gYF" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/reagent_dispensers/watertank,
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard)
"gYM" = (
/obj/structure/rack,
/obj/item/storage/belt/utility,
@@ -56470,16 +54987,12 @@
},
/area/station/engineering/control)
"gZT" = (
-/obj/effect/turf_decal/tile/purple,
-/obj/effect/turf_decal/tile/purple{
- dir = 1
+/obj/machinery/atmospherics/pipe/simple/insulated{
+ dir = 6
},
-/obj/machinery/firealarm{
- dir = 1;
- name = "south bump";
- pixel_y = -24
+/turf/simulated/floor/plasteel{
+ icon_state = "purple"
},
-/turf/simulated/floor/plasteel,
/area/station/science/research)
"gZV" = (
/obj/structure/cable/yellow{
@@ -56556,6 +55069,15 @@
icon_state = "whiteblue"
},
/area/station/medical/exam_room)
+"hcI" = (
+/obj/item/kirbyplants{
+ icon_state = "plant-21"
+ },
+/obj/machinery/light/small{
+ dir = 1
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard2)
"hcL" = (
/obj/structure/table,
/obj/item/stack/medical/bruise_pack,
@@ -56582,6 +55104,13 @@
},
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/exit)
+"hdc" = (
+/obj/item/book/manual/random,
+/obj/machinery/light/small{
+ dir = 8
+ },
+/turf/simulated/floor/wood,
+/area/station/maintenance/starboard)
"hdk" = (
/obj/structure/disposaloutlet{
name = "Prisoner Delivery"
@@ -56658,13 +55187,8 @@
/obj/machinery/atmospherics/unary/outlet_injector/on{
dir = 8
},
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/turf/simulated/floor/engine,
-/area/station/science/test_chamber)
+/area/station/science/xenobiology)
"hfb" = (
/obj/machinery/atmospherics/pipe/simple/visible/yellow,
/obj/effect/turf_decal/stripes/line{
@@ -56697,6 +55221,17 @@
dir = 4;
icon_state = "pipe-c"
},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 6
+ },
+/obj/structure/cable/yellow{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -56796,11 +55331,6 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/medmaint)
-"hgY" = (
-/obj/structure/grille/broken,
-/obj/effect/landmark/damageturf,
-/turf/simulated/floor/plating,
-/area/station/maintenance/aft2)
"hht" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -56817,6 +55347,17 @@
icon_state = "dark"
},
/area/station/command/bridge)
+"hhN" = (
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/science/toxins/mixing)
"hhO" = (
/obj/structure/cable/yellow{
d1 = 1;
@@ -56861,20 +55402,32 @@
/turf/simulated/floor/carpet,
/area/station/service/library)
"hiP" = (
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "whitepurplecorner"
+ },
+/area/station/science/explab)
+"hjg" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 10
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
+/obj/structure/cable/yellow{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/effect/turf_decal/stripes/line,
/obj/structure/cable/yellow{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/asmaint)
+/area/station/maintenance/starboard)
"hjj" = (
/obj/effect/turf_decal/arrows/red{
dir = 4
@@ -56903,6 +55456,14 @@
icon_state = "brown"
},
/area/station/supply/lobby)
+"hjx" = (
+/obj/machinery/atmospherics/pipe/simple/hidden{
+ dir = 4
+ },
+/obj/effect/spawner/random_spawners/fungus_maybe,
+/obj/effect/spawner/window/reinforced/tinted/grilled,
+/turf/simulated/floor/plating,
+/area/station/maintenance/asmaint)
"hjC" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -56969,24 +55530,14 @@
"hkF" = (
/turf/simulated/wall/mineral/titanium,
/area/shuttle/pod_2)
-"hls" = (
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
- },
-/obj/structure/cable/yellow{
- d1 = 2;
- d2 = 8;
- icon_state = "2-8"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 10
+"hkM" = (
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 8
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 10
+/turf/simulated/floor/plasteel{
+ icon_state = "cafeteria"
},
-/turf/simulated/floor/plating,
-/area/station/maintenance/starboard)
+/area/station/science/break_room)
"hlD" = (
/obj/structure/cable/yellow{
d1 = 1;
@@ -57033,22 +55584,6 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
-"hmM" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/turf/simulated/floor/plasteel{
- icon_state = "greenblue"
- },
-/area/station/maintenance/starboard)
"hnc" = (
/obj/effect/spawner/window/reinforced/grilled,
/obj/structure/cable/yellow{
@@ -57081,6 +55616,26 @@
},
/turf/simulated/floor/plasteel,
/area/station/engineering/atmos)
+"hns" = (
+/obj/structure/disposalpipe/junction/reversed{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+ dir = 1
+ },
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/effect/spawner/random_spawners/oil_maybe,
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 1
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/science/research)
"hnx" = (
/obj/effect/turf_decal/stripes/corner{
dir = 8
@@ -57089,28 +55644,6 @@
icon_state = "white"
},
/area/station/science/xenobiology)
-"hnB" = (
-/obj/structure/table,
-/obj/machinery/cell_charger{
- pixel_y = 5
- },
-/obj/item/stack/cable_coil,
-/obj/item/multitool,
-/obj/item/stock_parts/cell/high{
- charge = 100;
- maxcharge = 15000
- },
-/obj/machinery/power/apc{
- dir = 4;
- name = "east bump";
- pixel_x = 24
- },
-/obj/structure/cable/yellow{
- d2 = 2;
- icon_state = "0-2"
- },
-/turf/simulated/floor/engine,
-/area/station/science/test_chamber)
"hnI" = (
/obj/structure/sink{
pixel_y = 17
@@ -57197,6 +55730,7 @@
d2 = 2;
icon_state = "1-2"
},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -57260,26 +55794,11 @@
},
/turf/simulated/floor/plasteel,
/area/station/engineering/atmos/control)
-"hqs" = (
-/obj/structure/table/reinforced,
-/obj/machinery/door/window/classic/reversed{
- dir = 4
- },
-/obj/effect/mapping_helpers/airlock/windoor/autoname/desk{
- dir = 4
- },
-/obj/item/folder{
- pixel_x = 4;
- pixel_y = -3
- },
-/obj/machinery/door/firedoor,
-/obj/effect/mapping_helpers/airlock/windoor/access/all/service/hydroponics{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- icon_state = "greenfull"
- },
-/area/station/service/hydroponics)
+"hqx" = (
+/obj/structure/closet/emcloset,
+/obj/effect/spawner/lootdrop/maintenance,
+/turf/simulated/floor/plating,
+/area/station/maintenance/aft2)
"hqL" = (
/obj/effect/spawner/window/reinforced/grilled,
/obj/structure/cable/yellow{
@@ -57298,23 +55817,18 @@
/turf/simulated/floor/plating,
/area/station/security/permabrig)
"hrf" = (
-/obj/machinery/newscaster{
- dir = 8;
+/obj/structure/disposalpipe/segment,
+/obj/machinery/power/apc{
+ dir = 4;
name = "east bump";
- pixel_x = 28
+ pixel_x = 24
},
/obj/structure/cable/yellow{
- d1 = 1;
d2 = 2;
- icon_state = "1-2"
+ icon_state = "0-2"
},
/turf/simulated/floor/wood,
/area/station/service/bar)
-"hrM" = (
-/obj/structure/reagent_dispensers/watertank,
-/obj/effect/landmark/damageturf,
-/turf/simulated/floor/plating,
-/area/station/maintenance/asmaint)
"hrZ" = (
/obj/structure/table,
/obj/effect/turf_decal/delivery/hollow,
@@ -57367,18 +55881,19 @@
},
/area/station/medical/virology)
"hts" = (
-/obj/machinery/door/airlock/maintenance,
-/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
+/obj/structure/rack,
+/obj/effect/spawner/lootdrop/maintenance,
+/obj/machinery/light/small{
+ dir = 1
},
-/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
+"hty" = (
+/obj/item/kirbyplants{
+ icon_state = "plant-21"
+ },
+/turf/simulated/floor/plasteel,
+/area/station/maintenance/starboard2)
"htP" = (
/obj/structure/table,
/obj/item/reagent_containers/food/condiment/milk{
@@ -57424,6 +55939,10 @@
},
/turf/simulated/floor/plasteel,
/area/station/security/prison/cell_block/A)
+"hvr" = (
+/obj/effect/spawner/random_spawners/cobweb_right_rare,
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard2)
"hvz" = (
/obj/structure/table,
/obj/item/key/security,
@@ -57474,27 +55993,15 @@
/turf/simulated/floor/plasteel,
/area/station/science/xenobiology)
"hwF" = (
-/obj/item/broken_bottle{
- pixel_x = 9;
- pixel_y = -4
- },
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
- },
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 8;
- icon_state = "1-8"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 9
+/obj/structure/table/wood,
+/obj/item/storage/photo_album,
+/obj/item/book/codex_gigas,
+/obj/machinery/computer/security/telescreen/entertainment{
+ pixel_x = -32
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 9
+/turf/simulated/floor/plasteel{
+ icon_state = "cult"
},
-/obj/effect/landmark/burnturf,
-/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
"hwP" = (
/obj/structure/disposalpipe/segment,
@@ -57508,11 +56015,16 @@
},
/area/station/security/main)
"hwV" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/effect/turf_decal/stripes/white/line,
+/obj/machinery/atmospherics/portable/scrubber,
+/obj/item/radio/intercom{
+ name = "north bump";
+ pixel_y = 28
+ },
/turf/simulated/floor/plasteel{
- icon_state = "white"
+ icon_state = "darkgrey"
},
-/area/station/science/toxins/launch)
+/area/station/science/storage)
"hwZ" = (
/obj/effect/landmark/damageturf,
/obj/structure/cable/yellow{
@@ -57584,26 +56096,10 @@
icon_state = "dark"
},
/area/station/turret_protected/ai_upload)
-"hyp" = (
-/obj/machinery/door/airlock/research,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/effect/mapping_helpers/airlock/autoname,
-/obj/effect/mapping_helpers/airlock/access/all/science/tox,
-/obj/machinery/door/firedoor/heavy{
- opacity = 0
- },
-/turf/simulated/floor/plasteel{
- icon_state = "whitepurplefull"
- },
-/area/station/science/toxins/mixing)
"hyD" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 1
+/obj/structure/noticeboard{
+ dir = 4;
+ pixel_x = -32
},
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -57613,10 +56109,20 @@
d2 = 2;
icon_state = "1-2"
},
-/turf/simulated/floor/plating,
-/area/station/maintenance/aft2)
+/turf/simulated/floor/plasteel{
+ dir = 9;
+ icon_state = "whitepurple"
+ },
+/area/station/science/robotics)
"hyQ" = (
/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -57739,29 +56245,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/central)
-"hBB" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/research,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/effect/mapping_helpers/airlock/autoname,
-/obj/effect/mapping_helpers/airlock/access/all/science/research,
-/turf/simulated/floor/plasteel{
- icon_state = "whitepurplefull"
- },
-/area/station/science/explab)
"hBH" = (
/obj/machinery/atmospherics/unary/vent_pump/siphon/on{
dir = 8;
@@ -57791,6 +56274,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "cautioncorner"
@@ -57808,6 +56294,17 @@
},
/turf/simulated/floor/bluegrid/telecomms,
/area/station/science/xenobiology)
+"hCA" = (
+/obj/structure/closet/crate/secure/bin,
+/obj/item/paper/crumpled,
+/obj/item/paper/crumpled,
+/obj/effect/spawner/lootdrop{
+ loot = list(/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes);
+ name = "trash spawner"
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plating,
+/area/station/maintenance/aft2)
"hCM" = (
/obj/effect/landmark/lightsout,
/turf/simulated/floor/plasteel{
@@ -57829,13 +56326,6 @@
/obj/machinery/light{
dir = 8
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
/turf/simulated/floor/plasteel,
/area/station/science/robotics)
"hDx" = (
@@ -57856,6 +56346,11 @@
icon_state = "neutralcorner"
},
/area/station/hallway/secondary/bridge)
+"hDE" = (
+/obj/structure/rack,
+/obj/effect/spawner/lootdrop/maintenance/two,
+/turf/simulated/floor/plating,
+/area/station/maintenance/asmaint)
"hDK" = (
/turf/simulated/floor/plasteel,
/area/station/supply/lobby)
@@ -57880,9 +56375,6 @@
/turf/simulated/floor/plasteel,
/area/station/security/checkpoint/secondary)
"hEe" = (
-/obj/machinery/atmospherics/unary/vent_pump/on{
- dir = 8
- },
/obj/effect/landmark/start/roboticist,
/turf/simulated/floor/plasteel,
/area/station/science/robotics)
@@ -57918,7 +56410,6 @@
/obj/item/clothing/glasses/hud/diagnostic,
/obj/item/clothing/glasses/welding,
/obj/item/clothing/head/welding,
-/obj/effect/turf_decal/delivery/hollow,
/turf/simulated/floor/plasteel,
/area/station/science/robotics)
"hEv" = (
@@ -58057,6 +56548,15 @@
/obj/effect/spawner/lootdrop/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
+"hGj" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ dir = 0;
+ icon_state = "green"
+ },
+/area/station/service/hydroponics)
"hGL" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel,
@@ -58100,7 +56600,7 @@
/area/station/security/permabrig)
"hHA" = (
/obj/machinery/door/airlock/maintenance,
-/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
/turf/simulated/floor/plating,
/area/station/maintenance/aft2)
"hHE" = (
@@ -58125,11 +56625,6 @@
icon_state = "cult"
},
/area/station/legal/lawoffice)
-"hIk" = (
-/obj/structure/dispenser,
-/obj/effect/turf_decal/delivery/hollow,
-/turf/simulated/floor/plasteel,
-/area/station/science/toxins/mixing)
"hIG" = (
/obj/structure/window/reinforced{
dir = 8
@@ -58141,20 +56636,6 @@
icon_state = "dark"
},
/area/station/aisat)
-"hIK" = (
-/obj/structure/table/glass,
-/obj/item/paper_bin{
- pixel_x = -2;
- pixel_y = 6
- },
-/obj/item/pen{
- pixel_x = -2;
- pixel_y = 5
- },
-/turf/simulated/floor/plasteel{
- icon_state = "white"
- },
-/area/station/science/research)
"hIO" = (
/obj/machinery/light{
dir = 8
@@ -58225,18 +56706,6 @@
icon_state = "darkgrey"
},
/area/station/command/office/ce)
-"hKu" = (
-/obj/structure/table,
-/obj/item/storage/bag/plants,
-/obj/item/reagent_containers/glass/bucket,
-/obj/effect/turf_decal/tile/bar{
- dir = 1
- },
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "neutralcorner"
- },
-/area/station/maintenance/starboard)
"hKK" = (
/obj/structure/cable/yellow{
d1 = 1;
@@ -58276,19 +56745,6 @@
icon_state = "redcorner"
},
/area/station/security/brig)
-"hLa" = (
-/obj/structure/table,
-/obj/machinery/computer/security/telescreen{
- desc = "Used for watching the test chamber.";
- layer = 4;
- name = "Test Chamber Telescreen";
- network = list("Toxins")
- },
-/obj/effect/turf_decal/delivery/hollow,
-/turf/simulated/floor/plasteel{
- icon_state = "darkgrey"
- },
-/area/station/science/toxins/launch)
"hLt" = (
/obj/machinery/camera{
c_tag = "Chapel Office - Backroom";
@@ -58343,24 +56799,15 @@
},
/area/station/service/chapel)
"hLX" = (
-/obj/machinery/chem_master/condimaster{
- name = "HoochMaster Deluxe"
- },
-/obj/item/radio/intercom{
- name = "custom placement";
- pixel_x = -28;
- pixel_y = -28
- },
-/obj/machinery/alarm{
+/obj/machinery/light_switch{
dir = 4;
name = "west bump";
pixel_x = -24
},
-/obj/effect/turf_decal/delivery/hollow,
/turf/simulated/floor/plasteel{
- icon_state = "bar"
+ icon_state = "cafeteria"
},
-/area/station/service/bar)
+/area/station/service/kitchen)
"hMv" = (
/obj/effect/landmark/spawner/rev,
/obj/structure/morgue{
@@ -58385,6 +56832,25 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/disposal)
+"hMS" = (
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 1
+ },
+/obj/structure/cable/yellow{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/cyan{
+ dir = 1
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard2)
"hNa" = (
/obj/structure/lattice/catwalk,
/obj/structure/disposalpipe/segment{
@@ -58449,14 +56915,25 @@
},
/area/station/security/main)
"hPb" = (
-/obj/machinery/light{
- dir = 8
+/obj/effect/landmark/start/roboticist,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 9
+ },
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
},
-/obj/machinery/economy/vending/scidrobe,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
-/area/station/science/research)
+/area/station/science/robotics)
"hPi" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5
@@ -58553,6 +57030,10 @@
icon_state = "freezerfloor"
},
/area/station/public/toilet/lockerroom)
+"hRR" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard2)
"hRS" = (
/obj/machinery/newscaster{
name = "north bump";
@@ -58566,6 +57047,13 @@
icon_state = "yellow"
},
/area/station/engineering/break_room)
+"hRT" = (
+/obj/structure/closet/crate/freezer,
+/obj/machinery/light/small,
+/turf/simulated/floor/plasteel{
+ icon_state = "showroomfloor"
+ },
+/area/station/service/kitchen)
"hSa" = (
/obj/machinery/door/window/reinforced/normal{
name = "Command Desk"
@@ -58599,6 +57087,19 @@
/obj/machinery/space_heater,
/turf/simulated/floor/plating,
/area/station/maintenance/port2)
+"hSP" = (
+/obj/machinery/door_control{
+ id = "hydro_service";
+ name = "Service Shutter Control";
+ pixel_x = 24;
+ pixel_y = 24;
+ req_access_txt = "35"
+ },
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "green"
+ },
+/area/station/service/hydroponics)
"hSV" = (
/obj/structure/window/reinforced{
dir = 1
@@ -58618,11 +57119,6 @@
},
/turf/simulated/floor/plasteel,
/area/station/science/xenobiology)
-"hSW" = (
-/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction,
-/obj/effect/spawner/window/reinforced/grilled,
-/turf/simulated/floor/plating,
-/area/station/maintenance/aft2)
"hSX" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
@@ -58662,6 +57158,13 @@
},
/turf/simulated/floor/plasteel,
/area/station/supply/storage)
+"hTl" = (
+/obj/item/book/manual/random,
+/obj/machinery/light/small,
+/turf/simulated/floor/wood{
+ icon_state = "wood-broken6"
+ },
+/area/station/maintenance/starboard)
"hTx" = (
/obj/machinery/shower{
dir = 8
@@ -58727,21 +57230,21 @@
},
/area/station/science/toxins/launch)
"hVX" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
/obj/structure/disposalpipe/segment{
dir = 4;
icon_state = "pipe-c"
},
/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
},
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -58795,6 +57298,17 @@
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/station/security/permabrig)
+"hYj" = (
+/obj/machinery/door/airlock/atmos{
+ name = "Fore-Starboard Atmospherics Maintenance"
+ },
+/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
+/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos,
+/obj/machinery/atmospherics/pipe/simple/visible/universal{
+ dir = 4
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard2)
"hYu" = (
/obj/machinery/newscaster{
name = "north bump";
@@ -58841,8 +57355,18 @@
},
/area/station/science/rnd)
"hYD" = (
-/mob/living/simple_animal/mouse,
-/turf/simulated/floor/plating,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/manifold/hidden/cyan{
+ dir = 4
+ },
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
/area/station/maintenance/asmaint)
"hYL" = (
/obj/structure/cable/yellow{
@@ -58949,19 +57473,6 @@
icon_state = "vault"
},
/area/station/security/armory/secure)
-"iaW" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/tile/bar,
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "whitecorner"
- },
-/area/station/service/kitchen)
"ibh" = (
/obj/machinery/atmospherics/binary/pump{
dir = 1;
@@ -58976,7 +57487,6 @@
},
/area/station/engineering/atmos)
"ibu" = (
-/obj/effect/turf_decal/delivery/hollow,
/obj/machinery/atmospherics/portable/canister/nitrogen,
/turf/simulated/floor/plasteel,
/area/station/engineering/atmos/control)
@@ -59012,17 +57522,6 @@
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/entry)
"icm" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 5
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 5
- },
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 4;
- icon_state = "1-4"
- },
/turf/simulated/floor/plasteel{
dir = 10;
icon_state = "whitepurple"
@@ -59086,21 +57585,6 @@
/obj/effect/turf_decal/stripes/corner,
/turf/simulated/floor/plating,
/area/station/maintenance/engimaint)
-"ido" = (
-/obj/structure/rack,
-/obj/item/stock_parts/matter_bin,
-/obj/item/stock_parts/scanning_module{
- pixel_x = 2;
- pixel_y = 3
- },
-/obj/item/assembly/prox_sensor{
- pixel_y = 2
- },
-/obj/machinery/atmospherics/pipe/simple/hidden,
-/turf/simulated/floor/plasteel{
- icon_state = "white"
- },
-/area/station/maintenance/aft2)
"idr" = (
/obj/structure/disposalpipe/segment{
dir = 1;
@@ -59114,6 +57598,14 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/medmaint)
+"idO" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 9
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "cafeteria"
+ },
+/area/station/science/break_room)
"iet" = (
/obj/effect/turf_decal/stripes/corner{
dir = 4
@@ -59162,6 +57654,15 @@
icon_state = "white"
},
/area/station/science/xenobiology)
+"ifq" = (
+/obj/machinery/atmospherics/pipe/manifold/visible/cyan{
+ dir = 8;
+ initialize_directions = 11
+ },
+/obj/machinery/atmospherics/meter,
+/obj/effect/decal/cleanable/blood/drip,
+/turf/simulated/floor/plating,
+/area/station/maintenance/asmaint)
"ifr" = (
/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/siding,
@@ -59183,6 +57684,14 @@
icon_state = "dark"
},
/area/station/medical/cloning)
+"ifD" = (
+/obj/structure/kitchenspike,
+/obj/effect/decal/cleanable/blood/old,
+/turf/simulated/floor/plasteel{
+ dir = 6;
+ icon_state = "vault"
+ },
+/area/station/maintenance/asmaint)
"ifM" = (
/obj/machinery/atmospherics/unary/portables_connector{
dir = 4
@@ -59205,6 +57714,16 @@
/obj/structure/mecha_wreckage/ripley,
/turf/simulated/floor/plasteel,
/area/station/maintenance/apmaint)
+"igm" = (
+/obj/structure/reagent_dispensers/watertank/high,
+/obj/item/reagent_containers/glass/bucket,
+/obj/effect/turf_decal/stripes/line,
+/obj/item/radio/intercom{
+ name = "north bump";
+ pixel_y = 28
+ },
+/turf/simulated/floor/plasteel,
+/area/station/service/hydroponics)
"igv" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
@@ -59220,6 +57739,12 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/xenobio_north)
+"igJ" = (
+/obj/structure/rack,
+/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random_spawners/cobweb_left_frequent,
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard2)
"ihq" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/cable/yellow{
@@ -59254,27 +57779,42 @@
icon_state = "dark"
},
/area/station/engineering/atmos)
-"ihv" = (
+"ihF" = (
+/obj/machinery/door/airlock/maintenance,
+/obj/effect/mapping_helpers/airlock/autoname,
+/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
/obj/structure/disposalpipe/segment,
-/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/plasteel,
-/area/station/maintenance/starboard)
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
+/turf/simulated/floor/plating,
+/area/station/maintenance/asmaint)
"ihW" = (
-/obj/structure/morgue{
- dir = 2
+/obj/structure/disposalpipe/segment{
+ dir = 2;
+ icon_state = "pipe-c"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 10
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 10
+ },
+/obj/structure/cable/yellow{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
},
-/obj/effect/turf_decal/stripes/white,
/turf/simulated/floor/plasteel{
- icon_state = "white"
+ dir = 4;
+ icon_state = "whitepurple"
},
-/area/station/science/robotics)
+/area/station/science/research)
"iil" = (
/obj/machinery/atmospherics/unary/portables_connector{
dir = 4
@@ -59361,17 +57901,6 @@
},
/turf/simulated/floor/plating,
/area/station/security/prison/cell_block/A)
-"ikn" = (
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel,
-/area/station/maintenance/starboard)
"ikK" = (
/obj/machinery/atmospherics/trinary/filter{
dir = 4;
@@ -59414,6 +57943,22 @@
},
/turf/simulated/floor/plasteel,
/area/station/public/locker)
+"ily" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 10
+ },
+/obj/structure/cable/yellow{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 10
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/science/research)
"ilJ" = (
/obj/machinery/door/firedoor,
/obj/structure/table/reinforced,
@@ -59443,6 +57988,15 @@
},
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/exit)
+"imh" = (
+/obj/machinery/atmospherics/pipe/simple/hidden{
+ dir = 10
+ },
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "whitepurple"
+ },
+/area/station/maintenance/asmaint)
"ims" = (
/obj/effect/turf_decal/stripes/corner,
/turf/simulated/floor/plasteel{
@@ -59473,10 +58027,6 @@
icon_state = "dark"
},
/area/station/engineering/control)
-"imG" = (
-/obj/item/shard,
-/turf/simulated/floor/grass,
-/area/station/maintenance/aft2)
"imQ" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel,
@@ -59547,6 +58097,10 @@
},
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/entry)
+"inB" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard2)
"iof" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -59586,9 +58140,6 @@
},
/area/station/security/prisonlockers)
"ipa" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
@@ -59600,12 +58151,18 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/effect/turf_decal/tile/bar,
-/turf/simulated/floor/plasteel{
+/obj/structure/disposalpipe/junction{
dir = 4;
- icon_state = "neutralcorner"
+ icon_state = "pipe-j2"
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "redcorner"
},
/area/station/hallway/primary/central)
+"ipj" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard2)
"ipz" = (
/obj/structure/cable/yellow{
d2 = 2;
@@ -59825,19 +58382,6 @@
},
/turf/space,
/area/space/nearstation)
-"iuD" = (
-/obj/structure/closet/secure_closet/hydroponics,
-/obj/effect/turf_decal/stripes/line{
- dir = 10
- },
-/obj/machinery/light_switch{
- dir = 4;
- name = "custom placement";
- pixel_x = -24;
- pixel_y = -6
- },
-/turf/simulated/floor/plasteel,
-/area/station/service/hydroponics)
"iuI" = (
/obj/machinery/sparker{
id = "toxinsigniter";
@@ -59847,17 +58391,11 @@
/area/station/science/toxins/mixing)
"iuU" = (
/obj/machinery/atmospherics/pipe/simple/visible/purple,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable/yellow{
d1 = 1;
d2 = 8;
icon_state = "1-8"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
@@ -59980,19 +58518,8 @@
/turf/simulated/floor/plating,
/area/station/maintenance/aft)
"ixf" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
+/obj/effect/turf_decal/delivery,
/turf/simulated/floor/plasteel{
- dir = 1;
icon_state = "greenblue"
},
/area/station/service/hydroponics)
@@ -60052,14 +58579,6 @@
icon_state = "white"
},
/area/station/science/xenobiology)
-"iya" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/tile/bar,
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "whitecorner"
- },
-/area/station/service/kitchen)
"iyj" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -60097,6 +58616,31 @@
icon_state = "chapel"
},
/area/station/service/chapel)
+"izc" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 4
+ },
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard)
+"izo" = (
+/obj/machinery/economy/vending/hydroseeds,
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/stripes/line{
+ dir = 10
+ },
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "green"
+ },
+/area/station/service/hydroponics)
"izK" = (
/obj/structure/cable/yellow{
d1 = 2;
@@ -60196,10 +58740,15 @@
},
/area/station/security/execution)
"iBb" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 1
+/obj/structure/closet/secure_closet/personal,
+/obj/effect/spawner/lootdrop/maintenance,
+/obj/item/clothing/under/plasmaman/science,
+/obj/item/clothing/head/helmet/space/plasmaman/science,
+/obj/effect/spawner/random_spawners/cobweb_left_rare,
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "whitehall"
},
-/turf/simulated/floor/plating,
/area/station/maintenance/aft2)
"iBc" = (
/obj/machinery/atmospherics/pipe/simple/visible/green{
@@ -60211,12 +58760,6 @@
},
/turf/simulated/floor/plasteel,
/area/station/engineering/atmos/distribution)
-"iBi" = (
-/obj/effect/turf_decal/delivery/hollow,
-/turf/simulated/floor/plasteel{
- icon_state = "darkgrey"
- },
-/area/station/science/robotics)
"iBq" = (
/obj/structure/extinguisher_cabinet{
name = "west bump";
@@ -60258,6 +58801,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "whitepurplefull"
},
@@ -60276,6 +58822,12 @@
"iBR" = (
/turf/simulated/wall/r_wall,
/area/station/security/storage)
+"iCJ" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 4
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/aft2)
"iCM" = (
/obj/structure/grille/broken,
/turf/simulated/floor/plating,
@@ -60363,6 +58915,13 @@
icon_state = "whitehall"
},
/area/station/science/research)
+"iFA" = (
+/obj/structure/table,
+/obj/item/reagent_containers/food/drinks/h_chocolate,
+/turf/simulated/floor/plasteel{
+ icon_state = "cafeteria"
+ },
+/area/station/science/break_room)
"iGf" = (
/obj/machinery/firealarm{
dir = 8;
@@ -60378,23 +58937,6 @@
icon_state = "barber"
},
/area/station/service/barber)
-"iGw" = (
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/light/small{
- dir = 1
- },
-/turf/simulated/floor/plating,
-/area/station/maintenance/aft2)
"iGR" = (
/obj/structure/closet/crate{
name = "Silver Crate"
@@ -60411,25 +58953,12 @@
icon_state = "whitepurple"
},
/area/station/science/research)
-"iHc" = (
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/effect/landmark/spawner/nukedisc_respawn,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden,
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "whitepurple"
- },
-/area/station/maintenance/aft2)
+"iGZ" = (
+/obj/machinery/door/airlock/maintenance,
+/obj/effect/mapping_helpers/airlock/autoname,
+/obj/effect/mapping_helpers/airlock/access/all/service/bar,
+/turf/simulated/floor/wood,
+/area/station/maintenance/starboard)
"iHk" = (
/obj/structure/cable/yellow{
d1 = 1;
@@ -60478,25 +59007,6 @@
/obj/machinery/atmospherics/unary/vent_scrubber/on,
/turf/simulated/floor/plasteel,
/area/station/engineering/atmos/distribution)
-"iIf" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/turf/simulated/floor/plasteel{
- icon_state = "white"
- },
-/area/station/science/storage)
"iIA" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -60581,6 +59091,10 @@
icon_state = "neutralcorner"
},
/area/station/public/dorms)
+"iKH" = (
+/obj/machinery/recharge_station,
+/turf/simulated/floor/plasteel,
+/area/station/maintenance/starboard2)
"iKJ" = (
/obj/structure/cable/yellow{
d1 = 1;
@@ -60623,6 +59137,10 @@
icon_state = "dark"
},
/area/station/security/armory)
+"iKT" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plating,
+/area/station/maintenance/asmaint)
"iKV" = (
/obj/machinery/door/airlock/mining{
name = "Cargo Bay"
@@ -60652,6 +59170,24 @@
icon_state = "cautioncorner"
},
/area/station/hallway/primary/starboard)
+"iLj" = (
+/obj/effect/landmark/lightsout,
+/obj/machinery/hologram/holopad,
+/obj/effect/landmark/start/scientist,
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+ dir = 4
+ },
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/science/explab)
"iLl" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable/yellow{
@@ -60664,12 +59200,6 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
-"iLq" = (
-/obj/structure/closet,
-/obj/effect/turf_decal/stripes/line,
-/obj/effect/spawner/lootdrop/maintenance,
-/turf/simulated/floor/plating,
-/area/station/maintenance/aft2)
"iLs" = (
/obj/structure/cable/yellow{
d1 = 1;
@@ -60683,17 +59213,6 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/fore2)
-"iLv" = (
-/obj/machinery/hydroponics/constructable,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/effect/turf_decal/delivery/hollow,
-/turf/simulated/floor/plasteel,
-/area/station/service/hydroponics)
"iLw" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -60735,33 +59254,33 @@
icon_state = "redfull"
},
/area/station/security/permabrig)
-"iMm" = (
-/obj/structure/closet/crate,
-/obj/effect/landmark/costume/random,
-/obj/effect/landmark/costume/random,
-/obj/machinery/light_switch{
- dir = 1;
- name = "custom placement";
- pixel_x = 6;
- pixel_y = -24
- },
-/turf/simulated/floor/wood,
-/area/station/service/theatre)
"iMu" = (
-/obj/machinery/camera{
- c_tag = "Science Hallway - Port";
- dir = 4;
- network = list("Research","SS13")
+/obj/machinery/computer/operating{
+ dir = 1;
+ name = "Robotics Operating Computer"
},
-/obj/machinery/economy/vending/cigarette,
/turf/simulated/floor/plasteel{
- icon_state = "white"
+ icon_state = "whitepurple"
},
-/area/station/science/research)
+/area/station/science/robotics)
"iMJ" = (
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
/area/station/maintenance/auxsolarport)
+"iMW" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 5
+ },
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard)
"iNe" = (
/obj/machinery/computer/mech_bay_power_console{
dir = 8
@@ -60785,14 +59304,16 @@
/obj/structure/window/reinforced,
/turf/simulated/floor/plating/airless,
/area/space/nearstation)
-"iNF" = (
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
+"iNI" = (
+/obj/machinery/door/poddoor{
+ name = "Containment Pen";
+ id_tag = "maintcham2"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 4
},
/turf/simulated/floor/plating,
-/area/station/maintenance/aft2)
+/area/station/maintenance/asmaint)
"iOj" = (
/obj/structure/cable/yellow{
d1 = 2;
@@ -60802,6 +59323,17 @@
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/wood,
/area/station/service/library)
+"iOn" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/cable/yellow{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
+ },
+/turf/simulated/floor/wood,
+/area/station/service/bar)
"iOo" = (
/obj/structure/reagent_dispensers/peppertank{
pixel_x = 30
@@ -60837,20 +59369,6 @@
icon_state = "dark"
},
/area/station/security/main)
-"iOR" = (
-/obj/structure/table/wood,
-/obj/machinery/bottler,
-/obj/structure/sign/poster/random{
- pixel_y = -32
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/turf/simulated/floor/wood,
-/area/station/service/bar)
"iPP" = (
/obj/structure/table,
/obj/item/clothing/mask/gas,
@@ -60875,22 +59393,12 @@
},
/turf/simulated/floor/engine,
/area/station/maintenance/turbine)
-"iQh" = (
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/machinery/door/airlock/maintenance,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
+"iPW" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
},
-/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
-/turf/simulated/floor/plating,
-/area/station/maintenance/aft2)
+/turf/simulated/floor/plating/airless,
+/area/station/science/toxins/launch)
"iQm" = (
/obj/structure/sign/poster/official/random{
pixel_x = -32
@@ -60954,6 +59462,21 @@
/obj/effect/mapping_helpers/airlock/access/all/engineering/external,
/turf/simulated/floor/plating,
/area/station/maintenance/port)
+"iRX" = (
+/obj/effect/spawner/random_spawners/grille_maybe,
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/aft2)
"iSf" = (
/obj/effect/spawner/window/reinforced,
/obj/machinery/door/poddoor/shutters/preopen{
@@ -61069,6 +59592,11 @@
/obj/machinery/light{
dir = 1
},
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -61081,6 +59609,13 @@
icon_state = "white"
},
/area/station/science/xenobiology)
+"iUn" = (
+/obj/machinery/atmospherics/pipe/simple/heat_exchanging{
+ dir = 6
+ },
+/obj/structure/lattice/catwalk,
+/turf/space,
+/area/space/nearstation)
"iUs" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 8
@@ -61153,6 +59688,16 @@
},
/turf/simulated/floor/plasteel/dark,
/area/station/telecomms/chamber)
+"iWB" = (
+/obj/machinery/atmospherics/pipe/simple/hidden{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light/small{
+ dir = 1
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/asmaint)
"iXe" = (
/obj/machinery/hologram/holopad,
/obj/machinery/door/window/reinforced/reversed{
@@ -61166,6 +59711,18 @@
icon_state = "darkgrey"
},
/area/station/turret_protected/ai)
+"iXy" = (
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 8
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/science/toxins/launch)
"iYh" = (
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
@@ -61221,7 +59778,9 @@
/area/station/security/main)
"iZX" = (
/obj/effect/turf_decal/stripes/line,
-/obj/machinery/hologram/holopad,
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+ dir = 8
+ },
/turf/simulated/floor/plasteel,
/area/station/science/robotics)
"jap" = (
@@ -61236,17 +59795,6 @@
/obj/machinery/atmospherics/pipe/simple/heat_exchanging,
/turf/simulated/floor/bluegrid/telecomms,
/area/station/science/xenobiology)
-"jaE" = (
-/obj/machinery/atmospherics/unary/vent_pump/on{
- dir = 1
- },
-/obj/effect/turf_decal/stripes/corner{
- dir = 8
- },
-/turf/simulated/floor/plasteel{
- icon_state = "white"
- },
-/area/station/science/xenobiology)
"jaK" = (
/obj/structure/cable/yellow{
d1 = 1;
@@ -61261,12 +59809,6 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/fore2)
-"jaP" = (
-/obj/machinery/atmospherics/pipe/simple/heat_exchanging{
- dir = 4
- },
-/turf/space,
-/area/space/nearstation)
"jbe" = (
/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
@@ -61369,13 +59911,20 @@
},
/area/station/science/xenobiology)
"jes" = (
-/obj/effect/spawner/lootdrop{
- icon_state = "grille";
- loot = list(/obj/structure/grille=8,/obj/structure/grille/broken=2);
- name = "normal or broken grille spawner"
+/obj/machinery/atmospherics/pipe/simple/hidden{
+ dir = 4
},
-/turf/simulated/floor/plating,
-/area/station/maintenance/aft2)
+/obj/structure/rack,
+/obj/item/extinguisher,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light/small{
+ dir = 8
+ },
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "whitepurple"
+ },
+/area/station/maintenance/asmaint)
"jeY" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/cable/yellow{
@@ -61508,13 +60057,6 @@
/obj/effect/mapping_helpers/airlock/access/all/command/blueshield,
/turf/simulated/floor/wood,
/area/station/command/office/blueshield)
-"jll" = (
-/obj/structure/chair/stool{
- dir = 4
- },
-/obj/effect/landmark/start/assistant,
-/turf/simulated/floor/wood,
-/area/station/service/bar)
"jln" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small{
@@ -61535,6 +60077,13 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/disposal)
+"jlU" = (
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/floor/plasteel,
+/area/station/science/toxins/mixing)
"jma" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 8
@@ -61550,16 +60099,10 @@
/turf/simulated/floor/plasteel,
/area/station/security/permabrig)
"jmV" = (
-/obj/structure/dresser,
-/obj/machinery/light/small{
- dir = 1
- },
-/obj/machinery/newscaster{
- name = "north bump";
- pixel_y = 28
- },
-/turf/simulated/floor/wood,
-/area/station/service/theatre)
+/obj/structure/falsewall,
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard)
"jnD" = (
/turf/simulated/floor/plasteel{
dir = 8;
@@ -61599,33 +60142,6 @@
/obj/machinery/atmospherics/unary/vent_scrubber/on,
/turf/simulated/floor/carpet,
/area/station/security/detective)
-"jom" = (
-/obj/item/reagent_containers/dropper{
- pixel_x = -7;
- pixel_y = -1
- },
-/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/shaker{
- pixel_x = -6
- },
-/obj/machinery/requests_console{
- department = "Bar";
- departmentType = 2;
- name = "Bar Requests Console";
- pixel_y = -30
- },
-/obj/machinery/reagentgrinder{
- pixel_x = 6;
- pixel_y = 6
- },
-/obj/machinery/camera{
- c_tag = "Bar - Counter";
- dir = 1
- },
-/turf/simulated/floor/plasteel{
- icon_state = "bar"
- },
-/area/station/service/bar)
"joD" = (
/obj/effect/landmark/start/engineer,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -61742,23 +60258,6 @@
},
/turf/simulated/floor/plating/airless,
/area/station/engineering/atmos)
-"jta" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/turf/simulated/floor/plating,
-/area/station/maintenance/starboard)
"jtg" = (
/obj/structure/cable/yellow{
d1 = 4;
@@ -61810,6 +60309,16 @@
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
/area/station/security/permabrig)
+"jun" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/asmaint)
"juq" = (
/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -61906,10 +60415,19 @@
icon_state = "white"
},
/area/station/science/research)
-"jwh" = (
-/obj/structure/disposalpipe/broken,
-/turf/simulated/floor/plating,
-/area/station/maintenance/aft2)
+"jwi" = (
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 8
+ },
+/obj/machinery/atmospherics/portable/canister/toxins,
+/obj/structure/window/reinforced{
+ dir = 8
+ },
+/obj/effect/turf_decal/delivery/red/hollow,
+/turf/simulated/floor/plasteel{
+ icon_state = "darkgrey"
+ },
+/area/station/science/storage)
"jwo" = (
/obj/effect/turf_decal/stripes/line{
dir = 9
@@ -61926,26 +60444,15 @@
icon_state = "dark"
},
/area/station/engineering/control)
-"jxj" = (
-/obj/item/reagent_containers/food/snacks/monkeycube,
-/turf/simulated/floor/grass,
-/area/station/maintenance/aft2)
"jyP" = (
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
/obj/effect/landmark/start/scientist,
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
/area/station/science/misc_lab)
-"jyT" = (
-/obj/machinery/door/airlock/maintenance,
-/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
-/turf/simulated/floor/plating,
-/area/station/maintenance/starboard2)
"jyW" = (
/obj/structure/cable/yellow{
d2 = 4;
@@ -61973,26 +60480,6 @@
},
/turf/simulated/floor/plasteel,
/area/station/public/locker)
-"jzk" = (
-/obj/machinery/door/airlock/maintenance,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/effect/mapping_helpers/airlock/autoname,
-/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
-/turf/simulated/floor/plating,
-/area/station/maintenance/aft2)
"jzA" = (
/obj/structure/table,
/obj/effect/turf_decal/tile/red,
@@ -62014,16 +60501,21 @@
/obj/structure/chair/office/dark{
dir = 8
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 6
- },
+/turf/simulated/floor/plasteel,
+/area/station/science/robotics)
+"jAR" = (
+/obj/machinery/door/airlock/maintenance,
+/obj/effect/mapping_helpers/airlock/autoname,
+/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
-/turf/simulated/floor/plasteel,
-/area/station/science/robotics)
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/plating,
+/area/station/maintenance/aft2)
"jAZ" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/research{
@@ -62048,6 +60540,15 @@
icon_state = "whitepurplefull"
},
/area/station/science/xenobiology)
+"jBw" = (
+/obj/machinery/atmospherics/pipe/simple/hidden{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/maintenance/asmaint)
"jCd" = (
/obj/structure/cable/yellow{
d2 = 2;
@@ -62079,16 +60580,14 @@
/turf/simulated/floor/plasteel,
/area/station/public/locker)
"jCz" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 8
+/obj/structure/sink/kitchen{
+ dir = 1;
+ pixel_y = -8
},
-/obj/structure/cable/yellow{
- d1 = 2;
- d2 = 8;
- icon_state = "2-8"
+/obj/structure/disposalpipe/segment{
+ dir = 4
},
-/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/delivery/hollow,
/turf/simulated/floor/plasteel{
icon_state = "cafeteria"
},
@@ -62135,12 +60634,26 @@
/obj/structure/transit_tube/diagonal/topleft,
/turf/space,
/area/space/nearstation)
+"jDv" = (
+/obj/machinery/door/airlock/maintenance,
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/aft2)
"jDD" = (
/obj/machinery/atmospherics/pipe/simple/visible/cyan{
dir = 6
},
/turf/simulated/floor/plasteel,
/area/station/engineering/atmos)
+"jDK" = (
+/obj/effect/spawner/random_spawners/fungus_maybe,
+/turf/simulated/wall,
+/area/station/hallway/primary/central)
"jEw" = (
/obj/structure/transit_tube/horizontal,
/obj/structure/lattice/catwalk,
@@ -62148,13 +60661,7 @@
/turf/space,
/area/space/nearstation)
"jEA" = (
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/effect/spawner/random_spawners/grille_maybe,
/turf/simulated/floor/plating,
/area/station/maintenance/starboard2)
"jEC" = (
@@ -62203,6 +60710,21 @@
/obj/structure/sign/cargo,
/turf/simulated/wall,
/area/station/supply/storage)
+"jFa" = (
+/obj/machinery/light{
+ dir = 1
+ },
+/obj/machinery/economy/vending/wallmed{
+ name = "Emergency NanoMed";
+ pixel_y = 28
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/science/research)
"jFi" = (
/obj/machinery/alarm{
dir = 4;
@@ -62251,6 +60773,19 @@
icon_state = "white"
},
/area/station/science/toxins/mixing)
+"jFz" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "whitehall"
+ },
+/area/station/maintenance/asmaint)
"jFF" = (
/obj/structure/cable/yellow{
d1 = 1;
@@ -62265,8 +60800,8 @@
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/central)
"jFH" = (
-/obj/machinery/atmospherics/pipe/simple/hidden,
-/turf/simulated/wall,
+/obj/structure/girder,
+/turf/simulated/floor/plating,
/area/station/maintenance/aft2)
"jFN" = (
/obj/structure/cable/yellow{
@@ -62329,24 +60864,18 @@
/turf/simulated/floor/plasteel,
/area/station/ai_monitored/storage/eva)
"jHO" = (
-/obj/structure/table/reinforced,
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/machinery/door/window/classic/reversed{
- name = "Kitchen Window";
- dir = 1
- },
-/obj/machinery/door/poddoor/shutters/preopen{
- dir = 2;
- id_tag = "kitchen_service";
- name = "Service Desk Shutter"
+/obj/structure/table/glass,
+/obj/machinery/smartfridge/disks,
+/obj/machinery/camera{
+ c_tag = "Hydroponics";
+ dir = 6
},
-/obj/effect/mapping_helpers/airlock/windoor/access/all/service/kitchen{
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/light{
dir = 1
},
/turf/simulated/floor/plasteel,
-/area/station/maintenance/starboard)
+/area/station/service/hydroponics)
"jIf" = (
/obj/machinery/hologram/holopad,
/obj/structure/disposalpipe/segment,
@@ -62530,24 +61059,25 @@
icon_state = "darkbluecorners"
},
/area/station/turret_protected/aisat/interior)
-"jKE" = (
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
+"jKP" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/cyan{
+ dir = 1
},
/obj/structure/cable/yellow{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 6
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 6
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel,
-/area/station/maintenance/starboard)
+/area/station/maintenance/aft2)
"jKS" = (
/obj/structure/transit_tube/horizontal,
/obj/structure/lattice/catwalk,
@@ -62575,10 +61105,10 @@
},
/area/station/medical/surgery/observation)
"jMn" = (
-/obj/machinery/atmospherics/pipe/simple/visible{
+/obj/effect/spawner/window/reinforced/grilled,
+/obj/machinery/atmospherics/pipe/simple/hidden/universal{
dir = 4
},
-/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
/area/station/maintenance/xenobio_north)
"jMr" = (
@@ -62667,6 +61197,13 @@
/obj/structure/closet/secure_closet/engineering_welding,
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
+"jNT" = (
+/obj/effect/decal/remains/human,
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 4
+ },
+/turf/simulated/floor/engine,
+/area/station/maintenance/asmaint)
"jNU" = (
/obj/machinery/door/poddoor/preopen{
id_tag = "Perma Gate";
@@ -62743,6 +61280,20 @@
icon_state = "red"
},
/area/station/security/permabrig)
+"jOv" = (
+/obj/structure/table,
+/obj/machinery/kitchen_machine/microwave,
+/obj/machinery/camera{
+ c_tag = "Kitchen";
+ dir = 4
+ },
+/obj/machinery/light{
+ dir = 8
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "cafeteria"
+ },
+/area/station/service/kitchen)
"jOA" = (
/obj/structure/reagent_dispensers/fueltank,
/obj/structure/disposalpipe/segment{
@@ -62762,11 +61313,11 @@
},
/area/station/science/toxins/mixing)
"jOR" = (
-/obj/machinery/atmospherics/unary/vent_pump/on{
- dir = 1
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 10
},
/turf/simulated/floor/plasteel{
- icon_state = "cafeteria"
+ icon_state = "showroomfloor"
},
/area/station/service/kitchen)
"jOS" = (
@@ -62900,6 +61451,23 @@
"jQw" = (
/turf/simulated/floor/plasteel,
/area/station/security/range)
+"jQx" = (
+/obj/structure/table/reinforced,
+/obj/machinery/door/window/classic/normal{
+ name = "Kitchen"
+ },
+/obj/effect/mapping_helpers/airlock/autoname,
+/obj/machinery/door/firedoor,
+/obj/machinery/door/poddoor/shutters/preopen{
+ dir = 2;
+ id_tag = "kitchen_counter";
+ name = "Kitchen Counter Shutters"
+ },
+/obj/effect/mapping_helpers/airlock/windoor/access/all/service/kitchen,
+/turf/simulated/floor/plasteel{
+ icon_state = "cafeteria"
+ },
+/area/station/service/kitchen)
"jQK" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable{
@@ -62925,8 +61493,8 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/cable/yellow{
d1 = 1;
- d2 = 4;
- icon_state = "1-4"
+ d2 = 8;
+ icon_state = "1-8"
},
/turf/simulated/floor/plasteel{
icon_state = "white"
@@ -62944,6 +61512,17 @@
icon_state = "neutralcorner"
},
/area/station/public/fitness)
+"jRQ" = (
+/obj/structure/chair/office/light{
+ dir = 8
+ },
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "darkgrey"
+ },
+/area/station/science/toxins/launch)
"jRX" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -62959,6 +61538,17 @@
icon_state = "red"
},
/area/station/security/permabrig)
+"jSa" = (
+/obj/effect/decal/cleanable/blood/drip,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light/small{
+ dir = 8
+ },
+/turf/simulated/floor/plasteel{
+ dir = 10;
+ icon_state = "vault"
+ },
+/area/station/maintenance/asmaint)
"jSd" = (
/obj/structure/window/reinforced{
dir = 4
@@ -63016,6 +61606,13 @@
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
/area/station/security/main)
+"jTb" = (
+/obj/machinery/atmospherics/pipe/simple/heat_exchanging{
+ dir = 9
+ },
+/obj/structure/lattice/catwalk,
+/turf/space,
+/area/space/nearstation)
"jTe" = (
/obj/structure/cable/yellow{
d1 = 4;
@@ -63057,17 +61654,6 @@
/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos,
/turf/simulated/floor/plating,
/area/station/engineering/control)
-"jTK" = (
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/unary/vent_pump/on{
- dir = 1
- },
-/turf/simulated/floor/plasteel,
-/area/station/service/hydroponics)
"jUK" = (
/obj/machinery/light_switch{
dir = 8;
@@ -63157,11 +61743,13 @@
/obj/machinery/shieldwallgen{
req_access = list(55)
},
+/obj/effect/turf_decal/stripes/box,
+/obj/structure/cable/yellow,
/obj/structure/cable/yellow{
+ d1 = 1;
d2 = 2;
- icon_state = "0-2"
+ icon_state = "1-2"
},
-/obj/effect/turf_decal/stripes/box,
/turf/simulated/floor/plating,
/area/station/maintenance/xenobio_north)
"jWJ" = (
@@ -63185,18 +61773,27 @@
/turf/simulated/floor/plasteel,
/area/station/security/prisonlockers)
"jXi" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
+/obj/item/radio/intercom{
+ name = "south bump";
+ pixel_y = -28
+ },
+/obj/structure/disposalpipe/junction{
+ dir = 8
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
+ dir = 5
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
+ dir = 5
+ },
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
},
/turf/simulated/floor/plasteel{
dir = 1;
- icon_state = "whitepurple"
+ icon_state = "whitepurplecorner"
},
/area/station/science/research)
"jXj" = (
@@ -63343,14 +61940,7 @@
icon_state = "yellowcorner"
},
/area/station/hallway/primary/central)
-"kaZ" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/turf/simulated/floor/plating,
-/area/station/maintenance/starboard)
"kbr" = (
-/obj/effect/turf_decal/delivery/hollow,
/obj/machinery/atmospherics/portable/canister/air,
/obj/machinery/atmospherics/pipe/simple/hidden/purple{
dir = 5
@@ -63373,6 +61963,10 @@
icon_state = "white"
},
/area/station/science/xenobiology)
+"kcG" = (
+/obj/machinery/light/small,
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard2)
"kcU" = (
/obj/effect/turf_decal/stripes/line{
dir = 9
@@ -63409,13 +62003,26 @@
},
/turf/simulated/floor/wood,
/area/station/command/office/hos)
-"kdB" = (
-/obj/structure/sign/poster/random{
- pixel_y = -32
+"kdJ" = (
+/obj/machinery/door/airlock/maintenance,
+/obj/structure/disposalpipe/segment{
+ dir = 4
},
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel,
-/area/station/maintenance/starboard)
+/obj/effect/mapping_helpers/airlock/autoname,
+/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/aft2)
"ken" = (
/obj/structure/closet/crate,
/obj/effect/spawner/lootdrop/maintenance,
@@ -63440,16 +62047,6 @@
icon_state = "cafeteria"
},
/area/station/science/break_room)
-"keY" = (
-/obj/machinery/door/airlock,
-/obj/machinery/door/firedoor,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/mapping_helpers/airlock/autoname,
-/obj/effect/mapping_helpers/airlock/access/all/service/bar,
-/turf/simulated/floor/wood,
-/area/station/service/bar)
"kfe" = (
/obj/structure/cable/yellow{
d1 = 2;
@@ -63463,11 +62060,24 @@
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
/area/station/security/prison/cell_block/A)
+"kfn" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel,
+/area/station/engineering/atmos/control)
"kfx" = (
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
- icon_state = "white"
+ icon_state = "whitepurplecorner"
},
-/area/station/science/robotics)
+/area/station/science/research)
"kfF" = (
/obj/machinery/door/window/classic/normal{
name = "Coffin Storage";
@@ -63507,6 +62117,20 @@
icon_state = "white"
},
/area/station/science/toxins/mixing)
+"kgB" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 9
+ },
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 9
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/asmaint)
"kgG" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -63533,6 +62157,15 @@
icon_state = "caution"
},
/area/station/engineering/atmos)
+"khl" = (
+/obj/machinery/light{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "purple"
+ },
+/area/station/hallway/primary/aft)
"khy" = (
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel,
@@ -63555,6 +62188,9 @@
/area/shuttle/pod_3)
"kib" = (
/obj/machinery/light,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "whitepurple"
@@ -63587,6 +62223,11 @@
icon_state = "dark"
},
/area/station/security/execution)
+"kiC" = (
+/obj/item/paper/crumpled,
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plasteel,
+/area/station/maintenance/aft2)
"kiH" = (
/obj/machinery/atmospherics/unary/vent_pump/on,
/turf/simulated/floor/plasteel,
@@ -63627,15 +62268,14 @@
},
/area/station/security/permabrig)
"klo" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 5
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 8
+/obj/effect/spawner/random_spawners/oil_maybe,
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+ dir = 1
},
-/turf/simulated/floor/plasteel{
- icon_state = "white"
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
},
+/turf/simulated/floor/plasteel,
/area/station/science/toxins/mixing)
"kls" = (
/obj/structure/table/glass,
@@ -63700,10 +62340,30 @@
/turf/simulated/floor/plasteel,
/area/station/security/prisonlockers)
"kmw" = (
-/obj/structure/closet/crate/plastic,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 10
+ },
+/obj/structure/cable/yellow{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 10
+ },
/turf/simulated/floor/plating,
/area/station/maintenance/starboard2)
+"kmO" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard)
"knc" = (
/obj/machinery/atmospherics/pipe/simple/visible/green,
/obj/machinery/light{
@@ -63739,20 +62399,6 @@
},
/turf/simulated/floor/engine/plasma,
/area/station/engineering/atmos)
-"knB" = (
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel{
- icon_state = "white"
- },
-/area/station/science/toxins/mixing)
"kol" = (
/obj/effect/landmark/burnturf,
/obj/effect/spawner/lootdrop{
@@ -63761,6 +62407,12 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
+"kpl" = (
+/obj/machinery/atmospherics/pipe/manifold/visible{
+ dir = 1
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard2)
"kpn" = (
/obj/structure/cable/yellow{
d1 = 1;
@@ -63774,11 +62426,32 @@
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/fore)
"kqd" = (
-/obj/effect/turf_decal/loading_area/white,
+/obj/item/radio/intercom{
+ name = "west bump";
+ pixel_x = -28
+ },
+/obj/machinery/camera{
+ c_tag = "Science Hallway - Central";
+ dir = 4;
+ network = list("Research","SS13")
+ },
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 5
+ },
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
/turf/simulated/floor/plasteel{
- icon_state = "white"
+ dir = 4;
+ icon_state = "whitepurplecorner"
},
-/area/station/science/robotics)
+/area/station/science/research)
"kqi" = (
/obj/machinery/power/apc{
dir = 4;
@@ -63795,14 +62468,23 @@
/turf/simulated/floor/engine,
/area/station/science/explab/chamber)
"kqw" = (
-/obj/machinery/hologram/holopad,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
/area/station/science/rnd)
"kqz" = (
-/obj/effect/turf_decal/stripes/corner,
-/turf/simulated/floor/plating,
+/obj/effect/decal/cleanable/blood/drip,
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plasteel{
+ dir = 6;
+ icon_state = "vault"
+ },
/area/station/maintenance/asmaint)
"kqO" = (
/obj/structure/cable/yellow{
@@ -63826,6 +62508,15 @@
/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
/area/station/science/toxins/mixing)
+"kqU" = (
+/obj/structure/rack,
+/obj/item/extinguisher,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light/small{
+ dir = 4
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/asmaint)
"kri" = (
/obj/machinery/light_switch{
dir = 8;
@@ -63842,15 +62533,10 @@
icon_state = "red"
},
/area/station/security/main)
-"krx" = (
-/obj/machinery/atmospherics/pipe/simple/insulated{
- dir = 5
- },
-/turf/simulated/floor/plasteel,
-/area/station/science/toxins/mixing)
"kry" = (
-/obj/effect/landmark/spawner/nukedisc_respawn,
-/turf/simulated/floor/plating,
+/turf/simulated/floor/wood{
+ icon_state = "wood-broken7"
+ },
/area/station/maintenance/starboard)
"krF" = (
/turf/simulated/floor/plasteel{
@@ -63890,15 +62576,6 @@
},
/turf/simulated/floor/plasteel,
/area/station/engineering/control)
-"ksi" = (
-/obj/structure/table,
-/obj/item/stack/sheet/glass/fifty,
-/obj/item/stack/sheet/metal/fifty,
-/obj/machinery/light/small{
- dir = 4
- },
-/turf/simulated/floor/plating,
-/area/station/maintenance/aft2)
"ksz" = (
/obj/machinery/light_construct/small{
dir = 4
@@ -63921,6 +62598,11 @@
d2 = 8;
icon_state = "4-8"
},
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
/turf/simulated/floor/plating,
/area/station/maintenance/xenobio_south)
"ktd" = (
@@ -63929,18 +62611,9 @@
dir = 4;
network = list("Research","SS13")
},
-/obj/structure/cable/yellow{
- d2 = 4;
- icon_state = "0-4"
- },
/obj/effect/turf_decal/stripes/line{
dir = 8
},
-/obj/machinery/power/apc{
- dir = 8;
- name = "west bump";
- pixel_x = -24
- },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -63953,6 +62626,15 @@
/obj/machinery/atmospherics/pipe/simple/visible/yellow,
/turf/space,
/area/space/nearstation)
+"ktD" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 9
+ },
+/turf/simulated/floor/plasteel,
+/area/station/service/hydroponics)
"ktZ" = (
/obj/machinery/alarm{
dir = 1;
@@ -63977,13 +62659,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/central)
-"kuh" = (
-/obj/effect/landmark/burnturf,
-/obj/machinery/light/small{
- dir = 4
- },
-/turf/simulated/floor/plating,
-/area/station/maintenance/aft2)
"kvh" = (
/obj/structure/closet/bombcloset,
/obj/structure/extinguisher_cabinet{
@@ -64014,10 +62689,8 @@
/obj/machinery/light{
dir = 4
},
-/obj/effect/turf_decal/tile/bar,
/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "neutralcorner"
+ icon_state = "redcorner"
},
/area/station/hallway/primary/central)
"kwD" = (
@@ -64307,26 +62980,6 @@
},
/turf/simulated/floor/plasteel,
/area/station/supply/storage)
-"kBs" = (
-/obj/machinery/alarm{
- name = "north bump";
- pixel_y = 24
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/turf/simulated/floor/plasteel{
- icon_state = "whitepurple"
- },
-/area/station/science/research)
"kCc" = (
/obj/machinery/door/window/brigdoor{
dir = 8;
@@ -64352,20 +63005,29 @@
icon_state = "red"
},
/area/station/security/prison/cell_block/A)
+"kCk" = (
+/obj/structure/sign/poster/contraband/random{
+ pixel_x = 32
+ },
+/turf/simulated/floor/plasteel{
+ dir = 9;
+ icon_state = "green"
+ },
+/area/station/hallway/primary/central)
"kCP" = (
-/obj/structure/disposalpipe/segment,
-/obj/structure/cable/yellow{
- d1 = 2;
- d2 = 4;
- icon_state = "2-4"
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 5
},
-/obj/effect/turf_decal/stripes/line,
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 8
+/obj/structure/disposalpipe/segment{
+ dir = 1;
+ icon_state = "pipe-c"
},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 8
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
},
+/obj/structure/reagent_dispensers/fueltank,
/turf/simulated/floor/plating,
/area/station/maintenance/starboard2)
"kDt" = (
@@ -64432,12 +63094,6 @@
},
/area/station/public/fitness)
"kDU" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/obj/structure/cable/yellow{
d1 = 1;
@@ -64454,20 +63110,6 @@
icon_state = "whitepurple"
},
/area/station/science/research)
-"kEd" = (
-/obj/machinery/optable{
- name = "Robotics Operating Table"
- },
-/obj/item/storage/firstaid/machine,
-/obj/structure/noticeboard{
- dir = 8;
- pixel_x = 32
- },
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "whitepurple"
- },
-/area/station/science/robotics)
"kEg" = (
/obj/machinery/door/window/classic/reversed{
name = "Containment Pen #1";
@@ -64490,28 +63132,6 @@
},
/turf/simulated/floor/carpet/arcade,
/area/station/public/arcade)
-"kEk" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 8;
- icon_state = "1-8"
- },
-/turf/simulated/floor/plating,
-/area/station/maintenance/aft2)
"kEv" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -64522,11 +63142,11 @@
},
/turf/simulated/floor/plasteel,
/area/station/engineering/break_room)
+"kEw" = (
+/obj/effect/spawner/random_spawners/cobweb_left_frequent,
+/turf/simulated/floor/plating,
+/area/station/maintenance/aft2)
"kEy" = (
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
/turf/simulated/floor/plasteel{
icon_state = "caution"
@@ -64617,6 +63237,13 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
+"kGo" = (
+/obj/effect/landmark/start/scientist,
+/obj/machinery/atmospherics/unary/vent_scrubber/on,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/science/toxins/launch)
"kGv" = (
/obj/structure/table,
/obj/item/paper{
@@ -64684,19 +63311,6 @@
icon_state = "dark"
},
/area/station/security/main)
-"kHQ" = (
-/obj/effect/turf_decal/stripes/white/line{
- dir = 8
- },
-/obj/effect/turf_decal/delivery/hollow,
-/obj/machinery/atmospherics/portable/canister/carbon_dioxide,
-/obj/structure/window/reinforced{
- dir = 8
- },
-/turf/simulated/floor/plasteel{
- icon_state = "darkgrey"
- },
-/area/station/science/storage)
"kHZ" = (
/obj/structure/cable/yellow{
d1 = 4;
@@ -64729,6 +63343,12 @@
/obj/effect/spawner/lootdrop/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
+"kIi" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 4
+ },
+/turf/simulated/floor/engine,
+/area/station/maintenance/asmaint)
"kIA" = (
/obj/structure/window/reinforced{
dir = 4
@@ -64764,6 +63384,17 @@
},
/turf/simulated/floor/plating,
/area/station/engineering/atmos/distribution)
+"kIS" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 9
+ },
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/aft2)
"kJL" = (
/obj/effect/spawner/window/reinforced/polarized/grilled{
id = "CMO"
@@ -64779,9 +63410,6 @@
dir = 8;
icon_state = "pipe-c"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
@@ -64790,6 +63418,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 10
+ },
/turf/simulated/floor/plasteel{
icon_state = "cafeteria"
},
@@ -64877,20 +63508,6 @@
icon_state = "dark"
},
/area/station/medical/morgue)
-"kMy" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/turf/simulated/floor/wood,
-/area/station/service/bar)
"kMD" = (
/obj/structure/table/glass,
/obj/machinery/reagentgrinder{
@@ -64924,13 +63541,29 @@
},
/area/station/medical/virology)
"kNi" = (
-/obj/effect/turf_decal/stripes/white/line,
-/obj/effect/turf_decal/delivery/white/hollow,
-/obj/machinery/atmospherics/portable/scrubber,
-/turf/simulated/floor/plasteel{
- icon_state = "darkgrey"
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
},
-/area/station/science/storage)
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 9
+ },
+/obj/machinery/door/window/reinforced/reversed{
+ dir = 8;
+ name = "Reinforced Glass Door"
+ },
+/obj/effect/mapping_helpers/airlock/windoor/access/any/science/research{
+ dir = 8
+ },
+/obj/effect/mapping_helpers/airlock/windoor/autoname{
+ dir = 8
+ },
+/turf/simulated/floor/engine,
+/area/station/science/explab/chamber)
"kNk" = (
/obj/structure/rack,
/obj/item/clothing/suit/hooded/ablative,
@@ -65013,6 +63646,15 @@
},
/turf/simulated/floor/plasteel,
/area/station/science/xenobiology)
+"kOF" = (
+/obj/structure/lattice/catwalk,
+/obj/machinery/atmospherics/unary/outlet_injector{
+ dir = 8;
+ autolink_id = "air_in";
+ on = 1
+ },
+/turf/space,
+/area/space/nearstation)
"kPa" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -65099,9 +63741,19 @@
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
/area/station/engineering/atmos)
-"kQo" = (
-/obj/effect/decal/cleanable/glass,
-/turf/simulated/floor/grass,
+"kQj" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/plating,
/area/station/maintenance/aft2)
"kQv" = (
/obj/structure/grille{
@@ -65128,6 +63780,10 @@
icon_state = "red"
},
/area/station/security/checkpoint/secondary)
+"kQF" = (
+/mob/living/simple_animal/mouse,
+/turf/simulated/floor/wood,
+/area/station/maintenance/starboard)
"kRc" = (
/obj/structure/cable/yellow{
d1 = 1;
@@ -65236,23 +63892,8 @@
/obj/machinery/atmospherics/portable/canister/air,
/turf/simulated/floor/plasteel,
/area/station/public/construction)
-"kTc" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 10
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- icon_state = "white"
- },
-/area/station/science/toxins/launch)
"kTH" = (
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
+/obj/structure/filingcabinet/chestdrawer,
/turf/simulated/floor/plasteel{
icon_state = "darkgreycheck"
},
@@ -65275,16 +63916,6 @@
icon_state = "dark"
},
/area/station/engineering/control)
-"kUf" = (
-/obj/effect/turf_decal/delivery/hollow,
-/obj/machinery/atmospherics/portable/canister/sleeping_agent,
-/obj/machinery/light{
- dir = 1
- },
-/turf/simulated/floor/plasteel{
- icon_state = "darkgrey"
- },
-/area/station/science/storage)
"kUy" = (
/obj/machinery/biogenerator,
/turf/simulated/floor/plasteel{
@@ -65316,6 +63947,20 @@
},
/turf/simulated/floor/plasteel,
/area/station/security/permabrig)
+"kVn" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/door_assembly/door_assembly_fre{
+ name = "broken freezer airlock"
+ },
+/obj/structure/barricade/wooden/crude,
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard)
"kVu" = (
/obj/structure/cable/yellow{
d2 = 4;
@@ -65452,15 +64097,13 @@
icon_state = "dark"
},
/area/station/aisat)
-"kXV" = (
-/obj/effect/turf_decal/stripes/white/line{
+"kXT" = (
+/obj/machinery/atmospherics/pipe/simple/hidden,
+/obj/machinery/light/small{
dir = 1
},
-/obj/machinery/atmospherics/unary/portables_connector{
- dir = 8
- },
-/turf/simulated/floor/plasteel,
-/area/station/science/toxins/mixing)
+/turf/simulated/floor/plating,
+/area/station/maintenance/asmaint)
"kXX" = (
/obj/machinery/disposal,
/obj/structure/disposalpipe/trunk{
@@ -65494,37 +64137,18 @@
/obj/machinery/atmospherics/pipe/manifold/visible/cyan{
dir = 1
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 5
- },
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 5
- },
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "caution"
},
/area/station/engineering/atmos)
-"kYR" = (
-/obj/machinery/disposal,
-/obj/effect/turf_decal/delivery,
-/obj/structure/disposalpipe/trunk{
- dir = 8
- },
-/obj/machinery/light_switch{
- name = "custom placement";
- pixel_x = -6;
- pixel_y = 24
- },
-/turf/simulated/floor/plasteel{
- icon_state = "white"
- },
-/area/station/science/toxins/mixing)
"kYX" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
@@ -65535,14 +64159,11 @@
},
/area/station/medical/storage/secondary)
"kZl" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 10
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 10
+/obj/machinery/atmospherics/pipe/manifold/hidden{
+ dir = 8
},
-/turf/simulated/floor/wood,
-/area/station/service/theatre)
+/turf/simulated/floor/bluegrid,
+/area/station/maintenance/starboard)
"kZm" = (
/turf/simulated/floor/plasteel{
dir = 5;
@@ -65586,6 +64207,14 @@
icon_state = "neutralcorner"
},
/area/station/public/dorms)
+"lar" = (
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/engine,
+/area/station/science/test_chamber)
"law" = (
/obj/structure/cable/yellow{
d1 = 1;
@@ -65615,6 +64244,12 @@
},
/turf/space,
/area/space/nearstation)
+"laR" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 5
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/aft2)
"laU" = (
/obj/item/soap,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -65627,18 +64262,6 @@
icon_state = "freezerfloor"
},
/area/station/security/permabrig)
-"lbk" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/structure/disposalpipe/segment,
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/plating,
-/area/station/maintenance/starboard)
"lbv" = (
/obj/machinery/door/airlock/centcom{
name = "Cell 2"
@@ -65786,6 +64409,10 @@
icon_state = "neutralcorner"
},
/area/station/public/locker)
+"leO" = (
+/obj/structure/sign/explosives,
+/turf/simulated/wall/r_wall,
+/area/station/science/toxins/launch)
"lfd" = (
/obj/structure/table/glass,
/obj/machinery/requests_console{
@@ -65840,6 +64467,23 @@
icon_state = "white"
},
/area/station/medical/medbay)
+"lfu" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "whitepurplecorner"
+ },
+/area/station/science/explab)
"lfG" = (
/obj/machinery/atmospherics/unary/portables_connector,
/obj/machinery/light/small{
@@ -65848,27 +64492,6 @@
/obj/effect/turf_decal/stripes/line,
/turf/simulated/floor/plasteel,
/area/station/science/toxins/mixing)
-"lfJ" = (
-/obj/structure/table/reinforced,
-/obj/machinery/door/firedoor,
-/obj/machinery/door/window/classic/normal{
- name = "Robotics Desk";
- dir = 1
- },
-/obj/item/paper_bin,
-/obj/item/pen,
-/obj/machinery/door/poddoor/shutters/preopen{
- dir = 2;
- id_tag = "roboticsprivacy2";
- name = "Robotics Shutters"
- },
-/obj/effect/mapping_helpers/airlock/windoor/access/all/science/robotics{
- dir = 1
- },
-/turf/simulated/floor/plasteel{
- icon_state = "white"
- },
-/area/station/science/robotics)
"lfO" = (
/obj/structure/table/reinforced,
/obj/item/paper_bin{
@@ -66010,10 +64633,8 @@
/obj/structure/sign/barber{
pixel_y = -28
},
-/obj/effect/turf_decal/tile/bar,
/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "neutralcorner"
+ icon_state = "redcorner"
},
/area/station/hallway/primary/starboard)
"lhF" = (
@@ -66134,28 +64755,36 @@
icon_state = "white"
},
/area/station/science/toxins/launch)
+"ljk" = (
+/obj/machinery/atmospherics/pipe/simple/visible{
+ dir = 5
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/asmaint)
"ljo" = (
-/obj/structure/sink/kitchen{
- dir = 8;
- pixel_x = 12
+/obj/machinery/firealarm{
+ dir = 1;
+ name = "south bump";
+ pixel_y = -24
},
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/delivery/hollow,
+/obj/structure/kitchenspike,
/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "whitecorner"
+ icon_state = "showroomfloor"
},
/area/station/service/kitchen)
"ljS" = (
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
+/obj/structure/table,
+/obj/item/stack/sheet/metal/fifty{
+ pixel_y = -3;
+ pixel_x = 4
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
+/obj/item/stack/sheet/glass/fifty{
+ pixel_x = -10;
+ pixel_y = 4
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel{
- icon_state = "white"
+ dir = 6;
+ icon_state = "whitepurple"
},
/area/station/science/rnd)
"ljT" = (
@@ -66184,8 +64813,13 @@
},
/area/station/security/armory/secure)
"ljZ" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/wood,
+/obj/effect/landmark/start/bartender,
+/obj/structure/chair/stool{
+ dir = 8
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "bar"
+ },
/area/station/service/bar)
"lkw" = (
/obj/effect/turf_decal/delivery,
@@ -66239,15 +64873,20 @@
},
/area/station/medical/chemistry)
"lle" = (
-/obj/machinery/status_display{
- dir = 4;
- pixel_y = -32
- },
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 5
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
dir = 4;
@@ -66275,6 +64914,26 @@
},
/turf/simulated/floor/plasteel,
/area/station/engineering/controlroom)
+"lmq" = (
+/obj/machinery/light,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/science/research)
"lmu" = (
/obj/structure/chair/office/light{
dir = 8
@@ -66508,17 +65167,13 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/machinery/atmospherics/unary/vent_pump/on{
- dir = 8
- },
-/obj/effect/turf_decal/tile/purple,
-/obj/effect/turf_decal/tile/purple{
- dir = 1
- },
/obj/structure/disposalpipe/segment{
dir = 8;
icon_state = "pipe-c"
},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/station/science/research)
"lsi" = (
@@ -66534,6 +65189,12 @@
icon_state = "cafeteria"
},
/area/station/science/break_room)
+"lst" = (
+/obj/structure/rack,
+/obj/item/extinguisher,
+/obj/effect/spawner/random_spawners/cobweb_left_rare,
+/turf/simulated/floor/plating,
+/area/station/maintenance/aft2)
"lsC" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -66571,13 +65232,8 @@
},
/area/station/security/permabrig)
"lsQ" = (
-/obj/structure/sign/poster/random{
- pixel_x = 32
- },
-/obj/effect/turf_decal/tile/bar,
/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "neutralcorner"
+ icon_state = "redcorner"
},
/area/station/hallway/primary/central)
"ltg" = (
@@ -66607,13 +65263,34 @@
/obj/structure/reagent_dispensers/watertank,
/turf/simulated/floor/plating,
/area/station/maintenance/xenobio_north)
-"lui" = (
-/obj/structure/lattice,
-/obj/machinery/atmospherics/pipe/simple/heat_exchanging{
- dir = 9
+"luM" = (
+/obj/machinery/door/airlock/research,
+/obj/effect/mapping_helpers/airlock/autoname,
+/obj/effect/mapping_helpers/airlock/access/all/science/tox_storage,
+/obj/machinery/door/firedoor/heavy{
+ opacity = 0
},
-/turf/space,
-/area/space/nearstation)
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "whitepurplefull"
+ },
+/area/station/science/storage)
"luR" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -66642,11 +65319,6 @@
/area/station/security/main)
"lvB" = (
/obj/item/kirbyplants,
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/obj/machinery/firealarm{
name = "north bump";
pixel_y = 24
@@ -66662,6 +65334,15 @@
/obj/effect/mapping_helpers/airlock/access/any/service/library,
/turf/simulated/floor/plating,
/area/station/maintenance/port)
+"lvJ" = (
+/obj/structure/closet/secure_closet/personal,
+/obj/effect/spawner/lootdrop/maintenance,
+/obj/item/clothing/under/rank/rnd/scientist/skirt,
+/obj/item/clothing/suit/hooded/wintercoat/science,
+/obj/item/clothing/head/hooded/winterhood/science,
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plating,
+/area/station/maintenance/aft2)
"lvP" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 8
@@ -66675,18 +65356,6 @@
/obj/structure/lattice/catwalk,
/turf/space,
/area/space/nearstation)
-"lwL" = (
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/obj/effect/turf_decal/tile/bar,
-/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "neutralcorner"
- },
-/area/station/hallway/primary/starboard)
"lwN" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/cable/yellow{
@@ -66698,11 +65367,6 @@
/area/station/maintenance/fpmaint)
"lxz" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
/obj/effect/turf_decal/stripes/line{
dir = 4
},
@@ -66828,17 +65492,44 @@
icon_state = "whiteblue"
},
/area/station/medical/medbay)
+"lBw" = (
+/obj/effect/spawner/random_spawners/fungus_maybe,
+/turf/simulated/wall,
+/area/station/maintenance/starboard2)
"lBy" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 4
},
/turf/simulated/floor/plasteel,
/area/station/supply/storage)
+"lBQ" = (
+/obj/machinery/door/airlock,
+/obj/machinery/door/firedoor,
+/obj/effect/mapping_helpers/airlock/autoname,
+/obj/effect/mapping_helpers/airlock/access/all/service/kitchen,
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "cafeteria"
+ },
+/area/station/service/kitchen)
"lCb" = (
/obj/effect/turf_decal/delivery,
/obj/machinery/economy/vending/assist/free,
/turf/simulated/floor/plasteel,
/area/station/engineering/control)
+"lCc" = (
+/obj/machinery/hologram/holopad,
+/turf/simulated/floor/plasteel{
+ icon_state = "cafeteria"
+ },
+/area/station/science/break_room)
"lCt" = (
/obj/structure/window/reinforced{
dir = 4
@@ -66862,6 +65553,11 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/fpmaint)
+"lCO" = (
+/obj/structure/closet,
+/obj/effect/spawner/lootdrop/maintenance,
+/turf/simulated/floor/plating,
+/area/station/maintenance/aft2)
"lCQ" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/cable/yellow{
@@ -66905,6 +65601,9 @@
name = "Atmospherics Requests Console";
pixel_x = 30
},
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel,
/area/station/engineering/atmos)
"lDD" = (
@@ -66949,17 +65648,15 @@
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
"lEw" = (
-/obj/structure/rack,
-/obj/item/extinguisher,
-/obj/item/clothing/mask/gas,
-/obj/item/grenade/chem_grenade/firefighting,
-/obj/effect/turf_decal/delivery/hollow,
+/obj/structure/closet/firecloset,
+/obj/machinery/light/small{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
/area/station/science/toxins/mixing)
"lEx" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -66967,6 +65664,10 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 1;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel,
/area/station/engineering/atmos/control)
"lEM" = (
@@ -66975,9 +65676,10 @@
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
"lEN" = (
-/obj/machinery/light/small{
- dir = 8
+/obj/machinery/atmospherics/pipe/simple/visible/cyan{
+ dir = 6
},
+/obj/effect/decal/cleanable/blood/drip,
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint)
"lEQ" = (
@@ -67022,13 +65724,18 @@
/obj/structure/lattice/catwalk,
/turf/space,
/area/space/nearstation)
-"lFF" = (
-/obj/machinery/hologram/holopad,
-/obj/effect/landmark/start/scientist,
+"lFH" = (
+/obj/machinery/light,
/turf/simulated/floor/plasteel{
- icon_state = "white"
+ icon_state = "cafeteria"
},
-/area/station/science/toxins/launch)
+/area/station/science/break_room)
+"lFM" = (
+/obj/structure/closet/crate,
+/obj/item/cane,
+/obj/effect/spawner/lootdrop/maintenance,
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard2)
"lGh" = (
/obj/machinery/door/window/brigdoor{
id = "Cell 4";
@@ -67071,24 +65778,8 @@
},
/turf/simulated/floor/engine,
/area/station/engineering/engine/supermatter)
-"lGx" = (
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- icon_state = "white"
- },
-/area/station/science/xenobiology)
"lGC" = (
-/obj/structure/disposalpipe/junction{
- dir = 2;
- icon_state = "pipe-j2"
- },
+/obj/structure/disposalpipe/junction/reversed,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 8
},
@@ -67096,46 +65787,20 @@
dir = 8
},
/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
},
/obj/structure/cable/yellow{
d1 = 1;
- d2 = 4;
- icon_state = "1-4"
+ d2 = 2;
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "whitepurple"
},
/area/station/science/research)
-"lGD" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/turf/simulated/floor/plating,
-/area/station/maintenance/starboard2)
-"lGH" = (
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/turf/simulated/floor/plating,
-/area/station/maintenance/starboard)
"lGL" = (
/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel,
@@ -67172,16 +65837,6 @@
icon_state = "redcorner"
},
/area/station/security/brig)
-"lHn" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/structure/girder,
-/turf/simulated/floor/plating,
-/area/station/maintenance/asmaint)
"lHw" = (
/obj/machinery/atmospherics/binary/valve,
/turf/simulated/floor/plating,
@@ -67204,6 +65859,21 @@
icon_state = "white"
},
/area/station/science/toxins/mixing)
+"lHQ" = (
+/obj/structure/disposalpipe/segment{
+ dir = 8;
+ icon_state = "pipe-c"
+ },
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/engine{
+ icon_state = "rampbottom";
+ name = "reinforced stairs"
+ },
+/area/station/science/test_chamber)
"lHZ" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 8
@@ -67246,19 +65916,14 @@
/turf/simulated/wall,
/area/station/maintenance/fore2)
"lIR" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 1
},
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
+/obj/structure/extinguisher_cabinet{
+ name = "south bump";
+ pixel_y = -30
},
/turf/simulated/floor/plasteel{
- dir = 1;
icon_state = "greenblue"
},
/area/station/service/hydroponics)
@@ -67335,20 +66000,10 @@
},
/turf/simulated/floor/engine,
/area/station/engineering/engine/supermatter)
-"lKa" = (
-/obj/machinery/status_display{
- dir = 4;
- pixel_y = -32
- },
-/obj/machinery/atmospherics/pipe/simple/visible{
- dir = 10
- },
-/turf/simulated/floor/plasteel,
-/area/station/science/toxins/mixing)
"lKc" = (
/obj/effect/decal/remains/xeno,
/turf/simulated/floor/engine,
-/area/station/science/test_chamber)
+/area/station/science/xenobiology)
"lKn" = (
/obj/structure/cable/green{
icon_state = "5-6"
@@ -67400,25 +66055,17 @@
/turf/simulated/floor/engine,
/area/station/engineering/control)
"lLx" = (
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 9
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 9
},
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
/obj/structure/cable/yellow{
d1 = 1;
- d2 = 2;
- icon_state = "1-2"
+ d2 = 8;
+ icon_state = "1-8"
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
},
-/turf/simulated/floor/plating,
/area/station/maintenance/asmaint)
"lLH" = (
/obj/structure/cable/cyan{
@@ -67445,16 +66092,6 @@
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 1
},
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 8;
- icon_state = "1-8"
- },
/obj/effect/turf_decal/stripes/line{
dir = 4
},
@@ -67553,19 +66190,37 @@
},
/area/station/supply/lobby)
"lOv" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
+/obj/structure/disposalpipe/segment{
+ dir = 2;
+ icon_state = "pipe-c"
},
/obj/structure/cable/yellow{
- d1 = 4;
+ d1 = 2;
d2 = 8;
- icon_state = "4-8"
+ icon_state = "2-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 10
},
+/obj/effect/spawner/random_spawners/oil_maybe,
/turf/simulated/floor/plating,
/area/station/maintenance/starboard2)
+"lOB" = (
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/sortjunction{
+ dir = 2;
+ icon_state = "pipe-j2s";
+ name = "Hydroponics Junction";
+ sort_type_txt = "21"
+ },
+/turf/simulated/floor/plasteel,
+/area/station/hallway/primary/central)
"lOE" = (
/obj/structure/cable/yellow{
d2 = 4;
@@ -67618,22 +66273,17 @@
icon_state = "darkgrey"
},
/area/station/service/chapel)
-"lPe" = (
-/obj/structure/table/reinforced,
-/obj/machinery/door/window/classic/reversed{
- name = "Hydroponics Window"
- },
-/obj/machinery/door/poddoor/shutters/preopen{
- dir = 2;
- id_tag = "hydro_service";
- name = "Service Desk Shutter"
- },
-/obj/structure/window/reinforced{
- dir = 8
+"lPm" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/spawner/random_spawners/oil_maybe,
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard2)
+"lPx" = (
+/obj/machinery/atmospherics/pipe/simple/hidden{
+ dir = 10
},
-/obj/effect/mapping_helpers/airlock/windoor/access/all/service/hydroponics,
/turf/simulated/floor/plasteel,
-/area/station/maintenance/starboard)
+/area/station/maintenance/asmaint)
"lPV" = (
/obj/item/shard,
/turf/space,
@@ -67690,12 +66340,12 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 5
- },
/obj/effect/turf_decal/stripes/line{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 5
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -67771,8 +66421,9 @@
/turf/simulated/floor/catwalk,
/area/station/maintenance/fore)
"lRY" = (
-/obj/structure/reagent_dispensers/watertank,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/decal/cleanable/greenglow,
+/obj/structure/glowshroom,
+/obj/item/flashlight/flare/glowstick/random,
/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
"lSa" = (
@@ -67864,15 +66515,21 @@
icon_state = "whitepurple"
},
/area/station/science/research)
-"lUc" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 6
+"lTB" = (
+/obj/item/clothing/gloves/color/latex,
+/obj/structure/rack,
+/obj/machinery/atmospherics/pipe/simple/hidden{
+ dir = 10
},
/turf/simulated/floor/plasteel{
- icon_state = "bar"
+ dir = 10;
+ icon_state = "whitepurple"
},
-/area/station/service/bar)
+/area/station/maintenance/asmaint)
+"lTS" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plasteel,
+/area/station/maintenance/aft2)
"lUv" = (
/obj/structure/cable/yellow{
d1 = 4;
@@ -67896,6 +66553,16 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/spacehut)
+"lVp" = (
+/obj/effect/spawner/random_spawners/wall_rusted_maybe,
+/turf/simulated/wall/r_wall,
+/area/station/maintenance/asmaint)
+"lVy" = (
+/obj/structure/disposalpipe/segment,
+/turf/simulated/floor/plasteel{
+ icon_state = "caution"
+ },
+/area/station/engineering/atmos/control)
"lVz" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/cable/yellow{
@@ -67908,34 +66575,21 @@
/area/station/hallway/primary/aft)
"lVF" = (
/obj/machinery/r_n_d/circuit_imprinter,
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "whitepurple"
},
/area/station/science/rnd)
"lVI" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
+/obj/machinery/atmospherics/portable/canister/sleeping_agent,
+/obj/machinery/light{
+ dir = 1
},
+/obj/effect/turf_decal/delivery/hollow,
/turf/simulated/floor/plasteel{
- icon_state = "white"
- },
-/area/station/science/toxins/launch)
-"lWe" = (
-/obj/effect/turf_decal/delivery,
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
+ icon_state = "darkgrey"
},
-/turf/simulated/floor/plasteel,
-/area/station/science/xenobiology)
+/area/station/science/storage)
"lWi" = (
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -67978,9 +66632,24 @@
},
/turf/simulated/floor/plasteel,
/area/station/science/xenobiology)
+"lXi" = (
+/obj/structure/rack,
+/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random_spawners/cobweb_left_rare,
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard2)
"lXV" = (
/turf/simulated/wall/r_wall,
/area/station/security/prison/cell_block/A)
+"lXW" = (
+/obj/structure/rack,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/clothing/suit/storage/hazardvest,
+/obj/effect/spawner/lootdrop/maintenance,
+/turf/simulated/floor/plasteel{
+ icon_state = "caution"
+ },
+/area/station/maintenance/starboard)
"lXX" = (
/obj/structure/table/reinforced,
/obj/machinery/door/firedoor,
@@ -68011,6 +66680,10 @@
icon_state = "brown"
},
/area/station/supply/office)
+"lYB" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plating,
+/area/station/maintenance/aft2)
"lYI" = (
/turf/simulated/floor/plasteel{
dir = 8;
@@ -68029,6 +66702,15 @@
},
/turf/simulated/floor/plasteel,
/area/station/engineering/break_room)
+"lZz" = (
+/obj/structure/rack,
+/obj/item/scalpel,
+/obj/item/hemostat,
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "whitepurple"
+ },
+/area/station/maintenance/asmaint)
"lZU" = (
/obj/effect/spawner/window/reinforced/grilled,
/obj/structure/cable/yellow{
@@ -68052,6 +66734,29 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/aft)
+"mar" = (
+/obj/structure/table/reinforced,
+/obj/machinery/door/poddoor/shutters/preopen{
+ dir = 2;
+ id_tag = "kitchen_service";
+ name = "Service Desk Shutter"
+ },
+/obj/effect/mapping_helpers/airlock/windoor/access/all/service/kitchen{
+ dir = 1
+ },
+/obj/effect/mapping_helpers/airlock/windoor/access/all/service/hydroponics,
+/obj/structure/window/reinforced{
+ dir = 4
+ },
+/obj/machinery/door/window/classic/reversed{
+ name = "Kitchen Window";
+ dir = 1
+ },
+/obj/machinery/door/window/classic/reversed{
+ name = "Hydroponics Window"
+ },
+/turf/simulated/floor/plasteel,
+/area/station/service/kitchen)
"maC" = (
/obj/machinery/firealarm{
dir = 8;
@@ -68079,8 +66784,26 @@
},
/turf/simulated/floor/plating,
/area/station/command/bridge)
+"mbj" = (
+/obj/effect/spawner/window/reinforced/plasma/grilled,
+/obj/machinery/door/poddoor/preopen{
+ id_tag = "Xenolab";
+ name = "special containment blast door"
+ },
+/obj/structure/cable/yellow{
+ d2 = 2;
+ icon_state = "0-2"
+ },
+/turf/simulated/floor/engine,
+/area/station/science/xenobiology)
"mbt" = (
-/obj/machinery/atmospherics/unary/vent_pump/on{
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 8
},
/turf/simulated/floor/plasteel{
@@ -68143,10 +66866,14 @@
/turf/simulated/floor/plating,
/area/station/maintenance/fpmaint)
"mcw" = (
-/obj/effect/landmark/lightsout,
-/turf/simulated/floor/plasteel{
- icon_state = "white"
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 4
},
+/obj/item/radio/intercom{
+ name = "south bump";
+ pixel_y = -28
+ },
+/turf/simulated/floor/plasteel,
/area/station/science/toxins/mixing)
"mcP" = (
/obj/machinery/camera/motion{
@@ -68184,14 +66911,6 @@
icon_state = "red"
},
/area/station/security/permabrig)
-"mdy" = (
-/obj/machinery/atmospherics/unary/vent_pump/on{
- dir = 1
- },
-/turf/simulated/floor/plasteel{
- icon_state = "white"
- },
-/area/station/science/research)
"mdE" = (
/obj/item/radio/intercom{
name = "west bump";
@@ -68252,6 +66971,17 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel,
/area/station/engineering/break_room)
+"meL" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 1
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "bar"
+ },
+/area/station/service/bar)
"meM" = (
/obj/structure/cable/yellow{
d1 = 1;
@@ -68332,13 +67062,17 @@
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
-/obj/effect/turf_decal/tile/purple,
-/obj/effect/turf_decal/tile/purple{
- dir = 1
- },
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 9
+ },
/turf/simulated/floor/plasteel,
/area/station/science/research)
"mfG" = (
@@ -68381,28 +67115,20 @@
icon_state = "whiteblue"
},
/area/station/security/permabrig)
-"mgK" = (
-/obj/structure/table,
-/obj/item/retractor{
- pixel_x = -6;
- pixel_y = 6
- },
-/obj/item/bonegel,
-/obj/item/hemostat{
- pixel_x = 6
+"mgu" = (
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 1
},
-/obj/machinery/light/small,
-/obj/machinery/button/windowtint{
+/obj/structure/disposalpipe/segment{
dir = 1;
- id = "ROBO";
- pixel_x = -6;
- pixel_y = -24
+ icon_state = "pipe-c"
},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel{
- dir = 6;
- icon_state = "whitepurple"
+ icon_state = "darkgrey"
},
-/area/station/science/robotics)
+/area/station/science/toxins/launch)
"mgZ" = (
/obj/machinery/atmospherics/air_sensor{
autolink_id = "air_sensor";
@@ -68426,20 +67152,6 @@
icon_state = "freezerfloor"
},
/area/station/public/toilet/lockerroom)
-"mhV" = (
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 6
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 6
- },
-/turf/simulated/floor/plating,
-/area/station/maintenance/aft2)
"mik" = (
/obj/structure/sign/goldenplaque/medical{
pixel_x = -32
@@ -68574,28 +67286,6 @@
},
/turf/simulated/floor/engine,
/area/station/science/xenobiology)
-"mld" = (
-/obj/machinery/atmospherics/unary/portables_connector,
-/obj/structure/extinguisher_cabinet{
- name = "west bump";
- pixel_x = -27
- },
-/turf/simulated/floor/plasteel,
-/area/station/science/toxins/mixing)
-"mle" = (
-/obj/machinery/door/airlock/maintenance,
-/obj/structure/disposalpipe/segment,
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/obj/effect/mapping_helpers/airlock/autoname,
-/obj/effect/mapping_helpers/airlock/access/all/science/research,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/plating,
-/area/station/maintenance/starboard2)
"mlj" = (
/obj/structure/closet/secure_closet/brig,
/turf/simulated/floor/plasteel{
@@ -68603,6 +67293,15 @@
icon_state = "red"
},
/area/station/security/prisonlockers)
+"mlq" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/wood,
+/area/station/maintenance/starboard)
"mlC" = (
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -68650,6 +67349,9 @@
icon_state = "caution"
},
/area/station/engineering/atmos/control)
+"mlV" = (
+/turf/simulated/floor/plasteel,
+/area/station/maintenance/aft2)
"mmk" = (
/obj/structure/cable/yellow{
d1 = 4;
@@ -68708,6 +67410,9 @@
},
/turf/simulated/floor/plasteel,
/area/station/security/prison/cell_block/A)
+"mng" = (
+/turf/simulated/floor/plating/airless,
+/area/station/science/toxins/launch)
"mnl" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable/yellow{
@@ -68799,9 +67504,18 @@
/turf/simulated/floor/plating,
/area/station/engineering/secure_storage)
"mpr" = (
-/obj/machinery/hologram/holopad,
-/turf/simulated/floor/carpet,
-/area/station/service/theatre)
+/obj/structure/table,
+/obj/machinery/chem_dispenser/beer{
+ dir = 8;
+ pixel_y = 6
+ },
+/obj/machinery/light{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "bar"
+ },
+/area/station/service/bar)
"mpP" = (
/obj/machinery/atmospherics/binary/volume_pump/on{
dir = 8;
@@ -68827,6 +67541,28 @@
icon_state = "brown"
},
/area/station/supply/office)
+"mra" = (
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/cable/yellow{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
+ },
+/turf/simulated/floor/plasteel,
+/area/station/science/research)
"mrc" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -68847,6 +67583,10 @@
icon_state = "white"
},
/area/station/medical/chemistry)
+"mrv" = (
+/obj/effect/turf_decal/loading_area,
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard2)
"mrA" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -68874,6 +67614,10 @@
},
/turf/simulated/floor/plasteel,
/area/station/supply/lobby)
+"msw" = (
+/obj/effect/spawner/random_barrier/obstruction,
+/turf/simulated/floor/plating,
+/area/station/maintenance/aft2)
"msD" = (
/obj/machinery/atmospherics/pipe/simple/hidden/purple,
/obj/effect/spawner/window/reinforced/grilled,
@@ -68888,26 +67632,9 @@
/turf/simulated/floor/plating,
/area/station/maintenance/fore2)
"mtr" = (
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/machinery/light/small{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden{
- dir = 10
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
+/obj/structure/closet/firecloset,
+/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random_spawners/cobweb_right_rare,
/turf/simulated/floor/plating,
/area/station/maintenance/aft2)
"mtV" = (
@@ -68972,9 +67699,29 @@
},
/area/station/medical/reception)
"mwH" = (
-/obj/machinery/atmospherics/portable/canister/air,
-/turf/simulated/floor/plating,
-/area/station/public/storage/emergency)
+/obj/structure/table/wood,
+/obj/item/stack/sheet/metal{
+ amount = 50
+ },
+/obj/item/stack/sheet/glass{
+ amount = 50;
+ pixel_x = 3;
+ pixel_y = 3
+ },
+/obj/item/stack/cable_coil,
+/obj/item/stack/cable_coil,
+/obj/item/stack/cable_coil,
+/obj/item/stack/cable_coil,
+/obj/item/stack/cable_coil,
+/obj/item/storage/fancy/candle_box/eternal,
+/obj/item/storage/fancy/candle_box/eternal,
+/obj/item/storage/fancy/candle_box/eternal,
+/obj/item/radio/intercom{
+ name = "north bump";
+ pixel_y = 28
+ },
+/turf/simulated/floor/wood,
+/area/station/service/bar)
"mwK" = (
/obj/structure/chair{
dir = 1
@@ -69015,29 +67762,23 @@
},
/area/station/hallway/primary/central)
"mxb" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/effect/decal/cleanable/dirt,
+/obj/machinery/door/airlock/freezer,
+/obj/effect/mapping_helpers/airlock/access/any/service/kitchen,
/turf/simulated/floor/plasteel{
icon_state = "showroomfloor"
},
/area/station/service/kitchen)
+"mxp" = (
+/obj/structure/rack,
+/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plating,
+/area/station/maintenance/aft2)
"mxw" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
/turf/simulated/floor/plasteel,
/area/station/maintenance/fore)
-"myi" = (
-/obj/machinery/atmospherics/binary/valve{
- layer = 3.3;
- name = "Cooling loop input"
- },
-/obj/machinery/status_display{
- dir = 4;
- pixel_y = -32
- },
-/turf/simulated/floor/plasteel,
-/area/station/science/toxins/mixing)
"myk" = (
/obj/effect/turf_decal/stripes/line{
dir = 6
@@ -69045,6 +67786,14 @@
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel,
/area/station/security/range)
+"myv" = (
+/obj/machinery/light{
+ dir = 4
+ },
+/obj/machinery/atmospherics/portable/pump,
+/obj/machinery/atmospherics/pipe/simple/hidden/purple,
+/turf/simulated/floor/engine,
+/area/station/science/test_chamber)
"myY" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/turf/simulated/floor/plasteel,
@@ -69151,34 +67900,15 @@
/obj/item/storage/fancy/donut_box,
/turf/simulated/floor/plasteel,
/area/station/security/warden)
-"mAt" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/effect/turf_decal/tile/bar{
- dir = 1
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "neutralcorner"
- },
-/area/station/maintenance/starboard)
"mAA" = (
-/obj/structure/closet/bombcloset,
-/obj/machinery/requests_console{
- department = "Science";
- departmentType = 2;
- name = "Science Requests Console";
- pixel_x = -30
- },
-/obj/effect/turf_decal/stripes/line{
+/obj/machinery/atmospherics/binary/valve,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/turf/simulated/floor/plasteel{
- icon_state = "white"
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
},
+/turf/simulated/floor/plasteel,
/area/station/science/toxins/mixing)
"mAC" = (
/obj/structure/lattice/catwalk,
@@ -69203,6 +67933,21 @@
icon_state = "dark"
},
/area/station/engineering/break_room)
+"mBe" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
+/turf/simulated/floor/wood,
+/area/station/service/bar)
"mBn" = (
/turf/simulated/floor/plating/airless,
/area/station/engineering/solar/starboard)
@@ -69224,11 +67969,6 @@
/obj/machinery/atmospherics/pipe/simple/heat_exchanging,
/turf/space,
/area/space/nearstation)
-"mBJ" = (
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel,
-/area/station/maintenance/starboard)
"mCu" = (
/obj/structure/disposalpipe/segment,
/obj/effect/turf_decal/stripes/line,
@@ -69282,8 +68022,20 @@
/turf/simulated/floor/plasteel,
/area/station/engineering/atmos)
"mDn" = (
-/obj/effect/spawner/window/reinforced/tinted,
-/obj/structure/barricade/wooden,
+/obj/machinery/door/airlock/maintenance,
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/effect/mapping_helpers/airlock/autoname,
+/obj/effect/mapping_helpers/airlock/access/all/science/robotics,
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plating,
/area/station/maintenance/aft2)
"mDq" = (
@@ -69348,6 +68100,18 @@
},
/turf/simulated/floor/plasteel,
/area/station/security/brig)
+"mEm" = (
+/obj/machinery/door/airlock/maintenance,
+/obj/effect/mapping_helpers/airlock/autoname,
+/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard)
"mEu" = (
/obj/machinery/atmospherics/binary/valve/digital/open{
name = "Mixed Air Outlet Valve"
@@ -69492,6 +68256,20 @@
},
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/central)
+"mIC" = (
+/obj/effect/spawner/window/reinforced/plasma/grilled,
+/obj/machinery/door/poddoor/preopen{
+ id_tag = "Xenolab";
+ name = "special containment blast door"
+ },
+/obj/structure/cable/yellow,
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/engine,
+/area/station/science/xenobiology)
"mJe" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -69530,6 +68308,17 @@
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
/area/station/security/armory/secure)
+"mKw" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/science/xenobiology)
"mKy" = (
/turf/simulated/floor/plasteel{
icon_state = "neutralcorner"
@@ -69585,6 +68374,21 @@
/obj/machinery/atmospherics/portable/canister/air,
/turf/simulated/floor/plating,
/area/station/engineering/control)
+"mLH" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/aft2)
"mMk" = (
/obj/structure/sign/poster/contraband/random{
pixel_x = 32
@@ -69606,6 +68410,32 @@
icon_state = "whitebluefull"
},
/area/station/medical/exam_room)
+"mNu" = (
+/obj/structure/sink{
+ dir = 1;
+ pixel_y = -8
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ dir = 0;
+ icon_state = "green"
+ },
+/area/station/service/hydroponics)
+"mNF" = (
+/obj/effect/turf_decal/delivery,
+/turf/simulated/floor/plasteel{
+ icon_state = "darkgreenfull"
+ },
+/area/station/service/hydroponics)
+"mNJ" = (
+/obj/machinery/atmospherics/pipe/manifold/visible{
+ dir = 1
+ },
+/obj/machinery/atmospherics/meter,
+/turf/simulated/floor/plating,
+/area/station/maintenance/asmaint)
"mOc" = (
/obj/structure/cable/yellow{
d1 = 1;
@@ -69687,16 +68517,12 @@
dir = 8;
name = "Fuel Pipe to Filter"
},
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 10
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 6
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "caution"
@@ -69726,16 +68552,12 @@
name = "south bump";
pixel_y = -24
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "whitepurple"
+/obj/effect/spawner/window/reinforced/polarized{
+ id = "ROBO"
},
-/area/station/science/research)
+/turf/simulated/floor/plating,
+/area/station/science/robotics)
"mPo" = (
-/obj/effect/turf_decal/delivery/hollow,
/obj/machinery/atmospherics/portable/canister/air,
/obj/machinery/atmospherics/pipe/simple/hidden/purple,
/turf/simulated/floor/plasteel,
@@ -69782,29 +68604,19 @@
},
/area/station/service/hydroponics)
"mRj" = (
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/stripes/line{
- dir = 8
+ dir = 9
},
-/obj/effect/landmark/spawner/nukedisc_respawn,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 8;
icon_state = "1-8"
},
-/turf/simulated/floor/plasteel,
-/area/station/maintenance/starboard)
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 9
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard2)
"mRr" = (
/obj/machinery/alarm{
dir = 8;
@@ -69852,13 +68664,13 @@
},
/area/station/service/library)
"mSm" = (
-/obj/machinery/door/airlock/freezer,
-/obj/effect/mapping_helpers/airlock/access/all/service/kitchen,
-/obj/machinery/door/firedoor,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/light_switch{
+ dir = 8;
+ name = "east bump";
+ pixel_x = 24
+ },
/turf/simulated/floor/plasteel{
- icon_state = "cafeteria"
+ icon_state = "showroomfloor"
},
/area/station/service/kitchen)
"mSE" = (
@@ -69891,19 +68703,6 @@
icon_state = "white"
},
/area/station/medical/surgery/primary)
-"mTU" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/obj/machinery/door/airlock/maintenance,
-/obj/effect/mapping_helpers/airlock/autoname,
-/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
-/turf/simulated/floor/plating,
-/area/station/maintenance/aft2)
"mUf" = (
/turf/simulated/floor/plasteel{
dir = 4;
@@ -69925,11 +68724,8 @@
},
/area/station/legal/magistrate)
"mUl" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on,
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+ dir = 4
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -70001,19 +68797,20 @@
name = "north bump";
pixel_y = 24
},
-/obj/machinery/power/apc{
- dir = 4;
- name = "east bump";
- pixel_x = 24
- },
-/obj/structure/cable/yellow{
- d2 = 8;
- icon_state = "0-8"
- },
/turf/simulated/floor/plasteel{
icon_state = "cafeteria"
},
/area/station/science/break_room)
+"mVn" = (
+/obj/structure/closet/secure_closet/hydroponics,
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/atmospherics/unary/vent_scrubber/on,
+/obj/machinery/firealarm{
+ name = "north bump";
+ pixel_y = 24
+ },
+/turf/simulated/floor/plasteel,
+/area/station/service/hydroponics)
"mVu" = (
/obj/structure/cable{
d1 = 1;
@@ -70039,12 +68836,23 @@
},
/area/station/security/brig)
"mVD" = (
-/obj/machinery/light/small,
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel{
- icon_state = "white"
+/obj/machinery/door/airlock/maintenance,
+/obj/effect/mapping_helpers/airlock/autoname,
+/obj/effect/mapping_helpers/airlock/access/all/science/research,
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
},
-/area/station/science/toxins/mixing)
+/turf/simulated/floor/plating,
+/area/station/science/explab)
+"mVF" = (
+/obj/effect/spawner/random_spawners/fungus_maybe,
+/turf/simulated/wall,
+/area/station/service/hydroponics)
"mVG" = (
/obj/structure/cable{
d1 = 4;
@@ -70086,14 +68894,6 @@
},
/turf/simulated/floor/redgrid,
/area/station/turret_protected/ai_upload)
-"mVS" = (
-/obj/machinery/door/airlock/research{
- name = "Toxins Loop Observation"
- },
-/obj/effect/mapping_helpers/airlock/access/all/science/tox,
-/obj/machinery/atmospherics/pipe/simple/hidden,
-/turf/simulated/floor/plating,
-/area/station/maintenance/aft2)
"mVW" = (
/obj/effect/turf_decal/stripes/corner{
dir = 8
@@ -70101,6 +68901,16 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/entry)
+"mVZ" = (
+/obj/effect/spawner/random_spawners/fungus_probably,
+/turf/simulated/wall,
+/area/station/service/hydroponics)
+"mWp" = (
+/obj/machinery/hologram/holopad,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/science/toxins/launch)
"mWH" = (
/obj/structure/chair/office/dark{
dir = 4
@@ -70109,16 +68919,6 @@
icon_state = "darkgreycheck"
},
/area/station/command/office/rd)
-"mWI" = (
-/obj/structure/table/wood/poker,
-/obj/item/deck/cards{
- pixel_y = 4
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/simulated/floor/wood,
-/area/station/service/bar)
"mWL" = (
/obj/machinery/atmospherics/pipe/simple/visible/yellow{
dir = 4
@@ -70214,15 +69014,6 @@
},
/turf/simulated/floor/plasteel,
/area/station/supply/storage)
-"mYo" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
- dir = 1
- },
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "whitepurple"
- },
-/area/station/science/rnd)
"mYr" = (
/obj/structure/bed/roller,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -70292,6 +69083,15 @@
icon_state = "whitepurple"
},
/area/station/science/rnd)
+"mZq" = (
+/obj/machinery/power/apc{
+ dir = 8;
+ name = "west bump";
+ pixel_x = -24
+ },
+/obj/structure/cable/yellow,
+/turf/simulated/floor/plating,
+/area/station/maintenance/aft2)
"mZH" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 6
@@ -70307,13 +69107,6 @@
},
/turf/simulated/floor/plating,
/area/station/engineering/control)
-"mZL" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/wood,
-/area/station/service/bar)
"mZZ" = (
/obj/machinery/photocopier,
/obj/machinery/alarm{
@@ -70329,6 +69122,14 @@
icon_state = "yellow"
},
/area/station/engineering/break_room)
+"nac" = (
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 8
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "darkgreenfull"
+ },
+/area/station/service/hydroponics)
"nan" = (
/obj/machinery/atmospherics/pipe/simple/visible/green{
dir = 6
@@ -70336,6 +69137,17 @@
/obj/effect/landmark/start/atmospheric,
/turf/simulated/floor/plasteel,
/area/station/engineering/atmos/distribution)
+"naq" = (
+/obj/effect/spawner/random_spawners/wall_rusted_maybe,
+/turf/simulated/wall/r_wall,
+/area/station/science/toxins/launch)
+"naR" = (
+/obj/machinery/seed_extractor,
+/obj/effect/turf_decal/stripes/line{
+ dir = 10
+ },
+/turf/simulated/floor/plasteel,
+/area/station/service/hydroponics)
"naU" = (
/obj/effect/turf_decal/stripes/white/line{
dir = 8
@@ -70424,6 +69236,14 @@
icon_state = "white"
},
/area/station/security/permabrig)
+"ncl" = (
+/obj/machinery/door/airlock,
+/obj/effect/mapping_helpers/airlock/access/all/service/bar,
+/obj/effect/mapping_helpers/airlock/autoname,
+/turf/simulated/floor/plasteel{
+ icon_state = "bar"
+ },
+/area/station/service/bar)
"ncp" = (
/obj/machinery/door/window/classic/normal{
name = "Containment Pen #4";
@@ -70517,11 +69337,6 @@
},
/area/station/security/storage)
"ndR" = (
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 8;
- icon_state = "1-8"
- },
/turf/simulated/floor/plasteel,
/area/station/science/robotics)
"ndS" = (
@@ -70537,21 +69352,37 @@
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/effect/turf_decal/stripes/line{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
/area/station/science/xenobiology)
"nec" = (
-/obj/machinery/atmospherics/pipe/manifold/visible{
+/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{
dir = 8
},
-/obj/machinery/atmospherics/meter,
-/turf/simulated/floor/plasteel,
+/turf/simulated/wall/r_wall,
/area/station/science/toxins/mixing)
+"neh" = (
+/obj/machinery/door/airlock/maintenance,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 4
+ },
+/obj/effect/mapping_helpers/airlock/autoname,
+/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard2)
"nej" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
@@ -70719,44 +69550,23 @@
},
/area/station/medical/reception)
"nhP" = (
-/obj/structure/window/reinforced{
- dir = 8
+/obj/structure/table,
+/obj/item/book/manual/wiki/sop_service,
+/obj/item/book/manual/barman_recipes{
+ pixel_x = -4;
+ pixel_y = 7
},
-/obj/structure/musician/piano,
-/turf/simulated/floor/wood,
-/area/station/service/theatre)
+/obj/item/clothing/head/that,
+/turf/simulated/floor/plasteel{
+ icon_state = "bar"
+ },
+/area/station/service/bar)
"nhR" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/closet/firecloset,
/obj/effect/spawner/lootdrop/maintenance,
/turf/simulated/floor/plasteel,
/area/station/maintenance/fsmaint)
-"nhU" = (
-/obj/effect/turf_decal/stripes/white/line{
- dir = 4
- },
-/obj/effect/turf_decal/stripes/white/line{
- dir = 8
- },
-/obj/machinery/door/firedoor,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/turf/simulated/floor/plasteel{
- icon_state = "darkgrey"
- },
-/area/station/science/research)
"nia" = (
/obj/structure/cable{
d2 = 4;
@@ -70830,19 +69640,8 @@
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 4
},
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/turf/simulated/floor/engine,
-/area/station/science/test_chamber)
-"niS" = (
-/obj/effect/landmark/start/chef,
-/turf/simulated/floor/plasteel{
- icon_state = "cafeteria"
- },
-/area/station/service/kitchen)
+/area/station/science/xenobiology)
"niU" = (
/obj/structure/cable/yellow{
d1 = 1;
@@ -70874,11 +69673,6 @@
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
/area/station/security/armory)
-"njo" = (
-/obj/machinery/biogenerator,
-/obj/effect/turf_decal/stripes/end,
-/turf/simulated/floor/plasteel,
-/area/station/service/hydroponics)
"nju" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -70907,29 +69701,14 @@
"nkt" = (
/turf/simulated/floor/plating,
/area/station/maintenance/xenobio_south)
-"nkz" = (
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood/old,
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "darkpurple"
- },
-/area/station/maintenance/aft2)
"nkU" = (
/mob/living/simple_animal/pet/dog/corgi/borgi,
/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel,
/area/station/science/robotics)
"nln" = (
@@ -70942,11 +69721,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
},
-/obj/structure/cable/yellow{
- d1 = 2;
- d2 = 8;
- icon_state = "2-8"
- },
/obj/effect/turf_decal/stripes/line{
dir = 5
},
@@ -71050,6 +69824,15 @@
icon_state = "yellow"
},
/area/station/engineering/break_room)
+"nnA" = (
+/obj/machinery/atmospherics/pipe/simple/hidden{
+ dir = 6
+ },
+/obj/machinery/light/small{
+ dir = 1
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/asmaint)
"nnI" = (
/obj/structure/cable{
d1 = 4;
@@ -71062,6 +69845,17 @@
/obj/machinery/atmospherics/unary/vent_scrubber/on,
/turf/simulated/floor/plasteel,
/area/station/engineering/gravitygenerator)
+"nos" = (
+/obj/machinery/requests_console{
+ department = "Bar";
+ departmentType = 2;
+ name = "Bar Requests Console";
+ pixel_y = -30
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "bar"
+ },
+/area/station/service/bar)
"noy" = (
/obj/structure/cable/yellow{
d1 = 1;
@@ -71091,8 +69885,12 @@
/turf/simulated/floor/plating,
/area/station/maintenance/xenobio_south)
"npj" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 8
+/obj/machinery/door/poddoor{
+ name = "Containment Pen";
+ id_tag = "maintcham"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 4
},
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint)
@@ -71112,22 +69910,75 @@
icon_state = "whiteblue"
},
/area/station/medical/surgery/primary)
+"nqo" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
+/turf/simulated/floor/plasteel,
+/area/station/maintenance/starboard2)
+"nqq" = (
+/obj/effect/spawner/window/reinforced,
+/turf/simulated/floor/plating,
+/area/station/service/kitchen)
"nqr" = (
-/obj/structure/table,
-/obj/structure/table,
-/obj/item/wrench,
-/obj/item/crowbar,
-/obj/effect/turf_decal/delivery/hollow,
+/obj/machinery/computer/area_atmos{
+ dir = 4
+ },
+/obj/machinery/camera{
+ c_tag = "Science - Toxins Secure - Port";
+ dir = 4;
+ network = list("Research","SS13")
+ },
+/obj/machinery/light_switch{
+ dir = 4;
+ name = "west bump";
+ pixel_x = -24
+ },
/turf/simulated/floor/plasteel{
- icon_state = "darkgrey"
+ icon_state = "white"
},
-/area/station/science/toxins/launch)
+/area/station/science/storage)
"nqt" = (
/obj/machinery/atmospherics/pipe/simple/heat_exchanging{
dir = 9
},
/turf/space,
/area/space/nearstation)
+"nqw" = (
+/obj/structure/disposalpipe/segment{
+ dir = 8;
+ icon_state = "pipe-c"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 9
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 9
+ },
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "whitepurplecorner"
+ },
+/area/station/science/research)
+"nqG" = (
+/obj/machinery/door/airlock/research,
+/obj/effect/mapping_helpers/airlock/autoname,
+/obj/effect/mapping_helpers/airlock/access/all/science/tox,
+/obj/machinery/door/firedoor/heavy{
+ opacity = 0
+ },
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "whitepurplefull"
+ },
+/area/station/science/toxins/mixing)
"nqJ" = (
/obj/structure/table,
/obj/item/phone{
@@ -71196,31 +70047,20 @@
},
/turf/simulated/floor/engine,
/area/station/engineering/control)
-"nsy" = (
-/obj/effect/turf_decal/loading_area{
- dir = 4
+"nsB" = (
+/obj/structure/table/reinforced,
+/obj/item/reagent_containers/food/condiment/saltshaker{
+ pixel_x = -3
},
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
+/obj/item/reagent_containers/food/condiment/peppermill{
+ pixel_x = 3
},
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel{
- icon_state = "darkgrey"
+/obj/structure/disposalpipe/segment{
+ dir = 4
},
-/area/station/science/robotics)
-"nsB" = (
-/obj/structure/table/wood,
-/obj/item/clothing/mask/cigarette/pipe,
-/obj/item/radio/intercom{
- name = "north bump";
- pixel_y = 28
+/turf/simulated/floor/plasteel{
+ icon_state = "bar"
},
-/turf/simulated/floor/wood,
/area/station/service/bar)
"nsJ" = (
/obj/structure/sign/electricshock,
@@ -71300,15 +70140,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/bluegrid,
/area/station/turret_protected/ai)
-"nvP" = (
-/obj/machinery/door/airlock/maintenance,
-/obj/effect/mapping_helpers/airlock/autoname,
-/obj/effect/mapping_helpers/airlock/access/all/science/research,
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel{
- icon_state = "whitepurplefull"
- },
-/area/station/maintenance/aft2)
"nvY" = (
/obj/machinery/computer/secure_data{
dir = 1
@@ -71332,22 +70163,16 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
-"nwx" = (
-/obj/machinery/atmospherics/unary/vent_pump/on{
- dir = 1
- },
-/turf/simulated/floor/wood,
-/area/station/service/bar)
"nwQ" = (
-/obj/machinery/door/window/classic/reversed{
- name = "Theatre Stage";
- dir = 8
- },
-/obj/structure/sign/poster/random{
- pixel_y = 32
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock{
+ name = "Bar Office"
},
+/obj/effect/mapping_helpers/airlock/access/all/service/bar,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/wood,
-/area/station/service/theatre)
+/area/station/service/bar)
"nwU" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -71394,21 +70219,13 @@
/turf/simulated/floor/plasteel,
/area/station/security/permabrig)
"nxh" = (
-/obj/structure/disposalpipe/segment,
/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/cable/yellow{
- d1 = 2;
- d2 = 8;
- icon_state = "2-8"
- },
-/turf/simulated/floor/plasteel,
+/obj/structure/rack,
+/obj/item/stack/cable_coil,
+/obj/item/reagent_containers/glass/rag,
+/obj/item/lighter/zippo,
+/obj/item/storage/fancy/candle_box/eternal,
+/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
"nxr" = (
/obj/machinery/power/apc{
@@ -71480,6 +70297,15 @@
icon_state = "white"
},
/area/station/command/office/cmo)
+"nyp" = (
+/obj/machinery/door/airlock/atmos{
+ name = "Fore-Starboard Atmospherics Maintenance"
+ },
+/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
+/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos,
+/obj/machinery/atmospherics/pipe/simple/visible/universal,
+/turf/simulated/floor/plating,
+/area/station/maintenance/asmaint)
"nyM" = (
/obj/machinery/atmospherics/pipe/simple/visible/yellow{
dir = 9
@@ -71509,44 +70335,17 @@
/turf/space,
/area/space/nearstation)
"nzv" = (
-/obj/structure/table/wood,
-/obj/item/stack/sheet/metal{
- amount = 50
- },
-/obj/item/stack/sheet/glass{
- amount = 50;
- pixel_x = 3;
- pixel_y = 3
- },
-/obj/item/stack/cable_coil,
-/obj/item/stack/cable_coil,
-/obj/item/stack/cable_coil,
-/obj/item/stack/cable_coil,
-/obj/item/stack/cable_coil,
-/obj/item/storage/fancy/candle_box/eternal,
-/obj/item/storage/fancy/candle_box/eternal,
-/obj/item/storage/fancy/candle_box/eternal,
-/obj/item/radio/intercom{
- name = "south bump";
- pixel_y = -28
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 5
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 5
+/obj/machinery/door_control{
+ id = "kitchen_service";
+ name = "Service Shutter Control";
+ pixel_x = -24;
+ pixel_y = -24;
+ req_access_txt = "28"
},
-/turf/simulated/floor/wood,
-/area/station/service/bar)
-"nzz" = (
-/obj/structure/girder,
-/obj/effect/spawner/lootdrop{
- icon_state = "grille";
- loot = list(/obj/structure/grille=8,/obj/structure/grille/broken=2);
- name = "normal or broken grille spawner"
+/turf/simulated/floor/plasteel{
+ icon_state = "cafeteria"
},
-/turf/simulated/floor/plating,
-/area/station/maintenance/asmaint)
+/area/station/service/kitchen)
"nzE" = (
/obj/structure/cable/yellow,
/obj/effect/spawner/window/reinforced/polarized/grilled{
@@ -71579,11 +70378,9 @@
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
-/obj/structure/disposalpipe/sortjunction{
- dir = 2;
- icon_state = "pipe-j2s";
- name = "Hydroponics Junction";
- sort_type_txt = "21"
+/obj/structure/disposalpipe/segment{
+ dir = 8;
+ icon_state = "pipe-c"
},
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/central)
@@ -71615,6 +70412,12 @@
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
+"nBf" = (
+/obj/structure/closet,
+/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random_spawners/cobweb_right_rare,
+/turf/simulated/floor/plating,
+/area/station/maintenance/aft2)
"nBj" = (
/obj/structure/table/wood,
/obj/item/storage/photo_album,
@@ -71643,11 +70446,27 @@
icon_state = "whiteblue"
},
/area/station/medical/reception)
+"nBW" = (
+/obj/structure/rack,
+/obj/effect/spawner/lootdrop/maintenance,
+/obj/machinery/atmospherics/pipe/simple/hidden{
+ dir = 5
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/asmaint)
"nCf" = (
/obj/structure/grille/broken,
/obj/effect/landmark/damageturf,
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
+"nCh" = (
+/obj/structure/rack,
+/obj/effect/spawner/lootdrop/maintenance,
+/turf/simulated/floor/plasteel{
+ dir = 10;
+ icon_state = "whitepurple"
+ },
+/area/station/maintenance/asmaint)
"nCm" = (
/obj/machinery/atmospherics/pipe/simple/visible/yellow{
dir = 4
@@ -71703,6 +70522,13 @@
/obj/effect/spawner/lootdrop/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/xenobio_south)
+"nDi" = (
+/obj/machinery/atmospherics/portable/canister,
+/obj/effect/turf_decal/delivery/white/hollow,
+/turf/simulated/floor/plasteel{
+ icon_state = "darkgrey"
+ },
+/area/station/science/storage)
"nDj" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/medical/glass{
@@ -71720,6 +70546,11 @@
icon_state = "whitebluefull"
},
/area/station/medical/medbay)
+"nDk" = (
+/obj/effect/spawner/window/reinforced/grilled,
+/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction,
+/turf/simulated/floor/plating,
+/area/station/maintenance/asmaint)
"nDu" = (
/obj/structure/cable/yellow{
d1 = 1;
@@ -71741,6 +70572,12 @@
icon_state = "neutralcorner"
},
/area/station/public/fitness)
+"nDC" = (
+/obj/machinery/atmospherics/pipe/manifold/hidden/cyan{
+ dir = 8
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/aft2)
"nDF" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -71817,7 +70654,6 @@
/obj/machinery/light/small{
dir = 1
},
-/obj/effect/turf_decal/delivery/hollow,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "purple"
@@ -71871,6 +70707,15 @@
icon_state = "darkgreycheck"
},
/area/station/command/office/rd)
+"nFi" = (
+/obj/structure/kitchenspike,
+/obj/effect/decal/cleanable/blood/splatter,
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plasteel{
+ dir = 10;
+ icon_state = "vault"
+ },
+/area/station/maintenance/asmaint)
"nFZ" = (
/obj/machinery/door/airlock/external{
id_tag = "engine_door_ext";
@@ -71995,6 +70840,14 @@
},
/turf/space,
/area/space)
+"nJZ" = (
+/obj/item/assembly/prox_sensor{
+ pixel_x = -4;
+ pixel_y = 1
+ },
+/obj/effect/spawner/random_spawners/oil_often,
+/turf/simulated/floor/plating,
+/area/station/maintenance/aft2)
"nKf" = (
/obj/effect/spawner/window/reinforced/grilled,
/obj/structure/cable/yellow{
@@ -72049,12 +70902,6 @@
/turf/simulated/floor/plasteel,
/area/station/supply/storage)
"nLV" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
/obj/structure/disposalpipe/sortjunction{
dir = 8;
name = "Research Junction";
@@ -72148,6 +70995,13 @@
icon_state = "dark"
},
/area/station/security/range)
+"nOE" = (
+/obj/item/book/manual/random,
+/obj/effect/spawner/random_spawners/cobweb_right_frequent,
+/turf/simulated/floor/plasteel{
+ icon_state = "cult"
+ },
+/area/station/maintenance/starboard)
"nOF" = (
/obj/machinery/light/small{
dir = 4
@@ -72176,14 +71030,19 @@
},
/area/station/turret_protected/aisat/interior)
"nOU" = (
-/obj/structure/chair/stool{
- dir = 8
+/obj/structure/table/wood,
+/obj/item/flashlight/lamp/green{
+ pixel_x = 1;
+ pixel_y = 5
},
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/sign/poster/random{
- pixel_x = 32
+/obj/machinery/newscaster{
+ dir = 4;
+ name = "west bump";
+ pixel_x = -28
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "cult"
},
-/turf/simulated/floor/plasteel,
/area/station/maintenance/starboard)
"nPe" = (
/turf/simulated/floor/plasteel{
@@ -72257,6 +71116,24 @@
icon_state = "darkgrey"
},
/area/station/science/toxins/launch)
+"nRQ" = (
+/obj/effect/spawner/random_spawners/wall_rusted_probably,
+/turf/simulated/wall/r_wall,
+/area/station/science/test_chamber)
+"nSc" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 5
+ },
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
+/turf/simulated/floor/plasteel,
+/area/station/maintenance/asmaint)
"nSs" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/spawner/random_spawners/oil_maybe,
@@ -72315,16 +71192,9 @@
/turf/simulated/floor/plating,
/area/station/maintenance/aft)
"nTX" = (
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 4;
- icon_state = "1-4"
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/turf/simulated/floor/plating,
-/area/station/public/storage/emergency)
+/obj/effect/turf_decal/delivery,
+/turf/simulated/floor/wood,
+/area/station/service/bar)
"nUa" = (
/obj/structure/table,
/turf/simulated/floor/plasteel{
@@ -72349,7 +71219,7 @@
/area/station/science/robotics/chargebay)
"nUG" = (
/obj/effect/landmark/start/roboticist,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
},
/turf/simulated/floor/plasteel{
@@ -72475,8 +71345,21 @@
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/central)
"nWJ" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard)
+"nXk" = (
+/obj/structure/bookcase,
+/turf/simulated/floor/wood{
+ icon_state = "wood-broken7"
+ },
/area/station/maintenance/starboard)
"nXr" = (
/obj/machinery/light{
@@ -72732,20 +71615,6 @@
/obj/machinery/computer/rdconsole/robotics{
dir = 1
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 4;
- icon_state = "1-4"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 6
- },
/turf/simulated/floor/plasteel,
/area/station/science/robotics)
"ocp" = (
@@ -72820,26 +71689,6 @@
},
/turf/simulated/floor/plating,
/area/station/security/permabrig)
-"oee" = (
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 10
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 1
- },
-/obj/structure/cable/yellow{
- d1 = 2;
- d2 = 8;
- icon_state = "2-8"
- },
-/turf/simulated/floor/plasteel{
- icon_state = "white"
- },
-/area/station/science/storage)
"oeA" = (
/obj/structure/cable/yellow{
d1 = 1;
@@ -72930,21 +71779,24 @@
},
/area/station/medical/reception)
"ogE" = (
-/obj/effect/turf_decal/stripes/line{
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/machinery/atmospherics/pipe/manifold/hidden/cyan{
+ dir = 1
+ },
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint)
"oha" = (
/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/obj/structure/cable/yellow{
- d1 = 1;
+ d1 = 2;
d2 = 8;
- icon_state = "1-8"
+ icon_state = "2-8"
},
/turf/simulated/floor/plasteel{
icon_state = "darkgreycheck"
@@ -72964,17 +71816,9 @@
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
"oic" = (
-/obj/machinery/camera{
- c_tag = "Science Hallway - Central";
- dir = 4;
- network = list("Research","SS13")
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel{
- icon_state = "white"
+ dir = 6;
+ icon_state = "whitepurple"
},
/area/station/science/research)
"oiv" = (
@@ -73115,6 +71959,7 @@
name = "north bump";
pixel_y = 28
},
+/obj/effect/turf_decal/delivery,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "whitepurple"
@@ -73127,17 +71972,39 @@
/obj/structure/window/reinforced{
dir = 1
},
-/obj/effect/turf_decal/delivery/hollow,
/obj/machinery/atmospherics/portable/pump,
/turf/simulated/floor/plasteel{
dir = 9;
icon_state = "blueyellow"
},
/area/station/hallway/primary/starboard)
+"ood" = (
+/obj/machinery/door_control{
+ pixel_x = -26;
+ id = "maintcham2";
+ name = "Containment Control"
+ },
+/obj/item/slime_extract/pyrite,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "whitepurple"
+ },
+/area/station/maintenance/asmaint)
"ook" = (
/obj/effect/spawner/random_spawners/wall_rusted_maybe,
/turf/simulated/wall/r_wall,
/area/station/security/range)
+"ool" = (
+/obj/item/seeds/eggplant,
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard2)
"ooD" = (
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
@@ -73184,23 +72051,23 @@
},
/turf/simulated/floor/engine/n2,
/area/station/engineering/atmos)
-"opf" = (
-/obj/machinery/disposal,
-/obj/machinery/alarm{
- dir = 1;
- name = "south bump";
- pixel_y = -24
+"opd" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
},
-/obj/structure/disposalpipe/trunk{
- dir = 8
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
},
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/delivery/hollow,
/turf/simulated/floor/plasteel{
dir = 1;
- icon_state = "whitecorner"
+ icon_state = "whitepurple"
},
-/area/station/service/kitchen)
+/area/station/science/research)
"opu" = (
/obj/structure/bed/roller,
/obj/item/radio/intercom{
@@ -73343,17 +72210,6 @@
/obj/effect/turf_decal/loading_area{
dir = 4
},
-/obj/structure/disposalpipe/segment,
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel{
icon_state = "darkgrey"
},
@@ -73367,6 +72223,12 @@
},
/turf/space,
/area/station/engineering/solar/auxport)
+"ovR" = (
+/obj/structure/bookcase{
+ name = "bookcase (Adult)"
+ },
+/turf/simulated/floor/wood,
+/area/station/maintenance/starboard)
"owq" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -73381,12 +72243,6 @@
},
/turf/simulated/floor/engine,
/area/station/engineering/control)
-"oxJ" = (
-/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance/two,
-/obj/item/flashlight,
-/turf/simulated/floor/plating,
-/area/station/maintenance/starboard)
"oxT" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock,
@@ -73396,6 +72252,11 @@
icon_state = "cult"
},
/area/station/legal/lawoffice)
+"oyD" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/reagent_dispensers/watertank,
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard2)
"oyM" = (
/obj/machinery/light/small{
dir = 4
@@ -73480,7 +72341,6 @@
pixel_x = -5
},
/obj/item/flash,
-/obj/effect/turf_decal/delivery/hollow,
/obj/effect/turf_decal/stripes/line{
dir = 4
},
@@ -73529,6 +72389,11 @@
d2 = 8;
icon_state = "4-8"
},
+/obj/structure/cable/yellow{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
+ },
/turf/simulated/floor/plating,
/area/station/maintenance/xenobio_north)
"oCl" = (
@@ -73553,6 +72418,18 @@
},
/turf/simulated/floor/plasteel,
/area/station/engineering/atmos/distribution)
+"oCU" = (
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/machinery/door/airlock/maintenance,
+/obj/effect/mapping_helpers/airlock/autoname,
+/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/plating,
+/area/station/maintenance/asmaint)
"oCX" = (
/obj/structure/table,
/obj/item/stack/sheet/glass{
@@ -73697,14 +72574,10 @@
/turf/simulated/floor/plating,
/area/station/maintenance/xenobio_south)
"oFn" = (
-/obj/machinery/hologram/holopad,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 9
- },
/obj/structure/cable/yellow{
- d1 = 4;
+ d1 = 1;
d2 = 8;
- icon_state = "4-8"
+ icon_state = "1-8"
},
/turf/simulated/floor/plasteel{
icon_state = "cafeteria"
@@ -73722,15 +72595,23 @@
icon_state = "whitepurple"
},
/area/station/science/research)
+"oFz" = (
+/turf/simulated/floor/wood,
+/area/station/maintenance/starboard2)
"oFF" = (
-/obj/effect/turf_decal/stripes/white/line{
- dir = 1
- },
-/obj/machinery/atmospherics/trinary/mixer{
+/obj/machinery/atmospherics/pipe/simple/insulated,
+/obj/machinery/light/small{
dir = 4
},
/turf/simulated/floor/plasteel,
/area/station/science/toxins/mixing)
+"oFN" = (
+/obj/structure/closet/secure_closet/hydroponics,
+/obj/effect/turf_decal/stripes/line{
+ dir = 10
+ },
+/turf/simulated/floor/plasteel,
+/area/station/service/hydroponics)
"oFY" = (
/obj/structure/rack{
dir = 1
@@ -73755,6 +72636,12 @@
icon_state = "caution"
},
/area/station/engineering/atmos/control)
+"oHb" = (
+/obj/structure/sign/poster/official/safety_internals{
+ pixel_x = 30
+ },
+/turf/simulated/floor/engine,
+/area/station/science/test_chamber)
"oHd" = (
/obj/effect/landmark/spawner/xeno,
/obj/machinery/atmospherics/pipe/simple/hidden/universal,
@@ -73771,6 +72658,18 @@
icon_state = "browncorner"
},
/area/station/supply/lobby)
+"oHv" = (
+/mob/living/simple_animal/hostile/retaliate/goat/chef,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 9
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "showroomfloor"
+ },
+/area/station/service/kitchen)
"oHy" = (
/obj/structure/chair,
/obj/effect/turf_decal/stripes/white/corner,
@@ -73783,21 +72682,6 @@
/obj/structure/sign/greencross,
/turf/simulated/wall,
/area/station/medical/reception)
-"oIa" = (
-/obj/structure/table,
-/obj/machinery/camera{
- c_tag = "Science Toxins Test";
- dir = 4;
- network = list("Research","SS13")
- },
-/obj/structure/disaster_counter/toxins{
- pixel_x = -32
- },
-/obj/effect/turf_decal/delivery/hollow,
-/turf/simulated/floor/plasteel{
- icon_state = "darkgrey"
- },
-/area/station/science/toxins/launch)
"oIb" = (
/obj/machinery/computer/drone_control{
dir = 1
@@ -73845,13 +72729,8 @@
/obj/machinery/atmospherics/pipe/simple/visible{
dir = 4
},
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/turf/simulated/floor/engine,
-/area/station/science/test_chamber)
+/area/station/science/xenobiology)
"oJQ" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on,
/turf/simulated/floor/plasteel,
@@ -73916,14 +72795,14 @@
/area/station/public/sleep)
"oMT" = (
/obj/machinery/disposal,
-/obj/structure/disposalpipe/trunk{
- dir = 8
- },
/obj/machinery/alarm{
dir = 1;
name = "south bump";
pixel_y = -24
},
+/obj/structure/disposalpipe/trunk{
+ dir = 1
+ },
/turf/simulated/floor/plasteel{
icon_state = "caution"
},
@@ -73939,19 +72818,12 @@
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
"oNl" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/unary/vent_pump/on,
/turf/simulated/floor/plasteel,
/area/station/science/robotics)
"oNn" = (
-/obj/structure/girder,
-/obj/effect/spawner/lootdrop{
- icon_state = "grille";
- loot = list(/obj/structure/grille=8,/obj/structure/grille/broken=2);
- name = "normal or broken grille spawner"
- },
+/obj/effect/spawner/random_barrier/obstruction,
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
/turf/simulated/floor/plating,
/area/station/maintenance/starboard2)
"oNo" = (
@@ -73980,15 +72852,18 @@
},
/turf/simulated/floor/plasteel,
/area/station/security/brig)
-"oNA" = (
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
+"oNz" = (
+/obj/machinery/atmospherics/unary/thermomachine/freezer/on{
+ dir = 1;
+ name = "euthanization chamber freezer"
},
-/obj/effect/landmark/start/botanist,
-/turf/simulated/floor/plasteel,
-/area/station/service/hydroponics)
+/turf/simulated/floor/bluespace,
+/area/station/maintenance/starboard)
+"oNA" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/spawner/random_spawners/cobweb_right_frequent,
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard2)
"oNZ" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 9
@@ -74084,13 +72959,15 @@
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
/obj/machinery/firealarm{
dir = 4;
name = "east bump";
pixel_x = 24
},
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -74110,6 +72987,17 @@
icon_state = "C13"
},
/area/station/hallway/primary/central)
+"oPh" = (
+/obj/machinery/atmospherics/pipe/simple/hidden{
+ dir = 4
+ },
+/obj/structure/rack,
+/obj/effect/spawner/lootdrop/maintenance,
+/turf/simulated/floor/plasteel{
+ dir = 9;
+ icon_state = "whitepurple"
+ },
+/area/station/maintenance/asmaint)
"oPi" = (
/obj/machinery/economy/atm{
pixel_x = -32
@@ -74141,6 +73029,17 @@
icon_state = "neutralcorner"
},
/area/station/public/dorms)
+"oQC" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/asmaint)
"oQE" = (
/obj/machinery/door/airlock/security/glass{
name = "Secure Equipment Storage"
@@ -74241,18 +73140,6 @@
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
/area/station/medical/virology)
-"oRQ" = (
-/obj/structure/table,
-/obj/effect/decal/cleanable/dirt,
-/obj/item/book/manual/wiki/sop_service,
-/obj/item/book/manual/barman_recipes{
- pixel_x = -4;
- pixel_y = 7
- },
-/turf/simulated/floor/plasteel{
- icon_state = "bar"
- },
-/area/station/service/bar)
"oRU" = (
/obj/structure/sign/double/map/right{
desc = "A framed picture of the station. Clockwise from security at the top (red), you see engineering (yellow), science (purple), escape (red and white), medbay (green), arrivals (blue and white), and finally cargo (brown).";
@@ -74295,6 +73182,18 @@
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
/area/station/hallway/secondary/entry)
+"oTq" = (
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/plasteel,
+/area/station/service/hydroponics)
"oTt" = (
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/catwalk,
@@ -74332,6 +73231,26 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/fpmaint)
+"oUb" = (
+/obj/machinery/atmospherics/pipe/simple/hidden{
+ dir = 5
+ },
+/obj/effect/landmark/spawner/xeno,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/maintenance/asmaint)
+"oUf" = (
+/obj/machinery/atmospherics/binary/valve{
+ dir = 1
+ },
+/obj/machinery/alarm{
+ dir = 4;
+ name = "west bump";
+ pixel_x = -24
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/asmaint)
"oUs" = (
/obj/machinery/light/small,
/turf/simulated/floor/engine,
@@ -74369,6 +73288,17 @@
name = "north bump";
pixel_y = 24
},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel{
icon_state = "darkgrey"
},
@@ -74439,6 +73369,14 @@
"oWt" = (
/obj/machinery/atmospherics/pipe/manifold/visible/purple,
/obj/machinery/atmospherics/meter,
+/obj/structure/disposalpipe/segment{
+ dir = 8;
+ icon_state = "pipe-c"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 8
+ },
/turf/simulated/floor/plasteel,
/area/station/engineering/atmos)
"oWE" = (
@@ -74538,6 +73476,10 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/aft)
+"oXK" = (
+/obj/effect/spawner/random_spawners/fungus_maybe,
+/turf/simulated/wall,
+/area/station/maintenance/starboard)
"oXS" = (
/obj/structure/chair/office/light{
dir = 4
@@ -74579,6 +73521,18 @@
/obj/effect/mapping_helpers/airlock/access/any/service/crematorium,
/turf/simulated/floor/plating,
/area/station/maintenance/aft)
+"pah" = (
+/obj/effect/turf_decal/woodsiding{
+ dir = 8
+ },
+/obj/structure/extinguisher_cabinet{
+ name = "south bump";
+ pixel_y = -30
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "bar"
+ },
+/area/station/service/bar)
"pat" = (
/obj/structure/table/wood,
/obj/machinery/computer/secure_data/laptop{
@@ -74626,12 +73580,10 @@
/turf/simulated/floor/plasteel,
/area/station/public/locker)
"pcb" = (
-/obj/structure/chair/stool{
- dir = 4
- },
/obj/effect/decal/cleanable/dirt,
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/plasteel,
+/obj/structure/rack,
+/obj/effect/spawner/lootdrop/maintenance,
+/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
"pcd" = (
/obj/structure/table/reinforced,
@@ -74645,18 +73597,6 @@
icon_state = "white"
},
/area/station/security/permabrig)
-"pcx" = (
-/obj/machinery/firealarm{
- name = "north bump";
- pixel_y = 24
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- icon_state = "whitepurple"
- },
-/area/station/science/research)
"pcy" = (
/obj/structure/table/wood,
/obj/item/book/manual/wiki/security_space_law,
@@ -74789,6 +73729,11 @@
},
/turf/simulated/floor/plating,
/area/station/medical/virology)
+"peg" = (
+/obj/effect/decal/cleanable/dirt,
+/mob/living/simple_animal/mouse,
+/turf/simulated/floor/plasteel,
+/area/station/maintenance/starboard2)
"pej" = (
/obj/structure/cable/yellow{
d1 = 1;
@@ -74836,30 +73781,13 @@
/obj/effect/mapping_helpers/airlock/access/any/engineering/atmos,
/turf/simulated/floor/engine,
/area/station/engineering/engine/supermatter)
-"pfh" = (
-/obj/machinery/navbeacon{
- codes_txt = "delivery";
- dir = 8;
- location = "Kitchen"
- },
-/obj/effect/turf_decal/delivery,
-/obj/structure/plasticflaps{
- opacity = 1
- },
-/obj/machinery/door/window/classic/normal{
- name = "Kitchen Delivery";
- dir = 4
- },
-/obj/effect/mapping_helpers/airlock/windoor/access/any/supply/mule_bot{
- dir = 4
- },
-/obj/effect/mapping_helpers/airlock/windoor/access/any/service/kitchen{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- icon_state = "showroomfloor"
- },
-/area/station/maintenance/starboard)
+"pfa" = (
+/obj/structure/table,
+/obj/item/storage/belt,
+/obj/item/robotanalyzer,
+/obj/effect/spawner/lootdrop/maintenance,
+/turf/simulated/floor/plasteel,
+/area/station/maintenance/starboard2)
"pfp" = (
/obj/machinery/atmospherics/binary/volume_pump/on{
name = "Waste In"
@@ -74874,6 +73802,13 @@
icon_state = "caution"
},
/area/station/engineering/atmos/distribution)
+"pfB" = (
+/obj/machinery/atmospherics/unary/portables_connector{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/plasteel,
+/area/station/science/toxins/mixing)
"pfH" = (
/obj/machinery/door/airlock/engineering/glass{
name = "Supermatter Engine Room"
@@ -74899,7 +73834,7 @@
/obj/item/toy/crayon/white{
pixel_y = -4
},
-/obj/item/implanter{
+/obj/item/bio_chip_implanter{
pixel_x = 5;
pixel_y = 12
},
@@ -74919,9 +73854,9 @@
/area/station/maintenance/fpmaint)
"pho" = (
/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
},
/turf/simulated/floor/plasteel{
icon_state = "white"
@@ -74960,17 +73895,29 @@
icon_state = "purple"
},
/area/station/engineering/atmos)
-"phQ" = (
-/obj/structure/cable/yellow,
-/obj/machinery/power/apc{
- name = "south bump";
- pixel_y = -24
+"phL" = (
+/obj/structure/table/reinforced,
+/obj/item/stack/cable_coil{
+ pixel_x = 3;
+ pixel_y = -3
+ },
+/obj/item/stack/cable_coil,
+/obj/item/analyzer{
+ pixel_x = -5;
+ pixel_y = 5
+ },
+/obj/item/taperecorder{
+ pixel_x = 5;
+ pixel_y = 5
+ },
+/obj/machinery/alarm{
+ name = "north bump";
+ pixel_y = 24
},
/turf/simulated/floor/plasteel{
- dir = 6;
- icon_state = "greenblue"
+ icon_state = "white"
},
-/area/station/service/hydroponics)
+/area/station/science/toxins/launch)
"pig" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
@@ -75004,6 +73951,24 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/port)
+"piX" = (
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/machinery/door/airlock/maintenance,
+/obj/effect/mapping_helpers/airlock/autoname,
+/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard2)
+"pjb" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/turf/simulated/floor/wood,
+/area/station/service/bar)
"pji" = (
/obj/structure/table/glass,
/obj/item/storage/box/monkeycubes{
@@ -75183,27 +74148,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel,
/area/station/security/brig)
-"poj" = (
-/obj/machinery/navbeacon{
- codes_txt = "delivery";
- location = "Research Division"
- },
-/obj/structure/plasticflaps{
- opacity = 1
- },
-/obj/effect/turf_decal/delivery/hollow,
-/obj/machinery/door/window/classic/reversed{
- dir = 1;
- name = "Research Division"
- },
-/obj/effect/mapping_helpers/airlock/windoor/access/any/supply/mule_bot{
- dir = 1
- },
-/obj/effect/mapping_helpers/airlock/windoor/access/any/science/research{
- dir = 1
- },
-/turf/simulated/floor/plasteel,
-/area/station/maintenance/starboard2)
"pos" = (
/obj/machinery/atmospherics/pipe/manifold/visible/green{
dir = 8
@@ -75271,6 +74215,12 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/fpmaint)
+"ppH" = (
+/obj/machinery/light/small{
+ dir = 1
+ },
+/turf/simulated/floor/plasteel,
+/area/station/maintenance/starboard2)
"pqg" = (
/obj/structure/cable/yellow{
d1 = 4;
@@ -75360,13 +74310,15 @@
},
/area/station/aisat)
"prI" = (
-/obj/item/radio/intercom{
- name = "east bump";
- pixel_x = 28
+/obj/structure/closet/crate/freezer,
+/obj/item/reagent_containers/food/snacks/meat,
+/obj/item/reagent_containers/food/snacks/meat,
+/obj/item/reagent_containers/food/snacks/meat,
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plasteel{
+ icon_state = "showroomfloor"
},
-/obj/machinery/atmospherics/unary/vent_pump/on,
-/turf/simulated/floor/wood,
-/area/station/service/theatre)
+/area/station/maintenance/starboard)
"pso" = (
/obj/structure/cable/yellow{
d1 = 1;
@@ -75435,12 +74387,11 @@
/area/station/medical/paramedic)
"ptm" = (
/obj/machinery/atmospherics/pipe/simple/visible/purple,
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel,
/area/station/engineering/atmos)
-"ptn" = (
-/obj/effect/landmark/spawner/nukedisc_respawn,
-/turf/simulated/floor/plating,
-/area/station/maintenance/starboard2)
"pts" = (
/obj/structure/cable/yellow{
d1 = 4;
@@ -75479,11 +74430,23 @@
},
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/exit)
+"pvb" = (
+/obj/structure/closet/emcloset,
+/obj/effect/spawner/lootdrop/maintenance,
+/turf/simulated/floor/plasteel,
+/area/station/maintenance/starboard2)
"pvo" = (
/obj/structure/cable/yellow,
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
/area/station/security/warden)
+"pvr" = (
+/obj/effect/mapping_helpers/airlock/access/all/service/hydroponics,
+/obj/machinery/door/airlock{
+ name = "Abandoned Hydroponics Backroom"
+ },
+/turf/simulated/floor/plasteel,
+/area/station/maintenance/starboard2)
"pvu" = (
/obj/structure/table/reinforced,
/obj/structure/window/reinforced{
@@ -75507,6 +74470,12 @@
},
/turf/simulated/floor/engine,
/area/station/engineering/control)
+"pwf" = (
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 1
+ },
+/turf/simulated/floor/plasteel,
+/area/station/science/toxins/mixing)
"pwg" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 8
@@ -75515,29 +74484,26 @@
icon_state = "white"
},
/area/station/medical/chemistry)
+"pwj" = (
+/obj/machinery/door/airlock/maintenance,
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard2)
"pwN" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
+/obj/structure/table,
+/obj/item/paper_bin{
+ pixel_x = -2;
+ pixel_y = 5
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
+/obj/item/pen{
+ pixel_x = -3;
+ pixel_y = 5
},
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
+/turf/simulated/floor/plasteel{
+ icon_state = "green"
},
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel,
/area/station/hallway/primary/central)
"pwP" = (
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/light/small{
dir = 8
},
@@ -75562,17 +74528,28 @@
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
"pxr" = (
-/obj/effect/turf_decal/stripes/white/line{
- dir = 1
- },
/obj/structure/disposalpipe/segment{
- dir = 1;
+ dir = 2;
icon_state = "pipe-c"
},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 10
+ },
+/obj/structure/cable/yellow{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 10
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
- icon_state = "darkgrey"
+ icon_state = "white"
},
-/area/station/science/toxins/launch)
+/area/station/science/storage)
"pxG" = (
/obj/structure/morgue,
/turf/simulated/floor/plasteel{
@@ -75600,17 +74577,80 @@
icon_state = "freezerfloor"
},
/area/station/public/toilet/lockerroom)
+"pyh" = (
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "whitepurple"
+ },
+/area/station/maintenance/asmaint)
+"pyC" = (
+/obj/structure/table/glass,
+/obj/item/stack/packageWrap,
+/obj/item/stack/packageWrap,
+/obj/item/stack/packageWrap,
+/obj/item/stack/packageWrap,
+/obj/item/stack/packageWrap,
+/obj/item/hand_labeler,
+/obj/item/book/manual/wiki/sop_service,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/item/radio/intercom{
+ name = "south bump";
+ pixel_y = -28
+ },
+/turf/simulated/floor/plasteel{
+ dir = 0;
+ icon_state = "green"
+ },
+/area/station/service/hydroponics)
"pyU" = (
-/obj/effect/spawner/lootdrop{
- icon_state = "grille";
- loot = list(/obj/structure/grille=8,/obj/structure/grille/broken=2);
- name = "normal or broken grille spawner"
+/obj/machinery/atmospherics/pipe/manifold/hidden/cyan{
+ dir = 4
+ },
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
},
-/turf/simulated/floor/plating,
/area/station/maintenance/asmaint)
+"pzw" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/power/apc{
+ name = "south bump";
+ pixel_y = -24
+ },
+/obj/structure/cable/yellow,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/science/xenobiology)
"pzC" = (
/obj/item/storage/belt/utility,
-/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
icon_state = "darkgrey"
},
@@ -75676,17 +74716,13 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+ dir = 4
},
-/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
-/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 4;
- icon_state = "1-4"
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 4
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/aft)
"pBl" = (
@@ -75726,10 +74762,26 @@
/area/station/hallway/primary/starboard)
"pBW" = (
/obj/item/wrench,
+/obj/structure/cable/yellow{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
+ },
/obj/structure/disposalpipe/segment{
- dir = 4
+ dir = 4;
+ icon_state = "pipe-c"
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+ dir = 1
+ },
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
},
-/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
icon_state = "darkgrey"
},
@@ -75778,16 +74830,37 @@
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
"pDA" = (
-/obj/machinery/atmospherics/unary/vent_pump/on,
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 10
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
/area/station/science/misc_lab)
-"pEF" = (
-/obj/machinery/atmospherics/binary/pump,
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel,
-/area/station/science/toxins/mixing)
+"pEN" = (
+/obj/structure/disposalpipe/sortjunction{
+ dir = 2;
+ icon_state = "pipe-j2s";
+ name = "RD Junction";
+ sort_type_txt = "13"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "whitepurple"
+ },
+/area/station/science/research)
"pEO" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable/yellow{
@@ -75846,12 +74919,6 @@
},
/area/station/medical/medbay)
"pFG" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
/obj/structure/disposalpipe/segment{
dir = 8;
icon_state = "pipe-c"
@@ -75885,6 +74952,21 @@
icon_state = "blackcorner"
},
/area/station/security/permabrig)
+"pGI" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 9
+ },
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 9
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard2)
"pGO" = (
/obj/machinery/light{
dir = 4
@@ -75907,17 +74989,6 @@
/obj/effect/spawner/lootdrop/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/fpmaint)
-"pGW" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/camera{
- c_tag = "Secure Lab - Test Chamber";
- dir = 1;
- network = list("TestChamber","SS13","Research")
- },
-/turf/simulated/floor/engine,
-/area/station/science/test_chamber)
"pHq" = (
/obj/structure/rack,
/obj/item/clothing/head/helmet/riot{
@@ -75948,22 +75019,21 @@
},
/area/station/security/armory/secure)
"pHB" = (
-/obj/structure/closet/crate/trashcart,
-/obj/effect/spawner/lootdrop{
- loot = list(/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes);
- name = "trash spawner"
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 1
},
-/obj/effect/spawner/lootdrop{
- loot = list(/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes);
- name = "trash spawner"
+/obj/machinery/atmospherics/pipe/manifold/hidden/cyan{
+ dir = 1
},
-/obj/effect/spawner/lootdrop{
- loot = list(/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes);
- name = "trash spawner"
+/obj/structure/cable/yellow{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
},
-/obj/effect/spawner/lootdrop{
- loot = list(/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes);
- name = "trash spawner"
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
},
/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
@@ -76048,6 +75118,13 @@
icon_state = "red"
},
/area/station/engineering/atmos)
+"pJt" = (
+/obj/machinery/door/airlock,
+/obj/effect/mapping_helpers/airlock/autoname,
+/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard)
"pJv" = (
/obj/effect/turf_decal/tile/blue{
dir = 8
@@ -76156,16 +75233,25 @@
/turf/simulated/floor/bluegrid,
/area/station/turret_protected/ai)
"pKM" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 8
},
/obj/structure/cable/yellow{
- d1 = 4;
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/structure/cable/yellow{
+ d1 = 1;
d2 = 8;
- icon_state = "4-8"
+ icon_state = "1-8"
},
-/turf/simulated/floor/plating,
-/area/station/maintenance/asmaint)
+/turf/simulated/floor/plasteel{
+ icon_state = "whitepurplecorner"
+ },
+/area/station/science/explab)
"pLD" = (
/obj/machinery/door_timer/cell_1{
pixel_x = -32
@@ -76176,11 +75262,10 @@
/turf/simulated/floor/plasteel,
/area/station/security/prison/cell_block/A)
"pLH" = (
-/obj/structure/closet/firecloset,
-/obj/machinery/light/small{
- dir = 4
- },
-/obj/effect/turf_decal/delivery/hollow,
+/obj/structure/rack,
+/obj/item/extinguisher,
+/obj/item/clothing/mask/gas,
+/obj/item/grenade/chem_grenade/firefighting,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -76205,19 +75290,19 @@
},
/area/station/medical/reception)
"pMx" = (
-/obj/effect/landmark/damageturf,
-/obj/effect/turf_decal/stripes/line{
- dir = 8
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 4
+ },
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
},
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint)
-"pMS" = (
-/obj/structure/table/glass,
-/obj/item/paper/crumpled,
-/turf/simulated/floor/plasteel{
- icon_state = "white"
- },
-/area/station/science/research)
"pMT" = (
/obj/effect/turf_decal/delivery,
/obj/machinery/door/firedoor,
@@ -76284,13 +75369,6 @@
icon_state = "red"
},
/area/station/security/prison/cell_block/A)
-"pOG" = (
-/obj/machinery/door/airlock/maintenance,
-/obj/structure/disposalpipe/segment,
-/obj/effect/mapping_helpers/airlock/autoname,
-/obj/effect/mapping_helpers/airlock/access/all/science/research,
-/turf/simulated/floor/plating,
-/area/station/maintenance/asmaint)
"pOV" = (
/obj/effect/spawner/window/reinforced/grilled,
/obj/machinery/door/poddoor/preopen{
@@ -76309,28 +75387,11 @@
/turf/simulated/floor/engine,
/area/station/science/xenobiology)
"pOW" = (
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 1
- },
-/obj/structure/cable/yellow{
- d1 = 2;
- d2 = 4;
- icon_state = "2-4"
- },
-/obj/effect/turf_decal/stripes/line,
-/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
- icon_state = "greenblue"
+ dir = 1;
+ icon_state = "bluecorner"
},
-/area/station/maintenance/starboard)
+/area/station/service/hydroponics)
"pPj" = (
/obj/structure/table,
/obj/item/hand_labeler{
@@ -76393,12 +75454,6 @@
icon_state = "red"
},
/area/station/security/prisonlockers)
-"pQd" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/plasteel{
- icon_state = "white"
- },
-/area/station/science/toxins/mixing)
"pQq" = (
/obj/machinery/door/airlock/hatch{
name = "Telecoms Server Room"
@@ -76415,7 +75470,15 @@
/turf/simulated/floor/plasteel/dark,
/area/station/telecomms/chamber)
"pQv" = (
-/obj/machinery/atmospherics/unary/vent_pump/on,
+/obj/machinery/power/apc{
+ dir = 1;
+ name = "north bump";
+ pixel_y = 24
+ },
+/obj/structure/cable/yellow{
+ d2 = 2;
+ icon_state = "0-2"
+ },
/turf/simulated/floor/plasteel{
icon_state = "cafeteria"
},
@@ -76434,12 +75497,6 @@
/obj/machinery/atmospherics/pipe/simple/visible/purple{
dir = 5
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
@@ -76461,9 +75518,6 @@
},
/area/station/engineering/atmos)
"pRL" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/camera{
c_tag = "Central Primary Hallway - Aft-Starboard Corner";
dir = 1
@@ -76507,22 +75561,6 @@
icon_state = "whiteblue"
},
/area/station/command/office/cmo)
-"pSz" = (
-/obj/structure/rack,
-/obj/structure/sign/poster/random{
- pixel_x = 32
- },
-/obj/item/hand_labeler,
-/obj/item/stack/packageWrap,
-/obj/item/stack/packageWrap,
-/obj/item/book/manual/wiki/sop_service,
-/obj/item/storage/box/donkpockets,
-/obj/effect/turf_decal/tile/bar,
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "whitecorner"
- },
-/area/station/service/kitchen)
"pSE" = (
/obj/machinery/firealarm{
dir = 8;
@@ -76573,6 +75611,12 @@
},
/turf/simulated/floor/carpet/red,
/area/station/command/office/hos)
+"pTk" = (
+/turf/simulated/floor/plasteel{
+ dir = 5;
+ icon_state = "whitepurple"
+ },
+/area/station/science/research)
"pTW" = (
/obj/structure/rack,
/obj/item/storage/box/beakers{
@@ -76652,12 +75696,15 @@
/turf/simulated/floor/engine,
/area/station/engineering/control)
"pUs" = (
-/obj/machinery/door/poddoor{
- id_tag = "ToxinsVenting";
- name = "Toxins Venting Bay Door";
- power_state = 0
+/obj/machinery/alarm{
+ dir = 1;
+ name = "south bump";
+ pixel_y = -24
},
-/turf/simulated/floor/engine/vacuum,
+/obj/machinery/atmospherics/unary/portables_connector{
+ dir = 8
+ },
+/turf/simulated/floor/plasteel,
/area/station/science/toxins/mixing)
"pUx" = (
/obj/machinery/door/airlock/maintenance,
@@ -76681,14 +75728,9 @@
/turf/simulated/floor/plating,
/area/station/maintenance/aft)
"pUF" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/tile/bar,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
+/obj/structure/disposalpipe/segment/corner,
/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "neutralcorner"
+ icon_state = "redcorner"
},
/area/station/hallway/primary/central)
"pUU" = (
@@ -76710,6 +75752,13 @@
},
/turf/simulated/floor/plasteel,
/area/station/engineering/atmos)
+"pVi" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 6
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard)
"pVO" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -76731,6 +75780,23 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plating,
/area/station/maintenance/medmaint)
+"pWa" = (
+/obj/machinery/door/airlock/maintenance,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 4
+ },
+/obj/effect/mapping_helpers/airlock/autoname,
+/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard)
"pWt" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -76799,10 +75865,18 @@
/area/station/supply/lobby)
"pXO" = (
/obj/item/stack/cable_coil,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 8
},
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "darkgrey"
},
@@ -76850,20 +75924,14 @@
},
/area/station/security/brig)
"pYx" = (
-/obj/structure/table,
-/obj/item/stack/sheet/metal{
- amount = 10
- },
-/obj/item/electropack,
/obj/machinery/firealarm{
dir = 4;
name = "east bump";
pixel_x = 24
},
/turf/simulated/floor/engine,
-/area/station/science/test_chamber)
+/area/station/science/xenobiology)
"pZe" = (
-/obj/effect/turf_decal/delivery/hollow,
/obj/machinery/atmospherics/portable/canister/oxygen,
/turf/simulated/floor/plasteel,
/area/station/engineering/atmos/control)
@@ -76941,6 +76009,21 @@
icon_state = "dark"
},
/area/station/turret_protected/ai_upload)
+"qaW" = (
+/obj/item/reagent_containers/food/snacks/monkeycube,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 4
+ },
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/plasteel,
+/area/station/maintenance/asmaint)
"qba" = (
/obj/structure/table/reinforced,
/obj/item/paper_bin/nanotrasen{
@@ -76958,13 +76041,7 @@
/turf/simulated/floor/carpet,
/area/station/legal/lawoffice)
"qbe" = (
-/obj/effect/turf_decal/stripes/white/line{
- dir = 10
- },
-/obj/machinery/atmospherics/unary/thermomachine/freezer,
-/obj/machinery/light{
- dir = 8
- },
+/obj/machinery/atmospherics/binary/pump,
/turf/simulated/floor/plasteel,
/area/station/science/toxins/mixing)
"qbf" = (
@@ -76979,21 +76056,12 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 8;
- icon_state = "1-8"
- },
-/obj/effect/turf_decal/tile/purple{
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 1
},
-/obj/effect/turf_decal/tile/purple,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/turf/simulated/floor/plasteel,
/area/station/science/research)
"qbE" = (
@@ -77048,16 +76116,26 @@
/turf/simulated/floor/plasteel,
/area/station/science/xenobiology)
"qcw" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
+/obj/machinery/door/airlock/research,
+/obj/machinery/door/firedoor,
+/obj/effect/mapping_helpers/airlock/autoname,
+/obj/effect/mapping_helpers/airlock/access/all/science/robotics,
/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
},
-/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
- icon_state = "white"
+ icon_state = "whitepurplefull"
},
/area/station/science/robotics)
"qcE" = (
@@ -77067,22 +76145,6 @@
},
/turf/simulated/floor/plating,
/area/station/public/construction)
-"qcH" = (
-/obj/structure/disposalpipe/junction{
- dir = 8;
- icon_state = "pipe-j2"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 6
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 6
- },
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "whitepurple"
- },
-/area/station/science/research)
"qcP" = (
/obj/structure/cable/yellow{
d2 = 2;
@@ -77121,6 +76183,30 @@
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel,
/area/station/security/prison/cell_block/A)
+"qdR" = (
+/obj/structure/table/reinforced,
+/obj/machinery/door/window/classic/reversed{
+ dir = 4
+ },
+/obj/effect/mapping_helpers/airlock/windoor/autoname/desk{
+ dir = 4
+ },
+/obj/item/folder{
+ pixel_x = 4;
+ pixel_y = -3
+ },
+/obj/machinery/door/firedoor,
+/obj/effect/mapping_helpers/airlock/windoor/access/all/service/hydroponics{
+ dir = 4
+ },
+/obj/structure/noticeboard{
+ dir = 1;
+ pixel_y = -32
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "greenfull"
+ },
+/area/station/service/hydroponics)
"qdT" = (
/obj/structure/cable/yellow{
d1 = 1;
@@ -77138,22 +76224,14 @@
/turf/space,
/area/space/nearstation)
"qei" = (
-/obj/machinery/shower{
- dir = 8
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 9
- },
-/obj/effect/turf_decal/siding{
- dir = 9
+/obj/machinery/light{
+ dir = 4
},
-/obj/machinery/firealarm{
- dir = 4;
- name = "east bump";
- pixel_x = 24
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+ dir = 8
},
/turf/simulated/floor/plasteel{
- icon_state = "darkgreycheck"
+ icon_state = "white"
},
/area/station/science/research)
"qeD" = (
@@ -77202,12 +76280,10 @@
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/starboard)
"qfa" = (
-/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance/two,
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/turf/simulated/floor/plating,
+/obj/structure/table,
+/obj/item/paper_bin,
+/obj/item/pen,
+/turf/simulated/floor/plasteel,
/area/station/maintenance/aft2)
"qfe" = (
/obj/machinery/door/window/classic/normal{
@@ -77221,6 +76297,18 @@
/obj/effect/mapping_helpers/airlock/windoor/access/all/science/xenobio,
/turf/simulated/floor/engine,
/area/station/science/xenobiology)
+"qfl" = (
+/obj/structure/extinguisher_cabinet{
+ name = "east bump";
+ pixel_x = 27
+ },
+/obj/machinery/atmospherics/binary/pump{
+ dir = 8;
+ layer = 3.3;
+ name = "Cooling loop return"
+ },
+/turf/simulated/floor/plasteel,
+/area/station/science/toxins/mixing)
"qfs" = (
/obj/structure/cable/yellow{
d1 = 1;
@@ -77235,6 +76323,15 @@
icon_state = "darkgrey"
},
/area/station/engineering/tech_storage)
+"qfy" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/science/xenobiology)
"qfR" = (
/obj/machinery/porta_turret/ai_turret,
/turf/simulated/floor/plasteel{
@@ -77274,17 +76371,6 @@
icon_state = "white"
},
/area/station/science/explab)
-"qgz" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel,
-/area/station/maintenance/starboard)
"qgH" = (
/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
dir = 4
@@ -77292,12 +76378,11 @@
/turf/simulated/wall/r_wall,
/area/station/engineering/atmos/control)
"qhd" = (
-/obj/machinery/door/airlock/maintenance,
-/obj/effect/mapping_helpers/airlock/access/all/service/theatre,
-/obj/effect/mapping_helpers/airlock/autoname,
/obj/effect/decal/cleanable/dirt,
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/wood,
+/obj/item/stack/sheet/metal{
+ amount = 5
+ },
+/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
"qid" = (
/obj/machinery/door/airlock/external{
@@ -77305,6 +76390,13 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
+"qig" = (
+/obj/machinery/mech_bay_recharge_port{
+ dir = 2
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard2)
"qiA" = (
/obj/structure/closet/crate/sci,
/obj/effect/spawner/lootdrop/maintenance,
@@ -77358,16 +76450,12 @@
},
/area/station/science/storage)
"qkK" = (
-/obj/effect/decal/cleanable/dirt,
/obj/machinery/door/airlock/public/glass,
/obj/machinery/door/firedoor,
/obj/effect/mapping_helpers/airlock/autoname,
/obj/effect/turf_decal/woodsiding{
dir = 4
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/turf/simulated/floor/plasteel{
icon_state = "bar"
},
@@ -77418,6 +76506,17 @@
icon_state = "brown"
},
/area/station/supply/office)
+"qlh" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "showroomfloor"
+ },
+/area/station/service/kitchen)
"qlu" = (
/obj/machinery/door/window/classic/normal{
name = "Containment Pen #3";
@@ -77430,6 +76529,15 @@
/area/station/science/xenobiology)
"qlx" = (
/obj/effect/turf_decal/stripes/line,
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 6
+ },
/turf/simulated/floor/plasteel,
/area/station/science/robotics)
"qlH" = (
@@ -77462,19 +76570,13 @@
/turf/simulated/floor/plasteel,
/area/station/maintenance/turbine)
"qlX" = (
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+ dir = 4
},
-/obj/machinery/door/airlock/maintenance,
-/obj/effect/mapping_helpers/airlock/autoname,
-/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
-/turf/simulated/floor/plating,
-/area/station/maintenance/asmaint)
+/turf/simulated/floor/plasteel{
+ icon_state = "whitepurplecorner"
+ },
+/area/station/science/explab)
"qma" = (
/obj/effect/turf_decal/stripes/corner,
/turf/simulated/floor/plasteel{
@@ -77506,6 +76608,9 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/port)
+"qmD" = (
+/turf/simulated/wall/r_wall,
+/area/station/science/explab/chamber)
"qmL" = (
/obj/machinery/alarm{
name = "north bump";
@@ -77553,6 +76658,10 @@
icon_state = "white"
},
/area/station/maintenance/aft)
+"qoK" = (
+/mob/living/simple_animal/mouse,
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard2)
"qoQ" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -77722,14 +76831,26 @@
dir = 1;
network = list("Research","SS13")
},
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
- dir = 8
+/obj/structure/disposalpipe/segment{
+ dir = 4
},
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "whitepurple"
},
/area/station/science/research)
+"qth" = (
+/obj/machinery/hologram/holopad,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/science/rnd)
"qto" = (
/obj/machinery/atmospherics/unary/portables_connector,
/obj/machinery/camera{
@@ -77740,15 +76861,6 @@
icon_state = "dark"
},
/area/station/engineering/control)
-"qtr" = (
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
- },
-/turf/simulated/floor/plasteel{
- icon_state = "white"
- },
-/area/station/science/explab)
"qtt" = (
/obj/structure/window/reinforced{
dir = 1
@@ -77818,6 +76930,12 @@
},
/turf/simulated/floor/carpet/red,
/area/station/command/office/hos)
+"quz" = (
+/obj/machinery/atmospherics/trinary/mixer{
+ dir = 1
+ },
+/turf/simulated/floor/plasteel,
+/area/station/science/toxins/mixing)
"quL" = (
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
@@ -77827,13 +76945,6 @@
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
/area/station/maintenance/starboardsolar)
-"quW" = (
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
- dir = 1
- },
-/turf/simulated/floor/wood,
-/area/station/service/bar)
"quY" = (
/obj/structure/cable/yellow{
d1 = 2;
@@ -77965,13 +77076,30 @@
/turf/simulated/floor/plasteel,
/area/station/security/range)
"qxo" = (
-/obj/effect/spawner/lootdrop{
- icon_state = "grille";
- loot = list(/obj/structure/grille=8,/obj/structure/grille/broken=2);
- name = "normal or broken grille spawner"
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
},
/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
+"qxW" = (
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/machinery/light,
+/obj/structure/table,
+/obj/item/storage/toolbox/mechanical,
+/turf/simulated/floor/plasteel{
+ icon_state = "whitepurple"
+ },
+/area/station/science/rnd)
"qxZ" = (
/obj/structure/cable/yellow{
d2 = 2;
@@ -77994,17 +77122,29 @@
/turf/simulated/floor/plating,
/area/station/hallway/secondary/bridge)
"qyo" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on,
/obj/effect/turf_decal/stripes/line{
dir = 8
},
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
/area/station/science/xenobiology)
+"qyp" = (
+/obj/structure/reagent_dispensers/watertank,
+/obj/effect/spawner/random_spawners/cobweb_right_frequent,
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard2)
+"qyw" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/purple{
+ dir = 4
+ },
+/turf/simulated/floor/engine,
+/area/station/science/test_chamber)
"qyA" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/cable/yellow{
d1 = 2;
d2 = 4;
@@ -78018,6 +77158,7 @@
d2 = 2;
icon_state = "1-2"
},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -78033,6 +77174,29 @@
/obj/effect/spawner/random_spawners/grille_maybe,
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
+"qyW" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/aft2)
+"qzT" = (
+/obj/structure/closet/secure_closet/hydroponics,
+/obj/effect/spawner/lootdrop/maintenance/two,
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard2)
"qAb" = (
/obj/machinery/camera{
c_tag = "Brig - Hallway - Port";
@@ -78110,6 +77274,18 @@
icon_state = "whiteblue"
},
/area/station/medical/surgery/secondary)
+"qBO" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 9
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/cyan,
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/aft2)
"qBP" = (
/obj/structure/cable/yellow{
d1 = 1;
@@ -78178,6 +77354,12 @@
},
/turf/simulated/floor/plating,
/area/station/medical/virology)
+"qEh" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/maintenance/asmaint)
"qEm" = (
/obj/machinery/camera{
c_tag = "Command Hallway - Port";
@@ -78218,11 +77400,30 @@
/turf/simulated/floor/plasteel,
/area/station/security/range)
"qFl" = (
-/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 8;
+ icon_state = "pipe-c"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 9
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 9
+ },
/turf/simulated/floor/plasteel{
icon_state = "darkgrey"
},
/area/station/science/robotics)
+"qFs" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/floor/wood,
+/area/station/service/bar)
"qFz" = (
/obj/item/kirbyplants,
/turf/simulated/floor/wood,
@@ -78245,6 +77446,12 @@
/obj/effect/mapping_helpers/airlock/access/all/security/brig,
/turf/simulated/floor/plating,
/area/station/maintenance/fpmaint)
+"qGI" = (
+/turf/simulated/floor/plasteel{
+ dir = 10;
+ icon_state = "greenblue"
+ },
+/area/station/service/hydroponics)
"qIg" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 1
@@ -78260,7 +77467,7 @@
pixel_y = 25
},
/turf/simulated/floor/engine,
-/area/station/science/test_chamber)
+/area/station/science/xenobiology)
"qIk" = (
/obj/structure/window/reinforced,
/obj/machinery/door/firedoor,
@@ -78277,6 +77484,17 @@
icon_state = "dark"
},
/area/station/security/permabrig)
+"qIZ" = (
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 1
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "darkgrey"
+ },
+/area/station/science/toxins/launch)
"qJz" = (
/turf/simulated/floor/plasteel{
dir = 4;
@@ -78314,14 +77532,17 @@
/turf/simulated/floor/engine,
/area/station/engineering/control)
"qKA" = (
-/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 9
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 9
+ },
/obj/structure/cable/yellow{
d1 = 1;
- d2 = 2;
- icon_state = "1-2"
+ d2 = 8;
+ icon_state = "1-8"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
"qKE" = (
@@ -78336,6 +77557,10 @@
icon_state = "dark"
},
/area/station/security/armory)
+"qKY" = (
+/obj/effect/spawner/random_spawners/cobweb_left_rare,
+/turf/simulated/floor/plating,
+/area/station/maintenance/aft2)
"qLe" = (
/obj/structure/disposalpipe/segment{
dir = 1;
@@ -78375,6 +77600,14 @@
icon_state = "neutralcorner"
},
/area/station/hallway/primary/aft)
+"qLK" = (
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "cafeteria"
+ },
+/area/station/science/break_room)
"qLW" = (
/obj/machinery/door/window/classic/normal{
name = "Danger: Conveyor Access";
@@ -78423,29 +77656,6 @@
},
/turf/simulated/floor/plasteel,
/area/station/science/xenobiology)
-"qNa" = (
-/obj/structure/cable/yellow{
- d1 = 2;
- d2 = 4;
- icon_state = "2-4"
- },
-/obj/effect/spawner/lootdrop{
- loot = list(/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes);
- name = "trash spawner"
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 8
- },
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/turf/simulated/floor/plating,
-/area/station/maintenance/starboard2)
"qNJ" = (
/obj/machinery/atmospherics/pipe/manifold/visible/blue{
dir = 1
@@ -78648,6 +77858,13 @@
/obj/effect/spawner/random_spawners/oil_maybe,
/turf/simulated/floor/plasteel,
/area/station/maintenance/fore)
+"qRq" = (
+/obj/structure/chair/stool,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/turf/simulated/floor/wood,
+/area/station/service/bar)
"qRI" = (
/obj/structure/sign/atmosplaque{
pixel_x = -32
@@ -78745,6 +77962,12 @@
icon_state = "whitepurple"
},
/area/station/science/research)
+"qTJ" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plasteel{
+ icon_state = "whitepurplecorner"
+ },
+/area/station/maintenance/asmaint)
"qTK" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -78757,6 +77980,10 @@
},
/turf/simulated/floor/plasteel,
/area/station/public/dorms)
+"qUq" = (
+/mob/living/simple_animal/chicken/clucky,
+/turf/simulated/floor/grass,
+/area/station/service/hydroponics)
"qUA" = (
/obj/machinery/door/poddoor/shutters/radiation/preopen{
dir = 2;
@@ -78771,6 +77998,18 @@
/obj/item/crowbar,
/turf/simulated/floor/plating,
/area/station/engineering/engine/supermatter)
+"qUY" = (
+/obj/machinery/firealarm{
+ dir = 8;
+ name = "west bump";
+ pixel_x = -24
+ },
+/obj/structure/disposalpipe/segment,
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "whitepurple"
+ },
+/area/station/science/research)
"qVi" = (
/obj/structure/cable/yellow{
d2 = 4;
@@ -78854,6 +78093,14 @@
},
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/central)
+"qXr" = (
+/obj/structure/window/reinforced{
+ dir = 4
+ },
+/obj/structure/flora/ausbushes/fernybush,
+/obj/structure/flora/ausbushes/ppflowers,
+/turf/simulated/floor/grass/no_creep,
+/area/station/science/research)
"qXK" = (
/obj/machinery/atmospherics/pipe/simple/visible/yellow,
/turf/simulated/floor/plasteel{
@@ -78861,19 +78108,16 @@
},
/area/station/engineering/atmos)
"qXW" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 5
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 5
+/obj/machinery/light{
+ dir = 4
},
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 4;
- icon_state = "1-4"
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "greenblue"
},
-/turf/simulated/floor/plasteel,
-/area/station/maintenance/starboard)
+/area/station/service/hydroponics)
"qXY" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
@@ -78909,11 +78153,15 @@
dir = 8
},
/obj/machinery/light/small,
-/obj/effect/turf_decal/delivery/hollow,
/turf/simulated/floor/plasteel{
icon_state = "purple"
},
/area/station/science/xenobiology)
+"qYT" = (
+/obj/machinery/computer,
+/obj/effect/spawner/random_spawners/cobweb_right_rare,
+/turf/simulated/floor/bluespace,
+/area/station/maintenance/starboard)
"qZg" = (
/obj/item/seeds/chili,
/obj/item/seeds/chili,
@@ -78931,6 +78179,16 @@
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/grass/no_creep,
/area/station/security/permabrig)
+"qZv" = (
+/obj/machinery/disposal,
+/obj/effect/turf_decal/stripes/line{
+ dir = 9
+ },
+/obj/structure/disposalpipe/trunk{
+ dir = 8
+ },
+/turf/simulated/floor/plasteel,
+/area/station/service/hydroponics)
"qZz" = (
/obj/machinery/door/airlock/external{
id_tag = "aiaccess_door_int";
@@ -79015,6 +78273,18 @@
icon_state = "caution"
},
/area/station/engineering/atmos/control)
+"rar" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 10
+ },
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/asmaint)
"raV" = (
/obj/structure/cable/yellow{
d1 = 1;
@@ -79048,7 +78318,7 @@
/obj/item/candle{
pixel_x = -5
},
-/obj/item/storage/box/matches{
+/obj/item/storage/fancy/matches{
pixel_x = 1;
pixel_y = -1
},
@@ -79113,22 +78383,6 @@
icon_state = "dark"
},
/area/station/engineering/control)
-"rbN" = (
-/obj/machinery/door/airlock/maintenance,
-/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/turf/simulated/floor/plating,
-/area/station/maintenance/starboard)
"rbR" = (
/obj/effect/turf_decal/stripes/line{
dir = 5
@@ -79136,6 +78390,11 @@
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel,
/area/station/maintenance/fsmaint)
+"rbS" = (
+/obj/machinery/mecha_part_fabricator,
+/obj/effect/spawner/random_spawners/cobweb_left_rare,
+/turf/simulated/floor/plasteel,
+/area/station/maintenance/starboard2)
"rbU" = (
/obj/effect/landmark/burnturf,
/obj/machinery/light/small{
@@ -79156,11 +78415,12 @@
/turf/space,
/area/space/nearstation)
"rcY" = (
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
+/obj/machinery/firealarm{
+ dir = 1;
+ name = "south bump";
+ pixel_y = -24
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/simulated/floor/plasteel{
@@ -79188,20 +78448,6 @@
/obj/effect/decal/cleanable/cobweb2,
/turf/simulated/floor/plating,
/area/station/maintenance/aft)
-"rdk" = (
-/obj/structure/table/reinforced,
-/obj/machinery/door/window/classic/normal{
- name = "Abandoned Desk";
- dir = 4
- },
-/obj/machinery/door/poddoor/shutters{
- dir = 8;
- name = "Abandoned Shutter"
- },
-/turf/simulated/floor/plasteel{
- icon_state = "purplefull"
- },
-/area/station/maintenance/aft2)
"rdw" = (
/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
dir = 4
@@ -79236,16 +78482,6 @@
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
/area/station/medical/virology)
-"rfg" = (
-/obj/structure/rack,
-/obj/item/clothing/mask/gas,
-/obj/item/storage/box/lights/mixed,
-/obj/item/reagent_containers/food/drinks/shaker,
-/obj/item/cultivator,
-/obj/item/clothing/head/chefhat,
-/obj/effect/spawner/lootdrop/maintenance,
-/turf/simulated/floor/plasteel,
-/area/station/maintenance/starboard)
"rfn" = (
/obj/machinery/door/airlock/maintenance,
/obj/structure/disposalpipe/segment{
@@ -79270,6 +78506,20 @@
icon_state = "cafeteria"
},
/area/station/science/break_room)
+"rfK" = (
+/obj/machinery/atmospherics/pipe/simple/insulated{
+ dir = 4
+ },
+/obj/effect/spawner/random_spawners/wall_rusted_probably,
+/turf/simulated/wall/r_wall,
+/area/station/science/toxins/mixing)
+"rgo" = (
+/obj/machinery/hydroponics/soil,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 5
+ },
+/turf/simulated/floor/grass,
+/area/station/service/hydroponics)
"rgp" = (
/obj/machinery/light,
/obj/machinery/alarm{
@@ -79326,15 +78576,16 @@
},
/area/station/security/brig)
"rhw" = (
-/obj/structure/mirror{
- pixel_y = -34
+/obj/effect/landmark/start/chef,
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
},
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/sink{
- pixel_y = 17
+/turf/simulated/floor/plasteel{
+ icon_state = "cafeteria"
},
-/turf/simulated/floor/wood,
-/area/station/service/bar)
+/area/station/service/kitchen)
"rhH" = (
/obj/structure/window/reinforced{
dir = 8
@@ -79355,22 +78606,21 @@
icon_state = "whiteblue"
},
/area/station/medical/storage)
-"riF" = (
-/obj/machinery/light,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
+"rik" = (
+/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
+ dir = 5
},
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "whitepurple"
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
},
-/area/station/science/research)
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 5
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard2)
"riM" = (
/obj/structure/cable/yellow{
d1 = 4;
@@ -79404,18 +78654,14 @@
/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
/area/station/science/server/coldroom)
-"rjj" = (
-/obj/machinery/door/poddoor/shutters{
- dir = 8;
- id_tag = "toxinaccess"
- },
-/obj/machinery/door/firedoor/heavy{
- opacity = 0
+"rja" = (
+/obj/structure/chair/comfy/brown{
+ dir = 8
},
/turf/simulated/floor/plasteel{
- icon_state = "white"
+ icon_state = "cult"
},
-/area/station/science/storage)
+/area/station/maintenance/starboard)
"rjA" = (
/obj/structure/extinguisher_cabinet{
name = "north bump";
@@ -79513,17 +78759,28 @@
},
/area/station/security/permabrig)
"rlH" = (
-/obj/machinery/light/small{
- dir = 1
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+ dir = 8
},
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/sign/securearea{
- pixel_x = 32
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 8
+ },
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
- icon_state = "white"
+ dir = 1;
+ icon_state = "whitepurplecorner"
},
-/area/station/science/toxins/mixing)
+/area/station/science/explab)
"rlJ" = (
/obj/machinery/atmospherics/pipe/manifold/visible/cyan,
/obj/machinery/light,
@@ -79573,20 +78830,11 @@
icon_state = "yellow"
},
/area/station/hallway/primary/aft)
-"rnT" = (
-/obj/structure/cable/yellow{
- d2 = 2;
- icon_state = "0-2"
- },
-/obj/machinery/power/apc{
- dir = 1;
- name = "north bump";
- pixel_y = 24
- },
-/turf/simulated/floor/plasteel{
- icon_state = "white"
- },
-/area/station/science/explab)
+"rnM" = (
+/obj/effect/turf_decal/delivery/white/hollow,
+/obj/item/mecha_parts/mecha_equipment/extinguisher,
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard2)
"rnY" = (
/obj/machinery/door/airlock/external{
id_tag = "admin_home";
@@ -79666,19 +78914,22 @@
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
"rpG" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 4
+ },
/obj/structure/cable/yellow{
- d1 = 1;
+ d1 = 4;
d2 = 8;
- icon_state = "1-8"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 9
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 9
+ dir = 4
},
-/turf/simulated/floor/plating,
-/area/station/maintenance/aft2)
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plasteel{
+ icon_state = "darkgrey"
+ },
+/area/station/science/toxins/mixing)
"rqj" = (
/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
@@ -79817,6 +79068,15 @@
icon_state = "darkgrey"
},
/area/station/aisat)
+"rsI" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "showroomfloor"
+ },
+/area/station/maintenance/starboard)
"rsQ" = (
/obj/effect/turf_decal/stripes/corner{
dir = 8
@@ -79877,8 +79137,17 @@
},
/area/station/medical/medbay)
"rtk" = (
-/obj/effect/landmark/damageturf,
-/turf/simulated/floor/plating,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "whitehall"
+ },
/area/station/maintenance/aft2)
"rtq" = (
/obj/effect/turf_decal/stripes/line{
@@ -79889,21 +79158,45 @@
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/station/maintenance/medmaint)
+"rtF" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "greenblue"
+ },
+/area/station/service/hydroponics)
"rtY" = (
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/carpet,
/area/station/command/office/captain/bedroom)
"ruj" = (
-/obj/effect/turf_decal/stripes/white/line,
-/obj/effect/turf_decal/delivery/white/hollow,
-/obj/machinery/atmospherics/portable/pump,
-/obj/machinery/light{
- dir = 1
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
},
-/turf/simulated/floor/plasteel{
- icon_state = "darkgrey"
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
},
-/area/station/science/storage)
+/obj/effect/landmark/start/scientist,
+/turf/simulated/floor/engine,
+/area/station/science/explab/chamber)
+"ruo" = (
+/obj/structure/rack,
+/obj/item/stack/cable_coil/random,
+/obj/effect/spawner/lootdrop/maintenance,
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard2)
"ruH" = (
/obj/item/radio/intercom/department/security{
pixel_x = 28
@@ -79914,13 +79207,6 @@
icon_state = "darkblue"
},
/area/station/security/armory)
-"ruY" = (
-/obj/machinery/light/small{
- dir = 4
- },
-/mob/living/simple_animal/mouse,
-/turf/simulated/floor/plating,
-/area/station/maintenance/starboard2)
"ruZ" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/door/firedoor,
@@ -79944,15 +79230,25 @@
/turf/simulated/floor/plating,
/area/station/maintenance/port)
"rvF" = (
-/obj/machinery/door/airlock/maintenance,
-/obj/effect/mapping_helpers/airlock/autoname,
-/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
+/obj/machinery/navbeacon{
+ codes_txt = "delivery";
+ dir = 1;
+ location = "Bar"
},
-/turf/simulated/floor/plating,
+/obj/machinery/door/window/classic/reversed{
+ dir = 4;
+ name = "Bar Delivery"
+ },
+/obj/effect/mapping_helpers/airlock/windoor/access/any/supply/mule_bot{
+ dir = 4
+ },
+/obj/effect/mapping_helpers/airlock/windoor/access/any/service/bar{
+ dir = 4
+ },
+/obj/structure/plasticflaps{
+ opacity = 1
+ },
+/turf/simulated/floor/plasteel,
/area/station/maintenance/starboard)
"rwh" = (
/obj/machinery/atmospherics/supermatter_crystal/engine,
@@ -79998,24 +79294,6 @@
},
/turf/space,
/area/space/nearstation)
-"rwT" = (
-/obj/effect/spawner/lootdrop{
- loot = list(/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes);
- name = "trash spawner"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/turf/simulated/floor/plating,
-/area/station/maintenance/starboard2)
"rxj" = (
/obj/structure/extinguisher_cabinet{
name = "north bump";
@@ -80028,12 +79306,18 @@
},
/area/station/security/armory)
"rxB" = (
-/obj/effect/decal/cleanable/insectguts,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 8
+ },
+/obj/machinery/atmospherics/portable/canister/carbon_dioxide,
+/obj/structure/window/reinforced{
+ dir = 8
+ },
+/obj/effect/turf_decal/delivery/green/hollow,
/turf/simulated/floor/plasteel{
- icon_state = "white"
+ icon_state = "darkgrey"
},
-/area/station/science/toxins/launch)
+/area/station/science/storage)
"rxV" = (
/obj/structure/table/reinforced,
/obj/effect/spawner/lootdrop{
@@ -80110,10 +79394,6 @@
icon_state = "white"
},
/area/station/medical/medbay)
-"ryN" = (
-/obj/structure/closet/cardboard,
-/turf/simulated/floor/plating,
-/area/station/maintenance/starboard)
"ryV" = (
/obj/machinery/atmospherics/binary/pump{
dir = 0;
@@ -80156,6 +79436,11 @@
icon_state = "whitegreen"
},
/area/station/medical/virology)
+"rzS" = (
+/obj/structure/chair/sofa/right,
+/obj/item/clothing/mask/cigarette/rollie,
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard2)
"rzT" = (
/obj/structure/window/reinforced,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -80190,28 +79475,15 @@
/turf/simulated/floor/plasteel/dark,
/area/station/service/cafeteria)
"rAm" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 5
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 5
- },
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 4;
- icon_state = "1-4"
- },
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
+/obj/structure/disposalpipe/segment{
+ dir = 4;
+ icon_state = "pipe-c"
},
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "whitepurplecorner"
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 4
},
-/area/station/science/explab)
+/turf/simulated/floor/plasteel,
+/area/station/maintenance/starboard2)
"rAp" = (
/obj/machinery/atmospherics/pipe/manifold/visible/cyan{
dir = 8;
@@ -80226,6 +79498,9 @@
pixel_x = 27
},
/obj/machinery/atmospherics/pipe/simple/visible/purple,
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel,
/area/station/engineering/atmos)
"rBn" = (
@@ -80280,6 +79555,21 @@
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/station/maintenance/fpmaint)
+"rCD" = (
+/obj/effect/spawner/random_spawners/grille_maybe,
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard)
+"rDd" = (
+/obj/effect/turf_decal/woodsiding{
+ dir = 8
+ },
+/obj/structure/chair/stool/bar{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "bar"
+ },
+/area/station/service/bar)
"rDe" = (
/obj/structure/sign/pods{
pixel_y = 32
@@ -80288,10 +79578,22 @@
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
"rDg" = (
-/obj/machinery/light/small{
- dir = 8
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/disposalpipe/segment{
+ dir = 4
},
-/turf/simulated/floor/plating,
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel,
/area/station/maintenance/aft2)
"rDy" = (
/obj/docking_port/stationary{
@@ -80304,25 +79606,6 @@
},
/turf/space,
/area/space)
-"rDW" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/turf/simulated/floor/plasteel{
- icon_state = "neutralcorner"
- },
-/area/station/hallway/primary/aft)
"rEa" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
@@ -80384,13 +79667,11 @@
/turf/simulated/floor/plasteel,
/area/station/security/permabrig)
"rEV" = (
-/obj/effect/turf_decal/tile/bar,
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 1
},
/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "neutralcorner"
+ icon_state = "redcorner"
},
/area/station/hallway/primary/starboard)
"rFa" = (
@@ -80408,16 +79689,16 @@
/turf/simulated/floor/plating,
/area/station/engineering/secure_storage)
"rFe" = (
-/obj/structure/cable/yellow{
- d1 = 2;
- d2 = 8;
- icon_state = "2-8"
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 10
+ dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 10
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
dir = 1;
@@ -80518,20 +79799,14 @@
/obj/item/clothing/glasses/meson,
/turf/simulated/floor/plasteel,
/area/station/engineering/control)
-"rHb" = (
-/obj/machinery/economy/vending/cigarette,
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel,
-/area/station/maintenance/starboard)
"rHl" = (
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
-/obj/effect/turf_decal/tile/purple,
-/obj/effect/turf_decal/tile/purple{
- dir = 1
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 9
},
/turf/simulated/floor/plasteel,
/area/station/science/research)
@@ -80650,6 +79925,17 @@
icon_state = "white"
},
/area/station/medical/exam_room)
+"rJn" = (
+/obj/structure/table/glass,
+/obj/item/cultivator,
+/obj/item/crowbar,
+/obj/item/plant_analyzer,
+/obj/item/reagent_containers/glass/bucket,
+/turf/simulated/floor/plasteel{
+ dir = 5;
+ icon_state = "green"
+ },
+/area/station/hallway/primary/central)
"rJJ" = (
/obj/machinery/door/airlock/titanium{
name = "Arrivals Shuttle Airlock"
@@ -80705,37 +79991,10 @@
icon_state = "whitebluecorner"
},
/area/station/medical/medbay)
-"rKM" = (
-/obj/structure/table/wood,
-/obj/machinery/light/small{
- dir = 1
- },
-/obj/structure/sign/poster/random{
- pixel_y = 32
- },
-/obj/item/staff/broom,
-/obj/item/wrench,
-/obj/machinery/alarm{
- dir = 8;
- name = "east bump";
- pixel_x = 24
- },
-/turf/simulated/floor/wood,
-/area/station/service/theatre)
-"rLo" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/turf/simulated/floor/carpet,
-/area/station/service/theatre)
+"rKH" = (
+/obj/structure/reagent_dispensers/watertank,
+/turf/simulated/floor/plating,
+/area/station/maintenance/aft2)
"rLw" = (
/obj/machinery/atmospherics/air_sensor{
autolink_id = "waste_sensor";
@@ -80853,6 +80112,20 @@
icon_state = "black"
},
/area/station/security/permabrig)
+"rOc" = (
+/obj/structure/table,
+/obj/machinery/camera{
+ c_tag = "Science Toxins Test";
+ dir = 4;
+ network = list("Research","SS13")
+ },
+/obj/structure/disaster_counter/toxins{
+ pixel_x = -32
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "darkgrey"
+ },
+/area/station/science/toxins/launch)
"rOi" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -80901,8 +80174,7 @@
dir = 8
},
/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "neutralcorner"
+ icon_state = "redcorner"
},
/area/station/hallway/primary/central)
"rOY" = (
@@ -80933,6 +80205,23 @@
},
/turf/simulated/floor/wood,
/area/station/service/clown)
+"rPx" = (
+/obj/machinery/door/airlock/maintenance,
+/obj/effect/mapping_helpers/airlock/autoname,
+/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 4
+ },
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/asmaint)
"rPB" = (
/obj/structure/cable/yellow{
d2 = 2;
@@ -80953,6 +80242,13 @@
},
/turf/simulated/floor/engine,
/area/station/science/xenobiology)
+"rRg" = (
+/obj/structure/closet,
+/obj/effect/spawner/lootdrop/maintenance/three,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/maintenance/asmaint)
"rRp" = (
/obj/structure/closet/secure_closet/brig,
/turf/simulated/floor/plasteel{
@@ -80968,6 +80264,22 @@
},
/turf/simulated/floor/plasteel,
/area/station/science/robotics/chargebay)
+"rSH" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 10
+ },
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/science/robotics)
"rSR" = (
/obj/structure/cable/yellow{
d1 = 1;
@@ -81060,7 +80372,6 @@
/turf/simulated/floor/carpet,
/area/station/service/chapel)
"rUK" = (
-/obj/effect/turf_decal/delivery/hollow,
/obj/machinery/atmospherics/portable/canister/sleeping_agent,
/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
dir = 4
@@ -81088,9 +80399,15 @@
/obj/machinery/atmospherics/unary/vent_pump/on,
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/central)
-"rVv" = (
-/obj/effect/landmark/damageturf,
-/obj/structure/reagent_dispensers/fueltank,
+"rVg" = (
+/obj/item/assembly/signaler{
+ pixel_x = 6;
+ pixel_y = 5
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 4
+ },
/turf/simulated/floor/plating,
/area/station/maintenance/aft2)
"rVy" = (
@@ -81117,6 +80434,17 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/fpmaint)
+"rWk" = (
+/obj/machinery/door_control{
+ id = "roboticsprivacy2";
+ name = "Robotics Shutters";
+ pixel_x = 24;
+ req_access_txt = "29"
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "darkgrey"
+ },
+/area/station/science/robotics)
"rWn" = (
/obj/machinery/door/airlock/maintenance,
/obj/effect/mapping_helpers/airlock/autoname,
@@ -81165,17 +80493,18 @@
},
/area/station/medical/reception)
"rXk" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 4;
- icon_state = "1-4"
+/obj/machinery/light_switch{
+ dir = 1;
+ name = "south bump";
+ pixel_y = -24
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "greenblue"
},
-/turf/simulated/floor/plasteel,
/area/station/service/hydroponics)
"rXS" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel{
icon_state = "cafeteria"
},
@@ -81213,11 +80542,6 @@
},
/area/station/hallway/primary/central)
"rZt" = (
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
/obj/effect/turf_decal/stripes/corner{
dir = 4
},
@@ -81337,20 +80661,23 @@
icon_state = "darkgrey"
},
/area/station/security/armory/secure)
+"sbZ" = (
+/obj/machinery/atmospherics/binary/valve/open{
+ dir = 4
+ },
+/obj/machinery/light,
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard2)
"scF" = (
/obj/effect/turf_decal/caution/stand_clear{
dir = 1
},
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
- },
/obj/machinery/door/poddoor/preopen{
id_tag = "atmos";
name = "Atmospherics Blast Door"
},
/turf/simulated/floor/plasteel{
- dir = 10;
- icon_state = "caution"
+ icon_state = "cautionfull"
},
/area/station/engineering/atmos/control)
"scP" = (
@@ -81362,31 +80689,31 @@
/turf/simulated/wall/r_wall,
/area/station/public/mrchangs)
"sdj" = (
-/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/britcup,
-/obj/effect/turf_decal/tile/purple{
- dir = 1
+/obj/structure/disposalpipe/segment{
+ dir = 2;
+ icon_state = "pipe-c"
},
-/obj/effect/turf_decal/tile/purple,
-/obj/structure/extinguisher_cabinet{
- name = "south bump";
- pixel_y = -30
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel,
/area/station/science/research)
-"sdq" = (
-/obj/structure/table,
-/obj/item/clothing/gloves/color/latex,
-/obj/item/clothing/glasses/science,
-/obj/item/radio/intercom{
- name = "east bump";
- pixel_x = 28
+"sdJ" = (
+/obj/machinery/door/airlock/freezer,
+/obj/effect/mapping_helpers/airlock/access/all/service/kitchen,
+/obj/machinery/door/firedoor,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
},
-/obj/effect/turf_decal/delivery/hollow,
/turf/simulated/floor/plasteel{
- icon_state = "darkgrey"
+ icon_state = "cafeteria"
},
-/area/station/science/toxins/launch)
+/area/station/service/kitchen)
"sdO" = (
/obj/machinery/disposal,
/obj/machinery/status_display{
@@ -81421,17 +80748,25 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
+"sfc" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard2)
"sfg" = (
/obj/machinery/light{
dir = 8
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
/obj/structure/extinguisher_cabinet{
name = "west bump";
pixel_x = -27
@@ -81451,6 +80786,20 @@
},
/turf/simulated/floor/plating,
/area/station/command/office/cmo)
+"sfz" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 10
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 4
+ },
+/obj/structure/cable/yellow{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard2)
"sfG" = (
/obj/machinery/alarm{
name = "north bump";
@@ -81472,6 +80821,16 @@
icon_state = "yellowcorner"
},
/area/station/hallway/primary/aft)
+"sgk" = (
+/obj/machinery/smartfridge/foodcart,
+/obj/machinery/alarm{
+ name = "north bump";
+ pixel_y = 24
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "showroomfloor"
+ },
+/area/station/service/kitchen)
"sgH" = (
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
@@ -81537,6 +80896,15 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5
},
+/obj/structure/disposalpipe/segment{
+ dir = 4;
+ icon_state = "pipe-c"
+ },
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "whitepurple"
@@ -81602,6 +80970,21 @@
/obj/machinery/atmospherics/unary/vent_pump/on,
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
+"skr" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/plasteel{
+ icon_state = "bar"
+ },
+/area/station/service/bar)
+"sku" = (
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "bar"
+ },
+/area/station/service/bar)
"skD" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/portable/canister/air,
@@ -81668,19 +81051,29 @@
icon_state = "dark"
},
/area/station/engineering/break_room)
-"slT" = (
+"slX" = (
+/obj/effect/spawner/window/reinforced/grilled,
+/turf/simulated/floor/plating,
+/area/station/maintenance/port2)
+"smj" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
-/obj/effect/turf_decal/delivery,
-/turf/simulated/floor/plasteel,
-/area/station/science/xenobiology)
-"slX" = (
-/obj/effect/spawner/window/reinforced/grilled,
-/turf/simulated/floor/plating,
-/area/station/maintenance/port2)
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/science/robotics)
"sml" = (
/obj/structure/closet/secure_closet/brig,
/obj/machinery/light{
@@ -81727,14 +81120,6 @@
icon_state = "white"
},
/area/station/security/permabrig)
-"smL" = (
-/obj/machinery/atmospherics/pipe/manifold/visible{
- dir = 4;
- initialize_directions = 11
- },
-/obj/effect/landmark/start/scientist,
-/turf/simulated/floor/plasteel,
-/area/station/science/toxins/mixing)
"smW" = (
/obj/machinery/space_heater,
/obj/effect/landmark/damageturf,
@@ -81755,14 +81140,25 @@
/turf/simulated/floor/plating,
/area/station/engineering/atmos)
"snq" = (
-/obj/structure/table/reinforced,
-/obj/machinery/computer/security/telescreen/entertainment{
- pixel_x = -31
+/obj/structure/disposalpipe/segment{
+ dir = 1;
+ icon_state = "pipe-c"
},
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/plasteel{
- icon_state = "bar"
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 5
+ },
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
+/obj/machinery/status_display{
+ pixel_x = -32
},
+/turf/simulated/floor/wood,
/area/station/service/bar)
"snI" = (
/turf/simulated/wall,
@@ -81784,20 +81180,6 @@
},
/turf/simulated/floor/plasteel,
/area/station/supply/lobby)
-"sol" = (
-/obj/structure/table,
-/obj/item/scalpel{
- pixel_y = 12
- },
-/obj/item/bonesetter{
- pixel_x = 5;
- pixel_y = 5
- },
-/obj/item/circular_saw,
-/turf/simulated/floor/plasteel{
- icon_state = "whitepurple"
- },
-/area/station/science/robotics)
"soF" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
@@ -81832,17 +81214,16 @@
},
/area/station/science/rnd)
"soT" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
+/obj/structure/table,
+/obj/machinery/processor{
+ pixel_y = 12
},
-/obj/effect/turf_decal/tile/bar{
- dir = 1
+/obj/structure/extinguisher_cabinet{
+ name = "east bump";
+ pixel_x = 27
},
/turf/simulated/floor/plasteel{
- icon_state = "whitecorner"
+ icon_state = "cafeteria"
},
/area/station/service/kitchen)
"spf" = (
@@ -81905,6 +81286,15 @@
icon_state = "neutralcorner"
},
/area/station/public/fitness)
+"sqp" = (
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/wood,
+/area/station/service/bar)
"srB" = (
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
@@ -81926,26 +81316,14 @@
},
/turf/simulated/floor/noslip,
/area/station/engineering/control)
-"srT" = (
-/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance/three,
-/turf/simulated/floor/plating,
-/area/station/maintenance/aft2)
-"ssc" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 1
+"ssr" = (
+/obj/item/analyzer{
+ pixel_x = -5;
+ pixel_y = 5
},
-/obj/structure/disposalpipe/segment,
/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel,
-/area/station/maintenance/starboard)
+/turf/simulated/floor/plating,
+/area/station/maintenance/aft2)
"ssA" = (
/obj/machinery/light/small{
dir = 1
@@ -82010,26 +81388,6 @@
icon_state = "C2"
},
/area/station/hallway/primary/central)
-"svK" = (
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden{
- dir = 5
- },
-/turf/simulated/floor/plating,
-/area/station/maintenance/aft2)
"svR" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 8
@@ -82169,21 +81527,23 @@
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
-"syi" = (
-/obj/structure/disposalpipe/segment,
+"syo" = (
+/obj/structure/barricade/wooden,
+/obj/effect/spawner/window,
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard2)
+"syJ" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel{
- icon_state = "darkgrey"
+ dir = 8;
+ icon_state = "cautioncorner"
},
-/area/station/science/robotics)
+/area/station/hallway/primary/starboard)
"syP" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on,
/turf/simulated/floor/plasteel{
@@ -82216,6 +81576,11 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/disposal)
+"szL" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light,
+/turf/simulated/floor/wood,
+/area/station/service/bar)
"szW" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -82253,36 +81618,39 @@
},
/turf/simulated/floor/plating/airless,
/area/station/engineering/control)
-"sBN" = (
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
+"sAP" = (
+/obj/effect/turf_decal/woodsiding{
+ dir = 8
+ },
+/obj/structure/chair/stool/bar{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
},
-/turf/simulated/floor/plating,
-/area/station/maintenance/port2)
-"sBZ" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/turf/simulated/floor/plasteel{
+ icon_state = "bar"
+ },
+/area/station/service/bar)
+"sBN" = (
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 9
- },
-/obj/machinery/door/window/reinforced/reversed{
- dir = 8;
- name = "Reinforced Glass Door"
- },
-/obj/effect/mapping_helpers/airlock/autoname,
-/obj/effect/mapping_helpers/airlock/windoor/access/any/science/research{
+/turf/simulated/floor/plating,
+/area/station/maintenance/port2)
+"sBZ" = (
+/obj/structure/disposalpipe/broken{
dir = 8
},
-/turf/simulated/floor/engine,
-/area/station/science/explab/chamber)
+/obj/machinery/atmospherics/pipe/manifold/hidden/cyan,
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard2)
"sCr" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/command{
@@ -82406,19 +81774,10 @@
},
/area/station/security/execution)
"sEQ" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/disposalpipe/segment,
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
+/obj/structure/bookcase,
+/turf/simulated/floor/plasteel{
+ icon_state = "cult"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/plasteel,
/area/station/maintenance/starboard)
"sFg" = (
/obj/effect/spawner/window/reinforced/grilled,
@@ -82448,11 +81807,6 @@
name = "north bump";
pixel_y = 24
},
-/obj/structure/cable/yellow{
- d1 = 2;
- d2 = 4;
- icon_state = "2-4"
- },
/obj/machinery/door_control{
id = "roboticsprivacy";
name = "Robotics Privacy Control";
@@ -82505,6 +81859,12 @@
/obj/machinery/space_heater,
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
+"sGE" = (
+/obj/machinery/door/airlock/maintenance,
+/obj/effect/mapping_helpers/airlock/autoname,
+/obj/effect/mapping_helpers/airlock/access/all/science/tox,
+/turf/simulated/floor/plating,
+/area/station/science/toxins/launch)
"sGI" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -82626,21 +81986,6 @@
},
/turf/simulated/floor/plating,
/area/station/medical/virology)
-"sJj" = (
-/obj/structure/cable/yellow{
- d2 = 8;
- icon_state = "0-8"
- },
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/effect/spawner/window/reinforced/polarized/grilled{
- id = "RD"
- },
-/turf/simulated/floor/plating,
-/area/station/command/office/rd)
"sJE" = (
/obj/structure/sign/biohazard,
/turf/simulated/wall,
@@ -82719,12 +82064,12 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 5
- },
/obj/effect/turf_decal/stripes/line{
dir = 8
},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 5
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -82744,20 +82089,6 @@
icon_state = "darkredcorners"
},
/area/station/security/armory/secure)
-"sLc" = (
-/obj/machinery/door/airlock/maintenance,
-/obj/effect/mapping_helpers/airlock/autoname,
-/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
-/obj/structure/disposalpipe/segment,
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/plating,
-/area/station/maintenance/starboard)
"sLs" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 4
@@ -82778,21 +82109,27 @@
},
/area/station/engineering/control)
"sLS" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/tile/bar{
- dir = 1
- },
/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "neutralcorner"
+ dir = 9;
+ icon_state = "green"
},
-/area/station/maintenance/starboard)
+/area/station/service/hydroponics)
"sLT" = (
/obj/structure/disposalpipe/junction,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
/area/station/medical/medbay)
+"sMn" = (
+/obj/machinery/light/small,
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 8
+ },
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "whitehall"
+ },
+/area/station/maintenance/aft2)
"sMo" = (
/obj/machinery/computer/monitor{
name = "Grid Power Monitoring Computer"
@@ -82810,17 +82147,6 @@
icon_state = "caution"
},
/area/station/engineering/equipmentstorage)
-"sMK" = (
-/obj/machinery/door/airlock/maintenance,
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/obj/effect/mapping_helpers/airlock/autoname,
-/obj/effect/mapping_helpers/airlock/access/all/science/tox,
-/turf/simulated/floor/plating,
-/area/station/maintenance/aft2)
"sMM" = (
/mob/living/simple_animal/pet/sloth/paperwork,
/turf/simulated/floor/carpet,
@@ -82835,6 +82161,15 @@
},
/turf/simulated/floor/plating,
/area/station/command/office/ntrep)
+"sNa" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/science/xenobiology)
"sNb" = (
/obj/machinery/atmospherics/meter,
/obj/structure/cable/yellow{
@@ -82856,23 +82191,24 @@
icon_state = "cautioncorner"
},
/area/station/engineering/atmos)
-"sNm" = (
+"sNi" = (
/obj/structure/table,
-/obj/machinery/kitchen_machine/microwave,
-/obj/machinery/camera{
- c_tag = "Kitchen";
- dir = 4
+/obj/item/clothing/gloves/color/latex,
+/obj/item/clothing/glasses/science,
+/obj/item/radio/intercom{
+ name = "east bump";
+ pixel_x = 28
},
-/obj/machinery/firealarm{
- dir = 8;
- name = "west bump";
- pixel_x = -24
+/turf/simulated/floor/plasteel{
+ icon_state = "darkgrey"
},
-/obj/effect/turf_decal/tile/bar{
- dir = 1
+/area/station/science/toxins/launch)
+"sNm" = (
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 8
},
/turf/simulated/floor/plasteel{
- icon_state = "whitecorner"
+ icon_state = "cafeteria"
},
/area/station/service/kitchen)
"sNA" = (
@@ -82882,6 +82218,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/junction/reversed{
+ dir = 8
+ },
/turf/simulated/floor/plasteel,
/area/station/engineering/atmos/control)
"sNG" = (
@@ -82901,14 +82240,6 @@
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
/area/station/hallway/secondary/exit)
-"sNJ" = (
-/obj/machinery/door/airlock/maintenance,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/effect/mapping_helpers/airlock/autoname,
-/obj/effect/mapping_helpers/airlock/access/all/science/research,
-/turf/simulated/floor/plating,
-/area/station/maintenance/starboard2)
"sNR" = (
/obj/structure/chair/stool{
dir = 4
@@ -82934,35 +82265,45 @@
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
"sOB" = (
+/obj/machinery/button/windowtint{
+ dir = 4;
+ id = "ROBO";
+ pixel_x = -24
+ },
/obj/structure/disposalpipe/segment{
- dir = 8;
+ dir = 1;
icon_state = "pipe-c"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 9
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 9
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 5
},
/obj/structure/cable/yellow{
d1 = 1;
- d2 = 8;
- icon_state = "1-8"
+ d2 = 4;
+ icon_state = "1-4"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 8
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "whitepurple"
},
-/turf/simulated/floor/plating,
-/area/station/maintenance/aft2)
+/area/station/science/robotics)
"sOH" = (
-/obj/machinery/atmospherics/binary/valve,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
+/obj/structure/closet/bombcloset,
+/obj/machinery/requests_console{
+ department = "Science";
+ departmentType = 2;
+ name = "Science Requests Console";
+ pixel_x = 30
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+/obj/effect/turf_decal/stripes/line{
dir = 4
},
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
/area/station/science/toxins/mixing)
"sOR" = (
/obj/effect/turf_decal/stripes/line{
@@ -82996,22 +82337,14 @@
/turf/simulated/floor/plating,
/area/station/hallway/primary/central)
"sPr" = (
+/obj/machinery/photocopier,
/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
+ dir = 4;
+ icon_state = "pipe-c"
},
/turf/simulated/floor/plasteel{
- icon_state = "white"
+ dir = 9;
+ icon_state = "whitepurple"
},
/area/station/science/research)
"sPx" = (
@@ -83049,6 +82382,16 @@
},
/turf/simulated/floor/plasteel,
/area/station/engineering/break_room)
+"sQh" = (
+/obj/structure/disposalpipe/segment{
+ dir = 2;
+ icon_state = "pipe-c"
+ },
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "green"
+ },
+/area/station/hallway/primary/central)
"sQt" = (
/obj/structure/cable/yellow{
d1 = 1;
@@ -83075,24 +82418,13 @@
},
/turf/simulated/floor/plating,
/area/station/medical/virology)
-"sRb" = (
+"sRf" = (
/obj/structure/table,
-/obj/item/surgicaldrill{
- pixel_x = 17;
- pixel_y = 4
- },
-/obj/item/stack/medical/bruise_pack/advanced{
- pixel_x = -4;
- pixel_y = 4
- },
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/item/cautery,
+/obj/item/clothing/mask/gas,
/turf/simulated/floor/plasteel{
- icon_state = "whitepurple"
+ icon_state = "darkgrey"
},
-/area/station/science/robotics)
+/area/station/science/toxins/launch)
"sRs" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 1
@@ -83148,14 +82480,6 @@
icon_state = "yellowcorner"
},
/area/station/engineering/break_room)
-"sSk" = (
-/obj/machinery/atmospherics/unary/vent_pump/on{
- dir = 1
- },
-/turf/simulated/floor/plasteel{
- icon_state = "darkgrey"
- },
-/area/station/science/toxins/launch)
"sSq" = (
/obj/structure/table,
/obj/item/storage/box/bodybags{
@@ -83193,14 +82517,38 @@
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
/area/station/maintenance/engimaint)
+"sTF" = (
+/obj/structure/table/wood,
+/obj/item/reagent_containers/food/condiment/peppermill{
+ pixel_x = 3
+ },
+/obj/item/reagent_containers/food/condiment/saltshaker{
+ pixel_x = -3
+ },
+/obj/machinery/atmospherics/unary/vent_pump/on,
+/turf/simulated/floor/wood,
+/area/station/service/bar)
"sTM" = (
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
/area/station/maintenance/engimaint)
-"sVu" = (
-/obj/effect/spawner/lootdrop/maintenance,
-/turf/simulated/floor/plating,
-/area/station/maintenance/aft2)
+"sVy" = (
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel,
+/area/station/hallway/primary/central)
"sVB" = (
/obj/structure/cable/yellow{
d1 = 4;
@@ -83308,6 +82656,10 @@
icon_state = "neutralcorner"
},
/area/station/hallway/primary/central)
+"sXt" = (
+/obj/machinery/atmospherics/pipe/simple/hidden,
+/turf/simulated/floor/plating,
+/area/station/maintenance/asmaint)
"sXJ" = (
/obj/machinery/light/small,
/turf/simulated/floor/plasteel{
@@ -83349,13 +82701,10 @@
},
/area/station/legal/courtroom)
"sYJ" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
+/obj/effect/landmark/start/botanist,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
+ dir = 10
},
-/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel,
/area/station/service/hydroponics)
"sYR" = (
@@ -83376,12 +82725,6 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 8
- },
/obj/structure/cable/yellow{
d1 = 2;
d2 = 4;
@@ -83390,20 +82733,23 @@
/obj/effect/turf_decal/stripes/corner{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+ dir = 8
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
/area/station/science/xenobiology)
-"sZE" = (
-/obj/effect/turf_decal/stripes/white/line{
+"sZC" = (
+/obj/structure/rack,
+/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random_spawners/cobweb_right_frequent,
+/obj/machinery/light/small{
dir = 1
},
-/obj/machinery/atmospherics/unary/portables_connector{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/plasteel,
-/area/station/science/toxins/mixing)
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard2)
"sZI" = (
/turf/simulated/floor/plasteel{
dir = 8;
@@ -83472,6 +82818,15 @@
icon_state = "brown"
},
/area/station/supply/office)
+"taP" = (
+/obj/machinery/status_display{
+ pixel_x = -32
+ },
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "whitepurple"
+ },
+/area/station/science/research)
"taS" = (
/obj/structure/cable/yellow{
d1 = 1;
@@ -83482,21 +82837,28 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/aft)
"taW" = (
-/obj/item/radio/intercom{
- name = "south bump";
- pixel_y = -28
- },
-/obj/structure/disposalpipe/segment{
+/obj/structure/window/reinforced{
dir = 4
},
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "whitepurple"
- },
+/obj/structure/flora/ausbushes/fullgrass,
+/obj/structure/flora/ausbushes/ppflowers,
+/turf/simulated/floor/grass/no_creep,
/area/station/science/research)
+"tba" = (
+/obj/structure/rack,
+/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random_spawners/cobweb_left_rare,
+/obj/structure/cable/yellow{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/aft2)
"tbd" = (
/obj/machinery/alarm{
dir = 1;
@@ -83544,23 +82906,6 @@
/obj/machinery/atmospherics/pipe/simple/visible,
/turf/simulated/floor/plating,
/area/station/maintenance/fpmaint)
-"tco" = (
-/obj/structure/table/reinforced,
-/obj/machinery/door/window/classic/reversed{
- name = "Kitchen"
- },
-/obj/effect/mapping_helpers/airlock/autoname,
-/obj/machinery/door/firedoor,
-/obj/machinery/door/poddoor/shutters/preopen{
- dir = 2;
- id_tag = "kitchen_counter";
- name = "Kitchen Counter Shutters"
- },
-/obj/effect/mapping_helpers/airlock/windoor/access/all/service/kitchen,
-/turf/simulated/floor/plasteel{
- icon_state = "cafeteria"
- },
-/area/station/service/kitchen)
"tcD" = (
/obj/structure/table,
/obj/item/storage/box/donkpockets{
@@ -83634,7 +82979,6 @@
/turf/simulated/floor/plasteel,
/area/station/engineering/control)
"tdA" = (
-/obj/effect/turf_decal/delivery/hollow,
/obj/machinery/atmospherics/portable/canister/sleeping_agent,
/obj/machinery/atmospherics/pipe/simple/hidden/purple{
dir = 4
@@ -83712,6 +83056,20 @@
"tfl" = (
/turf/simulated/wall/r_wall,
/area/station/security/prisonlockers)
+"tfo" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/public/glass{
+ name = "Hydroponics Pasture"
+ },
+/obj/effect/mapping_helpers/airlock/access/any/service/hydroponics,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/turf/simulated/floor/plating,
+/area/station/service/hydroponics)
"tfp" = (
/obj/structure/cable/yellow{
d1 = 1;
@@ -83719,17 +83077,8 @@
icon_state = "1-2"
},
/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 8
- },
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 4;
- icon_state = "1-4"
- },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/central)
"tfD" = (
@@ -83746,6 +83095,12 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/medmaint)
+"tfH" = (
+/obj/machinery/hydroponics/constructable,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/effect/turf_decal/delivery/hollow,
+/turf/simulated/floor/plasteel,
+/area/station/service/hydroponics)
"tfM" = (
/obj/structure/chair,
/turf/simulated/floor/plasteel{
@@ -83788,52 +83143,13 @@
icon_state = "darkgreycheck"
},
/area/station/medical/break_room)
-"tgC" = (
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/turf/simulated/floor/plating,
-/area/station/maintenance/aft2)
"tgE" = (
/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
/area/station/telecomms/chamber)
-"tgO" = (
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/door/airlock/maintenance,
-/obj/effect/mapping_helpers/airlock/autoname,
-/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
-/turf/simulated/floor/plating,
-/area/station/maintenance/starboard2)
"tgV" = (
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
+/obj/structure/table/reinforced,
+/obj/item/transfer_valve,
/turf/simulated/floor/plating,
/area/station/maintenance/aft2)
"thc" = (
@@ -83870,6 +83186,14 @@
},
/turf/simulated/floor/carpet,
/area/station/command/office/hop)
+"thI" = (
+/obj/effect/spawner/random_spawners/oil_often,
+/obj/machinery/atmospherics/pipe/simple/visible{
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/plasteel,
+/area/station/science/toxins/mixing)
"thW" = (
/obj/structure/cable/yellow{
d1 = 2;
@@ -83883,22 +83207,12 @@
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
/area/station/security/warden)
-"tig" = (
-/obj/effect/turf_decal/stripes/white/line{
- dir = 8
- },
-/obj/machinery/alarm{
- name = "north bump";
- pixel_y = 24
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
+"tid" = (
+/obj/structure/reagent_dispensers/watertank/high,
+/obj/item/reagent_containers/glass/bucket,
+/obj/effect/turf_decal/stripes/line,
/turf/simulated/floor/plasteel,
-/area/station/science/toxins/mixing)
+/area/station/service/hydroponics)
"tio" = (
/obj/structure/cable/yellow{
d1 = 1;
@@ -83927,21 +83241,43 @@
},
/turf/simulated/floor/plasteel,
/area/station/security/permabrig)
-"tiN" = (
+"tiv" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 10
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 9
+ },
+/obj/structure/cable/yellow{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
+ },
/obj/structure/cable/yellow{
d1 = 1;
- d2 = 2;
- icon_state = "1-2"
+ d2 = 8;
+ icon_state = "1-8"
},
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard)
+"tiN" = (
+/obj/machinery/door/airlock/maintenance,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
+/obj/effect/mapping_helpers/airlock/autoname,
+/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
/obj/structure/cable/yellow{
- d1 = 2;
- d2 = 4;
- icon_state = "2-4"
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
},
+/obj/effect/spawner/lootdrop/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/starboard2)
+"tjd" = (
+/turf/simulated/wall/r_wall,
+/area/station/science/server/coldroom)
"tjR" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -83991,10 +83327,6 @@
},
/turf/space,
/area/space/nearstation)
-"tkV" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/mech_bay_recharge_floor,
-/area/station/science/robotics/chargebay)
"tlh" = (
/obj/machinery/atmospherics/pipe/simple/visible{
dir = 9
@@ -84047,21 +83379,23 @@
},
/area/station/security/permabrig)
"tmt" = (
-/obj/machinery/disposal,
-/obj/effect/turf_decal/delivery/hollow,
-/obj/machinery/light{
- dir = 8
+/obj/effect/turf_decal/woodsiding{
+ dir = 1
},
-/obj/machinery/status_display{
- pixel_x = -32
+/obj/item/kirbyplants{
+ level = 4.1
},
-/obj/structure/disposalpipe/trunk{
- dir = 1
+/obj/machinery/computer/security/telescreen/entertainment{
+ pixel_x = -31
},
/turf/simulated/floor/plasteel{
- icon_state = "bar"
+ icon_state = "cafeteria"
},
/area/station/service/bar)
+"tmz" = (
+/obj/effect/spawner/random_spawners/fungus_maybe,
+/turf/simulated/wall,
+/area/station/maintenance/aft2)
"tmI" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -84123,6 +83457,10 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
+"tnW" = (
+/mob/living/simple_animal/mouse,
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard)
"toD" = (
/obj/structure/sign/poster/official/random{
pixel_x = -32
@@ -84133,22 +83471,17 @@
/turf/simulated/floor/plasteel,
/area/station/security/permabrig)
"toH" = (
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
+/obj/machinery/firealarm{
+ dir = 4;
+ name = "east bump";
+ pixel_x = 24
},
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/plasteel{
+ icon_state = "bar"
},
-/turf/simulated/floor/carpet,
-/area/station/service/theatre)
+/area/station/service/bar)
"toL" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock,
@@ -84339,17 +83672,31 @@
"ttE" = (
/turf/simulated/floor/carpet,
/area/station/command/office/captain/bedroom)
+"ttI" = (
+/obj/structure/disposalpipe/segment{
+ dir = 2;
+ icon_state = "pipe-c"
+ },
+/obj/structure/cable/yellow{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
+ },
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "whitepurple"
+ },
+/area/station/science/robotics)
"tug" = (
-/obj/machinery/atmospherics/pipe/simple/insulated,
-/obj/machinery/door_control{
- id = "toxinaccess";
- name = "Toxins Access";
- pixel_x = 27;
- pixel_y = 8;
- req_access_txt = "8"
+/obj/machinery/newscaster{
+ dir = 8;
+ name = "east bump";
+ pixel_x = 28
},
-/obj/machinery/light/small{
- dir = 4
+/obj/machinery/atmospherics/binary/valve{
+ layer = 3.3;
+ name = "Cooling loop input";
+ dir = 8
},
/turf/simulated/floor/plasteel,
/area/station/science/toxins/mixing)
@@ -84415,45 +83762,26 @@
/obj/effect/turf_decal/stripes/line,
/turf/simulated/floor/plating,
/area/station/maintenance/disposal)
-"twH" = (
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/turf/simulated/floor/plating,
-/area/station/maintenance/starboard2)
"twL" = (
/obj/machinery/alarm{
dir = 1;
name = "south bump";
pixel_y = -24
},
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
+ dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 9
+ dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 9
- },
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 8;
- icon_state = "1-8"
+ dir = 4
},
-/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
icon_state = "darkgrey"
},
@@ -84475,7 +83803,6 @@
},
/area/station/medical/break_room)
"txp" = (
-/obj/effect/turf_decal/delivery/white/hollow,
/obj/machinery/processor{
desc = "A machine used to process slimes and retrieve their extract.";
name = "Slime Processor"
@@ -84560,21 +83887,6 @@
/obj/item/stamp/law,
/turf/simulated/floor/carpet,
/area/station/legal/lawoffice)
-"tzt" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 9
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 9
- },
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "whitepurplecorner"
- },
-/area/station/science/research)
"tzy" = (
/obj/machinery/atmospherics/pipe/simple/visible{
dir = 10
@@ -84666,6 +83978,13 @@
icon_state = "darkblue"
},
/area/station/security/armory/secure)
+"tCf" = (
+/obj/machinery/atmospherics/pipe/simple/insulated{
+ dir = 9
+ },
+/obj/effect/landmark/start/scientist,
+/turf/simulated/floor/plasteel,
+/area/station/science/toxins/mixing)
"tCr" = (
/obj/structure/table,
/obj/item/paper_bin,
@@ -84674,29 +83993,15 @@
icon_state = "white"
},
/area/station/science/explab)
-"tCw" = (
-/obj/effect/turf_decal/delivery,
-/obj/structure/closet/firecloset,
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/effect/turf_decal/siding{
- dir = 8
- },
-/obj/machinery/alarm{
- name = "north bump";
- pixel_y = 24
- },
-/turf/simulated/floor/plasteel{
- icon_state = "darkgreycheck"
- },
-/area/station/science/research)
"tCE" = (
/obj/machinery/atmospherics/pipe/simple/visible/yellow{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
+ dir = 9
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 9
},
/turf/simulated/floor/plasteel,
/area/station/engineering/atmos)
@@ -84763,15 +84068,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/aft)
-"tEM" = (
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
-/obj/effect/turf_decal/delivery/hollow,
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "cautioncorner"
- },
-/area/station/hallway/primary/starboard)
"tFb" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -84792,21 +84088,13 @@
},
/turf/space,
/area/space/nearstation)
-"tFX" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/turf/simulated/floor/plasteel{
- icon_state = "white"
- },
-/area/station/science/robotics)
"tGt" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/obj/structure/disposalpipe/segment{
dir = 1;
icon_state = "pipe-c"
},
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
@@ -84814,8 +84102,8 @@
},
/obj/structure/cable/yellow{
d1 = 1;
- d2 = 8;
- icon_state = "1-8"
+ d2 = 4;
+ icon_state = "1-4"
},
/turf/simulated/floor/plasteel{
icon_state = "whitepurple"
@@ -84866,14 +84154,43 @@
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
-"tIh" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 6
+"tId" = (
+/obj/machinery/power/apc{
+ dir = 4;
+ name = "east bump";
+ pixel_x = 24
+ },
+/obj/structure/cable/yellow{
+ d2 = 2;
+ icon_state = "0-2"
+ },
+/turf/simulated/floor/plasteel,
+/area/station/science/toxins/mixing)
+"tIg" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 4
+ },
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
},
/turf/simulated/floor/plasteel{
icon_state = "white"
},
-/area/station/science/toxins/launch)
+/area/station/maintenance/asmaint)
+"tIv" = (
+/obj/machinery/atmospherics/portable/canister,
+/obj/machinery/light,
+/obj/effect/turf_decal/delivery/white/hollow,
+/turf/simulated/floor/plasteel{
+ icon_state = "darkgrey"
+ },
+/area/station/science/storage)
"tIU" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -84949,6 +84266,10 @@
icon_state = "yellow"
},
/area/station/engineering/break_room)
+"tKX" = (
+/obj/effect/landmark/damageturf,
+/turf/simulated/floor/engine,
+/area/station/maintenance/asmaint)
"tLv" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 6
@@ -84982,13 +84303,21 @@
/turf/simulated/floor/plating,
/area/station/engineering/equipmentstorage)
"tMV" = (
-/obj/effect/turf_decal/delivery,
-/obj/machinery/light/small{
- dir = 4
+/obj/structure/rack,
+/obj/item/hand_labeler,
+/obj/item/stack/packageWrap,
+/obj/item/stack/packageWrap,
+/obj/item/book/manual/wiki/sop_service,
+/obj/item/storage/box/donkpockets,
+/obj/machinery/firealarm{
+ dir = 1;
+ name = "south bump";
+ pixel_y = -24
},
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/wood,
-/area/station/service/bar)
+/turf/simulated/floor/plasteel{
+ icon_state = "cafeteria"
+ },
+/area/station/service/kitchen)
"tNe" = (
/obj/effect/spawner/random_spawners/wall_rusted_probably,
/turf/simulated/wall/r_wall,
@@ -84999,23 +84328,12 @@
/obj/effect/spawner/random_spawners/cobweb_right_rare,
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
-"tNr" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/economy/vending/wallmed{
- name = "Emergency NanoMed";
- pixel_y = 28
- },
-/turf/simulated/floor/plasteel{
- icon_state = "whitepurple"
+"tNn" = (
+/obj/machinery/atmospherics/pipe/simple/visible{
+ dir = 6
},
-/area/station/science/research)
-"tNw" = (
-/obj/structure/table/wood,
-/obj/item/coin/iron,
-/turf/simulated/floor/wood,
-/area/station/service/bar)
+/turf/simulated/floor/plating,
+/area/station/maintenance/aft2)
"tNQ" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -85099,23 +84417,26 @@
icon_state = "cult"
},
/area/station/legal/magistrate)
-"tRb" = (
-/obj/structure/table,
-/obj/machinery/kitchen_machine/microwave,
-/obj/machinery/requests_console{
- department = "Kitchen";
- departmentType = 2;
- name = "Kitchen Requests Console";
- pixel_x = -30
+"tQW" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 9
},
-/obj/machinery/light{
- dir = 8
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 5
},
-/obj/effect/turf_decal/tile/bar{
- dir = 1
+/turf/simulated/floor/plasteel{
+ icon_state = "darkgrey"
+ },
+/area/station/science/toxins/launch)
+"tRb" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
},
/turf/simulated/floor/plasteel{
- icon_state = "whitecorner"
+ icon_state = "cafeteria"
},
/area/station/service/kitchen)
"tRf" = (
@@ -85146,40 +84467,16 @@
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
"tRD" = (
-/obj/machinery/door/airlock/research,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/effect/mapping_helpers/airlock/autoname,
-/obj/effect/mapping_helpers/airlock/access/all/science/tox_storage,
-/obj/machinery/door/firedoor/heavy{
- opacity = 0
+/obj/machinery/light_switch{
+ dir = 1;
+ name = "south bump";
+ pixel_y = -24
},
/turf/simulated/floor/plasteel{
- icon_state = "whitepurplefull"
- },
-/area/station/science/storage)
-"tRK" = (
-/obj/machinery/computer/operating{
dir = 8;
- name = "Robotics Operating Computer"
- },
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "whitepurple"
+ icon_state = "whitebluecorner"
},
-/area/station/science/robotics)
+/area/station/science/explab)
"tRN" = (
/obj/effect/spawner/window/reinforced/grilled,
/obj/structure/cable/yellow,
@@ -85234,15 +84531,6 @@
icon_state = "greenblue"
},
/area/station/service/hydroponics)
-"tUn" = (
-/obj/machinery/light{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/visible{
- dir = 6
- },
-/turf/simulated/floor/plasteel,
-/area/station/science/toxins/mixing)
"tUt" = (
/obj/item/wrench,
/turf/simulated/floor/catwalk,
@@ -85264,6 +84552,23 @@
icon_state = "darkblue"
},
/area/station/command/bridge)
+"tUS" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/power/apc{
+ name = "south bump";
+ pixel_y = -24
+ },
+/obj/structure/cable/yellow{
+ d2 = 4;
+ icon_state = "0-4"
+ },
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "whitepurple"
+ },
+/area/station/science/research)
"tUW" = (
/obj/machinery/atmospherics/binary/pump{
dir = 0;
@@ -85289,6 +84594,20 @@
name = "south bump";
pixel_y = -28
},
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "darkgrey"
},
@@ -85337,6 +84656,22 @@
icon_state = "whiteblue"
},
/area/station/medical/cryo)
+"tWK" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 4
+ },
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/maintenance/asmaint)
"tWO" = (
/obj/machinery/light,
/turf/simulated/floor/plasteel{
@@ -85358,16 +84693,45 @@
/obj/effect/landmark/damageturf,
/turf/simulated/floor/plating,
/area/station/maintenance/fpmaint)
-"tXA" = (
-/obj/structure/chair/stool/bar,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/woodsiding{
- dir = 1
+"tXq" = (
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
- icon_state = "bar"
+ dir = 6;
+ icon_state = "whitepurple"
+ },
+/area/station/science/robotics)
+"tXA" = (
+/obj/machinery/alarm{
+ dir = 1;
+ name = "south bump";
+ pixel_y = -24
},
+/turf/simulated/floor/wood,
/area/station/service/bar)
+"tYb" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/science/research)
"tYD" = (
/obj/structure/cable/yellow{
d1 = 2;
@@ -85426,6 +84790,22 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
+"tZl" = (
+/obj/structure/table/reinforced,
+/obj/structure/window/reinforced,
+/obj/item/eftpos/register{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "bar"
+ },
+/area/station/service/bar)
"tZG" = (
/obj/machinery/computer/general_air_control/large_tank_control{
dir = 8;
@@ -85503,17 +84883,21 @@
},
/area/station/security/armory/secure)
"ubf" = (
+/obj/effect/turf_decal/stripes/white/line,
/obj/effect/turf_decal/stripes/white/line{
dir = 1
},
-/obj/structure/disposalpipe/segment{
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel{
icon_state = "darkgrey"
},
-/area/station/science/toxins/launch)
+/area/station/science/storage)
+"ubu" = (
+/obj/structure/grille/broken,
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard2)
"ubB" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -85525,6 +84909,33 @@
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
+"ubN" = (
+/obj/machinery/economy/vending/wallmed{
+ name = "Emergency NanoMed";
+ pixel_y = 28
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/cyan{
+ dir = 1
+ },
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/structure/cable/yellow{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
+ },
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "caution"
+ },
+/area/station/maintenance/starboard)
"ubT" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -85593,6 +85004,15 @@
},
/turf/simulated/floor/plasteel,
/area/station/security/brig)
+"ucR" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/science/toxins/launch)
"udg" = (
/obj/effect/turf_decal/delivery,
/obj/machinery/door/firedoor,
@@ -85617,11 +85037,21 @@
/turf/simulated/floor/plasteel,
/area/station/science/xenobiology)
"udl" = (
-/obj/structure/table/reinforced,
-/obj/item/eftpos/register,
-/turf/simulated/floor/plasteel{
- icon_state = "bar"
+/obj/structure/disposalpipe/segment{
+ dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/wood,
/area/station/service/bar)
"udB" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on,
@@ -85688,6 +85118,10 @@
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel,
/area/station/security/brig)
+"ufm" = (
+/obj/machinery/door/airlock/maintenance,
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard2)
"ufr" = (
/obj/structure/table,
/obj/item/clothing/gloves/color/fyellow,
@@ -85698,6 +85132,13 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
+"uft" = (
+/obj/structure/table/reinforced,
+/obj/item/reagent_containers/glass/rag,
+/turf/simulated/floor/plasteel{
+ icon_state = "bar"
+ },
+/area/station/service/bar)
"ufw" = (
/obj/structure/cable/yellow{
d1 = 4;
@@ -85781,6 +85222,11 @@
/obj/effect/spawner/random_spawners/grille_maybe,
/turf/simulated/floor/plasteel,
/area/station/maintenance/fore)
+"uhJ" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard2)
"uhK" = (
/obj/structure/bed,
/obj/item/bedsheet,
@@ -85823,20 +85269,19 @@
},
/area/station/science/server)
"uhV" = (
-/obj/machinery/door/window/classic/reversed{
- dir = 4;
- name = "Bar Glass Door"
- },
-/obj/effect/mapping_helpers/airlock/autoname,
-/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/woodsiding{
- dir = 4
+ dir = 5
},
-/obj/effect/mapping_helpers/airlock/windoor/access/all/service/bar{
- dir = 4
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
- icon_state = "bar"
+ icon_state = "cafeteria"
},
/area/station/service/bar)
"uhY" = (
@@ -85939,28 +85384,11 @@
/turf/simulated/floor/bluegrid,
/area/station/turret_protected/ai_upload)
"ukO" = (
-/obj/effect/decal/cleanable/dirt,
+/obj/structure/kitchenspike,
/turf/simulated/floor/plasteel{
- icon_state = "cafeteria"
+ icon_state = "showroomfloor"
},
/area/station/service/kitchen)
-"ukV" = (
-/obj/machinery/navbeacon{
- codes_txt = "delivery";
- dir = 1;
- location = "Bar"
- },
-/obj/effect/turf_decal/delivery/hollow,
-/obj/structure/plasticflaps{
- opacity = 1
- },
-/obj/machinery/door/window/classic/reversed{
- name = "Bar Delivery"
- },
-/obj/effect/mapping_helpers/airlock/windoor/access/any/supply/mule_bot,
-/obj/effect/mapping_helpers/airlock/windoor/access/any/service/bar,
-/turf/simulated/floor/plasteel,
-/area/station/maintenance/starboard)
"ule" = (
/obj/structure/cable/yellow{
d1 = 1;
@@ -85988,20 +85416,6 @@
icon_state = "red"
},
/area/station/security/brig)
-"ulM" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 10
- },
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/turf/simulated/floor/carpet,
-/area/station/service/theatre)
"umh" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -86022,8 +85436,16 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/fpmaint)
+"umT" = (
+/obj/structure/chair/stool{
+ dir = 1
+ },
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 1
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard2)
"und" = (
-/obj/effect/decal/cleanable/dirt,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
@@ -86095,6 +85517,19 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
+"upe" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "greenblue"
+ },
+/area/station/service/hydroponics)
"upE" = (
/obj/machinery/atmospherics/pipe/simple/visible/cyan,
/obj/machinery/atmospherics/pipe/simple/visible/green{
@@ -86168,6 +85603,11 @@
},
/turf/space,
/area/space/nearstation)
+"usE" = (
+/obj/effect/spawner/window/reinforced/tinted,
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
+/turf/simulated/floor/plating,
+/area/station/maintenance/asmaint)
"usP" = (
/obj/structure/chair{
dir = 4
@@ -86244,13 +85684,24 @@
},
/area/station/command/office/captain)
"uuG" = (
-/obj/structure/disposalpipe/segment{
+/obj/structure/rack,
+/obj/item/storage/box/bodybags{
+ pixel_x = -4;
+ pixel_y = -4
+ },
+/obj/item/storage/box/gloves{
+ pixel_x = 4;
+ pixel_y = 4
+ },
+/obj/item/storage/box/masks,
+/obj/structure/window/reinforced{
dir = 4
},
/turf/simulated/floor/plasteel{
+ dir = 5;
icon_state = "whitepurple"
},
-/area/station/science/research)
+/area/station/science/robotics)
"uvM" = (
/obj/structure/cable/yellow{
d1 = 1;
@@ -86273,14 +85724,18 @@
/turf/simulated/floor/plating,
/area/station/engineering/control)
"uws" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
+/obj/structure/table/glass,
+/obj/item/paper_bin{
+ pixel_x = -2;
+ pixel_y = 6
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
+/obj/item/pen{
+ pixel_x = -2;
+ pixel_y = 5
},
/turf/simulated/floor/plasteel{
- icon_state = "white"
+ dir = 9;
+ icon_state = "whitepurple"
},
/area/station/science/research)
"uwv" = (
@@ -86290,18 +85745,6 @@
icon_state = "brown"
},
/area/station/supply/office)
-"uwy" = (
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/turf/simulated/floor/wood,
-/area/station/service/bar)
"uxc" = (
/obj/structure/disposalpipe/segment{
dir = 4;
@@ -86333,6 +85776,16 @@
icon_state = "whitepurplefull"
},
/area/station/science/research)
+"uxT" = (
+/obj/machinery/atmospherics/pipe/simple/hidden{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plasteel{
+ dir = 9;
+ icon_state = "whitepurple"
+ },
+/area/station/maintenance/asmaint)
"uxU" = (
/obj/machinery/atmospherics/pipe/simple/visible/purple{
dir = 4
@@ -86440,12 +85893,6 @@
"uzR" = (
/turf/simulated/floor/engine,
/area/station/science/test_chamber)
-"uzY" = (
-/obj/machinery/atmospherics/pipe/simple/visible/cyan{
- dir = 9
- },
-/turf/simulated/floor/plating,
-/area/station/maintenance/starboard)
"uAj" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/cable/yellow{
@@ -86458,12 +85905,6 @@
icon_state = "whitebluefull"
},
/area/station/medical/storage/secondary)
-"uAz" = (
-/obj/machinery/door/airlock/maintenance,
-/obj/effect/mapping_helpers/airlock/autoname,
-/obj/effect/mapping_helpers/airlock/access/all/service/hydroponics,
-/turf/simulated/floor/plating,
-/area/station/maintenance/starboard)
"uAA" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel,
@@ -86527,42 +85968,17 @@
/obj/machinery/atmospherics/pipe/simple/visible{
dir = 5
},
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/turf/simulated/floor/plasteel,
/area/station/science/xenobiology)
"uDH" = (
-/obj/structure/table/reinforced,
-/obj/effect/turf_decal/delivery/hollow,
-/obj/item/stack/cable_coil{
- pixel_x = 3;
- pixel_y = -3
- },
-/obj/item/stack/cable_coil,
-/obj/item/analyzer{
- pixel_x = -5;
- pixel_y = 5
- },
-/obj/item/taperecorder{
- pixel_x = 5;
- pixel_y = 5
- },
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/machinery/alarm{
- name = "north bump";
- pixel_y = 24
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/hidden{
+ dir = 4
},
/turf/simulated/floor/plasteel{
- icon_state = "white"
+ icon_state = "whitepurple"
},
-/area/station/science/toxins/launch)
+/area/station/maintenance/asmaint)
"uEa" = (
/obj/structure/chair/e_chair,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -86617,34 +86033,20 @@
},
/area/station/command/teleporter)
"uEX" = (
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
- },
-/turf/simulated/floor/plasteel{
- icon_state = "whitepurplecorner"
- },
-/area/station/science/research)
-"uFB" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
+/obj/structure/table,
+/obj/item/scalpel{
+ pixel_y = 12
},
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
+/obj/item/bonesetter{
+ pixel_x = 5;
+ pixel_y = 5
},
-/obj/structure/chair/stool,
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 8;
- icon_state = "1-8"
+/obj/item/circular_saw,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "whitepurple"
},
-/turf/simulated/floor/wood,
-/area/station/service/bar)
+/area/station/science/robotics)
"uFM" = (
/obj/structure/cable/yellow{
d2 = 2;
@@ -86683,6 +86085,11 @@
icon_state = "redcorner"
},
/area/station/security/brig)
+"uGh" = (
+/obj/item/slime_extract/metal,
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plating,
+/area/station/maintenance/asmaint)
"uGn" = (
/obj/item/radio/intercom/locked/prison{
name = "Prison Intercom (General)";
@@ -86698,9 +86105,27 @@
/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
+"uGA" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/grille/broken,
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard)
"uHp" = (
/obj/structure/disposalpipe/segment,
-/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -86732,6 +86157,14 @@
icon_state = "caution"
},
/area/station/engineering/equipmentstorage)
+"uHQ" = (
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 8
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "whitepurplecorner"
+ },
+/area/station/science/explab)
"uHX" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 1
@@ -86801,6 +86234,21 @@
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
+"uKc" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 5
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard2)
"uKi" = (
/obj/effect/spawner/window/reinforced/polarized/grilled{
id = "HoS"
@@ -86913,14 +86361,6 @@
/obj/effect/landmark/start/nanotrasen_rep,
/turf/simulated/floor/carpet/royalblack,
/area/station/command/office/ntrep)
-"uMv" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "whitepurple"
- },
-/area/station/science/research)
"uMx" = (
/obj/structure/table,
/obj/machinery/computer/med_data/laptop{
@@ -86955,31 +86395,22 @@
/turf/simulated/floor/plating,
/area/station/security/permabrig)
"uMG" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
},
-/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
- icon_state = "white"
+ icon_state = "whiteblue"
},
-/area/station/science/toxins/mixing)
+/area/station/science/explab)
"uMR" = (
/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/tile/bar,
/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "neutralcorner"
+ icon_state = "redcorner"
},
/area/station/hallway/primary/starboard)
"uMS" = (
@@ -87003,6 +86434,18 @@
},
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/fore)
+"uNf" = (
+/obj/structure/disposalpipe/segment{
+ dir = 1;
+ icon_state = "pipe-c"
+ },
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
+/turf/simulated/floor/wood,
+/area/station/service/bar)
"uNk" = (
/obj/effect/spawner/lootdrop{
icon_state = "grille";
@@ -87033,10 +86476,17 @@
},
/area/station/public/toilet/lockerroom)
"uNn" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/sign/poster/official/random{
pixel_x = 32
},
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -87094,19 +86544,38 @@
icon_state = "dark"
},
/area/station/engineering/control)
+"uOM" = (
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 9
+ },
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "cafeteria"
+ },
+/area/station/service/kitchen)
"uOY" = (
/obj/machinery/door/window/classic/reversed{
name = "Science Chemistry";
dir = 1
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/effect/turf_decal/tile/purple,
-/obj/effect/turf_decal/tile/purple{
- dir = 1
- },
/obj/effect/mapping_helpers/airlock/windoor/access/all/science/research{
dir = 1
},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plasteel,
/area/station/science/misc_lab)
"uPt" = (
@@ -87201,22 +86670,6 @@
icon_state = "dark"
},
/area/station/command/bridge)
-"uRX" = (
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/turf/simulated/floor/plasteel{
- icon_state = "darkgrey"
- },
-/area/station/science/robotics)
"uSc" = (
/obj/structure/closet/secure_closet/brig,
/turf/simulated/floor/plasteel{
@@ -87237,13 +86690,6 @@
icon_state = "whiteblue"
},
/area/station/medical/exam_room)
-"uSj" = (
-/obj/effect/turf_decal/delivery/hollow,
-/obj/machinery/atmospherics/portable/canister,
-/turf/simulated/floor/plasteel{
- icon_state = "darkgrey"
- },
-/area/station/science/storage)
"uSA" = (
/obj/structure/railing{
dir = 4
@@ -87251,19 +86697,20 @@
/turf/space,
/area/space/nearstation)
"uSJ" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 5
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 5
- },
/turf/simulated/floor/plasteel{
+ dir = 8;
icon_state = "whitepurple"
},
/area/station/science/research)
+"uSP" = (
+/obj/machinery/light{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 1
+ },
+/turf/simulated/floor/plasteel,
+/area/station/science/toxins/mixing)
"uTp" = (
/obj/structure/rack,
/obj/item/flashlight,
@@ -87321,6 +86768,11 @@
/obj/effect/mapping_helpers/airlock/autoname,
/obj/effect/turf_decal/woodsiding,
/obj/structure/disposalpipe/segment,
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plasteel{
icon_state = "bar"
},
@@ -87356,15 +86808,19 @@
},
/area/station/turret_protected/ai)
"uVl" = (
-/obj/machinery/status_display{
- pixel_y = 32
+/obj/machinery/light{
+ dir = 1
},
-/obj/structure/disposalpipe/segment{
- dir = 4
+/obj/machinery/camera{
+ c_tag = "Science Hallway - Port";
+ network = list("Research","SS13")
},
-/turf/simulated/floor/plasteel{
- icon_state = "whitepurple"
+/obj/structure/window/reinforced{
+ dir = 4
},
+/obj/structure/flora/ausbushes/fullgrass,
+/obj/structure/flora/ausbushes/ppflowers,
+/turf/simulated/floor/grass/no_creep,
/area/station/science/research)
"uVp" = (
/obj/effect/spawner/window/reinforced/grilled,
@@ -87399,6 +86855,10 @@
/obj/effect/decal/cleanable/fungus,
/turf/simulated/wall,
/area/station/maintenance/apmaint)
+"uWe" = (
+/obj/effect/spawner/random_spawners/fungus_maybe,
+/turf/simulated/wall/r_wall,
+/area/station/maintenance/starboard2)
"uWq" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -87432,6 +86892,17 @@
},
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/garden)
+"uXa" = (
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plasteel{
+ icon_state = "darkgrey"
+ },
+/area/station/science/toxins/mixing)
"uXo" = (
/obj/structure/closet/emcloset,
/obj/machinery/camera{
@@ -87447,16 +86918,9 @@
},
/area/station/science/xenobiology)
"uXs" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 9
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 5
- },
-/turf/simulated/floor/plasteel{
- icon_state = "showroomfloor"
- },
-/area/station/service/kitchen)
+/mob/living/simple_animal/pig,
+/turf/simulated/floor/grass,
+/area/station/service/hydroponics)
"uXx" = (
/obj/structure/cable/yellow{
d1 = 4;
@@ -87480,6 +86944,17 @@
name = "Robotics Junction";
sort_type_txt = "14"
},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel{
icon_state = "darkgrey"
},
@@ -87490,20 +86965,20 @@
icon_state = "white"
},
/area/station/security/permabrig)
-"uXI" = (
-/obj/structure/table,
-/obj/item/clothing/mask/gas,
-/obj/effect/turf_decal/delivery/hollow,
-/turf/simulated/floor/plasteel{
- icon_state = "darkgrey"
- },
-/area/station/science/toxins/launch)
"uXK" = (
/obj/machinery/shieldwallgen{
req_access = list(55)
},
-/obj/structure/cable/yellow,
/obj/effect/turf_decal/stripes/box,
+/obj/structure/cable/yellow{
+ d2 = 2;
+ icon_state = "0-2"
+ },
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plating,
/area/station/maintenance/xenobio_south)
"uXW" = (
@@ -87637,13 +87112,20 @@
/area/station/science/xenobiology)
"uZm" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
+ dir = 6
},
-/obj/structure/disposalpipe/segment{
- dir = 4
+/obj/effect/decal/cleanable/dirt,
+/mob/living/simple_animal/mouse,
+/obj/structure/cable/yellow{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
},
-/turf/simulated/floor/wood,
-/area/station/service/theatre)
+/obj/machinery/atmospherics/pipe/manifold4w/hidden/cyan,
+/turf/simulated/floor/plasteel{
+ icon_state = "showroomfloor"
+ },
+/area/station/maintenance/starboard)
"uZt" = (
/obj/structure/rack,
/obj/effect/landmark/costume/random,
@@ -87656,20 +87138,18 @@
},
/area/station/security/permabrig)
"uZG" = (
-/obj/machinery/door/airlock/maintenance,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
dir = 4
},
-/obj/effect/mapping_helpers/airlock/autoname,
-/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/starboard2)
"uZP" = (
@@ -87739,7 +87219,9 @@
"vbB" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
-/obj/effect/turf_decal/delivery/hollow,
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+ dir = 8
+ },
/turf/simulated/floor/plasteel{
dir = 6;
icon_state = "caution"
@@ -87770,6 +87252,10 @@
icon_state = "black"
},
/area/station/security/permabrig)
+"vbW" = (
+/obj/effect/decal/cleanable/fungus,
+/turf/simulated/wall,
+/area/station/maintenance/asmaint)
"vcs" = (
/obj/structure/cable/yellow{
d1 = 1;
@@ -87823,21 +87309,24 @@
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
"vde" = (
-/obj/structure/disposalpipe/junction{
- dir = 2;
- icon_state = "pipe-j2"
+/obj/machinery/navbeacon{
+ codes_txt = "delivery";
+ location = "Research Division"
},
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
+/obj/structure/plasticflaps{
+ opacity = 1
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "whitepurple"
+/obj/machinery/door/window/classic/reversed{
+ dir = 4;
+ name = "Research Division"
+ },
+/obj/effect/mapping_helpers/airlock/windoor/access/any/supply/mule_bot{
+ dir = 4
},
+/obj/effect/mapping_helpers/airlock/windoor/access/any/science/research{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel,
/area/station/science/rnd)
"vdk" = (
/obj/structure/cable/yellow{
@@ -87914,35 +87403,49 @@
/turf/simulated/floor/plating,
/area/station/maintenance/port)
"veO" = (
-/obj/effect/turf_decal/stripes/white/corner{
- dir = 4
- },
-/obj/machinery/atmospherics/unary/portables_connector{
- dir = 1
+/obj/machinery/atmospherics/pipe/simple/insulated,
+/obj/machinery/light/small{
+ dir = 8
},
-/obj/machinery/newscaster{
- dir = 4;
- name = "west bump";
- pixel_x = -28
+/obj/machinery/door_control{
+ id = "toxinaccess";
+ name = "Toxins Access";
+ pixel_x = -27;
+ pixel_y = 8;
+ req_access_txt = "8"
},
/turf/simulated/floor/plasteel,
/area/station/science/toxins/mixing)
-"vfe" = (
-/obj/structure/reagent_dispensers/watertank,
+"vfd" = (
/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/tile/bar{
- dir = 1
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 4
},
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "neutralcorner"
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/structure/grille/broken,
+/turf/simulated/floor/plating,
+/area/station/maintenance/asmaint)
+"vfe" = (
+/obj/structure/table/glass,
+/obj/machinery/reagentgrinder{
+ pixel_y = 4
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 6
+ },
+/obj/structure/extinguisher_cabinet{
+ name = "north bump";
+ pixel_y = 30
},
-/area/station/maintenance/starboard)
-"vfp" = (
-/obj/effect/decal/cleanable/blood/oil,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel,
-/area/station/science/toxins/mixing)
+/area/station/service/hydroponics)
"vfv" = (
/obj/machinery/light/small{
dir = 4
@@ -87998,6 +87501,14 @@
icon_state = "neutralcorner"
},
/area/station/hallway/secondary/bridge)
+"vgA" = (
+/obj/machinery/light/small{
+ dir = 8
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "darkgrey"
+ },
+/area/station/science/toxins/mixing)
"vgP" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -88008,10 +87519,20 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
+"vhl" = (
+/obj/effect/turf_decal/stripes/white/line,
+/obj/machinery/atmospherics/portable/scrubber/huge,
+/turf/simulated/floor/plasteel{
+ icon_state = "darkgrey"
+ },
+/area/station/science/storage)
"vib" = (
/obj/machinery/atmospherics/pipe/simple/visible/purple{
dir = 9
},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/station/engineering/atmos)
"viz" = (
@@ -88067,6 +87588,10 @@
/obj/effect/spawner/window/reinforced/plasma,
/turf/simulated/floor/plating,
/area/station/engineering/engine/supermatter)
+"vjR" = (
+/obj/effect/decal/cleanable/fungus,
+/turf/simulated/wall,
+/area/station/maintenance/starboard2)
"vkd" = (
/obj/item/mop,
/obj/item/reagent_containers/glass/bottle/ammonia,
@@ -88123,12 +87648,44 @@
icon_state = "whitepurplefull"
},
/area/station/science/research)
+"vlF" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/cyan{
+ dir = 8
+ },
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard2)
"vlP" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 9
},
/turf/simulated/floor/bluegrid,
/area/station/turret_protected/ai)
+"vmj" = (
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4;
+ icon_state = "pipe-c"
+ },
+/turf/simulated/floor/plasteel,
+/area/station/hallway/primary/central)
"vml" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/disposalpipe/segment{
@@ -88186,6 +87743,10 @@
/obj/effect/spawner/lootdrop/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
+"vmW" = (
+/obj/effect/spawner/random_spawners/wall_rusted_maybe,
+/turf/simulated/wall/r_wall,
+/area/station/science/misc_lab)
"vnj" = (
/obj/effect/decal/cleanable/dirt,
/obj/item/toy/prizeball/therapy,
@@ -88222,6 +87783,13 @@
"vob" = (
/turf/simulated/wall,
/area/station/medical/storage)
+"voi" = (
+/obj/machinery/economy/vending/hydronutrients,
+/turf/simulated/floor/plasteel{
+ dir = 10;
+ icon_state = "green"
+ },
+/area/station/hallway/primary/central)
"vow" = (
/obj/structure/cable/yellow{
d1 = 1;
@@ -88277,26 +87845,8 @@
},
/area/station/security/detective)
"voT" = (
-/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/drinkingglass{
- pixel_x = 4;
- pixel_y = 5
- },
-/obj/item/reagent_containers/food/drinks/drinkingglass{
- pixel_x = 6;
- pixel_y = -1
- },
-/obj/item/reagent_containers/food/drinks/drinkingglass{
- pixel_x = -4;
- pixel_y = 6
- },
-/obj/item/reagent_containers/dropper,
-/obj/item/reagent_containers/dropper,
-/obj/item/reagent_containers/syringe,
-/obj/item/reagent_containers/syringe,
-/obj/machinery/economy/vending/wallmed{
- name = "Emergency NanoMed";
- pixel_y = 28
+/obj/structure/sink{
+ pixel_y = 22
},
/turf/simulated/floor/plating,
/area/station/maintenance/starboard2)
@@ -88319,11 +87869,28 @@
},
/area/station/service/kitchen)
"vpj" = (
-/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{
- dir = 4
+/obj/machinery/atmospherics/pipe/manifold/visible{
+ dir = 4;
+ initialize_directions = 11
},
-/turf/simulated/wall/r_wall,
+/obj/machinery/atmospherics/meter,
+/turf/simulated/floor/plasteel,
/area/station/science/toxins/mixing)
+"vpo" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 6
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard2)
+"vpw" = (
+/obj/machinery/kitchen_machine/oven,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "cafeteria"
+ },
+/area/station/service/kitchen)
"vpQ" = (
/obj/structure/cable/pink{
icon_state = "0-4"
@@ -88354,18 +87921,21 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/structure/cable/yellow,
+/obj/machinery/door/poddoor/preopen{
+ id_tag = "Xenolab";
+ name = "special containment blast door"
+ },
+/obj/structure/cable/yellow{
+ d2 = 2;
+ icon_state = "0-2"
+ },
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
-/obj/machinery/door/poddoor/preopen{
- id_tag = "Xenolab";
- name = "test chamber blast door"
- },
/turf/simulated/floor/engine,
-/area/station/science/test_chamber)
+/area/station/science/xenobiology)
"vqD" = (
/obj/structure/lattice,
/obj/item/shard,
@@ -88465,6 +88035,30 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
+"vsR" = (
+/obj/structure/disposalpipe/segment{
+ dir = 8;
+ icon_state = "pipe-c"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 9
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 9
+ },
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
+/obj/machinery/status_display{
+ dir = 4;
+ pixel_y = -32
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/science/research)
"vsZ" = (
/obj/machinery/light,
/turf/simulated/floor/plasteel{
@@ -88496,6 +88090,29 @@
},
/turf/simulated/floor/engine/n2,
/area/station/engineering/atmos)
+"vtA" = (
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 1;
+ icon_state = "pipe-c"
+ },
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+ dir = 8
+ },
+/turf/simulated/floor/plasteel,
+/area/station/hallway/primary/aft)
"vtO" = (
/obj/structure/cable/yellow{
d1 = 1;
@@ -88530,6 +88147,12 @@
icon_state = "dark"
},
/area/station/service/expedition)
+"vtY" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/closet/crate,
+/obj/effect/spawner/lootdrop/maintenance,
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard)
"vub" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -88540,7 +88163,6 @@
},
/area/station/security/brig)
"vud" = (
-/obj/effect/turf_decal/delivery/hollow,
/obj/machinery/atmospherics/portable/canister/air,
/turf/simulated/floor/plasteel,
/area/station/engineering/atmos/control)
@@ -88599,20 +88221,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
-"vvR" = (
-/obj/structure/disposalpipe/junction{
- dir = 1;
- icon_state = "pipe-j2"
- },
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/plasteel,
-/area/station/maintenance/starboard)
"vwt" = (
/obj/structure/extinguisher_cabinet{
name = "west bump";
@@ -88649,6 +88257,15 @@
},
/turf/simulated/floor/plasteel,
/area/station/supply/storage)
+"vwU" = (
+/obj/machinery/atmospherics/pipe/simple/hidden{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "whitepurple"
+ },
+/area/station/maintenance/asmaint)
"vxc" = (
/obj/machinery/door/firedoor,
/obj/effect/spawner/window/reinforced,
@@ -88662,15 +88279,6 @@
/obj/effect/spawner/lootdrop/maintenance/three,
/turf/simulated/floor/plating,
/area/station/maintenance/fpmaint)
-"vxj" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/turf/simulated/floor/plasteel{
- icon_state = "white"
- },
-/area/station/science/xenobiology)
"vxx" = (
/obj/effect/spawner/lootdrop{
icon_state = "grille";
@@ -88763,6 +88371,29 @@
icon_state = "whiteblue"
},
/area/station/medical/medbay)
+"vAa" = (
+/obj/machinery/atmospherics/pipe/simple/hidden,
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plasteel{
+ dir = 6;
+ icon_state = "whitepurple"
+ },
+/area/station/maintenance/asmaint)
+"vAb" = (
+/obj/machinery/biogenerator,
+/obj/item/reagent_containers/glass/bucket,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "green"
+ },
+/area/station/service/hydroponics)
"vAN" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/visible{
@@ -88859,35 +88490,39 @@
/obj/effect/landmark/damageturf,
/turf/simulated/floor/plating,
/area/station/maintenance/aft)
-"vCK" = (
-/obj/machinery/atmospherics/pipe/simple/visible{
- dir = 4
+"vCB" = (
+/obj/machinery/door/poddoor/preopen{
+ name = "Biohazard Shutter";
+ id_tag = "RnDChem"
},
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 4;
- icon_state = "1-4"
+/obj/machinery/door/airlock/research/glass{
+ name = "Test Chamber"
},
+/obj/effect/mapping_helpers/airlock/access/all/science/research,
+/obj/structure/disposalpipe/segment,
+/obj/machinery/door/firedoor,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 8;
- icon_state = "1-8"
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/science/test_chamber)
+"vCK" = (
+/obj/machinery/atmospherics/pipe/simple/visible{
+ dir = 4
},
/obj/machinery/door/airlock/research/glass,
/obj/effect/mapping_helpers/airlock/autoname,
/obj/effect/mapping_helpers/airlock/access/all/science/xenobio,
-/obj/effect/turf_decal/delivery/hollow,
/obj/machinery/door/poddoor/preopen{
id_tag = "Xenolab";
- name = "test chamber blast door"
+ name = "special containment blast door"
},
/turf/simulated/floor/engine,
-/area/station/science/test_chamber)
+/area/station/science/xenobiology)
"vCR" = (
/obj/machinery/light{
dir = 4
@@ -88904,16 +88539,14 @@
icon_state = "darkgrey"
},
/area/station/medical/morgue)
-"vDG" = (
-/obj/structure/window/plasmareinforced{
- dir = 8
- },
-/obj/machinery/atmospherics/unary/passive_vent{
- dir = 8
+"vDQ" = (
+/obj/machinery/door/poddoor/preopen{
+ name = "Biohazard Shutter";
+ id_tag = "RnDChem"
},
-/obj/structure/lattice/catwalk,
-/turf/space,
-/area/space/nearstation)
+/obj/effect/spawner/window/reinforced/plasma,
+/turf/simulated/floor/engine,
+/area/station/science/test_chamber)
"vDZ" = (
/obj/structure/cable/yellow{
d1 = 2;
@@ -88945,6 +88578,12 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel,
/area/station/security/processing)
+"vFm" = (
+/obj/structure/closet/emcloset,
+/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random_spawners/cobweb_left_rare,
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard)
"vFz" = (
/obj/structure/transit_tube/curved{
dir = 4
@@ -88970,8 +88609,8 @@
},
/area/station/medical/reception)
"vGR" = (
-/obj/structure/chair/stool,
-/turf/simulated/floor/plating,
+/obj/item/seeds/berry,
+/turf/simulated/floor/wood,
/area/station/maintenance/starboard2)
"vHA" = (
/obj/machinery/light{
@@ -89042,13 +88681,6 @@
},
/area/station/aisat)
"vIY" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "whitepurple"
@@ -89121,28 +88753,12 @@
},
/turf/simulated/floor/wood,
/area/station/command/office/hos)
-"vKI" = (
-/obj/item/radio/intercom{
- name = "south bump";
- pixel_y = -28
- },
-/turf/simulated/floor/plasteel{
- icon_state = "greenblue"
- },
-/area/station/service/hydroponics)
"vKU" = (
/obj/effect/turf_decal/stripes/corner,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
/area/station/science/xenobiology)
-"vLA" = (
-/obj/effect/turf_decal/delivery/hollow,
-/obj/machinery/atmospherics/portable/canister/carbon_dioxide,
-/turf/simulated/floor/plasteel{
- icon_state = "darkgrey"
- },
-/area/station/science/storage)
"vLQ" = (
/obj/structure/table,
/obj/item/poster/random_official,
@@ -89209,6 +88825,10 @@
icon_state = "red"
},
/area/station/security/processing)
+"vNL" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
+/turf/simulated/floor/plasteel,
+/area/station/maintenance/aft2)
"vNV" = (
/obj/machinery/power/apc{
dir = 4;
@@ -89270,6 +88890,15 @@
icon_state = "dark"
},
/area/station/engineering/atmos)
+"vQo" = (
+/obj/item/stack/sheet/cardboard{
+ amount = 2
+ },
+/obj/item/reagent_containers/food/snacks/monkeycube,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/effect/decal/cleanable/blood/drip,
+/turf/simulated/floor/plasteel,
+/area/station/maintenance/asmaint)
"vQr" = (
/obj/machinery/newscaster{
dir = 4;
@@ -89279,15 +88908,6 @@
/obj/machinery/light{
dir = 8
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 6
- },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "whitepurple"
@@ -89305,25 +88925,16 @@
},
/area/station/science/research)
"vRv" = (
-/obj/structure/closet/secure_closet/freezer/fridge,
-/obj/machinery/door_control{
- id = "kitchen_counter";
- name = "Kitchen Counter Shutters";
- pixel_x = -6;
- pixel_y = 24;
- req_access_txt = "28"
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
+/obj/machinery/camera{
+ c_tag = "Kitchen Freezer"
},
-/obj/effect/turf_decal/tile/bar{
- dir = 1
+/obj/structure/closet/secure_closet/freezer/meat,
+/obj/item/radio/intercom{
+ name = "north bump";
+ pixel_y = 28
},
/turf/simulated/floor/plasteel{
- icon_state = "whitecorner"
+ icon_state = "showroomfloor"
},
/area/station/service/kitchen)
"vRY" = (
@@ -89379,6 +88990,9 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/aft)
+"vSM" = (
+/turf/simulated/floor/grass,
+/area/station/service/hydroponics)
"vSR" = (
/obj/structure/lattice,
/obj/machinery/atmospherics/pipe/manifold/visible/yellow{
@@ -89615,7 +89229,6 @@
/turf/simulated/floor/plasteel,
/area/station/maintenance/fore)
"vYQ" = (
-/obj/effect/turf_decal/delivery/hollow,
/obj/machinery/atmospherics/portable/canister/oxygen,
/obj/machinery/atmospherics/pipe/simple/hidden/purple{
dir = 4
@@ -89623,13 +89236,9 @@
/turf/simulated/floor/plasteel,
/area/station/engineering/atmos/control)
"vZh" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
- dir = 1
- },
-/turf/simulated/floor/plasteel{
- icon_state = "whitepurplecorner"
- },
-/area/station/science/explab)
+/obj/machinery/atmospherics/unary/vent_pump/on,
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard2)
"vZl" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -89655,6 +89264,13 @@
},
/turf/simulated/floor/plating,
/area/station/hallway/secondary/entry)
+"vZH" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard2)
"vZU" = (
/obj/machinery/atmospherics/unary/thermomachine/freezer{
dir = 1
@@ -89677,12 +89293,45 @@
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/grass/no_creep,
/area/station/security/permabrig)
-"waF" = (
-/obj/structure/computerframe{
- dir = 8
+"waj" = (
+/obj/machinery/newscaster{
+ dir = 8;
+ name = "east bump";
+ pixel_x = 28
},
-/turf/simulated/floor/grass,
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 4
+ },
+/obj/structure/cable/yellow{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
+ },
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "whitepurplecorner"
+ },
+/area/station/science/research)
+"waF" = (
+/obj/item/flag/syndi,
+/turf/simulated/floor/plating,
/area/station/maintenance/aft2)
+"waX" = (
+/obj/effect/decal/cleanable/blood/writing,
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 5
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard2)
"wbG" = (
/obj/structure/table/glass,
/obj/machinery/door/window/classic/normal{
@@ -89707,16 +89356,21 @@
/turf/simulated/floor/plating,
/area/station/maintenance/fpmaint)
"wci" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
+/obj/machinery/atmospherics/portable/canister/sleeping_agent,
+/obj/structure/extinguisher_cabinet{
+ name = "east bump";
+ pixel_x = 27
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
+/obj/machinery/camera{
+ c_tag = "Science - Toxins Secure - Starboard";
+ dir = 8;
+ network = list("Research","SS13")
},
+/obj/effect/turf_decal/delivery/hollow,
/turf/simulated/floor/plasteel{
- icon_state = "white"
+ icon_state = "darkgrey"
},
-/area/station/science/toxins/launch)
+/area/station/science/storage)
"wck" = (
/obj/structure/table/glass,
/obj/machinery/atmospherics/unary/vent_scrubber/on{
@@ -89749,6 +89403,15 @@
icon_state = "darkbluecorners"
},
/area/station/medical/surgery/observation)
+"wcT" = (
+/obj/effect/spawner/window/reinforced,
+/obj/machinery/door/poddoor/shutters/preopen{
+ id_tag = "rdrnd";
+ name = "Research and Development Shutters";
+ dir = 2
+ },
+/turf/simulated/floor/plating,
+/area/station/science/explab)
"wcU" = (
/obj/machinery/light,
/turf/simulated/floor/plasteel,
@@ -89768,6 +89431,19 @@
icon_state = "red"
},
/area/station/security/main)
+"wdY" = (
+/obj/structure/sign/poster/official/random{
+ pixel_y = -32
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plasteel,
+/area/station/maintenance/starboard2)
+"wec" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 4
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard2)
"wey" = (
/obj/structure/cable/yellow{
d1 = 4;
@@ -89788,25 +89464,39 @@
"wez" = (
/obj/effect/spawner/window/reinforced,
/obj/machinery/door/poddoor/shutters/preopen{
- dir = 2;
id_tag = "roboticsprivacy2";
name = "Robotics Shutters"
},
/turf/simulated/floor/plating,
/area/station/science/robotics)
-"weC" = (
-/obj/item/radio/intercom{
- name = "south bump";
- pixel_y = -28
- },
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
+"weB" = (
+/obj/machinery/atmospherics/pipe/manifold/visible{
dir = 8
},
+/obj/effect/turf_decal/stripes/white/corner{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/plasteel,
+/area/station/science/toxins/mixing)
+"weC" = (
/obj/structure/disposalpipe/segment{
- dir = 4
+ dir = 4;
+ icon_state = "pipe-c"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 6
+ },
+/obj/structure/cable/yellow{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
},
/turf/simulated/floor/plasteel{
- dir = 1;
+ dir = 9;
icon_state = "whitepurple"
},
/area/station/science/research)
@@ -89851,44 +89541,33 @@
},
/area/station/turret_protected/ai_upload)
"wfE" = (
-/obj/effect/landmark/lightsout,
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
+/obj/item/storage/toolbox/mechanical{
+ pixel_x = -3;
+ pixel_y = 3
},
-/obj/machinery/hologram/holopad,
-/obj/effect/landmark/start/scientist,
-/turf/simulated/floor/plasteel{
- icon_state = "white"
+/obj/structure/table,
+/obj/item/storage/toolbox/electrical,
+/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random_spawners/cobweb_right_rare,
+/turf/simulated/floor/plasteel,
+/area/station/maintenance/starboard2)
+"wgz" = (
+/obj/effect/spawner/window/reinforced/plasma/grilled,
+/obj/machinery/door/poddoor/preopen{
+ id_tag = "Xenolab";
+ name = "special containment blast door"
},
-/area/station/science/explab)
-"wgh" = (
/obj/structure/cable/yellow{
- d1 = 1;
d2 = 2;
- icon_state = "1-2"
+ icon_state = "0-2"
},
-/turf/simulated/floor/plating,
-/area/station/maintenance/aft2)
-"wgz" = (
-/obj/effect/spawner/window/reinforced/plasma/grilled,
-/obj/structure/cable/yellow,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
-/obj/machinery/door/poddoor/preopen{
- id_tag = "Xenolab";
- name = "test chamber blast door"
- },
/turf/simulated/floor/engine,
-/area/station/science/test_chamber)
+/area/station/science/xenobiology)
"wgE" = (
/obj/structure/table/glass,
/obj/item/paper_bin{
@@ -89902,6 +89581,14 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel,
/area/station/engineering/break_room)
+"wgT" = (
+/mob/living/simple_animal/cow/betsy,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 5
+ },
+/turf/simulated/floor/grass,
+/area/station/service/hydroponics)
"whf" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
@@ -89920,6 +89607,23 @@
},
/turf/simulated/floor/plasteel,
/area/station/security/permabrig)
+"whx" = (
+/obj/structure/table,
+/obj/item/paper_bin,
+/obj/item/pen,
+/obj/machinery/requests_console{
+ department = "Science";
+ departmentType = 2;
+ name = "Science Requests Console";
+ pixel_x = -30
+ },
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 1
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "darkgrey"
+ },
+/area/station/science/toxins/launch)
"whX" = (
/obj/machinery/space_heater,
/obj/machinery/light/small{
@@ -90082,6 +89786,16 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/fpmaint)
+"wlG" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/aft2)
"wlL" = (
/obj/effect/turf_decal/stripes/line{
dir = 5
@@ -90108,6 +89822,13 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/aft)
+"wlW" = (
+/obj/structure/chair/stool{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard2)
"wma" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -90125,6 +89846,16 @@
icon_state = "whitebluecorner"
},
/area/station/medical/medbay)
+"wmR" = (
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard2)
"wmS" = (
/obj/machinery/atmospherics/pipe/simple/visible/green{
dir = 4
@@ -90138,6 +89869,12 @@
},
/turf/simulated/floor/engine/vacuum,
/area/station/science/toxins/mixing)
+"wnx" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 10
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/asmaint)
"wnz" = (
/turf/simulated/floor/plasteel,
/area/station/security/prisonlockers)
@@ -90157,21 +89894,30 @@
},
/area/station/security/permabrig)
"wos" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 5
},
/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
},
/turf/simulated/floor/plasteel{
- icon_state = "whitepurple"
+ icon_state = "whitepurplecorner"
},
/area/station/science/research)
+"woK" = (
+/obj/effect/spawner/lootdrop{
+ loot = list(/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes);
+ name = "trash spawner"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
+/obj/item/pen,
+/turf/simulated/floor/bluegrid,
+/area/station/maintenance/starboard)
"woN" = (
/obj/structure/transit_tube/curved{
dir = 8
@@ -90194,15 +89940,12 @@
/turf/simulated/floor/plasteel,
/area/station/supply/lobby)
"wpL" = (
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/turf/simulated/floor/plasteel{
- icon_state = "whiteblue"
+/obj/machinery/disposal,
+/obj/structure/disposalpipe/trunk{
+ dir = 1
},
-/area/station/science/explab)
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard2)
"wqf" = (
/obj/structure/cable/yellow{
d1 = 4;
@@ -90250,6 +89993,11 @@
icon_state = "dark"
},
/area/station/aisat)
+"wrO" = (
+/obj/structure/closet/firecloset,
+/obj/effect/spawner/lootdrop/maintenance,
+/turf/simulated/floor/plasteel,
+/area/station/maintenance/starboard2)
"wrW" = (
/obj/machinery/atmospherics/pipe/manifold/visible/yellow{
dir = 8
@@ -90257,11 +90005,10 @@
/turf/simulated/floor/plasteel,
/area/station/engineering/atmos)
"wsu" = (
-/obj/machinery/atmospherics/pipe/simple/insulated,
-/obj/machinery/light/small{
- dir = 8
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 1
},
-/obj/effect/decal/cleanable/dirt,
+/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel,
/area/station/science/toxins/mixing)
"wsx" = (
@@ -90309,15 +90056,15 @@
/area/station/security/brig)
"wtm" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 10
- },
/obj/effect/turf_decal/stripes/line,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 10
+ },
/turf/simulated/floor/plating,
/area/station/maintenance/xenobio_north)
"wtz" = (
@@ -90443,20 +90190,10 @@
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/entry)
"wvJ" = (
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/effect/spawner/lootdrop{
- icon_state = "grille";
- loot = list(/obj/structure/grille=8,/obj/structure/grille/broken=2);
- name = "normal or broken grille spawner"
+/turf/simulated/floor/plasteel{
+ icon_state = "whitepurple"
},
-/turf/simulated/floor/plating,
-/area/station/maintenance/aft2)
+/area/station/maintenance/asmaint)
"wvK" = (
/obj/effect/turf_decal/stripes/line,
/turf/simulated/floor/plating,
@@ -90477,11 +90214,14 @@
},
/area/station/supply/office)
"wwo" = (
-/obj/effect/turf_decal/tile/bar,
/obj/structure/disposalpipe/segment,
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "neutralcorner"
+ icon_state = "redcorner"
},
/area/station/hallway/primary/starboard)
"www" = (
@@ -90555,12 +90295,34 @@
/obj/machinery/shower{
dir = 1
},
-/obj/effect/turf_decal/delivery/hollow,
/obj/effect/turf_decal/stripes/line{
dir = 5
},
/turf/simulated/floor/plasteel,
/area/station/science/xenobiology)
+"wxV" = (
+/obj/machinery/door/airlock/research,
+/obj/effect/mapping_helpers/airlock/access/all/science/tox,
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
+/turf/simulated/floor/plating,
+/area/station/maintenance/aft2)
+"wxY" = (
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 8
+ },
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "cafeteria"
+ },
+/area/station/service/kitchen)
"wyb" = (
/obj/structure/cable/yellow{
d1 = 1;
@@ -90588,6 +90350,13 @@
},
/turf/simulated/floor/plasteel,
/area/station/command/teleporter)
+"wyC" = (
+/obj/machinery/atmospherics/portable/canister/oxygen,
+/obj/effect/turf_decal/delivery/blue/hollow,
+/turf/simulated/floor/plasteel{
+ icon_state = "darkgrey"
+ },
+/area/station/science/storage)
"wyE" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -90688,25 +90457,19 @@
},
/area/station/turret_protected/ai)
"wBj" = (
-/obj/structure/reagent_dispensers/beerkeg,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
+/obj/structure/table,
+/obj/item/radio/intercom{
+ name = "south bump";
+ pixel_y = -28
},
-/obj/machinery/light_switch{
- dir = 1;
- name = "custom placement";
+/obj/machinery/reagentgrinder{
pixel_x = 6;
- pixel_y = -24
+ pixel_y = 6
},
-/obj/machinery/camera{
- c_tag = "Bar - Backroom";
- dir = 1
+/turf/simulated/floor/plasteel{
+ icon_state = "cafeteria"
},
-/turf/simulated/floor/wood,
-/area/station/service/bar)
+/area/station/service/kitchen)
"wBl" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
@@ -90723,6 +90486,22 @@
/obj/effect/spawner/lootdrop/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
+"wBW" = (
+/obj/machinery/firealarm{
+ dir = 1;
+ name = "south bump";
+ pixel_y = -24
+ },
+/obj/machinery/camera{
+ c_tag = "Science Toxins Mix";
+ dir = 10;
+ network = list("Research","SS13")
+ },
+/obj/machinery/atmospherics/unary/thermomachine/freezer{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel,
+/area/station/science/toxins/mixing)
"wCm" = (
/obj/machinery/power/apc{
dir = 4;
@@ -90759,28 +90538,20 @@
icon_state = "green"
},
/area/station/engineering/atmos/distribution)
-"wDg" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
+"wDC" = (
+/obj/machinery/door/airlock/research,
+/obj/effect/mapping_helpers/airlock/autoname,
+/obj/effect/mapping_helpers/airlock/access/all/science/research,
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/cable/yellow{
d1 = 1;
- d2 = 8;
- icon_state = "1-8"
- },
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
+ d2 = 2;
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
- icon_state = "whitepurplecorner"
+ icon_state = "whitepurplefull"
},
/area/station/science/explab)
"wDM" = (
@@ -90861,19 +90632,24 @@
/obj/structure/chair/stool,
/turf/simulated/floor/plasteel,
/area/station/engineering/break_room)
-"wED" = (
-/obj/effect/turf_decal/delivery/hollow,
-/obj/effect/turf_decal/stripes/white/line{
- dir = 8
+"wEM" = (
+/obj/structure/table,
+/obj/item/mmi,
+/obj/item/mmi,
+/obj/item/mmi,
+/obj/item/robotanalyzer,
+/obj/machinery/alarm{
+ dir = 1;
+ name = "south bump";
+ pixel_y = -24
},
-/obj/machinery/atmospherics/portable/canister/toxins,
-/obj/structure/window/reinforced{
- dir = 8
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 1
},
/turf/simulated/floor/plasteel{
- icon_state = "darkgrey"
+ icon_state = "whitepurple"
},
-/area/station/science/storage)
+/area/station/science/robotics)
"wET" = (
/obj/machinery/atmospherics/pipe/simple/visible,
/obj/machinery/atmospherics/meter{
@@ -90889,24 +90665,16 @@
icon_state = "darkbluecorners"
},
/area/station/medical/surgery/observation)
+"wFC" = (
+/obj/effect/spawner/random_spawners/grille_often,
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard)
"wFW" = (
/obj/machinery/light/small{
dir = 1
},
/turf/simulated/floor/plating,
/area/station/maintenance/aft)
-"wGc" = (
-/obj/structure/table,
-/obj/item/stock_parts/matter_bin{
- pixel_x = 3;
- pixel_y = 3
- },
-/obj/item/stock_parts/matter_bin,
-/obj/item/stock_parts/micro_laser,
-/turf/simulated/floor/plasteel{
- icon_state = "white"
- },
-/area/station/science/rnd)
"wGr" = (
/obj/structure/cable/yellow{
d1 = 1;
@@ -90927,6 +90695,16 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
+"wGR" = (
+/obj/structure/flora/ausbushes/grassybush,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 10
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 10
+ },
+/turf/simulated/floor/grass,
+/area/station/service/hydroponics)
"wHw" = (
/obj/structure/cable/yellow{
d2 = 2;
@@ -91012,6 +90790,14 @@
},
/turf/simulated/floor/engine,
/area/station/engineering/control)
+"wKQ" = (
+/obj/effect/spawner/lootdrop/maintenance,
+/obj/structure/table,
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 4
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/aft2)
"wKS" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable/yellow{
@@ -91056,18 +90842,6 @@
icon_state = "neutralcorner"
},
/area/station/hallway/secondary/bridge)
-"wMR" = (
-/obj/effect/turf_decal/stripes/white/line,
-/obj/effect/turf_decal/stripes/white/line{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- icon_state = "darkgrey"
- },
-/area/station/science/storage)
"wNA" = (
/obj/structure/disposalpipe/segment{
dir = 8;
@@ -91120,7 +90894,6 @@
/turf/simulated/floor/plating,
/area/station/maintenance/aft)
"wOn" = (
-/obj/effect/turf_decal/delivery/white/hollow,
/obj/machinery/smartfridge/secure/extract,
/turf/simulated/floor/plasteel{
dir = 1;
@@ -91132,16 +90905,6 @@
name = "Science Chemistry";
dir = 1
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/obj/effect/turf_decal/tile/purple{
- dir = 1
- },
-/obj/effect/turf_decal/tile/purple,
/obj/effect/mapping_helpers/airlock/windoor/access/all/science/research{
dir = 1
},
@@ -91179,20 +90942,51 @@
icon_state = "red"
},
/area/station/security/permabrig)
-"wQe" = (
-/obj/structure/table/wood,
-/obj/item/clothing/glasses/monocle,
-/obj/structure/cable/yellow{
- d2 = 2;
- icon_state = "0-2"
+"wPp" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
},
-/obj/machinery/power/apc{
- dir = 1;
- name = "north bump";
- pixel_y = 24
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel,
+/area/station/maintenance/starboard2)
+"wPP" = (
+/obj/machinery/atmospherics/pipe/simple/heat_exchanging{
+ dir = 5
+ },
+/obj/structure/lattice/catwalk,
+/turf/space,
+/area/space/nearstation)
+"wPS" = (
+/obj/machinery/smartfridge,
+/obj/machinery/door/window/classic/normal{
+ name = "Anti-Theft Shield";
+ dir = 1
},
+/obj/effect/mapping_helpers/airlock/windoor/access/any/service/hydroponics{
+ dir = 1
+ },
+/obj/effect/mapping_helpers/airlock/windoor/access/any/service/kitchen{
+ dir = 1
+ },
+/obj/machinery/door/poddoor/shutters/preopen{
+ dir = 2;
+ id_tag = "hydro_service";
+ name = "Service Desk Shutter"
+ },
+/obj/machinery/door/window/classic/normal{
+ name = "Hydroponics Window"
+ },
+/obj/effect/mapping_helpers/airlock/windoor/access/any/service/hydroponics,
+/turf/simulated/floor/plasteel,
+/area/station/service/kitchen)
+"wQe" = (
+/obj/structure/reagent_dispensers/beerkeg,
+/obj/structure/table/wood,
+/obj/machinery/light/small,
/turf/simulated/floor/wood,
-/area/station/service/theatre)
+/area/station/service/bar)
"wQo" = (
/obj/machinery/atmospherics/pipe/manifold/visible/yellow{
dir = 1
@@ -91221,6 +91015,18 @@
icon_state = "dark"
},
/area/station/security/execution)
+"wQQ" = (
+/obj/machinery/door/airlock/maintenance,
+/obj/effect/mapping_helpers/airlock/autoname,
+/obj/effect/mapping_helpers/airlock/access/all/science/tox,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/turf/simulated/floor/plating,
+/area/station/science/toxins/mixing)
"wRh" = (
/obj/machinery/door/window/classic/reversed{
name = "Shooting Range";
@@ -91286,6 +91092,10 @@
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/grass/no_creep,
/area/station/security/permabrig)
+"wSg" = (
+/obj/effect/spawner/random_spawners/fungus_probably,
+/turf/simulated/wall,
+/area/station/maintenance/aft2)
"wSh" = (
/obj/machinery/cryopod{
dir = 4
@@ -91349,17 +91159,13 @@
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
"wTJ" = (
-/obj/machinery/firealarm{
- name = "north bump";
- pixel_y = 24
- },
/obj/machinery/light{
dir = 1
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/structure/cable/yellow{
@@ -91456,6 +91262,21 @@
},
/turf/simulated/floor/plating,
/area/station/engineering/control)
+"wWu" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/plasteel,
+/area/station/maintenance/aft2)
"wWG" = (
/turf/simulated/floor/plasteel{
dir = 1;
@@ -91529,6 +91350,12 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
+"wYn" = (
+/turf/simulated/floor/plasteel{
+ dir = 10;
+ icon_state = "whitepurple"
+ },
+/area/station/science/research)
"wYs" = (
/obj/structure/transit_tube/diagonal,
/turf/space,
@@ -91538,9 +91365,6 @@
dir = 8
},
/obj/structure/table,
-/obj/machinery/computer/security/telescreen/research{
- pixel_y = 30
- },
/obj/item/radio/intercom{
name = "custom placement";
pixel_y = 4
@@ -91552,11 +91376,19 @@
},
/obj/machinery/door_control{
id = "Xenolab";
- name = "Test Chamber Blast Doors";
+ name = "Special Containment Blast Doors";
pixel_x = 4;
pixel_y = -3;
req_access_txt = "55"
},
+/obj/machinery/computer/security/telescreen{
+ desc = "Used for watching the special containment chamber.";
+ layer = 4;
+ name = "Special Containment Chamber Telescreen";
+ network = list("Containment");
+ pixel_x = -2;
+ pixel_y = 30
+ },
/turf/simulated/floor/plasteel,
/area/station/science/xenobiology)
"wZw" = (
@@ -91595,6 +91427,10 @@
icon_state = "barber"
},
/area/station/service/barber)
+"xan" = (
+/obj/item/flag/nt,
+/turf/simulated/floor/plating,
+/area/station/maintenance/aft2)
"xaq" = (
/obj/machinery/door/firedoor,
/obj/structure/disposalpipe/segment{
@@ -91689,27 +91525,13 @@
/turf/simulated/wall,
/area/station/science/toxins/mixing)
"xbt" = (
-/obj/machinery/door/airlock{
- name = "Theatre Backstage"
- },
-/obj/effect/mapping_helpers/airlock/access/all/service/theatre,
-/obj/effect/mapping_helpers/airlock/unres,
-/obj/machinery/door/firedoor,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/wood,
-/area/station/service/theatre)
-"xbu" = (
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/plasteel{
- icon_state = "white"
+/obj/machinery/atmospherics/portable/canister/nitrogen,
+/obj/effect/turf_decal/delivery/white/hollow,
+/obj/machinery/atmospherics/unary/portables_connector{
+ dir = 1
},
-/area/station/science/toxins/mixing)
+/turf/simulated/floor/bluespace,
+/area/station/maintenance/starboard)
"xbw" = (
/obj/machinery/atmospherics/trinary/filter{
dir = 1;
@@ -91823,6 +91645,16 @@
icon_state = "darkred"
},
/area/station/security/armory/secure)
+"xdo" = (
+/obj/machinery/status_display{
+ dir = 4;
+ pixel_y = -32
+ },
+/obj/machinery/atmospherics/unary/thermomachine/freezer{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel,
+/area/station/science/toxins/mixing)
"xdy" = (
/turf/simulated/floor/plasteel{
icon_state = "yellowfull"
@@ -91835,11 +91667,15 @@
/turf/simulated/floor/plating,
/area/station/service/chapel)
"xdT" = (
+/obj/item/radio/intercom{
+ name = "south bump";
+ pixel_y = -28
+ },
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+ dir = 8
},
/turf/simulated/floor/plasteel{
dir = 1;
@@ -91906,11 +91742,16 @@
d2 = 4;
icon_state = "1-4"
},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/structure/cable/yellow{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
+/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/starboard)
"xfG" = (
@@ -92042,6 +91883,25 @@
icon_state = "darkbluecorners"
},
/area/station/aisat)
+"xjA" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 4
+ },
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/plasteel,
+/area/station/maintenance/starboard2)
"xjB" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 6
@@ -92075,11 +91935,20 @@
icon_state = "green"
},
/area/station/security/permabrig)
+"xkc" = (
+/obj/structure/closet,
+/obj/effect/spawner/lootdrop/maintenance,
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard2)
"xkD" = (
/obj/effect/decal/snow,
/obj/structure/snowman/built,
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
+"xkQ" = (
+/obj/effect/spawner/random_spawners/blood_often,
+/turf/simulated/floor/plating,
+/area/station/maintenance/aft2)
"xkR" = (
/obj/machinery/door/airlock/atmos/glass{
name = "Auxiliary Chamber"
@@ -92109,6 +91978,10 @@
icon_state = "white"
},
/area/station/science/genetics)
+"xlh" = (
+/obj/structure/reagent_dispensers/watertank,
+/turf/simulated/floor/plasteel,
+/area/station/maintenance/asmaint)
"xlu" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable/yellow{
@@ -92117,6 +91990,9 @@
icon_state = "1-2"
},
/obj/effect/turf_decal/stripes/corner,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 5
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -92169,6 +92045,12 @@
icon_state = "darkgrey"
},
/area/station/medical/morgue)
+"xmM" = (
+/obj/structure/table/reinforced,
+/obj/item/storage/toolbox/mechanical,
+/obj/item/stack/cable_coil,
+/turf/simulated/floor/plating,
+/area/station/maintenance/aft2)
"xmN" = (
/obj/structure/table/reinforced,
/obj/machinery/door/firedoor,
@@ -92196,6 +92078,20 @@
icon_state = "whitepurplefull"
},
/area/station/science/rnd)
+"xmO" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 6
+ },
+/obj/structure/cable/yellow{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 6
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard2)
"xnb" = (
/obj/machinery/light/small{
dir = 8
@@ -92236,6 +92132,17 @@
icon_state = "darkbluecorners"
},
/area/station/command/bridge)
+"xno" = (
+/obj/structure/disposalpipe/segment{
+ dir = 8;
+ icon_state = "pipe-c"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/science/toxins/mixing)
"xnp" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 8
@@ -92260,18 +92167,6 @@
icon_state = "darkgrey"
},
/area/station/hallway/primary/central)
-"xoB" = (
-/obj/machinery/status_display{
- dir = 4;
- pixel_y = -32
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- icon_state = "white"
- },
-/area/station/science/research)
"xoI" = (
/obj/structure/cable/yellow{
d1 = 1;
@@ -92358,6 +92253,19 @@
icon_state = "white"
},
/area/station/science/xenobiology)
+"xpP" = (
+/obj/machinery/door/airlock/maintenance,
+/obj/effect/mapping_helpers/airlock/autoname,
+/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/asmaint)
"xpX" = (
/obj/machinery/light/small{
dir = 1
@@ -92418,15 +92326,6 @@
icon_state = "darkbluecorners"
},
/area/station/engineering/break_room)
-"xrS" = (
-/obj/structure/chair/office/light{
- dir = 8
- },
-/obj/machinery/atmospherics/unary/vent_scrubber/on,
-/turf/simulated/floor/plasteel{
- icon_state = "white"
- },
-/area/station/science/toxins/launch)
"xrZ" = (
/obj/structure/closet/firecloset,
/obj/effect/decal/cleanable/cobweb2,
@@ -92435,6 +92334,15 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/fpmaint)
+"xsj" = (
+/obj/effect/spawner/window/reinforced/plasma/grilled,
+/obj/machinery/door/poddoor/preopen{
+ id_tag = "Xenolab";
+ name = "special containment blast door"
+ },
+/obj/structure/cable/yellow,
+/turf/simulated/floor/engine,
+/area/station/science/xenobiology)
"xsF" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -92449,6 +92357,19 @@
/obj/machinery/disposal,
/turf/simulated/floor/carpet,
/area/station/security/detective)
+"xte" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 2;
+ icon_state = "pipe-c"
+ },
+/turf/simulated/floor/plasteel,
+/area/station/engineering/atmos/control)
"xtp" = (
/obj/structure/cable/yellow{
d2 = 2;
@@ -92478,6 +92399,10 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/xenobio_south)
+"xtx" = (
+/obj/effect/spawner/random_spawners/wall_rusted_probably,
+/turf/simulated/wall/r_wall,
+/area/station/science/toxins/launch)
"xtA" = (
/obj/item/radio/intercom{
name = "west bump";
@@ -92488,21 +92413,22 @@
icon_state = "red"
},
/area/station/hallway/secondary/exit)
-"xtP" = (
-/obj/item/kirbyplants{
- icon_state = "plant-21"
- },
-/obj/structure/sign/botany{
- pixel_x = 32
- },
+"xtZ" = (
+/obj/structure/table,
+/obj/structure/table,
+/obj/item/wrench,
+/obj/item/crowbar,
/turf/simulated/floor/plasteel{
- icon_state = "green"
+ icon_state = "darkgrey"
},
-/area/station/hallway/primary/central)
+/area/station/science/toxins/launch)
"xux" = (
/obj/machinery/atmospherics/pipe/simple/visible/purple{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "caution"
@@ -92707,17 +92633,6 @@
/obj/effect/turf_decal/delivery,
/turf/simulated/floor/plasteel,
/area/station/security/main)
-"xyQ" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/effect/spawner/lootdrop{
- icon_state = "grille";
- loot = list(/obj/structure/grille=8,/obj/structure/grille/broken=2);
- name = "normal or broken grille spawner"
- },
-/turf/simulated/floor/plating,
-/area/station/maintenance/starboard)
"xzB" = (
/obj/item/cigbutt,
/turf/simulated/floor/plating,
@@ -92806,14 +92721,6 @@
},
/turf/simulated/floor/plasteel,
/area/station/security/brig)
-"xBs" = (
-/obj/effect/turf_decal/stripes/white/line{
- dir = 1
- },
-/obj/machinery/hologram/holopad,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/plasteel,
-/area/station/science/toxins/mixing)
"xBS" = (
/obj/machinery/light_switch{
dir = 4;
@@ -92884,7 +92791,6 @@
dir = 4
},
/obj/structure/window/reinforced,
-/obj/effect/turf_decal/delivery/hollow,
/obj/machinery/atmospherics/portable/scrubber,
/obj/machinery/camera{
c_tag = "Starboard Primary Hallway - Atmospherics";
@@ -92896,21 +92802,13 @@
},
/area/station/hallway/primary/starboard)
"xCP" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
+/obj/structure/flora/ausbushes/fullgrass,
+/obj/item/radio/intercom{
+ name = "south bump";
+ pixel_y = -28
},
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/light/small,
-/turf/simulated/floor/plasteel,
-/area/station/maintenance/starboard)
+/turf/simulated/floor/grass,
+/area/station/service/hydroponics)
"xCT" = (
/obj/machinery/atmospherics/trinary/mixer{
dir = 4;
@@ -92925,6 +92823,15 @@
"xCY" = (
/obj/structure/table,
/obj/item/storage/toolbox/mechanical,
+/obj/machinery/power/apc{
+ dir = 1;
+ name = "north bump";
+ pixel_y = 24
+ },
+/obj/structure/cable/yellow{
+ d2 = 4;
+ icon_state = "0-4"
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -92944,6 +92851,12 @@
},
/turf/simulated/floor/plasteel/dark,
/area/station/telecomms/chamber)
+"xEr" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/purple{
+ dir = 5
+ },
+/turf/simulated/wall/r_wall,
+/area/station/science/test_chamber)
"xER" = (
/obj/structure/cable/pink{
icon_state = "1-5"
@@ -93028,8 +92941,8 @@
/turf/simulated/floor/plating,
/area/station/maintenance/aft)
"xGF" = (
-/obj/effect/spawner/window/reinforced/grilled,
-/turf/simulated/floor/plating,
+/obj/effect/spawner/random_spawners/fungus_probably,
+/turf/simulated/wall,
/area/station/maintenance/asmaint)
"xGP" = (
/obj/effect/decal/cleanable/dirt,
@@ -93041,28 +92954,6 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
-"xHu" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 8
- },
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/obj/structure/cable/yellow{
- d1 = 2;
- d2 = 4;
- icon_state = "2-4"
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 8
- },
-/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "whitepurple"
- },
-/area/station/science/rnd)
"xHw" = (
/obj/structure/chair,
/obj/machinery/newscaster{
@@ -93088,10 +92979,11 @@
/turf/simulated/floor/plating,
/area/station/security/warden)
"xHR" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
/obj/structure/cable/yellow{
- d1 = 2;
+ d1 = 1;
d2 = 8;
- icon_state = "2-8"
+ icon_state = "1-8"
},
/turf/simulated/floor/plating,
/area/station/maintenance/aft2)
@@ -93214,29 +93106,44 @@
icon_state = "neutralcorner"
},
/area/station/supply/lobby)
-"xLm" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/wood,
-/area/station/service/bar)
"xLw" = (
-/obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/condiment/saltshaker{
- pixel_x = -3
+/obj/structure/disposalpipe/sortjunction{
+ dir = 4;
+ name = "Kitchen Junction";
+ sort_type_txt = "20"
},
-/obj/item/reagent_containers/food/condiment/peppermill{
- pixel_x = 3
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+ dir = 1
},
-/obj/structure/window/reinforced{
- dir = 4
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 1
},
-/obj/effect/turf_decal/woodsiding{
- dir = 4
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
},
-/turf/simulated/floor/plasteel{
- icon_state = "bar"
+/obj/structure/cable/yellow{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
},
+/turf/simulated/floor/wood,
/area/station/service/bar)
+"xLA" = (
+/obj/machinery/hydroponics/constructable,
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 1
+ },
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/effect/turf_decal/delivery/hollow,
+/turf/simulated/floor/plasteel,
+/area/station/service/hydroponics)
"xLH" = (
/obj/machinery/door/airlock/maintenance,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -93253,8 +93160,24 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/medmaint)
+"xLO" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/plasteel,
+/area/station/maintenance/aft2)
"xLY" = (
-/obj/machinery/space_heater,
+/obj/machinery/atmospherics/unary/tank/air{
+ dir = 8
+ },
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint)
"xMN" = (
@@ -93535,27 +93458,13 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
-"xRE" = (
-/obj/effect/landmark/start/bartender,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- icon_state = "bar"
- },
-/area/station/service/bar)
-"xRN" = (
-/obj/effect/turf_decal/delivery/hollow,
-/obj/machinery/atmospherics/portable/canister/oxygen,
-/obj/machinery/alarm{
- dir = 8;
- name = "east bump";
- pixel_x = 24
- },
-/turf/simulated/floor/plasteel{
- icon_state = "darkgrey"
+"xRO" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 1
},
-/area/station/science/storage)
+/turf/simulated/floor/plasteel,
+/area/station/maintenance/asmaint)
"xSg" = (
/obj/machinery/economy/vending/security,
/turf/simulated/floor/plasteel{
@@ -93574,12 +93483,9 @@
/turf/simulated/floor/plating,
/area/station/maintenance/engimaint)
"xTH" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "whitepurple"
- },
-/area/station/science/rnd)
+/obj/effect/spawner/window/reinforced/tinted,
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard2)
"xTV" = (
/obj/machinery/atmospherics/pipe/manifold/visible/yellow,
/turf/simulated/floor/plasteel,
@@ -93596,36 +93502,11 @@
/obj/effect/turf_decal/stripes/white/line{
dir = 8
},
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 4
+ },
/turf/simulated/floor/plating,
/area/station/maintenance/starboard2)
-"xUk" = (
-/obj/machinery/atmospherics/pipe/simple/visible{
- dir = 5
- },
-/obj/machinery/camera{
- c_tag = "Science Toxins Mix";
- dir = 1;
- network = list("Research","SS13")
- },
-/obj/machinery/firealarm{
- dir = 1;
- name = "south bump";
- pixel_y = -24
- },
-/turf/simulated/floor/plasteel,
-/area/station/science/toxins/mixing)
-"xUA" = (
-/obj/structure/table,
-/obj/item/storage/bag/dice,
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 8;
- icon_state = "1-8"
- },
-/turf/simulated/floor/plasteel{
- icon_state = "cafeteria"
- },
-/area/station/science/break_room)
"xUC" = (
/obj/item/radio/intercom{
name = "south bump";
@@ -93703,7 +93584,6 @@
},
/area/station/engineering/control)
"xWt" = (
-/obj/effect/turf_decal/delivery/hollow,
/obj/machinery/atmospherics/portable/canister/sleeping_agent,
/turf/simulated/floor/plasteel,
/area/station/engineering/atmos/control)
@@ -93758,10 +93638,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/obj/effect/turf_decal/tile/purple{
- dir = 1
- },
-/obj/effect/turf_decal/tile/purple,
/obj/structure/disposalpipe/segment{
dir = 4
},
@@ -93773,10 +93649,6 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
- dir = 8
- },
/turf/simulated/floor/plasteel,
/area/station/science/robotics)
"xYk" = (
@@ -93937,16 +93809,12 @@
/turf/simulated/floor/plasteel,
/area/station/command/teleporter)
"yap" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 5
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 5
- },
+/obj/machinery/atmospherics/portable/canister/carbon_dioxide,
+/obj/effect/turf_decal/delivery/green/hollow,
/turf/simulated/floor/plasteel{
- icon_state = "white"
+ icon_state = "darkgrey"
},
-/area/station/science/toxins/launch)
+/area/station/science/storage)
"yaq" = (
/obj/machinery/power/emitter{
anchored = 1;
@@ -94013,25 +93881,19 @@
/obj/effect/turf_decal/stripes/line,
/turf/simulated/floor/plating,
/area/station/maintenance/port)
-"yaQ" = (
-/obj/machinery/atmospherics/unary/vent_pump/on{
+"yaL" = (
+/obj/effect/spawner/random_barrier/obstruction,
+/obj/effect/decal/cleanable/blood/writing{
dir = 8
},
-/turf/simulated/floor/plasteel{
- icon_state = "bar"
- },
-/area/station/service/bar)
+/turf/simulated/floor/plating,
+/area/station/maintenance/asmaint)
"ybD" = (
/obj/effect/turf_decal/delivery,
/obj/machinery/door/window/classic/normal{
name = "Maximum Security Test Chamber";
dir = 8
},
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/obj/effect/mapping_helpers/airlock/windoor/access/all/science/xenobio{
dir = 8
},
@@ -94062,6 +93924,31 @@
icon_state = "white"
},
/area/station/medical/medbay)
+"ycj" = (
+/obj/machinery/cooker/deepfryer,
+/obj/structure/extinguisher_cabinet{
+ name = "south bump";
+ pixel_y = -30
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 1;
+ icon_state = "pipe-c"
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "cafeteria"
+ },
+/area/station/service/kitchen)
+"ycw" = (
+/obj/machinery/light{
+ dir = 8
+ },
+/obj/item/radio/intercom{
+ name = "south bump";
+ pixel_y = -28
+ },
+/obj/machinery/atmospherics/portable/scrubber,
+/turf/simulated/floor/engine,
+/area/station/science/test_chamber)
"ycF" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable/yellow{
@@ -94074,17 +93961,6 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
-"ycU" = (
-/obj/machinery/firealarm{
- dir = 4;
- name = "east bump";
- pixel_x = 24
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel{
- icon_state = "bar"
- },
-/area/station/service/bar)
"ydv" = (
/obj/structure/cable/yellow{
d2 = 4;
@@ -94103,6 +93979,20 @@
icon_state = "darkred"
},
/area/station/security/storage)
+"ydI" = (
+/obj/structure/table/reinforced,
+/obj/item/paper_bin,
+/obj/item/pen,
+/obj/machinery/power/apc{
+ name = "south bump";
+ pixel_y = -24
+ },
+/obj/structure/window/reinforced{
+ dir = 1
+ },
+/obj/structure/cable/yellow,
+/turf/simulated/floor/engine,
+/area/station/science/test_chamber)
"ydM" = (
/obj/structure/transit_tube/curved/flipped{
dir = 8
@@ -94110,14 +94000,27 @@
/turf/space,
/area/space/nearstation)
"yed" = (
-/obj/effect/turf_decal/stripes/white/line{
- dir = 1
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel{
- icon_state = "darkgrey"
+ icon_state = "white"
},
-/area/station/science/toxins/launch)
+/area/station/science/storage)
"yej" = (
/obj/structure/cable/yellow{
d1 = 1;
@@ -94156,23 +94059,27 @@
},
/area/station/medical/virology)
"yeU" = (
-/obj/structure/table,
-/obj/item/paper_bin,
-/obj/item/pen,
-/obj/machinery/requests_console{
- department = "Science";
- departmentType = 2;
- name = "Science Requests Console";
- pixel_x = -30
+/obj/structure/disposalpipe/segment{
+ dir = 4
},
-/obj/effect/turf_decal/delivery/hollow,
-/obj/effect/turf_decal/stripes/white/line{
- dir = 1
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 4
},
/turf/simulated/floor/plasteel{
- icon_state = "darkgrey"
+ icon_state = "white"
},
-/area/station/science/toxins/launch)
+/area/station/science/storage)
"yeW" = (
/obj/structure/sign/radiation/rad_area,
/turf/simulated/wall/r_wall,
@@ -94187,28 +94094,6 @@
icon_state = "black"
},
/area/station/security/permabrig)
-"yfv" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/light/small{
- dir = 1
- },
-/turf/simulated/floor/plating,
-/area/station/maintenance/asmaint)
-"yfB" = (
-/obj/machinery/light,
-/obj/item/radio/intercom{
- name = "south bump";
- pixel_y = -28
- },
-/turf/simulated/floor/plasteel{
- icon_state = "cafeteria"
- },
-/area/station/science/break_room)
"yfT" = (
/obj/structure/cable/yellow{
d1 = 2;
@@ -94296,22 +94181,13 @@
/turf/simulated/floor/plating/airless,
/area/station/engineering/solar/auxport)
"yhT" = (
-/obj/structure/sign/poster/random{
- pixel_y = -32
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+ dir = 8
},
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
+/turf/simulated/floor/plasteel{
+ icon_state = "darkgreenfull"
},
-/turf/simulated/floor/plating,
-/area/station/maintenance/starboard)
+/area/station/service/hydroponics)
"yib" = (
/obj/structure/flora/junglebush,
/obj/structure/flora/ausbushes/ppflowers,
@@ -94329,6 +94205,19 @@
icon_state = "caution"
},
/area/station/engineering/atmos/distribution)
+"yih" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/mob/living/simple_animal/mouse,
+/obj/machinery/light/small{
+ dir = 4
+ },
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard2)
"yiP" = (
/mob/living/simple_animal/mouse,
/turf/simulated/floor/plasteel,
@@ -94339,10 +94228,10 @@
},
/area/station/security/armory/secure)
"yji" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/universal{
+/obj/machinery/space_heater,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/obj/machinery/space_heater,
/turf/simulated/floor/plating,
/area/station/maintenance/xenobio_north)
"yjJ" = (
@@ -94370,28 +94259,6 @@
icon_state = "dark"
},
/area/station/engineering/atmos)
-"ykN" = (
-/obj/structure/cable/yellow{
- d1 = 2;
- d2 = 8;
- icon_state = "2-8"
- },
-/obj/effect/turf_decal/stripes/line,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/disposalpipe/segment,
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 4
- },
-/turf/simulated/floor/plasteel,
-/area/station/maintenance/starboard)
"ylu" = (
/obj/machinery/light{
dir = 8
@@ -94414,29 +94281,6 @@
icon_state = "brown"
},
/area/station/supply/office)
-"ylG" = (
-/obj/machinery/smartfridge,
-/obj/machinery/door/window/classic/normal{
- name = "Anti-Theft Shield";
- dir = 1
- },
-/obj/effect/mapping_helpers/airlock/windoor/access/any/service/hydroponics{
- dir = 1
- },
-/obj/effect/mapping_helpers/airlock/windoor/access/any/service/kitchen{
- dir = 1
- },
-/obj/machinery/door/poddoor/shutters/preopen{
- dir = 2;
- id_tag = "hydro_service";
- name = "Service Desk Shutter"
- },
-/obj/machinery/door/window/classic/normal{
- name = "Hydroponics Window"
- },
-/obj/effect/mapping_helpers/airlock/windoor/access/any/service/hydroponics,
-/turf/simulated/floor/plasteel,
-/area/station/service/hydroponics)
"ylO" = (
/obj/structure/disposalpipe/sortjunction{
dir = 8;
@@ -121871,10 +121715,10 @@ noA
tPc
tPc
pAU
-cgx
+tPc
taS
-cgx
-cgx
+tPc
+vtA
tEL
cgx
pPn
@@ -122127,12 +121971,12 @@ sxv
cEv
cmm
cmm
-rDW
+cmm
cRS
cIt
cPI
cKx
-cuc
+khl
cuc
mGK
lHZ
@@ -122382,15 +122226,15 @@ cIx
cIx
cIx
cIx
-cOp
-coG
-jzk
+cIx
+cJp
+cJp
+cJp
coG
coG
+kdJ
coG
coG
-bYX
-daa
coG
coG
coG
@@ -122643,24 +122487,24 @@ cig
hyD
sOB
dbl
-hHA
-iBb
coG
-mDn
-rdk
+iBb
+qyW
+mlV
+tmz
+qKY
+lYB
+avs
+cUL
+lCO
coG
-cJz
-cJu
-jxj
+ech
+wKQ
coG
-bGW
-vZo
-rVv
-coG
-hgY
+kEw
cOi
coG
-qfa
+gEX
qfa
cOp
cRP
@@ -122878,10 +122722,10 @@ cef
cft
cgA
axy
-gnJ
+cie
ckZ
cHQ
-fXj
+cnw
iCZ
bGS
nUu
@@ -122891,34 +122735,34 @@ sFN
jAh
oco
hDr
-uRX
-nsy
-syi
+dQb
+ouz
+dQb
ouz
twL
+cJp
+bCx
+smj
+cRo
coG
-coG
-coG
-coG
-coG
-vZo
+lvJ
rDg
cBO
-cFx
-cyV
-cnh
-cJu
+hHA
+dpM
+vNL
+nDC
cLl
-coG
-iLq
-kuh
+laR
+tmz
vZo
-coG
-cwZ
+iCJ
+avs
+lYB
eJN
coG
-vZo
-vZo
+adp
+dUG
cOp
ddW
ret
@@ -123138,7 +122982,7 @@ fTT
cie
ckZ
cHQ
-fXj
+cnw
osq
kEz
iNe
@@ -123149,7 +122993,7 @@ oNl
nkU
qlx
gVS
-iBi
+dam
nUG
dam
tVd
@@ -123157,25 +123001,25 @@ cJp
cBT
hPb
iMu
-mDn
-nkz
-cEF
-jwh
-deT
-asv
-imG
-kQo
-cLl
-coG
coG
+oUw
+qyW
+sMn
coG
-hHA
coG
+crN
+cFt
vZo
-eJN
+drp
+hHA
+vNL
+evj
+eIC
+wlG
+kIS
coG
-oUw
-rtk
+kiC
+mlV
cOp
cQU
mvG
@@ -123398,7 +123242,7 @@ cHQ
cnw
cFm
bQf
-tkV
+cFm
ddq
cJp
ggO
@@ -123406,33 +123250,33 @@ hEe
xXE
iZX
pBW
-dQb
+bAk
pXO
bAk
qFl
-wez
+cFY
uEX
-bIG
-qLe
-nvP
-iBb
-vZo
+rSH
+wEM
+coG
+lYB
+rDg
cWF
-cnL
-cLl
-cLl
-cLl
-gBM
-hHA
-csc
-drN
-wgh
-wgh
-wgh
-cuj
-hHA
+coG
+xan
+coG
vZo
+lYB
+cwZ
+coG
+lYB
vZo
+xLO
+vZo
+cUL
+tmz
+mlV
+hCA
cOp
azz
ddU
@@ -123663,35 +123507,35 @@ inv
kWj
mWN
uXA
-iBi
-qFl
-iBi
+dam
+eOA
+dam
fho
-lfJ
+cFY
uuG
-cwR
-iGV
+ttI
+tXq
mDn
rtk
cJl
ddR
-cYZ
+tmz
waF
-dbK
-cYT
-vZo
coG
-mhV
-adB
-adB
-adB
-adB
-aRW
+cPb
+cPb
+coG
coG
+tmz
+mlV
+dgD
coG
coG
+coG
+msw
+tmz
cOp
-cXN
+jYM
jYM
jYM
uVp
@@ -123921,34 +123765,34 @@ cJp
cJp
oUU
pzC
+rWk
dQb
-qFl
eVO
cJp
-pcx
-cwR
+cFY
+cFY
mPh
+cEK
+cEK
+wQQ
+cEK
+cEK
+cEK
+cEK
+agK
+agK
cOp
-cOp
-cOp
-cOp
-cOp
-cOp
-cOp
-cOp
-cOp
-cOp
-csi
-coG
+lst
+vZo
+lYB
+kQj
coG
+tba
+mZq
+vZo
coG
coG
-iNF
-vZo
-czO
-vZo
-cuu
-vZo
+dif
aef
abq
abq
@@ -124164,48 +124008,48 @@ cft
cgF
rFe
cjN
-oFw
-cmr
-fPC
+clb
+cmz
+fwz
daG
-fPC
+cic
fHG
-fPC
-uVF
+fpM
+cfw
cvu
-cQK
+qXr
cGz
-cDM
+cJp
qcw
-tFX
-tFX
+cJp
+cJp
gVX
-sRb
+wez
cJp
uVl
-cwR
taW
-cEK
-jFr
+taW
+kqP
+kgS
mAA
qbe
veO
-mld
+aox
fdt
-cFH
-foP
-sMK
-kEk
-coG
-fvH
+fjU
+saM
+cOp
+rKH
vZo
-hHA
+vZo
+jKP
+jDv
xHR
cSY
-cAK
-coG
-coG
-coG
+tNn
+vZo
+vZo
+vZo
aef
abq
aaa
@@ -124419,50 +124263,50 @@ bdb
cei
cHM
cgE
-cic
-bUy
-clb
-uxR
-cic
+ily
+cLY
+oFw
+cmr
+fPC
mbt
-cic
+fPC
bUy
-cic
-tve
+fPC
+uVF
wos
-cwR
-tqF
-cFY
+qnt
+qnt
+taP
ihW
kqd
-fjV
+vQB
kfx
-sol
-cFY
-uuG
-cwR
-qcH
-uEr
-xbu
+bIG
+qUY
+bIG
+bIG
+qLe
+kqP
+fNw
klo
-pQd
-sZE
-vfp
-ojA
-tUn
-myi
-aiz
-svK
+hQB
+jFo
+vZA
+wwR
+uZk
+iuI
+cOp
+eki
+gLZ
+lTS
+kQj
coG
-aqe
-vZo
coG
-sVu
-ksi
+cUL
clN
coG
-aaa
-abq
+coG
+coG
aef
abq
aaa
@@ -124679,42 +124523,42 @@ cgu
qnt
qnt
clc
-cmz
-tCw
+uxR
+cic
bVj
cic
qei
-cnA
-cfw
-kBs
+cic
+tve
+mfG
+cwR
+cwR
+cwR
cwR
-cwF
-cJp
-djO
fTs
-kEd
-tRK
-mgK
-cJp
-tNr
+cBP
+clb
cwR
-riF
-cEK
-kYR
-jOM
-kgx
+cwR
+cwR
+cwR
+iGV
+kqP
+lfG
+mAA
+kRQ
oFF
-vrZ
-eNY
-smL
-xUk
+mmG
+qnp
+hVw
+wnf
cOp
-fuQ
-coG
-coG
-coG
-coG
-coG
+hqx
+lYB
+vZo
+xLO
+cUL
+tmz
coG
coG
coG
@@ -124946,35 +124790,35 @@ cvl
wTJ
cwR
weC
-cJp
-cFY
-cFY
-cJp
-cFY
-cFY
-cJp
-cjL
-cwR
+eIe
+lTc
+waj
+des
+fWN
+pEN
+cOZ
+cOZ
+cOZ
jXi
-kqP
-lEw
-lHJ
+cFH
+cFH
+bMg
mcw
-kXV
-eNY
+cEK
+cEK
nec
-krx
-bnx
+agK
+agK
cOp
mtr
-dTn
+lYB
jFH
-ePS
-ido
-hSW
-gtu
-kKa
-cxT
+mLH
+vZo
+hXg
+abq
+aaa
+abq
aaa
abq
aef
@@ -125194,44 +125038,44 @@ bVZ
lVF
cqv
vQr
-cxe
-xHu
+vIY
+vIY
vIY
sfg
icm
bWe
-wos
+mfG
cwR
cxP
-bIG
-bIG
-cHx
-vQB
-dXu
+lAX
+lAX
+lAX
+lAX
+cfw
gTS
oic
uSJ
-cwR
-jXi
+pTk
+tYb
kqP
lEw
-cIW
-cOB
-xBs
-hQB
-nbM
-nbM
-lKa
-aiz
-iHc
-dTn
-mVS
-dTn
-dTn
-hSW
-nzf
-iab
-nqt
+iRd
+iwB
+xbs
+dce
+rfK
+gQc
+cQd
+gty
+coG
+coG
+tmz
+xLO
+vZo
+coG
+aaa
+aaa
+aaa
aaa
abq
aef
@@ -125448,47 +125292,47 @@ dbb
cmo
hYA
pho
-bYq
+evt
clr
-gvN
+qth
kqw
hVX
-eQb
+fNQ
uHp
cut
soO
tGt
cwR
-cwR
-cwR
-cwR
-fIA
-cBP
+cxP
+eZW
+lJA
+rfD
+lAX
uws
-aLH
-bPy
+bGl
+cxO
cFs
-uMv
-tzt
+clb
+tYb
kqP
pLH
-iRd
-iwB
-xbs
-hIk
-gNG
-vDG
-cPb
+hhN
+cOB
+jlU
+hQB
+nbM
+nbM
+xdo
cOp
-tgC
-cUN
+xmM
+xkQ
coG
-oUw
-rtk
+kQj
+lTS
coG
-jaP
-gkt
-nzf
+abq
+aaa
+aaa
aaa
abq
aef
@@ -125677,7 +125521,7 @@ bjk
jXR
bmZ
boL
-bqr
+feu
boI
snI
qgk
@@ -125699,8 +125543,8 @@ bWZ
bNh
bNh
cbj
-bek
-bfJ
+vmj
+bhp
cej
cmo
clS
@@ -125710,42 +125554,42 @@ xOz
bYQ
cHK
nLV
-wGc
-alG
-oDj
+gvN
+bYq
+qxW
cvl
geC
lGC
-cOZ
-cOZ
-lTc
-cuv
-des
+nqw
+eZW
+keQ
+keQ
+lAX
gEt
-eoJ
-cEy
+bGl
+cxO
cdM
-cic
-xoB
-cFH
-cFH
-tig
-bVC
-cEK
-cEK
+clb
+tYb
+kqP
+pLH
+lHJ
+kgx
+pwf
+eNY
vpj
-pUs
+tCf
pUs
cOp
-iQh
+ssr
+nJZ
coG
+kQj
+avs
+wSg
coG
-coG
-coG
-coG
-wJN
-iab
-jvx
+abq
+abq
abq
arA
arA
@@ -125968,41 +125812,41 @@ cmB
onF
gqN
ljS
-cnR
-cqp
+eza
+oDj
cvl
lAX
crU
eZW
-eZW
+lAX
+qLK
+lFH
lAX
cfw
-cfw
-efG
-cic
-cGx
+jFa
+cxO
cIE
-cic
-bGl
-kqP
-kgS
-sOH
-pEF
+clb
+lmq
+cEK
+cuR
+jOM
+kgx
wsu
-aox
-qnp
-fjU
-saM
+eNY
+quz
+vrZ
+wBW
cOp
-cZs
-vZo
-cDG
+eZR
+rVg
coG
+wWu
+vZo
+vZo
+hXg
abq
-iEd
-nqt
-gkt
-nzf
+aaa
aaa
abq
aef
@@ -126216,50 +126060,50 @@ bNp
cXn
bqR
cek
-bwI
+bHE
bwP
bHE
bVG
kCP
-mle
+cmB
vde
eYA
-bYq
-bYq
-eza
-bWe
+cmo
+cmo
+cmo
+cmo
lsi
kJT
rXS
clG
-lJA
+idO
cOm
-hIK
+eZW
sPr
-cic
-cic
-cic
-cic
-bGl
-kqP
-fNw
+eoJ
+wYn
+qnt
+akH
+hns
+uEr
+xno
fJu
-hQB
-jFo
-vZA
-wwR
-uZk
-iuI
+cew
+weB
+thI
+pfB
+ojA
+boR
cOp
-iGw
-coU
-cwZ
-coG
+fEZ
+cKS
+wxV
+gWk
+lYB
+vZo
+hXg
aaa
-jaP
aaa
-iab
-nqt
aaa
abq
aef
@@ -126470,53 +126314,53 @@ bNp
bYr
bbt
bNp
-bek
+sVy
pRL
cte
-cte
-cte
-cte
-cte
+sZC
+lFM
+cwG
+ipj
lOv
-cmB
+wmR
cqo
esJ
-bYq
-bYq
+cte
+pfa
ctb
-bWe
+cmo
pQv
oFn
keQ
-keQ
-rfD
-cOm
-pMS
-fCW
-mdy
+hkM
+lCc
+iFA
+eZW
+iGV
+cic
hfC
uNn
hyQ
-eoJ
-kqP
-lfG
+vsR
+cEK
+jFr
sOH
-kRQ
+uSP
tug
-mmG
+qfl
dTX
-hVw
-wnf
+tId
+diY
cOp
tgV
-vZo
-cnO
-hXg
+dXZ
+coG
+kQj
+mlV
+cUL
+coG
abq
-jdX
-nzf
-gkt
-nzf
+aaa
aaa
abq
aef
@@ -126726,54 +126570,54 @@ hBq
jFF
tfp
bfI
-bfI
+lOB
nzW
-btC
-tpD
-cfG
-cgM
-cio
-cte
-lOv
-poj
+bZt
+bZu
+bZu
+bZu
+bZu
+jDK
+cAP
+ipj
cvY
-evD
+jEA
xTH
-mYo
+ipj
cFB
-bWe
+cmo
giv
-xUA
+eZG
cmA
keQ
-yfB
-cfw
-cfw
-nhU
-cGQ
+keQ
+fjj
+lAX
dZB
-bdN
-bdN
-bdN
-bdN
-cEK
-hyp
+cGQ
+eVM
cgG
+cgG
+cgG
+cgG
+cgG
+cgG
+cgG
+fqp
+fqp
cEK
cEK
-cEK
-pUs
-pUs
+nqG
cOp
crN
coG
+tmz
+iRX
+lYB
coG
coG
coG
coG
-gar
-kKa
-lui
abq
arA
bcb
@@ -126962,76 +126806,76 @@ bUM
kaK
blg
blk
-bVl
+lsQ
deD
dwp
-bdc
-eMF
+lsQ
+rOT
pUF
ipa
-bdc
-bdc
-bdc
-bdc
-bdc
-bdc
+lsQ
+lsQ
+lsQ
+lsQ
+lsQ
+lsQ
bwS
bpI
lsQ
kwt
bdc
rOT
-pwN
bZt
caF
+sQh
cbK
ccW
chO
cfA
cgN
-cip
+bBk
+bZu
+bZu
+ppH
+cvY
+lBw
cte
-lOv
-cmB
-cvl
-hBB
-gSO
+ppH
gSO
-gSO
-cvl
+cmo
mVl
afT
dxD
eRc
geG
-cOm
-cBV
+fQl
+eZW
cwV
cQK
lle
-bdN
+cgG
cKi
cUf
-cPc
-aoN
-euy
-mVD
-coG
+xPE
+tCr
+qAH
+cgG
+oPh
jes
-coG
-cQd
-cQd
-cOp
-tgV
-coG
+das
+xGF
+uXa
+vgA
+gFT
+jAR
dag
+qBO
+vZo
+tmz
+mxp
cUL
-srT
coG
aaa
-aaa
-aaa
-aaa
abq
aef
abq
@@ -127230,31 +127074,31 @@ bHA
bHA
bsp
bsp
-bHA
-bsp
-bsp
-bsp
-bsp
-bsp
-aoG
+nqq
+bQI
+bQI
+bQI
+bQI
+bQI
+bQI
aUX
pwN
-xtP
-cgK
+cbL
+cbL
cbL
cbL
tpD
cfB
cgO
-ciq
-cte
-lOv
-cmB
+cbL
+rJn
+bZu
+cwG
daw
-aiM
-xPE
-tCr
-qAH
+cte
+rbS
+mrv
+rnM
kvG
kvG
kvG
@@ -127266,28 +127110,28 @@ kvG
vxI
cwR
bXi
-bdN
-fVO
+wcT
+cha
hiP
qlX
-knB
-dSp
-gME
-mTU
+fRh
+nUa
+cgG
+gqC
cKG
wvJ
-gJg
-gJg
+cPc
+acS
gJg
rpG
-hHA
+tmz
+lYB
+ekF
+dpM
+vNL
+fxt
vZo
-vZo
-vZo
-coG
-aaa
-aaa
-aaa
+hXg
aaa
abq
aef
@@ -127481,38 +127325,38 @@ aHe
ded
bEv
bEv
-cEI
+bEv
bDV
-bGc
+bID
bID
snq
tmt
-bCy
+jQx
hLX
bQC
-bsp
+jOv
bTD
bSt
-aoG
-fgb
-bZb
-aoG
+bQI
+bZv
baj
uBn
-hqs
+qdR
+bZv
+bZv
+bZv
bZv
-baj
cgP
-baj
+cbL
+cip
+bZu
+ruo
+cvY
cte
-lOv
-cmB
-rnT
-wDg
vZh
-fRh
-nUa
-mDX
+gHd
+cFB
+kvG
cwW
cvH
cKw
@@ -127523,29 +127367,29 @@ mDX
dnN
cwR
dAy
-bdN
+wDC
cnt
pKM
-cPc
+iLj
rlH
uMG
mVD
-coG
-vZo
-vZo
-vZo
+pyh
+gVk
+fqz
+ihF
coU
cvw
-vZo
+gei
coG
-bVk
+nBf
+lYB
vZo
-cXO
+avs
+lTS
+lYB
coG
aaa
-aaa
-aaa
-aaa
abq
aef
abq
@@ -127732,44 +127576,44 @@ bhB
bjq
bkk
bnr
-boS
-lwL
+hfi
+bqA
bsp
bun
-hvW
-byI
-mZL
-bCv
bEv
-bHO
+bAv
+bEv
+bAv
+bEv
+bAv
udl
-bJH
-bLx
-lUc
-bQE
-keY
+bHO
+orV
+nic
+nic
+nic
bVs
nzv
-aoG
+mar
sLS
-bYE
-aoG
-cbD
uzt
+uzt
+cbD
+vAb
ccZ
cen
cfC
cgQ
-ciZ
+cbL
+kCk
+bZu
+cAu
+daw
cte
-lGD
-sNJ
-qtr
-bli
wfE
rAm
wpL
-cDN
+kvG
kTH
oha
gDC
@@ -127777,37 +127621,37 @@ cNk
vXJ
cNk
qPp
-aeF
+dnN
cwR
-bPm
-bdN
+tqF
+wcT
aeA
-pKM
-bdN
-bXG
+uHQ
+cha
+lfu
tRD
-rjj
-cOp
-cOp
-cOp
-cOp
-cOp
-bIm
-cOp
-cOp
-cOp
-cOp
-coG
-coG
-abq
-abq
+cgG
+vwU
+fqn
+vfd
+cPc
+bXG
+bXG
+luM
+bXG
+bXG
+bXG
+rOZ
+rOZ
+rOZ
+sGE
+rOZ
+rOZ
+xtx
+rOZ
abq
abq
-bqS
-arA
-bcb
abq
-iju
aaa
aaa
aaa
@@ -127995,38 +127839,38 @@ bHA
buo
bCH
bCk
-cDz
-bEo
bEv
+bau
+bEv
+sTF
+mBe
bHO
-bGd
-bCy
-fsW
-xRE
-jom
-bsp
-lfV
-iOR
-aoG
-sLS
-bZd
-aoG
-caQ
+voV
+nic
+bTZ
+dnI
+bVs
+nic
+wPS
+hSP
mQu
cda
+rtF
cda
-cda
-cda
+qGI
+hGj
+cYQ
+voi
ciC
-cjV
-fLJ
-cmB
+bZu
+bZu
+bkp
cnF
-cxS
-eQc
+lBw
+cte
dcX
-bpm
-sJj
+cte
+kvG
cNk
nFh
aZr
@@ -128037,22 +127881,30 @@ dRX
pFG
cwR
xdT
-bdN
-lHn
-pKM
-bdN
-eJg
-iIf
-dCm
+cgG
+qgw
+cNu
+cLB
+lfu
+cha
+cgG
fWB
-fyt
+gqC
+tWK
+nCh
bXG
+vhl
+yeU
+dCm
+nqr
+fyt
+rOZ
xCY
lhF
eDX
-yeU
-oIa
-nqr
+whx
+rOc
+xtZ
oTc
aaa
abq
@@ -128060,14 +127912,6 @@ aaa
aaa
aaa
aaa
-abq
-aef
-abq
-aaa
-aaa
-aaa
-aaa
-aaa
aaa
aaD
aaa
@@ -128251,39 +128095,39 @@ bqA
bHA
bwp
bEv
+fXd
+bEv
omK
-cDz
-bEq
-bGi
+bEv
+omK
+udl
bHO
-bHP
-bCy
-bLw
-aPG
-bVy
-bsp
+xFW
+nic
+bQJ
+aRy
rhw
wBj
-aoG
-sLS
-cap
-aoG
-cbn
+bQI
+izo
iuh
+dKN
+xLA
+tfH
cdb
-bYA
-bYA
-ces
-vKI
+amV
+bZv
+bZu
+bZu
+bZu
cte
-cRX
-cmB
-qgw
-cNu
-cLB
-dcX
-cha
-kqO
+oyD
+cvY
+pvb
+syo
+wPp
+wlW
+kvG
cvJ
mWH
wsN
@@ -128291,34 +128135,35 @@ cAM
hsg
tHP
kqO
-awL
+mfG
cwR
-xdT
-bdN
-yfv
-pKM
-bdN
+dpE
+qmD
+jcA
+cux
+xrm
kNi
-iIf
+qnY
+qmD
+iWB
+jBw
+fGH
+das
+bXG
+hwV
+yed
xrA
qkD
rEb
-fGH
+leO
iTN
-tIh
-hwV
-yed
-eJr
-hLa
+eDX
+eDX
+dal
+jRQ
+glQ
oTc
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-abq
-aef
abq
aaa
aaa
@@ -128383,7 +128228,6 @@ aaa
aaa
aaa
aaa
-aaa
"}
(133,1,1) = {"
aaa
@@ -128509,37 +128353,37 @@ bIE
bGi
bEv
byK
-bAu
-kMy
-bEv
-bHO
+qFs
+qFs
+qFs
+qFs
bGd
-bEs
-bCy
-yaQ
-bPa
-bsp
-bSv
+bHO
+eNT
+nic
+edB
+vpw
+bVs
blx
-bYs
-mAt
-cba
-ylG
-cbd
+bQI
+caQ
tTh
-aLr
-cgT
-cgT
-cgT
+ces
+cbd
+ces
+chm
+mNu
+bZv
dZI
-cte
+dZI
+vpo
csg
-cmB
-jcA
-cux
-xrm
+nqo
+vlF
+uhJ
+pwj
sBZ
-qnY
+hty
kvG
cGF
lCW
@@ -128551,31 +128395,32 @@ kvG
qTF
cwR
rcY
-pOG
-cnu
-fRj
-bdN
+qmD
+svV
+cKu
+cnK
ruj
-oee
+cnK
+qmD
+fVX
+gqC
+tIg
+aAO
+bXG
+gGe
+pxr
mEW
xIl
rgX
wtQ
jQZ
-fno
-gGe
-pxr
-hVK
+eGn
+iXy
+mgu
+tQW
czx
-rOZ
-aaa
-abq
-aaa
-aaa
+naq
aaa
-aaa
-abq
-aef
abq
aaa
aaa
@@ -128614,7 +128459,6 @@ aaa
aaa
aaa
aaa
-aaa
iYh
cIy
iYh
@@ -128763,40 +128607,40 @@ bni
eFD
wwo
uUI
-dbp
+sqp
+uNf
bwC
bAv
-apa
-kMy
+bAv
bEv
+bEv
+udl
bHO
-bHQ
-bJJ
bLA
-ycU
-oRQ
-bsp
+nic
+pWX
+gXg
cfD
tMV
-ukV
-sLS
-bZj
-lPe
-cbt
+bQI
+cbn
tTh
-iLv
-bYA
bYA
+cbt
bYA
chm
+pyC
+bZv
+kpl
+fru
+sbZ
cte
-csg
-cmB
-svV
-cKu
-eDv
+akr
+xjA
+cwG
+syo
aFL
-cnK
+umT
kvG
cgY
cDK
@@ -128808,21 +128652,29 @@ kvG
mYv
cwR
qta
-bdN
-flh
-bPl
-bdN
-kHQ
-wMR
-wED
-wED
-wED
+qmD
+cnK
+eAx
+cnK
+dru
+cnK
+qmD
+gWE
+gWE
+rPx
+cPc
bXG
-lvB
-czj
rxB
ubf
-sSk
+jwi
+jwi
+jwi
+rOZ
+lvB
+eDX
+dIQ
+qIZ
+lvP
hVK
oTc
aaa
@@ -128860,14 +128712,6 @@ abq
abq
abq
aaa
-aaa
-aaa
-abq
-abq
-abq
-abq
-abq
-aaa
abq
abq
abq
@@ -129020,40 +128864,40 @@ bnr
boY
bqA
bHA
-drv
-bEv
+bwp
+ewt
+qRq
byM
-mWI
-kMy
+bEA
+bvz
bEv
-bIL
xLw
uhV
-bsp
-bsp
-bsp
-bsp
-bsp
-bsp
-aoG
+lBQ
+fjy
+wxY
+uOM
+ycj
+bQI
+bQI
vfe
-hmM
-aoG
-njo
-cdr
-cde
-ces
+tTh
ces
+cbd
ces
-cll
+chm
+qZv
+bZv
+fYb
+fDE
+gMo
cte
-cYm
-cmB
-cnK
-eAx
-eDv
-dru
-cnK
+hcI
+sfc
+wrO
+cte
+ufm
+lBw
kvG
cwH
cxa
@@ -129065,34 +128909,34 @@ kvG
mfG
cwR
kib
-bdN
-flh
-bPl
-bdN
-vLA
-jSe
-fCO
-fCO
+qmD
+gND
+cnK
+jPj
+kqi
+oUs
+qmD
+bZy
fCO
-bXG
+fSa
gqt
-wpn
+bXG
yap
+jSe
+ddG
+ddG
+ddG
+rOZ
+dnE
+mfM
+ucR
iQC
-sdq
-uXI
+sNi
+sRf
oTc
aaa
abq
-aaa
-iju
-abq
-abq
-aaa
-abq
-aaa
-abq
-abq
+bwM
iju
abq
abq
@@ -129279,77 +129123,77 @@ rEV
bHA
bus
bwz
-aPF
-bGv
-uwy
-bEv
-bGi
-bEv
-bGi
-bLB
+gkl
+bEA
+dwL
+bvz
+hvW
+eEC
+szL
+bQI
bHR
tRb
sNm
bSx
-bUe
-aoG
-bSy
+bQI
+naR
+mQu
pOW
-bwA
-cbW
-cbN
-rXk
-bYA
bYA
+cbt
bYA
-cjZ
+rXk
+bZv
+bZv
cte
-csg
-cmB
-gND
-cnK
-jPj
-kqi
-oUs
-kvG
+vjR
+hYj
+cte
+cte
+neh
+cte
+cte
+gSO
+kcG
kvG
+tjd
riX
riX
fId
fId
fId
fId
-cyr
+mfG
cwR
-cxO
-bdN
-cgo
-daQ
-bdN
-kUf
-dRT
-cFe
-cFe
+tUS
+qmD
+qmD
+qmD
+qmD
+qmD
+qmD
+qmD
+cKG
ggT
-bXG
+kgB
uDH
-mfM
+bXG
lVI
+dRT
+wyC
+wyC
+tIv
+rOZ
+phL
+mWp
+dIQ
cRQ
cRQ
oTc
cRQ
cRQ
cRQ
-arA
-abq
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+mng
abq
aaa
aaa
@@ -129535,78 +129379,78 @@ bcP
bqA
bsp
bxe
-bvz
-bEv
+iOn
+byP
cGi
-bEO
-xLm
-quW
-bGc
+omK
+bEv
+bEv
+udl
biW
-euD
+bQI
bHS
-bQM
-bQO
+tRb
+nic
jCz
-bUf
+bQI
bXb
-bXX
-gMS
-aoG
-aoG
-cbP
-byL
-ces
+tTh
ces
cdD
-cjf
+cbd
+ces
+cjZ
+bZv
+igJ
+cwG
+cwG
+vZH
+bkp
+ubu
+dtC
cte
-rwT
-cmB
-cmB
-cmB
-cmB
-cmB
-cmB
-cmB
-cmB
+gnS
+cFB
+peg
+ipj
+tjd
qub
cyR
cyP
hGS
uhP
fId
-cAH
+mfG
cwR
-cxO
+dpk
bdN
-flh
+fiU
bPl
bdN
fiU
-dRT
-xRN
+jNT
+bdN
cFe
-uSj
-bXG
+fGH
+qEh
eZr
-lFF
+bXG
wci
+dRT
+ekg
+wyC
+nDi
+rOZ
+cDq
+kGo
+gFf
cRQ
dnH
cWc
wvK
cOy
-cDq
-arA
-abq
-abq
-aaa
-aaa
-aaa
-aaa
-aaa
-abq
+iPW
+mng
abq
abq
aaa
@@ -129794,39 +129638,39 @@ bsp
bxH
bwG
hrf
-byP
-uFB
-tNw
-bvz
-bEv
+dsr
+sqp
+sqp
+sqp
+fsh
tXA
-orV
+bQI
soT
-bTZ
+tRb
fnS
bYB
-iya
+bQI
jHO
-sLS
-bNB
-rfg
-aoG
-eeu
-ixf
+tTh
bYA
bYA
+cbt
bYA
-ckS
-cte
-csg
-jyT
+ixf
+dgn
+cwG
+ipj
+cwG
+fvO
+hRR
+hRR
coI
-cte
-ima
-cte
+lBw
+iKH
+qig
cZY
dct
-cmB
+tjd
cbf
cyS
cBS
@@ -129835,35 +129679,35 @@ mdH
sCr
kDU
cwR
-cxO
+opd
bdN
flh
-bPl
-bdN
+kIi
bdN
+tKX
bgD
bdN
-bdN
-bdN
-bdN
+hjx
+rPx
+cPc
gWE
-xrS
-kTc
+bXG
+bXG
+bXG
+bXG
+bXG
+bXG
+rOZ
+eAC
+dWQ
+wpn
nRl
rhH
gpV
wuc
cRQ
cRQ
-arA
-abq
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+mng
abq
aaa
aaa
@@ -130052,38 +129896,38 @@ bsm
bsm
bsm
bAx
-bCC
-bau
-bvz
-bGi
-bHO
-voV
-soT
-bQJ
-bQP
-niS
-bVp
-aoG
-bXk
+rDd
+rDd
+rDd
+sAP
+pah
+bQI
+bQI
+sdJ
+bQI
+bQI
+bQI
+fWa
+tTh
bNA
-nWJ
-aoG
-cbO
-lIR
-imQ
+cgT
+oTq
imQ
-gaa
-cku
+lIR
+bZv
+cwG
+cAP
cte
-cPQ
cte
+rzS
+ipj
+dtC
cte
cte
-jyT
cte
-clC
-cwG
-cmB
+cte
+cte
+tjd
hdR
xcw
cyP
@@ -130094,15 +129938,23 @@ ctm
shY
cNy
bdN
-flh
-bPl
-pyU
+bPI
+iNI
+bdN
bPI
npj
-xLY
-cPc
-cOt
bdN
+uxT
+fGH
+egq
+lTB
+gpR
+bUG
+nBW
+cPc
+rRg
+hDE
+rOZ
ljg
fuC
lIC
@@ -130144,14 +129996,6 @@ aaa
abq
aaa
abq
-abq
-iju
-abq
-abq
-aaa
-abq
-aaa
-abq
iju
abq
abq
@@ -130309,65 +130153,73 @@ bxI
iGf
bsm
nsB
-bEP
-bEv
-bEv
-bEv
-bHO
-xFW
-soT
-edB
+bHQ
+uft
+bHP
+tZl
+ncl
+bQI
+sgk
+qlh
bQQ
ukO
-bUh
-aoG
-hKu
-bND
-kdB
-aoG
-aoG
-bal
+bQI
+igm
+tTh
bYA
bYA
+cbt
bYA
cll
+bZv
+cwG
+cwG
+xkc
cte
-cwg
-csZ
-kmw
dcj
cLF
+kmw
+rik
cte
-cte
-jyT
-cmB
-cmB
-cmB
-cmB
-cmB
-cmB
-cmB
+ipj
+gqi
+ima
+tjd
+tjd
+tjd
+fId
+fId
+fId
+fId
cfw
iBI
cfw
bdN
-flh
-bPl
-emj
-emj
+ddv
+rar
+ood
+oQC
hYD
cKJ
-cPc
+gxn
pyU
-bdN
-bdN
-bdN
-bdN
-bdN
-bdN
+jun
+jFz
+xpP
+nSc
+lPx
+gpR
+kXT
+fHu
rOZ
+xtx
rOZ
rOZ
+rOZ
+xtx
+rOZ
+naq
+rOZ
aaa
aaa
aaa
@@ -130402,14 +130254,6 @@ abq
abq
abq
aaa
-aaa
-aaa
-abq
-abq
-abq
-abq
-abq
-aaa
abq
abq
abq
@@ -130566,68 +130410,68 @@ buH
bwR
bsm
bAy
-bCF
+bCy
ljZ
-nwx
-bEv
-bHO
-eNT
-soT
-pWX
+bCy
+gFz
+nos
+bQI
+bXo
+qlh
bSj
ljo
-pSz
-aoG
+bQI
+tid
bXl
bNC
qXW
bpj
-aoG
+upe
fza
-jTK
+bZv
oNA
-cgd
-phQ
+cwG
+cwG
+bkp
cte
-ckz
-qNa
-jEA
-jEA
+cte
+cAP
+hMS
tiN
+uKc
+ipj
+lPm
+ipj
+cAu
jEA
-jEA
-jEA
-jEA
-jEA
-jEA
-jEA
+cwG
cAu
cAP
-tgO
+cte
pwP
cFc
eMh
-qlX
+oCU
lLx
-aeg
-emj
-cPc
-cPc
-cPc
-cPc
-cIH
+qEh
+iKT
+qTJ
+egC
+uGh
+imh
+sXt
dcu
-cPc
-cHD
+vAa
+gpR
cBQ
bNG
-cPc
-aaa
-aaa
-abq
-aaa
-aaa
-aaa
+gpR
+oUb
+dVl
+nDk
+mMu
+gtu
+wPP
aaa
aaa
abq
@@ -130823,68 +130667,68 @@ xam
bbE
bsm
bAz
-kMy
-bAv
-jll
-bAv
+bCy
+bCy
+bCy
+meL
bJM
-tco
+bQI
bOy
-nic
+oHv
bQS
+bUi
bQI
-bQI
-aoG
-aoG
-aoG
-bNB
-caT
-aoG
-cdI
-cev
-cfS
-bZC
-chr
+baj
+tfo
+baj
+bZv
+bZv
+bZv
+caS
+bZv
+bZv
+clC
+ipj
cte
-cwG
-twH
-crq
-bkp
-aTg
-cwG
-cwG
+lXi
+xmO
+eDj
+pGI
+cte
+sfz
+dhG
crr
-cwG
-cwG
-cwG
-cmB
cwd
dhG
-cte
+dhG
+yih
+cwd
+dhG
+piX
aOx
cup
qJN
cPc
cOh
-bPl
-emj
-nzz
-emj
-ddK
+kqU
+lZz
+cze
+vbW
+cPc
cPc
cHY
-emj
-cJD
-npj
+cPc
+cPc
+xGF
pMx
coB
-cPc
-aaa
-aaa
-abq
-aaa
-aaa
-aaa
+aZi
+dVl
+sXt
+nDk
+nzf
+iab
+jvx
aaa
aaa
aaa
@@ -131079,69 +130923,69 @@ bsm
bsm
bsm
bsm
-bCJ
+bsp
bCC
-bEA
-dwL
-bEA
+sku
+bCy
+gFz
bHI
bQI
vRv
jOR
bQT
+hRT
bQI
-aoW
bUj
bXn
-aoG
+qUq
bNB
-buy
-aoG
+bZv
+oFN
cdk
ceP
-cfR
-bZB
-cgV
-cte
+bZv
+bkp
+ubu
cte
+cwG
uZG
-cte
-cte
+ubu
+lBw
cte
csh
cte
-cte
+lBw
+qyp
+cwG
crq
-ruY
-cXx
-cmB
+uWe
cmB
cmB
cmB
cmz
cWK
cmz
-bdN
-pyU
-bPl
-emj
-cPc
-bHo
-emj
-cPc
+mMv
+mMv
+mMv
+mMv
+mMv
+mMv
+fFi
+jSa
cTk
-emj
-gVL
+nFi
+cPc
dhl
-emj
+qaW
dcC
xGF
-aaa
-aaa
-abq
-aaa
-aaa
-aaa
+cPc
+cPc
+cPc
+bBh
+jdX
+cxT
aaa
aaa
aaa
@@ -131332,35 +131176,35 @@ beC
bnr
bQR
buV
-aLC
+bsp
buz
azy
aLC
nwQ
toH
-bHU
-bHU
+gry
+skr
bHU
nhP
-bEG
+bQI
alI
-bPd
-iaW
+bQS
+bQS
mSm
mxb
uXs
bPO
-aoG
+vSM
xCP
-aoG
bZv
-caS
+mVn
+ktD
+gwd
bZv
-aoG
-aoG
-aoG
-aoG
-dAO
+cwG
+xmO
+eUU
+eDj
mRj
coM
cte
@@ -131378,27 +131222,27 @@ cSl
cLm
xXD
gqQ
-bdN
+mMv
cHq
-bPl
-pyU
-cPc
-cVn
-cXW
-pyU
+uzR
+dlD
+ycw
+mMv
+mMv
+dSF
kqz
-ogE
-ogE
+ifD
+cPc
bME
ogE
csW
+xRO
+csa
cPc
-aaa
-aaa
-abq
-aaa
-aaa
-aaa
+iUn
+nqt
+iab
+jvx
aaa
aaa
bNI
@@ -131589,73 +131433,73 @@ bbH
bnr
boY
bqx
-aLC
+bsp
mwH
-bwN
-aLC
-bZJ
-rLo
+hvW
+gOq
+bsp
+bsp
bLI
mpr
bTd
bJO
-bEG
-akA
+bQI
+bQI
bPe
-opf
bQI
-bUk
+bQI
+bQI
bVA
-bXo
-aoG
-bNB
-aoG
-iuD
+wGR
+wgT
+rgo
+bZv
+oTB
sYJ
cex
-aoG
-clq
-ikn
-ikn
-qgz
-cFN
-coN
+bZv
+hvr
+uZG
+cwG
+cAP
+cAu
+cAu
cte
crR
-cuH
-cwG
+dlb
+inB
oNn
-fvO
-cwG
+inB
+waX
cyT
cmB
cUu
cQg
rOD
cDa
-xXD
+mra
sdj
-bdN
-csa
-bPl
-cOc
-cPc
-cPc
-cPc
+vCB
+lHQ
+eIa
+lar
+lar
+ydI
+mMv
+yaL
cPc
cPc
-cQE
-cAC
+xGF
cIM
cEG
cDD
+iKT
+xlh
cPc
-aaa
-aaa
-abq
-aaa
-aaa
-aaa
+deX
+nzf
+gkt
+cxT
aaa
aaa
bNI
@@ -131846,43 +131690,43 @@ bbH
bnr
mUq
qIg
-bmB
+bsp
buI
bwO
-aLC
+pjb
bAB
-ulM
-bED
-biM
-evK
-gIN
-bEG
-bEG
-bEG
-bEG
-bEG
+aoG
+aoG
+aoG
+aoG
+aoG
+aoG
+oXK
+asJ
+aNR
bEG
+bZv
bVB
-bUi
-aoG
+mNF
+nac
yhT
-aoG
-bcm
-cbT
+bZv
+pHM
+ces
bNK
+bZv
+aoG
+pWa
+oXK
aoG
-cJd
-asJ
-nOF
-nWJ
-kaZ
-xyQ
cte
cte
cte
cte
cte
-cvV
+cte
+cte
+cte
cvV
cte
cmB
@@ -131892,27 +131736,27 @@ mUl
wOZ
qbl
cPf
-bdN
-hrM
-cEN
+vDQ
+uzR
+uzR
bnB
-cJk
+uzR
cGs
-emj
+mMv
lEN
-cPc
-cPc
-cPc
-cPc
-cPc
+oUf
+ifq
+nyp
+vQo
+dSx
bdN
cQW
cQW
cQW
xwJ
-aaa
-aaa
-aaa
+deX
+kKa
+jTb
aaa
aaa
bNI
@@ -132103,43 +131947,43 @@ bbH
bnk
bpb
bqC
-aLC
+bsp
cbX
nTX
-aLC
+lfV
wQe
-bLv
-bHW
+aoG
+gHV
bHW
bHX
kZl
xbt
-bJN
+aoG
bPg
-ajr
+dnm
bTP
-bEG
+mVF
bnc
bXq
-aoG
-caI
-aoG
-oTB
-bJI
-bak
-aoG
-cir
-cxo
-aoG
+bZv
+bZv
+mVF
+bZv
+dgn
+bZv
+mVZ
+bSU
+eUt
+coQ
aoG
dbC
-aoG
+qzT
cte
cqC
-csk
-ctp
+cyh
+cyh
cww
-cwG
+cyh
cSa
cyd
cmB
@@ -132149,19 +131993,19 @@ cUQ
uOY
mfA
gZT
-bdN
+eIY
cAS
-adu
-pyU
-cKr
+uzR
+qyw
+uzR
cEN
-cSZ
-cJk
-cJk
+mMv
+mNJ
+ljk
cJk
-cWz
+cPc
cNf
-bBg
+fbQ
bdN
cJm
fFW
@@ -132363,41 +132207,41 @@ bqx
aoG
aoG
rvF
+iGZ
+aoG
+aoG
+aoG
aoG
-rKM
-bUl
-bEF
-bGq
bHY
bJP
-bEG
-bNE
+oNz
+aoG
bPh
-eeL
+rsI
bSB
-bEG
-bVD
-bXr
aoG
-rbN
-aoG
-pHM
-cZS
-cbm
-ers
-cJd
-mfJ
+asJ
+bSU
+rCD
+rCD
+rCD
+bSU
+asJ
+oXK
+lJt
+bSU
+izc
+gYF
aoG
-dcE
bXC
-oxJ
-cte
-cLV
+cFB
+pvr
cwG
+ePK
vGR
-cuG
-fvO
cwG
+oFz
+wec
cye
cmB
cwc
@@ -132406,17 +132250,17 @@ cDE
cUT
lrD
bcC
-bdN
-cPc
-cPc
-cPc
-cPc
-pyU
-cnW
+mMv
+uzR
+oHb
+eAL
+myv
+xEr
+mMv
xLY
-pyU
-das
-cze
+gft
+wnx
+usE
cln
csn
dUv
@@ -132616,43 +132460,43 @@ bjB
blq
iHk
xfn
-bqx
-aoG
+syJ
+mEm
+eqI
+eqI
+eqI
+eqI
+aQT
azp
-lGH
-aoG
-aoG
-bln
-aoG
-aoG
-aoG
-aoG
aoG
+aOz
+fFl
+woK
jmV
bUl
uZm
-iMm
-aoG
-pfh
-aoG
-aoG
-bYE
-aoG
+bYC
+kVn
+bYC
+bYC
+kmO
+bYC
+bYC
+iMW
+cxo
aoG
-uAz
+vtY
+bSU
+gQu
aoG
-dcx
-cFq
-bdl
aoG
-dck
bPj
-coQ
+wdY
cte
cqE
-cwG
-ptn
-cwG
+qoK
+dhw
+dhw
bUz
cuH
cyf
@@ -132663,19 +132507,19 @@ cSl
cOk
rHl
cRH
-cmz
-aaa
-aaa
-aaa
-cPc
-cPc
+mMv
+nRQ
+mMv
+mMv
+gBL
+eLT
cPc
cPc
cPc
cPc
cPc
-emj
-cAO
+nnA
+bBg
bdN
cVr
cSx
@@ -132872,68 +132716,68 @@ bhQ
bjC
bbH
bnp
-bpd
-bqy
-sLc
+hfi
+bqx
+aoG
cZD
nxh
-qKA
-qKA
+nOF
+bSU
dfg
-ihv
-qKA
-qKA
+coQ
+aoG
+qYT
cFG
+eVa
aoG
-daZ
prI
-aGW
+izc
aNR
qhd
-bWT
+nOF
pcb
-bNF
-bNB
-aoG
+bdl
+oXK
+chk
pHB
-bwD
-qgz
-qgz
+bYC
+kmO
+kmO
bYC
buC
aoG
cYB
-uzY
+gSO
csV
cte
voT
cqi
+fNl
+ool
cwG
-cuH
-cwG
-cwG
+oFz
cHV
cmB
cBR
cBR
-cBR
+vmW
wLt
vkT
wLt
-cmz
+gOT
aaa
aaa
aaa
aaa
-abq
+kOF
aaa
aaa
aaa
aaa
cPc
-dar
-cPc
-bdN
+emj
+cAO
+lVp
cQW
cQW
cQW
@@ -133132,43 +132976,43 @@ bqB
boY
bqx
aoG
-asJ
-asJ
-nWJ
-nWJ
+aoG
+aoG
+dSv
+tnW
nWJ
-qxo
-cJv
-asJ
-jta
+oXK
aoG
aoG
aoG
aoG
+oXK
+chk
+izc
+rCD
aoG
aoG
-mBJ
-jKE
-vvR
-ykN
-hts
-ssc
-bwE
-bgV
-asJ
-dcx
aoG
aoG
aoG
+hts
+izc
+asJ
+mfJ
+wFC
+dcx
aoG
aoG
cte
+cte
+cte
+cte
cqG
-csl
+cyh
ctr
-cuI
-cwI
-cxj
+cyh
+cyh
+cyh
cyh
cte
aaa
@@ -133188,7 +133032,7 @@ aaa
aaa
aaa
cPc
-emj
+dar
cPc
aaa
aaa
@@ -133390,34 +133234,34 @@ boY
bqx
aoG
aMh
-asJ
-aoG
-mfJ
-asJ
-aoG
+pVi
+pJt
+cOJ
+hjg
+kmO
cNc
-asJ
-hls
-qKA
-qKA
-qKA
+bYC
+bYC
+uGA
+bYC
+bYC
qKA
-lbk
+lJt
dSv
sEQ
hwF
nOU
-rHb
+aoG
aoG
cQF
-czZ
-asJ
-qxo
+aoG
+aoG
+aoG
aoG
chs
ckb
agj
-cmF
+agj
cnJ
cte
cte
@@ -133444,9 +133288,9 @@ aaa
aaa
aaa
aaa
-aef
-aef
-aef
+cPc
+emj
+cPc
aaa
aaa
aaa
@@ -133647,33 +133491,33 @@ xVd
lDD
aoG
bSG
-asJ
-nWJ
-cmg
-bSU
+gRz
aoG
-dbV
-csB
-nOF
-qxo
+cmg
+eVy
asJ
+mfJ
+csB
+bSU
+mfJ
+lJt
asJ
-kry
-aoG
-aoG
-aoG
-aoG
-aoG
+bSU
+lJt
aoG
+nOE
+rja
+etR
aoG
+vFm
qxo
cdm
-asJ
+aoG
lRY
aoG
ciF
-clz
-clz
+aRQ
+aRQ
bkY
brW
dBe
@@ -133701,9 +133545,9 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
-aaa
+aef
+aef
+aef
aaa
aaa
aaa
@@ -133906,8 +133750,8 @@ aoG
aoG
aoG
aoG
-cSV
aoG
+eVJ
axh
axh
axh
@@ -133917,15 +133761,15 @@ axh
cwQ
buy
aoG
-ryN
-bUr
+aoG
+oXK
cGV
-bTc
-csf
aoG
-cwQ
-cPd
-coX
+aoG
+oXK
+izc
+asJ
+oXK
aoG
aoG
chQ
@@ -134175,12 +134019,12 @@ axh
axh
axh
bgV
-asJ
-bZI
-asJ
+hdc
+kry
+fTV
bZH
aoG
-aoG
+ubN
cdp
chb
cfL
@@ -134432,14 +134276,14 @@ kbr
vud
axh
cyv
-asJ
-aDa
+kQF
+bZH
kry
-asJ
-asJ
+nXk
+aoG
aAL
cfy
-asJ
+lXW
aoG
cgW
chX
@@ -134675,7 +134519,7 @@ ylO
xhF
qqk
iKZ
-tEM
+pig
nfX
pig
vbB
@@ -134690,11 +134534,11 @@ pZe
axh
cBG
avC
-asJ
+nXk
aub
-asJ
+mlq
csf
-aoG
+tiv
aQT
cLr
aoG
@@ -134940,7 +134784,7 @@ ceF
oJW
ciE
bFh
-cmE
+dmN
fLw
bow
ibu
@@ -134949,8 +134793,8 @@ bSI
bVL
dbI
aXP
-lJt
-axh
+hTl
+eBq
axh
cds
axh
@@ -135197,7 +135041,7 @@ ceF
nqJ
utC
bSQ
-cmE
+dmN
rUK
tdA
xWt
@@ -135205,7 +135049,7 @@ axh
cCr
bVM
bXt
-csf
+ovR
arr
axh
fcB
@@ -135710,7 +135554,7 @@ uNL
scF
cdQ
vjy
-sNA
+kfn
cij
qFI
exZ
@@ -135967,7 +135811,7 @@ ndp
ceF
ceF
chR
-sNA
+kfn
nyT
ceF
nfk
@@ -136224,8 +136068,8 @@ eht
ceF
kSA
bil
-sNA
-dmN
+xte
+lVy
bhv
bnU
cnH
@@ -136751,7 +136595,7 @@ aAG
aAG
lfX
dWq
-tCE
+ctt
kwm
ctt
oEe
@@ -137008,7 +136852,7 @@ kxo
aAG
hnq
dWq
-tCE
+ctt
kwm
ctt
hRm
@@ -137265,7 +137109,7 @@ bwV
uiY
gTx
vib
-tCE
+ctt
xCT
npx
tbm
@@ -137522,7 +137366,7 @@ fWW
fWW
sGe
fkv
-aTr
+ctt
kwm
etE
dsf
@@ -138834,10 +138678,10 @@ lHc
lHc
rIX
qyo
-vxj
-gfy
lHc
+gfy
lHc
+mKw
rIX
lHc
lHc
@@ -139353,7 +139197,7 @@ gJt
cJb
cZr
cji
-kjo
+sNa
cBb
ibI
uQm
@@ -139610,7 +139454,7 @@ hwb
wCn
cZr
wyX
-kjo
+sNa
tbY
fNn
mdi
@@ -139867,7 +139711,7 @@ jau
bxi
wCn
iUe
-kjo
+sNa
dRU
oWa
ddY
@@ -140124,7 +139968,7 @@ jau
hCr
wCn
iUe
-kjo
+sNa
gOX
fNn
mdi
@@ -140373,15 +140217,15 @@ eUC
uQm
rPU
cBb
-cEd
-kjo
+dxi
+pzw
cZr
wCn
wCn
wCn
cZr
iUe
-kjo
+sNa
cBb
rPU
uQm
@@ -140631,14 +140475,14 @@ eUC
iPP
dVK
cTI
-jaE
+hnx
ktd
lHc
vUV
lHc
jFi
xUb
-hnx
+fAN
nXr
kOw
evr
@@ -140893,8 +140737,8 @@ lMC
rZt
fhR
qma
-gSu
-gSu
+grl
+qfy
aIa
jOj
iEP
@@ -141148,7 +140992,7 @@ hfR
kLd
lWW
pmT
-lGx
+gSu
lej
hEv
bQl
@@ -141662,7 +141506,7 @@ cqk
sjV
ivR
cqk
-lWe
+wXA
sjV
cIP
cqk
@@ -141919,7 +141763,7 @@ eUC
sjV
mdi
cqk
-lWe
+wXA
sjV
mdi
cqk
@@ -142176,7 +142020,7 @@ eUC
uQm
wZa
uFN
-slT
+wXA
mnt
xnj
uQm
@@ -142430,13 +142274,13 @@ ngG
ngG
igv
xQR
-eUC
+uQm
bdp
reP
uDq
wXA
qcu
-evr
+uQm
uHv
uLb
nkt
@@ -142687,11 +142531,11 @@ qiA
aEl
oBT
jWt
-wgz
-wgz
-wgz
+mIC
+mIC
+xsj
vCK
-wgz
+mbj
vqy
wgz
uXK
@@ -142944,13 +142788,13 @@ nxT
nxT
jSg
nxT
-mMv
-uzR
-uzR
+uQm
+mdi
+mdi
oJs
-uzR
+mdi
dSg
-mMv
+uQm
unF
heq
unF
@@ -143201,13 +143045,13 @@ nxT
oOg
umh
dfi
-mMv
+uQm
qIh
-uzR
+mdi
oJs
-uzR
-pGW
-mMv
+mdi
+dSg
+uQm
xts
qww
sCX
@@ -143458,13 +143302,13 @@ nxT
hbc
dMK
lzW
-mMv
+uQm
eqj
-uzR
+mdi
heJ
-uzR
+mdi
gSU
-mMv
+uQm
noE
iqC
kUz
@@ -143715,13 +143559,13 @@ sJE
nxT
quL
quL
-mMv
+uQm
lKc
-uzR
+mdi
niQ
-uzR
-uzR
-mMv
+mdi
+mdi
+uQm
adk
adk
unF
@@ -143972,13 +143816,13 @@ aaa
aaa
aaa
abq
-mMv
-mMv
-hnB
+uQm
+uQm
+mdi
ckq
pYx
-mMv
-mMv
+uQm
+uQm
abq
aaa
aaa
@@ -144230,11 +144074,11 @@ aaa
aaa
abq
abq
-mMv
-mMv
+uQm
+uQm
fRl
-mMv
-mMv
+uQm
+uQm
abq
abq
aaa
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/deepstorage.dmm b/_maps/map_files/RandomRuins/SpaceRuins/deepstorage.dmm
index a843b2e42d35..0559b278a5d4 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/deepstorage.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/deepstorage.dmm
@@ -148,7 +148,7 @@
/obj/item/storage/box/syringes,
/obj/item/storage/box/beakers,
/obj/item/storage/box/beakers,
-/obj/item/storage/box/matches,
+/obj/item/storage/fancy/matches,
/obj/item/storage/box/bodybags,
/obj/item/clothing/glasses/meson,
/obj/item/clothing/glasses/meson,
@@ -546,7 +546,7 @@
/area/ruin/space/unpowered)
"bl" = (
/obj/structure/table,
-/obj/item/storage/box/matches,
+/obj/item/storage/fancy/matches,
/turf/simulated/floor/plasteel,
/area/ruin/space/unpowered)
"bm" = (
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/meatpackers.dmm b/_maps/map_files/RandomRuins/SpaceRuins/meatpackers.dmm
index 63adf20f7cea..89a5ba26557e 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/meatpackers.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/meatpackers.dmm
@@ -2412,7 +2412,7 @@
/turf/simulated/floor/engine,
/area/ruin/unpowered/BMPship/Aft)
"hr" = (
-/obj/item/storage/box/matches,
+/obj/item/storage/fancy/matches,
/obj/item/storage/fancy/cigarettes/dromedaryco,
/turf/simulated/floor/plating,
/area/ruin/unpowered/BMPship/Aft)
diff --git a/_maps/map_files/cerestation/cerestation.dmm b/_maps/map_files/cerestation/cerestation.dmm
index bf3158e750dc..b05add31b3b5 100644
--- a/_maps/map_files/cerestation/cerestation.dmm
+++ b/_maps/map_files/cerestation/cerestation.dmm
@@ -1002,7 +1002,7 @@
/area/station/security/permabrig)
"aga" = (
/obj/structure/table,
-/obj/item/storage/box/matches,
+/obj/item/storage/fancy/matches,
/obj/item/seeds/tobacco,
/obj/item/storage/fancy/rollingpapers,
/turf/simulated/floor/plasteel{
@@ -49148,7 +49148,7 @@
/area/station/command/office/blueshield)
"iKY" = (
/obj/structure/table/glass/reinforced,
-/obj/item/storage/box/matches{
+/obj/item/storage/fancy/matches{
pixel_x = 1;
pixel_y = -1
},
diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm
index d97f522e972f..cf849fe3c8aa 100644
--- a/_maps/map_files/cyberiad/cyberiad.dmm
+++ b/_maps/map_files/cyberiad/cyberiad.dmm
@@ -30373,7 +30373,7 @@
name = "south bump";
pixel_y = -28
},
-/obj/item/storage/box/matches,
+/obj/item/storage/fancy/matches,
/obj/item/reagent_containers/food/drinks/flask/gold,
/obj/item/clothing/mask/cigarette/cigar,
/obj/item/razor{
@@ -71366,7 +71366,7 @@
"lWD" = (
/obj/structure/table,
/obj/item/storage/fancy/rollingpapers,
-/obj/item/storage/box/matches,
+/obj/item/storage/fancy/matches,
/obj/item/seeds/tobacco,
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
diff --git a/_maps/map_files/generic/centcomm.dmm b/_maps/map_files/generic/centcomm.dmm
index 8295f9818031..afd70a1a1f52 100644
--- a/_maps/map_files/generic/centcomm.dmm
+++ b/_maps/map_files/generic/centcomm.dmm
@@ -3979,32 +3979,32 @@
/area/abductor_ship)
"ns" = (
/obj/structure/rack,
-/obj/item/implanter/adrenalin{
+/obj/item/bio_chip_implanter/adrenalin{
pixel_x = 12;
pixel_y = -12
},
-/obj/item/implanter/emp{
+/obj/item/bio_chip_implanter/emp{
pixel_x = 9;
pixel_y = -9
},
-/obj/item/implanter/explosive{
+/obj/item/bio_chip_implanter/explosive{
pixel_x = 6;
pixel_y = -6
},
-/obj/item/implanter/explosive_macro{
+/obj/item/bio_chip_implanter/explosive_macro{
pixel_x = 3;
pixel_y = -3
},
-/obj/item/implanter/freedom,
-/obj/item/implanter/krav_maga{
+/obj/item/bio_chip_implanter/freedom,
+/obj/item/bio_chip_implanter/krav_maga{
pixel_x = -9;
pixel_y = 9
},
-/obj/item/implanter/mindshield{
+/obj/item/bio_chip_implanter/mindshield{
pixel_x = -6;
pixel_y = 6
},
-/obj/item/implanter/storage{
+/obj/item/bio_chip_implanter/storage{
pixel_x = -3;
pixel_y = 3
},
@@ -4801,7 +4801,7 @@
/area/shuttle/escape)
"qm" = (
/obj/structure/table/wood/fancy/royalblack,
-/obj/item/storage/box/matches,
+/obj/item/storage/fancy/matches,
/turf/simulated/floor/carpet/black,
/area/ghost_bar)
"qn" = (
@@ -10690,7 +10690,7 @@
/area/shuttle/escape)
"LT" = (
/obj/structure/table/wood/fancy/royalblack,
-/obj/item/storage/box/matches,
+/obj/item/storage/fancy/matches,
/obj/effect/turf_decal/woodsiding{
dir = 1
},
@@ -12904,7 +12904,7 @@
},
/area/centcom/evac)
"TN" = (
-/obj/item/storage/box/matches{
+/obj/item/storage/fancy/matches{
pixel_x = -3;
pixel_y = 5
},
diff --git a/code/__DEFINES/dcs/signals.dm b/code/__DEFINES/dcs/signals.dm
index 4be8046aecdc..0b3ba9e063f3 100644
--- a/code/__DEFINES/dcs/signals.dm
+++ b/code/__DEFINES/dcs/signals.dm
@@ -649,12 +649,12 @@
#define COMSIG_SUIT_SPACE_TOGGLE "suit_space_toggle"
// /obj/item/implant signals
-///from base of /obj/item/implant/proc/activate(): ()
+///from base of /obj/item/bio_chip/proc/activate(): ()
#define COMSIG_IMPLANT_ACTIVATED "implant_activated"
-///from base of /obj/item/implant/proc/implant(): (list/args)
+///from base of /obj/item/bio_chip/proc/implant(): (list/args)
#define COMSIG_IMPLANT_IMPLANTING "implant_implanting"
#define COMPONENT_STOP_IMPLANTING (1<<0)
-///called on already installed implants when a new one is being added in /obj/item/implant/proc/implant(): (list/args, obj/item/implant/new_implant)
+///called on already installed implants when a new one is being added in /obj/item/bio_chip/proc/implant(): (list/args, obj/item/bio_chip/new_implant)
#define COMSIG_IMPLANT_OTHER "implant_other"
//#define COMPONENT_STOP_IMPLANTING (1<<0) //The name makes sense for both
#define COMPONENT_DELETE_NEW_IMPLANT (1<<1)
diff --git a/code/__DEFINES/misc_defines.dm b/code/__DEFINES/misc_defines.dm
index 1247d77e0047..482bc95f622c 100644
--- a/code/__DEFINES/misc_defines.dm
+++ b/code/__DEFINES/misc_defines.dm
@@ -578,3 +578,13 @@
/// It will only work for datums mind, for datum reasons
/// : because of the embedded typecheck
#define text_ref(datum) (isdatum(datum) ? (datum:cached_ref ||= "\ref[datum]") : ("\ref[datum]"))
+
+#define ROUND_END_NUCLEAR 1
+#define ROUND_END_CREW_TRANSFER 2
+#define ROUND_END_FORCED 3
+
+#define TS_INFESTATION_GREEN_SPIDER 1
+#define TS_INFESTATION_PRINCE_SPIDER 2
+#define TS_INFESTATION_WHITE_SPIDER 3
+#define TS_INFESTATION_PRINCESS_SPIDER 4
+#define TS_INFESTATION_QUEEN_SPIDER 5
diff --git a/code/__DEFINES/mob_defines.dm b/code/__DEFINES/mob_defines.dm
index 497c229f08dd..de0aafa4096e 100644
--- a/code/__DEFINES/mob_defines.dm
+++ b/code/__DEFINES/mob_defines.dm
@@ -199,6 +199,9 @@
#define INVISIBILITY_ABSTRACT 101
#define UNHEALING_EAR_DAMAGE 100
+/// If you examine the same atom twice in this timeframe, we call examine_more() instead of examine()
+#define EXAMINE_MORE_WINDOW 1 SECONDS
+
#define DIRECTION_LOCK_SLOWDOWN 3
//Human sub-species
diff --git a/code/__HELPERS/trait_helpers.dm b/code/__HELPERS/trait_helpers.dm
index 71e15c25375a..758d18401fa0 100644
--- a/code/__HELPERS/trait_helpers.dm
+++ b/code/__HELPERS/trait_helpers.dm
@@ -222,6 +222,7 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
#define TRAIT_HAS_GPS "has_gps" // used for /Stat
#define TRAIT_CAN_VIEW_HEALTH "can_view_health" // Also used for /Stat
#define TRAIT_MAGPULSE "magnetificent" // Used for anything that is magboot related
+#define TRAIT_NOSLIP "noslip"
//***** MIND TRAITS *****/
#define TRAIT_HOLY "is_holy" // The mob is holy in regards to religion
diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm
index e8f2ba579252..751daeca3ac8 100644
--- a/code/__HELPERS/unsorted.dm
+++ b/code/__HELPERS/unsorted.dm
@@ -1649,7 +1649,7 @@ GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new)
/obj/item/grenade/clusterbuster = "CLUSTERBUSTER",
/obj/item/grenade = "GRENADE",
/obj/item/gun = "GUN",
- /obj/item/implant = "IMPLANT",
+ /obj/item/bio_chip = "BIO_CHIP",
/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack = "MECHA_MISSILE_RACK",
/obj/item/mecha_parts/mecha_equipment/weapon = "MECHA_WEAPON",
/obj/item/mecha_parts/mecha_equipment = "MECHA_EQUIP",
diff --git a/code/_globalvars/traits.dm b/code/_globalvars/traits.dm
index 361f75b4846e..6e5ea7ed4cba 100644
--- a/code/_globalvars/traits.dm
+++ b/code/_globalvars/traits.dm
@@ -86,6 +86,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
"TRAIT_SUPERMATTER_IMMUNE" = TRAIT_SUPERMATTER_IMMUNE,
"TRAIT_BADASS" = TRAIT_BADASS,
"TRAIT_FORCED_STANDING" = TRAIT_FORCED_STANDING,
+ "TRAIT_NOSLIP" = TRAIT_NOSLIP,
"TRAIT_MAGPULSE" = TRAIT_MAGPULSE
),
diff --git a/code/_onclick/ai_onclick.dm b/code/_onclick/ai_onclick.dm
index c8b598ab91b2..093d9408014f 100644
--- a/code/_onclick/ai_onclick.dm
+++ b/code/_onclick/ai_onclick.dm
@@ -179,7 +179,6 @@
/obj/machinery/power/apc/AICtrlClick(mob/living/user) // turns off/on APCs.
if(stat & BROKEN)
return
-
if(aidisabled)
to_chat(user, "Unable to interface: Connection refused.")
return
@@ -212,7 +211,7 @@
/obj/machinery/door/airlock/AICtrlClick(mob/living/silicon/user) // Bolts doors
if(!ai_control_check(user))
return
- if(user.can_instant_lockdown() || do_after_once(user, 3 SECONDS, needhand = FALSE, target = src, allow_moving = TRUE, attempt_cancel_message = "Bolting [src] cancelled.", special_identifier = "Bolt"))
+ if(ispulsedemon(user) || user.can_instant_lockdown() || do_after_once(user, 3 SECONDS, needhand = FALSE, target = src, allow_moving = TRUE, attempt_cancel_message = "Bolting [src] cancelled.", special_identifier = "Bolt"))
toggle_bolt(user)
@@ -224,7 +223,7 @@
if(isElectrified())
electrify(0, user, TRUE) // un-shock
else
- if(user.can_instant_lockdown() || do_after_once(user, 3 SECONDS, target = src, allow_moving = TRUE, attempt_cancel_message = "Shocking [src] cancelled.", special_identifier = "Shock"))
+ if(ispulsedemon(user) || user.can_instant_lockdown() || do_after_once(user, 3 SECONDS, target = src, allow_moving = TRUE, attempt_cancel_message = "Shocking [src] cancelled.", special_identifier = "Shock"))
electrify(-1, user, TRUE) // permanent shock + audio cue
playsound(loc, "sparks", 100, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
diff --git a/code/controllers/subsystem/SSevents.dm b/code/controllers/subsystem/SSevents.dm
index 05cf11c1c088..bd01160067cb 100644
--- a/code/controllers/subsystem/SSevents.dm
+++ b/code/controllers/subsystem/SSevents.dm
@@ -30,6 +30,8 @@ SUBSYSTEM_DEF(events)
var/datum/event_meta/new_event = new
+ var/list/biohazards_this_round = list()
+
/datum/controller/subsystem/events/Initialize()
allEvents = subtypesof(/datum/event)
diff --git a/code/controllers/subsystem/SSghost_spawns.dm b/code/controllers/subsystem/SSghost_spawns.dm
index 6a5c9927c8a3..c433765f0bc6 100644
--- a/code/controllers/subsystem/SSghost_spawns.dm
+++ b/code/controllers/subsystem/SSghost_spawns.dm
@@ -59,7 +59,7 @@ SUBSYSTEM_DEF(ghost_spawns)
var/category = "[P.hash]_notify_action"
- var/notice_sound = sound('sound/misc/notice2.ogg')
+ var/notice_sound = sound('sound/effects/ghost_ping.ogg')
for(var/mob/M in (GLOB.player_list))
if(!is_eligible(M, role, antag_age_check, role, min_hours, check_antaghud))
continue
diff --git a/code/controllers/subsystem/SSticker.dm b/code/controllers/subsystem/SSticker.dm
index b44fb91e9264..3dde5a389b41 100644
--- a/code/controllers/subsystem/SSticker.dm
+++ b/code/controllers/subsystem/SSticker.dm
@@ -128,6 +128,8 @@ SUBSYSTEM_DEF(ticker)
if(game_finished || force_ending)
current_state = GAME_STATE_FINISHED
if(GAME_STATE_FINISHED)
+ if(SSshuttle.emergency.mode >= SHUTTLE_ENDGAME && !mode.station_was_nuked)
+ event_blackbox(outcome = ROUND_END_CREW_TRANSFER)
current_state = GAME_STATE_FINISHED
Master.SetRunLevel(RUNLEVEL_POSTGAME) // This shouldnt process more than once, but you never know
auto_toggle_ooc(TRUE) // Turn it on
@@ -776,3 +778,77 @@ SUBSYSTEM_DEF(ticker)
QDEL_LIST_ASSOC_VAL(load_queries)
records.Cut()
flagged_antag_rollers.Cut()
+
+/// This proc is for recording biohazard events, and blackboxing if they lived, died, or ended the round. This currently applies to: Terror spiders, Xenomorphs, and Blob.
+/datum/controller/subsystem/ticker/proc/event_blackbox(outcome = ROUND_END_CREW_TRANSFER)
+ for(var/I in SSevents.biohazards_this_round)
+ switch(I)
+ if(TS_INFESTATION_GREEN_SPIDER, TS_INFESTATION_PRINCE_SPIDER, TS_INFESTATION_WHITE_SPIDER, TS_INFESTATION_PRINCESS_SPIDER, TS_INFESTATION_QUEEN_SPIDER)
+ var/output = "unknown spider type"
+ switch(I)
+ if(TS_INFESTATION_GREEN_SPIDER)
+ output = "Green Terrors"
+ if(TS_INFESTATION_PRINCE_SPIDER)
+ output = "Prince Terror"
+ if(TS_INFESTATION_WHITE_SPIDER)
+ output = "White Terrors"
+ if(TS_INFESTATION_PRINCESS_SPIDER)
+ output = "Princess Terrors"
+ if(TS_INFESTATION_QUEEN_SPIDER)
+ output = "Queen Terrors"
+ var/spiders = 0
+ for(var/mob/living/simple_animal/hostile/poison/terror_spider/S in GLOB.ts_spiderlist)
+ if(S.ckey)
+ spiders++
+ if(spiders >= 5 || (output == "Prince Terror" && spiders == 1)) //If a prince lives, record as win.
+ switch(outcome)
+ if(ROUND_END_NUCLEAR)
+ SSblackbox.record_feedback("tally", "Biohazard nuclear victories", 1, output)
+ if(ROUND_END_CREW_TRANSFER)
+ SSblackbox.record_feedback("tally", "Biohazard survives to normal round end", 1, output)
+ if(ROUND_END_FORCED)
+ SSblackbox.record_feedback("tally", "Biohazard survives to admin round end", 1, output)
+ else
+ switch(outcome)
+ if(ROUND_END_NUCLEAR)
+ SSblackbox.record_feedback("tally", "Biohazard dies station nuked", 1, output)
+ if(ROUND_END_CREW_TRANSFER)
+ SSblackbox.record_feedback("tally", "Biohazard dies normal end", 1, output)
+ if(ROUND_END_FORCED)
+ SSblackbox.record_feedback("tally", "Biohazard dies admin round end", 1, output)
+ if("Xenomorphs")
+ if(length(SSticker.mode.xenos) > 5)
+ switch(outcome)
+ if(ROUND_END_NUCLEAR)
+ SSblackbox.record_feedback("tally", "Biohazard nuclear victories", 1, "Xenomorphs")
+ if(ROUND_END_CREW_TRANSFER)
+ SSblackbox.record_feedback("tally", "Biohazard survives to normal round end", 1, "Xenomorphs")
+ if(ROUND_END_FORCED)
+ SSblackbox.record_feedback("tally", "Biohazard survives to admin round end", 1, "Xenomorphs")
+ else
+ switch(outcome)
+ if(ROUND_END_NUCLEAR)
+ SSblackbox.record_feedback("tally", "Biohazard dies station nuked", 1, "Xenomorphs")
+ if(ROUND_END_CREW_TRANSFER)
+ SSblackbox.record_feedback("tally", "Biohazard dies normal end", 1, "Xenomorphs")
+ if(ROUND_END_FORCED)
+ SSblackbox.record_feedback("tally", "Biohazard dies admin round end", 1, "Xenomorphs")
+
+ if("Blob")
+ if(length(SSticker.mode.blob_overminds))
+ switch(outcome)
+ if(ROUND_END_NUCLEAR)
+ SSblackbox.record_feedback("tally", "Biohazard nuclear victories", 1, "Blob")
+ if(ROUND_END_CREW_TRANSFER)
+ SSblackbox.record_feedback("tally", "Biohazard survives to normal round end", 1, "Blob")
+ if(ROUND_END_FORCED)
+ SSblackbox.record_feedback("tally", "Biohazard survives to admin round end", 1, "Blob")
+ else
+ switch(outcome)
+ if(ROUND_END_NUCLEAR)
+ SSblackbox.record_feedback("tally", "Biohazard dies station nuked", 1, "Blob")
+ if(ROUND_END_CREW_TRANSFER)
+ SSblackbox.record_feedback("tally", "Biohazard dies normal end", 1, "Blob")
+ if(ROUND_END_FORCED)
+ SSblackbox.record_feedback("tally", "Biohazard dies admin round end", 1, "Blob")
+
diff --git a/code/datums/diseases/transformation.dm b/code/datums/diseases/transformation.dm
index 214934b26074..0a23b014a59a 100644
--- a/code/datums/diseases/transformation.dm
+++ b/code/datums/diseases/transformation.dm
@@ -53,7 +53,7 @@
affected_mob.overlays.Cut()
affected_mob.invisibility = 101
for(var/obj/item/W in affected_mob)
- if(istype(W, /obj/item/implant))
+ if(istype(W, /obj/item/bio_chip))
qdel(W)
continue
W.layer = initial(W.layer)
diff --git a/code/datums/mind.dm b/code/datums/mind.dm
index dda9365c288b..1d4eb334251b 100644
--- a/code/datums/mind.dm
+++ b/code/datums/mind.dm
@@ -161,6 +161,17 @@
new_character.key = key //now transfer the key to link the client to our new body
SEND_SIGNAL(src, COMSIG_MIND_TRANSER_TO, new_character)
SEND_SIGNAL(new_character, COMSIG_BODY_TRANSFER_TO)
+ if(ishuman(new_character))
+ var/mob/living/carbon/human/H = new_character
+ if(H.mind in SSticker.mode.syndicates)
+ SSticker.mode.update_synd_icons_added()
+ if(H.mind in SSticker.mode.cult)
+ SSticker.mode.update_cult_icons_added(H.mind) // Adds the cult antag hud
+ SSticker.mode.add_cult_actions(H.mind) // And all the actions
+ if(SSticker.mode.cult_risen)
+ SSticker.mode.rise(H)
+ if(SSticker.mode.cult_ascendant)
+ SSticker.mode.ascend(H)
/datum/mind/proc/store_memory(new_text)
memory += "[new_text]
"
@@ -782,14 +793,14 @@
switch(href_list["implant"])
if("remove")
- for(var/obj/item/implant/mindshield/I in H.contents)
+ for(var/obj/item/bio_chip/mindshield/I in H.contents)
if(I && I.implanted)
qdel(I)
- to_chat(H, "Your mindshield bio-chip has been deactivated.")
+ to_chat(H, "Your mindshield bio-chip has been deactivated.")
log_admin("[key_name(usr)] has deactivated [key_name(current)]'s mindshield bio-chip")
message_admins("[key_name_admin(usr)] has deactivated [key_name_admin(current)]'s mindshield bio-chip")
if("add")
- var/obj/item/implant/mindshield/L = new/obj/item/implant/mindshield(H)
+ var/obj/item/bio_chip/mindshield/L = new/obj/item/bio_chip/mindshield(H)
L.implant(H)
log_admin("[key_name(usr)] has given [key_name(current)] a mindshield bio-chip")
@@ -1387,7 +1398,7 @@
if(has_antag_datum(/datum/antagonist/mindslave, FALSE))
var/mob/living/carbon/human/H = current
for(var/i in H.contents)
- if(istype(i, /obj/item/implant/traitor))
+ if(istype(i, /obj/item/bio_chip/traitor))
qdel(i)
break
remove_antag_datum(/datum/antagonist/mindslave)
diff --git a/code/datums/outfits/outfit.dm b/code/datums/outfits/outfit.dm
index 3ebfef8a4cd6..230aef4f95f3 100644
--- a/code/datums/outfits/outfit.dm
+++ b/code/datums/outfits/outfit.dm
@@ -25,7 +25,7 @@
var/internals_slot = null //ID of slot containing a gas tank
var/list/backpack_contents = list() // In the list(path=count,otherpath=count) format
var/box // Internals box. Will be inserted at the start of backpack_contents
- var/list/implants = list()
+ var/list/bio_chips = list()
var/list/cybernetic_implants = list()
var/list/accessories = list()
@@ -136,9 +136,9 @@
H.internal = H.get_item_by_slot(internals_slot)
H.update_action_buttons_icon()
- if(implants)
- for(var/implant_type in implants)
- var/obj/item/implant/I = new implant_type(H)
+ if(bio_chips)
+ for(var/bio_chip_type in bio_chips)
+ var/obj/item/bio_chip/I = new bio_chip_type(H)
I.implant(H, null)
H.update_body()
@@ -232,12 +232,12 @@
backpack_contents[itype] = backpack[item]
box = text2path(outfit_data["box"])
- var/list/impl = outfit_data["implants"]
- implants = list()
+ var/list/impl = outfit_data["bio_chips"]
+ bio_chips = list()
for(var/I in impl)
var/imptype = text2path(I)
if(imptype)
- implants += imptype
+ bio_chips += imptype
var/list/cybernetic_impl = outfit_data["cybernetic_implants"]
cybernetic_implants = list()
@@ -281,7 +281,7 @@
.["internals_slot"] = internals_slot
.["backpack_contents"] = backpack_contents
.["box"] = box
- .["implants"] = implants
+ .["bio_chips"] = bio_chips
.["cybernetic_implants"] = cybernetic_implants
.["accessories"] = accessories
diff --git a/code/datums/outfits/outfit_admin.dm b/code/datums/outfits/outfit_admin.dm
index 9c457d9c7209..8136bf81c680 100644
--- a/code/datums/outfits/outfit_admin.dm
+++ b/code/datums/outfits/outfit_admin.dm
@@ -113,7 +113,7 @@
if(visualsOnly)
return
- var/obj/item/implant/explosive/E = new(H)
+ var/obj/item/bio_chip/explosive/E = new(H)
E.implant(H)
@@ -136,8 +136,8 @@
uplink_uses = 200
id_access = "Syndicate Agent"
- implants = list(
- /obj/item/implant/dust
+ bio_chips = list(
+ /obj/item/bio_chip/dust
)
@@ -181,11 +181,11 @@
pda = /obj/item/pda/centcom
backpack_contents = list(
/obj/item/storage/box/centcomofficer = 1,
- /obj/item/implanter/death_alarm = 1
+ /obj/item/bio_chip_implanter/death_alarm = 1
)
- implants = list(
- /obj/item/implant/mindshield,
- /obj/item/implant/dust
+ bio_chips = list(
+ /obj/item/bio_chip/mindshield,
+ /obj/item/bio_chip/dust
)
/datum/outfit/admin/nt_navy_captain/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
@@ -212,11 +212,11 @@
pda = /obj/item/pda/centcom
backpack_contents = list(
/obj/item/storage/box/survival = 1,
- /obj/item/implanter/death_alarm = 1,
+ /obj/item/bio_chip_implanter/death_alarm = 1,
)
- implants = list(
- /obj/item/implant/mindshield,
- /obj/item/implant/dust
+ bio_chips = list(
+ /obj/item/bio_chip/mindshield,
+ /obj/item/bio_chip/dust
)
/datum/outfit/admin/nt_diplomat/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
@@ -246,8 +246,8 @@
/obj/item/flashlight = 1,
/obj/item/pinpointer/crew = 1
)
- implants = list(
- /obj/item/implant/dust
+ bio_chips = list(
+ /obj/item/bio_chip/dust
)
cybernetic_implants = list(
/obj/item/organ/internal/cyberimp/eyes/hud/security,
@@ -299,9 +299,9 @@
/obj/item/shield/energy,
)
- implants = list(
- /obj/item/implant/mindshield, // No death alarm, Deathsquad are silent
- /obj/item/implant/dust
+ bio_chips = list(
+ /obj/item/bio_chip/mindshield, // No death alarm, Deathsquad are silent
+ /obj/item/bio_chip/dust
)
/datum/outfit/admin/deathsquad_commando/leader
@@ -705,12 +705,12 @@
pda = /obj/item/pda
backpack_contents = list(
/obj/item/storage/box/responseteam = 1,
- /obj/item/implanter/dust = 1,
- /obj/item/implanter/death_alarm = 1,
+ /obj/item/bio_chip_implanter/dust = 1,
+ /obj/item/bio_chip_implanter/death_alarm = 1,
)
- implants = list(/obj/item/implant/mindshield,
- /obj/item/implant/death_alarm
+ bio_chips = list(/obj/item/bio_chip/mindshield,
+ /obj/item/bio_chip/death_alarm
)
/datum/outfit/admin/solgov_rep/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
@@ -753,8 +753,8 @@
/obj/item/organ/internal/cyberimp/chest/nutriment/hardened,
/obj/item/organ/internal/cyberimp/eyes/hud/security
)
- implants = list(/obj/item/implant/mindshield,
- /obj/item/implant/death_alarm
+ bio_chips = list(/obj/item/bio_chip/mindshield,
+ /obj/item/bio_chip/death_alarm
)
var/is_solgov_lieutenant = FALSE
@@ -915,58 +915,57 @@
if(istype(I))
apply_to_card(I, H, get_all_accesses(), "Space Explorer")
-/datum/outfit/admin/hardsuit
- name = "Hardsuit - Generic"
- back = /obj/item/tank/jetpack/oxygen
+/datum/outfit/admin/modsuit
+ name = "MODsuit - Generic"
+ back = /obj/item/mod/control/pre_equipped/standard
+ suit_store = /obj/item/tank/internals/oxygen
mask = /obj/item/clothing/mask/breath
shoes = /obj/item/clothing/shoes/magboots
id = /obj/item/card/id
-/datum/outfit/admin/hardsuit/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
+/datum/outfit/admin/modsuit/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
. = ..()
if(visualsOnly)
return
- if(istype(H.back, /obj/item/tank/jetpack))
- var/obj/item/tank/jetpack/J = H.back
- J.turn_on()
+ if(istype(H.back, /obj/item/tank/internals/oxygen))
+ var/obj/item/tank/internals/oxygen/J = H.back
J.toggle_internals(H)
var/obj/item/card/id/I = H.wear_id
if(istype(I))
- apply_to_card(I, H, get_all_accesses(), "Hardsuit Tester")
+ apply_to_card(I, H, get_all_accesses(), "MODsuit Tester")
-/datum/outfit/admin/hardsuit/engineer
- name = "Hardsuit - Engineer"
- suit = /obj/item/clothing/suit/space/hardsuit/engine
+/datum/outfit/admin/modsuit/engineer
+ name = "MODsuit - Engineer"
+ back = /obj/item/mod/control/pre_equipped/engineering
-/datum/outfit/admin/hardsuit/ce
- name = "Hardsuit - CE"
- suit = /obj/item/clothing/suit/space/hardsuit/engine/elite
+/datum/outfit/admin/modsuit/ce
+ name = "MODsuit - CE"
+ back = /obj/item/mod/control/pre_equipped/advanced
shoes = /obj/item/clothing/shoes/magboots/advance
-/datum/outfit/admin/hardsuit/mining
- name = "Hardsuit - Mining"
- suit = /obj/item/clothing/suit/space/hardsuit/mining
+/datum/outfit/admin/modsuit/mining
+ name = "MODsuit - Mining"
+ back = /obj/item/mod/control/pre_equipped/mining/asteroid
-/datum/outfit/admin/hardsuit/syndi
- name = "Hardsuit - Syndi"
- suit = /obj/item/clothing/suit/space/hardsuit/syndi
+/datum/outfit/admin/modsuit/syndi
+ name = "MODsuit - Syndi"
+ back = /obj/item/mod/control/pre_equipped/traitor
shoes = /obj/item/clothing/shoes/magboots/syndie
-/datum/outfit/admin/hardsuit/wizard
+/datum/outfit/admin/modsuit/wizard // Technically not a MODsuit, we'll bundle it up in here for the future when it does become one
name = "Hardsuit - Wizard"
suit = /obj/item/clothing/suit/space/hardsuit/shielded/wizard
shoes = /obj/item/clothing/shoes/magboots/wizard
-/datum/outfit/admin/hardsuit/medical
- name = "Hardsuit - Medical"
- suit = /obj/item/clothing/suit/space/hardsuit/medical
-
-/datum/outfit/admin/hardsuit/atmos
- name = "Hardsuit - Atmos"
- suit = /obj/item/clothing/suit/space/hardsuit/engine/atmos
+/datum/outfit/admin/modsuit/medical
+ name = "MODsuit - Medical"
+ back = /obj/item/mod/control/pre_equipped/medical
+/datum/outfit/admin/modsuit/atmos
+ name = "MODsuit - Atmos"
+ back = /obj/item/mod/control/pre_equipped/atmospheric
/datum/outfit/admin/tournament
name = "Tournament Generic"
@@ -1046,7 +1045,7 @@
. = ..()
for(var/obj/item/I in H.contents)
- if(!istype(I, /obj/item/implant))
+ if(!istype(I, /obj/item/bio_chip))
I.add_mob_blood(H)
if(visualsOnly)
@@ -1081,7 +1080,7 @@
. = ..()
for(var/obj/item/I in H.contents)
- if(!istype(I, /obj/item/implant))
+ if(!istype(I, /obj/item/bio_chip))
I.add_mob_blood(H)
if(visualsOnly)
@@ -1278,8 +1277,8 @@
/obj/item/storage/box/survival = 1,
/obj/item/flashlight = 1,
)
- implants = list(
- /obj/item/implant/dust
+ bio_chips = list(
+ /obj/item/bio_chip/dust
)
/datum/outfit/admin/dark_priest/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
@@ -1376,7 +1375,7 @@
shoes = /obj/item/clothing/shoes/black
box = /obj/item/storage/box/survival
backpack_contents = list(
- /obj/item/implanter/dust = 1
+ /obj/item/bio_chip_implanter/dust = 1
)
/datum/outfit/admin/observer/plasmaman
diff --git a/code/datums/outfits/vv_outfit.dm b/code/datums/outfits/vv_outfit.dm
index 1b986aa12140..c211e1001c13 100644
--- a/code/datums/outfits/vv_outfit.dm
+++ b/code/datums/outfits/vv_outfit.dm
@@ -116,13 +116,13 @@
O.backpack_contents = typecounts
// TODO : Copy varedits from backpack stuff too.
- // Copy implants
- O.implants = list()
- for(var/obj/item/implant/I in contents)
+ //Copy biochips
+ O.bio_chips = list()
+ for(var/obj/item/bio_chip/I in contents)
if(istype(I))
- O.implants |= I.type
+ O.bio_chips |= I.type
- // Copy cybernetic implants
+ // Copy cybernetic biochips
O.cybernetic_implants = list()
for(var/org in internal_organs)
var/obj/item/organ/internal/aug = org
diff --git a/code/datums/radiation_wave.dm b/code/datums/radiation_wave.dm
index 0c6f32c45556..c7ff5d74af57 100644
--- a/code/datums/radiation_wave.dm
+++ b/code/datums/radiation_wave.dm
@@ -119,7 +119,7 @@
/obj/structure/cable,
/obj/machinery/atmospherics,
/obj/item/ammo_casing,
- /obj/item/implant,
+ /obj/item/bio_chip,
/obj/singularity,
))
if(!can_contaminate || !can_contam || blacklisted[thing.type])
diff --git a/code/datums/spell_targeting/matter_eater_targeting.dm b/code/datums/spell_targeting/matter_eater_targeting.dm
index a9f33c676768..d13449812dc9 100644
--- a/code/datums/spell_targeting/matter_eater_targeting.dm
+++ b/code/datums/spell_targeting/matter_eater_targeting.dm
@@ -22,7 +22,7 @@
)
var/list/own_blacklist = list(
/obj/item/organ,
- /obj/item/implant
+ /obj/item/bio_chip
)
/datum/spell_targeting/matter_eater/choose_targets(mob/user, obj/effect/proc_holder/spell/spell, params, atom/clicked_atom)
diff --git a/code/datums/spells/construct_spells.dm b/code/datums/spells/construct_spells.dm
index e27d70153bb6..c3a7d5ceacdd 100644
--- a/code/datums/spells/construct_spells.dm
+++ b/code/datums/spells/construct_spells.dm
@@ -52,7 +52,7 @@
/obj/effect/proc_holder/spell/aoe/conjure/build/soulstone
name = "Summon Soulstone"
- desc = "This spell reaches into Redspace, summoning one of the legendary fragments across time and space"
+ desc = "This spell uses vile sorcery to create a spirit-trapping soulstone."
action_icon_state = "summonsoulstone"
action_background_icon_state = "bg_cult"
school = "conjuration"
@@ -71,7 +71,7 @@
/obj/effect/proc_holder/spell/aoe/conjure/build/pylon
name = "Cult Pylon"
- desc = "This spell conjures a fragile crystal from Redspace. Makes for a convenient light source."
+ desc = "This spell uses dark magic to craft an unholy beacon. Heals cultists, and makes a handy light source."
action_icon_state = "pylon"
action_background_icon_state = "bg_cult"
school = "conjuration"
diff --git a/code/datums/spells/summonitem.dm b/code/datums/spells/summonitem.dm
index 1030621065be..9ce1d514d2fb 100644
--- a/code/datums/spells/summonitem.dm
+++ b/code/datums/spells/summonitem.dm
@@ -28,6 +28,9 @@
for(var/obj/item in hand_items)
if(istype(item, /obj/item/organ/internal/brain)) //Yeah, sadly this doesn't work due to the organ system.
break
+ if(istype(item, /obj/item/disk/nuclear)) //Let's not make nukies suffer with this bullshit.
+ to_chat(user, "[item] has some built in protections against such summoning magic.")
+ break
if(ABSTRACT in item.flags)
continue
if(NODROP in item.flags)
@@ -120,8 +123,12 @@
return
if(visible_item)
item_to_retrieve.loc.visible_message("[item_to_retrieve] suddenly disappears!")
-
-
+ var/list/heres_disky = item_to_retrieve.search_contents_for(/obj/item/disk/nuclear)
+ heres_disky += item_to_retrieve.loc.search_contents_for(/obj/item/disk/nuclear) //So if you mark another item in a bag, we don't pull
+ for(var/obj/item/disk/nuclear/N in heres_disky)
+ N.forceMove(get_turf(item_to_retrieve))
+ N.visible_message("As [item_to_retrieve] vanishes, [N] remains behind!")
+ break //If you have 2 nads, well, congrats? Keeps message from doubling up
if(target.hand) //left active hand
if(!target.equip_to_slot_if_possible(item_to_retrieve, SLOT_HUD_LEFT_HAND, FALSE, TRUE))
if(!target.equip_to_slot_if_possible(item_to_retrieve, SLOT_HUD_RIGHT_HAND, FALSE, TRUE))
diff --git a/code/datums/uplink_items/uplink_general.dm b/code/datums/uplink_items/uplink_general.dm
index e04640fa3ae0..a3cdf5befbcc 100644
--- a/code/datums/uplink_items/uplink_general.dm
+++ b/code/datums/uplink_items/uplink_general.dm
@@ -740,50 +740,50 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
// IMPLANTS
-/datum/uplink_item/implants
- category = "Implants"
+/datum/uplink_item/bio_chips
+ category = "Bio-chips"
-/datum/uplink_item/implants/freedom
+/datum/uplink_item/bio_chips/freedom
name = "Freedom Bio-chip"
desc = "A bio-chip injected into the body and later activated manually to break out of any restraints or grabs. Can be activated up to 4 times."
reference = "FI"
- item = /obj/item/implanter/freedom
+ item = /obj/item/bio_chip_implanter/freedom
cost = 25
-/datum/uplink_item/implants/protofreedom
+/datum/uplink_item/bio_chips/protofreedom
name = "Prototype Freedom Bio-chip"
desc = "A prototype bio-chip injected into the body and later activated manually to break out of any restraints or grabs. Can only be activated a singular time."
reference = "PFI"
- item = /obj/item/implanter/freedom/prototype
+ item = /obj/item/bio_chip_implanter/freedom/prototype
cost = 10
-/datum/uplink_item/implants/storage
+/datum/uplink_item/bio_chips/storage
name = "Storage Bio-chip"
desc = "A bio-chip injected into the body, and later activated at the user's will. It will open a small subspace pocket capable of storing two items."
reference = "ESI"
- item = /obj/item/implanter/storage
+ item = /obj/item/bio_chip_implanter/storage
cost = 40
-/datum/uplink_item/implants/mindslave
+/datum/uplink_item/bio_chips/mindslave
name = "Mindslave Bio-chip"
desc = "A box containing a bio-chip implanter filled with a mindslave bio-chip that when injected into another person makes them loyal to you and your cause, unless of course they're already implanted by someone else. Loyalty ends if the implant is no longer in their system."
reference = "MI"
- item = /obj/item/implanter/traitor
+ item = /obj/item/bio_chip_implanter/traitor
cost = 50
-/datum/uplink_item/implants/adrenal
+/datum/uplink_item/bio_chips/adrenal
name = "Adrenal Bio-chip"
desc = "A bio-chip injected into the body, and later activated manually to inject a chemical cocktail, which has a mild healing effect along with removing and reducing the time of all stuns and increasing movement speed. Can be activated up to 3 times."
reference = "AI"
- item = /obj/item/implanter/adrenalin
+ item = /obj/item/bio_chip_implanter/adrenalin
cost = 40
-/datum/uplink_item/implants/stealthimplant
+/datum/uplink_item/bio_chips/stealthimplant
name = "Stealth Bio-chip"
desc = "This one-of-a-kind implant will make you almost invisible if you play your cards right. \
On activation, it will conceal you inside a chameleon cardboard box that is only revealed once someone bumps into it."
reference = "SI"
- item = /obj/item/implanter/stealth
+ item = /obj/item/bio_chip_implanter/stealth
cost = 45
// POINTLESS BADASSERY
diff --git a/code/datums/uplink_items/uplink_nuclear.dm b/code/datums/uplink_items/uplink_nuclear.dm
index 4e9d60f941ed..444dd9b696ed 100644
--- a/code/datums/uplink_items/uplink_nuclear.dm
+++ b/code/datums/uplink_items/uplink_nuclear.dm
@@ -508,35 +508,35 @@
// IMPLANTS
-/datum/uplink_item/implants/krav_implant
+/datum/uplink_item/bio_chips/krav_implant
name = "Krav Maga Implant"
desc = "A biochip that teaches you Krav Maga when implanted, great as a cheap backup weapon. Warning: the biochip will override any other fighting styles such as CQC while active."
reference = "KMI"
- item = /obj/item/implanter/krav_maga
+ item = /obj/item/bio_chip_implanter/krav_maga
cost = 25
uplinktypes = list(UPLINK_TYPE_NUCLEAR, UPLINK_TYPE_SST)
-/datum/uplink_item/implants/uplink/nuclear
+/datum/uplink_item/bio_chips/uplink/nuclear
name = "Nuclear Uplink Bio-chip"
reference = "UIN"
- item = /obj/item/implanter/nuclear
+ item = /obj/item/bio_chip_implanter/nuclear
excludefrom = list()
uplinktypes = list(UPLINK_TYPE_NUCLEAR, UPLINK_TYPE_SST)
-/datum/uplink_item/implants/microbomb
+/datum/uplink_item/bio_chips/microbomb
name = "Microbomb Bio-chip"
desc = "A bio-chip injected into the body, and later activated either manually or automatically upon death. The more implants inside of you, the higher the explosive power. \
This will permanently destroy your body, however."
reference = "MBI"
- item = /obj/item/implanter/explosive
+ item = /obj/item/bio_chip_implanter/explosive
cost = 10
uplinktypes = list(UPLINK_TYPE_NUCLEAR, UPLINK_TYPE_SST)
-/datum/uplink_item/implants/macrobomb
+/datum/uplink_item/bio_chips/macrobomb
name = "Macrobomb Bio-chip"
desc = "A bio-chip injected into the body, and later activated either manually or automatically upon death. Upon death, releases a massive explosion that will wipe out everything nearby."
reference = "HAB"
- item = /obj/item/implanter/explosive_macro
+ item = /obj/item/bio_chip_implanter/explosive_macro
cost = 50
uplinktypes = list(UPLINK_TYPE_NUCLEAR, UPLINK_TYPE_SST)
diff --git a/code/datums/uplink_items/uplink_traitor.dm b/code/datums/uplink_items/uplink_traitor.dm
index fde738f81a4e..d110f0f5cd61 100644
--- a/code/datums/uplink_items/uplink_traitor.dm
+++ b/code/datums/uplink_items/uplink_traitor.dm
@@ -290,7 +290,7 @@
desc = "A single-use bio-chip which contains an experimental serum that causes rapid muscular growth in Hominidae. \
Side-affects may include hypertrichosis, violent outbursts, and an unending affinity for bananas."
reference = "MAG"
- item = /obj/item/implanter/gorilla_rampage
+ item = /obj/item/bio_chip_implanter/gorilla_rampage
cost = 25
job = list("Research Director", "Geneticist")
@@ -340,7 +340,7 @@
name = "Synthetic Supercharge Bio-chip"
desc = "A bio-chip injected into the body, and later activated manually to inject a chemical cocktail, which has the effect of removing and reducing the time of all stuns and increasing movement speed. Can be activated up to 3 times."
reference = "SSI"
- item = /obj/item/implanter/supercharge
+ item = /obj/item/bio_chip_implanter/supercharge
cost = 40
species = list("Machine")
surplus = 0
@@ -365,6 +365,16 @@
cost = 10
species = list("Human")
+//Gr(e)(a)y
+/datum/uplink_item/species_restricted/prescan
+ name = "Technocracy Advanced Cloning System"
+ desc = "This kit will give you the parts to build an advanced automatic cloning system, to clone whoever has the linked implant installed on death. \
+ Power intensive, implant must be recovered for reuse, and implanter must be linked to cloner."
+ reference = "TACS"
+ item = /obj/item/storage/box/syndie_kit/prescan
+ cost = 25 /// A fresh start, but a start with nothing. Hard to use as well
+ species = list("Grey")
+
// -------------------------------------
// ITEMS BLACKLISTED FROM NUCLEAR AGENTS
// -------------------------------------
@@ -496,11 +506,11 @@
surplus = 60
excludefrom = list(UPLINK_TYPE_NUCLEAR, UPLINK_TYPE_SST)
-/datum/uplink_item/implants/uplink // Nukies get Nuclear Uplink Bio-chip instead
+/datum/uplink_item/bio_chips/uplink // Nukies get Nuclear Uplink Bio-chip instead
name = "Uplink Bio-chip"
desc = "A bio-chip injected into the body, and later activated manually to open an uplink with 50 telecrystals. The ability for an agent to open an uplink after their possessions have been stripped from them makes this implant excellent for escaping confinement."
reference = "UI"
- item = /obj/item/implanter/uplink
+ item = /obj/item/bio_chip_implanter/uplink
cost = 70
excludefrom = list(UPLINK_TYPE_NUCLEAR, UPLINK_TYPE_SST)
surplus = 0
diff --git a/code/game/area/areas/depot-areas.dm b/code/game/area/areas/depot-areas.dm
index b686315dff1e..8831d8089810 100644
--- a/code/game/area/areas/depot-areas.dm
+++ b/code/game/area/areas/depot-areas.dm
@@ -390,7 +390,7 @@
/area/syndicate_depot/core/proc/ghostlog(gmsg)
if(istype(reactor))
var/image/alert_overlay = image('icons/obj/flag.dmi', "syndiflag")
- notify_ghosts(gmsg, title = "Depot News", source = reactor.loc, alert_overlay = alert_overlay, action = NOTIFY_JUMP)
+ notify_ghosts(gmsg, title = "Depot News", source = reactor.loc, alert_overlay = alert_overlay, flashwindow = FALSE, action = NOTIFY_JUMP)
/area/syndicate_depot/core/proc/declare_started()
if(!run_started)
diff --git a/code/game/atoms.dm b/code/game/atoms.dm
index f7b86265a862..98220ce3ae90 100644
--- a/code/game/atoms.dm
+++ b/code/game/atoms.dm
@@ -387,6 +387,12 @@
SEND_SIGNAL(src, COMSIG_PARENT_EXAMINE, user, .)
+/atom/proc/examine_more(mob/user) ///Extended description of an object. Allows you to double examine objects and have them give you a second description of an item. Useful for writing flavourful stuff.
+ SHOULD_CALL_PARENT(TRUE)
+ RETURN_TYPE(/list)
+
+ return list()
+
/**
* Updates the appearence of the icon
*
diff --git a/code/game/data_huds.dm b/code/game/data_huds.dm
index 848e7fa0fcbc..51d8bbc88417 100644
--- a/code/game/data_huds.dm
+++ b/code/game/data_huds.dm
@@ -238,15 +238,15 @@
for(var/i in list(IMPTRACK_HUD, IMPMINDSHIELD_HUD, IMPCHEM_HUD))
holder = hud_list[i]
holder.icon_state = null
- for(var/obj/item/implant/I in src)
+ for(var/obj/item/bio_chip/I in src)
if(I.implanted)
- if(istype(I,/obj/item/implant/tracking))
+ if(istype(I,/obj/item/bio_chip/tracking))
holder = hud_list[IMPTRACK_HUD]
holder.icon_state = "hud_imp_tracking"
- else if(istype(I,/obj/item/implant/mindshield))
+ else if(istype(I,/obj/item/bio_chip/mindshield))
holder = hud_list[IMPMINDSHIELD_HUD]
holder.icon_state = "hud_imp_loyal"
- else if(istype(I,/obj/item/implant/chem))
+ else if(istype(I,/obj/item/bio_chip/chem))
holder = hud_list[IMPCHEM_HUD]
holder.icon_state = "hud_imp_chem"
diff --git a/code/game/dna/mutations/monkey_mutation.dm b/code/game/dna/mutations/monkey_mutation.dm
index c51522824d3b..18334b1bd917 100644
--- a/code/game/dna/mutations/monkey_mutation.dm
+++ b/code/game/dna/mutations/monkey_mutation.dm
@@ -15,7 +15,7 @@
if(issmall(H))
return
for(var/obj/item/W in H)
- if(istype(W, /obj/item/implant))
+ if(istype(W, /obj/item/bio_chip))
continue
H.unEquip(W)
@@ -50,7 +50,7 @@
for(var/obj/item/W in H)
if(W == H.w_uniform) // will be torn
continue
- if(istype(W, /obj/item/implant))
+ if(istype(W, /obj/item/bio_chip))
continue
H.unEquip(W)
H.regenerate_icons()
diff --git a/code/game/gamemodes/autotraitor/autotraitor.dm b/code/game/gamemodes/autotraitor/autotraitor.dm
index 908daffeb776..be7bf110aa3e 100644
--- a/code/game/gamemodes/autotraitor/autotraitor.dm
+++ b/code/game/gamemodes/autotraitor/autotraitor.dm
@@ -93,7 +93,7 @@
if(!player.current || !ishuman(player.current)) // Remove mindshield-implanted mobs from the list
continue
var/mob/living/carbon/human/H = player.current
- for(var/obj/item/implant/mindshield/I in H.contents)
+ for(var/obj/item/bio_chip/mindshield/I in H.contents)
if(I && I.implanted)
possible_traitors -= player
if(!H.job || H.mind.offstation_role) //Golems, special events stuff, etc.
diff --git a/code/game/gamemodes/cult/cult_structures.dm b/code/game/gamemodes/cult/cult_structures.dm
index e969adfac29d..7db14947e373 100644
--- a/code/game/gamemodes/cult/cult_structures.dm
+++ b/code/game/gamemodes/cult/cult_structures.dm
@@ -70,7 +70,7 @@
to_chat(user, "[heathen_message]")
return
if(invisibility)
- to_chat(user, "The magic in [src] is being channeled into Redspace, reveal the structure first!")
+ to_chat(user, "The magic in [src] is being suppressed, reveal the structure first!")
return
if(HAS_TRAIT(user, TRAIT_HULK))
to_chat(user, "You cannot seem to manipulate this structure with your bulky hands!")
diff --git a/code/game/gamemodes/miniantags/abduction/abductee_objectives.dm b/code/game/gamemodes/miniantags/abduction/abductee_objectives.dm
index 82f986f5d4aa..fffe6e267a9d 100644
--- a/code/game/gamemodes/miniantags/abduction/abductee_objectives.dm
+++ b/code/game/gamemodes/miniantags/abduction/abductee_objectives.dm
@@ -148,3 +148,68 @@
/datum/objective/abductee/sixthsense
explanation_text = "You died back there and went to heaven... or is it hell? No one here seems to know they're dead. Convince them, and maybe you can escape this limbo."
+
+/datum/objective/abductee/forbiddennumber
+ explanation_text = "Ignore anything in a set number of"
+
+/datum/objective/abductee/forbiddennumber/New()
+ ..()
+ var/number = pick(list("two", "three", "four", "five", "six", "seven", "eight", "nine", "ten"))
+ explanation_text +=" [number], they don't exist."
+
+/datum/objective/abductee/buddy
+ explanation_text = "Being alone and in large groups are both frightening. Try to be alone with only one other person whenever possible."
+
+/datum/objective/abductee/finality
+ explanation_text = "Death should be final and modern medicine disrupts the natural order. Don't allow anyone to be revived."
+
+/datum/objective/abductee/mispronounced
+ explanation_text = "No matter how they say it, other people keep mispronouncing your name. Be sure to correct them whenever possible."
+
+/datum/objective/abductee/bald
+ explanation_text = "There are alien parasites masquerading as people's hair. Save people from this invasion."
+
+/datum/objective/abductee/one
+ explanation_text = "There is only one other person in existence, they are just really good at pretending to be multiple people."
+
+/datum/objective/abductee/outlaw
+ explanation_text = "You have infiltrated this station as a space-renowned outlaw, commit as many minor crimes as possible while remaining unnoticed by security."
+
+/datum/objective/abductee/rot
+ explanation_text = "Your flesh is rotting from your body. Fight the inevitable, and replace your tainted limbs with entirely new ones."
+
+/datum/objective/abductee/blind
+ explanation_text = "You are blind. Perhaps a new pair of eyes can help."
+
+/datum/objective/abductee/ill
+ explanation_text = "The station is ill. Medicate them until they're cured."
+
+/datum/objective/abductee/game
+ explanation_text = "Convince the crew that we are in a game, without explicitly telling them we are in a game."
+
+/datum/objective/abductee/instructor
+ explanation_text = "You are a military instructor. You must make sure the crew is in top shape for the war against the syndicate!"
+
+/datum/objective/abductee/actor
+ explanation_text = "You are in an action movie. You must say as many cheesy one-liners as possible."
+
+/datum/objective/abductee/writer
+ explanation_text = "You are a writer. Convince the crew of your superb writing skills!"
+
+/datum/objective/abductee/doomed
+ explanation_text = "You know something bad is about to happen to this station. Convince the crew to get off of it while they still can!"
+
+/datum/objective/abductee/proof
+ explanation_text = "You think you were kidnapped by aliens! Ensure that"
+
+/datum/objective/abductee/proof/New()
+ ..()
+ var/list/jobs = SSjobs.occupations.Copy()
+ for(var/datum/job/J in jobs)
+ if(J.current_positions < 1)
+ jobs -= J
+ if(length(jobs))
+ var/datum/job/target = pick(jobs)
+ explanation_text += " a [target.title] is also experimented on by an Abductor so they believe you!"
+ else
+ explanation_text += " someone is also experimented on by an Abductor so they believe you!"
diff --git a/code/game/gamemodes/miniantags/abduction/abduction_outfits.dm b/code/game/gamemodes/miniantags/abduction/abduction_outfits.dm
index dcf181903eb1..15cf5eeacde8 100644
--- a/code/game/gamemodes/miniantags/abduction/abduction_outfits.dm
+++ b/code/game/gamemodes/miniantags/abduction/abduction_outfits.dm
@@ -58,5 +58,5 @@
/datum/outfit/abductor/scientist/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
..()
if(!visualsOnly)
- var/obj/item/implant/abductor/beamplant = new /obj/item/implant/abductor(H)
+ var/obj/item/bio_chip/abductor/beamplant = new /obj/item/bio_chip/abductor(H)
beamplant.implant(H)
diff --git a/code/game/gamemodes/miniantags/abduction/abduction_surgery.dm b/code/game/gamemodes/miniantags/abduction/abduction_surgery.dm
index 882582b7c710..81a53fe481a9 100644
--- a/code/game/gamemodes/miniantags/abduction/abduction_surgery.dm
+++ b/code/game/gamemodes/miniantags/abduction/abduction_surgery.dm
@@ -17,7 +17,7 @@
/datum/surgery/organ_extraction/can_start(mob/user, mob/living/carbon/target, target_zone, obj/item/tool,datum/surgery/surgery)
var/mob/living/carbon/human/H = user
// You must either: Be of the abductor species, or contain an abductor implant
- if((isabductor(H) || (locate(/obj/item/implant/abductor) in H)))
+ if((isabductor(H) || (locate(/obj/item/bio_chip/abductor) in H)))
return TRUE
return FALSE
diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm
index a3abb1697770..4bc83c1c492d 100644
--- a/code/game/gamemodes/nuclear/nuclear.dm
+++ b/code/game/gamemodes/nuclear/nuclear.dm
@@ -309,7 +309,7 @@
synd_mob.update_action_buttons_icon()
synd_mob.rejuvenate() //fix any damage taken by naked vox/plasmamen/etc while round setups
- var/obj/item/implant/explosive/E = new/obj/item/implant/explosive(synd_mob)
+ var/obj/item/bio_chip/explosive/E = new/obj/item/bio_chip/explosive(synd_mob)
E.implant(synd_mob)
synd_mob.faction |= "syndicate"
synd_mob.update_icons()
diff --git a/code/game/gamemodes/nuclear/nuclearbomb.dm b/code/game/gamemodes/nuclear/nuclearbomb.dm
index 0c7b18507c8e..f20e122a817f 100644
--- a/code/game/gamemodes/nuclear/nuclearbomb.dm
+++ b/code/game/gamemodes/nuclear/nuclearbomb.dm
@@ -565,6 +565,7 @@ GLOBAL_VAR(bomb_set)
playsound(src,'sound/machines/alarm.ogg',100,0,5)
if(SSticker && SSticker.mode)
SSticker.mode.explosion_in_progress = TRUE
+ SSticker.event_blackbox(outcome = ROUND_END_NUCLEAR)
sleep(100)
GLOB.enter_allowed = 0
diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm
index aa222e427467..4757f6747917 100644
--- a/code/game/gamemodes/objective.dm
+++ b/code/game/gamemodes/objective.dm
@@ -68,7 +68,7 @@ GLOBAL_LIST_INIT(potential_theft_objectives, (subtypesof(/datum/theft_objective)
* This is for objectives that have reason to update their text, such as target changes.
*/
/datum/objective/proc/update_explanation_text()
- return
+ stack_trace("Objective [type]'s update_explanation_text was not overridden.")
/**
* Get all owners of the objective, including ones from the objective's team, if it has one.
@@ -665,11 +665,9 @@ GLOBAL_LIST_INIT(potential_theft_objectives, (subtypesof(/datum/theft_objective)
update_explanation_text()
return target
-/datum/objective/destory/update_explanation_text()
- var/target_real_name
+/datum/objective/destroy/update_explanation_text()
if(target?.current)
- target_real_name = target.current.real_name
- explanation_text = "Destroy [target_real_name], the AI."
+ explanation_text = "Destroy [target.current.real_name], the AI."
else
explanation_text = "Free Objective"
diff --git a/code/game/gamemodes/steal_items.dm b/code/game/gamemodes/steal_items.dm
index 481f033b6629..39bfff317412 100644
--- a/code/game/gamemodes/steal_items.dm
+++ b/code/game/gamemodes/steal_items.dm
@@ -66,18 +66,6 @@
protected_jobs = list("Captain", "Research Director", "Chief Engineer")
location_override = "Teleporter"
-/datum/theft_objective/ai
- name = "a functional AI"
- typepath = /obj/item/aicard
- location_override = "AI Satellite. An intellicard for transportation can be found in Tech Storage, Science Department or manufactured"
-
-/datum/theft_objective/ai/check_special_completion(obj/item/aicard/C)
- if(..())
- for(var/mob/living/silicon/ai/A in C)
- if(isAI(A) && A.stat != 2) //See if any AI's are alive inside that card.
- return 1
- return 0
-
/datum/theft_objective/defib
name = "the chief medical officer's advanced compact defibrillator"
typepath = /obj/item/defibrillator/compact/advanced
diff --git a/code/game/gamemodes/wizard/artefact.dm b/code/game/gamemodes/wizard/artefact.dm
index 7bfca0d25861..bc74e2c07754 100644
--- a/code/game/gamemodes/wizard/artefact.dm
+++ b/code/game/gamemodes/wizard/artefact.dm
@@ -630,7 +630,7 @@ GLOBAL_LIST_EMPTY(multiverse)
M.equip_to_slot_or_del(new /obj/item/scalpel(M), SLOT_HUD_RIGHT_STORE)
M.equip_to_slot_or_del(sword, SLOT_HUD_RIGHT_HAND)
for(var/obj/item/carried_item in M.contents)
- if(!istype(carried_item, /obj/item/implant))
+ if(!istype(carried_item, /obj/item/bio_chip))
carried_item.add_mob_blood(M)
if("pirate")
diff --git a/code/game/jobs/job/central.dm b/code/game/jobs/job/central.dm
index 6be6cf5e3861..04ddbe4d40d4 100644
--- a/code/game/jobs/job/central.dm
+++ b/code/game/jobs/job/central.dm
@@ -28,9 +28,9 @@
glasses = /obj/item/clothing/glasses/hud/security/sunglasses
id = /obj/item/card/id/centcom
pda = /obj/item/pda/centcom
- implants = list(
- /obj/item/implant/mindshield,
- /obj/item/implant/dust
+ bio_chips = list(
+ /obj/item/bio_chip/mindshield,
+ /obj/item/bio_chip/dust
)
backpack = /obj/item/storage/backpack/satchel
backpack_contents = list(
@@ -81,16 +81,16 @@
glasses = /obj/item/clothing/glasses/hud/security/sunglasses
id = /obj/item/card/id/centcom
pda = /obj/item/pda/centcom
- r_pocket = /obj/item/storage/box/matches
+ r_pocket = /obj/item/storage/fancy/matches
back = /obj/item/storage/backpack/satchel
box = /obj/item/storage/box/centcomofficer
backpack_contents = list(
/obj/item/clothing/shoes/magboots/advance = 1,
/obj/item/storage/box/zipties = 1
)
- implants = list(
- /obj/item/implant/mindshield,
- /obj/item/implant/dust
+ bio_chips = list(
+ /obj/item/bio_chip/mindshield,
+ /obj/item/bio_chip/dust
)
cybernetic_implants = list(
/obj/item/organ/internal/eyes/cybernetic/xray/hardened,
diff --git a/code/game/jobs/job/security_jobs.dm b/code/game/jobs/job/security_jobs.dm
index a4875d44b420..0647ae0a5a5a 100644
--- a/code/game/jobs/job/security_jobs.dm
+++ b/code/game/jobs/job/security_jobs.dm
@@ -44,7 +44,7 @@
/obj/item/melee/classic_baton/telescopic = 1
)
- implants = list(/obj/item/implant/mindshield)
+ bio_chips = list(/obj/item/bio_chip/mindshield)
backpack = /obj/item/storage/backpack/security
satchel = /obj/item/storage/backpack/satchel_sec
@@ -89,7 +89,7 @@
/obj/item/restraints/handcuffs = 1
)
- implants = list(/obj/item/implant/mindshield)
+ bio_chips = list(/obj/item/bio_chip/mindshield)
backpack = /obj/item/storage/backpack/security
satchel = /obj/item/storage/backpack/satchel_sec
@@ -139,7 +139,7 @@
/obj/item/melee/classic_baton/telescopic = 1
)
- implants = list(/obj/item/implant/mindshield)
+ bio_chips = list(/obj/item/bio_chip/mindshield)
/datum/outfit/job/detective/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
. = ..()
@@ -192,7 +192,7 @@
backpack_contents = list(
/obj/item/restraints/handcuffs = 1
)
- implants = list(/obj/item/implant/mindshield)
+ bio_chips = list(/obj/item/bio_chip/mindshield)
backpack = /obj/item/storage/backpack/security
satchel = /obj/item/storage/backpack/satchel_sec
dufflebag = /obj/item/storage/backpack/duffel/security
diff --git a/code/game/jobs/job/supervisor.dm b/code/game/jobs/job/supervisor.dm
index ca4071f4d6da..c7d7891df7c6 100644
--- a/code/game/jobs/job/supervisor.dm
+++ b/code/game/jobs/job/supervisor.dm
@@ -41,7 +41,7 @@
/obj/item/storage/box/ids = 1,
/obj/item/melee/classic_baton/telescopic = 1
)
- implants = list(/obj/item/implant/mindshield)
+ bio_chips = list(/obj/item/bio_chip/mindshield)
backpack = /obj/item/storage/backpack/captain
satchel = /obj/item/storage/backpack/satchel_cap
dufflebag = /obj/item/storage/backpack/duffel/captain
@@ -101,7 +101,7 @@
/obj/item/melee/classic_baton/telescopic = 1
)
- implants = list()
+ bio_chips = list()
@@ -149,7 +149,7 @@
backpack_contents = list(
/obj/item/melee/classic_baton/ntcane = 1
)
- implants = list(/obj/item/implant/mindshield)
+ bio_chips = list(/obj/item/bio_chip/mindshield)
@@ -195,7 +195,7 @@
/obj/item/storage/box/deathimp = 1,
/obj/item/gun/energy/gun/blueshield = 1
)
- implants = list(/obj/item/implant/mindshield)
+ bio_chips = list(/obj/item/bio_chip/mindshield)
backpack = /obj/item/storage/backpack/blueshield
satchel = /obj/item/storage/backpack/satchel_blueshield
dufflebag = /obj/item/storage/backpack/duffel/blueshield
@@ -242,7 +242,7 @@
backpack_contents = list(
/obj/item/melee/classic_baton/telescopic = 1
)
- implants = list(/obj/item/implant/mindshield)
+ bio_chips = list(/obj/item/bio_chip/mindshield)
satchel = /obj/item/storage/backpack/satchel_sec
dufflebag = /obj/item/storage/backpack/duffel/security
@@ -284,6 +284,6 @@
backpack_contents = list(
/obj/item/flash = 1
)
- implants = list(/obj/item/implant/mindshield)
+ bio_chips = list(/obj/item/bio_chip/mindshield)
satchel = /obj/item/storage/backpack/satchel_sec
dufflebag = /obj/item/storage/backpack/duffel/security
diff --git a/code/game/jobs/job/support.dm b/code/game/jobs/job/support.dm
index 916a9d157dc9..2e7438ba2cf4 100644
--- a/code/game/jobs/job/support.dm
+++ b/code/game/jobs/job/support.dm
@@ -127,9 +127,9 @@
var/obj/item/clothing/suit/hooded/S = H.wear_suit
S.ToggleHood()
-/datum/outfit/job/miner/equipped/hardsuit
- name = "Shaft Miner (Equipment + Hardsuit)"
- suit = /obj/item/clothing/suit/space/hardsuit/mining
+/datum/outfit/job/miner/equipped/modsuit
+ name = "Shaft Miner (Equipment + MODsuit)"
+ back = /obj/item/mod/control/pre_equipped/mining/asteroid
mask = /obj/item/clothing/mask/breath
@@ -290,7 +290,7 @@
/obj/item/instrument/bikehorn = 1
)
- implants = list(/obj/item/implant/sad_trombone)
+ bio_chips = list(/obj/item/bio_chip/sad_trombone)
backpack = /obj/item/storage/backpack/clown
satchel = /obj/item/storage/backpack/satchel/clown
diff --git a/code/game/jobs/job/syndicate_jobs.dm b/code/game/jobs/job/syndicate_jobs.dm
index 60462690c39e..0ca792114b7e 100644
--- a/code/game/jobs/job/syndicate_jobs.dm
+++ b/code/game/jobs/job/syndicate_jobs.dm
@@ -36,10 +36,10 @@
/obj/item/gun/projectile/automatic/pistol/deagle/camo = 1,
/obj/item/clothing/accessory/holster = 1
)
- implants = list(
- /obj/item/implant/dust,
- /obj/item/implant/freedom,
- /obj/item/implant/adrenalin
+ bio_chips = list(
+ /obj/item/bio_chip/dust,
+ /obj/item/bio_chip/freedom,
+ /obj/item/bio_chip/adrenalin
)
cybernetic_implants = list(
@@ -52,7 +52,7 @@
if(visualsOnly)
return
- var/obj/item/implant/uplink/admin/U = new /obj/item/implant/uplink/admin(H)
+ var/obj/item/bio_chip/uplink/admin/U = new /obj/item/bio_chip/uplink/admin(H)
U.implant(H)
U.hidden_uplink.uses = 2500
H.faction += "syndicate"
diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm
index 9a92642a8c71..452deb3105d8 100644
--- a/code/game/machinery/Sleeper.dm
+++ b/code/game/machinery/Sleeper.dm
@@ -15,7 +15,6 @@
dir = WEST
var/mob/living/carbon/human/occupant = null
var/possible_chems = list("ephedrine", "salglu_solution", "salbutamol", "charcoal")
- var/emergency_chems = list("ephedrine") // Desnowflaking
var/amounts = list(5, 10)
/// Beaker loaded into the sleeper. Used for dialysis.
var/obj/item/reagent_containers/glass/beaker = null
@@ -23,7 +22,6 @@
var/filtering = FALSE
var/max_chem
var/initial_bin_rating = 1
- var/min_health = -25
var/controls_inside = FALSE
var/auto_eject_dead = FALSE
idle_power_consumption = 1250
@@ -86,7 +84,6 @@
E += B.rating
max_chem = E * 20
- min_health = -E * 25
/obj/machinery/sleeper/Destroy()
for(var/mob/M in contents)
@@ -119,13 +116,13 @@
if(beaker.reagents.total_volume < beaker.reagents.maximum_volume)
occupant.transfer_blood_to(beaker, 1)
- for(var/datum/reagent/R in occupant.reagents.reagent_list)
+ for(var/datum/reagent/reagent in occupant.reagents.reagent_list)
occupant.transfer_blood_to(beaker, 1)
- if(R.id in GLOB.blocked_chems)
- occupant.reagents.remove_reagent(R.id, 3)
+ if(reagent.id in GLOB.blocked_chems)
+ occupant.reagents.remove_reagent(reagent.id, 3)
beaker.reagents.add_reagent("saturated_charcoal", 3)
continue
- occupant.reagents.trans_to(beaker, 3)
+ occupant.reagents.trans_id_to(beaker, reagent.id, 3)
for(var/A in occupant.reagents.addiction_list)
var/datum/reagent/R = A
@@ -171,7 +168,6 @@
data["amounts"] = amounts
data["hasOccupant"] = occupant ? 1 : 0
var/occupantData[0]
- var/crisis = 0
if(occupant)
occupantData["name"] = occupant.name
occupantData["stat"] = occupant.stat
@@ -215,7 +211,6 @@
occupantData["btFaren"] = ((occupant.bodytemperature - T0C) * (9.0/5.0))+ 32
- crisis = (occupant.health < min_health)
// I'm not sure WHY you'd want to put a simple_animal in a sleeper, but precedent is precedent
// Runtime is aptly named, isn't she?
if(ishuman(occupant) && !(NO_BLOOD in occupant.dna.species.species_traits))
@@ -227,7 +222,6 @@
data["occupant"] = occupantData
data["maxchem"] = max_chem
- data["minhealth"] = min_health
data["dialysis"] = filtering
data["auto_eject_dead"] = auto_eject_dead
if(beaker)
@@ -250,8 +244,6 @@
var/injectable = occupant ? 1 : 0
var/overdosing = 0
var/caution = 0 // To make things clear that you're coming close to an overdose
- if(crisis && !(temp.id in emergency_chems))
- injectable = 0
if(occupant && occupant.reagents)
reagent_amount = occupant.reagents.get_reagent_amount(temp.id)
@@ -290,10 +282,7 @@
var/amount = text2num(params["amount"])
if(!length(chemical) || amount <= 0)
return
- if(occupant.health > min_health || (chemical in emergency_chems))
- inject_chemical(usr, chemical, amount)
- else
- to_chat(usr, "This person is not in good enough condition for sleepers to be effective! Use another means of treatment, such as cryogenics!")
+ inject_chemical(usr, chemical, amount)
if("removebeaker")
remove_beaker(ui.user)
if("togglefilter")
@@ -553,7 +542,6 @@
icon_state = "sleeper_s-open"
base_icon = "sleeper_s"
possible_chems = list("epinephrine", "ether", "salbutamol", "styptic_powder", "silver_sulfadiazine")
- emergency_chems = list("epinephrine")
controls_inside = TRUE
light_color = LIGHT_COLOR_DARKRED
diff --git a/code/game/machinery/adv_med.dm b/code/game/machinery/adv_med.dm
index 1e6afac677b5..cf281ed1577b 100644
--- a/code/game/machinery/adv_med.dm
+++ b/code/game/machinery/adv_med.dm
@@ -10,7 +10,7 @@
active_power_consumption = 2500
light_color = "#00FF00"
var/mob/living/carbon/human/occupant
- var/known_implants = list(/obj/item/implant/chem, /obj/item/implant/death_alarm, /obj/item/implant/mindshield, /obj/item/implant/tracking, /obj/item/implant/health)
+ var/known_implants = list(/obj/item/bio_chip/chem, /obj/item/bio_chip/death_alarm, /obj/item/bio_chip/mindshield, /obj/item/bio_chip/tracking, /obj/item/bio_chip/health)
/obj/machinery/bodyscanner/examine(mob/user)
. = ..()
@@ -271,7 +271,7 @@
occupantData["blood"] = bloodData
var/implantData[0]
- for(var/obj/item/implant/I in occupant)
+ for(var/obj/item/bio_chip/I in occupant)
if(I.implanted && is_type_in_list(I, known_implants))
var/implantSubData[0]
implantSubData["name"] = sanitize(I.name)
diff --git a/code/game/machinery/clonepod.dm b/code/game/machinery/clonepod.dm
index 5051daab729f..1a1eaa0e5ba2 100644
--- a/code/game/machinery/clonepod.dm
+++ b/code/game/machinery/clonepod.dm
@@ -284,7 +284,6 @@ GLOBAL_LIST_INIT(cloner_biomass_items, list(\
if(grab_ghost_when == CLONER_FRESH_CLONE)
clonemind.transfer_to(H)
H.ckey = R.ckey
- update_clone_antag(H) //Since the body's got the mind, update their antag stuff right now. Otherwise, wait until they get kicked out (as per the CLONER_MATURE_CLONE business) to do it.
var/message
message += "Consciousness slowly creeps over you as your body regenerates.
"
message += "So this is what cloning feels like?"
@@ -436,18 +435,6 @@ GLOBAL_LIST_INIT(cloner_biomass_items, list(\
to_chat(user, "A droplet of bananium ooze seeps into the synthmeat storage chamber...")
ADD_TRAIT(src, TRAIT_CMAGGED, CLOWN_EMAG)
-/obj/machinery/clonepod/proc/update_clone_antag(mob/living/carbon/human/H)
- // Check to see if the clone's mind is an antagonist of any kind and handle them accordingly to make sure they get their spells, HUD/whatever else back.
- if(H.mind in SSticker.mode.syndicates)
- SSticker.mode.update_synd_icons_added()
- if(H.mind in SSticker.mode.cult)
- SSticker.mode.update_cult_icons_added(H.mind) // Adds the cult antag hud
- SSticker.mode.add_cult_actions(H.mind) // And all the actions
- if(SSticker.mode.cult_risen)
- SSticker.mode.rise(H)
- if(SSticker.mode.cult_ascendant)
- SSticker.mode.ascend(H)
-
//Put messages in the connected computer's temp var for display.
/obj/machinery/clonepod/proc/connected_message(message)
if((isnull(connected)) || (!istype(connected, /obj/machinery/computer/cloning)))
@@ -481,7 +468,6 @@ GLOBAL_LIST_INIT(cloner_biomass_items, list(\
UnregisterSignal(clonemind, COMSIG_MIND_TRANSER_TO)
clonemind.transfer_to(occupant)
occupant.grab_ghost()
- update_clone_antag(occupant)
to_chat(occupant, "You remember nothing from the time that you were dead!")
to_chat(occupant, "There is a bright flash!
\
You feel like a new being.")
@@ -609,18 +595,6 @@ GLOBAL_LIST_INIT(cloner_biomass_items, list(\
if(occupant.reagents.get_reagent_amount(bt) < 1)
occupant.reagents.add_reagent(bt, 1)
-/*
- * Genetics Diskette Box
- */
-
-/obj/item/storage/box/disks
- name = "Genetics Diskette Box"
- icon_state = "disk_kit"
-
-/obj/item/storage/box/disks/populate_contents()
- for(var/i in 1 to 7)
- new /obj/item/disk/data(src)
-
/*
* Manual -- A big ol' manual.
*/
diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm
index b325048628fa..35cd02c66764 100644
--- a/code/game/machinery/computer/cloning.dm
+++ b/code/game/machinery/computer/cloning.dm
@@ -230,7 +230,7 @@
qdel(active_record)
set_temp("Error: Record corrupt.", "danger")
else
- var/obj/item/implant/health/H = null
+ var/obj/item/bio_chip/health/H = null
if(active_record.implant)
H = locate(active_record.implant)
var/list/payload = list(
@@ -330,6 +330,10 @@
set_scan_temp("Subject species is not clonable.", "bad")
SStgui.update_uis(src)
return
+ if(NO_CLONESCAN in subject.dna.species.species_traits)
+ set_scan_temp("[subject.dna.species.name_plural] are not clonable. Alternative revival methods recommended.", "bad")
+ SStgui.update_uis(src)
+ return
if(subject.get_int_organ(/obj/item/organ/internal/brain))
var/obj/item/organ/internal/brain/Brn = subject.get_int_organ(/obj/item/organ/internal/brain)
if(istype(Brn))
@@ -398,9 +402,9 @@
R.types=DNA2_BUF_UI|DNA2_BUF_UE|DNA2_BUF_SE
R.languages=subject.languages
//Add an implant if needed
- var/obj/item/implant/health/imp = locate(/obj/item/implant/health, subject)
+ var/obj/item/bio_chip/health/imp = locate(/obj/item/bio_chip/health, subject)
if(!imp)
- imp = new /obj/item/implant/health(subject)
+ imp = new /obj/item/bio_chip/health(subject)
imp.implant(subject)
R.implant = "\ref[imp]"
diff --git a/code/game/machinery/computer/depot_consoles.dm b/code/game/machinery/computer/depot_consoles.dm
index 4e32428c9d7a..6c5f0916bb93 100644
--- a/code/game/machinery/computer/depot_consoles.dm
+++ b/code/game/machinery/computer/depot_consoles.dm
@@ -394,8 +394,8 @@
window_height = 300
req_access = list(ACCESS_SYNDICATE_LEADER)
var/obj/machinery/bluespace_beacon/syndicate/mybeacon
- var/obj/effect/portal/redspace/myportal
- var/obj/effect/portal/redspace/myportal2
+ var/obj/effect/portal/advanced/myportal
+ var/obj/effect/portal/advanced/myportal2
var/portal_enabled = FALSE
var/portaldir = WEST
@@ -457,11 +457,11 @@
if(!tele_target)
return
var/turf/portal_turf = get_step(src, portaldir)
- var/obj/effect/portal/redspace/P = new(portal_turf, tele_target, src, 0)
+ var/obj/effect/portal/advanced/P = new(portal_turf, tele_target, src, 0)
myportal = P
var/area/A = get_area(tele_target)
P.name = "[A] portal"
- var/obj/effect/portal/redspace/P2 = new(get_turf(tele_target), portal_turf, src, 0)
+ var/obj/effect/portal/advanced/P2 = new(get_turf(tele_target), portal_turf, src, 0)
myportal2 = P2
P2.name = "mysterious portal"
else if(!portal_enabled && myportal)
diff --git a/code/game/machinery/computer/prisoner.dm b/code/game/machinery/computer/prisoner.dm
index e798b5413616..873da0f43d79 100644
--- a/code/game/machinery/computer/prisoner.dm
+++ b/code/game/machinery/computer/prisoner.dm
@@ -47,7 +47,7 @@
return
return ..()
-/obj/machinery/computer/prisoner/proc/check_implant(obj/item/implant/I)
+/obj/machinery/computer/prisoner/proc/check_implant(obj/item/bio_chip/I)
var/turf/implant_location = get_turf(I)
if(!implant_location || implant_location.z != z)
return FALSE
@@ -72,7 +72,7 @@
)
data["chemicalInfo"] = list()
- for(var/obj/item/implant/chem/C in GLOB.tracked_implants)
+ for(var/obj/item/bio_chip/chem/C in GLOB.tracked_implants)
if(!check_implant(C))
continue
var/list/implant_info = list(
@@ -83,7 +83,7 @@
data["chemicalInfo"] += list(implant_info)
data["trackingInfo"] = list()
- for(var/obj/item/implant/tracking/T in GLOB.tracked_implants)
+ for(var/obj/item/bio_chip/tracking/T in GLOB.tracked_implants)
if(!check_implant(T))
continue
var/mob/living/carbon/M = T.imp_in
@@ -137,7 +137,7 @@
else
to_chat(user, "No valid ID.")
if("inject")
- var/obj/item/implant/chem/implant = locateUID(params["uid"])
+ var/obj/item/bio_chip/chem/implant = locateUID(params["uid"])
if(!implant)
return
implant.activate(text2num(params["amount"]))
@@ -167,7 +167,7 @@
var/answer = params["answer"]
switch(id)
if("warn")
- var/obj/item/implant/tracking/implant = locateUID(arguments["uid"])
+ var/obj/item/bio_chip/tracking/implant = locateUID(arguments["uid"])
if(!implant)
return
if(implant.warn_cooldown >= world.time)
diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm
index 0603664c3f39..69ec66f91eaf 100644
--- a/code/game/machinery/machinery.dm
+++ b/code/game/machinery/machinery.dm
@@ -232,7 +232,7 @@
if(ishuman(user))
var/mob/living/carbon/human/H = user
if(H.getBrainLoss() >= 60)
- visible_message("[H] stares cluelessly at [src] and drools.")
+ visible_message("[H] stares cluelessly at [src].")
return TRUE
else if(prob(H.getBrainLoss()))
to_chat(user, "You momentarily forget how to use [src].")
diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm
index 480b8a112f6d..7a4bfc6a26f4 100644
--- a/code/game/machinery/suit_storage_unit.dm
+++ b/code/game/machinery/suit_storage_unit.dm
@@ -213,41 +213,6 @@
/obj/machinery/suit_storage_unit/syndicate/secure
secure = TRUE
-/obj/machinery/suit_storage_unit/ert
- req_access = list(ACCESS_CENT_GENERAL)
-
-/obj/machinery/suit_storage_unit/ert/command
- suit_type = /obj/item/clothing/suit/space/hardsuit/ert/commander
- mask_type = /obj/item/clothing/mask/breath
- storage_type = /obj/item/tank/internals/emergency_oxygen/double
-
-/obj/machinery/suit_storage_unit/ert/command/secure
- secure = TRUE
-
-/obj/machinery/suit_storage_unit/ert/security
- suit_type = /obj/item/clothing/suit/space/hardsuit/ert/security
- mask_type = /obj/item/clothing/mask/breath
- storage_type = /obj/item/tank/internals/emergency_oxygen/double
-
-/obj/machinery/suit_storage_unit/ert/security/secure
- secure = TRUE
-
-/obj/machinery/suit_storage_unit/ert/engineer
- suit_type = /obj/item/clothing/suit/space/hardsuit/ert/engineer
- mask_type = /obj/item/clothing/mask/breath
- storage_type = /obj/item/tank/internals/emergency_oxygen/double
-
-/obj/machinery/suit_storage_unit/ert/engineer/secure
- secure = TRUE
-
-/obj/machinery/suit_storage_unit/ert/medical
- suit_type = /obj/item/clothing/suit/space/hardsuit/ert/medical
- mask_type = /obj/item/clothing/mask/breath
- storage_type = /obj/item/tank/internals/emergency_oxygen/double
-
-/obj/machinery/suit_storage_unit/ert/medical/secure
- secure = TRUE
-
//telecoms NASA SSU. Suits themselves are assigned in Initialize
/obj/machinery/suit_storage_unit/telecoms
mask_type = /obj/item/clothing/mask/breath
diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm
index 6817ae73763f..ad5f3a59b41b 100644
--- a/code/game/machinery/teleporter.dm
+++ b/code/game/machinery/teleporter.dm
@@ -212,7 +212,7 @@
"y" = T.y,
"z" = T.z)
- for(var/obj/item/implant/tracking/I in GLOB.tracked_implants)
+ for(var/obj/item/bio_chip/tracking/I in GLOB.tracked_implants)
if(!I.implanted || !ismob(I.loc))
continue
else
diff --git a/code/game/machinery/transformer.dm b/code/game/machinery/transformer.dm
index c835f9c8945b..b72b6a7b7143 100644
--- a/code/game/machinery/transformer.dm
+++ b/code/game/machinery/transformer.dm
@@ -253,7 +253,7 @@
if(prestrip)
for(var/obj/item/I in H)
- if(istype(I, /obj/item/implant))
+ if(istype(I, /obj/item/bio_chip))
continue
qdel(I)
diff --git a/code/game/machinery/vendors/generic_vendors.dm b/code/game/machinery/vendors/generic_vendors.dm
index e87c805fb81f..31b700b6a92b 100644
--- a/code/game/machinery/vendors/generic_vendors.dm
+++ b/code/game/machinery/vendors/generic_vendors.dm
@@ -577,7 +577,7 @@
/obj/item/clothing/mask/gas/clownwiz = 1,
/obj/item/clothing/shoes/clown_shoes/magical = 1,
/obj/item/dnainjector/comic = 1,
- /obj/item/implanter/sad_trombone = 1,
+ /obj/item/bio_chip_implanter/sad_trombone = 1,
/obj/item/clothing/suit/wizrobe/mime = 1,
/obj/item/clothing/head/wizard/mime = 1,
/obj/item/clothing/mask/gas/mime/wizard = 1,
@@ -1192,7 +1192,7 @@
/obj/item/storage/fancy/cigarettes/cigpack_robustgold = 1,
/obj/item/clothing/mask/cigarette/cigar/havana = 2,
/obj/item/reagent_containers/patch/nicotine = 10,
- /obj/item/storage/box/matches = 10,
+ /obj/item/storage/fancy/matches = 10,
/obj/item/lighter/random = 4,
/obj/item/lighter/zippo = 2)
@@ -1205,7 +1205,7 @@
/obj/item/storage/fancy/cigarettes/cigpack_random = 80,
/obj/item/storage/fancy/cigarettes/cigpack_robustgold = 120,
/obj/item/reagent_containers/patch/nicotine = 70,
- /obj/item/storage/box/matches = 20,
+ /obj/item/storage/fancy/matches = 20,
/obj/item/lighter/random = 40,
/obj/item/lighter/zippo = 80,
/obj/item/storage/fancy/rollingpapers = 30,
@@ -1222,7 +1222,7 @@
/obj/item/storage/fancy/cigarettes/cigpack_robust = 2,
/obj/item/storage/fancy/cigarettes/cigpack_carp = 3,
/obj/item/storage/fancy/cigarettes/cigpack_midori = 1,
- /obj/item/storage/box/matches = 10,
+ /obj/item/storage/fancy/matches = 10,
/obj/item/storage/fancy/rollingpapers = 5)
contraband = list(/obj/item/lighter/zippo = 4)
@@ -1249,7 +1249,7 @@
/obj/item/storage/fancy/cigarettes/cigpack_midori = 3,
/obj/item/storage/fancy/cigarettes/cigpack_robustgold = 1,
/obj/item/clothing/mask/cigarette/cigar/havana = 2,
- /obj/item/storage/box/matches = 10,
+ /obj/item/storage/fancy/matches = 10,
/obj/item/lighter/zippo = 4,
/obj/item/storage/fancy/rollingpapers = 5)
diff --git a/code/game/machinery/vendors/wardrobe_vendors.dm b/code/game/machinery/vendors/wardrobe_vendors.dm
index 387c696929ef..67530ab7458f 100644
--- a/code/game/machinery/vendors/wardrobe_vendors.dm
+++ b/code/game/machinery/vendors/wardrobe_vendors.dm
@@ -169,6 +169,7 @@
/obj/item/clothing/suit/storage/fr_jacket = 3,
/obj/item/clothing/suit/storage/labcoat = 3,
/obj/item/clothing/suit/apron/surgical = 3,
+ /obj/item/clothing/suit/jacket/medbomber = 3,
/obj/item/clothing/accessory/armband/med = 3,
/obj/item/clothing/accessory/armband/medgreen = 3,
/obj/item/clothing/shoes/laceup = 3,
@@ -198,6 +199,7 @@
/obj/item/clothing/suit/storage/fr_jacket = 75,
/obj/item/clothing/suit/storage/labcoat = 75,
/obj/item/clothing/suit/apron/surgical = 75,
+ /obj/item/clothing/suit/jacket/medbomber = 75,
/obj/item/clothing/accessory/armband/med = 20,
/obj/item/clothing/accessory/armband/medgreen = 20,
/obj/item/clothing/shoes/laceup = 30,
@@ -266,6 +268,7 @@
/obj/item/clothing/under/rank/medical/chemist/skirt = 2,
/obj/item/clothing/head/beret/med = 2,
/obj/item/clothing/suit/storage/labcoat/chemist = 2,
+ /obj/item/clothing/suit/jacket/chembomber = 2,
/obj/item/clothing/accessory/armband/med = 2,
/obj/item/clothing/mask/gas = 2,
/obj/item/clothing/shoes/laceup = 2,
@@ -280,6 +283,7 @@
/obj/item/clothing/under/rank/medical/chemist/skirt = 50,
/obj/item/clothing/head/beret/med = 20,
/obj/item/clothing/suit/storage/labcoat/chemist = 75,
+ /obj/item/clothing/suit/jacket/chembomber = 75,
/obj/item/clothing/accessory/armband/med = 20,
/obj/item/clothing/shoes/laceup = 30,
/obj/item/clothing/shoes/white = 20,
@@ -342,6 +346,7 @@
/obj/item/clothing/under/rank/rnd/scientist/skirt = 3,
/obj/item/clothing/suit/hooded/wintercoat/science = 3,
/obj/item/clothing/suit/storage/labcoat/science = 3,
+ /obj/item/clothing/suit/jacket/scibomber = 3,
/obj/item/clothing/head/beret/sci = 3,
/obj/item/clothing/accessory/armband/science = 6,
/obj/item/clothing/shoes/laceup = 3,
@@ -358,6 +363,7 @@
/obj/item/clothing/under/rank/rnd/scientist/skirt = 50,
/obj/item/clothing/suit/hooded/wintercoat/science = 75,
/obj/item/clothing/suit/storage/labcoat/science = 75,
+ /obj/item/clothing/suit/jacket/scibomber = 75,
/obj/item/clothing/head/beret/sci = 20,
/obj/item/clothing/accessory/armband/science = 20,
/obj/item/clothing/shoes/laceup = 30,
@@ -385,6 +391,7 @@
/obj/item/clothing/under/rank/rnd/roboticist/skirt = 3,
/obj/item/clothing/suit/storage/labcoat/roboblack = 3,
/obj/item/clothing/suit/storage/labcoat/robowhite = 3,
+ /obj/item/clothing/suit/jacket/robobomber = 3,
/obj/item/clothing/head/beret/roboblack = 3,
/obj/item/clothing/head/beret/robowhite = 3,
/obj/item/clothing/head/soft/black = 3,
@@ -403,6 +410,7 @@
/obj/item/clothing/under/rank/rnd/roboticist/skirt = 50,
/obj/item/clothing/suit/storage/labcoat/roboblack = 75,
/obj/item/clothing/suit/storage/labcoat/robowhite = 75,
+ /obj/item/clothing/suit/jacket/robobomber = 75,
/obj/item/clothing/head/beret/roboblack = 20,
/obj/item/clothing/head/beret/robowhite = 20,
/obj/item/clothing/head/soft/black = 20,
@@ -670,6 +678,7 @@
/obj/item/clothing/suit/apron = 3,
/obj/item/clothing/suit/apron/overalls = 3,
/obj/item/clothing/suit/hooded/wintercoat/hydro = 3,
+ /obj/item/clothing/suit/jacket/hydrobomber = 3,
/obj/item/clothing/suit/storage/labcoat/hydro = 3,
/obj/item/clothing/mask/bandana/botany = 3,
/obj/item/clothing/accessory/armband/hydro = 3,
@@ -685,6 +694,7 @@
/obj/item/clothing/suit/apron = 50,
/obj/item/clothing/suit/apron/overalls = 50,
/obj/item/clothing/suit/hooded/wintercoat/hydro = 75,
+ /obj/item/clothing/suit/jacket/hydrobomber = 75,
/obj/item/clothing/suit/storage/labcoat/hydro = 75,
/obj/item/clothing/mask/bandana/botany = 20,
/obj/item/clothing/accessory/armband/hydro = 20,
diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm
index f52dcec444c3..2fb25b4111fa 100644
--- a/code/game/mecha/mecha.dm
+++ b/code/game/mecha/mecha.dm
@@ -743,11 +743,16 @@
// Check if a tracker exists
var/obj/item/mecha_parts/mecha_tracking/new_tracker = W
for(var/obj/item/mecha_parts/mecha_tracking/current_tracker in trackers)
- if(new_tracker.ai_beacon == current_tracker.ai_beacon)
- to_chat(user, "This exosuit already has \a [new_tracker.ai_beacon ? "AI" : "tracking"] beacon.")
+ if(new_tracker.type == current_tracker.type)
+ to_chat(user, "This exosuit already has a [current_tracker].")
user.put_in_hands(new_tracker)
return
+ trackers -= current_tracker
+ to_chat(user, "You remove [current_tracker].")
+ var/obj/item/mecha_parts/mecha_tracking/duplicate_tracker = new current_tracker.type
+ user.put_in_hands(duplicate_tracker)
+ qdel(current_tracker)
new_tracker.forceMove(src)
trackers += W
user.visible_message("[user] attaches [new_tracker] to [src].", "You attach [new_tracker] to [src].")
diff --git a/code/game/objects/effects/portals.dm b/code/game/objects/effects/portals.dm
index f8b45da7c42c..bc80f56dbbba 100644
--- a/code/game/objects/effects/portals.dm
+++ b/code/game/objects/effects/portals.dm
@@ -24,7 +24,7 @@
var/effect_cooldown = 0
///Whether or not portal use will cause sparks
var/create_sparks = TRUE
-
+
/obj/effect/portal/New(loc, turf/_target, obj/creation_object = null, lifespan = 300, mob/creation_mob = null, create_sparks = TRUE)
..()
@@ -187,8 +187,8 @@
#undef UNSTABLE_TIME_DELAY
-/obj/effect/portal/redspace
- name = "redspace portal"
+/obj/effect/portal/advanced
+ name = "advanced portal"
desc = "A portal capable of bypassing bluespace interference."
icon_state = "portal1"
failchance = 0
diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm
index 0c600bbe6465..67398adea5c7 100644
--- a/code/game/objects/effects/spawners/lootdrop.dm
+++ b/code/game/objects/effects/spawners/lootdrop.dm
@@ -158,7 +158,7 @@
/obj/item/storage/belt/military/traitor = 2,
/obj/item/storage/box/syndie_kit/space = 2,
/obj/item/multitool/ai_detect = 2,
- /obj/item/implanter/storage = 1,
+ /obj/item/bio_chip_implanter/storage = 1,
/obj/item/deck/cards/syndicate = 2,
/obj/item/storage/secure/briefcase/syndie = 2,
/obj/item/storage/fancy/cigarettes/cigpack_syndicate = 2,
diff --git a/code/game/objects/explosion.dm b/code/game/objects/explosion.dm
index f1277d431e81..8fc027675913 100644
--- a/code/game/objects/explosion.dm
+++ b/code/game/objects/explosion.dm
@@ -195,9 +195,6 @@
if(istype(array, /obj/machinery/doppler_array))
var/obj/machinery/doppler_array/Array = array
Array.sense_explosion(x0,y0,z0,devastation_range,heavy_impact_range,light_impact_range,took,orig_dev_range,orig_heavy_range,orig_light_range)
- if(istype(array, /obj/item/clothing/head/helmet/space/hardsuit/rd))
- var/obj/item/clothing/head/helmet/space/hardsuit/rd/Helm_Array = array
- Helm_Array.sense_explosion(x0,y0,z0,devastation_range,heavy_impact_range,light_impact_range,took,orig_dev_range,orig_heavy_range,orig_light_range)
if(istype(array, /obj/item/mod/module/reagent_scanner/advanced))
var/obj/item/mod/module/reagent_scanner/advanced/Mod_Array = array
Mod_Array.sense_explosion(x0,y0,z0,devastation_range,heavy_impact_range,light_impact_range,took,orig_dev_range,orig_heavy_range,orig_light_range)
diff --git a/code/game/objects/items/devices/radio/beacon.dm b/code/game/objects/items/devices/radio/beacon.dm
index b5ee0089fa4c..88c5e23d89ca 100644
--- a/code/game/objects/items/devices/radio/beacon.dm
+++ b/code/game/objects/items/devices/radio/beacon.dm
@@ -131,6 +131,11 @@
desc = "A label on it reads: Warning: Activating this device will send a high-ordinance EMP explosive to your location."
bomb = /obj/machinery/syndicatebomb/emp
+/obj/item/radio/beacon/syndicate/bomb/grey_autocloner
+ desc = "A label on it reads: Warning: Activating this device will send an expensive cloner to your location."
+ origin_tech = "bluespace=2;syndicate=2"
+ bomb = /obj/machinery/grey_autocloner
+
/obj/item/radio/beacon/engine
desc = "A label on it reads: Warning: This device is used for transportation of high-density objects used for high-yield power generation. Stay away!."
anchored = TRUE //Let's not move these around. Some folk might get the idea to use these for assassinations
diff --git a/code/game/objects/items/random_items.dm b/code/game/objects/items/random_items.dm
index bbb75fa65f9b..bea4ba78d010 100644
--- a/code/game/objects/items/random_items.dm
+++ b/code/game/objects/items/random_items.dm
@@ -85,7 +85,7 @@
/obj/item/storage/box/grenades
name = "tactical grenades"
desc = "A box with 6 tactical grenades."
- icon_state = "flashbang"
+ icon_state = "grenade_box"
/obj/item/storage/box/grenades/populate_contents()
var/static/list/grenadelist = list(
diff --git a/code/game/objects/items/robot/robot_parts.dm b/code/game/objects/items/robot/robot_parts.dm
index 38d1e025e46b..a00156fcb763 100644
--- a/code/game/objects/items/robot/robot_parts.dm
+++ b/code/game/objects/items/robot/robot_parts.dm
@@ -87,6 +87,7 @@
name = "endoskeleton"
desc = "A complex metal backbone with standard limb sockets and pseudomuscle anchors."
icon_state = "robo_suit"
+ w_class = WEIGHT_CLASS_BULKY
model_info = null
var/obj/item/robot_parts/l_arm/l_arm = null
var/obj/item/robot_parts/r_arm/r_arm = null
diff --git a/code/game/objects/items/stacks/sheets/leather.dm b/code/game/objects/items/stacks/sheets/leather.dm
index 3f61bdeb5bfe..34f767302c75 100644
--- a/code/game/objects/items/stacks/sheets/leather.dm
+++ b/code/game/objects/items/stacks/sheets/leather.dm
@@ -187,8 +187,6 @@ GLOBAL_LIST_INIT(sinew_recipes, list (
layer = MOB_LAYER
dynamic_icon_state = TRUE
var/static/list/goliath_platable_armor_typecache = typecacheof(list(
- /obj/item/clothing/suit/space/hardsuit/mining,
- /obj/item/clothing/head/helmet/space/hardsuit/mining,
/obj/item/clothing/suit/hooded/explorer,
/obj/item/clothing/head/hooded/explorer,
/obj/item/clothing/head/helmet/space/plasmaman/mining))
diff --git a/code/game/objects/items/stacks/telecrystal.dm b/code/game/objects/items/stacks/telecrystal.dm
index 1d9461776b82..865f45bc2712 100644
--- a/code/game/objects/items/stacks/telecrystal.dm
+++ b/code/game/objects/items/stacks/telecrystal.dm
@@ -13,7 +13,7 @@
/obj/item/stack/telecrystal/attack(mob/target, mob/user)
if(target == user) //You can't go around smacking people with crystals to find out if they have an uplink or not.
- for(var/obj/item/implant/uplink/I in target)
+ for(var/obj/item/bio_chip/uplink/I in target)
if(I && I.imp_in)
I.hidden_uplink.uses += amount
use(amount)
diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm
index 929a7aaf76d0..f229ce8b9562 100644
--- a/code/game/objects/items/toys.dm
+++ b/code/game/objects/items/toys.dm
@@ -1034,22 +1034,8 @@
name = "Lich Miniature"
desc = "Murderboner extraordinaire."
icon_state = "lichcharacter"
-/obj/item/storage/box/characters
- name = "Box of Miniatures"
- desc = "The nerd's best friends."
- icon_state = "box"
-/obj/item/storage/box/characters/populate_contents()
- new /obj/item/toy/character/alien(src)
- new /obj/item/toy/character/cleric(src)
- new /obj/item/toy/character/warrior(src)
- new /obj/item/toy/character/thief(src)
- new /obj/item/toy/character/wizard(src)
- new /obj/item/toy/character/cthulhu(src)
- new /obj/item/toy/character/lich(src)
-
-
-//Pet Rocks, just like from the 70's!
+// Pet Rocks, just like from the 70's!
/obj/item/toy/pet_rock
name = "pet rock"
desc = "The perfect pet!"
@@ -1071,8 +1057,7 @@
desc = "Roxie, the bestest girl pet in the whole wide universe!"
icon_state = "roxie"
-//minigibber, so cute
-
+// Minigibber, so cute
/obj/item/toy/minigibber
name = "miniature gibber"
desc = "A miniature recreation of Nanotrasen's famous meat grinder."
diff --git a/code/game/objects/items/weapons/implants/implant.dm b/code/game/objects/items/weapons/bio_chips/bio_chip.dm
similarity index 89%
rename from code/game/objects/items/weapons/implants/implant.dm
rename to code/game/objects/items/weapons/bio_chips/bio_chip.dm
index 41369cfef5c1..3c040149d776 100644
--- a/code/game/objects/items/weapons/implants/implant.dm
+++ b/code/game/objects/items/weapons/bio_chips/bio_chip.dm
@@ -23,16 +23,16 @@
* Code for implants that can be inserted into a person and have some sort of passive or triggered action.
*
*/
-/obj/item/implant
+/obj/item/bio_chip
name = "bio-chip"
- icon = 'icons/obj/implants.dmi'
+ icon = 'icons/obj/bio_chips.dmi'
icon_state = "generic" //Shows up as a auto surgeon, used as a placeholder when a implant doesn't have a sprite
origin_tech = "materials=2;biotech=3;programming=2"
actions_types = list(/datum/action/item_action/hands_free/activate)
item_color = "black"
flags = DROPDEL // By default, don't let implants be harvestable.
- ///which implant overlay should be used for implant cases. This should point to a state in implants.dmi
+ ///which implant overlay should be used for implant cases. This should point to a state in bio_chips.dmi
var/implant_state = "implant-default"
/// How the implant is activated.
var/activated = BIOCHIP_ACTIVATED_ACTIVE
@@ -56,18 +56,18 @@
///the implant_fluff datum attached to this implant, purely cosmetic "lore" information
var/datum/implant_fluff/implant_data = /datum/implant_fluff
-/obj/item/implant/Initialize(mapload)
+/obj/item/bio_chip/Initialize(mapload)
. = ..()
if(ispath(implant_data))
implant_data = new implant_data
-/obj/item/implant/Destroy()
+/obj/item/bio_chip/Destroy()
if(imp_in)
removed(imp_in)
QDEL_NULL(implant_data)
return ..()
-/obj/item/implant/proc/unregister_emotes()
+/obj/item/bio_chip/proc/unregister_emotes()
if(imp_in && LAZYLEN(trigger_emotes))
for(var/emote in trigger_emotes)
UnregisterSignal(imp_in, COMSIG_MOB_EMOTED(emote))
@@ -79,7 +79,7 @@
* * on_implant - Whether this proc is being called during the implantation of the implant.
* * silent - If true, the user won't get any to_chat messages if an implantation fails.
*/
-/obj/item/implant/proc/set_trigger(mob/user, emote_key, on_implant = FALSE, silent = TRUE)
+/obj/item/bio_chip/proc/set_trigger(mob/user, emote_key, on_implant = FALSE, silent = TRUE)
if(imp_in != user)
return FALSE
@@ -107,7 +107,7 @@
LAZYADD(trigger_emotes, emote_key)
RegisterSignal(user, COMSIG_MOB_EMOTED(emote_key), PROC_REF(on_emote))
-/obj/item/implant/proc/on_emote(mob/living/user, datum/emote/fired_emote, key, emote_type, message, intentional)
+/obj/item/bio_chip/proc/on_emote(mob/living/user, datum/emote/fired_emote, key, emote_type, message, intentional)
SIGNAL_HANDLER
if(!implanted || !imp_in)
@@ -119,7 +119,7 @@
add_attack_logs(user, user, "[intentional ? "intentionally" : "unintentionally"] [src] was [intentional ? "intentionally" : "unintentionally"] triggered with the emote [fired_emote].")
emote_trigger(key, user, intentional)
-/obj/item/implant/proc/on_death(mob/source, gibbed)
+/obj/item/bio_chip/proc/on_death(mob/source, gibbed)
SIGNAL_HANDLER
if(!implanted || !imp_in)
@@ -137,16 +137,16 @@
add_attack_logs(source, source, "had their [src] bio-chip triggered on [gibbed ? "gib" : "death"].")
death_trigger(source, gibbed)
-/obj/item/implant/proc/emote_trigger(emote, mob/source, force)
+/obj/item/bio_chip/proc/emote_trigger(emote, mob/source, force)
return
-/obj/item/implant/proc/death_trigger(mob/source, gibbed)
+/obj/item/bio_chip/proc/death_trigger(mob/source, gibbed)
return
-/obj/item/implant/proc/activate(cause)
+/obj/item/bio_chip/proc/activate(cause)
return
-/obj/item/implant/ui_action_click()
+/obj/item/bio_chip/ui_action_click()
activate("action_button")
/**
@@ -160,10 +160,10 @@
* -1 if the implant fails to inject
* 0 if there's no room for the implant.
*/
-/obj/item/implant/proc/implant(mob/source, mob/user, force)
+/obj/item/bio_chip/proc/implant(mob/source, mob/user, force)
if(!force && !can_implant(source, user))
return
- var/obj/item/implant/imp_e = locate(type) in source
+ var/obj/item/bio_chip/imp_e = locate(type) in source
if(!allow_multiple && imp_e && imp_e != src)
if(imp_e.uses < initial(imp_e.uses)*2)
if(uses == -1)
@@ -211,7 +211,7 @@
* TRUE - I could care less, implant it, maybe don't. I don't care.
* FALSE - Don't implant!
*/
-/obj/item/implant/proc/can_implant(mob/source, mob/user)
+/obj/item/bio_chip/proc/can_implant(mob/source, mob/user)
return TRUE
@@ -219,7 +219,7 @@
* Clean up when an implant is removed.
* * source - the user who the implant was removed from.
*/
-/obj/item/implant/proc/removed(mob/source)
+/obj/item/bio_chip/proc/removed(mob/source)
loc = null
imp_in = null
implanted = FALSE
@@ -239,6 +239,6 @@
return TRUE
-/obj/item/implant/dropped(mob/user)
+/obj/item/bio_chip/dropped(mob/user)
. = TRUE
..()
diff --git a/code/game/objects/items/weapons/implants/implant_abductor.dm b/code/game/objects/items/weapons/bio_chips/bio_chip_abductor.dm
similarity index 78%
rename from code/game/objects/items/weapons/implants/implant_abductor.dm
rename to code/game/objects/items/weapons/bio_chips/bio_chip_abductor.dm
index 67a7f6257884..74fc5e42dceb 100644
--- a/code/game/objects/items/weapons/implants/implant_abductor.dm
+++ b/code/game/objects/items/weapons/bio_chips/bio_chip_abductor.dm
@@ -1,4 +1,4 @@
-/obj/item/implant/abductor
+/obj/item/bio_chip/abductor
name = "recall bio-chip"
desc = "Returns you to the mothership."
icon = 'icons/obj/abductor.dmi'
@@ -12,7 +12,7 @@
var/cooldown = 30
var/total_cooldown = 30
-/obj/item/implant/abductor/activate()
+/obj/item/bio_chip/abductor/activate()
if(cooldown == total_cooldown)
home.Retrieve(imp_in, 1)
cooldown = 0
@@ -20,13 +20,13 @@
else
to_chat(imp_in, "You must wait [(total_cooldown - cooldown) * 2] seconds to use [src] again!")
-/obj/item/implant/abductor/process()
+/obj/item/bio_chip/abductor/process()
if(cooldown < total_cooldown)
cooldown++
if(cooldown == total_cooldown)
STOP_PROCESSING(SSobj, src)
-/obj/item/implant/abductor/implant(mob/source, mob/user)
+/obj/item/bio_chip/abductor/implant(mob/source, mob/user)
if(..())
var/obj/machinery/abductor/console/console
if(ishuman(source))
@@ -41,7 +41,7 @@
home = console.pad
return TRUE
-/obj/item/implant/abductor/proc/get_team_console(team)
+/obj/item/bio_chip/abductor/proc/get_team_console(team)
var/obj/machinery/abductor/console/console
for(var/obj/machinery/abductor/console/c in GLOB.abductor_equipment)
if(c.team == team)
@@ -49,11 +49,11 @@
break
return console
-/obj/item/implanter/abductor
+/obj/item/bio_chip_implanter/abductor
name = "bio-chip implanter (abductor)"
- implant_type = /obj/item/implant/abductor
+ implant_type = /obj/item/bio_chip/abductor
-/obj/item/implantcase/abductor
+/obj/item/bio_chip_case/abductor
name = "bio-chip case - 'abductor'"
desc = "A glass case containing an abductor bio-chip."
- implant_type = /obj/item/implant/abductor
+ implant_type = /obj/item/bio_chip/abductor
diff --git a/code/game/objects/items/weapons/implants/implant_adrenalin.dm b/code/game/objects/items/weapons/bio_chips/bio_chip_adrenalin.dm
similarity index 78%
rename from code/game/objects/items/weapons/implants/implant_adrenalin.dm
rename to code/game/objects/items/weapons/bio_chips/bio_chip_adrenalin.dm
index e0bb601cd701..7623f39ed668 100644
--- a/code/game/objects/items/weapons/implants/implant_adrenalin.dm
+++ b/code/game/objects/items/weapons/bio_chips/bio_chip_adrenalin.dm
@@ -1,4 +1,4 @@
-/obj/item/implant/adrenalin
+/obj/item/bio_chip/adrenalin
name = "adrenal bio-chip"
desc = "Removes all stuns and knockdowns."
icon_state = "adrenal"
@@ -7,7 +7,7 @@
implant_data = /datum/implant_fluff/adrenaline
implant_state = "implant-syndicate"
-/obj/item/implant/adrenalin/activate()
+/obj/item/bio_chip/adrenalin/activate()
uses--
to_chat(imp_in, "You feel a sudden surge of energy!")
imp_in.SetStunned(0)
@@ -24,11 +24,11 @@
if(!uses)
qdel(src)
-/obj/item/implanter/adrenalin
+/obj/item/bio_chip_implanter/adrenalin
name = "bio-chip implanter (adrenalin)"
- implant_type = /obj/item/implant/adrenalin
+ implant_type = /obj/item/bio_chip/adrenalin
-/obj/item/implantcase/adrenaline
+/obj/item/bio_chip_case/adrenaline
name = "bio-chip case - 'Adrenaline'"
desc = "A glass case containing an adrenaline bio-chip."
- implant_type = /obj/item/implant/adrenalin
+ implant_type = /obj/item/bio_chip/adrenalin
diff --git a/code/game/objects/items/weapons/implants/implantcase.dm b/code/game/objects/items/weapons/bio_chips/bio_chip_case.dm
similarity index 67%
rename from code/game/objects/items/weapons/implants/implantcase.dm
rename to code/game/objects/items/weapons/bio_chips/bio_chip_case.dm
index 7317c884d5b9..96ff2a4a15eb 100644
--- a/code/game/objects/items/weapons/implants/implantcase.dm
+++ b/code/game/objects/items/weapons/bio_chips/bio_chip_case.dm
@@ -1,7 +1,7 @@
-/obj/item/implantcase
+/obj/item/bio_chip_case
name = "bio-chip case"
desc = "A glass case containing a bio-chip."
- icon = 'icons/obj/implants.dmi'
+ icon = 'icons/obj/bio_chips.dmi'
icon_state = "implantcase"
item_state = "implantcase"
throw_speed = 2
@@ -11,22 +11,22 @@
container_type = OPENCONTAINER | INJECTABLE | DRAWABLE
materials = list(MAT_GLASS = 500)
- var/obj/item/implant/imp
- var/obj/item/implant/implant_type
+ var/obj/item/bio_chip/imp
+ var/obj/item/bio_chip/implant_type
-/obj/item/implantcase/Initialize(mapload)
+/obj/item/bio_chip_case/Initialize(mapload)
. = ..()
if(!implant_type)
return
imp = new implant_type(src)
update_state()
-/obj/item/implantcase/Destroy()
+/obj/item/bio_chip_case/Destroy()
if(imp)
QDEL_NULL(imp)
return ..()
-/obj/item/implantcase/proc/update_state()
+/obj/item/bio_chip_case/proc/update_state()
if(imp)
origin_tech = imp.origin_tech
flags = imp.flags & ~DROPDEL
@@ -37,19 +37,19 @@
reagents = null
update_icon(UPDATE_OVERLAYS)
-/obj/item/implantcase/update_overlays()
+/obj/item/bio_chip_case/update_overlays()
. = ..()
if(imp)
- var/image/implant_overlay = image('icons/obj/implants.dmi', imp.implant_state)
+ var/image/implant_overlay = image('icons/obj/bio_chips.dmi', imp.implant_state)
. += implant_overlay
-/obj/item/implantcase/attackby(obj/item/W, mob/user)
+/obj/item/bio_chip_case/attackby(obj/item/W, mob/user)
..()
if(is_pen(W))
rename_interactive(user, W)
- else if(istype(W, /obj/item/implanter))
- var/obj/item/implanter/I = W
+ else if(istype(W, /obj/item/bio_chip_implanter))
+ var/obj/item/bio_chip_implanter/I = W
if(I.imp)
if(imp || I.imp.implanted)
return
diff --git a/code/game/objects/items/weapons/implants/implant_chem.dm b/code/game/objects/items/weapons/bio_chips/bio_chip_chem.dm
similarity index 78%
rename from code/game/objects/items/weapons/implants/implant_chem.dm
rename to code/game/objects/items/weapons/bio_chips/bio_chip_chem.dm
index 70810e440e55..d1a057a0ba78 100644
--- a/code/game/objects/items/weapons/implants/implant_chem.dm
+++ b/code/game/objects/items/weapons/bio_chips/bio_chip_chem.dm
@@ -1,4 +1,4 @@
-/obj/item/implant/chem
+/obj/item/bio_chip/chem
name = "chem bio-chip"
desc = "Injects things."
icon_state = "reagents"
@@ -8,19 +8,19 @@
implant_data = /datum/implant_fluff/chem
implant_state = "implant-nanotrasen"
-/obj/item/implant/chem/Initialize(mapload)
+/obj/item/bio_chip/chem/Initialize(mapload)
. = ..()
create_reagents(50)
GLOB.tracked_implants += src
-/obj/item/implant/chem/Destroy()
+/obj/item/bio_chip/chem/Destroy()
GLOB.tracked_implants -= src
return ..()
-/obj/item/implant/chem/death_trigger(mob/victim, gibbed)
+/obj/item/bio_chip/chem/death_trigger(mob/victim, gibbed)
activate(reagents.total_volume)
-/obj/item/implant/chem/activate(cause)
+/obj/item/bio_chip/chem/activate(cause)
if(!cause || !imp_in)
return FALSE
var/mob/living/carbon/R = imp_in
@@ -42,11 +42,11 @@
to_chat(R, "You hear a faint click from your chest.")
qdel(src)
-/obj/item/implanter/chem
+/obj/item/bio_chip_implanter/chem
name = "bio-chip implanter (chem)"
- implant_type = /obj/item/implant/chem
+ implant_type = /obj/item/bio_chip/chem
-/obj/item/implantcase/chem
+/obj/item/bio_chip_case/chem
name = "bio-chip case - 'Remote Chemical'"
desc = "A glass case containing a remote chemical bio-chip."
- implant_type = /obj/item/implant/chem
+ implant_type = /obj/item/bio_chip/chem
diff --git a/code/game/objects/items/weapons/implants/implant_death_alarm.dm b/code/game/objects/items/weapons/bio_chips/bio_chip_death_alarm.dm
similarity index 70%
rename from code/game/objects/items/weapons/implants/implant_death_alarm.dm
rename to code/game/objects/items/weapons/bio_chips/bio_chip_death_alarm.dm
index da72a545909b..fadfd8f4a5be 100644
--- a/code/game/objects/items/weapons/implants/implant_death_alarm.dm
+++ b/code/game/objects/items/weapons/bio_chips/bio_chip_death_alarm.dm
@@ -1,4 +1,4 @@
-/obj/item/implant/death_alarm
+/obj/item/bio_chip/death_alarm
name = "death alarm bio-chip"
desc = "An alarm which monitors host vital signs and transmits a radio message upon death."
activated = BIOCHIP_ACTIVATED_PASSIVE
@@ -9,12 +9,12 @@
var/mobname = "Unknown"
var/static/list/stealth_areas = typecacheof(list(/area/syndicate_mothership, /area/shuttle/syndicate_elite))
-/obj/item/implant/death_alarm/implant(mob/target)
+/obj/item/bio_chip/death_alarm/implant(mob/target)
. = ..()
if(.)
mobname = target.real_name
-/obj/item/implant/death_alarm/activate(cause) // Death signal sends name followed by the gibbed / not gibbed check
+/obj/item/bio_chip/death_alarm/activate(cause) // Death signal sends name followed by the gibbed / not gibbed check
var/mob/M = imp_in
var/area/t = get_area(M)
@@ -38,26 +38,26 @@
qdel(a)
-/obj/item/implant/death_alarm/emp_act(severity) //for some reason alarms stop going off in case they are emp'd, even without this
+/obj/item/bio_chip/death_alarm/emp_act(severity) //for some reason alarms stop going off in case they are emp'd, even without this
activate("emp") //let's shout that this dude is dead
-/obj/item/implant/death_alarm/death_trigger(mob/source, gibbed)
+/obj/item/bio_chip/death_alarm/death_trigger(mob/source, gibbed)
if(gibbed)
activate("gib")
else
activate("death")
-/obj/item/implant/death_alarm/removed(mob/target)
+/obj/item/bio_chip/death_alarm/removed(mob/target)
if(..())
UnregisterSignal(target, COMSIG_MOB_DEATH)
return TRUE
return FALSE
-/obj/item/implanter/death_alarm
+/obj/item/bio_chip_implanter/death_alarm
name = "bio-chip implanter (Death Alarm)"
- implant_type = /obj/item/implant/death_alarm
+ implant_type = /obj/item/bio_chip/death_alarm
-/obj/item/implantcase/death_alarm
+/obj/item/bio_chip_case/death_alarm
name = "bio-chip Case - 'Death Alarm'"
desc = "A case containing a death alarm bio-chip."
- implant_type = /obj/item/implant/death_alarm
+ implant_type = /obj/item/bio_chip/death_alarm
diff --git a/code/game/objects/items/weapons/implants/implant_dust.dm b/code/game/objects/items/weapons/bio_chips/bio_chip_dust.dm
similarity index 75%
rename from code/game/objects/items/weapons/implants/implant_dust.dm
rename to code/game/objects/items/weapons/bio_chips/bio_chip_dust.dm
index 8079bbae8f82..b4b0a21e37ad 100644
--- a/code/game/objects/items/weapons/implants/implant_dust.dm
+++ b/code/game/objects/items/weapons/bio_chips/bio_chip_dust.dm
@@ -1,19 +1,19 @@
// Dust implant, for CC officers. Prevents gear theft if they die.
-/obj/item/implant/dust
+/obj/item/bio_chip/dust
name = "duster bio-chip"
desc = "A remote controlled bio-chip that will dust the user upon activation (or death of user)."
- icon = 'icons/obj/implants.dmi'
+ icon = 'icons/obj/bio_chips.dmi'
icon_state = "dust"
actions_types = list(/datum/action/item_action/hands_free/activate/always)
trigger_causes = BIOCHIP_TRIGGER_DEATH_ONCE | BIOCHIP_TRIGGER_NOT_WHEN_GIBBED
implant_data = /datum/implant_fluff/dust
implant_state = "implant-nanotrasen"
-/obj/item/implant/dust/death_trigger(mob/source, force)
+/obj/item/bio_chip/dust/death_trigger(mob/source, force)
activate("death")
-/obj/item/implant/dust/activate(cause)
+/obj/item/bio_chip/dust/activate(cause)
if(!cause || !imp_in || cause == "emp")
return FALSE
if(cause == "action_button" && alert(imp_in, "Are you sure you want to activate your dusting bio-chip? This will turn you to ash!", "Dusting Confirmation", "Yes", "No") != "Yes")
@@ -22,14 +22,14 @@
imp_in.visible_message("[imp_in] burns up in a flash!")
imp_in.dust()
-/obj/item/implant/dust/emp_act(severity)
+/obj/item/bio_chip/dust/emp_act(severity)
return
-/obj/item/implanter/dust
+/obj/item/bio_chip_implanter/dust
name = "bio-chip implanter (Dust-on-death)"
- implant_type = /obj/item/implant/dust
+ implant_type = /obj/item/bio_chip/dust
-/obj/item/implantcase/dust
+/obj/item/bio_chip_case/dust
name = "bio-chip case - 'Dust'"
desc = "A glass case containing a dust bio-chip."
- implant_type = /obj/item/implant/dust
+ implant_type = /obj/item/bio_chip/dust
diff --git a/code/game/objects/items/weapons/implants/implant_emp.dm b/code/game/objects/items/weapons/bio_chips/bio_chip_emp.dm
similarity index 69%
rename from code/game/objects/items/weapons/implants/implant_emp.dm
rename to code/game/objects/items/weapons/bio_chips/bio_chip_emp.dm
index 2de7952fa6d3..0afcad195345 100644
--- a/code/game/objects/items/weapons/implants/implant_emp.dm
+++ b/code/game/objects/items/weapons/bio_chips/bio_chip_emp.dm
@@ -1,4 +1,4 @@
-/obj/item/implant/emp
+/obj/item/bio_chip/emp
name = "emp bio-chip"
desc = "Triggers an EMP."
icon_state = "emp"
@@ -7,17 +7,17 @@
implant_data = /datum/implant_fluff/emp
implant_state = "implant-syndicate"
-/obj/item/implant/emp/activate()
+/obj/item/bio_chip/emp/activate()
uses--
INVOKE_ASYNC(GLOBAL_PROC, GLOBAL_PROC_REF(empulse), get_turf(imp_in), 3, 5, 1)
if(!uses)
qdel(src)
-/obj/item/implanter/emp
+/obj/item/bio_chip_implanter/emp
name = "bio-chip implanter (EMP)"
- implant_type = /obj/item/implant/emp
+ implant_type = /obj/item/bio_chip/emp
-/obj/item/implantcase/emp
+/obj/item/bio_chip_case/emp
name = "bio-chip case - 'EMP'"
desc = "A glass case containing an EMP bio-chip."
- implant_type = /obj/item/implant/emp
+ implant_type = /obj/item/bio_chip/emp
diff --git a/code/game/objects/items/weapons/implants/implant_explosive.dm b/code/game/objects/items/weapons/bio_chips/bio_chip_explosive.dm
similarity index 79%
rename from code/game/objects/items/weapons/implants/implant_explosive.dm
rename to code/game/objects/items/weapons/bio_chips/bio_chip_explosive.dm
index 72221af45409..3cc327272281 100644
--- a/code/game/objects/items/weapons/implants/implant_explosive.dm
+++ b/code/game/objects/items/weapons/bio_chips/bio_chip_explosive.dm
@@ -1,4 +1,4 @@
-/obj/item/implant/explosive
+/obj/item/bio_chip/explosive
name = "microbomb bio-chip"
desc = "And boom goes the weasel."
icon_state = "explosive"
@@ -14,10 +14,10 @@
var/heavy = 0.4
var/delay = 7
-/obj/item/implant/explosive/death_trigger(mob/source, gibbed)
+/obj/item/bio_chip/explosive/death_trigger(mob/source, gibbed)
activate("death")
-/obj/item/implant/explosive/activate(cause)
+/obj/item/bio_chip/explosive/activate(cause)
if(!cause || !imp_in)
return FALSE
if(cause == "action_button" && alert(imp_in, "Are you sure you want to activate your microbomb bio-chip? This will cause you to explode!", "Microbomb Bio-chip Confirmation", "Yes", "No") != "Yes")
@@ -36,7 +36,7 @@
timed_explosion()
/// Gib the implantee and delete their destructible contents.
-/obj/item/implant/explosive/proc/self_destruct()
+/obj/item/bio_chip/explosive/proc/self_destruct()
if(!imp_in)
return
@@ -67,8 +67,8 @@
qdel(src)
-/obj/item/implant/explosive/implant(mob/source)
- var/obj/item/implant/explosive/imp_e = locate(type) in source
+/obj/item/bio_chip/explosive/implant(mob/source)
+ var/obj/item/bio_chip/explosive/imp_e = locate(type) in source
if(imp_e && imp_e != src)
imp_e.heavy += heavy
imp_e.medium += medium
@@ -79,7 +79,7 @@
return ..()
-/obj/item/implant/explosive/proc/timed_explosion()
+/obj/item/bio_chip/explosive/proc/timed_explosion()
imp_in.visible_message("[imp_in] starts beeping ominously!")
playsound(loc, 'sound/items/timer.ogg', 30, 0)
var/wait_delay = delay / 4
@@ -95,7 +95,7 @@
sleep(wait_delay)
self_destruct()
-/obj/item/implant/explosive/macro
+/obj/item/bio_chip/explosive/macro
name = "macrobomb bio-chip"
desc = "And boom goes the weasel. And everything else nearby."
icon_state = "explosive"
@@ -106,7 +106,7 @@
delay = 3 SECONDS
implant_data = new /datum/implant_fluff/explosive_macro
-/obj/item/implant/explosive/macro/activate(cause)
+/obj/item/bio_chip/explosive/macro/activate(cause)
if(!cause || !imp_in)
return FALSE
if(cause == "action_button" && alert(imp_in, "Are you sure you want to activate your macrobomb bio-chip? This will cause you to explode and gib!", "Macrobomb Bio-chip Confirmation", "Yes", "No") != "Yes")
@@ -114,11 +114,11 @@
to_chat(imp_in, "You activate your macrobomb bio-chip.")
timed_explosion()
-/obj/item/implant/explosive/macro/implant(mob/source)
- var/obj/item/implant/explosive/imp_e = locate(type) in source
+/obj/item/bio_chip/explosive/macro/implant(mob/source)
+ var/obj/item/bio_chip/explosive/imp_e = locate(type) in source
if(imp_e && imp_e != src)
return FALSE
- imp_e = locate(/obj/item/implant/explosive) in source
+ imp_e = locate(/obj/item/bio_chip/explosive) in source
if(imp_e && imp_e != src)
heavy += imp_e.heavy
medium += imp_e.medium
@@ -129,20 +129,20 @@
return ..()
-/obj/item/implanter/explosive
+/obj/item/bio_chip_implanter/explosive
name = "bio-chip implanter (explosive)"
- implant_type = /obj/item/implant/explosive
+ implant_type = /obj/item/bio_chip/explosive
-/obj/item/implantcase/explosive
+/obj/item/bio_chip_case/explosive
name = "bio-chip case - 'Micro Explosive'"
desc = "A glass case containing a micro explosive bio-chip."
- implant_type = /obj/item/implant/explosive
+ implant_type = /obj/item/bio_chip/explosive
-/obj/item/implanter/explosive_macro
+/obj/item/bio_chip_implanter/explosive_macro
name = "bio-chip implanter (macro-explosive)"
- implant_type = /obj/item/implant/explosive/macro
+ implant_type = /obj/item/bio_chip/explosive/macro
-/obj/item/implantcase/explosive_macro
+/obj/item/bio_chip_case/explosive_macro
name = "bio-chip case - 'Macro Explosive'"
desc = "A glass case containing a macro explosive bio-chip."
- implant_type = /obj/item/implant/explosive/macro
+ implant_type = /obj/item/bio_chip/explosive/macro
diff --git a/code/game/objects/items/weapons/implants/implantfluff.dm b/code/game/objects/items/weapons/bio_chips/bio_chip_fluff.dm
similarity index 100%
rename from code/game/objects/items/weapons/implants/implantfluff.dm
rename to code/game/objects/items/weapons/bio_chips/bio_chip_fluff.dm
diff --git a/code/game/objects/items/weapons/implants/implant_freedom.dm b/code/game/objects/items/weapons/bio_chips/bio_chip_freedom.dm
similarity index 78%
rename from code/game/objects/items/weapons/implants/implant_freedom.dm
rename to code/game/objects/items/weapons/bio_chips/bio_chip_freedom.dm
index d98ff98790ae..898584a9240c 100644
--- a/code/game/objects/items/weapons/implants/implant_freedom.dm
+++ b/code/game/objects/items/weapons/bio_chips/bio_chip_freedom.dm
@@ -1,4 +1,4 @@
-/obj/item/implant/freedom
+/obj/item/bio_chip/freedom
name = "freedom bio-chip"
desc = "Use this to escape from those evil Red Shirts."
icon_state = "freedom"
@@ -9,7 +9,7 @@
implant_state = "implant-syndicate"
-/obj/item/implant/freedom/activate()
+/obj/item/bio_chip/freedom/activate()
uses--
to_chat(imp_in, "You feel a faint click.")
if(iscarbon(imp_in))
@@ -27,16 +27,16 @@
if(!uses)
qdel(src)
-/obj/item/implanter/freedom
+/obj/item/bio_chip_implanter/freedom
name = "bio-chip implanter (freedom)"
- implant_type = /obj/item/implant/freedom
+ implant_type = /obj/item/bio_chip/freedom
-/obj/item/implantcase/freedom
+/obj/item/bio_chip_case/freedom
name = "bio-chip case - 'Freedom'"
desc = "A glass case containing a freedom bio-chip."
- implant_type = /obj/item/implant/freedom
+ implant_type = /obj/item/bio_chip/freedom
-/obj/item/implant/freedom/prototype
+/obj/item/bio_chip/freedom/prototype
name = "prototype freedom bio-chip"
desc = "Use this to escape from those evil Red Shirts. Works only once!"
icon_state = "freedom"
@@ -46,11 +46,11 @@
implant_data = /datum/implant_fluff/protofreedom
implant_state = "implant-syndicate"
-/obj/item/implanter/freedom/prototype
+/obj/item/bio_chip_implanter/freedom/prototype
name = "bio-chip implanter (proto-freedom)"
- implant_type = /obj/item/implant/freedom/prototype
+ implant_type = /obj/item/bio_chip/freedom/prototype
-/obj/item/implantcase/freedom/prototype
+/obj/item/bio_chip_case/freedom/prototype
name = "bio-chip case - 'Proto-Freedom'"
desc = "A glass case containing a prototype freedom bio-chip."
- implant_type = /obj/item/implant/freedom/prototype
+ implant_type = /obj/item/bio_chip/freedom/prototype
diff --git a/code/game/objects/items/weapons/implants/implant_gorilla_rampage.dm b/code/game/objects/items/weapons/bio_chips/bio_chip_gorilla_rampage.dm
similarity index 75%
rename from code/game/objects/items/weapons/implants/implant_gorilla_rampage.dm
rename to code/game/objects/items/weapons/bio_chips/bio_chip_gorilla_rampage.dm
index 0ff79e5053a3..5fae9d5d602c 100644
--- a/code/game/objects/items/weapons/implants/implant_gorilla_rampage.dm
+++ b/code/game/objects/items/weapons/bio_chips/bio_chip_gorilla_rampage.dm
@@ -1,4 +1,4 @@
-/obj/item/implant/gorilla_rampage //Dumb path but easier to search for admins
+/obj/item/bio_chip/gorilla_rampage //Dumb path but easier to search for admins
name = "magillitis serum bio-chip"
desc = "An experimental biochip which causes irreversable rapid muscular growth in Hominidae. Side-affects may include hypertrichosis, violent outbursts, and an unending affinity for bananas."
icon_state = "gorilla_rampage"
@@ -7,7 +7,7 @@
implant_data = /datum/implant_fluff/gorilla_rampage
implant_state = "implant-syndicate"
-/obj/item/implant/gorilla_rampage/activate()
+/obj/item/bio_chip/gorilla_rampage/activate()
if(!iscarbon(imp_in))
return
@@ -15,11 +15,11 @@
target.visible_message("[target] swells and their hair grows rapidly. Uh oh!.","You feel your muscles swell and your hair grow as you return to monke.", "You hear angry gorilla noises.")
target.gorillize(TRUE)
-/obj/item/implanter/gorilla_rampage
+/obj/item/bio_chip_implanter/gorilla_rampage
name = "bio-chip implanter (magillitis serum)"
- implant_type = /obj/item/implant/gorilla_rampage
+ implant_type = /obj/item/bio_chip/gorilla_rampage
-/obj/item/implantcase/gorilla_rampage
+/obj/item/bio_chip_case/gorilla_rampage
name = "bio-chip case - 'magillitis serum'"
desc = "A glass case containing a magillitis bio-chip."
- implant_type = /obj/item/implant/gorilla_rampage
+ implant_type = /obj/item/bio_chip/gorilla_rampage
diff --git a/code/game/objects/items/weapons/implants/implant_health.dm b/code/game/objects/items/weapons/bio_chips/bio_chip_health.dm
similarity index 67%
rename from code/game/objects/items/weapons/implants/implant_health.dm
rename to code/game/objects/items/weapons/bio_chips/bio_chip_health.dm
index fd02a612b038..f96dffd6307b 100644
--- a/code/game/objects/items/weapons/implants/implant_health.dm
+++ b/code/game/objects/items/weapons/bio_chips/bio_chip_health.dm
@@ -1,4 +1,4 @@
-/obj/item/implant/health
+/obj/item/bio_chip/health
name = "health bio-chip"
activated = FALSE
implant_data = /datum/implant_fluff/health
@@ -6,18 +6,18 @@
var/healthstring = ""
-/obj/item/implant/health/proc/sensehealth()
+/obj/item/bio_chip/health/proc/sensehealth()
if(!imp_in)
return "ERROR"
else
healthstring = "[round(imp_in.getOxyLoss())] - [round(imp_in.getFireLoss())] - [round(imp_in.getToxLoss())] - [round(imp_in.getBruteLoss())]"
return healthstring
-/obj/item/implanter/health
+/obj/item/bio_chip_implanter/health
name = "implanter (health)"
- implant_type = /obj/item/implant/health
+ implant_type = /obj/item/bio_chip/health
-/obj/item/implantcase/health
+/obj/item/bio_chip_case/health
name = "implant case - 'Health'"
desc = "A glass case containing a health implant."
- implant_type = /obj/item/implant/health
+ implant_type = /obj/item/bio_chip/health
diff --git a/code/game/objects/items/weapons/implants/implant_krav_maga.dm b/code/game/objects/items/weapons/bio_chips/bio_chip_krav_maga.dm
similarity index 77%
rename from code/game/objects/items/weapons/implants/implant_krav_maga.dm
rename to code/game/objects/items/weapons/bio_chips/bio_chip_krav_maga.dm
index 032ad237d356..d79a03409bb4 100644
--- a/code/game/objects/items/weapons/implants/implant_krav_maga.dm
+++ b/code/game/objects/items/weapons/bio_chips/bio_chip_krav_maga.dm
@@ -1,4 +1,4 @@
-/obj/item/implant/krav_maga
+/obj/item/bio_chip/krav_maga
name = "krav maga bio-chip"
desc = "Teaches you the arts of Krav Maga in 5 short instructional videos beamed directly into your eyeballs."
icon = 'icons/obj/wizard.dmi'
@@ -10,7 +10,7 @@
var/datum/martial_art/krav_maga/style = new
-/obj/item/implant/krav_maga/activate()
+/obj/item/bio_chip/krav_maga/activate()
var/mob/living/carbon/human/H = imp_in
if(!ishuman(H) || !H.mind)
return
@@ -19,11 +19,11 @@
else
style.teach(H, TRUE)
-/obj/item/implanter/krav_maga
+/obj/item/bio_chip_implanter/krav_maga
name = "bio-chip implanter (krav maga)"
- implant_type = /obj/item/implant/krav_maga
+ implant_type = /obj/item/bio_chip/krav_maga
-/obj/item/implantcase/krav_maga
+/obj/item/bio_chip_case/krav_maga
name = "bio-chip case - 'Krav Maga'"
desc = "A glass case containing a bio-chip that can teach the user the art of Krav Maga."
- implant_type = /obj/item/implant/krav_maga
+ implant_type = /obj/item/bio_chip/krav_maga
diff --git a/code/game/objects/items/weapons/implants/implant_mindshield.dm b/code/game/objects/items/weapons/bio_chips/bio_chip_mindshield.dm
similarity index 78%
rename from code/game/objects/items/weapons/implants/implant_mindshield.dm
rename to code/game/objects/items/weapons/bio_chips/bio_chip_mindshield.dm
index 6aa9070145c3..0eef4a4100cc 100644
--- a/code/game/objects/items/weapons/implants/implant_mindshield.dm
+++ b/code/game/objects/items/weapons/bio_chips/bio_chip_mindshield.dm
@@ -1,4 +1,4 @@
-/obj/item/implant/mindshield
+/obj/item/bio_chip/mindshield
name = "mindshield bio-chip"
desc = "Stops people messing with your mind."
origin_tech = "materials=2;biotech=4;programming=4"
@@ -6,14 +6,14 @@
implant_data = /datum/implant_fluff/mindshield
implant_state = "implant-nanotrasen"
-/obj/item/implant/mindshield/can_implant(mob/source, mob/user)
+/obj/item/bio_chip/mindshield/can_implant(mob/source, mob/user)
if(source.mind?.has_antag_datum(/datum/antagonist/rev/head))
source.visible_message("[source] seems to resist [src]!",
"You feel something interfering with your mental conditioning, but you resist it!")
return FALSE
return ..()
-/obj/item/implant/mindshield/implant(mob/target)
+/obj/item/bio_chip/mindshield/implant(mob/target)
if(!..())
return FALSE
if(target.mind)
@@ -26,18 +26,18 @@
to_chat(target, "Your mind feels hardened - more resistant to brainwashing.")
return TRUE
-/obj/item/implant/mindshield/removed(mob/target, silent = 0)
+/obj/item/bio_chip/mindshield/removed(mob/target, silent = 0)
if(..())
if(target.stat != DEAD && !silent)
to_chat(target, "Your mind softens. You feel susceptible to the effects of brainwashing once more.")
return TRUE
return FALSE
-/obj/item/implanter/mindshield
+/obj/item/bio_chip_implanter/mindshield
name = "bio-chip implanter (mindshield)"
- implant_type = /obj/item/implant/mindshield
+ implant_type = /obj/item/bio_chip/mindshield
-/obj/item/implantcase/mindshield
+/obj/item/bio_chip_case/mindshield
name = "bio-chip case - 'mindshield'"
desc = "A glass case containing a mindshield bio-chip."
- implant_type = /obj/item/implant/mindshield
+ implant_type = /obj/item/bio_chip/mindshield
diff --git a/code/game/objects/items/weapons/implants/implantpad.dm b/code/game/objects/items/weapons/bio_chips/bio_chip_pad.dm
similarity index 68%
rename from code/game/objects/items/weapons/implants/implantpad.dm
rename to code/game/objects/items/weapons/bio_chips/bio_chip_pad.dm
index fc6c9ada1ffa..9c9036cffb41 100644
--- a/code/game/objects/items/weapons/implants/implantpad.dm
+++ b/code/game/objects/items/weapons/bio_chips/bio_chip_pad.dm
@@ -1,40 +1,40 @@
-/obj/item/implantpad
+/obj/item/bio_chip_pad
name = "bio-chip pad"
desc = "Used to modify bio-chips."
- icon = 'icons/obj/implants.dmi'
+ icon = 'icons/obj/bio_chips.dmi'
icon_state = "implantpad-off"
item_state = "electronic"
throw_speed = 3
throw_range = 5
w_class = WEIGHT_CLASS_SMALL
- var/obj/item/implantcase/case
+ var/obj/item/bio_chip_case/case
-/obj/item/implantpad/Destroy()
+/obj/item/bio_chip_pad/Destroy()
if(case)
eject_case()
return ..()
-/obj/item/implantpad/examine(mob/user)
+/obj/item/bio_chip_pad/examine(mob/user)
. = ..()
. += "You can Alt-Click [src] to remove it's stored implant."
-/obj/item/implantpad/update_icon_state()
+/obj/item/bio_chip_pad/update_icon_state()
if(case)
icon_state = "implantpad-on"
else
icon_state = "implantpad-off"
-/obj/item/implantpad/attack_self(mob/user)
+/obj/item/bio_chip_pad/attack_self(mob/user)
ui_interact(user)
-/obj/item/implantpad/attackby(obj/item/implantcase/C, mob/user)
+/obj/item/bio_chip_pad/attackby(obj/item/bio_chip_case/C, mob/user)
if(istype(C))
addcase(user, C)
else
return ..()
-/obj/item/implantpad/proc/addcase(mob/user, obj/item/implantcase/C)
+/obj/item/bio_chip_pad/proc/addcase(mob/user, obj/item/bio_chip_case/C)
if(!user || !C)
return
if(case)
@@ -45,7 +45,7 @@
case = C
update_icon(UPDATE_ICON_STATE)
-/obj/item/implantpad/proc/eject_case(mob/user)
+/obj/item/bio_chip_pad/proc/eject_case(mob/user)
if(!case)
return
if(user)
@@ -60,19 +60,19 @@
case = null
update_icon(UPDATE_ICON_STATE)
-/obj/item/implantpad/AltClick(mob/user)
+/obj/item/bio_chip_pad/AltClick(mob/user)
if(user.stat || HAS_TRAIT(user, TRAIT_HANDS_BLOCKED) || !Adjacent(user))
return
eject_case(user)
-/obj/item/implantpad/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
+/obj/item/bio_chip_pad/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
ui = new(user, src, ui_key, "ImplantPad", name, 410, 400, master_ui, state)
ui.open()
-/obj/item/implantpad/ui_data(mob/user)
+/obj/item/bio_chip_pad/ui_data(mob/user)
var/list/data = list()
data["contains_case"] = case ? TRUE : FALSE
if(case && case.imp)
@@ -86,7 +86,7 @@
)
return data
-/obj/item/implantpad/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
+/obj/item/bio_chip_pad/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
if(..())
return
diff --git a/code/game/objects/items/weapons/bio_chips/bio_chip_prescan.dm b/code/game/objects/items/weapons/bio_chips/bio_chip_prescan.dm
new file mode 100644
index 000000000000..e544e333c452
--- /dev/null
+++ b/code/game/objects/items/weapons/bio_chips/bio_chip_prescan.dm
@@ -0,0 +1,48 @@
+/obj/item/bio_chip/grey_autocloner
+ name = "technocracy cloning bio-chip"
+ desc = "Allows for advanced instantanious cloning!"
+ icon_state = "generic"
+ origin_tech = "materials=3;combat=5;syndicate=2"
+ activated = FALSE
+ trigger_causes = BIOCHIP_TRIGGER_DEATH_ANY
+ implant_state = "implant-alien"
+ var/obj/machinery/grey_autocloner/linked
+ var/datum/dna2/record/our_record
+
+/obj/item/bio_chip/grey_autocloner/Destroy()
+ linked = null
+ our_record = null
+ return ..()
+
+/obj/item/bio_chip/grey_autocloner/death_trigger(mob/source, gibbed)
+ imp_in.ghostize(TRUE)
+ if(linked)
+ linked.growclone(our_record)
+
+/obj/item/bio_chip/grey_autocloner/implant(mob/source, mob/user, force)
+ if(!linked)
+ to_chat(user, "Please link the implanter with a Technocracy cloning pod!")
+ return FALSE
+ . = ..()
+ if(!. || !ishuman(imp_in))
+ return FALSE
+ our_record = new /datum/dna2/record()
+ our_record.ckey = imp_in.ckey
+ var/obj/item/organ/B = imp_in.get_int_organ(/obj/item/organ/internal/brain)
+ B.dna.check_integrity()
+ our_record.dna = B.dna.Clone()
+ our_record.id = copytext(md5(B.dna.real_name), 2, 6)
+ our_record.name = B.dna.real_name
+ our_record.types = DNA2_BUF_UI|DNA2_BUF_UE|DNA2_BUF_SE
+ our_record.languages = imp_in.languages
+ if(imp_in.mind) //Save that mind so traitors can continue traitoring after cloning.
+ our_record.mind = imp_in.mind.UID()
+
+/obj/item/bio_chip_implanter/grey_autocloner
+ name = "bio-chip implanter (Technocracy cloning)"
+ implant_type = /obj/item/bio_chip/grey_autocloner
+
+/obj/item/bio_chip_case/grey_autocloner
+ name = "bio-chip case - 'Technocracy cloning'"
+ desc = "A glass case containing an Technocracy bio-chip."
+ implant_type = /obj/item/bio_chip/grey_autocloner
diff --git a/code/game/objects/items/weapons/implants/implant_sad_trombone.dm b/code/game/objects/items/weapons/bio_chips/bio_chip_sad_trombone.dm
similarity index 60%
rename from code/game/objects/items/weapons/implants/implant_sad_trombone.dm
rename to code/game/objects/items/weapons/bio_chips/bio_chip_sad_trombone.dm
index 14c6c78493dd..8ec2ac01a6b3 100644
--- a/code/game/objects/items/weapons/implants/implant_sad_trombone.dm
+++ b/code/game/objects/items/weapons/bio_chips/bio_chip_sad_trombone.dm
@@ -1,4 +1,4 @@
-/obj/item/implant/sad_trombone
+/obj/item/bio_chip/sad_trombone
name = "sad trombone bio-chip"
activated = FALSE
trigger_emotes = list("deathgasp")
@@ -7,21 +7,21 @@
implant_data = /datum/implant_fluff/sad_trombone
implant_state = "implant-honk"
-/obj/item/implant/sad_trombone/emote_trigger(emote, mob/source, force)
+/obj/item/bio_chip/sad_trombone/emote_trigger(emote, mob/source, force)
activate(emote)
-/obj/item/implant/sad_trombone/death_trigger(mob/user, gibbed)
+/obj/item/bio_chip/sad_trombone/death_trigger(mob/user, gibbed)
activate(gibbed)
-/obj/item/implant/sad_trombone/activate()
+/obj/item/bio_chip/sad_trombone/activate()
playsound(loc, 'sound/misc/sadtrombone.ogg', 50, FALSE)
-/obj/item/implanter/sad_trombone
+/obj/item/bio_chip_implanter/sad_trombone
name = "bio-chip implanter (sad trombone)"
- implant_type = /obj/item/implant/sad_trombone
+ implant_type = /obj/item/bio_chip/sad_trombone
-/obj/item/implantcase/sad_trombone
+/obj/item/bio_chip_case/sad_trombone
name = "bio-chip case - 'Sad Trombone'"
desc = "A glass case containing a sad trombone bio-chip."
- implant_type = /obj/item/implant/sad_trombone
+ implant_type = /obj/item/bio_chip/sad_trombone
diff --git a/code/game/objects/items/weapons/implants/implant_stealth.dm b/code/game/objects/items/weapons/bio_chips/bio_chip_stealth.dm
similarity index 98%
rename from code/game/objects/items/weapons/implants/implant_stealth.dm
rename to code/game/objects/items/weapons/bio_chips/bio_chip_stealth.dm
index 4c146bdfcc4a..0dfdf4e864c3 100644
--- a/code/game/objects/items/weapons/implants/implant_stealth.dm
+++ b/code/game/objects/items/weapons/bio_chips/bio_chip_stealth.dm
@@ -3,16 +3,16 @@
*
* Implant which allows you to summon an MGS-style cardboard box that turns you invisble after a short delay.
*/
-/obj/item/implant/stealth
+/obj/item/bio_chip/stealth
name = "S3 bio-chip"
desc = "Allows you to be hidden in plain sight."
implant_state = "implant-syndicate"
implant_data = /datum/implant_fluff/stealth
actions_types = list(/datum/action/item_action/agent_box)
-/obj/item/implanter/stealth
+/obj/item/bio_chip_implanter/stealth
name = "bio-chip implanter (stealth)"
- implant_type = /obj/item/implant/stealth
+ implant_type = /obj/item/bio_chip/stealth
/datum/action/item_action/agent_box
name = "Deploy Box"
diff --git a/code/game/objects/items/weapons/implants/implant_storage.dm b/code/game/objects/items/weapons/bio_chips/bio_chip_storage.dm
similarity index 71%
rename from code/game/objects/items/weapons/implants/implant_storage.dm
rename to code/game/objects/items/weapons/bio_chips/bio_chip_storage.dm
index 4fb991f3f25b..51cd1caadcc2 100644
--- a/code/game/objects/items/weapons/implants/implant_storage.dm
+++ b/code/game/objects/items/weapons/bio_chips/bio_chip_storage.dm
@@ -8,7 +8,7 @@
w_class_override = list(/obj/item/storage/belt)
silent = TRUE
-/obj/item/implant/storage
+/obj/item/bio_chip/storage
name = "storage bio-chip"
desc = "Stores up to two big items in a bluespace pocket."
icon_state = "storage"
@@ -19,22 +19,22 @@
var/obj/item/storage/hidden/implant/storage
-/obj/item/implant/storage/Initialize(mapload)
+/obj/item/bio_chip/storage/Initialize(mapload)
. = ..()
storage = new /obj/item/storage/hidden/implant(src)
-/obj/item/implant/storage/emp_act(severity)
+/obj/item/bio_chip/storage/emp_act(severity)
..()
storage.emp_act(severity)
-/obj/item/implant/storage/activate()
+/obj/item/bio_chip/storage/activate()
if(!length(storage.mobs_viewing))
storage.MouseDrop(imp_in)
else
for(var/mob/to_close in storage.mobs_viewing)
storage.close(to_close)
-/obj/item/implant/storage/removed(source)
+/obj/item/bio_chip/storage/removed(source)
if(..())
for(var/mob/M in range(1))
if(M.s_active == storage)
@@ -43,8 +43,8 @@
storage.remove_from_storage(I, get_turf(source))
return TRUE
-/obj/item/implant/storage/implant(mob/source)
- var/obj/item/implant/storage/imp_e = locate(type) in source
+/obj/item/bio_chip/storage/implant(mob/source)
+ var/obj/item/bio_chip/storage/imp_e = locate(type) in source
if(imp_e)
imp_e.storage.storage_slots += storage.storage_slots
imp_e.storage.max_combined_w_class += storage.max_combined_w_class
@@ -60,15 +60,15 @@
return ..()
-/obj/item/implant/storage/proc/get_contents() //Used for swiftly returning a list of the implant's contents i.e. for checking a theft objective's completion.
+/obj/item/bio_chip/storage/proc/get_contents() //Used for swiftly returning a list of the implant's contents i.e. for checking a theft objective's completion.
if(storage && storage.contents)
return storage.contents
-/obj/item/implanter/storage
+/obj/item/bio_chip_implanter/storage
name = "bio-chip implanter (storage)"
- implant_type = /obj/item/implant/storage
+ implant_type = /obj/item/bio_chip/storage
-/obj/item/implantcase/storage
+/obj/item/bio_chip_case/storage
name = "bio-chip case - 'Storage'"
desc = "A glass case containing a storage bio-chip."
- implant_type = /obj/item/implant/storage
+ implant_type = /obj/item/bio_chip/storage
diff --git a/code/game/objects/items/weapons/implants/implant_supercharge.dm b/code/game/objects/items/weapons/bio_chips/bio_chip_supercharge.dm
similarity index 78%
rename from code/game/objects/items/weapons/implants/implant_supercharge.dm
rename to code/game/objects/items/weapons/bio_chips/bio_chip_supercharge.dm
index b50d906d7c35..f7dbfef5f63d 100644
--- a/code/game/objects/items/weapons/implants/implant_supercharge.dm
+++ b/code/game/objects/items/weapons/bio_chips/bio_chip_supercharge.dm
@@ -1,4 +1,4 @@
-/obj/item/implant/supercharge
+/obj/item/bio_chip/supercharge
name = "supercharge bio-chip"
desc = "Removes all stuns and knockdowns."
icon_state = "adrenal"
@@ -7,7 +7,7 @@
implant_data = /datum/implant_fluff/adrenaline
implant_state = "implant-syndicate"
-/obj/item/implant/supercharge/activate()
+/obj/item/bio_chip/supercharge/activate()
uses--
to_chat(imp_in, "You feel an electric sensation as your components enter overdrive!")
imp_in.SetStunned(0)
@@ -24,11 +24,11 @@
if(!uses)
qdel(src)
-/obj/item/implanter/supercharge
+/obj/item/bio_chip_implanter/supercharge
name = "bio-chip implanter (supercharge)"
- implant_type = /obj/item/implant/supercharge
+ implant_type = /obj/item/bio_chip/supercharge
-/obj/item/implantcase/supercharge
+/obj/item/bio_chip_case/supercharge
name = "bio-chip case - 'supercharge'"
desc = "A glass case containing an supercharge bio-chip."
- implant_type = /obj/item/implant/supercharge
+ implant_type = /obj/item/bio_chip/supercharge
diff --git a/code/game/objects/items/weapons/implants/implant_tracking.dm b/code/game/objects/items/weapons/bio_chips/bio_chip_tracking.dm
similarity index 68%
rename from code/game/objects/items/weapons/implants/implant_tracking.dm
rename to code/game/objects/items/weapons/bio_chips/bio_chip_tracking.dm
index 560d728abaec..1e64bc40f2d2 100644
--- a/code/game/objects/items/weapons/implants/implant_tracking.dm
+++ b/code/game/objects/items/weapons/bio_chips/bio_chip_tracking.dm
@@ -1,4 +1,4 @@
-/obj/item/implant/tracking
+/obj/item/bio_chip/tracking
name = "tracking bio-chip"
desc = "Track with this."
activated = BIOCHIP_ACTIVATED_PASSIVE
@@ -9,22 +9,22 @@
var/obj/item/gps/internal_gps
var/internal_gps_path = /obj/item/gps/internal/tracking_implant
-/obj/item/implant/tracking/Initialize(mapload)
+/obj/item/bio_chip/tracking/Initialize(mapload)
. = ..()
GLOB.tracked_implants += src
-/obj/item/implant/tracking/Destroy()
+/obj/item/bio_chip/tracking/Destroy()
QDEL_NULL(internal_gps)
GLOB.tracked_implants -= src
return ..()
-/obj/item/implant/tracking/implant(mob/target)
+/obj/item/bio_chip/tracking/implant(mob/target)
. = ..()
if(!.)
return
internal_gps = new internal_gps_path(src)
-/obj/item/implant/tracking/removed(mob/target)
+/obj/item/bio_chip/tracking/removed(mob/target)
. = ..()
if(.)
QDEL_NULL(internal_gps)
@@ -33,11 +33,11 @@
gpstag = "TRACK0"
local = FALSE
-/obj/item/implanter/tracking
+/obj/item/bio_chip_implanter/tracking
name = "bio-chip implanter (tracking)"
- implant_type = /obj/item/implant/tracking
+ implant_type = /obj/item/bio_chip/tracking
-/obj/item/implantcase/tracking
+/obj/item/bio_chip_case/tracking
name = "bio-chip case - 'Tracking'"
desc = "A glass case containing a tracking bio-chip."
- implant_type = /obj/item/implant/tracking
+ implant_type = /obj/item/bio_chip/tracking
diff --git a/code/game/objects/items/weapons/implants/implant_traitor.dm b/code/game/objects/items/weapons/bio_chips/bio_chip_traitor.dm
similarity index 86%
rename from code/game/objects/items/weapons/implants/implant_traitor.dm
rename to code/game/objects/items/weapons/bio_chips/bio_chip_traitor.dm
index 17d906737655..b937df4540a0 100644
--- a/code/game/objects/items/weapons/implants/implant_traitor.dm
+++ b/code/game/objects/items/weapons/bio_chips/bio_chip_traitor.dm
@@ -1,4 +1,4 @@
-/obj/item/implant/traitor
+/obj/item/bio_chip/traitor
name = "Mindslave Bio-chip"
desc = "Divide and Conquer"
origin_tech = "programming=5;biotech=5;syndicate=8"
@@ -9,7 +9,7 @@
/// The UID of the mindslave's `mind`. Stored to solve GC race conditions and ensure we can remove their mindslave status even when they're deleted or gibbed.
var/mindslave_UID
-/obj/item/implant/traitor/implant(mob/living/carbon/human/mindslave_target, mob/living/carbon/human/user)
+/obj/item/bio_chip/traitor/implant(mob/living/carbon/human/mindslave_target, mob/living/carbon/human/user)
// Check `activated` here so you can't just keep taking it out and putting it back into other people.
if(activated || !istype(mindslave_target) || !istype(user)) // Both the target and the user need to be human.
return FALSE
@@ -40,16 +40,16 @@
log_admin("[key_name_admin(user)] has mind-slaved [key_name_admin(mindslave_target)].")
return ..()
-/obj/item/implant/traitor/removed(mob/target)
+/obj/item/bio_chip/traitor/removed(mob/target)
. = ..()
var/datum/mind/M = locateUID(mindslave_UID)
M.remove_antag_datum(/datum/antagonist/mindslave)
-/obj/item/implanter/traitor
+/obj/item/bio_chip_implanter/traitor
name = "bio-chip implanter (Mindslave)"
- implant_type = /obj/item/implant/traitor
+ implant_type = /obj/item/bio_chip/traitor
-/obj/item/implantcase/traitor
+/obj/item/bio_chip_case/traitor
name = "bio-chip case - 'Mindslave'"
desc = "A glass case containing a mindslave bio-chip."
- implant_type = /obj/item/implant/traitor
+ implant_type = /obj/item/bio_chip/traitor
diff --git a/code/game/objects/items/weapons/implants/implant_uplink.dm b/code/game/objects/items/weapons/bio_chips/bio_chip_uplink.dm
similarity index 61%
rename from code/game/objects/items/weapons/implants/implant_uplink.dm
rename to code/game/objects/items/weapons/bio_chips/bio_chip_uplink.dm
index ef9cfaf786d5..242c7386f9de 100644
--- a/code/game/objects/items/weapons/implants/implant_uplink.dm
+++ b/code/game/objects/items/weapons/bio_chips/bio_chip_uplink.dm
@@ -1,4 +1,4 @@
-/obj/item/implant/uplink
+/obj/item/bio_chip/uplink
name = "uplink bio-chip"
desc = "Summon things."
icon = 'icons/obj/radio.dmi'
@@ -7,29 +7,29 @@
implant_data = /datum/implant_fluff/uplink
implant_state = "implant-syndicate"
-/obj/item/implant/uplink/Initialize(mapload)
+/obj/item/bio_chip/uplink/Initialize(mapload)
. = ..()
hidden_uplink = new(src)
hidden_uplink.uses = 50
-/obj/item/implant/uplink/nuclear/Initialize(mapload)
+/obj/item/bio_chip/uplink/nuclear/Initialize(mapload)
. = ..()
if(hidden_uplink)
hidden_uplink.update_uplink_type(UPLINK_TYPE_NUCLEAR)
-/obj/item/implant/uplink/sit/Initialize(mapload)
+/obj/item/bio_chip/uplink/sit/Initialize(mapload)
. = ..()
if(hidden_uplink)
hidden_uplink.update_uplink_type(UPLINK_TYPE_SIT)
-/obj/item/implant/uplink/admin/Initialize(mapload)
+/obj/item/bio_chip/uplink/admin/Initialize(mapload)
. = ..()
if(hidden_uplink)
hidden_uplink.update_uplink_type(UPLINK_TYPE_ADMIN)
-/obj/item/implant/uplink/implant(mob/source)
- var/obj/item/implant/imp_e = locate(type) in source
+/obj/item/bio_chip/uplink/implant(mob/source)
+ var/obj/item/bio_chip/imp_e = locate(type) in source
if(imp_e && imp_e != src)
imp_e.hidden_uplink.uses += hidden_uplink.uses
qdel(src)
@@ -40,23 +40,23 @@
return TRUE
return FALSE
-/obj/item/implant/uplink/activate()
+/obj/item/bio_chip/uplink/activate()
if(hidden_uplink)
hidden_uplink.check_trigger(imp_in)
-/obj/item/implanter/uplink
+/obj/item/bio_chip_implanter/uplink
name = "bio-chip implanter (uplink)"
- implant_type = /obj/item/implant/uplink
+ implant_type = /obj/item/bio_chip/uplink
-/obj/item/implantcase/uplink
+/obj/item/bio_chip_case/uplink
name = "bio-chip case - 'Syndicate Uplink'"
desc = "A glass case containing an uplink bio-chip."
- implant_type = /obj/item/implant/uplink
+ implant_type = /obj/item/bio_chip/uplink
-/obj/item/implanter/nuclear
+/obj/item/bio_chip_implanter/nuclear
name = "bio-chip implanter (Nuclear Agent Uplink)"
- implant_type = /obj/item/implant/uplink/nuclear
+ implant_type = /obj/item/bio_chip/uplink/nuclear
-/obj/item/implantcase/nuclear
+/obj/item/bio_chip_case/nuclear
name = "bio-chip case - 'Nuclear Agent Uplink'"
- implant_type = /obj/item/implant/uplink/nuclear
+ implant_type = /obj/item/bio_chip/uplink/nuclear
diff --git a/code/game/objects/items/weapons/implants/implanter.dm b/code/game/objects/items/weapons/bio_chips/bio_chipper.dm
similarity index 75%
rename from code/game/objects/items/weapons/implants/implanter.dm
rename to code/game/objects/items/weapons/bio_chips/bio_chipper.dm
index 889a51ba2f4f..cc39c68ae383 100644
--- a/code/game/objects/items/weapons/implants/implanter.dm
+++ b/code/game/objects/items/weapons/bio_chips/bio_chipper.dm
@@ -1,7 +1,7 @@
-/obj/item/implanter
+/obj/item/bio_chip_implanter
name = "bio-chip implanter"
desc = "A sterile automatic bio-chip injector."
- icon = 'icons/obj/implants.dmi'
+ icon = 'icons/obj/bio_chips.dmi'
icon_state = "implanter0"
item_state = "syringe_0"
throw_speed = 3
@@ -10,10 +10,10 @@
origin_tech = "materials=2;biotech=3"
materials = list(MAT_METAL = 600, MAT_GLASS = 200)
toolspeed = 1
- var/obj/item/implant/imp
- var/obj/item/implant/implant_type
+ var/obj/item/bio_chip/imp
+ var/obj/item/bio_chip/implant_type
-/obj/item/implanter/update_icon_state()
+/obj/item/bio_chip_implanter/update_icon_state()
if(imp)
icon_state = "implanter1"
origin_tech = imp.origin_tech
@@ -21,7 +21,7 @@
icon_state = "implanter0"
origin_tech = initial(origin_tech)
-/obj/item/implanter/attack(mob/living/carbon/M, mob/user)
+/obj/item/bio_chip_implanter/attack(mob/living/carbon/M, mob/user)
if(!iscarbon(M))
return
if(user && imp)
@@ -39,18 +39,18 @@
imp = null
update_icon(UPDATE_ICON_STATE)
-/obj/item/implanter/attackby(obj/item/W, mob/user, params)
+/obj/item/bio_chip_implanter/attackby(obj/item/W, mob/user, params)
..()
if(is_pen(W))
rename_interactive(user, W)
-/obj/item/implanter/Initialize(mapload)
+/obj/item/bio_chip_implanter/Initialize(mapload)
. = ..()
if(!implant_type)
return
imp = new implant_type()
update_icon(UPDATE_ICON_STATE)
-/obj/item/implanter/Destroy()
+/obj/item/bio_chip_implanter/Destroy()
QDEL_NULL(imp)
. = ..()
diff --git a/code/game/objects/items/weapons/dice.dm b/code/game/objects/items/weapons/dice.dm
index 8ee1908cd781..6363f02b6389 100644
--- a/code/game/objects/items/weapons/dice.dm
+++ b/code/game/objects/items/weapons/dice.dm
@@ -190,7 +190,7 @@
//Destroy Equipment
T.visible_message("Everything [user] is holding and wearing disappears!")
for(var/obj/item/I in user)
- if(istype(I, /obj/item/implant))
+ if(istype(I, /obj/item/bio_chip))
continue
qdel(I)
if(5)
@@ -261,7 +261,7 @@
/obj/item/borg/upgrade/modkit/indoors,
/obj/item/storage/box/syndie_kit/chameleon,
/obj/item/mod/control/pre_equipped/traitor,
- /obj/item/implanter/storage,
+ /obj/item/bio_chip_implanter/storage,
/obj/item/toy/syndicateballoon)
var/selected_item = pick(traitor_items)
T.visible_message("A suspicious item appears!")
diff --git a/code/game/objects/items/weapons/soap.dm b/code/game/objects/items/weapons/soap.dm
index 009bed78c08e..5a23face976d 100644
--- a/code/game/objects/items/weapons/soap.dm
+++ b/code/game/objects/items/weapons/soap.dm
@@ -93,7 +93,7 @@
new /obj/effect/decal/cleanable/blood/gibs/cleangibs(target)
else if(iscarbon(target))
for(var/obj/item/carried_item in target.contents)
- if(!istype(carried_item, /obj/item/implant))//If it's not an implant.
+ if(!istype(carried_item, /obj/item/bio_chip))//If it's not an implant.
carried_item.add_mob_blood(target)//Oh yes, there will be blood...
var/mob/living/carbon/human/H = target
H.bloody_hands(target,0)
diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm
index 4496647127af..36943a3b93b3 100644
--- a/code/game/objects/items/weapons/storage/boxes.dm
+++ b/code/game/objects/items/weapons/storage/boxes.dm
@@ -22,6 +22,7 @@
/obj/item/storage/box
name = "box"
desc = "It's just an ordinary box."
+ icon = 'icons/obj/boxes.dmi'
icon_state = "box"
item_state = "syringe_kit"
resistance_flags = FLAMMABLE
@@ -33,14 +34,17 @@
/obj/item/storage/box/large
name = "large box"
desc = "You could build a fort with this."
- icon_state = "largebox"
+ icon_state = "large_box"
w_class = 4 // Big, bulky.
foldable_amt = 4
storage_slots = 21
max_combined_w_class = 42 // 21*2
+////////////////////
+/* Survival Boxes */
+////////////////////
/obj/item/storage/box/survival
- icon_state = "box_civ"
+ icon_state = "civ_box"
/obj/item/storage/box/survival/populate_contents()
new /obj/item/clothing/mask/breath(src)
@@ -49,7 +53,7 @@
new /obj/item/flashlight/flare/glowstick/emergency(src)
/obj/item/storage/box/survival_vox
- icon_state = "box_vox"
+ icon_state = "vox_box"
/obj/item/storage/box/survival_vox/populate_contents()
new /obj/item/clothing/mask/breath/vox(src)
@@ -58,7 +62,7 @@
new /obj/item/flashlight/flare/glowstick/emergency(src)
/obj/item/storage/box/survival_plasmaman
- icon_state = "box_plasma"
+ icon_state = "plasma_box"
/obj/item/storage/box/survival_plasmaman/populate_contents()
new /obj/item/clothing/mask/breath(src)
@@ -67,7 +71,7 @@
new /obj/item/flashlight/flare/glowstick/emergency(src)
/obj/item/storage/box/engineer
- icon_state = "box_eng"
+ icon_state = "eng_box"
/obj/item/storage/box/engineer/populate_contents()
new /obj/item/clothing/mask/breath(src)
@@ -76,7 +80,7 @@
new /obj/item/flashlight/flare/glowstick/emergency(src)
/obj/item/storage/box/survival_mining
- icon_state = "box_min"
+ icon_state = "min_box"
/obj/item/storage/box/survival_mining/populate_contents()
new /obj/item/clothing/mask/gas/explorer(src)
@@ -85,7 +89,7 @@
new /obj/item/flashlight/flare/glowstick/emergency(src)
/obj/item/storage/box/survival_syndi
- icon_state = "box_syndi"
+ icon_state = "syndi_box"
/obj/item/storage/box/survival_syndi/populate_contents()
new /obj/item/clothing/mask/gas/syndicate(src)
@@ -95,6 +99,9 @@
new /obj/item/reagent_containers/pill/initropidril(src)
new /obj/item/flashlight/flare/glowstick/red(src)
+//////////////////
+/* Common Boxes */
+//////////////////
/obj/item/storage/box/gloves
name = "box of latex gloves"
desc = "Contains white gloves."
@@ -255,107 +262,588 @@
for(var/I in 1 to 5)
new /obj/item/grenade/empgrenade(src)
+/obj/item/storage/box/tapes
+ name = "Tape Box"
+ desc = "A box of spare recording tapes."
+ icon_state = "tape_box"
+
+/obj/item/storage/box/tapes/populate_contents()
+ for(var/I in 1 to 6)
+ new /obj/item/tape/random(src)
+
+/obj/item/storage/box/cups
+ name = "box of paper cups"
+ desc = "It has pictures of paper cups on the front."
+ icon_state = "cup_box"
+
+/obj/item/storage/box/cups/populate_contents()
+ for(var/I in 1 to 7)
+ new /obj/item/reagent_containers/food/drinks/sillycup(src)
+
+/obj/item/storage/box/drinkingglasses
+ name = "box of drinking glasses"
+ desc = "It has a picture of drinking glasses on it."
+
+/obj/item/storage/box/drinkingglasses/populate_contents()
+ for(var/I in 1 to 6)
+ new /obj/item/reagent_containers/food/drinks/drinkingglass(src)
+
+/obj/item/storage/box/condimentbottles
+ name = "box of condiment bottles"
+ desc = "It has a large ketchup smear on it."
+
+/obj/item/storage/box/condimentbottles/populate_contents()
+ for(var/I in 1 to 6)
+ new /obj/item/reagent_containers/food/condiment(src)
+
+/obj/item/storage/box/mousetraps
+ name = "box of Pest-B-Gon mousetraps"
+ desc = "WARNING: Keep out of reach of children."
+ icon_state = "mousetraps_box"
+
+/obj/item/storage/box/mousetraps/populate_contents()
+ for(var/I in 1 to 6)
+ new /obj/item/assembly/mousetrap(src)
+
+/obj/item/storage/box/ids
+ name = "spare IDs"
+ desc = "Has so many empty IDs."
+ icon_state = "id_box"
+
+/obj/item/storage/box/ids/populate_contents()
+ for(var/I in 1 to 7)
+ new /obj/item/card/id(src)
+
+/obj/item/storage/box/lights
+ name = "replacement bulbs"
+ desc = "This box is shaped on the inside so that only light tubes and bulbs fit."
+ icon_state = "light_box"
+ storage_slots = 21
+ can_hold = list(/obj/item/light/tube, /obj/item/light/bulb)
+ max_combined_w_class = 21
+ use_to_pickup = TRUE // for picking up broken bulbs, not that most people will try
+
+/obj/item/storage/box/lights/bulbs/populate_contents()
+ for(var/I in 1 to storage_slots)
+ new /obj/item/light/bulb(src)
+
+/obj/item/storage/box/lights/tubes
+ name = "replacement tubes"
+ icon_state = "light_tube_box"
+
+/obj/item/storage/box/lights/tubes/populate_contents()
+ for(var/I in 1 to storage_slots)
+ new /obj/item/light/tube(src)
+
+/obj/item/storage/box/lights/mixed
+ name = "replacement lights"
+ icon_state = "light_mixed_box"
+
+/obj/item/storage/box/lights/mixed/populate_contents()
+ for(var/I in 1 to 14)
+ new /obj/item/light/tube(src)
+ for(var/I in 1 to 7)
+ new /obj/item/light/bulb(src)
+
+/obj/item/storage/box/disks_plantgene
+ name = "plant data disks box"
+ icon_state = "disk_box"
+
+/obj/item/storage/box/disks_plantgene/populate_contents()
+ for(var/i in 1 to 7)
+ new /obj/item/disk/plantgene(src)
+
+/obj/item/storage/box/disks
+ name = "genetics diskette box"
+ icon_state = "disk_box"
+
+/obj/item/storage/box/disks/populate_contents()
+ for(var/i in 1 to 7)
+ new /obj/item/disk/data(src)
+
+/obj/item/storage/box/PDAs
+ name = "spare PDAs"
+ desc = "A box of spare PDA microcomputers."
+ icon_state = "pda_box"
+
+/obj/item/storage/box/PDAs/populate_contents()
+ var/newcart = pick(
+ /obj/item/cartridge/engineering,
+ /obj/item/cartridge/security,
+ /obj/item/cartridge/medical,
+ /obj/item/cartridge/signal/toxins,
+ /obj/item/cartridge/cargo)
+
+ new /obj/item/pda(src)
+ new /obj/item/pda(src)
+ new /obj/item/pda(src)
+ new /obj/item/pda(src)
+ new /obj/item/cartridge/head(src)
+ new newcart(src)
+
+///////////////////
+/* Special Boxes */
+///////////////////
+/obj/item/storage/box/bartender_rare_ingredients_kit
+ name = "bartender rare reagents kit"
+ desc = "A box intended for experienced bartenders."
+
+/obj/item/storage/box/bartender_rare_ingredients_kit/populate_contents()
+ var/list/reagent_list = list("sacid", "radium", "ether", "methamphetamine", "plasma", "gold", "silver", "capsaicin", "psilocybin")
+ for(var/reag in reagent_list)
+ var/obj/item/reagent_containers/glass/bottle/B = new(src)
+ B.reagents.add_reagent(reag, 30)
+ B.name = "[reag] bottle"
+
+/obj/item/storage/box/chef_rare_ingredients_kit
+ name = "chef rare reagents kit"
+ desc = "A box intended for experienced chefs."
+
+/obj/item/storage/box/chef_rare_ingredients_kit/populate_contents()
+ new /obj/item/reagent_containers/food/condiment/soysauce(src)
+ new /obj/item/reagent_containers/food/condiment/enzyme(src)
+ new /obj/item/reagent_containers/food/condiment/pack/hotsauce(src)
+ new /obj/item/kitchen/knife/butcher(src)
+ var/list/reagent_list = list("msg", "triple_citrus", "salglu_solution", "nutriment", "gravy", "honey", "vitfro")
+ for(var/reag in reagent_list)
+ var/obj/item/reagent_containers/glass/bottle/B = new(src)
+ B.reagents.add_reagent(reag, 30)
+ B.name = "[reag] bottle"
+
+/obj/item/storage/box/botany_labelled_seeds
+ name = "botanist labelled random seeds kit"
+ desc = "A box intended for experienced botanists."
+
+/obj/item/storage/box/botany_labelled_seeds/populate_contents()
+ for(var/I in 1 to 7)
+ new /obj/item/seeds/random/labelled(src)
+
+/obj/item/storage/box/barber
+ name = "barber starter kit"
+ desc = "For all hairstyling needs."
+
+/obj/item/storage/box/barber/populate_contents()
+ new /obj/item/scissors/barber(src)
+ new /obj/item/hair_dye_bottle(src)
+ new /obj/item/reagent_containers/glass/bottle/reagent/hairgrownium(src)
+ new /obj/item/reagent_containers/glass/bottle/reagent/hair_dye(src)
+ new /obj/item/reagent_containers/glass/bottle/reagent(src)
+ new /obj/item/reagent_containers/dropper(src)
+ new /obj/item/clothing/mask/fakemoustache(src) //totally necessary for successful barbering -Fox
+
+/obj/item/storage/box/lip_stick
+ name = "lipstick kit"
+ desc = "For all your lip coloring needs."
+
+/obj/item/storage/box/lip_stick/populate_contents()
+ new /obj/item/lipstick(src)
+ new /obj/item/lipstick/purple(src)
+ new /obj/item/lipstick/jade(src)
+ new /obj/item/lipstick/black(src)
+ new /obj/item/lipstick/green(src)
+ new /obj/item/lipstick/blue(src)
+ new /obj/item/lipstick/white(src)
+
+/obj/item/storage/box/characters
+ name = "box of miniatures"
+ desc = "The nerd's best friends."
+ icon_state = "toy_box"
+
+/obj/item/storage/box/characters/populate_contents()
+ new /obj/item/toy/character/alien(src)
+ new /obj/item/toy/character/cleric(src)
+ new /obj/item/toy/character/warrior(src)
+ new /obj/item/toy/character/thief(src)
+ new /obj/item/toy/character/wizard(src)
+ new /obj/item/toy/character/cthulhu(src)
+ new /obj/item/toy/character/lich(src)
+
+//////////////////
+/* Monkey Boxes */
+//////////////////
+/obj/item/storage/box/monkeycubes
+ name = "monkey cube box"
+ desc = "Drymate brand monkey cubes. Just add water!"
+ icon_state = "monkey_box"
+ storage_slots = 7
+ can_hold = list(/obj/item/reagent_containers/food/snacks/monkeycube)
+ var/monkey_cube_type = /obj/item/reagent_containers/food/snacks/monkeycube
+
+/obj/item/storage/box/monkeycubes/populate_contents()
+ for(var/I in 1 to 5)
+ new monkey_cube_type(src)
+
+/obj/item/storage/box/monkeycubes/syndicate
+ desc = "Waffle Co. brand monkey cubes. Just add water and a dash of subterfuge!"
+ monkey_cube_type = /obj/item/reagent_containers/food/snacks/monkeycube/syndicate
+
+/obj/item/storage/box/monkeycubes/farwacubes
+ name = "farwa cube box"
+ desc = "Drymate brand farwa cubes. Just add water!"
+ icon_state = "farwa_box"
+ monkey_cube_type = /obj/item/reagent_containers/food/snacks/monkeycube/farwacube
+
+/obj/item/storage/box/monkeycubes/stokcubes
+ name = "stok cube box"
+ desc = "Drymate brand stok cubes. Just add water!"
+ icon_state = "stok_box"
+ monkey_cube_type = /obj/item/reagent_containers/food/snacks/monkeycube/stokcube
+
+/obj/item/storage/box/monkeycubes/neaeracubes
+ name = "neaera cube box"
+ desc = "Drymate brand neaera cubes. Just add water!"
+ icon_state = "neaera_box"
+ monkey_cube_type = /obj/item/reagent_containers/food/snacks/monkeycube/neaeracube
+
+/obj/item/storage/box/monkeycubes/wolpincubes
+ name = "wolpin cube box"
+ desc = "Drymate brand wolpin cubes. Just add water!"
+ icon_state = "wolpin_box"
+ monkey_cube_type = /obj/item/reagent_containers/food/snacks/monkeycube/wolpincube
+
+///////////////////
+/* Medical Boxes */
+///////////////////
+/obj/item/storage/box/gloves
+ name = "box of latex gloves"
+ desc = "Contains white gloves."
+ icon_state = "latex_box"
+
+/obj/item/storage/box/gloves/populate_contents()
+ for(var/I in 1 to 7)
+ new /obj/item/clothing/gloves/color/latex(src)
+
+/obj/item/storage/box/masks
+ name = "sterile masks"
+ desc = "This box contains masks of sterility."
+ icon_state = "mask_box"
+
+/obj/item/storage/box/masks/populate_contents()
+ for(var/I in 1 to 7)
+ new /obj/item/clothing/mask/surgical(src)
+
+/obj/item/storage/box/syringes
+ name = "syringes"
+ desc = "A box full of syringes."
+ icon_state = "syringe_box"
+
+/obj/item/storage/box/syringes/populate_contents()
+ for(var/I in 1 to 7)
+ new /obj/item/reagent_containers/syringe(src)
+
+/obj/item/storage/box/beakers
+ name = "beaker box"
+ icon_state = "beaker_box"
+
+/obj/item/storage/box/beakers/populate_contents()
+ for(var/I in 1 to 7)
+ new /obj/item/reagent_containers/glass/beaker(src)
+
+/obj/item/storage/box/beakers/bluespace
+ name = "box of bluespace beakers"
+ icon_state = "beaker_bs_box"
+
+/obj/item/storage/box/beakers/bluespace/populate_contents()
+ for(var/I in 1 to 7)
+ new /obj/item/reagent_containers/glass/beaker/bluespace(src)
+
+/obj/item/storage/box/iv_bags
+ name = "IV Bags"
+ desc = "A box full of empty IV bags."
+ icon_state = "iv_box"
+/obj/item/storage/box/iv_bags/populate_contents()
+ for(var/I in 1 to 7)
+ new /obj/item/reagent_containers/iv_bag(src)
+
+/obj/item/storage/box/autoinjectors
+ name = "box of injectors"
+ desc = "Contains autoinjectors."
+ icon_state = "injector_box"
+
+/obj/item/storage/box/autoinjectors/populate_contents()
+ for(var/I in 1 to storage_slots)
+ new /obj/item/reagent_containers/hypospray/autoinjector/epinephrine(src)
+
+/obj/item/storage/box/autoinjectors/utility
+ name = "autoinjector kit"
+ desc = "A box with several utility autoinjectors for the economical miner."
+
+/obj/item/storage/box/autoinjectors/utility/populate_contents()
+ new /obj/item/reagent_containers/hypospray/autoinjector/teporone(src)
+ new /obj/item/reagent_containers/hypospray/autoinjector/teporone(src)
+ new /obj/item/reagent_containers/hypospray/autoinjector/stimpack(src)
+ new /obj/item/reagent_containers/hypospray/autoinjector/stimpack(src)
+ new /obj/item/reagent_containers/hypospray/autoinjector/stimpack(src)
+
+/obj/item/storage/box/pillbottles
+ name = "box of pill bottles"
+ desc = "It has pictures of pill bottles on its front."
+ icon_state = "pillbox_box"
+
+/obj/item/storage/box/pillbottles/populate_contents()
+ for(var/I in 1 to 7)
+ new /obj/item/storage/pill_bottle(src)
+
+/obj/item/storage/box/patch_packs
+ name = "box of patch packs"
+ desc = "It has pictures of patch packs on its front."
+ icon_state = "patch_box"
+
+/obj/item/storage/box/patch_packs/populate_contents()
+ for(var/I in 1 to 7)
+ new /obj/item/storage/pill_bottle/patch_pack(src)
+
+/obj/item/storage/box/bodybags
+ name = "body bags"
+ desc = "This box contains body bags."
+ icon_state = "bodybags_box"
+
+/obj/item/storage/box/bodybags/populate_contents()
+ for(var/I in 1 to 7)
+ new /obj/item/bodybag(src)
+
+/obj/item/storage/box/rxglasses
+ name = "prescription glasses"
+ desc = "This box contains nerd glasses."
+ icon_state = "glasses_box"
+
+/obj/item/storage/box/rxglasses/populate_contents()
+ for(var/I in 1 to 7)
+ new /obj/item/clothing/glasses/regular(src)
+
+////////////////////
+/* Security Boxes */
+////////////////////
+/obj/item/storage/box/flashbangs
+ name = "box of flashbangs (WARNING)"
+ desc = "WARNING: These devices are extremely dangerous and can cause blindness or deafness in repeated use."
+ icon_state = "flashbang_box"
+
+/obj/item/storage/box/flashbangs/populate_contents()
+ for(var/I in 1 to 7)
+ new /obj/item/grenade/flashbang(src)
+
+/obj/item/storage/box/flashes
+ name = "box of flashbulbs"
+ desc = "WARNING: Flashes can cause serious eye damage, protective eyewear is required."
+ icon_state = "flash_box"
+
+/obj/item/storage/box/flashes/populate_contents()
+ for(var/I in 1 to 6)
+ new /obj/item/flash(src)
+
+/obj/item/storage/box/teargas
+ name = "box of tear gas grenades (WARNING)"
+ desc = "WARNING: These devices are extremely dangerous and can cause blindness and skin irritation."
+ icon_state = "teargas_box"
+
+/obj/item/storage/box/teargas/populate_contents()
+ for(var/I in 1 to 7)
+ new /obj/item/grenade/chem_grenade/teargas(src)
+
+/obj/item/storage/box/emps
+ name = "emp grenades"
+ desc = "A box with 5 emp grenades."
+ icon_state = "emp_box"
+
+/obj/item/storage/box/emps/populate_contents()
+ for(var/I in 1 to 5)
+ new /obj/item/grenade/empgrenade(src)
+
+/obj/item/storage/box/prisoner
+ name = "prisoner IDs"
+ desc = "Take away their last shred of dignity, their name."
+ icon_state = "id_prisoner_box"
+
+/obj/item/storage/box/prisoner/populate_contents()
+ new /obj/item/card/id/prisoner/one(src)
+ new /obj/item/card/id/prisoner/two(src)
+ new /obj/item/card/id/prisoner/three(src)
+ new /obj/item/card/id/prisoner/four(src)
+ new /obj/item/card/id/prisoner/five(src)
+ new /obj/item/card/id/prisoner/six(src)
+ new /obj/item/card/id/prisoner/seven(src)
+
+/obj/item/storage/box/seccarts
+ name = "spare R.O.B.U.S.T. Cartridges"
+ desc = "A box full of R.O.B.U.S.T. Cartridges, used by Security."
+ icon_state = "pda_box"
+
+/obj/item/storage/box/seccarts/populate_contents()
+ for(var/I in 1 to 7)
+ new /obj/item/cartridge/security(src)
+
+/obj/item/storage/box/holobadge
+ name = "holobadge box"
+ desc = "A box claiming to contain holobadges."
+ icon_state = "badge_box"
+
+/obj/item/storage/box/holobadge/populate_contents()
+ new /obj/item/clothing/accessory/holobadge(src)
+ new /obj/item/clothing/accessory/holobadge(src)
+ new /obj/item/clothing/accessory/holobadge(src)
+ new /obj/item/clothing/accessory/holobadge(src)
+ new /obj/item/clothing/accessory/holobadge/cord(src)
+ new /obj/item/clothing/accessory/holobadge/cord(src)
+
+/obj/item/storage/box/evidence
+ name = "evidence bag box"
+ desc = "A box claiming to contain evidence bags."
+ icon_state = "evidence_box"
+
+/obj/item/storage/box/evidence/populate_contents()
+ for(var/I in 1 to 6)
+ new /obj/item/evidencebag(src)
+
+/obj/item/storage/box/handcuffs
+ name = "spare handcuffs"
+ desc = "A box full of handcuffs."
+ icon_state = "handcuff_box"
+
+/obj/item/storage/box/handcuffs/populate_contents()
+ for(var/I in 1 to 7)
+ new /obj/item/restraints/handcuffs(src)
+
+/obj/item/storage/box/zipties
+ name = "box of spare zipties"
+ desc = "A box full of zipties."
+ icon_state = "zipties_box"
+
+/obj/item/storage/box/zipties/populate_contents()
+ for(var/I in 1 to 7)
+ new /obj/item/restraints/handcuffs/cable/zipties(src)
+
+////////////////////
+/* Implants Boxes */
+////////////////////
/obj/item/storage/box/trackimp
name = "tracking bio-chip kit"
desc = "Box full of scum-bag tracking utensils."
- icon_state = "implant"
+ icon_state = "implant_box"
/obj/item/storage/box/trackimp/populate_contents()
- new /obj/item/implantcase/tracking(src)
- new /obj/item/implantcase/tracking(src)
- new /obj/item/implantcase/tracking(src)
- new /obj/item/implantcase/tracking(src)
- new /obj/item/implanter(src)
- new /obj/item/implantpad(src)
+ new /obj/item/bio_chip_case/tracking(src)
+ new /obj/item/bio_chip_case/tracking(src)
+ new /obj/item/bio_chip_case/tracking(src)
+ new /obj/item/bio_chip_case/tracking(src)
+ new /obj/item/bio_chip_implanter(src)
+ new /obj/item/bio_chip_pad(src)
new /obj/item/gps/security(src)
/obj/item/storage/box/minertracker
name = "boxed tracking bio-chip kit"
desc = "For finding those who have died on the accursed lavaworld."
- icon_state = "implant"
+ icon_state = "implant_box"
/obj/item/storage/box/minertracker/populate_contents()
- new /obj/item/implantcase/tracking(src)
- new /obj/item/implantcase/tracking(src)
- new /obj/item/implantcase/tracking(src)
- new /obj/item/implanter(src)
- new /obj/item/implantpad(src)
+ new /obj/item/bio_chip_case/tracking(src)
+ new /obj/item/bio_chip_case/tracking(src)
+ new /obj/item/bio_chip_case/tracking(src)
+ new /obj/item/bio_chip_implanter(src)
+ new /obj/item/bio_chip_pad(src)
new /obj/item/gps/mining(src)
/obj/item/storage/box/chemimp
name = "chemical bio-chip kit"
desc = "Box of stuff used to bio-chip chemicals."
- icon_state = "implant"
+ icon_state = "implant_box"
/obj/item/storage/box/chemimp/populate_contents()
for(var/I in 1 to 5)
- new /obj/item/implantcase/chem(src)
- new /obj/item/implanter(src)
- new /obj/item/implantpad(src)
+ new /obj/item/bio_chip_case/chem(src)
+ new /obj/item/bio_chip_implanter(src)
+ new /obj/item/bio_chip_pad(src)
/obj/item/storage/box/deathimp
name = "death alarm bio-chip kit"
desc = "Box of life sign monitoring bio-chips."
- icon_state = "implant"
+ icon_state = "implant_box"
/obj/item/storage/box/deathimp/populate_contents()
for(var/I in 1 to 6)
- new /obj/item/implantcase/death_alarm(src)
- new /obj/item/implanter/death_alarm (src)
+ new /obj/item/bio_chip_case/death_alarm(src)
+ new /obj/item/bio_chip_implanter/death_alarm (src)
-/obj/item/storage/box/tapes
- name = "Tape Box"
- desc = "A box of spare recording tapes"
- icon_state = "box"
+////////////////
+/* Ammo Boxes */
+////////////////
+/obj/item/storage/box/slug
+ name = "ammunition box (Slug)"
+ desc = "A small box capable of holding seven shotgun shells."
+ icon_state = "slug_box"
-/obj/item/storage/box/tapes/populate_contents()
- for(var/I in 1 to 6)
- new /obj/item/tape/random(src)
+/obj/item/storage/box/slug/populate_contents()
+ for(var/I in 1 to 7)
+ new /obj/item/ammo_casing/shotgun(src)
-/obj/item/storage/box/rxglasses
- name = "prescription glasses"
- desc = "This box contains nerd glasses."
- icon_state = "glasses"
+/obj/item/storage/box/buck
+ name = "ammunition box (Buckshot)"
+ desc = "A small box capable of holding seven shotgun shells."
+ icon_state = "buckshot_box"
-/obj/item/storage/box/rxglasses/populate_contents()
+/obj/item/storage/box/buck/populate_contents()
for(var/I in 1 to 7)
- new /obj/item/clothing/glasses/regular(src)
+ new /obj/item/ammo_casing/shotgun/buckshot(src)
-/obj/item/storage/box/drinkingglasses
- name = "box of drinking glasses"
- desc = "It has a picture of drinking glasses on it."
+/obj/item/storage/box/dragonsbreath
+ name = "ammunition box (Dragonsbreath)"
+ desc = "A small box capable of holding seven shotgun shells."
+ icon_state = "dragonsbreath_box"
-/obj/item/storage/box/drinkingglasses/populate_contents()
- for(var/I in 1 to 6)
- new /obj/item/reagent_containers/food/drinks/drinkingglass(src)
+/obj/item/storage/box/dragonsbreath/populate_contents()
+ for(var/I in 1 to 7)
+ new /obj/item/ammo_casing/shotgun/incendiary/dragonsbreath(src)
-/obj/item/storage/box/condimentbottles
- name = "box of condiment bottles"
- desc = "It has a large ketchup smear on it."
+/obj/item/storage/box/stun
+ name = "ammunition box (Stun shells)"
+ desc = "A small box capable of holding seven shotgun shells."
+ icon_state = "stun_box"
-/obj/item/storage/box/condimentbottles/populate_contents()
- for(var/I in 1 to 6)
- new /obj/item/reagent_containers/food/condiment(src)
+/obj/item/storage/box/stun/populate_contents()
+ for(var/I in 1 to 7)
+ new /obj/item/ammo_casing/shotgun/stunslug(src)
-/obj/item/storage/box/cups
- name = "box of paper cups"
- desc = "It has pictures of paper cups on the front."
+/obj/item/storage/box/beanbag
+ name = "ammunition box (Beanbag shells)"
+ desc = "A small box capable of holding seven shotgun shells."
+ icon_state = "beanbag_box"
+
+/obj/item/storage/box/beanbag/populate_contents()
+ for(var/I in 1 to 7)
+ new /obj/item/ammo_casing/shotgun/beanbag(src)
+
+/obj/item/storage/box/rubbershot
+ name = "ammunition box (Rubbershot shells)"
+ desc = "A small box capable of holding seven shotgun shells."
+ icon_state = "rubbershot_box"
+
+/obj/item/storage/box/rubbershot/populate_contents()
+ for(var/I in 1 to 7)
+ new /obj/item/ammo_casing/shotgun/rubbershot(src)
+
+/obj/item/storage/box/tranquilizer
+ name = "ammunition box (Tranquilizer darts)"
+ desc = "A small box capable of holding seven shotgun shells."
+ icon_state = "tranq_box"
-/obj/item/storage/box/cups/populate_contents()
+/obj/item/storage/box/tranquilizer/populate_contents()
for(var/I in 1 to 7)
- new /obj/item/reagent_containers/food/drinks/sillycup(src)
+ new /obj/item/ammo_casing/shotgun/tranquilizer(src)
+////////////////
+/* Donk Boxes */
+////////////////
/obj/item/storage/box/donkpockets
name = "box of donk-pockets"
desc = "A heavy, insulated box that reads, Instructions: Heat in microwave. Product will cool if not eaten within seven minutes. Store product in box to keep warm."
+ icon_state = "donk_box"
storage_slots = 6
can_hold = list(
/obj/item/reagent_containers/food/snacks/donkpocket,
/obj/item/reagent_containers/food/snacks/warmdonkpocket,
/obj/item/reagent_containers/food/snacks/warmdonkpocket_weak,
/obj/item/reagent_containers/food/snacks/syndidonkpocket)
- icon_state = "donk_kit"
/obj/item/storage/box/donkpockets/populate_contents()
for(var/I in 1 to 6)
@@ -367,135 +855,28 @@
/obj/item/storage/box/syndidonkpockets
name = "box of donk-pockets"
desc = "This box feels slightly warm"
- icon_state = "donk_kit_synd"
+ icon_state = "donk_box"
/obj/item/storage/box/syndidonkpockets/populate_contents()
for(var/I in 1 to 6)
new /obj/item/reagent_containers/food/snacks/syndidonkpocket(src)
-/obj/item/storage/box/monkeycubes
- name = "monkey cube box"
- desc = "Drymate brand monkey cubes. Just add water!"
- icon = 'icons/obj/food/food.dmi'
- icon_state = "monkeycubebox"
- storage_slots = 7
- can_hold = list(/obj/item/reagent_containers/food/snacks/monkeycube)
- var/monkey_cube_type = /obj/item/reagent_containers/food/snacks/monkeycube
-
-/obj/item/storage/box/monkeycubes/populate_contents()
- for(var/I in 1 to 5)
- new monkey_cube_type(src)
-
-/obj/item/storage/box/monkeycubes/syndicate
- desc = "Waffle Co. brand monkey cubes. Just add water and a dash of subterfuge!"
- monkey_cube_type = /obj/item/reagent_containers/food/snacks/monkeycube/syndicate
-
-/obj/item/storage/box/monkeycubes/farwacubes
- name = "farwa cube box"
- desc = "Drymate brand farwa cubes. Just add water!"
- monkey_cube_type = /obj/item/reagent_containers/food/snacks/monkeycube/farwacube
-
-/obj/item/storage/box/monkeycubes/stokcubes
- name = "stok cube box"
- desc = "Drymate brand stok cubes. Just add water!"
- monkey_cube_type = /obj/item/reagent_containers/food/snacks/monkeycube/stokcube
-
-/obj/item/storage/box/monkeycubes/neaeracubes
- name = "neaera cube box"
- desc = "Drymate brand neaera cubes. Just add water!"
- monkey_cube_type = /obj/item/reagent_containers/food/snacks/monkeycube/neaeracube
-
-/obj/item/storage/box/monkeycubes/wolpincubes
- name = "wolpin cube box"
- desc = "Drymate brand wolpin cubes. Just add water!"
- monkey_cube_type = /obj/item/reagent_containers/food/snacks/monkeycube/wolpincube
-
+////////////////
+/* Misc Boxes */
+////////////////
/obj/item/storage/box/permits
name = "box of construction permits"
desc = "A box for containing construction permits, used to officially declare built rooms as additions to the station."
- icon_state = "id"
+ icon_state = "id_box"
/obj/item/storage/box/permits/populate_contents()
for(var/I in 1 to 7)
new /obj/item/areaeditor/permit(src)
-
-/obj/item/storage/box/ids
- name = "spare IDs"
- desc = "Has so many empty IDs."
- icon_state = "id"
-
-/obj/item/storage/box/ids/populate_contents()
- for(var/I in 1 to 7)
- new /obj/item/card/id(src)
-
-/obj/item/storage/box/prisoner
- name = "prisoner IDs"
- desc = "Take away their last shred of dignity, their name."
- icon_state = "id"
-
-/obj/item/storage/box/prisoner/populate_contents()
- new /obj/item/card/id/prisoner/one(src)
- new /obj/item/card/id/prisoner/two(src)
- new /obj/item/card/id/prisoner/three(src)
- new /obj/item/card/id/prisoner/four(src)
- new /obj/item/card/id/prisoner/five(src)
- new /obj/item/card/id/prisoner/six(src)
- new /obj/item/card/id/prisoner/seven(src)
-
-/obj/item/storage/box/seccarts
- name = "spare R.O.B.U.S.T. Cartridges"
- desc = "A box full of R.O.B.U.S.T. Cartridges, used by Security."
- icon_state = "pda"
-
-/obj/item/storage/box/seccarts/populate_contents()
- for(var/I in 1 to 7)
- new /obj/item/cartridge/security(src)
-
-/obj/item/storage/box/holobadge
- name = "holobadge box"
- icon_state = "box_badge"
- desc = "A box claiming to contain holobadges."
-
-/obj/item/storage/box/holobadge/populate_contents()
- new /obj/item/clothing/accessory/holobadge(src)
- new /obj/item/clothing/accessory/holobadge(src)
- new /obj/item/clothing/accessory/holobadge(src)
- new /obj/item/clothing/accessory/holobadge(src)
- new /obj/item/clothing/accessory/holobadge/cord(src)
- new /obj/item/clothing/accessory/holobadge/cord(src)
-
-/obj/item/storage/box/evidence
- name = "evidence bag box"
- desc = "A box claiming to contain evidence bags."
- icon_state = "box_evidence"
-
-/obj/item/storage/box/evidence/populate_contents()
- for(var/I in 1 to 6)
- new /obj/item/evidencebag(src)
-
-/obj/item/storage/box/handcuffs
- name = "spare handcuffs"
- desc = "A box full of handcuffs."
- icon_state = "handcuff"
-
-/obj/item/storage/box/handcuffs/populate_contents()
- for(var/I in 1 to 7)
- new /obj/item/restraints/handcuffs(src)
-
-/obj/item/storage/box/zipties
- name = "box of spare zipties"
- desc = "A box full of zipties."
- icon_state = "handcuff"
-
-/obj/item/storage/box/zipties/populate_contents()
- for(var/I in 1 to 7)
- new /obj/item/restraints/handcuffs/cable/zipties(src)
-
/obj/item/storage/box/alienhandcuffs
name = "box of spare handcuffs"
desc = "A box full of handcuffs."
- icon_state = "alienboxCuffs"
+ icon_state = "alien_handcuff_box"
/obj/item/storage/box/alienhandcuffs/populate_contents()
for(var/I in 1 to 7)
@@ -504,7 +885,7 @@
/obj/item/storage/box/fakesyndiesuit
name = "boxed space suit and helmet"
desc = "A sleek, sturdy box used to hold replica spacesuits."
- icon_state = "box_of_doom"
+ icon_state = "doom_box"
/obj/item/storage/box/fakesyndiesuit/populate_contents()
new /obj/item/clothing/head/syndicatefake(src)
@@ -513,7 +894,7 @@
/obj/item/storage/box/enforcer_rubber
name = "\improper Enforcer pistol kit (rubber)"
desc = "A box marked with pictures of an Enforcer pistol, two ammo clips, and the word 'NON-LETHAL'."
- icon_state = "box_ert"
+ icon_state = "ert_box"
/obj/item/storage/box/enforcer_rubber/populate_contents()
new /obj/item/gun/projectile/automatic/pistol/enforcer(src) // loaded with rubber by default
@@ -523,94 +904,26 @@
/obj/item/storage/box/enforcer_lethal
name = "\improper Enforcer pistol kit (lethal)"
desc = "A box marked with pictures of an Enforcer pistol, two ammo clips, and the word 'LETHAL'."
- icon_state = "box_ert"
+ icon_state = "ert_box"
/obj/item/storage/box/enforcer_lethal/populate_contents()
new /obj/item/gun/projectile/automatic/pistol/enforcer/lethal(src)
new /obj/item/ammo_box/magazine/enforcer/lethal(src)
new /obj/item/ammo_box/magazine/enforcer/lethal(src)
-/obj/item/storage/box/bartender_rare_ingredients_kit
- name = "bartender rare reagents kit"
- desc = "A box intended for experienced bartenders."
-
-/obj/item/storage/box/bartender_rare_ingredients_kit/populate_contents()
- var/list/reagent_list = list("sacid", "radium", "ether", "methamphetamine", "plasma", "gold", "silver", "capsaicin", "psilocybin")
- for(var/reag in reagent_list)
- var/obj/item/reagent_containers/glass/bottle/B = new(src)
- B.reagents.add_reagent(reag, 30)
- B.name = "[reag] bottle"
-
-/obj/item/storage/box/chef_rare_ingredients_kit
- name = "chef rare reagents kit"
- desc = "A box intended for experienced chefs."
-
-/obj/item/storage/box/chef_rare_ingredients_kit/populate_contents()
- new /obj/item/reagent_containers/food/condiment/soysauce(src)
- new /obj/item/reagent_containers/food/condiment/enzyme(src)
- new /obj/item/reagent_containers/food/condiment/pack/hotsauce(src)
- new /obj/item/kitchen/knife/butcher(src)
- var/list/reagent_list = list("msg", "triple_citrus", "salglu_solution", "nutriment", "gravy", "honey", "vitfro")
- for(var/reag in reagent_list)
- var/obj/item/reagent_containers/glass/bottle/B = new(src)
- B.reagents.add_reagent(reag, 30)
- B.name = "[reag] bottle"
-
-/obj/item/storage/box/botany_labelled_seeds
- name = "botanist labelled random seeds kit"
- desc = "A box intended for experienced botanists."
-
-/obj/item/storage/box/botany_labelled_seeds/populate_contents()
- for(var/I in 1 to 7)
- new /obj/item/seeds/random/labelled(src)
-
/obj/item/storage/box/telescience
name = "babies first telescience kit"
desc = "A now restricted kit for those who want to learn about telescience!"
+ icon_state = "circuit_box"
/obj/item/storage/box/telescience/populate_contents()
new /obj/item/circuitboard/telesci_pad(src)
new /obj/item/circuitboard/telesci_console(src)
-/obj/item/storage/box/mousetraps
- name = "box of Pest-B-Gon mousetraps"
- desc = "WARNING: Keep out of reach of children."
- icon_state = "mousetraps"
-
-/obj/item/storage/box/mousetraps/populate_contents()
- for(var/I in 1 to 6)
- new /obj/item/assembly/mousetrap(src)
-
-/obj/item/storage/box/pillbottles
- name = "box of pill bottles"
- desc = "It has pictures of pill bottles on its front."
-
-/obj/item/storage/box/pillbottles/populate_contents()
- for(var/I in 1 to 7)
- new /obj/item/storage/pill_bottle(src)
-
-/obj/item/storage/box/patch_packs
- name = "box of patch packs"
- desc = "It has pictures of patch packs on its front."
-
-/obj/item/storage/box/patch_packs/populate_contents()
- for(var/I in 1 to 7)
- new /obj/item/storage/pill_bottle/patch_pack(src)
-
-/obj/item/storage/box/bodybags
- name = "body bags"
- desc = "This box contains body bags."
- icon_state = "bodybags"
-
-/obj/item/storage/box/bodybags/populate_contents()
- for(var/I in 1 to 7)
- new /obj/item/bodybag(src)
-
/obj/item/storage/box/snappops
name = "snap pop box"
desc = "Eight wrappers of fun! Ages 8 and up. Not suitable for children."
- icon = 'icons/obj/toy.dmi'
- icon_state = "spbox"
+ icon_state = "toy_box"
storage_slots = 8
can_hold = list(/obj/item/toy/snappop)
@@ -618,124 +931,15 @@
for(var/I in 1 to storage_slots)
new /obj/item/toy/snappop(src)
-/obj/item/storage/box/matches
- name = "matchbox"
- desc = "A small box of Almost But Not Quite Plasma Premium Matches."
- icon = 'icons/obj/cigarettes.dmi'
- icon_state = "matchbox"
- item_state = "matchbox"
- base_icon_state = "matchbox"
- storage_slots = 10
- w_class = WEIGHT_CLASS_TINY
- max_w_class = WEIGHT_CLASS_TINY
- slot_flags = SLOT_FLAG_BELT
- drop_sound = 'sound/items/handling/matchbox_drop.ogg'
- pickup_sound = 'sound/items/handling/matchbox_pickup.ogg'
- can_hold = list(/obj/item/match)
-
-/obj/item/storage/box/matches/populate_contents()
- for(var/I in 1 to storage_slots)
- new /obj/item/match(src)
-
-/obj/item/storage/box/matches/attackby(obj/item/match/W, mob/user, params)
- if(istype(W, /obj/item/match) && !W.lit)
- W.matchignite()
- playsound(user.loc, 'sound/goonstation/misc/matchstick_light.ogg', 50, 1)
- return
-
-/obj/item/storage/box/matches/update_icon_state()
- . = ..()
- switch(length(contents))
- if(10)
- icon_state = base_icon_state
- if(5 to 9)
- icon_state = "[base_icon_state]_almostfull"
- if(1 to 4)
- icon_state = "[base_icon_state]_almostempty"
- if(0)
- icon_state = "[base_icon_state]_e"
-
-/obj/item/storage/box/autoinjectors
- name = "box of injectors"
- desc = "Contains autoinjectors."
- icon_state = "syringe"
-
-/obj/item/storage/box/autoinjectors/populate_contents()
- for(var/I in 1 to storage_slots)
- new /obj/item/reagent_containers/hypospray/autoinjector/epinephrine(src)
-
-/obj/item/storage/box/autoinjector/utility
- name = "autoinjector kit"
- desc = "A box with several utility autoinjectors for the economical miner."
- icon_state = "syringe"
-
-/obj/item/storage/box/autoinjector/utility/populate_contents()
- new /obj/item/reagent_containers/hypospray/autoinjector/teporone(src)
- new /obj/item/reagent_containers/hypospray/autoinjector/teporone(src)
- new /obj/item/reagent_containers/hypospray/autoinjector/stimpack(src)
- new /obj/item/reagent_containers/hypospray/autoinjector/stimpack(src)
- new /obj/item/reagent_containers/hypospray/autoinjector/stimpack(src)
-
-/obj/item/storage/box/lights
- name = "replacement bulbs"
- icon = 'icons/obj/storage.dmi'
- icon_state = "light"
- desc = "This box is shaped on the inside so that only light tubes and bulbs fit."
- item_state = "syringe_kit"
- storage_slots = 21
- can_hold = list(/obj/item/light/tube, /obj/item/light/bulb)
- max_combined_w_class = 21
- use_to_pickup = 1 // for picking up broken bulbs, not that most people will try
-
-/obj/item/storage/box/lights/bulbs/populate_contents()
- for(var/I in 1 to storage_slots)
- new /obj/item/light/bulb(src)
-
-/obj/item/storage/box/lights/tubes
- name = "replacement tubes"
- icon_state = "lighttube"
-
-/obj/item/storage/box/lights/tubes/populate_contents()
- for(var/I in 1 to storage_slots)
- new /obj/item/light/tube(src)
-
-/obj/item/storage/box/lights/mixed
- name = "replacement lights"
- icon_state = "lightmixed"
-
-/obj/item/storage/box/lights/mixed/populate_contents()
- for(var/I in 1 to 14)
- new /obj/item/light/tube(src)
- for(var/I in 1 to 7)
- new /obj/item/light/bulb(src)
-
-/obj/item/storage/box/barber
- name = "Barber Starter Kit"
- desc = "For all hairstyling needs."
- icon_state = "implant"
-
-/obj/item/storage/box/barber/populate_contents()
- new /obj/item/scissors/barber(src)
- new /obj/item/hair_dye_bottle(src)
- new /obj/item/reagent_containers/glass/bottle/reagent/hairgrownium(src)
- new /obj/item/reagent_containers/glass/bottle/reagent/hair_dye(src)
- new /obj/item/reagent_containers/glass/bottle/reagent(src)
- new /obj/item/reagent_containers/dropper(src)
- new /obj/item/clothing/mask/fakemoustache(src) //totally necessary for successful barbering -Fox
+/obj/item/storage/box/injectors
+ name = "\improper DNA injectors"
+ desc = "This box contains injectors it seems."
+ icon_state = "injector_box"
-/obj/item/storage/box/lip_stick
- name = "Lipstick Kit"
- desc = "For all your lip coloring needs."
- icon_state = "implant"
+/obj/item/storage/box/injectors/populate_contents()
+ for(var/I in 1 to 6)
+ new /obj/item/dnainjector/h2m(src)
-/obj/item/storage/box/lip_stick/populate_contents()
- new /obj/item/lipstick(src)
- new /obj/item/lipstick/purple(src)
- new /obj/item/lipstick/jade(src)
- new /obj/item/lipstick/black(src)
- new /obj/item/lipstick/green(src)
- new /obj/item/lipstick/blue(src)
- new /obj/item/lipstick/white(src)
#define NODESIGN "None"
#define NANOTRASEN "NanotrasenStandard"
@@ -746,6 +950,7 @@
/obj/item/storage/box/papersack
name = "paper sack"
desc = "A sack neatly crafted out of paper."
+ icon = 'icons/obj/storage.dmi'
icon_state = "paperbag_None"
item_state = "paperbag_None"
resistance_flags = FLAMMABLE
@@ -809,7 +1014,7 @@
/obj/item/storage/box/centcomofficer
name = "officer kit"
- icon_state = "box_ert"
+ icon_state = "ert_box"
storage_slots = 14
max_combined_w_class = 20
@@ -821,7 +1026,7 @@
new /obj/item/radio/centcom(src)
new /obj/item/door_remote/omni(src)
- new /obj/item/implanter/death_alarm(src)
+ new /obj/item/bio_chip_implanter/death_alarm(src)
new /obj/item/reagent_containers/hypospray/combat/nanites(src)
new /obj/item/pinpointer(src)
@@ -829,7 +1034,7 @@
/obj/item/storage/box/responseteam
name = "boxed survival kit"
- icon_state = "box_ert"
+ icon_state = "ert_box"
storage_slots = 8
/obj/item/storage/box/responseteam/populate_contents()
@@ -844,7 +1049,7 @@
/obj/item/storage/box/deathsquad
name = "boxed death kit"
- icon_state = "box_of_doom"
+ icon_state = "doom_box"
/obj/item/storage/box/deathsquad/populate_contents()
new /obj/item/flashlight/flare(src)
@@ -858,7 +1063,7 @@
/obj/item/storage/box/soviet
name = "boxed survival kit"
desc = "A standard issue Soviet military survival kit."
- icon_state = "box_soviet"
+ icon_state = "soviet_box"
/obj/item/storage/box/soviet/populate_contents()
new /obj/item/clothing/mask/breath(src)
@@ -873,7 +1078,7 @@
/obj/item/storage/box/clown
name = "clown box"
desc = "A colorful cardboard box for the clown."
- icon_state = "box_clown"
+ icon_state = "clown_box"
var/robot_arm // This exists for bot construction
/obj/item/storage/box/emptysandbags
@@ -886,6 +1091,7 @@
/obj/item/storage/box/rndboards
name = "the Liberator's legacy"
desc = "A box containing a gift for worthy golems."
+ icon_state = "circuit_box"
/obj/item/storage/box/rndboards/populate_contents()
new /obj/item/circuitboard/protolathe(src)
@@ -923,7 +1129,7 @@
/obj/item/storage/box/hug
name = "box of hugs"
desc = "A special box for sensitive people."
- icon_state = "hugbox"
+ icon_state = "hug_box"
foldable = null
/obj/item/storage/box/hug/suicide_act(mob/user)
@@ -939,13 +1145,13 @@
/obj/item/storage/box/wizard
name = "magical box"
desc = "It's just an ordinary magical box."
- icon_state = "box_wizard"
+ icon_state = "wizard_box"
w_class = WEIGHT_CLASS_GIGANTIC
/obj/item/storage/box/wizard/hardsuit
name = "battlemage armour bundle"
desc = "This box contains a bundle of Battlemage Armour."
- icon_state = "box_wizard"
+ icon_state = "wizard_box"
/obj/item/storage/box/wizard/hardsuit/populate_contents()
new /obj/item/clothing/suit/space/hardsuit/shielded/wizard(src)
@@ -954,7 +1160,7 @@
/obj/item/storage/box/breaching
name = "breaching charges"
desc = "Contains three T4 thermal breaching charges."
- icon_state = "flashbang"
+ icon_state = "grenade_box"
/obj/item/storage/box/breaching/populate_contents()
for(var/I in 1 to 3)
@@ -963,11 +1169,12 @@
/obj/item/storage/box/mindshield
name = "boxed mindshield kit"
desc = "Contains everything needed to secure the minds of those around you."
+ icon_state = "implant_box"
/obj/item/storage/box/mindshield/populate_contents()
for(var/I in 1 to 3)
- new /obj/item/implantcase/mindshield(src)
- new /obj/item/implanter/mindshield(src)
+ new /obj/item/bio_chip_case/mindshield(src)
+ new /obj/item/bio_chip_implanter/mindshield(src)
/obj/item/storage/box/dish_drive
name = "DIY Dish Drive Kit"
diff --git a/code/game/objects/items/weapons/storage/fancy.dm b/code/game/objects/items/weapons/storage/fancy.dm
index 5b36a18beffe..95bdd28570bd 100644
--- a/code/game/objects/items/weapons/storage/fancy.dm
+++ b/code/game/objects/items/weapons/storage/fancy.dm
@@ -161,6 +161,47 @@
return
..()
+/*
+ * Matches Box
+ */
+
+/obj/item/storage/fancy/matches
+ name = "matchbox"
+ desc = "A small box of Almost But Not Quite Plasma Premium Matches."
+ icon = 'icons/obj/cigarettes.dmi'
+ icon_state = "matchbox"
+ item_state = "matchbox"
+ base_icon_state = "matchbox"
+ storage_slots = 10
+ w_class = WEIGHT_CLASS_TINY
+ max_w_class = WEIGHT_CLASS_TINY
+ slot_flags = SLOT_FLAG_BELT
+ drop_sound = 'sound/items/handling/matchbox_drop.ogg'
+ pickup_sound = 'sound/items/handling/matchbox_pickup.ogg'
+ can_hold = list(/obj/item/match)
+
+/obj/item/storage/fancy/matches/populate_contents()
+ for(var/I in 1 to storage_slots)
+ new /obj/item/match(src)
+
+/obj/item/storage/fancy/matches/attackby(obj/item/match/W, mob/user, params)
+ if(istype(W, /obj/item/match) && !W.lit)
+ W.matchignite()
+ playsound(user.loc, 'sound/goonstation/misc/matchstick_light.ogg', 50, TRUE)
+ return
+
+/obj/item/storage/fancy/matches/update_icon_state()
+ . = ..()
+ switch(length(contents))
+ if(10)
+ icon_state = base_icon_state
+ if(5 to 9)
+ icon_state = "[base_icon_state]_almostfull"
+ if(1 to 4)
+ icon_state = "[base_icon_state]_almostempty"
+ if(0)
+ icon_state = "[base_icon_state]_e"
+
////////////
//CIG PACK//
////////////
diff --git a/code/game/objects/items/weapons/storage/lockbox.dm b/code/game/objects/items/weapons/storage/lockbox.dm
index c98fe5833907..8dd2b4142c3c 100644
--- a/code/game/objects/items/weapons/storage/lockbox.dm
+++ b/code/game/objects/items/weapons/storage/lockbox.dm
@@ -90,10 +90,10 @@
req_access = list(ACCESS_SECURITY)
/obj/item/storage/lockbox/mindshield/populate_contents()
- new /obj/item/implantcase/mindshield(src)
- new /obj/item/implantcase/mindshield(src)
- new /obj/item/implantcase/mindshield(src)
- new /obj/item/implanter/mindshield(src)
+ new /obj/item/bio_chip_case/mindshield(src)
+ new /obj/item/bio_chip_case/mindshield(src)
+ new /obj/item/bio_chip_case/mindshield(src)
+ new /obj/item/bio_chip_implanter/mindshield(src)
/obj/item/storage/lockbox/clusterbang
name = "lockbox (clusterbang)"
diff --git a/code/game/objects/items/weapons/storage/uplink_kits.dm b/code/game/objects/items/weapons/storage/uplink_kits.dm
index 5dd3b61997cd..943fba0275d6 100644
--- a/code/game/objects/items/weapons/storage/uplink_kits.dm
+++ b/code/game/objects/items/weapons/storage/uplink_kits.dm
@@ -1,6 +1,6 @@
/obj/item/storage/box/syndie_kit
desc = "A sleek, sturdy box."
- icon_state = "box_of_doom"
+ icon_state = "doom_box"
/obj/item/storage/box/syndie_kit/bundle // Traitor bundles
var/list/items = list()
@@ -13,7 +13,7 @@
/obj/item/card/id/syndicate, // 10TC
/obj/item/clothing/shoes/chameleon/noslip, // 10TC
/obj/item/clothing/glasses/hud/security/chameleon, // 10TC
- /obj/item/implanter/storage, // 40TC
+ /obj/item/bio_chip_implanter/storage, // 40TC
/obj/item/pen/edagger, // 10TC
/obj/item/pinpointer/advpinpointer, // 20TC
/obj/item/storage/fancy/cigarettes/cigpack_syndicate, // 7TC
@@ -37,7 +37,7 @@
/obj/item/door_remote/omni/access_tuner, // 30TC
/obj/item/clothing/glasses/chameleon/thermal, // 15TC
/obj/item/storage/briefcase/false_bottomed, // 10 TC
- /obj/item/implanter/freedom, // 25TC
+ /obj/item/bio_chip_implanter/freedom, // 25TC
/obj/item/coin/gold, // 0TC
/obj/item/encryptionkey/syndicate) // 10TC
@@ -101,19 +101,19 @@
/obj/item/clothing/mask/gas/clown_hat, // 0TC
/obj/item/grenade/plastic/c4, // 1TC
/obj/item/thermal_drill/diamond_drill/syndicate, // 1TC
- /obj/item/implanter/freedom/prototype, // 10 TC
+ /obj/item/bio_chip_implanter/freedom/prototype, // 10 TC
/obj/item/encryptionkey/syndicate) // 10TC
/obj/item/storage/box/syndie_kit/bundle/implant // 200TC
name = "Bio-chip Bundle"
desc = "A few useful bio-chips to give you some options for when you inevitably get captured by the Security."
items = list(
- /obj/item/implanter/freedom, // 25TC
- /obj/item/implanter/stealth, // 45 TC
- /obj/item/implanter/emp, // 5TC (half of EMP kit)
- /obj/item/implanter/adrenalin, // 40TC
- /obj/item/implanter/explosive, // 10TC
- /obj/item/implanter/storage, // 40TC
+ /obj/item/bio_chip_implanter/freedom, // 25TC
+ /obj/item/bio_chip_implanter/stealth, // 45 TC
+ /obj/item/bio_chip_implanter/emp, // 5TC (half of EMP kit)
+ /obj/item/bio_chip_implanter/adrenalin, // 40TC
+ /obj/item/bio_chip_implanter/explosive, // 10TC
+ /obj/item/bio_chip_implanter/storage, // 40TC
/obj/item/encryptionkey/syndicate) // 10TC
/obj/item/storage/box/syndie_kit/bundle/hacker // 180TC
@@ -130,7 +130,7 @@
/obj/item/aiModule/toyAI, // 0TC
/obj/item/aiModule/syndicate, // 15 TC
/obj/item/storage/box/syndie_kit/camera_bug, // 5 TC
- /obj/item/implanter/freedom/prototype, // 10 TC
+ /obj/item/bio_chip_implanter/freedom/prototype, // 10 TC
/obj/item/storage/belt/military/traitor/hacker, // 15TC + AI detector for 5 TC
/obj/item/clothing/gloves/combat, // accounted in belt + toolbox
/obj/item/flashlight/emp) // 4TC
@@ -191,7 +191,7 @@
/obj/item/mod/module/sphere_transform, // ?TC
/obj/item/autosurgeon/organ/syndicate/laser_arm, // ?TC
/obj/item/pinpointer/advpinpointer, // 20TC
- /obj/item/implanter/adrenalin, // 40TC
+ /obj/item/bio_chip_implanter/adrenalin, // 40TC
/obj/item/storage/belt/utility/full/multitool, // 15TC
/obj/item/clothing/head/collectable/slime, // 0TC priceless
/obj/item/encryptionkey/syndicate) // 10TC
@@ -227,7 +227,7 @@
/obj/item/storage/box/syndie_kit/emp/populate_contents()
new /obj/item/grenade/empgrenade(src)
new /obj/item/grenade/empgrenade(src)
- new /obj/item/implanter/emp/(src)
+ new /obj/item/bio_chip_implanter/emp/(src)
/obj/item/storage/box/syndie_kit/poisoner
name = "poisoner's kit"
@@ -433,6 +433,13 @@
for(var/i in 1 to 5)
new /obj/item/wall_bug(src, camera)
+/obj/item/storage/box/syndie_kit/prescan
+ name = "\improper Technocracy Advanced Cloning System Kit"
+
+/obj/item/storage/box/syndie_kit/prescan/populate_contents()
+ new /obj/item/bio_chip_implanter/grey_autocloner(src)
+ new /obj/item/radio/beacon/syndicate/bomb/grey_autocloner(src)
+
/obj/item/storage/box/syndie_kit/pen_bomb
name = "\improper Pen bomb"
diff --git a/code/game/objects/items/weapons/storage/wallets.dm b/code/game/objects/items/weapons/storage/wallets.dm
index 8279b5151c23..ee285b4a9b33 100644
--- a/code/game/objects/items/weapons/storage/wallets.dm
+++ b/code/game/objects/items/weapons/storage/wallets.dm
@@ -17,7 +17,7 @@
/obj/item/coin,
/obj/item/dice,
/obj/item/disk,
- /obj/item/implanter,
+ /obj/item/bio_chip_implanter,
/obj/item/lighter,
/obj/item/match,
/obj/item/paper,
diff --git a/code/game/objects/items/weapons/teleportation.dm b/code/game/objects/items/weapons/teleportation.dm
index 231a5586bcb1..12d8c9f4c063 100644
--- a/code/game/objects/items/weapons/teleportation.dm
+++ b/code/game/objects/items/weapons/teleportation.dm
@@ -3,7 +3,6 @@
* Hand-tele
*/
-
/*
* Hand-tele
*/
diff --git a/code/game/objects/structures/grey_autocloner.dm b/code/game/objects/structures/grey_autocloner.dm
new file mode 100644
index 000000000000..8e444ae070f5
--- /dev/null
+++ b/code/game/objects/structures/grey_autocloner.dm
@@ -0,0 +1,131 @@
+/obj/machinery/grey_autocloner
+ name = "technocracy cloning pod"
+ desc = "An advanced Technocracy cloning pod, used for rapid cloning. Very delicate, very power hungry, and very much should not be tampered with."
+ icon = 'icons/obj/abductor.dmi'
+ icon_state = "experiment-open"
+ anchored = TRUE
+ density = TRUE
+ var/mob/living/carbon/human/occupant
+ var/datum/gas_mixture/air_contents
+ var/list/brine_types = list("corazone", "perfluorodecalin", "epinephrine", "salglu_solution") //Taken from cloner, a bit of extra healing though they should be fully good.
+ var/datum/mind/clonemind
+ /// If the clone pod is cloning someone, attempting becomes true, so only one person can clone at a time. False otherwise.
+ var/attempting = FALSE
+
+/obj/machinery/grey_autocloner/Initialize(mapload)
+ . = ..()
+ air_contents = new()
+ air_contents.oxygen = MOLES_O2STANDARD * 2
+ air_contents.nitrogen = MOLES_N2STANDARD
+ air_contents.temperature = T20C
+
+/obj/machinery/grey_autocloner/Destroy() //These will only be not null if deleted with someone in it
+ occupant = null
+ clonemind = null
+ return ..()
+
+/obj/machinery/grey_autocloner/attackby(obj/item/bio_chip_implanter/implant, mob/user, params)
+ if(!istype(implant) || !(istype(implant.imp, /obj/item/bio_chip/grey_autocloner)))
+ return ..()
+ var/obj/item/bio_chip/grey_autocloner/autoclone = implant.imp
+ autoclone.linked = src
+ atom_say("Link confirmed!")
+
+/obj/machinery/grey_autocloner/proc/growclone(datum/dna2/record/R)
+ if(attempting || stat & (NOPOWER|BROKEN))
+ return FALSE
+ clonemind = locateUID(R.mind)
+ if(!istype(clonemind)) //not a mind
+ return FALSE
+ if(clonemind.current && clonemind.current.stat != DEAD) //mind is associated with a non-dead body
+ return FALSE
+ if(clonemind.active) //somebody is using that mind
+ if(ckey(clonemind.key) != R.ckey)
+ return FALSE
+ if(clonemind.suicided) // Nah, if you are being dragged to the borg factory, that's on you
+ return FALSE
+ else
+ // get_ghost() will fail if they're unable to reenter their body
+ var/mob/dead/observer/G = clonemind.get_ghost()
+ if(!G)
+ return FALSE
+
+ attempting = TRUE //One at a time!!
+
+ if(!R.dna)
+ R.dna = new /datum/dna()
+
+ var/mob/living/carbon/human/H = new /mob/living/carbon/human(src)
+ H.set_species(/datum/species/grey) //This is a grey cloner after all. Funnier this way tbh
+ occupant = H
+
+ if(!R.dna.real_name) //to prevent null names
+ R.dna.real_name = H.real_name
+ else
+ H.real_name = R.dna.real_name
+
+ H.dna = R.dna.Clone()
+
+ for(var/datum/language/L in R.languages)
+ H.add_language(L.name)
+
+ domutcheck(H, MUTCHK_FORCED) //Ensures species that get powers by the species proc handle_dna keep them
+
+ H.dna.UpdateSE()
+ H.dna.UpdateUI()
+
+ H.sync_organ_dna(TRUE) // It's literally a fresh body as you can get, so all organs properly belong to it
+ H.UpdateAppearance()
+
+ H.Paralyse(8 SECONDS)
+
+ clonemind.transfer_to(H) //INSTANTLY INTO THE CLONE
+ H.ckey = R.ckey
+ to_chat(H, "Consciousness slowly creeps over you as your body regenerates.
So this is what cloning feels like?")
+
+ update_icon()
+
+ H.suiciding = FALSE
+ attempting = FALSE
+ addtimer(CALLBACK(src, PROC_REF(finish_clone)), 1 MINUTES)
+ return TRUE
+
+/obj/machinery/grey_autocloner/process()
+ if(stat & NOPOWER) //explode if power is lost and cloning
+ if(occupant)
+ messy_explode()
+ return
+
+ else if(occupant?.loc == src)
+ occupant.Paralyse(8 SECONDS)
+ if(!use_power(15000)) //Hope the room has power!
+ return
+ for(var/bt in brine_types)
+ if(occupant.reagents.get_reagent_amount(bt) < 1)
+ occupant.reagents.add_reagent(bt, 1)
+
+/obj/machinery/grey_autocloner/proc/finish_clone()
+ playsound(get_turf(src), 'sound/machines/ding.ogg', 50, TRUE)
+ var/obj/item/organ/internal/storedorgan = new /obj/item/organ/internal/cyberimp/brain/speech_translator
+ storedorgan.insert(occupant) //insert stored organ into the user
+ occupant.forceMove(get_turf(src))
+ occupant.update_body()
+ domutcheck(occupant) //Waiting until they're out before possible notransform.
+ occupant.special_post_clone_handling()
+ occupant = null
+ update_icon()
+
+/obj/machinery/grey_autocloner/emp_act(severity)
+ messy_explode()
+
+/obj/machinery/grey_autocloner/proc/messy_explode()
+ if(occupant)
+ occupant.forceMove(get_turf(src))
+ explosion(get_turf(src), 1, 2, 4, flame_range = 2)
+ qdel(src)
+
+/obj/machinery/grey_autocloner/deconstruct(disassembled)
+ messy_explode()
+
+/obj/machinery/grey_autocloner/update_icon_state()
+ icon_state = occupant ? "experiment" : "experiment-open"
diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm
index e6adf57c7626..04b98ffde474 100644
--- a/code/game/objects/structures/watercloset.dm
+++ b/code/game/objects/structures/watercloset.dm
@@ -657,8 +657,8 @@
/obj/item/bathroom_parts
name = "toilet in a box"
desc = "An entire toilet in a box, straight from Space Sweden. It has an unpronounceable name."
- icon = 'icons/obj/storage.dmi'
- icon_state = "largebox"
+ icon = 'icons/obj/boxes.dmi'
+ icon_state = "large_box"
w_class = WEIGHT_CLASS_BULKY
var/result = /obj/structure/toilet
var/result_name = "toilet"
diff --git a/code/game/turfs/simulated/floor/chasm.dm b/code/game/turfs/simulated/floor/chasm.dm
index b282a4490962..fbd869220f4b 100644
--- a/code/game/turfs/simulated/floor/chasm.dm
+++ b/code/game/turfs/simulated/floor/chasm.dm
@@ -32,6 +32,8 @@
/obj/machinery/atmospherics/pipe/simple,
/obj/effect/projectile,
/obj/effect/projectile_lighting,
+ /obj/effect/dummy/slaughter, //no bloodcrawlers into chasms.
+ /obj/effect/dummy/spell_jaunt, //No jaunters into chasms either.
/mob/living/simple_animal/hostile/megafauna //failsafe
))
var/drop_x = 1
diff --git a/code/modules/admin/misc_admin_procs.dm b/code/modules/admin/misc_admin_procs.dm
index fe951230dda7..52a1c80c8f54 100644
--- a/code/modules/admin/misc_admin_procs.dm
+++ b/code/modules/admin/misc_admin_procs.dm
@@ -406,6 +406,7 @@ GLOBAL_VAR_INIT(nologevent, 0)
message_admins("[key_name_admin(usr)] has admin ended the round with message: '[input]'")
log_admin("[key_name(usr)] has admin ended the round with message: '[input]'")
SSticker.force_ending = TRUE
+ SSticker.event_blackbox(outcome = ROUND_END_FORCED)
to_chat(world, "[input]")
SSblackbox.record_feedback("tally", "admin_verb", 1, "End Round") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
SSticker.mode_result = "admin ended"
diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index 8fc385496e8e..5095e112ad4c 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -3505,8 +3505,8 @@
N.target = H
N.point_at(N.target)
N.modelocked = TRUE
- if(!locate(/obj/item/implant/dust, hunter_mob))
- var/obj/item/implant/dust/D = new /obj/item/implant/dust(hunter_mob)
+ if(!locate(/obj/item/bio_chip/dust, hunter_mob))
+ var/obj/item/bio_chip/dust/D = new /obj/item/bio_chip/dust(hunter_mob)
D.implant(hunter_mob)
if(killthem)
var/datum/objective/assassinate/kill_objective = new
diff --git a/code/modules/admin/verbs/infiltratorteam_syndicate.dm b/code/modules/admin/verbs/infiltratorteam_syndicate.dm
index caf60a57d6cb..34b14b10056a 100644
--- a/code/modules/admin/verbs/infiltratorteam_syndicate.dm
+++ b/code/modules/admin/verbs/infiltratorteam_syndicate.dm
@@ -154,14 +154,14 @@ GLOBAL_VAR_INIT(sent_syndicate_infiltration_team, 0)
// Implants:
// Uplink
- var/obj/item/implant/uplink/sit/U = new /obj/item/implant/uplink/sit(src)
+ var/obj/item/bio_chip/uplink/sit/U = new /obj/item/bio_chip/uplink/sit(src)
U.implant(src)
if(flag_mgmt)
U.hidden_uplink.uses = 2500
else
U.hidden_uplink.uses = num_tc
// Dust
- var/obj/item/implant/dust/D = new /obj/item/implant/dust(src)
+ var/obj/item/bio_chip/dust/D = new /obj/item/bio_chip/dust(src)
D.implant(src)
// Radio & PDA
diff --git a/code/modules/admin/verbs/onlyone.dm b/code/modules/admin/verbs/onlyone.dm
index 5d5132e8cd34..dadf06693a1e 100644
--- a/code/modules/admin/verbs/onlyone.dm
+++ b/code/modules/admin/verbs/onlyone.dm
@@ -26,7 +26,7 @@
to_chat(H, chat_box_red(messages.Join("
")))
for(var/obj/item/I in H)
- if(istype(I, /obj/item/implant))
+ if(istype(I, /obj/item/bio_chip))
continue
qdel(I)
diff --git a/code/modules/admin/verbs/onlyoneteam.dm b/code/modules/admin/verbs/onlyoneteam.dm
index 98299d3607a4..80ca1f922ad2 100644
--- a/code/modules/admin/verbs/onlyoneteam.dm
+++ b/code/modules/admin/verbs/onlyoneteam.dm
@@ -17,7 +17,7 @@
S.copy_to(H)
for(var/obj/item/I in H)
- if(istype(I, /obj/item/implant))
+ if(istype(I, /obj/item/bio_chip))
continue
qdel(I)
diff --git a/code/modules/admin/verbs/striketeam_syndicate.dm b/code/modules/admin/verbs/striketeam_syndicate.dm
index 2a466d636b54..5a32fb693b49 100644
--- a/code/modules/admin/verbs/striketeam_syndicate.dm
+++ b/code/modules/admin/verbs/striketeam_syndicate.dm
@@ -155,7 +155,7 @@ GLOBAL_VAR_INIT(sent_syndicate_strike_team, 0)
equip_to_slot_or_del(new /obj/item/gun/projectile/automatic/l6_saw(src), SLOT_HUD_RIGHT_HAND)
equip_to_slot_or_del(new /obj/item/ammo_box/magazine/mm556x45(src), SLOT_HUD_IN_BACKPACK)
- var/obj/item/implant/dust/D = new /obj/item/implant/dust(src)
+ var/obj/item/bio_chip/dust/D = new /obj/item/bio_chip/dust(src)
D.implant(src)
var/obj/item/card/id/syndicate/W = new(src) //Untrackable by AI
W.name = "[real_name]'s ID Card"
diff --git a/code/modules/antagonists/_common/antag_spawner.dm b/code/modules/antagonists/_common/antag_spawner.dm
index b93332d311cc..687237e66741 100644
--- a/code/modules/antagonists/_common/antag_spawner.dm
+++ b/code/modules/antagonists/_common/antag_spawner.dm
@@ -14,7 +14,7 @@
/obj/item/antag_spawner/nuke_ops
name = "syndicate operative teleporter"
desc = "A single-use teleporter designed to quickly reinforce operatives in the field."
- icon = 'icons/obj/implants.dmi'
+ icon = 'icons/obj/bio_chips.dmi'
icon_state = "locator"
var/borg_to_spawn
var/checking = FALSE
diff --git a/code/modules/antagonists/traitor/contractor/datums/rep_purchases/contractor_fulton.dm b/code/modules/antagonists/traitor/contractor/datums/rep_purchases/contractor_fulton.dm
index ead475511313..689bb2ec63fd 100644
--- a/code/modules/antagonists/traitor/contractor/datums/rep_purchases/contractor_fulton.dm
+++ b/code/modules/antagonists/traitor/contractor/datums/rep_purchases/contractor_fulton.dm
@@ -6,12 +6,12 @@
description = "A balloon that can be used to extract equipment or personnel to a Fulton Recovery Beacon. Anything not bolted down can be moved. Link the pack to a beacon by using the pack in hand. Beacon can be placed inside the station, but the Fulton will not work inside the station."
cost = 1
stock = 1
- item_type = /obj/item/storage/box/contractor/fulton_kit
+ item_type = /obj/item/storage/box/syndie_kit/fulton_kit
-/obj/item/storage/box/contractor/fulton_kit
+/obj/item/storage/box/syndie_kit/fulton_kit
name = "fulton extraction kit"
- icon_state = "box_of_doom"
+ icon_state = "doom_box"
-/obj/item/storage/box/contractor/fulton_kit/populate_contents()
+/obj/item/storage/box/syndie_kit/fulton_kit/populate_contents()
new /obj/item/extraction_pack(src)
new /obj/item/fulton_core(src)
diff --git a/code/modules/antagonists/traitor/contractor/datums/syndicate_contract.dm b/code/modules/antagonists/traitor/contractor/datums/syndicate_contract.dm
index 11bb20bc5114..82d4ca3ea709 100644
--- a/code/modules/antagonists/traitor/contractor/datums/syndicate_contract.dm
+++ b/code/modules/antagonists/traitor/contractor/datums/syndicate_contract.dm
@@ -3,10 +3,7 @@
#define EXTRACTION_PHASE_PREPARE 5 SECONDS
#define EXTRACTION_PHASE_PORTAL 5 SECONDS
#define COMPLETION_NOTIFY_DELAY 5 SECONDS
-#define RETURN_INJURY_CHANCE 85
#define RETURN_SOUVENIR_CHANCE 10
-/// How long an antagonist target remains in the Syndicate jail.
-#define ANTAG_CONTRACT_TIME 10 MINUTES
/**
* # Syndicate Contract
@@ -60,7 +57,7 @@
/// The flare indicating the extraction point.
var/obj/effect/contractor_flare/extraction_flare = null
/// The extraction portal.
- var/obj/effect/portal/redspace/contractor/extraction_portal = null
+ var/obj/effect/portal/advanced/contractor/extraction_portal = null
/// The world.time at which the current extraction fulton will vanish and another extraction can be requested.
var/extraction_deadline = -1
/// Name of the target to display on the UI.
@@ -288,7 +285,7 @@
U.message_holder("Extraction signal received, agent. [SSmapping.map_datum.fluff_name]'s bluespace transport jamming systems have been sabotaged. "\
+ "We have opened a temporary portal at your flare location - proceed to the target's extraction by inserting them into the portal.", 'sound/effects/confirmdropoff.ogg')
// Open a portal
- var/obj/effect/portal/redspace/contractor/P = new(get_turf(F), pick(GLOB.syndieprisonwarp), F, 0, M)
+ var/obj/effect/portal/advanced/contractor/P = new(get_turf(F), pick(GLOB.syndieprisonwarp), F, 0, M)
P.contract = src
P.contractor_mind = M.mind
P.target_mind = contract.target
@@ -302,7 +299,7 @@
* * M - The target mob.
* * P - The extraction portal.
*/
-/datum/syndicate_contract/proc/target_received(mob/living/M, obj/effect/portal/redspace/contractor/P)
+/datum/syndicate_contract/proc/target_received(mob/living/M, obj/effect/portal/advanced/contractor/P)
INVOKE_ASYNC(src, PROC_REF(clean_up))
add_attack_logs(owning_hub.owner.current, M, "extracted to Syndicate Jail")
complete(M.stat == DEAD)
@@ -330,14 +327,11 @@
* * M - The target mob.
* * P - The extraction portal.
*/
-/datum/syndicate_contract/proc/handle_target_experience(mob/living/M, obj/effect/portal/redspace/contractor/P)
+/datum/syndicate_contract/proc/handle_target_experience(mob/living/M, obj/effect/portal/advanced/contractor/P)
var/turf/T = get_turf(P)
var/mob/living/carbon/human/H = M
// Prepare their return
- if(M.mind.special_role && !(M.mind.special_role in list(SPECIAL_ROLE_ERT, SPECIAL_ROLE_DEATHSQUAD)))
- prison_time = ANTAG_CONTRACT_TIME
-
prisoner_timer_handle = addtimer(CALLBACK(src, PROC_REF(handle_target_return), M, T), prison_time, TIMER_STOPPABLE)
LAZYSET(GLOB.prisoner_belongings.prisoners, M, src)
@@ -382,11 +376,11 @@
continue
// Any kind of implant gets potentially removed (mindshield, freedoms, etc)
- if(istype(I, /obj/item/implant))
- if(istype(I, /obj/item/implant/storage)) // Storage items are removed and placed in the confiscation locker before the implant is taken.
- var/obj/item/implant/storage/storage_implant = I
- for(var/it in storage_implant.storage)
- storage_implant.storage.remove_from_storage(it)
+ if(istype(I, /obj/item/bio_chip))
+ if(istype(I, /obj/item/bio_chip/storage)) // Storage items are removed and placed in the confiscation locker before the implant is taken.
+ var/obj/item/bio_chip/storage/storage_chip = I
+ for(var/it in storage_chip.storage)
+ storage_chip.storage.remove_from_storage(it)
stuff_to_transfer += it
qdel(I)
continue
@@ -496,44 +490,40 @@
* * M - The target mob.
*/
/datum/syndicate_contract/proc/injure_target(mob/living/M)
- if(!prob(RETURN_INJURY_CHANCE) || M.health < 50)
- return
-
var/obj/item/organ/external/injury_target
- if(prob(20)) //remove a limb
- if(prob(50))
- injury_target = M.get_organ(pick(BODY_ZONE_PRECISE_R_HAND, BODY_ZONE_PRECISE_L_HAND, BODY_ZONE_PRECISE_R_FOOT, BODY_ZONE_PRECISE_L_FOOT))
- if(!injury_target)
- default_damage(M)
- return
- injury_target.droplimb()
- to_chat(M, "You were interrogated by your captors before being sent back! Oh god something's missing!")
- else //fracture
- if(ismachineperson(M))
- M.emp_act(EMP_HEAVY)
- M.adjustBrainLoss(30)
- to_chat(M, "You were interrogated by your captors before being sent back! You feel like some of your components are loose!")
-
- else if(isslimeperson(M))
- injury_target = M.get_organ(pick(BODY_ZONE_PRECISE_R_HAND, BODY_ZONE_PRECISE_L_HAND, BODY_ZONE_PRECISE_R_FOOT, BODY_ZONE_PRECISE_L_FOOT))
- if(!injury_target)
- default_damage(M)
- return
- injury_target.cause_internal_bleeding()
-
- injury_target = M.get_organ(BODY_ZONE_CHEST)
- injury_target.cause_internal_bleeding()
- to_chat(M, "You were interrogated by your captors before being sent back! You feel like your inner membrane has been punctured!")
-
- if(prob(25))
- injury_target = M.get_organ(BODY_ZONE_CHEST)
- injury_target.fracture()
- else
- injury_target = M.get_organ(pick(BODY_ZONE_PRECISE_R_HAND, BODY_ZONE_PRECISE_L_HAND, BODY_ZONE_R_LEG, BODY_ZONE_R_LEG))
- if(!injury_target)
- default_damage(M)
- return
- injury_target.fracture()
+ if(prob(20)) //See if they're !!!lucky!!! enough to just chop a hand or foot off first, or even !!LUCKIER!! that it chose an already amputated limb
+ injury_target = M.get_organ(pick(BODY_ZONE_PRECISE_R_HAND, BODY_ZONE_PRECISE_L_HAND, BODY_ZONE_PRECISE_R_FOOT, BODY_ZONE_PRECISE_L_FOOT))
+ if(!injury_target)
+ return
+ default_damage(M)
+ injury_target.droplimb()
+ to_chat(M, "You were interrogated by your captors before being sent back! Oh god, something's missing!")
+ return
+ //Species specific punishments first
+ if(ismachineperson(M))
+ M.emp_act(EMP_HEAVY)
+ M.adjustBrainLoss(30)
+ to_chat(M, "You were interrogated by your captors before being sent back! You feel like some of your components are loose!")
+ return
+ default_damage(M) //Now that we won't accidentally kill an IPC we can make everyone take damage
+ if(isslimeperson(M))
+ injury_target = M.get_organ(pick(BODY_ZONE_PRECISE_R_HAND, BODY_ZONE_PRECISE_L_HAND, BODY_ZONE_PRECISE_R_FOOT, BODY_ZONE_PRECISE_L_FOOT))
+ if(!injury_target)
+ return
+ injury_target.cause_internal_bleeding()
+ injury_target = M.get_organ(BODY_ZONE_CHEST)
+ injury_target.cause_internal_bleeding()
+ to_chat(M, "You were interrogated by your captors before being sent back! You feel like your inner membrane has been punctured!")
+ return
+ if(prob(25)) //You either get broken ribs, or a broken limb and IB if you made it this far
+ injury_target = M.get_organ(BODY_ZONE_CHEST)
+ injury_target.fracture()
+ else
+ injury_target = M.get_organ(pick(BODY_ZONE_R_ARM, BODY_ZONE_L_ARM, BODY_ZONE_R_LEG, BODY_ZONE_R_LEG))
+ if(!injury_target)
+ return
+ injury_target.fracture()
+ injury_target.cause_internal_bleeding()
/**
* Handles the target's return to station.
@@ -563,7 +553,7 @@
victim_belongings = list()
// Clean up
- var/obj/item/implant/uplink/uplink_implant = locate() in M
+ var/obj/item/bio_chip/uplink/uplink_implant = locate() in M
uplink_implant?.hidden_uplink?.is_jammed = FALSE
QDEL_LIST_CONTENTS(temp_objs)
@@ -638,6 +628,4 @@
#undef EXTRACTION_PHASE_PREPARE
#undef EXTRACTION_PHASE_PORTAL
#undef COMPLETION_NOTIFY_DELAY
-#undef RETURN_INJURY_CHANCE
#undef RETURN_SOUVENIR_CHANCE
-#undef ANTAG_CONTRACT_TIME
diff --git a/code/modules/antagonists/traitor/contractor/items/contractor_kit.dm b/code/modules/antagonists/traitor/contractor/items/contractor_kit.dm
index 93759920b84d..7b5ac75edf95 100644
--- a/code/modules/antagonists/traitor/contractor/items/contractor_kit.dm
+++ b/code/modules/antagonists/traitor/contractor/items/contractor_kit.dm
@@ -31,7 +31,7 @@
/obj/item/encryptionkey/binary,
/obj/item/jammer,
/obj/item/clothing/under/syndicate/silicon_cham,
- /obj/item/implanter/freedom,
+ /obj/item/bio_chip_implanter/freedom,
)
diff --git a/code/modules/antagonists/traitor/contractor/items/extraction_items.dm b/code/modules/antagonists/traitor/contractor/items/extraction_items.dm
index 9b8f056792b7..8f08c7bcf197 100644
--- a/code/modules/antagonists/traitor/contractor/items/extraction_items.dm
+++ b/code/modules/antagonists/traitor/contractor/items/extraction_items.dm
@@ -1,7 +1,7 @@
/**
* # Contractor Extraction Flare
*
- * Used to designate where the [/obj/effect/portal/redspace/contractor] should spawn during the extraction process.
+ * Used to designate where the [/obj/effect/portal/advanced/contractor] should spawn during the extraction process.
*/
/obj/effect/contractor_flare
name = "contractor extraction flare"
@@ -22,7 +22,7 @@
*
* Used to extract contract targets and send them to the Syndicate jail for a few minutes.
*/
-/obj/effect/portal/redspace/contractor
+/obj/effect/portal/advanced/contractor
name = "suspicious portal"
icon_state = "portal-syndicate"
/// The contract associated with this portal.
@@ -32,7 +32,7 @@
/// The mind of the kidnapping target. Prevents non-targets from taking the portal.
var/datum/mind/target_mind = null
-/obj/effect/portal/redspace/contractor/can_teleport(atom/movable/A)
+/obj/effect/portal/advanced/contractor/can_teleport(atom/movable/A)
var/mob/living/M = A
if(!istype(M))
return FALSE
@@ -49,7 +49,7 @@
return FALSE
return ..()
-/obj/effect/portal/redspace/contractor/teleport(atom/movable/M)
+/obj/effect/portal/advanced/contractor/teleport(atom/movable/M)
. = ..()
if(.)
contract.target_received(M, src)
diff --git a/code/modules/antagonists/traitor/datum_traitor.dm b/code/modules/antagonists/traitor/datum_traitor.dm
index b2e2fe1fa82f..22dfd2c48b70 100644
--- a/code/modules/antagonists/traitor/datum_traitor.dm
+++ b/code/modules/antagonists/traitor/datum_traitor.dm
@@ -61,7 +61,7 @@
qdel(uplink)
// Check for an uplink implant
- var/uplink_implant = locate(/obj/item/implant/uplink) in M.contents
+ var/uplink_implant = locate(/obj/item/bio_chip/uplink) in M.contents
if(uplink_implant)
qdel(uplink_implant)
diff --git a/code/modules/antagonists/vampire/vampire_powers/vampire_powers.dm b/code/modules/antagonists/vampire/vampire_powers/vampire_powers.dm
index e0bd78307b9f..68304f932a6c 100644
--- a/code/modules/antagonists/vampire/vampire_powers/vampire_powers.dm
+++ b/code/modules/antagonists/vampire/vampire_powers/vampire_powers.dm
@@ -333,10 +333,10 @@
visible_message("[H] looks to be stunned by the energy!")
H.Weaken(40 SECONDS)
return
- for(var/obj/item/implant/mindshield/L in H)
+ for(var/obj/item/bio_chip/mindshield/L in H)
if(L && L.implanted)
qdel(L)
- for(var/obj/item/implant/traitor/T in H)
+ for(var/obj/item/bio_chip/traitor/T in H)
if(T && T.implanted)
qdel(T)
visible_message("[H] gets an eerie red glow in their eyes!")
diff --git a/code/modules/awaymissions/mission_code/ghost_role_spawners/golems.dm b/code/modules/awaymissions/mission_code/ghost_role_spawners/golems.dm
index 1cd8acb00132..f2fbfe87b8f6 100644
--- a/code/modules/awaymissions/mission_code/ghost_role_spawners/golems.dm
+++ b/code/modules/awaymissions/mission_code/ghost_role_spawners/golems.dm
@@ -69,6 +69,7 @@
move_resist = MOVE_FORCE_NORMAL
density = FALSE
death_cooldown = 300 SECONDS
+ STATIC_COOLDOWN_DECLARE(ghost_flash_cooldown)
var/has_owner = FALSE
var/can_transfer = TRUE //if golems can switch bodies to this new shell
var/mob/living/owner = null //golem's owner if it has one
@@ -85,7 +86,11 @@
. = ..()
var/area/A = get_area(src)
if(!mapload && A)
- notify_ghosts("\A [initial(species.prefix)] golem shell has been completed in [A.name].", source = src)
+ if(COOLDOWN_FINISHED(src, ghost_flash_cooldown))
+ notify_ghosts("\A [initial(species.prefix)] golem shell has been completed in [A.name].", source = src)
+ COOLDOWN_START(src, ghost_flash_cooldown, 20 MINUTES)
+ else
+ notify_ghosts("\A [initial(species.prefix)] golem shell has been completed in [A.name].", source = src, flashwindow = FALSE)
if(has_owner && creator)
important_info = "Serve your creator, even if they are an antag."
flavour_text = "You are a golem created to serve your creator."
diff --git a/code/modules/awaymissions/mob_spawn.dm b/code/modules/awaymissions/mob_spawn.dm
index 4fe292506fe9..67f2af1e0ea0 100644
--- a/code/modules/awaymissions/mob_spawn.dm
+++ b/code/modules/awaymissions/mob_spawn.dm
@@ -544,7 +544,7 @@
uniform = /obj/item/clothing/under/rank/engineering/engineer
belt = /obj/item/storage/belt/utility/full
- suit = /obj/item/clothing/suit/space/hardsuit/engine
+ back = /obj/item/mod/control/pre_equipped/engineering
shoes = /obj/item/clothing/shoes/workboots
mask = /obj/item/clothing/mask/breath
id = /obj/item/card/id/engineering
@@ -576,7 +576,7 @@
/datum/outfit/job/mining/suit
name = "Shaft Miner"
- suit = /obj/item/clothing/suit/space/hardsuit/mining
+ back = /obj/item/mod/control/pre_equipped/mining/asteroid
uniform = /obj/item/clothing/under/rank/cargo/miner
gloves = /obj/item/clothing/gloves/fingerless
shoes = /obj/item/clothing/shoes/workboots
diff --git a/code/modules/client/client_defines.dm b/code/modules/client/client_defines.dm
index 686f2eae34ca..ed0268a61720 100644
--- a/code/modules/client/client_defines.dm
+++ b/code/modules/client/client_defines.dm
@@ -125,6 +125,9 @@
/// The client's movement keybindings to directions, which work regardless of modifiers.
var/list/movement_kb_dirs = list()
+ ///A lazy list of atoms we've examined in the last RECENT_EXAMINE_MAX_WINDOW (default 2) seconds, so that we will call [/atom/proc/examine_more] instead of [/atom/proc/examine] on them when examining
+ var/list/recent_examines
+
/client/vv_edit_var(var_name, var_value)
switch(var_name)
// I know we will never be in a world where admins are editing client vars to let people bypass TOS
diff --git a/code/modules/client/preference/character.dm b/code/modules/client/preference/character.dm
index b3132288f9b4..3cdb005db38e 100644
--- a/code/modules/client/preference/character.dm
+++ b/code/modules/client/preference/character.dm
@@ -1128,11 +1128,11 @@
if(4)
clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY)
if(JOB_LAWYER)
- clothes_s = new /icon('icons/mob/clothing/under/civilian.dmi', "internalaffairs_s")
+ clothes_s = new /icon('icons/mob/clothing/under/procedure.dmi', "iaa_s")
clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "brown"), ICON_UNDERLAY)
clothes_s.Blend(new /icon('icons/mob/inhands/items_righthand.dmi', "briefcase"), ICON_UNDERLAY)
if(prob(1))
- clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "suitjacket_blue"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "suitjacket_black"), ICON_OVERLAY)
switch(backbag)
if(2)
clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "backpack"), ICON_OVERLAY)
@@ -1471,10 +1471,9 @@
else if(backbag == 3 || backbag == 4)
clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY)
if(JOB_JUDGE)
- clothes_s = new /icon('icons/mob/clothing/under/suit.dmi', "really_black_suit_s")
+ clothes_s = new /icon('icons/mob/clothing/under/procedure.dmi', "magistrate_s")
clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "laceups"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/clothing/head.dmi', "mercy_hood"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "judge"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "magirobe"), ICON_UNDERLAY)
switch(backbag)
if(2)
clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "backpack"), ICON_OVERLAY)
@@ -1483,7 +1482,7 @@
if(4)
clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY)
if(JOB_NANO)
- clothes_s = new /icon('icons/mob/clothing/under/centcom.dmi', "officer_s")
+ clothes_s = new /icon('icons/mob/clothing/under/procedure.dmi', "ntrep_s")
clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "laceups"), ICON_UNDERLAY)
switch(backbag)
if(2)
@@ -1493,7 +1492,7 @@
if(4)
clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY)
if(JOB_BLUESHIELD)
- clothes_s = new /icon('icons/mob/clothing/under/centcom.dmi', "officer_s")
+ clothes_s = new /icon('icons/mob/clothing/under/procedure.dmi', "blueshield_s")
clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "jackboots"), ICON_UNDERLAY)
clothes_s.Blend(new /icon('icons/mob/clothing/hands.dmi', "swat_gl"), ICON_OVERLAY)
clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "blueshield"), ICON_OVERLAY)
diff --git a/code/modules/client/preference/loadout/loadout_general.dm b/code/modules/client/preference/loadout/loadout_general.dm
index f9fe14a95703..4def22c447be 100644
--- a/code/modules/client/preference/loadout/loadout_general.dm
+++ b/code/modules/client/preference/loadout/loadout_general.dm
@@ -42,7 +42,7 @@
/datum/gear/matches
display_name = "Box of matches"
- path = /obj/item/storage/box/matches
+ path = /obj/item/storage/fancy/matches
/datum/gear/candlebox
display_name = "Box of candles"
diff --git a/code/modules/client/preference/loadout/loadout_suit.dm b/code/modules/client/preference/loadout/loadout_suit.dm
index 9c01e17cac97..a6368408e152 100644
--- a/code/modules/client/preference/loadout/loadout_suit.dm
+++ b/code/modules/client/preference/loadout/loadout_suit.dm
@@ -116,6 +116,36 @@
path = /obj/item/clothing/suit/jacket/atmosbomber
allowed_roles = list("Chief Engineer", "Life Support Specialist")
+/datum/gear/suit/bomber/job/hydro
+ display_name = "Bomber jacket, hydroponics"
+ path = /obj/item/clothing/suit/jacket/hydrobomber
+ allowed_roles = list("Botanist")
+
+/datum/gear/suit/bomber/job/medical
+ display_name = "Bomber jacket, medical"
+ path = /obj/item/clothing/suit/jacket/medbomber
+ allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Chemist", "Psychiatrist", "Paramedic", "Virologist", "Coroner")
+
+/datum/gear/suit/bomber/job/chemist
+ display_name = "Bomber jacket, chemist"
+ path = /obj/item/clothing/suit/jacket/chembomber
+ allowed_roles = list("Chemist")
+
+/datum/gear/suit/bomber/job/coroner
+ display_name = "Bomber jacket, coroner"
+ path = /obj/item/clothing/suit/jacket/coronerbomber
+ allowed_roles = list("Coroner")
+
+/datum/gear/suit/bomber/job/science
+ display_name = "Bomber jacket, science"
+ path = /obj/item/clothing/suit/jacket/scibomber
+ allowed_roles = list("Research Director", "Scientist")
+
+/datum/gear/suit/bomber/job/robotics
+ display_name = "Bomber jacket, robotics"
+ path = /obj/item/clothing/suit/jacket/robobomber
+ allowed_roles = list("Research Director", "Roboticist")
+
//JACKETS
/datum/gear/suit/leather_jacket
display_name = "Leather jacket"
diff --git a/code/modules/clothing/chameleon.dm b/code/modules/clothing/chameleon.dm
index 9b1028c82a62..d1695082d25e 100644
--- a/code/modules/clothing/chameleon.dm
+++ b/code/modules/clothing/chameleon.dm
@@ -525,7 +525,7 @@
icon_state = "black"
item_color = "black"
desc = "A pair of black shoes."
- flags = NOSLIP
+ no_slip = TRUE
/obj/item/clothing/shoes/chameleon/noslip/broken/Initialize(mapload)
. = ..()
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index efdaafea15ff..3c3ceea9d347 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -466,6 +466,7 @@
var/chained = FALSE
var/can_cut_open = FALSE
var/cut_open = FALSE
+ var/no_slip = FALSE
body_parts_covered = FEET
slot_flags = SLOT_FLAG_FEET
@@ -480,6 +481,20 @@
"Drask" = 'icons/mob/clothing/species/drask/shoes.dmi'
)
+/obj/item/clothing/shoes/equipped(mob/user, slot)
+ . = ..()
+ if(!no_slip || slot != SLOT_HUD_SHOES)
+ return
+ ADD_TRAIT(user, TRAIT_NOSLIP, UID())
+
+/obj/item/clothing/shoes/dropped(mob/user)
+ ..()
+ if(!no_slip)
+ return
+ var/mob/living/carbon/human/H = user
+ if(H.get_item_by_slot(SLOT_HUD_SHOES) == src)
+ REMOVE_TRAIT(H, TRAIT_NOSLIP, UID())
+
/obj/item/clothing/shoes/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/match) && src.loc == user)
var/obj/item/match/M = I
diff --git a/code/modules/clothing/shoes/magboots.dm b/code/modules/clothing/shoes/magboots.dm
index 88b9be267c52..ce849a5016fe 100644
--- a/code/modules/clothing/shoes/magboots.dm
+++ b/code/modules/clothing/shoes/magboots.dm
@@ -8,6 +8,8 @@
var/slowdown_active = 2
var/slowdown_passive = SHOES_SLOWDOWN
var/magpulse_name = "mag-pulse traction system"
+ ///If a pair of magboots has different icons for being on or off
+ var/multiple_icons = TRUE
actions_types = list(/datum/action/item_action/toggle)
strip_delay = 70
put_on_delay = 70
@@ -34,14 +36,16 @@
toggle_magpulse(user, forced)
/obj/item/clothing/shoes/magboots/proc/toggle_magpulse(mob/user, forced)
- if(magpulse)
- flags &= ~NOSLIP
+ if(magpulse) //magpulse and no_slip will always be the same value unless VV happens
+ REMOVE_TRAIT(user, TRAIT_NOSLIP, UID())
slowdown = slowdown_passive
else
- flags |= NOSLIP
+ ADD_TRAIT(user, TRAIT_NOSLIP, UID())
slowdown = slowdown_active
magpulse = !magpulse
- icon_state = "[magboot_state][magpulse]"
+ no_slip = !no_slip
+ if(multiple_icons)
+ icon_state = "[magboot_state][magpulse]"
if(!forced)
to_chat(user, "You [magpulse ? "enable" : "disable"] the [magpulse_name].")
user.update_inv_shoes() //so our mob-overlays update
diff --git a/code/modules/clothing/shoes/misc_shoes.dm b/code/modules/clothing/shoes/misc_shoes.dm
index a6925603b28d..86b85ccb40f7 100644
--- a/code/modules/clothing/shoes/misc_shoes.dm
+++ b/code/modules/clothing/shoes/misc_shoes.dm
@@ -19,7 +19,7 @@
desc = "High speed, no drag combat boots."
permeability_coefficient = 0.01
armor = list(MELEE = 35, BULLET = 20, LASER = 15, ENERGY = 15, BOMB = 50, RAD = 20, FIRE = 450, ACID = 50)
- flags = NOSLIP
+ no_slip = TRUE
/obj/item/clothing/shoes/sandal
name = "sandals"
@@ -45,7 +45,7 @@
desc = "A pair of yellow rubber boots, designed to prevent slipping on wet surfaces."
icon_state = "galoshes"
permeability_coefficient = 0.05
- flags = NOSLIP
+ no_slip = TRUE
slowdown = SHOES_SLOWDOWN+1
strip_delay = 50
put_on_delay = 50
diff --git a/code/modules/clothing/spacesuits/alien_suits.dm b/code/modules/clothing/spacesuits/alien_suits.dm
index 40e84a3e1e39..5713d1ff5fd5 100644
--- a/code/modules/clothing/spacesuits/alien_suits.dm
+++ b/code/modules/clothing/spacesuits/alien_suits.dm
@@ -207,12 +207,11 @@
species_restricted = list("Vox")
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/feet.dmi')
+ multiple_icons = FALSE
/obj/item/clothing/shoes/magboots/vox/attack_self(mob/user)
if(magpulse)
- flags &= ~NOSLIP
- magpulse = FALSE
- flags |= NODROP
+ flags &= ~NODROP
to_chat(user, "You relax your deathgrip on the flooring.")
else
//make sure these can only be used when equipped.
@@ -222,20 +221,18 @@
if(H.shoes != src)
to_chat(user, " dy)
- distance = dx
- else
- distance = dy
- if(distance > explosion_detection_dist)
- return
- display_visor_message("Explosion detected! Epicenter radius: [devastation_range], Outer radius: [heavy_impact_range], Shockwave radius: [light_impact_range]")
-
-/obj/item/clothing/suit/space/hardsuit/rd
- name = "prototype hardsuit"
- desc = "A prototype suit that protects against hazardous, low pressure environments. Fitted with extensive plating for handling explosives and dangerous research materials."
- icon_state = "hardsuit-rd"
- item_state = "hardsuit-rd"
- max_heat_protection_temperature = FIRE_SUIT_MAX_TEMP_PROTECT //Same as an emergency firesuit. Not ideal for extended exposure.
- allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/gun/energy/wormhole_projector,
- /obj/item/hand_tele, /obj/item/aicard)
- armor = list(MELEE = 20, BULLET = 5, LASER = 5, ENERGY = 5, BOMB = INFINITY, RAD = 75, FIRE = 75, ACID = 200)
- helmettype = /obj/item/clothing/head/helmet/space/hardsuit/rd
-
-
- //Security
+//Security
/obj/item/clothing/head/helmet/space/hardsuit/security
name = "security hardsuit helmet"
desc = "A special helmet designed for work in a hazardous, low pressure environment. Has an additional layer of armor."
diff --git a/code/modules/clothing/suits/armor_suits.dm b/code/modules/clothing/suits/armor_suits.dm
index d4328ed99b60..846b5d033e9d 100644
--- a/code/modules/clothing/suits/armor_suits.dm
+++ b/code/modules/clothing/suits/armor_suits.dm
@@ -190,7 +190,7 @@
armor = list(MELEE = 50, BULLET = 35, LASER = 50, ENERGY = 5, BOMB = 15, RAD = 0, FIRE = INFINITY, ACID = 450)
dog_fashion = null
resistance_flags = FIRE_PROOF
- allowed = list(/obj/item/disk, /obj/item/stamp, /obj/item/reagent_containers/food/drinks/flask, /obj/item/melee, /obj/item/storage/lockbox/medal, /obj/item/flash, /obj/item/storage/box/matches, /obj/item/lighter, /obj/item/clothing/mask/cigarette, /obj/item/storage/fancy/cigarettes, /obj/item/tank/internals/emergency_oxygen, /obj/item/gun/energy, /obj/item/gun/projectile)
+ allowed = list(/obj/item/disk, /obj/item/stamp, /obj/item/reagent_containers/food/drinks/flask, /obj/item/melee, /obj/item/storage/lockbox/medal, /obj/item/flash, /obj/item/storage/fancy/matches, /obj/item/lighter, /obj/item/clothing/mask/cigarette, /obj/item/storage/fancy/cigarettes, /obj/item/tank/internals/emergency_oxygen, /obj/item/gun/energy, /obj/item/gun/projectile)
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
@@ -626,9 +626,8 @@
for(var/atom/movable/AM in T)
thrown_atoms += AM
- for(var/am in thrown_atoms)
- var/atom/movable/AM = am
- if(AM == owner || AM.anchored)
+ for(var/atom/movable/AM as anything in thrown_atoms)
+ if(AM == owner || AM.anchored || (ismob(AM) && !isliving(AM)))
continue
var/throw_target = get_edge_target_turf(owner, get_dir(owner, get_step_away(AM, owner)))
diff --git a/code/modules/clothing/suits/job_suits.dm b/code/modules/clothing/suits/job_suits.dm
index 81da15db9d6e..4b3232679f5b 100644
--- a/code/modules/clothing/suits/job_suits.dm
+++ b/code/modules/clothing/suits/job_suits.dm
@@ -271,6 +271,7 @@
desc = "A big coat for the Head of Personnel who wants to make a fashion statement. Has armour woven within the fabric."
icon_state = "hopcoat"
item_state = "hopcoat"
+ allowed = list(/obj/item/gun/energy, /obj/item/reagent_containers/spray/pepper, /obj/item/gun/projectile, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/restraints/handcuffs, /obj/item/flashlight/seclite, /obj/item/melee/classic_baton/telescopic, /obj/item/kitchen/knife/combat)
armor = list(MELEE = 15, BULLET = 10, LASER = 15, ENERGY = 5, BOMB = 15, RAD = 0, FIRE = 50, ACID = 50)
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
diff --git a/code/modules/clothing/suits/misc_suits.dm b/code/modules/clothing/suits/misc_suits.dm
index ae8646e5c70c..bfa4b04a399a 100644
--- a/code/modules/clothing/suits/misc_suits.dm
+++ b/code/modules/clothing/suits/misc_suits.dm
@@ -809,7 +809,7 @@
desc = "Aviators not included."
icon_state = "bomber"
item_state = "bomber"
- ignore_suitadjust = 0
+ ignore_suitadjust = FALSE
allowed = list(/obj/item/flashlight,/obj/item/tank/internals/emergency_oxygen,/obj/item/toy,/obj/item/storage/fancy/cigarettes,/obj/item/lighter)
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS
@@ -818,7 +818,10 @@
adjust_flavour = "unzip"
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
+ "Drask" = 'icons/mob/clothing/species/drask/suit.dmi',
+ "Grey" = 'icons/mob/clothing/species/grey/suit.dmi',
+ "Kidan" = 'icons/mob/clothing/species/kidan/suit.dmi'
)
/obj/item/clothing/suit/jacket/varsity
@@ -870,22 +873,15 @@
desc = "A suspicious but extremely stylish jacket."
icon_state = "bombersyndie"
item_state = "bombersyndie"
- ignore_suitadjust = FALSE
allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter, /obj/item/gun, /obj/item/melee/classic_baton/telescopic/contractor, /obj/item/kitchen/knife/combat)
- body_parts_covered = UPPER_TORSO | LOWER_TORSO | ARMS
- cold_protection = UPPER_TORSO | LOWER_TORSO | ARMS
- min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
- actions_types = list(/datum/action/item_action/zipper)
- adjust_flavour = "unzip"
armor = list(MELEE = 5, BULLET = 5, LASER = 5, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 30, ACID = 30)
/obj/item/clothing/suit/jacket/secbomber
name = "security bomber jacket"
- desc = "A stylish and worn-in armoured black bomber jacket emblazoned with the NT Security crest on the left breast. Looks rugged."
+ desc = "A stylish and worn-in armoured black bomber jacket emblazoned with a red stripe across the left. Looks rugged."
w_class = WEIGHT_CLASS_NORMAL
icon_state = "bombersec"
item_state = "bombersec"
- ignore_suitadjust = 0
//Inherited from Security armour.
allowed = list(/obj/item/gun/energy,/obj/item/reagent_containers/spray/pepper,/obj/item/gun/projectile,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/restraints/handcuffs,/obj/item/flashlight/seclite,/obj/item/melee/classic_baton/telescopic,/obj/item/kitchen/knife/combat)
heat_protection = UPPER_TORSO|LOWER_TORSO
@@ -895,66 +891,84 @@
put_on_delay = 40
armor = list(MELEE = 10, BULLET = 5, LASER = 10, ENERGY = 5, BOMB = 10, RAD = 0, FIRE = 20, ACID = 20)
//End of inheritance from Security armour.
- sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
- "Drask" = 'icons/mob/clothing/species/drask/suit.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/suit.dmi'
- )
/obj/item/clothing/suit/jacket/engibomber
name = "engineering bomber jacket"
desc = "A stylish and warm jacket adorned with the colors of the humble Station Engineer."
icon_state = "bomberengi"
item_state = "bomberengi"
- ignore_suitadjust = 0
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 10, FIRE = 20, ACID = 40)
allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/t_scanner, /obj/item/rcd, /obj/item/rpd)
- body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
- cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS
- min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
- actions_types = list(/datum/action/item_action/zipper)
- adjust_flavour = "unzip"
/obj/item/clothing/suit/jacket/atmosbomber
name = "atmospherics bomber jacket"
desc = "A stylish and warm jacket adorned with the colors of the magical Atmospherics Technician."
icon_state = "bomberatmos"
item_state = "bomberatmos"
- ignore_suitadjust = 0
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 10, FIRE = 20, ACID = 40)
allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/t_scanner, /obj/item/rcd, /obj/item/rpd)
- body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
- cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS
- min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
- actions_types = list(/datum/action/item_action/zipper)
- adjust_flavour = "unzip"
/obj/item/clothing/suit/jacket/cargobomber
name = "cargo bomber jacket"
desc = "A stylish jacket to keep you warm in the warehouse."
icon_state = "bombercargo"
item_state = "bombercargo"
- ignore_suitadjust = 0
allowed = list(/obj/item/rcs, /obj/item/clipboard, /obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/toy, /obj/item/lighter, /obj/item/storage/fancy/cigarettes, /obj/item/storage/bag/mail, /obj/item/envelope)
- body_parts_covered = UPPER_TORSO | LOWER_TORSO | ARMS
- cold_protection = UPPER_TORSO | LOWER_TORSO | ARMS
- min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
- actions_types = list(/datum/action/item_action/zipper)
- adjust_flavour = "unzip"
/obj/item/clothing/suit/jacket/miningbomber
name = "mining bomber jacket"
desc = "A slightly armoured and stylish jacket for shaft miners."
icon_state = "bombermining"
item_state = "bombermining"
- ignore_suitadjust = 0
allowed = list(/obj/item/pickaxe, /obj/item/t_scanner/adv_mining_scanner, /obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter, /obj/item/gun/energy/kinetic_accelerator, /obj/item/shovel, /obj/item/storage/bag/ore)
armor = list(MELEE = 5, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 0, ACID = 0)
- body_parts_covered = UPPER_TORSO | LOWER_TORSO | ARMS
- cold_protection = UPPER_TORSO | LOWER_TORSO | ARMS
- min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
- actions_types = list(/datum/action/item_action/zipper)
- adjust_flavour = "unzip"
+
+/obj/item/clothing/suit/jacket/hydrobomber
+ name = "hydroponics bomber jacket"
+ desc = "A stylish choice for the workers of the hydroponics lab."
+ icon_state = "bomberhydro"
+ item_state = "bomberhydro"
+ allowed = list(/obj/item/reagent_containers/spray, /obj/item/plant_analyzer, /obj/item/seeds, /obj/item/reagent_containers/glass/bottle, /obj/item/hatchet, /obj/item/storage/bag/plants)
+
+/obj/item/clothing/suit/jacket/medbomber
+ name = "medical bomber jacket"
+ desc = "A stain-resistant and stylish option for any member of the medical department."
+ icon_state = "bombermed"
+ item_state = "bombermed"
+ allowed = list(/obj/item/bodyanalyzer, /obj/item/analyzer, /obj/item/dnainjector, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/hypospray, /obj/item/reagent_containers/applicator, /obj/item/healthanalyzer, /obj/item/flashlight/pen, /obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/glass/beaker, /obj/item/storage/pill_bottle, /obj/item/paper)
+ armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 5, FIRE = 0, ACID = 20)
+
+/obj/item/clothing/suit/jacket/chembomber
+ name = "chemistry bomber jacket"
+ desc = "An exclusive and stylish variant of the medical bomber, for chemists only."
+ icon_state = "bomberchem"
+ item_state = "bomberchem"
+ allowed = list(/obj/item/reagent_scanner, /obj/item/reagent_scanner/adv, /obj/item/analyzer, /obj/item/dnainjector, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/hypospray, /obj/item/reagent_containers/applicator, /obj/item/healthanalyzer, /obj/item/flashlight/pen, /obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/glass/beaker, /obj/item/storage/pill_bottle, /obj/item/paper)
+ armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 5, RAD = 0, FIRE = 0, ACID = 40)
+
+/obj/item/clothing/suit/jacket/coronerbomber
+ name = "coroner's bomber jacket"
+ desc = "An extremely exclusive and stylish jacket. Coroner's use only!"
+ icon_state = "bombercoroner"
+ item_state = "bombercoroner"
+ allowed = list(/obj/item/autopsy_scanner, /obj/item/analyzer, /obj/item/dnainjector, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/hypospray, /obj/item/reagent_containers/applicator, /obj/item/healthanalyzer, /obj/item/flashlight/pen, /obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/glass/beaker, /obj/item/storage/pill_bottle, /obj/item/paper)
+ armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 5, FIRE = 0, ACID = 20)
+
+/obj/item/clothing/suit/jacket/scibomber
+ name = "science bomber jacket"
+ desc = "A stylish and slightly bomb-resistant jacket for warmth within the sterile labs."
+ icon_state = "bombersci"
+ item_state = "bombersci"
+ allowed = list(/obj/item/slime_scanner, /obj/item/reagent_scanner/adv, /obj/item/reagent_scanner, /obj/item/analyzer, /obj/item/stack/medical, /obj/item/dnainjector, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/hypospray, /obj/item/reagent_containers/applicator, /obj/item/healthanalyzer, /obj/item/flashlight/pen, /obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/glass/beaker, /obj/item/storage/pill_bottle, /obj/item/paper)
+ armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 5, RAD = 0, FIRE = 0, ACID = 20)
+
+/obj/item/clothing/suit/jacket/robobomber
+ name = "robotics bomber jacket"
+ desc = "A stylish jacket to warm you up after handling cold robotic limbs."
+ icon_state = "bomberrobo"
+ item_state = "bomberrobo"
+ allowed = list(/obj/item/robotanalyzer, /obj/item/analyzer, /obj/item/stack/medical, /obj/item/dnainjector, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/hypospray, /obj/item/reagent_containers/applicator, /obj/item/healthanalyzer, /obj/item/flashlight/pen, /obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/glass/beaker, /obj/item/storage/pill_bottle, /obj/item/paper)
+ armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 5, RAD = 0, FIRE = 0, ACID = 20)
/obj/item/clothing/suit/jacket/leather
name = "leather jacket"
diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm
index 4cb0098abffb..cc753c4d261b 100644
--- a/code/modules/customitems/item_defines.dm
+++ b/code/modules/customitems/item_defines.dm
@@ -469,13 +469,13 @@
else
to_chat(user, "You can't modify [target]!")
-
+// These two fluff items are commented out due to the transfer to MODsuits breaking these. Sprites are still in custom_items.dmi , but they need a resprite to work with MODsuits.
/obj/item/fluff/pyro_wintersec_kit //DarkLordpyro: Valthorne Haliber
name = "winter sec conversion kit"
desc = "A securirty hardsuit conversion kit."
icon_state = "modkit"
w_class = WEIGHT_CLASS_SMALL
-
+/*
/obj/item/fluff/pyro_wintersec_kit/afterattack(atom/target, mob/user, proximity)
if(!proximity || !ishuman(user) || user.incapacitated())
return
@@ -521,14 +521,14 @@
H.update_inv_wear_suit()
return
to_chat(user, "You can't modify [target]!")
-
+*/
/obj/item/fluff/sylus_conversion_kit //Decemviri: Sylus Cain
name = "cerberus pattern conversion kit"
desc = "A securirty hardsuit conversion kit."
icon_state = "modkit"
w_class = WEIGHT_CLASS_SMALL
-
+/*
/obj/item/fluff/sylus_conversion_kit/afterattack(atom/target, mob/user, proximity)
if(!proximity || !ishuman(user) || user.incapacitated())
return
@@ -581,7 +581,7 @@
to_chat(user, "You can't modify [target]!")
-
+*/
//////////////////////////////////
//////////// Clothing ////////////
//////////////////////////////////
diff --git a/code/modules/events/alien_infestation.dm b/code/modules/events/alien_infestation.dm
index 858f8ef45b0d..f2e6cc5bcf88 100644
--- a/code/modules/events/alien_infestation.dm
+++ b/code/modules/events/alien_infestation.dm
@@ -41,3 +41,4 @@
spawncount--
successSpawn = TRUE
+ SSevents.biohazards_this_round += "Xenomorphs"
diff --git a/code/modules/events/blob_spawn.dm b/code/modules/events/blob_spawn.dm
index 4220569f1208..9061bbbaf086 100644
--- a/code/modules/events/blob_spawn.dm
+++ b/code/modules/events/blob_spawn.dm
@@ -39,3 +39,4 @@
to_chat(B, "For more information, check the wiki page: ([GLOB.configuration.url.wiki_url]/index.php/Blob)")
notify_ghosts("Infected Mouse has appeared in [get_area(B)].", source = B, action = NOTIFY_FOLLOW)
successSpawn = TRUE
+ SSevents.biohazards_this_round += "Blob"
diff --git a/code/modules/events/fake_virus.dm b/code/modules/events/fake_virus.dm
index d8f33867b4b9..96d0252503a5 100644
--- a/code/modules/events/fake_virus.dm
+++ b/code/modules/events/fake_virus.dm
@@ -17,7 +17,7 @@
hypochondriac.apply_status_effect(STATUS_EFFECT_FAKE_VIRUS)
hypochondriac.create_log(MISC_LOG, "[hypochondriac] has contracted a fake virus.")
valid_targets -= hypochondriac
- notify_ghosts("[hypochondriac] now has a fake virus!")
+ notify_ghosts("[hypochondriac] now has a fake virus!", flashwindow = FALSE)
if(!length(valid_targets)) // List has been modified, lets check again
return
diff --git a/code/modules/events/spider_terror.dm b/code/modules/events/spider_terror.dm
index 9f0d0a677a52..51f71526d24a 100644
--- a/code/modules/events/spider_terror.dm
+++ b/code/modules/events/spider_terror.dm
@@ -1,9 +1,4 @@
#define TS_HIGHPOP_TRIGGER 80
-#define GREEN_SPIDER 1
-#define PRINCE_SPIDER 2
-#define WHITE_SPIDER 3
-#define PRINCESS_SPIDER 4
-#define QUEEN_SPIDER 5
/datum/event/spider_terror
announceWhen = 240
@@ -28,27 +23,27 @@
var/spider_type
var/infestation_type
if((length(GLOB.clients)) < TS_HIGHPOP_TRIGGER)
- infestation_type = pick(GREEN_SPIDER, PRINCE_SPIDER, WHITE_SPIDER, PRINCESS_SPIDER)
+ infestation_type = pick(TS_INFESTATION_GREEN_SPIDER, TS_INFESTATION_PRINCE_SPIDER, TS_INFESTATION_WHITE_SPIDER, TS_INFESTATION_PRINCESS_SPIDER)
else
- infestation_type = pick(PRINCE_SPIDER, WHITE_SPIDER, PRINCESS_SPIDER, QUEEN_SPIDER)
+ infestation_type = pick(TS_INFESTATION_PRINCE_SPIDER, TS_INFESTATION_WHITE_SPIDER, TS_INFESTATION_PRINCESS_SPIDER, TS_INFESTATION_QUEEN_SPIDER)
switch(infestation_type)
- if(GREEN_SPIDER)
+ if(TS_INFESTATION_GREEN_SPIDER)
// Weakest, only used during lowpop.
spider_type = /mob/living/simple_animal/hostile/poison/terror_spider/green
spawncount = 5
- if(PRINCE_SPIDER)
+ if(TS_INFESTATION_PRINCE_SPIDER)
// Fairly weak. Dangerous in single combat but has little staying power. Always gets whittled down.
spider_type = /mob/living/simple_animal/hostile/poison/terror_spider/prince
spawncount = 1
- if(WHITE_SPIDER)
+ if(TS_INFESTATION_WHITE_SPIDER)
// Variable. Depends how many they infect.
spider_type = /mob/living/simple_animal/hostile/poison/terror_spider/white
spawncount = 2
- if(PRINCESS_SPIDER)
+ if(TS_INFESTATION_PRINCESS_SPIDER)
// Pretty strong.
spider_type = /mob/living/simple_animal/hostile/poison/terror_spider/queen/princess
spawncount = 3
- if(QUEEN_SPIDER)
+ if(TS_INFESTATION_QUEEN_SPIDER)
// Strongest, only used during highpop.
spider_type = /mob/living/simple_animal/hostile/poison/terror_spider/queen
spawncount = 1
@@ -71,10 +66,6 @@
S.give_intro_text()
spawncount--
successSpawn = TRUE
+ SSevents.biohazards_this_round += infestation_type
#undef TS_HIGHPOP_TRIGGER
-#undef GREEN_SPIDER
-#undef PRINCE_SPIDER
-#undef WHITE_SPIDER
-#undef PRINCESS_SPIDER
-#undef QUEEN_SPIDER
diff --git a/code/modules/food_and_drinks/food/foods/frozen.dm b/code/modules/food_and_drinks/food/foods/frozen.dm
index d9c790827b77..069dfa297111 100644
--- a/code/modules/food_and_drinks/food/foods/frozen.dm
+++ b/code/modules/food_and_drinks/food/foods/frozen.dm
@@ -17,8 +17,10 @@
icon = 'icons/obj/food/frozen_treats.dmi'
icon_state = "clowncake"
slice_path = /obj/item/reagent_containers/food/snacks/frozen/clowncakeslice
+ slices_num = 5
+ bitesize = 3
list_reagents = list("nutriment" = 20, "sugar" = 5, "vitamin" = 5, "banana" = 15)
- tastes = list("cake" = 5, "sweetness" = 2, "carrot" = 1)
+ tastes = list("cake" = 5, "sweetness" = 2, "banana" = 1, "sad clowns" = 1, "ice-cream" = 1)
/obj/item/reagent_containers/food/snacks/frozen/clowncakeslice
name = "clown cake slice"
diff --git a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm
index 44c77a26e235..515af3acb849 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm
@@ -409,8 +409,8 @@
for(var/obj/O in H)
if(isclothing(O)) //clothing gets skipped to avoid cleaning out shit
continue
- if(istype(O,/obj/item/implant))
- var/obj/item/implant/I = O
+ if(istype(O,/obj/item/bio_chip))
+ var/obj/item/bio_chip/I = O
if(I.implanted)
continue
if(O.flags & NODROP || stealthmode)
diff --git a/code/modules/hydroponics/gene_modder.dm b/code/modules/hydroponics/gene_modder.dm
index 6d90036f05f9..de80880e5712 100644
--- a/code/modules/hydroponics/gene_modder.dm
+++ b/code/modules/hydroponics/gene_modder.dm
@@ -451,14 +451,3 @@
return
if((user.mind.assigned_role == "Captain" || user.mind.special_role == SPECIAL_ROLE_NUKEOPS) && (user.Adjacent(src)))
. += "... Wait. This isn't the nuclear authentication disk! It's a clever forgery!"
-
-/*
- * Plant DNA Disks Box
- */
-/obj/item/storage/box/disks_plantgene
- name = "plant data disks box"
- icon_state = "disk_kit"
-
-/obj/item/storage/box/disks_plantgene/populate_contents()
- for(var/i in 1 to 7)
- new /obj/item/disk/plantgene(src)
diff --git a/code/modules/mining/equipment/wormhole_jaunter.dm b/code/modules/mining/equipment/wormhole_jaunter.dm
index 5365d90f81f8..451353bfc28f 100644
--- a/code/modules/mining/equipment/wormhole_jaunter.dm
+++ b/code/modules/mining/equipment/wormhole_jaunter.dm
@@ -146,7 +146,7 @@
/obj/item/wormhole_jaunter/contractor/proc/create_portal(turf/destination)
new /obj/effect/decal/cleanable/ash(get_turf(src))
- new /obj/effect/portal/redspace/getaway(get_turf(src), get_turf(destination), src, 100)
+ new /obj/effect/portal/advanced/getaway(get_turf(src), get_turf(destination), src, 100)
qdel(src)
/obj/item/wormhole_jaunter/contractor/emag_act(mob/user)
@@ -162,7 +162,7 @@
new /obj/item/wormhole_jaunter/contractor(src)
new /obj/item/radio/beacon/emagged(src)
-/obj/effect/portal/redspace/getaway
+/obj/effect/portal/advanced/getaway
one_use = TRUE
/obj/effect/temp_visual/getaway_flare // Because the original contractor flare is not a temp visual, for some reason.
@@ -210,7 +210,7 @@
playsound(src, 'sound/magic/lightningbolt.ogg', 100, TRUE)
qdel(src)
return
-
+
var/list/portal_turfs = list()
for(var/turf/PT in circleviewturfs(T, 3))
if(!PT.density)
diff --git a/code/modules/mining/machine_vending.dm b/code/modules/mining/machine_vending.dm
index 8e03c2e1e749..f96ea785af88 100644
--- a/code/modules/mining/machine_vending.dm
+++ b/code/modules/mining/machine_vending.dm
@@ -341,7 +341,7 @@
EQUIPMENT("Cigarettes", /obj/item/storage/fancy/cigarettes, 100),
EQUIPMENT("Medical Marijuana", /obj/item/storage/fancy/cigarettes/cigpack_med, 250),
EQUIPMENT("Cigar", /obj/item/clothing/mask/cigarette/cigar/havana, 150),
- EQUIPMENT("Box of matches", /obj/item/storage/box/matches, 50),
+ EQUIPMENT("Box of matches", /obj/item/storage/fancy/matches, 50),
EQUIPMENT("Cheeseburger", /obj/item/reagent_containers/food/snacks/burger/cheese, 150),
EQUIPMENT("Big Burger", /obj/item/reagent_containers/food/snacks/burger/bigbite, 250),
EQUIPMENT("Recycled Prisoner", /obj/item/reagent_containers/food/snacks/soylentgreen, 500),
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index 3e7b91df663b..8fbf5c0d845e 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -518,7 +518,7 @@ GLOBAL_LIST_INIT(ventcrawl_machinery, list(/obj/machinery/atmospherics/unary/ven
if(iscarbon(src) && contents.len && ventcrawlerlocal < 2)//It must have atleast been 1 to get this far
for(var/obj/item/I in contents)
var/failed = 0
- if(istype(I, /obj/item/implant))
+ if(istype(I, /obj/item/bio_chip))
continue
if(istype(I, /obj/item/reagent_containers/patch))
continue
@@ -1136,7 +1136,7 @@ GLOBAL_LIST_INIT(ventcrawl_machinery, list(/obj/machinery/atmospherics/unary/ven
if(!(slipAny))
if(ishuman(src))
var/mob/living/carbon/human/H = src
- if(isobj(H.shoes) && H.shoes.flags & NOSLIP)
+ if(HAS_TRAIT(H, TRAIT_NOSLIP))
return FALSE
if(tilesSlipped)
diff --git a/code/modules/mob/living/carbon/examine.dm b/code/modules/mob/living/carbon/examine.dm
index 12c3d77b9c77..afa842014de5 100644
--- a/code/modules/mob/living/carbon/examine.dm
+++ b/code/modules/mob/living/carbon/examine.dm
@@ -286,7 +286,7 @@
if(stat == UNCONSCIOUS || just_sleeping)
msg += "[p_they(TRUE)] [p_are()]n't responding to anything around [p_them()] and seems to be asleep.\n"
else if(getBrainLoss() >= 60)
- msg += "[p_they(TRUE)] [p_have()] a stupid expression on [p_their()] face.\n"
+ msg += "[p_they(TRUE)] [p_are()] staring forward with a blank expression.\n"
if(get_int_organ(/obj/item/organ/internal/brain))
msg += examine_show_ssd()
diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm
index 705ae6ee6560..04d9bb6f7457 100644
--- a/code/modules/mob/living/carbon/human/human_defense.dm
+++ b/code/modules/mob/living/carbon/human/human_defense.dm
@@ -746,10 +746,8 @@ emp_act
/mob/living/carbon/human/experience_pressure_difference(pressure_difference, direction)
playsound(src, 'sound/effects/space_wind.ogg', 50, TRUE)
- if(shoes && isclothing(shoes))
- var/obj/item/clothing/S = shoes
- if(S.flags & NOSLIP)
- return FALSE
+ if(HAS_TRAIT(src, TRAIT_NOSLIP))
+ return FALSE
return ..()
/mob/living/carbon/human/water_act(volume, temperature, source, method = REAGENT_TOUCH)
diff --git a/code/modules/mob/living/carbon/human/human_life.dm b/code/modules/mob/living/carbon/human/human_life.dm
index b3f5227145aa..5cec16605726 100644
--- a/code/modules/mob/living/carbon/human/human_life.dm
+++ b/code/modules/mob/living/carbon/human/human_life.dm
@@ -99,56 +99,6 @@
else if(!vision || vision.is_broken()) // Vision organs cut out or broken? Permablind.
EyeBlind(4 SECONDS)
- if(getBrainLoss() >= 60 && stat != DEAD)
- if(prob(3))
- var/list/crazysay = list("IM A [pick("PONY","LIZARD","taJaran","kitty","Vulpakin","drASK","BIRDIE","voxxie","race car","combat meCH","SPESSSHIP")] [pick("NEEEEEEIIIIIIIIIGH","sKREEEEEE","MEOW","NYA~","rawr","Barkbark","Hissssss","vROOOOOM","pewpew","choo Choo")]!",
- "without oxigen blob don't evoluate?",
- "CAPTAINS A COMDOM",
- "[pick("", "that damn traitor")] [pick("joerge", "george", "gorge", "gdoruge")] [pick("mellens", "melons", "mwrlins")] is grifing me HAL;P!!!",
- "can u give me [pick("telikesis","halk","eppilapse")]?",
- "THe saiyans screwed",
- "Bi is THE BEST OF BOTH WORLDS",
- "I WANNA PET TEH monkeyS",
- "stop grifing me!!!!",
- "SOTP IT!",
- "HALPZ SITCULITY",
- "VOXES caN't LOVE",
- "my dad own this station",
- "the CHef put [pick("PROTEIN", "toiret waTer", "RiPPleing TendIes", "Einzymes","HORRY WALTER","nuTriments","ReActive MutAngen","TeSLium","sKrektonium")] in my [pick("wiSh soup","Bullito","rAingurber","sOilent GREEn","KoI Susishes","yaya")]!",
- "the monkey have TASER ARMS!",
- "qM blew my points on [pick("cOMbat Shtogun","inSuLated gloves","LOTS MASSHEEN!")]",
- "EI'NATH!",
- "WAKE UP SHEEPLES!",
- "et wus my [pick("wittle brother!!","fiancee","friend staying over","entiRe orphanage","love interest","wife","husband","liTTle kids","sentient cAT","accidentally")]!",
- "FUS RO DAH",
- "fuckin tangerines!!!",
- "stAT ME",
- "my FACE",
- "rOLl it eaSy!",
- "waaaaaagh!!!",
- "red wonz go fasta",
- "FOR TEH EMPRAH",
- "HAZ A SECURE DAY!!!!",
- "dem dwarfs man, dem dwarfs",
- "SPESS MAHREENS",
- "hwee did eet fhor khayosss",
- "lifelike texture",
- "luv can bloooom",
- "PACKETS!!!",
- "[pick("WHERE MY","aYE need","giv me my","bath me inn.")] [pick("dermaline","alKkyZine","dylOvene","inAprovaline","biCaridine","Hyperzine","kELotane","lePorazine","bAcch Salts","tricord","clOnexazone","hydroChloric Acid","chlORine Hydrate","paRoxetine")]!",
- "mALPRACTICEBAY",
- "I HavE A pe H dee iN ENTerpriSE resOUrCE pLaNNIN",
- "h-h-HalP MaINT",
- "dey come, dey COME! DEY COME!!!",
- "THE END IS NIGH!",
- "I FOT AND DIED FOR MUH [pick("RITES","FREEDOM","payCHECK","cARGO points","teCH Level","doG","mAPLe syrup","fluffy fWiends","gATEway LoOt")]",
- "KILL DEM [pick("mainTnacE cHickinNS","kiRA CulwnNES","FLOOR CLUWNEs","MIME ASSASSIN","BOMBING TAJARAN","cC offiser","morPhlings","slinglings")]!",
- "I CAN FORCE YOU TO SAY WHATEREVE!!?!?!")
- if(prob(66))
- say(pick(crazysay))
- else
- emote("drool")
-
/mob/living/carbon/human/handle_mutations_and_radiation()
for(var/mutation_type in active_mutations)
var/datum/mutation/mutation = GLOB.dna_mutations[mutation_type]
diff --git a/code/modules/mob/living/carbon/human/human_mob.dm b/code/modules/mob/living/carbon/human/human_mob.dm
index 6d46d5f16e71..2f0c994e8afe 100644
--- a/code/modules/mob/living/carbon/human/human_mob.dm
+++ b/code/modules/mob/living/carbon/human/human_mob.dm
@@ -1987,7 +1987,7 @@ Eyes need to have significantly high darksight to shine unless the mob has the X
if(thing != null)
equip_list[i] = thing.serialize()
- for(var/obj/item/implant/implant in src)
+ for(var/obj/item/bio_chip/implant in src)
implant_list[implant] = implant.serialize()
return data
@@ -2031,7 +2031,7 @@ Eyes need to have significantly high darksight to shine unless the mob has the X
for(var/thing in implant_list)
var/implant_data = implant_list[thing]
var/path = text2path(implant_data["type"])
- var/obj/item/implant/implant = new path(T)
+ var/obj/item/bio_chip/implant = new path(T)
if(!implant.implant(src, src))
qdel(implant)
@@ -2074,7 +2074,7 @@ Eyes need to have significantly high darksight to shine unless the mob has the X
makeCluwne()
/mob/living/carbon/human/is_literate()
- return getBrainLoss() < 100
+ return getBrainLoss() < 90
/mob/living/carbon/human/fakefire(fire_icon = "Generic_mob_burning")
diff --git a/code/modules/mob/living/carbon/human/human_say.dm b/code/modules/mob/living/carbon/human/human_say.dm
index 551689b1ec6c..50562a09e37a 100644
--- a/code/modules/mob/living/carbon/human/human_say.dm
+++ b/code/modules/mob/living/carbon/human/human_say.dm
@@ -158,7 +158,7 @@ GLOBAL_LIST_INIT(soapy_words, list(
if(prob(braindam / 4))
S.message = stutter(S.message)
verb = "gibbers"
- if(prob(braindam))
+ else if(prob(braindam / 2))
S.message = uppertext(S.message)
verb = "yells loudly"
diff --git a/code/modules/mob/living/carbon/human/species/machine.dm b/code/modules/mob/living/carbon/human/species/machine.dm
index 17e5ec1234cf..924ca49d8762 100644
--- a/code/modules/mob/living/carbon/human/species/machine.dm
+++ b/code/modules/mob/living/carbon/human/species/machine.dm
@@ -113,17 +113,6 @@
H.med_hud_set_health()
H.med_hud_set_status()
-/datum/species/machine/handle_death(gibbed, mob/living/carbon/human/H)
- var/obj/item/organ/external/head/head_organ = H.get_organ("head")
- if(!istype(head_organ))
- return
- head_organ.h_style = "Bald"
- head_organ.f_style = "Shaved"
- spawn(100)
- if(H && head_organ)
- H.update_hair()
- H.update_fhair()
-
/datum/species/machine/handle_life(mob/living/carbon/human/H) // Handles IPC starvation
..()
if(isLivingSSD(H)) // We don't want AFK people dying from this
diff --git a/code/modules/mob/living/carbon/superheroes.dm b/code/modules/mob/living/carbon/superheroes.dm
index ba0c7a9942a9..85528b51b87a 100644
--- a/code/modules/mob/living/carbon/superheroes.dm
+++ b/code/modules/mob/living/carbon/superheroes.dm
@@ -96,7 +96,7 @@
H.equip_to_slot_or_del(new /obj/item/clothing/suit/toggle/owlwings/griffinwings(H), SLOT_HUD_OUTER_SUIT)
H.equip_to_slot_or_del(new /obj/item/clothing/head/griffin/(H), SLOT_HUD_HEAD)
- var/obj/item/implant/freedom/L = new/obj/item/implant/freedom(H)
+ var/obj/item/bio_chip/freedom/L = new/obj/item/bio_chip/freedom(H)
L.implant(H)
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index daf0ab0dcd05..4c53754a20dd 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -414,7 +414,7 @@
L += get_contents(S)
for(var/obj/item/clothing/accessory/storage/S in contents)//Check for holsters
L += get_contents(S)
- for(var/obj/item/implant/storage/I in contents) //Check for storage implants.
+ for(var/obj/item/bio_chip/storage/I in contents) //Check for storage implants.
L += I.get_contents()
for(var/obj/item/gift/G in contents) //Check for gift-wrapped items
L += G.gift
diff --git a/code/modules/mob/living/silicon/robot/robot_mob.dm b/code/modules/mob/living/silicon/robot/robot_mob.dm
index 341079ffdc9e..37ee1966f42d 100644
--- a/code/modules/mob/living/silicon/robot/robot_mob.dm
+++ b/code/modules/mob/living/silicon/robot/robot_mob.dm
@@ -208,7 +208,7 @@ GLOBAL_LIST_INIT(robot_verbs_default, list(
/mob/living/silicon/robot/rename_character(oldname, newname)
if(!..(oldname, newname))
- return 0
+ return FALSE
if(oldname != real_name)
notify_ai(3, oldname, newname)
@@ -225,7 +225,7 @@ GLOBAL_LIST_INIT(robot_verbs_default, list(
if(mmi && mmi.brainmob)
mmi.brainmob.name = newname
- return 1
+ return TRUE
/mob/living/silicon/robot/proc/check_custom_sprite()
if(!custom_sprite && (ckey in GLOB.configuration.custom_sprites.cyborg_ckeys))
diff --git a/code/modules/mob/living/silicon/silicon_mob.dm b/code/modules/mob/living/silicon/silicon_mob.dm
index 3197196e4c58..ca6e2ec72655 100644
--- a/code/modules/mob/living/silicon/silicon_mob.dm
+++ b/code/modules/mob/living/silicon/silicon_mob.dm
@@ -167,13 +167,15 @@
alarm_types_clear[key] = 0
/mob/living/silicon/rename_character(oldname, newname)
- // we actually don't want it changing minds and stuff
if(!newname)
- return 0
+ return FALSE
real_name = newname
name = real_name
- return 1
+ if(mind?.is_original_mob(src))
+ mind.set_original_mob(src) // update our original mind name, since this is our original mob.
+ mind.name = newname
+ return TRUE
/mob/living/silicon/proc/show_laws()
return
diff --git a/code/modules/mob/living/simple_animal/bot/bot.dm b/code/modules/mob/living/simple_animal/bot/bot.dm
index 9366461eb337..379e8e674cd9 100644
--- a/code/modules/mob/living/simple_animal/bot/bot.dm
+++ b/code/modules/mob/living/simple_animal/bot/bot.dm
@@ -445,10 +445,10 @@
/mob/living/simple_animal/bot/rename_character(oldname, newname)
if(!..(oldname, newname))
- return 0
+ return FALSE
set_custom_texts()
- return 1
+ return TRUE
/mob/living/simple_animal/bot/proc/set_custom_texts() //Superclass for setting hack texts. Appears only if a set is not given to a bot locally.
text_hack = "You hack [name]."
diff --git a/code/modules/mob/living/simple_animal/hostile/illusion.dm b/code/modules/mob/living/simple_animal/hostile/illusion.dm
index 470315968dd9..b232b63a106f 100644
--- a/code/modules/mob/living/simple_animal/hostile/illusion.dm
+++ b/code/modules/mob/living/simple_animal/hostile/illusion.dm
@@ -64,15 +64,15 @@
for(var/i in list(IMPTRACK_HUD, IMPMINDSHIELD_HUD, IMPCHEM_HUD))
holder2 = hud_list[i]
holder2.icon_state = null
- for(var/obj/item/implant/I in H)
+ for(var/obj/item/bio_chip/I in H)
if(I.implanted)
- if(istype(I, /obj/item/implant/tracking))
+ if(istype(I, /obj/item/bio_chip/tracking))
holder2 = hud_list[IMPTRACK_HUD]
holder2.icon_state = "hud_imp_tracking"
- else if(istype(I, /obj/item/implant/mindshield))
+ else if(istype(I, /obj/item/bio_chip/mindshield))
holder2 = hud_list[IMPMINDSHIELD_HUD]
holder2.icon_state = "hud_imp_loyal"
- else if(istype(I, /obj/item/implant/chem))
+ else if(istype(I, /obj/item/bio_chip/chem))
holder2 = hud_list[IMPCHEM_HUD]
holder2.icon_state = "hud_imp_chem"
var/image/holder3 = hud_list[WANTED_HUD]
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/ancient_robot.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/ancient_robot.dm
index b11bf9f1d407..e1e4d06f04da 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/ancient_robot.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/ancient_robot.dm
@@ -256,6 +256,8 @@ Difficulty: Hard
/mob/living/simple_animal/hostile/megafauna/ancient_robot/proc/charge(atom/chargeat = target, delay = 5, chargepast = 2)
if(!chargeat)
return
+ if(chargeat.z != z)
+ return
if(mode == BLUESPACE || (enraged && prob(13)))
new /obj/effect/temp_visual/bsg_kaboom(get_turf(src))
src.visible_message("[src] teleports somewhere nearby!")
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm
index bf87953eec06..978f0d19b104 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm
@@ -63,7 +63,7 @@ Difficulty: Hard
/// Is it on its enraged exclusive second life?
var/second_life = FALSE
/// Does it have a portal to the funny second life arena created?
- var/obj/effect/portal/redspace/second_life_portal
+ var/obj/effect/portal/advanced/second_life_portal
/// Enraged healing recived
var/enraged_healing = 0
internal_gps = /obj/item/gps/internal/bubblegum
@@ -649,7 +649,7 @@ Difficulty: Hard
/mob/living/simple_animal/hostile/megafauna/bubblegum/round_2/Initialize(mapload)
. = ..()
for(var/obj/effect/landmark/spawner/bubblegum_exit/E in GLOB.landmarks_list)
- second_life_portal = new /obj/effect/portal/redspace(get_turf(E), get_turf(src), null, 2 HOURS, src, FALSE)
+ second_life_portal = new /obj/effect/portal/advanced(get_turf(E), get_turf(src), null, 2 HOURS, src, FALSE)
break
RegisterSignal(src, COMSIG_HOSTILE_FOUND_TARGET, PROC_REF(i_see_you))
for(var/mob/living/carbon/human/H in range(20))
diff --git a/code/modules/mob/living/simple_animal/hostile/mining/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining/hivelord.dm
index 4c89d2b6bd94..c7c33b6daa63 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining/hivelord.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining/hivelord.dm
@@ -392,7 +392,7 @@
if(prob(10))
l_pocket = pickweight(list(/obj/item/bikehorn/golden = 3, /obj/item/bikehorn/airhorn= 1 ))
if(prob(10))
- r_pocket = /obj/item/implanter/sad_trombone
+ r_pocket = /obj/item/bio_chip_implanter/sad_trombone
if("Golem")
mob_species = pick(list(/datum/species/golem/adamantine, /datum/species/golem/plasma, /datum/species/golem/diamond, /datum/species/golem/gold, /datum/species/golem/silver, /datum/species/golem/plasteel, /datum/species/golem/titanium, /datum/species/golem/plastitanium))
if(prob(30))
diff --git a/code/modules/mob/living/simple_animal/posessed_object.dm b/code/modules/mob/living/simple_animal/posessed_object.dm
index 55c2dbffda50..475a4f84da67 100644
--- a/code/modules/mob/living/simple_animal/posessed_object.dm
+++ b/code/modules/mob/living/simple_animal/posessed_object.dm
@@ -16,6 +16,7 @@
no_spin_thrown = TRUE
del_on_death = TRUE
+ weather_immunities = list("ash")
/// The probability % of us escaping if stuffed into a bag/toolbox/etc
var/escape_chance = 10
diff --git a/code/modules/mob/living/simple_animal/shade.dm b/code/modules/mob/living/simple_animal/shade.dm
index a00609a43dd7..2878a7d4595c 100644
--- a/code/modules/mob/living/simple_animal/shade.dm
+++ b/code/modules/mob/living/simple_animal/shade.dm
@@ -62,6 +62,7 @@
can_change_intents = FALSE // same here
health = 100
maxHealth = 100
+ weather_immunities = list("ash")
/mob/living/simple_animal/shade/sword/Initialize(mapload)
.=..()
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index ebcfa14a2992..1f0516b06408 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -628,7 +628,25 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \
return 1
face_atom(A)
- var/list/result = A.examine(src)
+ if(!client)
+ var/list/result = A.examine(src)
+ to_chat(src, chat_box_examine(result.Join("\n")))
+ return
+
+ var/list/result
+ LAZYINITLIST(client.recent_examines)
+ for(var/key in client.recent_examines)
+ if(client.recent_examines[key] < world.time)
+ client.recent_examines -= key
+ var/ref_to_atom = A.UID()
+ if(LAZYACCESS(client.recent_examines, ref_to_atom))
+ result = A.examine_more(src)
+ if(!length(result))
+ result += "You examine [A] closer, but find nothing of interest..."
+ else
+ result = A.examine(src)
+ client.recent_examines[ref_to_atom] = world.time + EXAMINE_MORE_WINDOW // set to when we should not examine something
+
to_chat(src, chat_box_examine(result.Join("\n")))
/mob/proc/ret_grab(obj/effect/list_container/mobl/L as obj, flag)
diff --git a/code/modules/mob/mob_misc_procs.dm b/code/modules/mob/mob_misc_procs.dm
index e698bb602a72..e90fa1aa0e47 100644
--- a/code/modules/mob/mob_misc_procs.dm
+++ b/code/modules/mob/mob_misc_procs.dm
@@ -99,7 +99,7 @@
INVOKE_ASYNC(client, TYPE_PROC_REF(/client, colour_transition), get_screen_colour(), flash_time)
/proc/ismindshielded(A) //Checks to see if the person contains a mindshield implant, then checks that the implant is actually inside of them
- for(var/obj/item/implant/mindshield/L in A)
+ for(var/obj/item/bio_chip/mindshield/L in A)
if(L && L.implanted)
return 1
return 0
@@ -602,7 +602,7 @@
/mob/proc/rename_character(oldname, newname)
if(!newname)
- return 0
+ return FALSE
real_name = newname
name = newname
if(mind)
@@ -620,8 +620,8 @@
//update our pda and id if we have them on our person
var/list/searching = GetAllContents(searchDepth = 3)
- var/search_id = 1
- var/search_pda = 1
+ var/search_id = TRUE
+ var/search_pda = TRUE
for(var/A in searching)
if(search_id && istype(A,/obj/item/card/id))
@@ -630,27 +630,26 @@
ID.registered_name = newname
ID.name = "[newname]'s ID Card ([ID.assignment])"
ID.RebuildHTML()
- if(!search_pda) break
- search_id = 0
+ if(!search_pda)
+ break
+ search_id = FALSE
else if(search_pda && istype(A,/obj/item/pda))
var/obj/item/pda/PDA = A
if(PDA.owner == oldname)
PDA.owner = newname
PDA.name = "PDA-[newname] ([PDA.ownjob])"
- if(!search_id) break
- search_pda = 0
+ if(!search_id)
+ break
+ search_pda = FALSE
//Fixes renames not being reflected in objective text
- var/length
- var/pos
- for(var/datum/objective/objective in GLOB.all_objectives)
- if(!mind || objective.target != mind)
- continue
- length = length_char(oldname) // SS220 EDIT - ORIGINAL: length
- pos = findtextEx_char(objective.explanation_text, oldname) // SS220 EDIT - ORIGINAL: findtextEx
- objective.explanation_text = copytext_char(objective.explanation_text, 1, pos)+newname+copytext_char(objective.explanation_text, pos+length) // SS220 EDIT - ORIGINAL: copytext
- return 1
+ if(mind)
+ for(var/datum/objective/objective in GLOB.all_objectives)
+ if(objective.target != mind)
+ continue
+ objective.update_explanation_text()
+ return TRUE
/mob/proc/rename_self(role, allow_numbers = FALSE, force = FALSE)
spawn(0)
diff --git a/code/modules/mod/mod_clothes.dm b/code/modules/mod/mod_clothes.dm
index bb2640cdd65e..d08429da4ad9 100644
--- a/code/modules/mod/mod_clothes.dm
+++ b/code/modules/mod/mod_clothes.dm
@@ -14,7 +14,7 @@
"Grey" = 'icons/mob/clothing/modsuit/species/grey_helmets.dmi',
"Vulpkanin" = 'icons/mob/clothing/modsuit/species/vulp_modsuits.dmi',
"Tajaran" = 'icons/mob/clothing/modsuit/species/taj_modsuits.dmi',
- "Unathi" = 'icons/mob/clothing/modsuit/species/modsuits_younahthee.dmi',
+ "Unathi" = 'icons/mob/clothing/modsuit/species/unathi_modsuits.dmi',
"Vox" = 'icons/mob/clothing/modsuit/species/vox_modsuits.dmi'
)
@@ -40,7 +40,7 @@
sprite_sheets = list(
"Vulpkanin" = 'icons/mob/clothing/modsuit/species/vulp_modsuits.dmi',
"Tajaran" = 'icons/mob/clothing/modsuit/species/taj_modsuits.dmi',
- "Unathi" = 'icons/mob/clothing/modsuit/species/modsuits_younahthee.dmi',
+ "Unathi" = 'icons/mob/clothing/modsuit/species/unathi_modsuits.dmi',
"Vox" = 'icons/mob/clothing/modsuit/species/vox_modsuits.dmi'
)
@@ -60,7 +60,7 @@
sprite_sheets = list(
"Vulpkanin" = 'icons/mob/clothing/modsuit/species/vulp_modsuits.dmi',
"Tajaran" = 'icons/mob/clothing/modsuit/species/taj_modsuits.dmi',
- "Unathi" = 'icons/mob/clothing/modsuit/species/modsuits_younahthee.dmi',
+ "Unathi" = 'icons/mob/clothing/modsuit/species/unathi_modsuits.dmi',
"Vox" = 'icons/mob/clothing/modsuit/species/vox_modsuits.dmi'
)
@@ -80,6 +80,6 @@
sprite_sheets = list(
"Vulpkanin" = 'icons/mob/clothing/modsuit/species/vulp_modsuits.dmi',
"Tajaran" = 'icons/mob/clothing/modsuit/species/taj_modsuits.dmi',
- "Unathi" = 'icons/mob/clothing/modsuit/species/modsuits_younahthee.dmi',
+ "Unathi" = 'icons/mob/clothing/modsuit/species/unathi_modsuits.dmi',
"Vox" = 'icons/mob/clothing/modsuit/species/vox_modsuits.dmi'
)
diff --git a/code/modules/mod/mod_control.dm b/code/modules/mod/mod_control.dm
index 29885c2809ad..bf016502b8cc 100644
--- a/code/modules/mod/mod_control.dm
+++ b/code/modules/mod/mod_control.dm
@@ -203,7 +203,10 @@
. += "You could remove [core] with a wrench."
else
. += "You could use a MOD core on it to install one."
- . += "[extended_desc]" //god is dead
+
+/obj/item/mod/control/examine_more(mob/user)
+ . = ..()
+ . += "[extended_desc]"
/obj/item/mod/control/process()
if(seconds_electrified > 0)
diff --git a/code/modules/mod/mod_theme.dm b/code/modules/mod/mod_theme.dm
index 3d50e73e1273..d4057244a450 100644
--- a/code/modules/mod/mod_theme.dm
+++ b/code/modules/mod/mod_theme.dm
@@ -289,7 +289,7 @@
offering full view of the land and its soon-to-be-dead inhabitants. The armor plating has been trimmed down to \
the bare essentials, geared far more for environmental hazards than combat against fauna; however, \
this gives way to incredible protection against corrosives and thermal protection good enough for \
- both casual backstroking through molten magma and romantic walks through arctic terrain. \
+ traversing the hostile climate of scorching hot barren planets, molten, and volcanic worlds like Epsilon Eridanii II. \
Instead, the suit is capable of using its' anomalous properties to attract and \
carefully distribute layers of ash or ice across the surface; these layers are ablative, but incredibly strong. \
However, all of this has proven to be straining on all Nanotrasen-approved cells, \
diff --git a/code/modules/mod/modules/module_pathfinder.dm b/code/modules/mod/modules/module_pathfinder.dm
index 2a09c01a11e7..2b9a95508d99 100644
--- a/code/modules/mod/modules/module_pathfinder.dm
+++ b/code/modules/mod/modules/module_pathfinder.dm
@@ -14,7 +14,7 @@
use_power_cost = DEFAULT_CHARGE_DRAIN * 200
incompatible_modules = list(/obj/item/mod/module/pathfinder)
/// The pathfinding implant.
- var/obj/item/implant/mod/implant
+ var/obj/item/bio_chip/mod/implant
/obj/item/mod/module/pathfinder/Initialize(mapload)
. = ..()
@@ -60,7 +60,7 @@
playsound(mod, 'sound/machines/ping.ogg', 50, TRUE)
drain_power(use_power_cost)
-/obj/item/implant/mod
+/obj/item/bio_chip/mod
name = "MOD pathfinder implant"
desc = "Lets you recall a MODsuit to you at any time."
implant_data = /datum/implant_fluff/pathfinder
@@ -77,21 +77,21 @@
var/tries = 0
-/obj/item/implant/mod/Initialize(mapload)
+/obj/item/bio_chip/mod/Initialize(mapload)
. = ..()
if(!istype(loc, /obj/item/mod/module/pathfinder))
return INITIALIZE_HINT_QDEL
module = loc
jet_icon = image(icon = 'icons/obj/clothing/modsuit/mod_modules.dmi', icon_state = "mod_jet", layer = LOW_ITEM_LAYER)
-/obj/item/implant/mod/Destroy()
+/obj/item/bio_chip/mod/Destroy()
if(path)
end_recall(successful = FALSE)
module = null
jet_icon = null
return ..()
-/obj/item/implant/mod/proc/recall()
+/obj/item/bio_chip/mod/proc/recall()
target = get_turf(imp_in)
if(!module?.mod)
to_chat(imp_in, "Module is not attached to a suit!")
@@ -126,12 +126,12 @@
mod_move(target)
return TRUE
-/obj/item/implant/mod/proc/set_path(list/newpath)
+/obj/item/bio_chip/mod/proc/set_path(list/newpath)
if(newpath == null)
end_recall(FALSE)
path = newpath ? newpath : list()
-/obj/item/implant/mod/proc/end_recall(successful = TRUE)
+/obj/item/bio_chip/mod/proc/end_recall(successful = TRUE)
if(!module?.mod)
return
module.mod.cut_overlay(jet_icon)
@@ -141,14 +141,14 @@
to_chat(imp_in, "Lost connection to suit!")
path = list() //Stopping endless end_recall with luck.
-/obj/item/implant/mod/proc/on_move(atom/movable/source, atom/old_loc, dir, forced)
+/obj/item/bio_chip/mod/proc/on_move(atom/movable/source, atom/old_loc, dir, forced)
SIGNAL_HANDLER
var/matrix/mod_matrix = matrix()
mod_matrix.Turn(get_angle(source, imp_in))
source.transform = mod_matrix
-/obj/item/implant/mod/proc/mod_move(dest)
+/obj/item/bio_chip/mod/proc/mod_move(dest)
dest = get_turf(dest) //We must always compare turfs, so get the turf of the dest var if dest was originally something else.
if(get_turf(module.mod) == dest) //We have arrived, no need to move again.
for(var/mob/living/carbon/human/H in range(1, module.mod))
@@ -184,7 +184,7 @@
return TRUE
-/obj/item/implant/mod/proc/mod_step() //Step,increase tries if failed
+/obj/item/bio_chip/mod/proc/mod_step() //Step,increase tries if failed
if(!path || !length(path))
return FALSE
for(var/obj/machinery/door/D in range(2, module.mod))
@@ -203,7 +203,7 @@
tries = 0
return TRUE
-/obj/item/implant/mod/proc/increment_path()
+/obj/item/bio_chip/mod/proc/increment_path()
if(!path || !length(path))
return
path.Cut(1, 2)
@@ -222,7 +222,7 @@
/datum/action/item_action/mod_recall/New(Target)
..()
- if(!istype(Target, /obj/item/implant/mod))
+ if(!istype(Target, /obj/item/bio_chip/mod))
qdel(src)
return
@@ -230,7 +230,7 @@
. = ..()
if(!.)
return
- var/obj/item/implant/mod/implant = target
+ var/obj/item/bio_chip/mod/implant = target
if(!COOLDOWN_FINISHED(src, recall_cooldown))
to_chat(usr, "On cooldown!")
return
diff --git a/code/modules/mod/modules/modules_antag.dm b/code/modules/mod/modules/modules_antag.dm
index c4777b08e469..912c1018b317 100644
--- a/code/modules/mod/modules/modules_antag.dm
+++ b/code/modules/mod/modules/modules_antag.dm
@@ -143,10 +143,10 @@
origin_tech = "syndicate=1"
/obj/item/mod/module/noslip/on_suit_activation()
- mod.boots.flags |= NOSLIP
+ ADD_TRAIT(mod.wearer, TRAIT_NOSLIP, UID())
/obj/item/mod/module/noslip/on_suit_deactivation(deleting = FALSE)
- mod.boots.flags ^= NOSLIP
+ REMOVE_TRAIT(mod.wearer, TRAIT_NOSLIP, UID())
//Bite of 87 Springlock - Equips faster, disguised as DNA lock, can block retracting for 10 seconds.
/obj/item/mod/module/springlock/bite_of_87
diff --git a/code/modules/mod/modules/modules_engineering.dm b/code/modules/mod/modules/modules_engineering.dm
index 0b2f5a456cbb..bf118f3edad4 100644
--- a/code/modules/mod/modules/modules_engineering.dm
+++ b/code/modules/mod/modules/modules_engineering.dm
@@ -57,7 +57,7 @@
. = ..()
if(!.)
return
- mod.boots.flags |= NOSLIP
+ ADD_TRAIT(mod.wearer, TRAIT_NOSLIP, UID())
mod.slowdown += slowdown_active
ADD_TRAIT(mod.wearer, TRAIT_MAGPULSE, "magbooted")
@@ -65,7 +65,7 @@
. = ..()
if(!.)
return
- mod.boots.flags ^= NOSLIP
+ REMOVE_TRAIT(mod.wearer, TRAIT_NOSLIP, UID())
mod.slowdown -= slowdown_active
REMOVE_TRAIT(mod.wearer, TRAIT_MAGPULSE, "magbooted")
diff --git a/code/modules/ninja/suit/ninja_shoes.dm b/code/modules/ninja/suit/ninja_shoes.dm
index 2ec11a2aebc0..5095058efc16 100644
--- a/code/modules/ninja/suit/ninja_shoes.dm
+++ b/code/modules/ninja/suit/ninja_shoes.dm
@@ -4,7 +4,7 @@
desc = "A pair of running shoes. Excellent for running and even better for smashing skulls."
icon_state = "s-ninja"
permeability_coefficient = 0.01
- flags = NOSLIP
+ no_slip = TRUE
armor = list(MELEE = 75, BULLET = 50, LASER = 20, ENERGY = 10, BOMB = 20, RAD = 15, FIRE = INFINITY, ACID = INFINITY)
cold_protection = FEET
min_cold_protection_temperature = SHOES_MIN_TEMP_PROTECT
diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm
index 44b99c137209..bb2290f27734 100644
--- a/code/modules/paperwork/paper.dm
+++ b/code/modules/paperwork/paper.dm
@@ -577,6 +577,11 @@
name = "discoveries and thoughts"
info = "As the Diona species, we awoke aboard our terraformation vessel with the primary goal of reshaping the alien world. Our endeavors were highly successful, as we cultivated various plant species and made astonishing discoveries throughout our journey. We seeded a remarkable 'special' grass around our ship, which thrived splendidly. However, as time passed, we faced a growing challenge - a shortage of oxygen in our containment tanks hindered our ability to spread the grass further. In response, we embarked on a series of trials and experiments to engineer plants with the capacity to survive in low-oxygen environments, thus extending our breath of life.
Through a series of trials, combining failures and successes, we unveiled several plant species with unique attributes. Some proved to be valuable for healing purposes, while others offered addictive properties. Glowing mushrooms emerged as a source of vital light, preventing us from succumbing to the darkness. Among these discoveries, one plant commanded our utmost attention – the 'space tobacco.' While this species did not generate oxygen, it contained a chemical known as Salbutamol, enabling us to respire in low-oxygen conditions when consumed. The only drawback was the need to meticulously extract harmful compounds for its safe utilization.
Amid our efforts to expand the greenery, an unexpected encounter transpired. I found myself under assault by an enigmatic creature, and I was forced to flee in haste, straying too far from our vessel. As I stand now, my supplies of life-sustaining plants are dwindling, as is my ability to endure in this low-oxygen environment. Suffocation looms, and I must hasten my return to the safety of our ship to avert this dire fate."
+/obj/item/paper/crumpled/bloody/hacker
+ name = "burned paper scrap"
+ icon_state = "scrap_bloodied"
+ info = "FINALLY, I DECIPHERED NTS' FAXING NETWO-
"
+
/obj/item/paper/fortune
name = "fortune"
icon_state = "slip"
diff --git a/code/modules/pda/PDA.dm b/code/modules/pda/PDA.dm
index f4dec2234251..a247777e91f7 100644
--- a/code/modules/pda/PDA.dm
+++ b/code/modules/pda/PDA.dm
@@ -378,20 +378,21 @@ GLOBAL_LIST_EMPTY(PDAs)
for(var/mob/O in hearers(3, loc))
O.show_message(text("[bicon(src)] *[ttone]*"))
-/obj/item/pda/proc/set_ringtone()
- var/t = input("Please enter new ringtone", name, ttone) as text
- if(in_range(src, usr) && loc == usr)
- if(t)
- if(hidden_uplink && hidden_uplink.check_trigger(usr, trim(lowertext(t)), lowertext(lock_code))) // SS220 EDIT - ORIGINAL: (usr, lowertext(t), lowertext(lock_code)))
- to_chat(usr, "The PDA softly beeps.")
- close(usr)
- else
- t = sanitize(copytext_char(t, 1, 20)) // SS220 EDIT - ORIGINAL: copytext
- ttone = t
- return 1
- else
- close(usr)
- return 0
+/obj/item/pda/proc/set_ringtone(mob/user)
+ var/new_tone = input("Please enter new ringtone", name, ttone) as text
+ new_tone = trim(new_tone)
+ if(!in_range(src, user) || loc != user)
+ close(user)
+ return FALSE
+ if(!new_tone)
+ return FALSE
+
+ if(hidden_uplink && hidden_uplink.check_trigger(user, lowertext(new_tone), lowertext(lock_code)))
+ to_chat(user, "The PDA softly beeps.")
+ close(user)
+ return TRUE
+ ttone = sanitize(copytext_char(new_tone, 1, 20)) // SS220 EDIT - ORIGINAL: copytext
+ return TRUE
/obj/item/pda/process()
if(current_app)
diff --git a/code/modules/pda/pda_tgui.dm b/code/modules/pda/pda_tgui.dm
index 00e1c6580aea..535d47616b4d 100644
--- a/code/modules/pda/pda_tgui.dm
+++ b/code/modules/pda/pda_tgui.dm
@@ -62,7 +62,7 @@
if(..())
return
- add_fingerprint(usr)
+ add_fingerprint(ui.user)
. = TRUE
switch(action)
@@ -93,13 +93,13 @@
update_shortcuts()
playsound(src, 'sound/machines/terminal_eject.ogg', 50, TRUE)
if("Authenticate") //Checks for ID
- id_check(usr, 1)
+ id_check(ui.user, 1)
if("Available_Ringtones")
ttone = params["selected_ringtone"]
if("Ringtone")
if(!silent)
playsound(src, 'sound/machines/terminal_select.ogg', 15, TRUE)
- return set_ringtone()
+ return set_ringtone(ui.user)
else
if(current_app)
. = current_app.ui_act(action, params, ui, state) // It needs proxying through down here so apps actually have their interacts called
diff --git a/code/modules/pda/pdas.dm b/code/modules/pda/pdas.dm
index 534399396954..8d568b0f1454 100644
--- a/code/modules/pda/pdas.dm
+++ b/code/modules/pda/pdas.dm
@@ -186,24 +186,3 @@
var/datum/data/pda/app/messenger/M = find_program(/datum/data/pda/app/messenger)
if(M)
M.m_hidden = 1
-
-//Some spare PDAs in a box
-/obj/item/storage/box/PDAs
- name = "spare PDAs"
- desc = "A box of spare PDA microcomputers."
- icon = 'icons/obj/pda.dmi'
- icon_state = "pdabox"
-
-/obj/item/storage/box/PDAs/populate_contents()
- new /obj/item/pda(src)
- new /obj/item/pda(src)
- new /obj/item/pda(src)
- new /obj/item/pda(src)
- new /obj/item/cartridge/head(src)
-
- var/newcart = pick( /obj/item/cartridge/engineering,
- /obj/item/cartridge/security,
- /obj/item/cartridge/medical,
- /obj/item/cartridge/signal/toxins,
- /obj/item/cartridge/cargo)
- new newcart(src)
diff --git a/code/modules/power/apc/apc.dm b/code/modules/power/apc/apc.dm
index 54288d681250..f27668e5af46 100644
--- a/code/modules/power/apc/apc.dm
+++ b/code/modules/power/apc/apc.dm
@@ -520,7 +520,7 @@
if(istype(H))
if(H.getBrainLoss() >= 60)
for(var/mob/M in viewers(src, null))
- to_chat(M, "[H] stares cluelessly at [src] and drools.")
+ to_chat(M, "[H] stares cluelessly at [src].")
return FALSE
else if(prob(H.getBrainLoss()))
to_chat(user, "You momentarily forget how to use [src].")
diff --git a/code/modules/reagents/chemistry/reagents/drinks_reagents.dm b/code/modules/reagents/chemistry/reagents/drinks_reagents.dm
index 2b62c63e9c38..27d2d5977ce4 100644
--- a/code/modules/reagents/chemistry/reagents/drinks_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/drinks_reagents.dm
@@ -271,10 +271,6 @@
/datum/reagent/consumable/drink/hot_coco/on_mob_life(mob/living/M)
if(M.bodytemperature < 310) // 310 is the normal bodytemp. 310.055
M.bodytemperature = min(310, M.bodytemperature + (5 * TEMPERATURE_DAMAGE_COEFFICIENT))
- var/update_flags = STATUS_UPDATE_NONE
- if(isvulpkanin(M) || istajaran(M) || isfarwa(M) || iswolpin(M))
- update_flags |= M.adjustToxLoss(2, FALSE)
- return ..() | update_flags
/datum/reagent/consumable/drink/coffee
name = "Coffee"
diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm
index 50807d7b54f8..2a541a575d84 100644
--- a/code/modules/reagents/chemistry/reagents/food_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm
@@ -343,12 +343,6 @@
color = "#5F3A13"
taste_description = "bitter cocoa"
-/datum/reagent/consumable/cocoa/on_mob_life(mob/living/M)
- var/update_flags = STATUS_UPDATE_NONE
- if(isvulpkanin(M) || istajaran(M) || isfarwa(M) || iswolpin(M))
- update_flags |= M.adjustToxLoss(2, FALSE)
- return ..() | update_flags
-
/datum/reagent/consumable/vanilla
name = "Vanilla"
id = "vanilla"
@@ -603,10 +597,6 @@
/datum/reagent/consumable/chocolate/on_mob_life(mob/living/M)
M.reagents.add_reagent("sugar", 0.8)
- var/update_flags = STATUS_UPDATE_NONE
- if(isvulpkanin(M) || istajaran(M) || isfarwa(M) || iswolpin(M)) // chocolate is bad for dogs and cats, ya know
- update_flags |= M.adjustToxLoss(2, FALSE)
- return ..() | update_flags
/datum/reagent/consumable/chocolate/reaction_turf(turf/T, volume)
if(volume >= 5 && !isspaceturf(T))
@@ -618,7 +608,7 @@
description = "A rather bitter herb once thought to hold magical protective properties."
reagent_state = LIQUID
color = "#21170E"
- process_flags = ORGANIC | SYNTHETIC
+ process_flags = ORGANIC | SYNTHETIC
taste_description = "tea"
harmless = TRUE
diff --git a/code/modules/reagents/chemistry/recipes/slime_extracts.dm b/code/modules/reagents/chemistry/recipes/slime_extracts.dm
index 6fe535ff9d0e..a25bbe0a7140 100644
--- a/code/modules/reagents/chemistry/recipes/slime_extracts.dm
+++ b/code/modules/reagents/chemistry/recipes/slime_extracts.dm
@@ -172,7 +172,8 @@
/obj/item/reagent_containers/food/snacks/chinese,
/obj/item/reagent_containers/food/snacks/human,
/obj/item/reagent_containers/food/snacks/monstermeat,
- /obj/item/reagent_containers/food/snacks/meatsteak/stimulating
+ /obj/item/reagent_containers/food/snacks/meatsteak/stimulating,
+ /obj/item/reagent_containers/food/snacks/egg/watcher
)
blocked |= typesof(/obj/item/reagent_containers/food/snacks/customizable)
diff --git a/code/modules/reagents/reagent_containers/iv_bag.dm b/code/modules/reagents/reagent_containers/iv_bag.dm
index e6e64b404810..0236eb5ed2eb 100644
--- a/code/modules/reagents/reagent_containers/iv_bag.dm
+++ b/code/modules/reagents/reagent_containers/iv_bag.dm
@@ -74,10 +74,10 @@
else // Drawing
if(reagents.total_volume < reagents.maximum_volume)
injection_target.transfer_blood_to(src, amount_per_transfer_from_this)
- for(var/datum/reagent/x in injection_target.reagents.reagent_list) // Pull small amounts of reagents from the person while drawing blood
- if(x.id in GLOB.blocked_chems)
+ for(var/datum/reagent/reagent in injection_target.reagents.reagent_list) // Pull small amounts of reagents from the person while drawing blood
+ if(reagent.id in GLOB.blocked_chems)
continue
- injection_target.reagents.trans_to(src, amount_per_transfer_from_this/10)
+ injection_target.reagents.trans_id_to(src, reagent.id, amount_per_transfer_from_this / 10)
update_icon(UPDATE_OVERLAYS)
/obj/item/reagent_containers/iv_bag/attack(mob/living/M, mob/living/user, def_zone)
diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm
index 8f3a15c754d5..ce03f7589b60 100644
--- a/code/modules/recycling/sortingmachinery.dm
+++ b/code/modules/recycling/sortingmachinery.dm
@@ -365,7 +365,7 @@
/obj/item/shippingPackage
name = "Shipping package"
desc = "A pre-labeled package for shipping an item to coworkers."
- icon = 'icons/obj/storage.dmi'
+ icon = 'icons/obj/boxes.dmi'
icon_state = "shippack"
var/obj/item/wrapped = null
var/sortTag = 1
diff --git a/code/modules/research/designs/medical_designs.dm b/code/modules/research/designs/medical_designs.dm
index 91620b6e399a..0c5a86e82d61 100644
--- a/code/modules/research/designs/medical_designs.dm
+++ b/code/modules/research/designs/medical_designs.dm
@@ -588,54 +588,54 @@
////////////Regular Implants/////////////
/////////////////////////////////////////
-/datum/design/implanter
+/datum/design/bio_chip_implanter
name = "Bio-chip Implanter"
desc = "A sterile automatic bio-chip injector."
id = "implanter"
req_tech = list("materials" = 2, "biotech" = 3, "programming" = 2)
build_type = PROTOLATHE
materials = list(MAT_METAL = 600, MAT_GLASS = 200)
- build_path = /obj/item/implanter
+ build_path = /obj/item/bio_chip_implanter
category = list("Medical")
-/datum/design/implantcase
+/datum/design/bio_chip_case
name = "Bio-chip Case"
desc = "A glass case containing a bio-chip."
id = "implantcase"
req_tech = list("biotech" = 2)
build_type = PROTOLATHE
materials = list(MAT_GLASS = 500)
- build_path = /obj/item/implantcase
+ build_path = /obj/item/bio_chip_case
category = list("Medical")
-/datum/design/implant_chem
+/datum/design/bio_chip_chem
name = "Chemical Bio-chip Case"
desc = "A glass case containing a bio-chip."
id = "implant_chem"
req_tech = list("materials" = 3, "biotech" = 5)
build_type = PROTOLATHE
materials = list(MAT_GLASS = 700)
- build_path = /obj/item/implantcase/chem
+ build_path = /obj/item/bio_chip_case/chem
category = list("Medical")
-/datum/design/implant_sadtrombone
+/datum/design/bio_chip_sad_trombone
name = "Sad Trombone Bio-chip Case"
desc = "Makes death amusing."
id = "implant_trombone"
req_tech = list("materials" = 3, "biotech" = 5)
build_type = PROTOLATHE
materials = list(MAT_GLASS = 500, MAT_BANANIUM = 500)
- build_path = /obj/item/implantcase/sad_trombone
+ build_path = /obj/item/bio_chip_case/sad_trombone
category = list("Medical")
-/datum/design/implant_tracking
+/datum/design/bio_chip_tracking
name = "Tracking Bio-chip Case"
desc = "A glass case containing a bio-chip."
id = "implant_tracking"
req_tech = list("materials" = 2, "biotech" = 3, "magnets" = 3, "programming" = 2)
build_type = PROTOLATHE
materials = list(MAT_METAL = 500, MAT_GLASS = 500)
- build_path = /obj/item/implantcase/tracking
+ build_path = /obj/item/bio_chip_case/tracking
category = list("Medical")
//Cybernetic organs
diff --git a/code/modules/response_team/ert.dm b/code/modules/response_team/ert.dm
index 5975eb7f1fb9..33b4895a1e31 100644
--- a/code/modules/response_team/ert.dm
+++ b/code/modules/response_team/ert.dm
@@ -368,7 +368,7 @@ GLOBAL_LIST_EMPTY(ert_request_messages)
box = /obj/item/storage/box/responseteam
gloves = /obj/item/clothing/gloves/combat
- implants = list(/obj/item/implant/mindshield)
+ bio_chips = list(/obj/item/bio_chip/mindshield)
/obj/item/radio/centcom
name = "centcomm bounced radio"
diff --git a/code/modules/response_team/ert_outfits.dm b/code/modules/response_team/ert_outfits.dm
index 6d69660f7818..c3e7c3de8c45 100644
--- a/code/modules/response_team/ert_outfits.dm
+++ b/code/modules/response_team/ert_outfits.dm
@@ -84,9 +84,9 @@
/obj/item/organ/internal/cyberimp/chest/nutriment/hardened
)
- implants = list(
- /obj/item/implant/mindshield,
- /obj/item/implant/death_alarm
+ bio_chips = list(
+ /obj/item/bio_chip/mindshield,
+ /obj/item/bio_chip/death_alarm
)
/datum/outfit/job/centcom/response_team/commander/gamma
@@ -113,9 +113,9 @@
/obj/item/organ/internal/cyberimp/arm/flash
)
- implants = list(
- /obj/item/implant/mindshield,
- /obj/item/implant/death_alarm
+ bio_chips = list(
+ /obj/item/bio_chip/mindshield,
+ /obj/item/bio_chip/death_alarm
)
//////////////////// SECURITY ///////////////////
@@ -169,9 +169,9 @@
/obj/item/organ/internal/cyberimp/eyes/hud/security
)
- implants = list(
- /obj/item/implant/mindshield,
- /obj/item/implant/death_alarm
+ bio_chips = list(
+ /obj/item/bio_chip/mindshield,
+ /obj/item/bio_chip/death_alarm
)
/datum/outfit/job/centcom/response_team/security/gamma
@@ -201,9 +201,9 @@
/obj/item/organ/internal/cyberimp/chest/reviver/hardened
)
- implants = list(
- /obj/item/implant/mindshield,
- /obj/item/implant/death_alarm
+ bio_chips = list(
+ /obj/item/bio_chip/mindshield,
+ /obj/item/bio_chip/death_alarm
)
//////////////////// ENGINEER ///////////////////
@@ -270,9 +270,9 @@
/obj/item/organ/internal/cyberimp/brain/wire_interface/hardened
)
- implants = list(
- /obj/item/implant/mindshield,
- /obj/item/implant/death_alarm
+ bio_chips = list(
+ /obj/item/bio_chip/mindshield,
+ /obj/item/bio_chip/death_alarm
)
/datum/outfit/job/centcom/response_team/engineer/gamma
@@ -301,8 +301,8 @@
/obj/item/organ/internal/cyberimp/brain/wire_interface/hardened
)
- implants = list(/obj/item/implant/mindshield,
- /obj/item/implant/death_alarm
+ bio_chips = list(/obj/item/bio_chip/mindshield,
+ /obj/item/bio_chip/death_alarm
)
//////////////////// MEDIC ///////////////////
@@ -367,9 +367,9 @@
/obj/item/organ/internal/cyberimp/chest/nutriment/hardened
)
- implants = list(
- /obj/item/implant/mindshield,
- /obj/item/implant/death_alarm
+ bio_chips = list(
+ /obj/item/bio_chip/mindshield,
+ /obj/item/bio_chip/death_alarm
)
/datum/outfit/job/centcom/response_team/medic/gamma
@@ -402,9 +402,9 @@
/obj/item/organ/internal/cyberimp/brain/anti_stam/hardened
)
- implants = list(
- /obj/item/implant/mindshield,
- /obj/item/implant/death_alarm
+ bio_chips = list(
+ /obj/item/bio_chip/mindshield,
+ /obj/item/bio_chip/death_alarm
)
//////////////////// PARANORMAL ///////////////////
@@ -454,9 +454,9 @@
/obj/item/organ/internal/cyberimp/chest/nutriment/hardened
)
- implants = list(
- /obj/item/implant/mindshield,
- /obj/item/implant/death_alarm
+ bio_chips = list(
+ /obj/item/bio_chip/mindshield,
+ /obj/item/bio_chip/death_alarm
)
/datum/outfit/job/centcom/response_team/paranormal/gamma
@@ -480,9 +480,9 @@
/obj/item/organ/internal/cyberimp/brain/anti_stam/hardened
)
- implants = list(
- /obj/item/implant/mindshield,
- /obj/item/implant/death_alarm
+ bio_chips = list(
+ /obj/item/bio_chip/mindshield,
+ /obj/item/bio_chip/death_alarm
)
//////////////////// JANITORIAL ///////////////////
@@ -534,9 +534,9 @@
/obj/item/organ/internal/cyberimp/chest/nutriment/hardened
)
- implants = list(
- /obj/item/implant/mindshield,
- /obj/item/implant/death_alarm
+ bio_chips = list(
+ /obj/item/bio_chip/mindshield,
+ /obj/item/bio_chip/death_alarm
)
/datum/outfit/job/centcom/response_team/janitorial/gamma
@@ -560,7 +560,7 @@
/obj/item/organ/internal/cyberimp/brain/anti_stam/hardened
)
- implants = list(
- /obj/item/implant/mindshield,
- /obj/item/implant/death_alarm
+ bio_chips = list(
+ /obj/item/bio_chip/mindshield,
+ /obj/item/bio_chip/death_alarm
)
diff --git a/code/modules/ruins/ghost_bar.dm b/code/modules/ruins/ghost_bar.dm
index c957eb01dabf..879580a8a26e 100644
--- a/code/modules/ruins/ghost_bar.dm
+++ b/code/modules/ruins/ghost_bar.dm
@@ -38,7 +38,7 @@
equip_item(H, /obj/item/radio/headset/deadsay, SLOT_HUD_LEFT_EAR)
H.dna.species.before_equip_job(/datum/job/assistant, H)
H.dna.species.remains_type = /obj/effect/decal/cleanable/ash
- var/obj/item/implant/dust/I = new
+ var/obj/item/bio_chip/dust/I = new
I.implant(H, null)
for(var/gear in save_to_load.loadout_gear)
var/datum/gear/G = GLOB.gear_datums[text2path(gear) || gear]
diff --git a/code/modules/station_goals/bluespace_tap.dm b/code/modules/station_goals/bluespace_tap.dm
index 404a4e91a70a..a4887697fca5 100644
--- a/code/modules/station_goals/bluespace_tap.dm
+++ b/code/modules/station_goals/bluespace_tap.dm
@@ -260,7 +260,7 @@
. = ..()
if(length(active_nether_portals))
- icon_state = "redspace_tap"
+ icon_state = "cascade_tap"
return
if(get_available_power() <= 0)
@@ -275,7 +275,7 @@
underlays.Cut()
if(length(active_nether_portals))
- . += "redspace"
+ . += "cascade"
set_light(15, 5, "#ff0000")
return
diff --git a/code/modules/supply/supply_packs/pack_miscellaneous.dm b/code/modules/supply/supply_packs/pack_miscellaneous.dm
index bce9c7952cba..dd906cfc71c0 100644
--- a/code/modules/supply/supply_packs/pack_miscellaneous.dm
+++ b/code/modules/supply/supply_packs/pack_miscellaneous.dm
@@ -207,6 +207,23 @@
cost = 200
containername = "high-traction floor tiles"
+/datum/supply_packs/misc/soap
+ name = "Assorted Soap Crate"
+ contains = list(/obj/item/soap,
+ /obj/item/soap,
+ /obj/item/soap,
+ /obj/item/soap/nanotrasen)
+ cost = 250
+ containername = "soap crate"
+
+/datum/supply_packs/misc/sus_soap
+ name = "Suspicious Soap Crate"
+ contains = list(/obj/item/soap/syndie,
+ /obj/item/soap/syndie)
+ cost = 250
+ containername = "suspicious soap crate"
+ hidden = TRUE
+
///////////// Costumes
/datum/supply_packs/misc/servicecostume
diff --git a/code/modules/surgery/implant_removal.dm b/code/modules/surgery/bio_chip_removal.dm
similarity index 83%
rename from code/modules/surgery/implant_removal.dm
rename to code/modules/surgery/bio_chip_removal.dm
index c22841d26f0e..039e1c81c765 100644
--- a/code/modules/surgery/implant_removal.dm
+++ b/code/modules/surgery/bio_chip_removal.dm
@@ -9,7 +9,7 @@
/datum/surgery_step/generic/clamp_bleeders,
/datum/surgery_step/generic/retract_skin,
/datum/surgery_step/proxy/open_organ,
- /datum/surgery_step/extract_implant,
+ /datum/surgery_step/extract_bio_chip,
/datum/surgery_step/generic/cauterize
)
possible_locs = list(BODY_ZONE_CHEST)
@@ -21,20 +21,20 @@
/datum/surgery_step/robotics/external/unscrew_hatch,
/datum/surgery_step/robotics/external/open_hatch,
/datum/surgery_step/proxy/robotics/repair_limb,
- /datum/surgery_step/extract_implant/synth,
+ /datum/surgery_step/extract_bio_chip/synth,
/datum/surgery_step/robotics/external/close_hatch
)
requires_organic_bodypart = FALSE
-/datum/surgery_step/extract_implant
+/datum/surgery_step/extract_bio_chip
name = "extract bio-chip"
allowed_tools = list(TOOL_HEMOSTAT = 100, TOOL_CROWBAR = 65)
time = 6.4 SECONDS
repeatable = TRUE
- var/obj/item/implant/I = null
+ var/obj/item/bio_chip/I = null
var/max_times_to_check = 5
-/datum/surgery_step/extract_implant/begin_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool, datum/surgery/surgery)
+/datum/surgery_step/extract_bio_chip/begin_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool, datum/surgery/surgery)
var/obj/item/organ/external/affected = target.get_organ(target_zone)
@@ -45,7 +45,7 @@
)
return SURGERY_BEGINSTEP_SKIP
- I = locate(/obj/item/implant) in target
+ I = locate(/obj/item/bio_chip) in target
user.visible_message(
"[user] starts poking around inside [target]'s [affected.name] with \the [tool].",
"You start poking around inside [target]'s [affected.name] with \the [tool]."
@@ -53,7 +53,7 @@
affected.custom_pain("The pain in your [affected.name] is living hell!")
return ..()
-/datum/surgery_step/extract_implant/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool, datum/surgery/surgery)
+/datum/surgery_step/extract_bio_chip/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool, datum/surgery/surgery)
. = ..()
var/obj/item/organ/external/affected = target.get_organ(target_zone)
@@ -64,9 +64,9 @@
affected.receive_damage(10)
return SURGERY_STEP_RETRY
-/datum/surgery_step/extract_implant/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool, datum/surgery/surgery)
+/datum/surgery_step/extract_bio_chip/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool, datum/surgery/surgery)
var/obj/item/organ/external/affected = target.get_organ(target_zone)
- I = locate(/obj/item/implant) in target
+ I = locate(/obj/item/bio_chip) in target
if(I && prob(80)) //implant removal only works on the chest.
user.visible_message(
"[user] takes something out of [target]'s [affected.name] with \the [tool].",
@@ -75,14 +75,14 @@
I.removed(target)
- var/obj/item/implantcase/case
+ var/obj/item/bio_chip_case/case
- if(istype(user.get_item_by_slot(SLOT_HUD_LEFT_HAND), /obj/item/implantcase))
+ if(istype(user.get_item_by_slot(SLOT_HUD_LEFT_HAND), /obj/item/bio_chip_case))
case = user.get_item_by_slot(SLOT_HUD_LEFT_HAND)
- else if(istype(user.get_item_by_slot(SLOT_HUD_RIGHT_HAND), /obj/item/implantcase))
+ else if(istype(user.get_item_by_slot(SLOT_HUD_RIGHT_HAND), /obj/item/bio_chip_case))
case = user.get_item_by_slot(SLOT_HUD_RIGHT_HAND)
else
- case = locate(/obj/item/implantcase) in get_turf(target)
+ case = locate(/obj/item/bio_chip_case) in get_turf(target)
if(case && !case.imp)
case.imp = I
@@ -98,6 +98,6 @@
)
return SURGERY_STEP_CONTINUE
-/datum/surgery_step/extract_implant/synth
+/datum/surgery_step/extract_bio_chip/synth
allowed_tools = list(TOOL_WIRECUTTER = 100, TOOL_HEMOSTAT = 60)
diff --git a/code/modules/surgery/organs/augments_arms.dm b/code/modules/surgery/organs/augments_arms.dm
index 48736aab74b4..11a274d816d6 100644
--- a/code/modules/surgery/organs/augments_arms.dm
+++ b/code/modules/surgery/organs/augments_arms.dm
@@ -294,7 +294,7 @@
/obj/item/organ/internal/cyberimp/arm/combat/centcom
name = "NT specops cybernetics implant"
desc = "An extremely powerful cybernetic implant that contains combat and utility modules used by NT special forces."
- contents = newlist(/obj/item/gun/energy/pulse/pistol/m1911, /obj/item/door_remote/omni, /obj/item/melee/energy/blade/hardlight, /obj/item/reagent_containers/hypospray/combat/nanites, /obj/item/gun/medbeam, /obj/item/borg/stun, /obj/item/implanter/mindshield, /obj/item/flash/armimplant)
+ contents = newlist(/obj/item/gun/energy/pulse/pistol/m1911, /obj/item/door_remote/omni, /obj/item/melee/energy/blade/hardlight, /obj/item/reagent_containers/hypospray/combat/nanites, /obj/item/gun/medbeam, /obj/item/borg/stun, /obj/item/bio_chip_implanter/mindshield, /obj/item/flash/armimplant)
icon = 'icons/obj/guns/energy.dmi'
icon_state = "m1911"
emp_proof = 1
diff --git a/code/modules/surgery/organs/augments_internal.dm b/code/modules/surgery/organs/augments_internal.dm
index f9f56bbf8d01..c5fa8032c335 100644
--- a/code/modules/surgery/organs/augments_internal.dm
+++ b/code/modules/surgery/organs/augments_internal.dm
@@ -540,7 +540,7 @@
/obj/item/storage/box/cyber_implants
name = "boxed cybernetic implants"
desc = "A sleek, sturdy box."
- icon_state = "cyber_implants"
+ icon_state = "cyber_implants_box"
var/list/boxed = list(
/obj/item/autosurgeon/organ/syndicate/thermal_eyes,
/obj/item/autosurgeon/organ/syndicate/xray_eyes,
diff --git a/code/modules/surgery/organs/brain.dm b/code/modules/surgery/organs/brain.dm
index 36fd7ed612e3..3e55578c4a4c 100644
--- a/code/modules/surgery/organs/brain.dm
+++ b/code/modules/surgery/organs/brain.dm
@@ -125,6 +125,65 @@
if(owner && vital)
owner.setBrainLoss(120)
+/obj/item/organ/internal/brain/on_life()
+ if(decoy_brain || damage < 10)
+ return
+ switch(damage)
+ if(10 to 30)
+ handle_minor_brain_damage()
+ if(31 to 60)
+ handle_moderate_brain_damage()
+ if(61 to 80)
+ handle_severe_brain_damage()
+ if(81 to 100)
+ handle_critical_brain_damage()
+
+/obj/item/organ/internal/brain/proc/handle_minor_brain_damage()
+ if(prob(5))
+ owner.Dizzy(5 SECONDS)
+ to_chat(owner, "Your head feels foggy.")
+ else if(prob(4))
+ owner.vomit()
+ to_chat(owner, "")
+
+/obj/item/organ/internal/brain/proc/handle_moderate_brain_damage()
+ if(prob(4))
+ owner.Confused(20 SECONDS)
+ to_chat(owner, "It's suddenly difficult to walk straight.")
+ else if(prob(5))
+ owner.EyeBlurry(15 SECONDS)
+ to_chat(owner, "Your vision unfocuses.")
+ else if(prob(3))
+ owner.Drowsy(20 SECONDS)
+ to_chat(owner, "You're getting tired.")
+
+/obj/item/organ/internal/brain/proc/handle_severe_brain_damage()
+ if(prob(5))
+ owner.Hallucinate(60 SECONDS)
+ to_chat(owner, "You start losing your grip on reality.")
+ else if(prob(10))
+ owner.Slur(60 SECONDS)
+ owner.Stuttering(60 SECONDS)
+ to_chat(owner, "You can't form your words properly.")
+ else if(prob(2))
+ owner.Stun(5 SECONDS)
+ to_chat(owner, "You stare forward in a stupor.")
+ else if(prob(5))
+ owner.KnockDown(1 SECONDS)
+ to_chat(owner, "You lose your footing, and stumble.")
+
+/obj/item/organ/internal/brain/proc/handle_critical_brain_damage()
+ if(prob(4))
+ owner.Silence(45 SECONDS)
+ to_chat(owner, "You open your mouth to speak, but no sound comes out.")
+ else if(prob(5))
+ owner.EyeBlind(30 SECONDS)
+ to_chat(owner, "Your vision gives out.")
+ else if(prob(5))
+ owner.Weaken(10 SECONDS)
+ owner.Jitter(150 SECONDS)
+ to_chat(owner, "You start to have a seizure.")
+
/obj/item/organ/internal/brain/prepare_eat()
return // Too important to eat.
diff --git a/icons/mob/clothing/modsuit/species/modsuits_younahthee.dmi b/icons/mob/clothing/modsuit/species/unathi_modsuits.dmi
similarity index 100%
rename from icons/mob/clothing/modsuit/species/modsuits_younahthee.dmi
rename to icons/mob/clothing/modsuit/species/unathi_modsuits.dmi
diff --git a/icons/mob/clothing/species/drask/helmet.dmi b/icons/mob/clothing/species/drask/helmet.dmi
index 9d58968d0ab1..a060778cd947 100644
Binary files a/icons/mob/clothing/species/drask/helmet.dmi and b/icons/mob/clothing/species/drask/helmet.dmi differ
diff --git a/icons/mob/clothing/species/drask/suit.dmi b/icons/mob/clothing/species/drask/suit.dmi
index b4bf22f7f1ed..4f4792871054 100644
Binary files a/icons/mob/clothing/species/drask/suit.dmi and b/icons/mob/clothing/species/drask/suit.dmi differ
diff --git a/icons/mob/clothing/species/grey/suit.dmi b/icons/mob/clothing/species/grey/suit.dmi
index 45f1f6cc44ae..25f80cacbb92 100644
Binary files a/icons/mob/clothing/species/grey/suit.dmi and b/icons/mob/clothing/species/grey/suit.dmi differ
diff --git a/icons/mob/clothing/species/kidan/suit.dmi b/icons/mob/clothing/species/kidan/suit.dmi
index 8e398165f2c2..d773c94c128b 100644
Binary files a/icons/mob/clothing/species/kidan/suit.dmi and b/icons/mob/clothing/species/kidan/suit.dmi differ
diff --git a/icons/mob/clothing/species/tajaran/helmet.dmi b/icons/mob/clothing/species/tajaran/helmet.dmi
index e479ea8a5c7a..08f4afe33224 100644
Binary files a/icons/mob/clothing/species/tajaran/helmet.dmi and b/icons/mob/clothing/species/tajaran/helmet.dmi differ
diff --git a/icons/mob/clothing/species/tajaran/suit.dmi b/icons/mob/clothing/species/tajaran/suit.dmi
index 337c48b46930..d9a9352d29c0 100644
Binary files a/icons/mob/clothing/species/tajaran/suit.dmi and b/icons/mob/clothing/species/tajaran/suit.dmi differ
diff --git a/icons/mob/clothing/species/unathi/helmet.dmi b/icons/mob/clothing/species/unathi/helmet.dmi
index fc6db757d5a3..633680846162 100644
Binary files a/icons/mob/clothing/species/unathi/helmet.dmi and b/icons/mob/clothing/species/unathi/helmet.dmi differ
diff --git a/icons/mob/clothing/species/unathi/suit.dmi b/icons/mob/clothing/species/unathi/suit.dmi
index e1964adac4fa..59c8faa766af 100644
Binary files a/icons/mob/clothing/species/unathi/suit.dmi and b/icons/mob/clothing/species/unathi/suit.dmi differ
diff --git a/icons/mob/clothing/species/vox/helmet.dmi b/icons/mob/clothing/species/vox/helmet.dmi
index d7fb92eea9b9..47e6adb7b522 100644
Binary files a/icons/mob/clothing/species/vox/helmet.dmi and b/icons/mob/clothing/species/vox/helmet.dmi differ
diff --git a/icons/mob/clothing/species/vox/suit.dmi b/icons/mob/clothing/species/vox/suit.dmi
index 52aa1343e512..e713793e1a72 100644
Binary files a/icons/mob/clothing/species/vox/suit.dmi and b/icons/mob/clothing/species/vox/suit.dmi differ
diff --git a/icons/mob/clothing/species/vulpkanin/helmet.dmi b/icons/mob/clothing/species/vulpkanin/helmet.dmi
index 24c0283c0e2b..afc6ea5edf2f 100644
Binary files a/icons/mob/clothing/species/vulpkanin/helmet.dmi and b/icons/mob/clothing/species/vulpkanin/helmet.dmi differ
diff --git a/icons/mob/clothing/species/vulpkanin/suit.dmi b/icons/mob/clothing/species/vulpkanin/suit.dmi
index 3cdf1a1228b8..f03f0627393f 100644
Binary files a/icons/mob/clothing/species/vulpkanin/suit.dmi and b/icons/mob/clothing/species/vulpkanin/suit.dmi differ
diff --git a/icons/mob/clothing/suit.dmi b/icons/mob/clothing/suit.dmi
index b034654674c5..d5d99a310bd1 100644
Binary files a/icons/mob/clothing/suit.dmi and b/icons/mob/clothing/suit.dmi differ
diff --git a/icons/obj/implants.dmi b/icons/obj/bio_chips.dmi
similarity index 100%
rename from icons/obj/implants.dmi
rename to icons/obj/bio_chips.dmi
diff --git a/icons/obj/boxes.dmi b/icons/obj/boxes.dmi
new file mode 100644
index 000000000000..03d0a7413b57
Binary files /dev/null and b/icons/obj/boxes.dmi differ
diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi
index aaf4877597a3..c5c655fb781a 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 2660087f11cb..f2030353f36d 100644
Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ
diff --git a/icons/obj/custom_items.dmi b/icons/obj/custom_items.dmi
index ae96898cf33d..5ff5e5a5ebdf 100644
Binary files a/icons/obj/custom_items.dmi and b/icons/obj/custom_items.dmi differ
diff --git a/icons/obj/food/food.dmi b/icons/obj/food/food.dmi
index 502ad16f1c59..bd40ddcc8a9a 100644
Binary files a/icons/obj/food/food.dmi and b/icons/obj/food/food.dmi differ
diff --git a/icons/obj/machines/bluespace_tap.dmi b/icons/obj/machines/bluespace_tap.dmi
index 7d53d84fc225..d271f9eb2cf6 100644
Binary files a/icons/obj/machines/bluespace_tap.dmi and b/icons/obj/machines/bluespace_tap.dmi differ
diff --git a/icons/obj/pda.dmi b/icons/obj/pda.dmi
index 459f9150c6c3..d93b0cec3b78 100644
Binary files a/icons/obj/pda.dmi and b/icons/obj/pda.dmi differ
diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi
index b5805bbd6ae5..8758283d1532 100644
Binary files a/icons/obj/storage.dmi and b/icons/obj/storage.dmi differ
diff --git a/icons/obj/toy.dmi b/icons/obj/toy.dmi
index 8782e222d2b9..e21855df14ad 100644
Binary files a/icons/obj/toy.dmi and b/icons/obj/toy.dmi differ
diff --git a/paradise.dme b/paradise.dme
index 951c7c361d6a..5a9d28d9774c 100644
--- a/paradise.dme
+++ b/paradise.dme
@@ -1105,6 +1105,31 @@
#include "code\game\objects\items\weapons\vending_items.dm"
#include "code\game\objects\items\weapons\weaponry.dm"
#include "code\game\objects\items\weapons\whetstone.dm"
+#include "code\game\objects\items\weapons\bio_chips\bio_chip.dm"
+#include "code\game\objects\items\weapons\bio_chips\bio_chip_abductor.dm"
+#include "code\game\objects\items\weapons\bio_chips\bio_chip_adrenalin.dm"
+#include "code\game\objects\items\weapons\bio_chips\bio_chip_case.dm"
+#include "code\game\objects\items\weapons\bio_chips\bio_chip_chem.dm"
+#include "code\game\objects\items\weapons\bio_chips\bio_chip_death_alarm.dm"
+#include "code\game\objects\items\weapons\bio_chips\bio_chip_dust.dm"
+#include "code\game\objects\items\weapons\bio_chips\bio_chip_emp.dm"
+#include "code\game\objects\items\weapons\bio_chips\bio_chip_explosive.dm"
+#include "code\game\objects\items\weapons\bio_chips\bio_chip_fluff.dm"
+#include "code\game\objects\items\weapons\bio_chips\bio_chip_freedom.dm"
+#include "code\game\objects\items\weapons\bio_chips\bio_chip_gorilla_rampage.dm"
+#include "code\game\objects\items\weapons\bio_chips\bio_chip_health.dm"
+#include "code\game\objects\items\weapons\bio_chips\bio_chip_krav_maga.dm"
+#include "code\game\objects\items\weapons\bio_chips\bio_chip_mindshield.dm"
+#include "code\game\objects\items\weapons\bio_chips\bio_chip_pad.dm"
+#include "code\game\objects\items\weapons\bio_chips\bio_chip_prescan.dm"
+#include "code\game\objects\items\weapons\bio_chips\bio_chip_sad_trombone.dm"
+#include "code\game\objects\items\weapons\bio_chips\bio_chip_stealth.dm"
+#include "code\game\objects\items\weapons\bio_chips\bio_chip_storage.dm"
+#include "code\game\objects\items\weapons\bio_chips\bio_chip_supercharge.dm"
+#include "code\game\objects\items\weapons\bio_chips\bio_chip_tracking.dm"
+#include "code\game\objects\items\weapons\bio_chips\bio_chip_traitor.dm"
+#include "code\game\objects\items\weapons\bio_chips\bio_chip_uplink.dm"
+#include "code\game\objects\items\weapons\bio_chips\bio_chipper.dm"
#include "code\game\objects\items\weapons\grenades\atmosgrenade.dm"
#include "code\game\objects\items\weapons\grenades\bananade.dm"
#include "code\game\objects\items\weapons\grenades\chem_grenade.dm"
@@ -1120,30 +1145,6 @@
#include "code\game\objects\items\weapons\grenades\smokebomb.dm"
#include "code\game\objects\items\weapons\grenades\spawnergrenade.dm"
#include "code\game\objects\items\weapons\grenades\syndieminibomb.dm"
-#include "code\game\objects\items\weapons\implants\implant.dm"
-#include "code\game\objects\items\weapons\implants\implant_abductor.dm"
-#include "code\game\objects\items\weapons\implants\implant_adrenalin.dm"
-#include "code\game\objects\items\weapons\implants\implant_chem.dm"
-#include "code\game\objects\items\weapons\implants\implant_death_alarm.dm"
-#include "code\game\objects\items\weapons\implants\implant_dust.dm"
-#include "code\game\objects\items\weapons\implants\implant_emp.dm"
-#include "code\game\objects\items\weapons\implants\implant_explosive.dm"
-#include "code\game\objects\items\weapons\implants\implant_freedom.dm"
-#include "code\game\objects\items\weapons\implants\implant_gorilla_rampage.dm"
-#include "code\game\objects\items\weapons\implants\implant_health.dm"
-#include "code\game\objects\items\weapons\implants\implant_krav_maga.dm"
-#include "code\game\objects\items\weapons\implants\implant_mindshield.dm"
-#include "code\game\objects\items\weapons\implants\implant_sad_trombone.dm"
-#include "code\game\objects\items\weapons\implants\implant_stealth.dm"
-#include "code\game\objects\items\weapons\implants\implant_storage.dm"
-#include "code\game\objects\items\weapons\implants\implant_supercharge.dm"
-#include "code\game\objects\items\weapons\implants\implant_tracking.dm"
-#include "code\game\objects\items\weapons\implants\implant_traitor.dm"
-#include "code\game\objects\items\weapons\implants\implant_uplink.dm"
-#include "code\game\objects\items\weapons\implants\implantcase.dm"
-#include "code\game\objects\items\weapons\implants\implanter.dm"
-#include "code\game\objects\items\weapons\implants\implantfluff.dm"
-#include "code\game\objects\items\weapons\implants\implantpad.dm"
#include "code\game\objects\items\weapons\melee\energy_melee_weapons.dm"
#include "code\game\objects\items\weapons\melee\melee_misc.dm"
#include "code\game\objects\items\weapons\storage\backpack.dm"
@@ -1186,6 +1187,7 @@
#include "code\game\objects\structures\flora.dm"
#include "code\game\objects\structures\fluff.dm"
#include "code\game\objects\structures\girders.dm"
+#include "code\game\objects\structures\grey_autocloner.dm"
#include "code\game\objects\structures\grille.dm"
#include "code\game\objects\structures\guillotine.dm"
#include "code\game\objects\structures\holosigns.dm"
@@ -2654,13 +2656,13 @@
#include "code\modules\supply\supply_packs\pack_security.dm"
#include "code\modules\supply\supply_packs\pack_vendor.dm"
#include "code\modules\surgery\abstract_steps.dm"
+#include "code\modules\surgery\bio_chip_removal.dm"
#include "code\modules\surgery\bones.dm"
#include "code\modules\surgery\cavity_implant.dm"
#include "code\modules\surgery\core_removal.dm"
#include "code\modules\surgery\dental_implant.dm"
#include "code\modules\surgery\encased.dm"
#include "code\modules\surgery\generic.dm"
-#include "code\modules\surgery\implant_removal.dm"
#include "code\modules\surgery\limb_augmentation.dm"
#include "code\modules\surgery\limb_reattach.dm"
#include "code\modules\surgery\organs_internal.dm"
diff --git a/sound/effects/ghost_ping.ogg b/sound/effects/ghost_ping.ogg
new file mode 100644
index 000000000000..380df597d7ad
Binary files /dev/null and b/sound/effects/ghost_ping.ogg differ
diff --git a/tools/UpdatePaths/Scripts/23213_matches.txt b/tools/UpdatePaths/Scripts/23213_matches.txt
new file mode 100644
index 000000000000..3344731ab2e4
--- /dev/null
+++ b/tools/UpdatePaths/Scripts/23213_matches.txt
@@ -0,0 +1 @@
+/obj/item/storage/box/matches : /obj/item/storage/fancy/matches{@OLD}
diff --git a/tools/ci/check_grep2.py b/tools/ci/check_grep2.py
index 9ebbf17a633f..fbf68189889b 100644
--- a/tools/ci/check_grep2.py
+++ b/tools/ci/check_grep2.py
@@ -101,10 +101,9 @@ def check_to_chats_have_a_user_arguement(lines):
if TO_CHAT_WITH_NO_USER_ARG_RE.search(line):
return Failure(idx + 1, "Changed files contains a to_chat() procedure without a user argument.")
-CONDITIONAL_LEADING_SPACE = re.compile(r"(if|for|while|switch)\s+(\(.*?\))") # checks for "if (thing)", replace with $1$2
-CONDITIONAL_BEGINNING_SPACE = re.compile(r"(if|for|while|switch)(\(.+) \)") # checks for "if( thing)", replace with $1$2)
-CONDITIONAL_ENDING_SPACE = re.compile(r"(if|for|while|switch)\( (.+\))") # checks for "if(thing )", replace with $1($2
-CONDITIONAL_INFIX_NOT_SPACE = re.compile(r"(if)\(! (.+\))") # checks for "if(! thing)", replace with $1(!$2
+CONDITIONAL_LEADING_SPACE = re.compile(r"(if|for|while|switch)\s+(\(.*?\)?)") # checks for "if (thing)", replace with $1$2
+CONDITIONAL_BEGINNING_SPACE = re.compile(r"(if|for|while|switch)\((!?) (.+\)?)") # checks for "if( thing)", replace with $1($2$3
+CONDITIONAL_ENDING_SPACE = re.compile(r"(if|for|while|switch)(\(.+) \)") # checks for "if(thing )", replace with $1$2)
# To fix any of these, run them as regex in VSCode, with the appropriate replacement
# It may be a good idea to turn the replacement into a script someday
def check_conditional_spacing(lines):
@@ -115,8 +114,6 @@ def check_conditional_spacing(lines):
return Failure(idx + 1, "Found a conditional statement matching the format \"if( thing)\", please use \"if(thing)\" instead.")
if CONDITIONAL_ENDING_SPACE.search(line):
return Failure(idx + 1, "Found a conditional statement matching the format \"if(thing )\", please use \"if(thing)\" instead.")
- if CONDITIONAL_INFIX_NOT_SPACE.search(line):
- return Failure(idx + 1, "Found a conditional statement matching the format \"if(! thing)\", please use \"if(!thing)\" instead.")
# makes sure that no global list inits have an empty list in them without using the helper
GLOBAL_LIST_EMPTY = re.compile(r"(?