diff --git a/_maps/map_files/CogStation/CogStation.dmm b/_maps/map_files/CogStation/CogStation.dmm
index 8c558e000e..2f27c3f747 100644
--- a/_maps/map_files/CogStation/CogStation.dmm
+++ b/_maps/map_files/CogStation/CogStation.dmm
@@ -5534,11 +5534,10 @@
/turf/open/floor/plating,
/area/maintenance/disposal)
"ann" = (
-/obj/effect/turf_decal/plaque{
+/obj/effect/landmark/event_spawn,
+/turf/open/floor/goonplaque{
desc = "It reads 'In honor of spacemen past, whose work allowed this station to find its new home. The fact that you stand on a station originally built light years away is a definitive representation of the ingenuity of the human spirit.' Beneath this is the image of a spaceman rocketing upwards by means of what appears to be a match and flatulence."
},
-/obj/effect/landmark/event_spawn,
-/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"ano" = (
/obj/structure/disposalpipe/segment,
@@ -23461,6 +23460,17 @@
},
/turf/open/floor/plasteel/grimy,
/area/security/detectives_office)
+"aYG" = (
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/obj/machinery/light,
+/obj/structure/disposalpipe/junction/flip{
+ dir = 1
+ },
+/turf/open/floor/plasteel,
+/area/hallway/primary/aft)
"aYH" = (
/obj/effect/turf_decal/tile/yellow{
dir = 8
@@ -24359,6 +24369,17 @@
},
/turf/open/floor/carpet,
/area/crew_quarters/bar)
+"bau" = (
+/obj/structure/disposalpipe/segment,
+/obj/machinery/camera{
+ c_tag = "Aft Maintenance - Port";
+ pixel_x = 22
+ },
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 8
+ },
+/turf/open/floor/plating,
+/area/maintenance/aft)
"bav" = (
/obj/structure/chair/sofa/right,
/obj/machinery/firealarm{
@@ -26737,6 +26758,25 @@
/obj/effect/landmark/start/cargo_technician,
/turf/open/floor/plasteel,
/area/quartermaster/sorting)
+"bga" = (
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/obj/machinery/power/apc/highcap/five_k{
+ areastring = "/area/hallway/primary/aft";
+ dir = 1;
+ name = "Aft Primary Hallway APC";
+ pixel_x = 1;
+ pixel_y = 24
+ },
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 10
+ },
+/turf/open/floor/plating,
+/area/maintenance/aft)
"bgb" = (
/obj/structure/disposalpipe/sorting/mail{
sortType = 30
@@ -28064,6 +28104,13 @@
/obj/machinery/pipedispenser,
/turf/open/floor/plasteel,
/area/science/mixing)
+"biU" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/plating,
+/area/maintenance/aft)
"biV" = (
/turf/closed/wall,
/area/storage/primary)
@@ -29556,6 +29603,13 @@
},
/turf/closed/wall/r_wall,
/area/science/mixing)
+"blU" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/structure/closet/cardboard,
+/turf/open/floor/plating,
+/area/maintenance/aft)
"blV" = (
/obj/machinery/computer/cargo{
dir = 8
@@ -31652,6 +31706,15 @@
dir = 1
},
/area/hallway/secondary/exit)
+"bqq" = (
+/obj/machinery/chem_master,
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/camera{
+ c_tag = "Medbay - Chemistry Lab";
+ network = list("ss13","rd")
+ },
+/turf/open/floor/plasteel,
+/area/medical/chemistry)
"bqr" = (
/obj/effect/turf_decal/tile/blue,
/obj/effect/turf_decal/tile/blue{
@@ -31663,8 +31726,13 @@
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
"bqs" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/disposalpipe/segment,
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
/turf/open/floor/plating,
/area/maintenance/aft)
"bqt" = (
@@ -31744,16 +31812,8 @@
/turf/open/floor/plasteel,
/area/quartermaster/miningoffice)
"bqz" = (
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/machinery/light,
-/obj/structure/disposalpipe/segment{
- dir = 9
- },
-/turf/open/floor/plasteel,
-/area/hallway/primary/aft)
+/turf/closed/wall,
+/area/medical/chemistry)
"bqA" = (
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
@@ -32318,6 +32378,15 @@
},
/turf/open/floor/plasteel,
/area/hallway/secondary/civilian)
+"brF" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/door/poddoor/shutters/preopen{
+ id = "chem1";
+ name = "chem lab shutters"
+ },
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/plating,
+/area/medical/chemistry)
"brG" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -32332,20 +32401,8 @@
/turf/open/floor/plasteel/grimy,
/area/crew_quarters/heads/hos)
"brH" = (
-/obj/structure/cable{
- icon_state = "2-8"
- },
-/obj/structure/closet/wardrobe/chemistry_white{
- anchored = 1
- },
-/obj/effect/turf_decal/trimline/yellow/filled/line,
-/obj/effect/turf_decal/trimline/yellow/filled/line{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/orange/hidden{
- dir = 8
- },
-/turf/open/floor/plasteel/showroomfloor,
+/obj/structure/disposalpipe/segment,
+/turf/closed/wall,
/area/medical/chemistry)
"brI" = (
/obj/effect/turf_decal/tile/neutral{
@@ -32364,20 +32421,25 @@
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"brJ" = (
+/obj/machinery/door/firedoor,
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
- dir = 10
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/obj/machinery/door/airlock/maintenance{
+ name = "Chemistry Maintenance";
+ req_access_txt = "5; 33"
},
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plating,
/area/medical/chemistry)
"brK" = (
-/obj/machinery/chem_heater,
-/obj/effect/turf_decal/trimline/yellow/filled/end{
- dir = 1
+/obj/structure/window/reinforced/spawner/east,
+/obj/machinery/chem_dispenser,
+/obj/machinery/airalarm{
+ pixel_y = 24
},
-/turf/open/floor/plasteel/showroomfloor,
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
/area/medical/chemistry)
"brL" = (
/obj/structure/disposalpipe/segment,
@@ -32857,11 +32919,14 @@
/turf/open/floor/grass,
/area/hydroponics)
"bsG" = (
-/obj/item/kirbyplants{
- icon_state = "plant-03"
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/table,
+/obj/effect/decal/cleanable/cobweb,
+/obj/structure/sign/poster/contraband/borg_fancy_2{
+ pixel_y = 32
},
-/turf/open/floor/plasteel/white,
-/area/medical/medbay/lobby)
+/turf/open/floor/plasteel,
+/area/maintenance/aft)
"bsH" = (
/obj/structure/table/glass,
/obj/item/storage/box/syringes{
@@ -32899,26 +32964,40 @@
/turf/open/floor/grass,
/area/hydroponics)
"bsL" = (
-/obj/effect/turf_decal/trimline/yellow/filled/end,
-/obj/machinery/atmospherics/pipe/simple/orange/hidden{
- dir = 5
+/obj/structure/table,
+/obj/effect/turf_decal/stripes/line{
+ dir = 10
},
-/turf/open/floor/plasteel/showroomfloor,
+/obj/machinery/reagentgrinder{
+ pixel_y = 8
+ },
+/obj/item/storage/box/syringes,
+/obj/item/storage/box/beakers{
+ pixel_x = -2;
+ pixel_y = -2
+ },
+/turf/open/floor/plasteel,
/area/medical/chemistry)
"bsM" = (
/turf/closed/wall,
/area/science/robotics/lab)
"bsN" = (
-/obj/structure/table/reinforced,
-/obj/machinery/door/window/eastright{
- base_state = "left";
- dir = 2;
- icon_state = "left";
- name = "Chemistry Desk";
- req_access_txt = "33"
+/obj/structure/table,
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/light{
+ dir = 1
},
-/obj/machinery/door/firedoor,
-/turf/open/floor/plating,
+/obj/item/stack/sheet/mineral/plasma,
+/obj/item/stack/cable_coil/random,
+/obj/item/grenade/chem_grenade,
+/obj/item/grenade/chem_grenade,
+/obj/item/grenade/chem_grenade,
+/obj/item/screwdriver{
+ pixel_x = -2;
+ pixel_y = 6
+ },
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/plasteel,
/area/medical/chemistry)
"bsO" = (
/obj/structure/disposalpipe/segment{
@@ -32926,9 +33005,22 @@
},
/turf/closed/wall/r_wall,
/area/hallway/secondary/civilian)
+"bsP" = (
+/obj/structure/disposalpipe/trunk{
+ dir = 1
+ },
+/obj/machinery/disposal/bin,
+/obj/effect/turf_decal/stripes/white/full,
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
+/area/medical/chemistry)
"bsQ" = (
-/obj/machinery/smartfridge/chemistry/preloaded,
-/turf/closed/wall/r_wall,
+/obj/machinery/disposal/bin,
+/obj/effect/turf_decal/stripes/line{
+ dir = 6
+ },
+/obj/structure/disposalpipe/trunk,
+/turf/open/floor/plasteel,
/area/medical/chemistry)
"bsR" = (
/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
@@ -33130,6 +33222,14 @@
},
/turf/open/floor/plating,
/area/maintenance/department/chapel)
+"bts" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/light_construct/small{
+ icon_state = "bulb-construct-stage1";
+ dir = 1
+ },
+/turf/open/floor/plasteel,
+/area/maintenance/aft)
"btt" = (
/obj/structure/chair{
dir = 8
@@ -33159,11 +33259,12 @@
/turf/closed/wall,
/area/hallway/secondary/civilian)
"btv" = (
-/obj/machinery/atmospherics/pipe/simple/orange/hidden{
- dir = 8
+/obj/structure/cable{
+ icon_state = "4-8"
},
-/turf/closed/wall/r_wall,
-/area/router/medsci)
+/obj/effect/landmark/event_spawn,
+/turf/open/floor/plating,
+/area/maintenance/aft)
"btw" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable{
@@ -33444,6 +33545,10 @@
"bui" = (
/turf/open/floor/plasteel,
/area/hallway/secondary/exit)
+"buj" = (
+/obj/structure/closet/crate,
+/turf/open/floor/plating,
+/area/maintenance/aft)
"buk" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -33458,13 +33563,9 @@
/turf/open/floor/plating,
/area/router)
"bul" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/door/poddoor/shutters/preopen{
- id = "chem1";
- name = "chem lab shutters"
- },
+/obj/structure/girder,
/turf/open/floor/plating,
-/area/medical/chemistry)
+/area/maintenance/aft)
"bum" = (
/obj/structure/closet/crate,
/obj/effect/spawner/lootdrop/maintenance,
@@ -34093,24 +34194,10 @@
/area/crew_quarters/heads/hop)
"bvK" = (
/obj/structure/cable{
- icon_state = "4-8"
+ icon_state = "1-4"
},
-/obj/structure/table/glass,
-/obj/item/stack/sheet/mineral/plasma,
-/obj/item/stack/cable_coil/random,
-/obj/item/grenade/chem_grenade,
-/obj/item/grenade/chem_grenade,
-/obj/item/grenade/chem_grenade,
-/obj/item/screwdriver{
- pixel_x = -2;
- pixel_y = 6
- },
-/obj/effect/turf_decal/trimline/yellow/filled/line,
-/obj/effect/turf_decal/trimline/yellow/filled/line{
- dir = 1
- },
-/turf/open/floor/plasteel/showroomfloor,
-/area/medical/chemistry)
+/turf/open/floor/plasteel/white,
+/area/medical/medbay/lobby)
"bvL" = (
/obj/effect/turf_decal/tile/bar,
/obj/effect/turf_decal/tile/bar{
@@ -34291,23 +34378,8 @@
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/structure/table/glass,
-/obj/item/book/manual/wiki/chemistry,
-/obj/item/book/manual/wiki/chemistry{
- pixel_x = 3;
- pixel_y = 3
- },
-/obj/item/clothing/glasses/science,
-/obj/item/clothing/glasses/science{
- pixel_x = 2;
- pixel_y = 4
- },
-/obj/effect/turf_decal/trimline/yellow/filled/line,
-/obj/effect/turf_decal/trimline/yellow/filled/line{
- dir = 1
- },
-/turf/open/floor/plasteel/showroomfloor,
-/area/medical/chemistry)
+/turf/open/floor/plasteel/white,
+/area/medical/medbay/lobby)
"bwg" = (
/obj/structure/disposalpipe/segment{
dir = 9
@@ -35438,11 +35510,17 @@
/turf/open/floor/plating,
/area/maintenance/starboard/central)
"byw" = (
-/obj/structure/extinguisher_cabinet{
- pixel_x = -27
+/obj/machinery/airalarm{
+ pixel_y = 24
},
-/turf/open/floor/plasteel/dark,
-/area/medical/chemistry)
+/obj/machinery/light{
+ dir = 1
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel/white,
+/area/medical/medbay/lobby)
"byx" = (
/obj/machinery/telecomms/processor/preset_three,
/turf/open/floor/circuit/telecomms/mainframe,
@@ -35472,11 +35550,25 @@
/turf/open/floor/plasteel/dark/telecomms,
/area/tcommsat/server)
"byD" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
+/obj/machinery/camera{
+ c_tag = "Medbay - Lobby";
+ network = list("ss13","rd")
+ },
+/obj/effect/turf_decal/tile/yellow{
dir = 4
},
-/turf/open/floor/plasteel/dark,
-/area/medical/chemistry)
+/obj/effect/turf_decal/tile/yellow{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/blue,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel/white,
+/area/medical/medbay/lobby)
"byE" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -35861,6 +35953,24 @@
},
/turf/open/floor/plasteel/white,
/area/gateway)
+"bzA" = (
+/obj/machinery/power/apc{
+ areastring = "/area/medical/chemistry";
+ dir = 1;
+ name = "Chemistry APC";
+ pixel_y = 24
+ },
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/obj/effect/turf_decal/tile/yellow{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/turf/open/floor/plasteel/white,
+/area/medical/chemistry)
"bzB" = (
/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
dir = 6
@@ -35903,14 +36013,13 @@
/turf/open/floor/plating,
/area/router)
"bzG" = (
-/obj/machinery/chem_dispenser,
-/obj/item/radio/intercom{
- pixel_x = -25
+/obj/effect/turf_decal/tile/yellow{
+ dir = 4
},
-/obj/effect/turf_decal/trimline/yellow/filled/end{
+/obj/effect/turf_decal/tile/blue{
dir = 1
},
-/turf/open/floor/plasteel/showroomfloor,
+/turf/open/floor/plasteel/white,
/area/medical/chemistry)
"bzH" = (
/obj/structure/disposalpipe/segment,
@@ -35926,9 +36035,21 @@
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
"bzJ" = (
-/obj/structure/sign/warning/biohazard,
-/turf/closed/wall/r_wall,
-/area/medical/chemistry)
+/obj/effect/turf_decal/tile/yellow{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/yellow{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/blue,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel/white,
+/area/medical/medbay/lobby)
"bzK" = (
/obj/machinery/disposal/bin{
name = "Chapel Corpse Delivery"
@@ -36332,27 +36453,60 @@
/turf/open/floor/plasteel,
/area/quartermaster/sorting)
"bAC" = (
-/obj/machinery/chem_master,
-/obj/machinery/requests_console{
- department = "Chemistry";
- departmentType = 2;
- pixel_x = -30;
- receive_ore_updates = 1
+/obj/effect/turf_decal/tile/yellow{
+ dir = 4
},
-/obj/effect/turf_decal/trimline/yellow/filled/end,
-/turf/open/floor/plasteel/showroomfloor,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/turf/open/floor/plasteel/white,
+/area/medical/chemistry)
+"bAD" = (
+/obj/machinery/door/firedoor,
+/obj/structure/table/reinforced,
+/obj/effect/turf_decal/delivery,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/door/window/eastleft{
+ name = "Chemistry Desk";
+ req_access_txt = "33"
+ },
+/turf/open/floor/plasteel/white,
/area/medical/chemistry)
"bAE" = (
-/obj/structure/table/glass,
-/obj/item/reagent_containers/glass/beaker/large{
- pixel_x = -3;
- pixel_y = 3
+/obj/structure/disposalpipe/segment,
+/obj/structure/chair/office/light{
+ dir = 8
},
-/obj/item/reagent_containers/glass/beaker/large,
-/obj/item/reagent_containers/dropper,
-/obj/item/reagent_containers/dropper,
-/obj/effect/turf_decal/trimline/yellow/filled/end,
-/turf/open/floor/plasteel/showroomfloor,
+/obj/machinery/button/door{
+ id = "chem1";
+ name = "Shutters Control Button";
+ pixel_x = -8;
+ pixel_y = 24;
+ req_access_txt = "29"
+ },
+/obj/effect/landmark/start/chemist,
+/obj/effect/turf_decal/tile/yellow{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/yellow{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/obj/structure/extinguisher_cabinet{
+ pixel_x = 5;
+ pixel_y = 32
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel/white,
/area/medical/chemistry)
"bAF" = (
/obj/machinery/gateway/centerstation,
@@ -36703,10 +36857,23 @@
/turf/open/floor/plating,
/area/maintenance/disposal)
"bBs" = (
-/obj/structure/sign/warning/nosmoking{
- pixel_y = -32
+/obj/structure/cable{
+ icon_state = "1-2"
},
-/turf/open/floor/plasteel/dark,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/obj/effect/turf_decal/tile/yellow{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/turf/open/floor/plasteel/white,
/area/medical/chemistry)
"bBt" = (
/obj/structure/cable{
@@ -36890,16 +37057,25 @@
name = "Power Monitoring"
})
"bBP" = (
-/obj/structure/disposalpipe/segment,
-/turf/closed/wall,
-/area/science/robotics/lab)
-"bBQ" = (
-/obj/machinery/door/airlock/research{
- name = "Mech Bay";
- req_access_txt = "29"
+/obj/machinery/door/firedoor,
+/obj/structure/table/reinforced,
+/obj/effect/turf_decal/delivery,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 8
},
-/turf/open/floor/plasteel/dark,
-/area/science/robotics/lab)
+/obj/machinery/door/window/eastright{
+ name = "Chemistry Desk";
+ req_access_txt = "33"
+ },
+/turf/open/floor/plasteel/white,
+/area/medical/chemistry)
+"bBQ" = (
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
+/obj/machinery/light_switch{
+ pixel_x = -24
+ },
+/turf/open/floor/plasteel/showroomfloor,
+/area/medical/medbay/central)
"bBR" = (
/obj/structure/cable{
icon_state = "0-8"
@@ -37049,6 +37225,29 @@
},
/turf/open/floor/plasteel/dark,
/area/crew_quarters/heads/hop)
+"bCf" = (
+/obj/effect/turf_decal/tile/yellow{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/obj/effect/landmark/start/chemist,
+/turf/open/floor/plasteel/white,
+/area/medical/chemistry)
+"bCg" = (
+/obj/effect/turf_decal/tile/yellow{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 5
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/obj/effect/landmark/start/chemist,
+/turf/open/floor/plasteel/white,
+/area/medical/chemistry)
"bCh" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -37370,6 +37569,22 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
+"bCY" = (
+/obj/effect/turf_decal/tile/yellow{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 9
+ },
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/obj/structure/sign/warning/nosmoking{
+ pixel_x = 32
+ },
+/turf/open/floor/plasteel/white,
+/area/medical/chemistry)
"bCZ" = (
/obj/machinery/conveyor{
dir = 8;
@@ -38634,6 +38849,20 @@
},
/turf/open/floor/plasteel,
/area/quartermaster/sorting)
+"bFE" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+ dir = 8
+ },
+/obj/structure/table/glass,
+/obj/item/reagent_containers/glass/beaker/large{
+ pixel_x = -3;
+ pixel_y = 3
+ },
+/obj/item/reagent_containers/glass/beaker/large,
+/obj/item/reagent_containers/dropper,
+/obj/item/reagent_containers/dropper,
+/turf/open/floor/plasteel/white,
+/area/medical/chemistry)
"bFF" = (
/obj/machinery/light_switch{
pixel_y = 24
@@ -38643,6 +38872,10 @@
},
/turf/open/floor/plating,
/area/storage/tech)
+"bFG" = (
+/obj/effect/turf_decal/tile/blue,
+/turf/open/floor/plasteel/white,
+/area/medical/chemistry)
"bFH" = (
/obj/machinery/power/apc{
name = "Customs APC";
@@ -38907,20 +39140,9 @@
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"bFZ" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/manifold/cyan/hidden{
- dir = 1
- },
-/obj/machinery/airalarm{
- pixel_y = 24
- },
+/obj/machinery/chem_heater,
/turf/open/floor/plasteel/white,
-/area/medical/medbay/central)
+/area/medical/chemistry)
"bGa" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
/turf/open/floor/plasteel/dark,
@@ -39633,48 +39855,26 @@
/turf/open/floor/plating,
/area/crew_quarters/locker)
"bHC" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/machinery/firealarm{
- pixel_y = 26
- },
-/obj/effect/turf_decal/tile/purple{
- dir = 4
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
- dir = 4
- },
-/obj/structure/cable{
- icon_state = "4-8"
+/obj/effect/turf_decal/tile/yellow{
+ dir = 8
},
+/obj/effect/turf_decal/tile/blue,
/turf/open/floor/plasteel/white,
-/area/medical/medbay/central)
+/area/medical/chemistry)
+"bHD" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel,
+/area/maintenance/aft)
"bHE" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/effect/turf_decal/tile/purple{
+/obj/effect/turf_decal/tile/yellow{
dir = 4
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/manifold/cyan/hidden{
- dir = 1
- },
-/obj/machinery/camera{
- c_tag = "Medbay - Starboard";
- network = list("ss13","rd")
- },
-/obj/structure/cable{
- icon_state = "4-8"
+/obj/effect/turf_decal/tile/yellow{
+ dir = 8
},
+/obj/effect/turf_decal/tile/blue,
/turf/open/floor/plasteel/white,
-/area/medical/medbay/central)
+/area/medical/chemistry)
"bHF" = (
/obj/structure/table/reinforced,
/obj/item/assembly/timer{
@@ -39696,23 +39896,11 @@
/turf/open/floor/plasteel/white,
/area/science/mixing)
"bHG" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/effect/turf_decal/tile/purple{
- dir = 4
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
- dir = 4
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/open/floor/plasteel/white,
-/area/medical/medbay/central)
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/landmark/event_spawn,
+/turf/open/floor/plasteel,
+/area/maintenance/aft)
"bHH" = (
/obj/structure/table,
/obj/machinery/recharger,
@@ -39727,33 +39915,15 @@
},
/area/gateway)
"bHI" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/effect/turf_decal/tile/purple{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
- dir = 4
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
/turf/open/floor/plasteel/white,
-/area/medical/medbay/central)
+/area/medical/medbay/lobby)
"bHJ" = (
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/effect/turf_decal/tile/purple{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
- dir = 10
+/obj/item/kirbyplants{
+ icon_state = "plant-03"
},
/turf/open/floor/plasteel/white,
-/area/medical/medbay/central)
+/area/medical/medbay/lobby)
"bHK" = (
/obj/structure/sign/warning/biohazard,
/turf/closed/wall,
@@ -39926,6 +40096,10 @@
/obj/structure/window/reinforced,
/turf/open/floor/plasteel/dark,
/area/science/robotics/lab)
+"bIi" = (
+/obj/machinery/smartfridge/chemistry/preloaded,
+/turf/closed/wall,
+/area/medical/chemistry)
"bIj" = (
/obj/machinery/door/window/southright,
/turf/open/floor/plasteel/dark,
@@ -40011,15 +40185,15 @@
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"bIt" = (
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/purple{
- dir = 4
+/obj/structure/disposalpipe/segment,
+/obj/effect/turf_decal/tile/yellow{
+ dir = 8
},
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
- dir = 5
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
},
/turf/open/floor/plasteel/white,
-/area/medical/medbay/central)
+/area/medical/chemistry)
"bIu" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/medical{
@@ -40152,6 +40326,26 @@
/obj/item/extinguisher,
/turf/open/floor/plasteel,
/area/science/xenobiology)
+"bIL" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/manifold/orange/hidden{
+ dir = 8
+ },
+/turf/open/floor/plasteel/white,
+/area/medical/chemistry)
+"bIM" = (
+/obj/machinery/shower{
+ desc = "The HS-451. Standard Nanotrasen Hygiene Division design, although it looks like this one was installed more recently.";
+ dir = 8;
+ name = "emergency shower";
+ pixel_y = -4
+ },
+/obj/structure/window/reinforced/spawner/north,
+/obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
+/area/medical/chemistry)
"bIN" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -40328,6 +40522,10 @@
/obj/structure/window/reinforced/spawner,
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
+"bJd" = (
+/obj/effect/landmark/event_spawn,
+/turf/open/floor/plasteel/white,
+/area/medical/chemistry)
"bJe" = (
/obj/structure/closet/secure_closet/personal/patient,
/obj/effect/turf_decal/tile/blue,
@@ -40342,20 +40540,14 @@
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"bJf" = (
-/obj/structure/closet/secure_closet/personal/patient,
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/purple{
- dir = 8
+/obj/machinery/door/airlock/maintenance{
+ name = "Chemistry Maintenance";
+ req_access_txt = "5; 33"
},
-/obj/effect/turf_decal/tile/purple{
- dir = 4
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/structure/window/reinforced/spawner,
-/turf/open/floor/plasteel/white,
-/area/medical/medbay/central)
+/obj/machinery/door/firedoor,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel,
+/area/medical/chemistry)
"bJg" = (
/obj/structure/table,
/obj/effect/turf_decal/tile/red{
@@ -43904,33 +44096,11 @@
/turf/open/floor/plasteel/showroomfloor,
/area/medical/morgue)
"bQp" = (
-/obj/machinery/airalarm{
- dir = 4;
- pixel_x = -23
- },
-/obj/machinery/power/apc{
- areastring = "/area/medical/chemistry";
- dir = 1;
- name = "Chemistry APC";
- pixel_y = 24
- },
-/obj/structure/cable{
- icon_state = "0-4"
- },
-/obj/structure/table/glass,
-/obj/machinery/reagentgrinder{
- pixel_y = 8
- },
-/obj/item/storage/box/syringes,
-/obj/item/storage/box/beakers{
- pixel_x = -2;
- pixel_y = -2
- },
-/obj/effect/turf_decal/trimline/yellow/filled/end{
- dir = 8
- },
-/turf/open/floor/plasteel/showroomfloor,
-/area/medical/chemistry)
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/reagent_dispensers/fueltank,
+/obj/machinery/light/small,
+/turf/open/floor/plasteel,
+/area/maintenance/aft)
"bQq" = (
/obj/effect/turf_decal/tile/yellow{
dir = 1
@@ -47830,11 +48000,11 @@
name = "Research Sector"
})
"bXL" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/turf/open/floor/plasteel/white,
-/area/medical/medbay/lobby)
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/rack,
+/obj/item/storage/belt/utility,
+/turf/open/floor/plasteel,
+/area/maintenance/aft)
"bXM" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/conveyor{
@@ -48328,6 +48498,12 @@
},
/turf/open/floor/plasteel/dark,
/area/science/robotics/lab)
+"bYK" = (
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 5
+ },
+/turf/open/floor/plasteel/white,
+/area/medical/medbay/lobby)
"bYL" = (
/obj/effect/turf_decal/tile/purple{
dir = 4
@@ -48958,6 +49134,18 @@
},
/turf/open/floor/plasteel,
/area/engine/atmos)
+"caj" = (
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/turf/open/floor/plasteel/white,
+/area/medical/medbay/central)
"cak" = (
/obj/structure/sign/warning/fire,
/turf/closed/wall/r_wall,
@@ -49056,9 +49244,12 @@
/turf/open/floor/engine/n2,
/area/engine/atmos)
"caz" = (
-/obj/structure/disposalpipe/segment,
-/turf/closed/wall,
-/area/science/explab)
+/obj/machinery/door/airlock/research{
+ name = "Mech Bay";
+ req_access_txt = "29"
+ },
+/turf/open/floor/plasteel/dark,
+/area/science/robotics/mechbay)
"caA" = (
/obj/structure/closet/radiation,
/turf/open/floor/plasteel,
@@ -49111,6 +49302,19 @@
},
/turf/open/floor/plasteel/dark,
/area/science/explab)
+"caH" = (
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 6
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/turf/open/floor/plasteel/white,
+/area/medical/medbay/central)
"caI" = (
/obj/structure/table/reinforced,
/obj/item/integrated_electronics/analyzer,
@@ -49359,6 +49563,17 @@
/obj/item/healthanalyzer,
/turf/open/floor/engine,
/area/science/explab)
+"cbm" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 8
+ },
+/obj/machinery/door/airlock/maintenance{
+ name = "Medbay Maintenance";
+ req_access_txt = "5"
+ },
+/turf/open/floor/plating,
+/area/medical/medbay/central)
"cbn" = (
/obj/structure/window/reinforced{
dir = 4;
@@ -49399,6 +49614,28 @@
/obj/item/pen,
/turf/open/floor/engine,
/area/science/explab)
+"cbr" = (
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 8
+ },
+/turf/open/floor/plasteel/white,
+/area/medical/medbay/lobby)
+"cbs" = (
+/obj/effect/turf_decal/tile/yellow{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/yellow{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/blue,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 8
+ },
+/turf/open/floor/plasteel/white,
+/area/medical/medbay/lobby)
"cbt" = (
/obj/structure/disposalpipe/segment,
/turf/open/floor/engine,
@@ -49536,6 +49773,26 @@
/area/engine/supermatter{
name = "Thermo-Electric Generator"
})
+"cbK" = (
+/obj/effect/turf_decal/tile/yellow{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/yellow{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/blue,
+/obj/structure/sign/departments/chemistry{
+ pixel_x = 32;
+ pixel_y = -32
+ },
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 8
+ },
+/turf/open/floor/plasteel/white,
+/area/medical/medbay/lobby)
"cbL" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -49799,13 +50056,11 @@
/turf/open/floor/plasteel/stairs,
/area/maintenance/department/chapel)
"ccm" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/door/poddoor/shutters/preopen{
- id = "robotics2";
- name = "robotics lab shutters"
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 8
},
-/turf/open/floor/plating,
-/area/router/medsci)
+/turf/closed/wall/r_wall,
+/area/science/robotics/lab)
"ccn" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/conveyor/auto{
@@ -50647,14 +50902,52 @@
/turf/closed/wall/r_wall,
/area/engine/teg_hot)
"cdW" = (
-/obj/machinery/airalarm{
- pixel_y = 24
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 10
},
-/obj/machinery/light{
+/obj/machinery/door/poddoor/shutters/preopen{
+ id = "robotics2";
+ name = "robotics lab shutters"
+ },
+/turf/open/floor/plating,
+/area/science/robotics/lab)
+"cdX" = (
+/obj/structure/disposalpipe/segment{
+ dir = 5
+ },
+/obj/structure/chair/office/light{
+ dir = 8
+ },
+/obj/effect/landmark/start/chemist,
+/obj/effect/turf_decal/tile/yellow{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/obj/item/radio/intercom{
+ broadcasting = 1;
+ frequency = 1485;
+ listening = 0;
+ name = "Station Intercom (Medical)";
+ pixel_y = -30
+ },
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 8
+ },
+/turf/open/floor/plasteel/white,
+/area/medical/chemistry)
+"cdY" = (
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/blue{
dir = 1
},
/turf/open/floor/plasteel/white,
-/area/medical/medbay/lobby)
+/area/medical/medbay/central)
"cdZ" = (
/turf/closed/wall/r_wall,
/area/medical/medbay/lobby)
@@ -52596,6 +52889,18 @@
},
/turf/open/floor/wood,
/area/library)
+"chV" = (
+/obj/machinery/firealarm{
+ dir = 8;
+ pixel_x = 26
+ },
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue,
+/turf/open/floor/plasteel/white,
+/area/medical/medbay/central)
"chW" = (
/obj/effect/turf_decal/tile/neutral{
dir = 4
@@ -53003,21 +53308,20 @@
/turf/open/floor/plasteel,
/area/quartermaster/warehouse)
"ciQ" = (
-/obj/structure/cable{
- icon_state = "0-4"
+/obj/structure/disposalpipe/segment{
+ dir = 10
},
/obj/structure/cable{
- icon_state = "4-8"
+ icon_state = "1-2"
},
-/obj/machinery/power/apc/highcap/five_k{
- areastring = "/area/hallway/primary/aft";
- dir = 1;
- name = "Aft Primary Hallway APC";
- pixel_x = 1;
- pixel_y = 24
+/obj/effect/turf_decal/tile/yellow{
+ dir = 8
},
-/turf/open/floor/plating,
-/area/maintenance/aft)
+/obj/machinery/atmospherics/pipe/manifold/orange/hidden{
+ dir = 4
+ },
+/turf/open/floor/plasteel/white,
+/area/medical/chemistry)
"ciR" = (
/obj/machinery/door/firedoor,
/obj/effect/turf_decal/tile/red,
@@ -53752,6 +54056,14 @@
/area/engine/engineering{
name = "Engine Room"
})
+"ckp" = (
+/obj/effect/turf_decal/tile/yellow{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/landmark/start/chemist,
+/turf/open/floor/plasteel/white,
+/area/medical/chemistry)
"ckq" = (
/obj/structure/closet/crate/hydroponics,
/obj/machinery/light_switch{
@@ -53886,9 +54198,15 @@
/turf/open/floor/plasteel,
/area/engine/teg_cold)
"ckD" = (
-/obj/machinery/chem_master,
-/obj/effect/turf_decal/trimline/yellow/filled/end,
-/turf/open/floor/plasteel/showroomfloor,
+/obj/effect/turf_decal/tile/yellow{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/blue,
+/obj/structure/sign/warning/fire{
+ pixel_x = 32;
+ pixel_y = -32
+ },
+/turf/open/floor/plasteel/white,
/area/medical/chemistry)
"ckE" = (
/obj/effect/decal/cleanable/dirt,
@@ -54134,6 +54452,17 @@
},
/turf/open/floor/plasteel/dark,
/area/science/xenobiology)
+"clc" = (
+/obj/machinery/vending/wardrobe/chem_wardrobe,
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/yellow{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/yellow{
+ dir = 4
+ },
+/turf/open/floor/plasteel/white,
+/area/medical/chemistry)
"cld" = (
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -54760,6 +55089,14 @@
},
/turf/open/floor/plasteel/grimy,
/area/crew_quarters/bar)
+"cmB" = (
+/obj/structure/window/reinforced/spawner/west,
+/obj/effect/turf_decal/delivery,
+/obj/machinery/door/window/northright{
+ name = "Emergency Shower"
+ },
+/turf/open/floor/plasteel,
+/area/medical/chemistry)
"cmC" = (
/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
dir = 4
@@ -54856,6 +55193,23 @@
},
/turf/open/floor/plasteel,
/area/quartermaster/miningoffice)
+"cmK" = (
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/obj/effect/turf_decal/tile/yellow{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/obj/machinery/light{
+ dir = 8
+ },
+/turf/open/floor/plasteel/white,
+/area/medical/chemistry)
"cmL" = (
/obj/effect/landmark/blobstart,
/turf/open/floor/plating,
@@ -54980,12 +55334,20 @@
/turf/open/floor/plasteel,
/area/security/checkpoint/supply)
"cmU" = (
-/obj/machinery/camera{
- c_tag = "Medbay - Lobby";
- network = list("ss13","rd")
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable{
+ icon_state = "1-2"
},
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/obj/effect/turf_decal/tile/yellow{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/blue,
/turf/open/floor/plasteel/white,
-/area/medical/medbay/lobby)
+/area/medical/chemistry)
"cmV" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable{
@@ -55152,10 +55514,16 @@
name = "Research Observatory"
})
"cnk" = (
-/obj/structure/disposalpipe/segment,
-/obj/structure/lattice,
-/turf/open/space/basic,
-/area/space/nearstation)
+/obj/machinery/light,
+/obj/effect/turf_decal/tile/yellow{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/yellow{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/blue,
+/turf/open/floor/plasteel/white,
+/area/medical/chemistry)
"cnl" = (
/obj/machinery/atmospherics/pipe/simple/general/visible{
dir = 4
@@ -55291,6 +55659,21 @@
/area/science/server{
name = "Computer Core"
})
+"cnz" = (
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/manifold/cyan/hidden{
+ dir = 1
+ },
+/obj/structure/sign/departments/chemistry{
+ pixel_y = 32
+ },
+/turf/open/floor/plasteel/white,
+/area/medical/medbay/central)
"cnA" = (
/obj/effect/turf_decal/tile/brown{
dir = 4
@@ -55646,6 +56029,21 @@
},
/turf/open/floor/plasteel,
/area/engine/teg_hot)
+"col" = (
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/yellow{
+ dir = 4
+ },
+/turf/open/floor/plasteel/white,
+/area/medical/chemistry)
+"com" = (
+/obj/machinery/chem_master,
+/obj/effect/turf_decal/stripes/end{
+ dir = 8
+ },
+/obj/structure/window/reinforced/spawner,
+/turf/open/floor/plasteel,
+/area/medical/chemistry)
"con" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -55731,6 +56129,12 @@
},
/turf/open/floor/plasteel,
/area/crew_quarters/heads/chief)
+"cov" = (
+/obj/structure/sign/warning/nosmoking{
+ pixel_y = -32
+ },
+/turf/closed/wall,
+/area/medical/medbay/central)
"cow" = (
/obj/machinery/door/airlock/external/glass{
name = "Asteroid Mining Access";
@@ -55750,6 +56154,16 @@
},
/turf/open/floor/plasteel,
/area/quartermaster/miningoffice)
+"cox" = (
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 5
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue,
+/turf/open/floor/plasteel/white,
+/area/medical/medbay/central)
"coy" = (
/obj/structure/sign/poster/official/safety_internals{
pixel_x = -32
@@ -55855,16 +56269,25 @@
/turf/open/floor/engine,
/area/science/explab)
"coH" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/atmospherics/pipe/simple/orange/hidden{
- dir = 10
+/obj/machinery/door/firedoor,
+/obj/structure/disposalpipe/segment{
+ dir = 4
},
-/obj/machinery/door/poddoor/shutters/preopen{
- id = "robotics2";
- name = "robotics lab shutters"
+/obj/structure/cable{
+ icon_state = "4-8"
},
-/turf/open/floor/plating,
-/area/router/medsci)
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
+ dir = 4
+ },
+/obj/machinery/door/airlock/research{
+ name = "Robotics Lab";
+ req_access_txt = "29"
+ },
+/turf/open/floor/plasteel/dark,
+/area/science/robotics/lab)
"coI" = (
/obj/structure/closet/secure_closet/medical1,
/obj/effect/turf_decal/tile/yellow{
@@ -56391,6 +56814,14 @@
},
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
+"cpI" = (
+/obj/machinery/chem_dispenser,
+/obj/effect/turf_decal/stripes/end{
+ dir = 4
+ },
+/obj/structure/window/reinforced/spawner,
+/turf/open/floor/plasteel,
+/area/medical/chemistry)
"cpJ" = (
/turf/closed/wall/r_wall/rust,
/area/quartermaster/office)
@@ -57178,6 +57609,29 @@
/obj/structure/reagent_dispensers/fueltank,
/turf/open/floor/plasteel/dark,
/area/science/robotics/mechbay)
+"crg" = (
+/obj/machinery/door/firedoor,
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/obj/effect/turf_decal/tile/yellow{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/yellow{
+ dir = 8
+ },
+/obj/machinery/door/airlock/medical/glass{
+ name = "Chemistry Lab";
+ req_access_txt = "5; 33"
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/blue,
+/turf/open/floor/plasteel/white,
+/area/medical/chemistry)
"crh" = (
/obj/machinery/mass_driver{
dir = 1;
@@ -57231,6 +57685,15 @@
},
/turf/open/floor/plating,
/area/engine/teg_cold)
+"crn" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/door/poddoor/shutters/preopen{
+ id = "chem1";
+ name = "chem lab shutters"
+ },
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
+/turf/open/floor/plating,
+/area/medical/chemistry)
"cro" = (
/turf/closed/wall/r_wall/rust,
/area/maintenance/starboard/aft)
@@ -57989,8 +58452,22 @@
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
"csK" = (
-/turf/closed/wall/r_wall,
-/area/medical/chemistry)
+/obj/structure/table/reinforced,
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/blue,
+/obj/machinery/door/window/northright{
+ name = "Medbay Desk";
+ req_access_txt = "5"
+ },
+/obj/item/clipboard,
+/obj/item/clothing/glasses/hud/health,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/obj/item/pen,
+/obj/item/clothing/glasses/hud/health,
+/turf/open/floor/plasteel/white,
+/area/medical/medbay/lobby)
"csL" = (
/obj/effect/landmark/xmastree/rdrod,
/turf/open/floor/carpet{
@@ -58817,16 +59294,14 @@
/turf/open/floor/plating,
/area/hallway/primary/aft)
"cup" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/structure/closet/secure_closet/chemical,
-/obj/effect/turf_decal/trimline/yellow/filled/line,
-/obj/effect/turf_decal/trimline/yellow/filled/line{
+/obj/effect/turf_decal/tile/blue{
dir = 1
},
-/turf/open/floor/plasteel/showroomfloor,
-/area/medical/chemistry)
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/turf/open/floor/plasteel/white,
+/area/medical/medbay/central)
"cuq" = (
/obj/effect/turf_decal/tile/neutral{
dir = 4
@@ -59360,19 +59835,12 @@
/turf/open/floor/plasteel/dark/side,
/area/science/robotics/lab)
"cvu" = (
-/obj/structure/cable{
- icon_state = "4-8"
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
},
-/obj/structure/disposalpipe/trunk{
- dir = 1
- },
-/obj/machinery/disposal/bin,
-/obj/effect/turf_decal/trimline/yellow/filled/line,
-/obj/effect/turf_decal/trimline/yellow/filled/line{
- dir = 1
- },
-/turf/open/floor/plasteel/showroomfloor,
-/area/medical/chemistry)
+/obj/effect/turf_decal/tile/blue,
+/turf/open/floor/plasteel/white,
+/area/medical/medbay/central)
"cvv" = (
/obj/effect/turf_decal/tile/blue,
/obj/effect/turf_decal/tile/blue{
@@ -59687,19 +60155,24 @@
/turf/open/floor/plasteel/dark/side,
/area/science/robotics/lab)
"cvR" = (
-/obj/machinery/firealarm{
- dir = 8;
- pixel_x = 26
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
},
-/obj/effect/turf_decal/trimline/yellow/filled/line{
- dir = 8
+/obj/structure/disposalpipe/sorting/mail/flip{
+ sortType = 23
},
-/obj/effect/turf_decal/trimline/yellow/filled/line{
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
dir = 4
},
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
/obj/machinery/atmospherics/pipe/simple/orange/hidden,
-/turf/open/floor/plasteel/showroomfloor,
-/area/medical/chemistry)
+/obj/effect/turf_decal/tile/yellow{
+ dir = 4
+ },
+/turf/open/floor/plasteel/white,
+/area/medical/medbay/central)
"cvS" = (
/obj/machinery/vending/wardrobe/robo_wardrobe,
/turf/open/floor/plasteel/dark,
@@ -60024,18 +60497,21 @@
/turf/open/floor/plasteel,
/area/engine/workshop)
"cws" = (
+/obj/structure/disposalpipe/segment,
/obj/structure/cable{
- icon_state = "4-8"
+ icon_state = "1-2"
},
-/obj/machinery/vending/wardrobe/chem_wardrobe,
-/obj/effect/turf_decal/trimline/yellow/filled/line,
-/obj/effect/turf_decal/trimline/yellow/filled/line{
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/obj/effect/turf_decal/tile/yellow{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/blue{
dir = 1
},
-/obj/machinery/atmospherics/pipe/simple/orange/hidden{
- dir = 6
+/obj/machinery/light_switch{
+ pixel_x = -24
},
-/turf/open/floor/plasteel/showroomfloor,
+/turf/open/floor/plasteel/white,
/area/medical/chemistry)
"cwt" = (
/obj/structure/disposalpipe/segment,
@@ -60327,26 +60803,40 @@
/turf/open/floor/plasteel,
/area/quartermaster/warehouse)
"cxf" = (
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/obj/structure/disposalpipe/segment{
dir = 4
},
-/turf/open/floor/plasteel/dark,
-/area/medical/chemistry)
+/obj/effect/turf_decal/tile/yellow{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/manifold/cyan/hidden,
+/turf/open/floor/plasteel/white,
+/area/medical/medbay/central)
"cxg" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+/obj/effect/turf_decal/tile/blue{
dir = 1
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
dir = 4
},
-/turf/open/floor/plasteel/dark,
-/area/medical/chemistry)
-"cxh" = (
-/obj/machinery/chem_dispenser,
-/obj/effect/turf_decal/trimline/yellow/filled/end{
- dir = 1
+/obj/effect/turf_decal/tile/yellow{
+ dir = 4
},
-/turf/open/floor/plasteel/showroomfloor,
+/turf/open/floor/plasteel/white,
+/area/medical/medbay/central)
+"cxh" = (
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/yellow{
+ dir = 4
+ },
+/obj/effect/landmark/start/chemist,
+/turf/open/floor/plasteel/white,
/area/medical/chemistry)
"cxi" = (
/obj/structure/rack,
@@ -60983,19 +61473,11 @@
/turf/open/floor/plating,
/area/maintenance/aft)
"cyu" = (
-/obj/structure/disposalpipe/segment,
-/obj/structure/cable{
- icon_state = "2-4"
+/obj/structure/closet/wardrobe/chemistry_white{
+ anchored = 1
},
-/obj/machinery/camera{
- c_tag = "Aft Maintenance - Port";
- pixel_x = 22
- },
-/obj/machinery/atmospherics/pipe/simple/orange/hidden{
- dir = 10
- },
-/turf/open/floor/plating,
-/area/maintenance/aft)
+/turf/open/floor/plasteel/white,
+/area/medical/chemistry)
"cyv" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 4
@@ -61059,13 +61541,38 @@
/turf/open/floor/plasteel/white,
/area/medical/medbay/lobby)
"cyB" = (
-/obj/structure/disposalpipe/segment,
-/obj/structure/cable{
- icon_state = "1-2"
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
},
-/obj/machinery/atmospherics/pipe/simple/orange/hidden,
-/turf/open/floor/plating,
-/area/maintenance/aft)
+/obj/machinery/light{
+ dir = 1
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 10
+ },
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
+ dir = 4
+ },
+/obj/structure/sign/poster/official/medical_green_cross{
+ pixel_y = 32
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/turf/open/floor/plasteel/white,
+/area/medical/medbay/central)
+"cyC" = (
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/turf/open/floor/plasteel/white,
+/area/medical/medbay/central)
"cyD" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/public/glass{
@@ -61080,50 +61587,32 @@
/turf/open/floor/plasteel/white,
/area/medical/medbay/lobby)
"cyF" = (
-/obj/structure/cable{
- icon_state = "1-4"
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
- dir = 4
- },
+/obj/structure/closet/secure_closet/chemical,
/turf/open/floor/plasteel/white,
-/area/medical/medbay/lobby)
+/area/medical/chemistry)
"cyG" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/orange/hidden{
- dir = 8
- },
-/turf/open/floor/plasteel/white,
-/area/medical/medbay/lobby)
+/obj/machinery/chem_master,
+/turf/open/floor/plasteel/showroomfloor,
+/area/medical/medbay/central)
"cyH" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/maintenance{
- name = "Aft Maintenance";
- req_access_txt = "12"
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
},
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/orange/hidden{
- dir = 8
- },
-/turf/open/floor/plating,
-/area/medical/medbay/lobby)
-"cyI" = (
-/obj/structure/disposalpipe/segment,
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/structure/cable{
- icon_state = "1-8"
- },
-/obj/machinery/atmospherics/pipe/manifold/orange/hidden{
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
dir = 4
},
-/turf/open/floor/plating,
-/area/maintenance/aft)
+/turf/open/floor/plasteel/white,
+/area/medical/medbay/central)
+"cyI" = (
+/obj/effect/turf_decal/tile/blue,
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
+ dir = 10
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/turf/open/floor/plasteel/white,
+/area/medical/medbay/central)
"cyJ" = (
/obj/effect/turf_decal/tile/green{
dir = 8
@@ -61140,41 +61629,37 @@
/turf/open/floor/plasteel/white,
/area/medical/medbay/lobby)
"cyL" = (
-/obj/structure/closet/cardboard,
-/obj/structure/disposalpipe/segment{
+/obj/effect/turf_decal/tile/blue,
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
dir = 5
},
-/obj/structure/cable{
- icon_state = "1-4"
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/orange/hidden{
- dir = 5
- },
-/turf/open/floor/plating,
-/area/maintenance/aft)
+/turf/open/floor/plasteel/white,
+/area/medical/medbay/central)
"cyM" = (
-/obj/structure/disposalpipe/segment{
- dir = 10
- },
-/obj/structure/cable{
- icon_state = "2-8"
- },
-/obj/machinery/atmospherics/pipe/simple/orange/hidden{
- dir = 10
- },
-/turf/open/floor/plating,
-/area/maintenance/aft)
-"cyN" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+/obj/structure/closet/secure_closet/personal/patient,
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/purple{
dir = 8
},
-/obj/machinery/door/airlock/maintenance{
- name = "Chemistry Maintenance";
- req_access_txt = "5; 33"
+/obj/structure/disposalpipe/segment{
+ dir = 4
},
-/turf/open/floor/plating,
-/area/medical/chemistry)
+/obj/structure/window/reinforced/spawner,
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/turf/open/floor/plasteel/white,
+/area/medical/medbay/central)
+"cyN" = (
+/obj/machinery/chem_dispenser/apothecary,
+/obj/machinery/airalarm{
+ pixel_y = 24
+ },
+/turf/open/floor/plasteel/showroomfloor,
+/area/medical/medbay/central)
"cyO" = (
/obj/structure/disposalpipe/segment{
dir = 6
@@ -61539,15 +62024,22 @@
/turf/open/floor/plasteel/white,
/area/crew_quarters/heads/cmo)
"czv" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/obj/effect/turf_decal/tile/yellow{
dir = 8
},
-/obj/machinery/door/airlock/medical/glass{
- name = "Chemistry Lab";
- req_access_txt = "5; 33"
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
},
-/turf/open/floor/plasteel/dark,
+/obj/machinery/firealarm{
+ dir = 4;
+ pixel_x = -28
+ },
+/turf/open/floor/plasteel/white,
/area/medical/chemistry)
"czw" = (
/obj/machinery/atmospherics/pipe/simple/orange/hidden{
@@ -61595,18 +62087,12 @@
/turf/open/floor/plasteel/dark,
/area/crew_quarters/heads/hor)
"czB" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/maintenance{
- name = "Medbay Maintenance";
- req_access_txt = "5"
+/obj/effect/turf_decal/tile/yellow{
+ dir = 4
},
-/obj/structure/disposalpipe/segment,
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/orange/hidden,
-/turf/open/floor/plating,
-/area/maintenance/aft)
+/obj/effect/turf_decal/tile/blue,
+/turf/open/floor/plasteel/white,
+/area/medical/chemistry)
"czC" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 1
@@ -61640,27 +62126,9 @@
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"czF" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/structure/disposalpipe/sorting/mail/flip{
- sortType = 23
- },
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
- dir = 4
- },
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/orange/hidden,
-/obj/structure/cable{
- icon_state = "1-4"
- },
+/obj/machinery/atmospherics/components/unary/vent_pump/on,
/turf/open/floor/plasteel/white,
-/area/medical/medbay/central)
+/area/medical/chemistry)
"czG" = (
/obj/effect/landmark/event_spawn,
/turf/open/floor/plasteel/showroomfloor,
@@ -61710,7 +62178,15 @@
/turf/open/floor/plasteel/white,
/area/medical/genetics)
"czM" = (
-/turf/open/floor/plasteel/dark,
+/obj/machinery/requests_console{
+ department = "Chemistry";
+ departmentType = 2;
+ name = "Chemistry RC";
+ pixel_x = 30;
+ pixel_y = 0;
+ receive_ore_updates = 1
+ },
+/turf/open/floor/plasteel/white,
/area/medical/chemistry)
"czN" = (
/obj/structure/closet/crate/trashcart,
@@ -61736,12 +62212,12 @@
/turf/open/floor/plating,
/area/maintenance/disposal)
"czP" = (
-/obj/structure/cable{
- icon_state = "1-2"
+/obj/machinery/atmospherics/components/unary/vent_pump/on,
+/obj/machinery/light/small{
+ dir = 8
},
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
-/turf/open/floor/plasteel/dark,
-/area/medical/chemistry)
+/turf/open/floor/plasteel/showroomfloor,
+/area/medical/medbay/central)
"czQ" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/disposalpipe/segment,
@@ -61818,28 +62294,14 @@
/turf/open/floor/plasteel,
/area/maintenance/disposal)
"czW" = (
-/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/effect/turf_decal/tile/purple{
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 4
},
-/obj/effect/turf_decal/tile/purple{
+/obj/structure/chair/office/light{
dir = 8
},
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
-/obj/machinery/door/airlock/medical/glass{
- name = "Chemistry Lab";
- req_access_txt = "5; 33"
- },
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
-/turf/open/floor/plasteel/white,
-/area/medical/chemistry)
+/turf/open/floor/plasteel/showroomfloor,
+/area/medical/medbay/central)
"czX" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/orange/hidden,
@@ -61898,17 +62360,11 @@
/turf/open/floor/plasteel,
/area/maintenance/disposal)
"cAc" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 1
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 8
},
-/obj/effect/turf_decal/tile/purple{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/manifold/cyan/hidden,
-/obj/structure/cable{
- icon_state = "1-8"
- },
-/turf/open/floor/plasteel/white,
+/obj/effect/spawner/structure/window,
+/turf/open/floor/plating,
/area/medical/medbay/central)
"cAd" = (
/obj/structure/disposalpipe/segment,
@@ -62033,23 +62489,17 @@
/turf/open/floor/plating,
/area/maintenance/disposal)
"cAo" = (
-/obj/structure/table/reinforced,
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
/obj/effect/turf_decal/tile/blue{
dir = 1
},
-/obj/effect/turf_decal/tile/blue,
-/obj/machinery/door/window/northright{
- name = "Medbay Desk";
- req_access_txt = "5"
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 8
},
-/obj/item/clipboard,
-/obj/item/clothing/glasses/hud/health,
-/obj/machinery/atmospherics/pipe/simple/orange/hidden,
-/obj/item/paper/fluff/cogstation/sleepers,
-/obj/item/pen,
-/obj/item/clothing/glasses/hud/health,
/turf/open/floor/plasteel/white,
-/area/medical/medbay/lobby)
+/area/medical/medbay/central)
"cAp" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
@@ -64080,6 +64530,40 @@
},
/turf/open/floor/engine,
/area/gateway)
+"cDL" = (
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue,
+/obj/machinery/atmospherics/pipe/manifold/orange/hidden{
+ dir = 4
+ },
+/obj/machinery/camera{
+ c_tag = "Medbay - Apothecary";
+ dir = 8;
+ network = list("ss13","medbay");
+ pixel_y = -22
+ },
+/turf/open/floor/plasteel/white,
+/area/medical/medbay/central)
+"cDM" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 9
+ },
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
+/obj/structure/table/glass,
+/obj/item/book/manual/wiki/chemistry,
+/obj/item/book/manual/wiki/chemistry{
+ pixel_x = 3;
+ pixel_y = 3
+ },
+/obj/item/clothing/glasses/science,
+/obj/item/clothing/glasses/science{
+ pixel_x = 2;
+ pixel_y = 4
+ },
+/turf/open/floor/plasteel,
+/area/medical/chemistry)
"cDN" = (
/obj/machinery/atmospherics/pipe/simple/orange/hidden{
dir = 8
@@ -65499,25 +65983,13 @@
/turf/open/floor/plasteel/dark,
/area/science/robotics/lab)
"cFX" = (
-/obj/machinery/door/firedoor,
-/obj/structure/disposalpipe/segment{
- dir = 4
+/obj/machinery/chem_heater,
+/obj/machinery/firealarm{
+ dir = 8;
+ pixel_x = 26
},
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
- dir = 4
- },
-/obj/machinery/door/airlock/research{
- name = "Robotics Lab";
- req_access_txt = "29"
- },
-/turf/open/floor/plasteel/dark,
-/area/router/medsci)
+/turf/open/floor/plasteel/showroomfloor,
+/area/medical/medbay/central)
"cFY" = (
/turf/open/floor/plasteel,
/area/router/air)
@@ -65985,6 +66457,14 @@
/obj/machinery/portable_atmospherics/pump,
/turf/open/floor/engine,
/area/science/storage)
+"cGI" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/structure/chair/office/light,
+/obj/effect/landmark/start/chemist,
+/turf/open/floor/plasteel,
+/area/medical/chemistry)
"cGJ" = (
/obj/machinery/portable_atmospherics/canister/oxygen,
/obj/effect/turf_decal/stripes/line{
@@ -66054,6 +66534,17 @@
},
/turf/open/floor/plasteel/white,
/area/science/circuit)
+"cGU" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 8
+ },
+/obj/machinery/door/airlock/medical{
+ name = "Morgue";
+ req_access_txt = "5;6"
+ },
+/turf/open/floor/plasteel/showroomfloor,
+/area/medical/morgue)
"cGV" = (
/obj/machinery/portable_atmospherics/canister/toxins,
/obj/effect/turf_decal/delivery,
@@ -66572,6 +67063,19 @@
/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
/turf/open/floor/plasteel,
/area/security/checkpoint/supply)
+"cHW" = (
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/delivery,
+/obj/structure/table/reinforced,
+/obj/machinery/door/window/eastright{
+ base_state = "left";
+ dir = 2;
+ icon_state = "left";
+ name = "Chemistry Desk";
+ req_access_txt = "33"
+ },
+/turf/open/floor/plasteel,
+/area/medical/chemistry)
"cHX" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -67895,24 +68399,14 @@
/turf/open/floor/plasteel/white,
/area/medical/medbay/lobby)
"cKi" = (
-/obj/machinery/button/door{
- id = "chem1";
- name = "Shutters Control Button";
- pixel_x = -8;
- pixel_y = 24;
- req_access_txt = "29"
- },
-/obj/effect/turf_decal/trimline/yellow/filled/line{
- dir = 5
- },
-/obj/effect/turf_decal/trimline/yellow/filled/corner{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/manifold/orange/hidden{
- dir = 1
+/obj/machinery/door/firedoor,
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
+/obj/machinery/door/airlock/medical{
+ name = "Apothecary";
+ req_access_txt = "5"
},
/turf/open/floor/plasteel/showroomfloor,
-/area/medical/chemistry)
+/area/medical/medbay/central)
"cKj" = (
/obj/structure/closet/secure_closet/CMO,
/obj/effect/turf_decal/tile/blue,
@@ -68143,6 +68637,24 @@
/obj/structure/closet/wardrobe/yellow,
/turf/open/floor/plasteel,
/area/hallway/primary/central)
+"cKH" = (
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/yellow{
+ dir = 4
+ },
+/obj/machinery/airalarm{
+ pixel_y = 24
+ },
+/turf/open/floor/plasteel/white,
+/area/medical/medbay/central)
"cKI" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -69407,17 +69919,24 @@
/turf/open/floor/plating/airless,
/area/router/aux)
"cNJ" = (
-/obj/structure/disposalpipe/segment,
-/obj/structure/cable{
- icon_state = "1-2"
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
},
-/obj/structure/cable{
- icon_state = "1-8"
+/obj/structure/disposalpipe/segment{
+ dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/orange/hidden,
-/obj/effect/landmark/event_spawn,
-/turf/open/floor/plating,
-/area/maintenance/aft)
+/obj/machinery/atmospherics/pipe/manifold/cyan/hidden{
+ dir = 1
+ },
+/obj/machinery/camera{
+ c_tag = "Medbay - Starboard";
+ network = list("ss13","rd")
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/turf/open/floor/plasteel/white,
+/area/medical/medbay/central)
"cNK" = (
/obj/machinery/atmospherics/components/unary/outlet_injector/on{
dir = 4
@@ -69499,6 +70018,19 @@
/obj/item/stack/sheet/plasteel/fifty,
/turf/open/floor/plating,
/area/quartermaster/miningdock/airless)
+"cNV" = (
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/manifold/cyan/hidden,
+/turf/open/floor/plasteel/white,
+/area/medical/medbay/central)
"cNW" = (
/obj/structure/lattice/catwalk,
/obj/machinery/camera{
@@ -70192,30 +70724,6 @@
"cPw" = (
/turf/open/floor/plasteel/dark,
/area/science/robotics/mechbay)
-"cPx" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/machinery/light{
- dir = 1
- },
-/obj/effect/turf_decal/tile/purple{
- dir = 4
- },
-/obj/structure/disposalpipe/segment{
- dir = 10
- },
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
- dir = 4
- },
-/obj/structure/sign/poster/official/medical_green_cross{
- pixel_y = 32
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/open/floor/plasteel/white,
-/area/medical/medbay/central)
"cPy" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -70412,16 +70920,6 @@
},
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
-"cPP" = (
-/obj/effect/turf_decal/trimline/yellow/filled/line{
- dir = 8
- },
-/obj/effect/turf_decal/trimline/yellow/filled/line{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/orange/hidden,
-/turf/open/floor/plasteel/showroomfloor,
-/area/medical/chemistry)
"cPQ" = (
/obj/structure/disposalpipe/segment{
dir = 6
@@ -94786,7 +95284,7 @@ bYv
bYv
cio
cct
-caz
+cct
bOO
cHq
cHs
@@ -95043,7 +95541,7 @@ cct
bYo
ckk
bYF
-bBP
+cct
bFu
bIc
btn
@@ -95300,7 +95798,7 @@ bYv
bYp
bYx
cPw
-bBQ
+caz
ccd
bId
cpw
@@ -95557,7 +96055,7 @@ bYv
bYq
cPv
bYH
-bsM
+bYv
bDT
bIe
bYB
@@ -95814,7 +96312,7 @@ bYv
cgr
bYy
crf
-bsM
+bYv
bFx
bIf
bto
@@ -96071,7 +96569,7 @@ bYv
bYv
cwb
bYv
-bsM
+bYv
csV
bIe
bYB
@@ -97104,10 +97602,10 @@ bFC
bIj
ccd
bJD
-btv
-cFX
ccm
-cOI
+coH
+bJH
+bIk
cOI
cOI
cOI
@@ -97361,7 +97859,7 @@ clv
bsU
ccd
bJE
-btv
+ccm
cOx
cOA
cOE
@@ -97618,7 +98116,7 @@ bZT
bsU
ccd
ckb
-coH
+cdW
cOy
cOB
cOF
@@ -97875,7 +98373,7 @@ cum
bIj
ccd
cvS
-cOI
+bIk
cOz
cOC
cOG
@@ -98132,7 +98630,7 @@ bIk
bIk
ccB
bJH
-cOI
+bIk
cGb
bRI
cOH
@@ -99152,7 +99650,7 @@ bRJ
bth
bTB
cek
-cAo
+csK
cKk
cKl
cKm
@@ -100690,9 +101188,9 @@ bXi
bXq
caQ
bXC
-bXL
-cyF
-bst
+bvK
+bHI
+bYK
buK
bst
bst
@@ -100947,9 +101445,9 @@ buF
bDm
bqe
ceY
-bst
-cyG
-bst
+bwf
+bHJ
+cbr
cDE
cDG
cEa
@@ -101204,9 +101702,9 @@ bbh
bbh
bqm
bqm
-cdW
-cyG
+byw
bst
+cbr
cDF
cDJ
cKC
@@ -101461,9 +101959,9 @@ bbh
bpA
bXz
bqm
-cmU
-cyG
-bst
+byD
+bHJ
+cbs
buS
cDZ
czg
@@ -101716,11 +102214,11 @@ ccp
cJe
bbh
bpB
-bPw
+btv
bqm
-bsG
-cyG
-bsG
+bzJ
+bst
+cbK
buS
bAJ
czh
@@ -101973,11 +102471,11 @@ ccw
csM
cyo
cyt
-bPw
-bqm
-bqm
-cyH
-bqm
+blU
+bqz
+bAD
+bIi
+bBP
buS
caR
czi
@@ -102229,18 +102727,18 @@ cIH
cgv
coE
bxM
-cyu
-cNJ
-cyB
-cyB
-cyI
-cyL
+bau
+bXt
+brH
+bAE
+bIt
+cdX
buS
buS
buS
buS
buS
-bFZ
+cnz
cEZ
bJa
aKZ
@@ -102486,18 +102984,18 @@ cIF
cgB
bqr
bbh
+bga
+bqs
+brJ
+bBs
+bIL
ciQ
-bpD
-bpD
-bpD
-bpD
-cyM
-cyB
-cyB
-cyB
-cyB
-czB
-czF
+cmK
+cws
+czv
+cmU
+crg
+cvR
cFd
bEl
aMm
@@ -102744,17 +103242,17 @@ cgB
bqx
bbh
bPw
-bsZ
-bsZ
-bsZ
-bsZ
-csK
-csK
-csK
-csK
-csK
-csK
-bHC
+bqz
+bqz
+bzA
+bFE
+bFG
+col
+cxh
+czB
+cnk
+bqz
+cKH
cFe
cFk
cFm
@@ -103001,17 +103499,17 @@ cgB
bqr
bbh
bPw
-bsZ
-bim
-bim
-bim
-csK
-bQp
-byw
+bqz
+bqq
bzG
-bAC
-csK
-bHG
+bFZ
+ckp
+com
+cyu
+czF
+cDM
+crn
+cxf
cFf
bEl
aOF
@@ -103258,17 +103756,17 @@ cgB
bqr
bbh
bPw
-bsZ
-bim
-bim
-bim
-bul
-bvK
+bqz
+brK
+bCf
+bJd
+ckD
+cpI
+cyF
czM
-czM
-czM
-bsN
-bHG
+cGI
+cHW
+cxg
cFf
bJb
bJJ
@@ -103515,17 +104013,17 @@ cgB
bqr
bcT
bPw
-bsZ
-bim
-bim
-bim
-bul
-bwf
-byD
-brK
-bAE
-bsQ
-bHE
+bqz
+bsL
+bzG
+bFG
+clc
+bqz
+bqz
+bqz
+bqz
+bqz
+cNJ
cAm
cAt
cAv
@@ -103769,20 +104267,20 @@ bbh
bdF
cIL
ciF
-bqz
-bcT
-bPw
-bsZ
-bim
-bim
-bim
-bul
-cup
-cxf
-czM
-czM
+aYG
+bdu
+biU
+brF
bsN
-bHG
+bCg
+bHC
+cmB
+bqz
+cyG
+czP
+bBQ
+cKi
+cNV
cFf
bJc
bJL
@@ -104029,17 +104527,17 @@ ciW
bqC
bdu
bXt
-bqs
-cnk
-cnk
-cnk
csi
-cvu
-cxf
-cxh
-ckD
-csK
-cPx
+bsP
+bAC
+bHC
+bIM
+bqz
+cyN
+czW
+cFX
+bRI
+cyB
cFh
bJe
cRb
@@ -104286,17 +104784,17 @@ cjV
bdu
bdu
bXu
-bsZ
-bim
-bim
-bim
-bul
-cws
-cxg
-czM
-bBs
-csK
-bHI
+bqz
+bsQ
+bCY
+bHE
+bqz
+bqz
+bMj
+cAc
+cov
+bMj
+cyC
cFf
btp
bJN
@@ -104543,17 +105041,17 @@ cgB
bTv
bcT
bQE
-bsZ
-bim
-bim
-bim
-bul
-brH
-brJ
-czP
-czP
-czW
-cAc
+bqz
+bqz
+bqz
+bJf
+bqz
+caj
+cdY
+cAo
+cdY
+cup
+cyH
cFi
bMF
bNF
@@ -104800,19 +105298,19 @@ cgB
bYW
bcT
bQE
-bsZ
-bim
-bim
-bim
-csK
-cKi
-cvR
-cPP
-bsL
-bul
-bHJ
-bIt
-bJf
+bsV
+bsG
+bHD
+bHD
+bMj
+caH
+chV
+cDL
+cox
+cvu
+cyI
+cyL
+cyM
bJO
cKp
cHS
@@ -105057,16 +105555,16 @@ cgB
bbh
bbh
bQE
-bsZ
-bim
-bim
-bim
-csK
-cyN
-csK
-bzJ
-czv
-csK
+bsV
+bts
+bHG
+bQp
+bMj
+cbm
+byQ
+bHK
+cGU
+byQ
bHK
bIu
bJh
@@ -105314,11 +105812,11 @@ cgB
bbh
bpm
bQE
-bsZ
-bim
-bim
-bim
-bsZ
+bsV
+buj
+bpD
+bXL
+bsV
cyO
byN
bzK
@@ -105571,11 +106069,11 @@ cmn
bWZ
bXj
bXv
-bsZ
-bsZ
-bsZ
-bsZ
-bsZ
+bsV
+bul
+bpD
+bsV
+bsV
cyP
byQ
bzS
diff --git a/code/__DEFINES/cooldowns.dm b/code/__DEFINES/cooldowns.dm
new file mode 100644
index 0000000000..29c7a25dad
--- /dev/null
+++ b/code/__DEFINES/cooldowns.dm
@@ -0,0 +1,71 @@
+//// COOLDOWN SYSTEMS
+/*
+ * We have 2 cooldown systems: timer cooldowns (divided between stoppable and regular) and world.time cooldowns.
+ *
+ * When to use each?
+ *
+ * * Adding a commonly-checked cooldown, like on a subsystem to check for processing
+ * * * Use the world.time ones, as they are cheaper.
+ *
+ * * Adding a rarely-used one for special situations, such as giving an uncommon item a cooldown on a target.
+ * * * Timer cooldown, as adding a new variable on each mob to track the cooldown of said uncommon item is going too far.
+ *
+ * * Triggering events at the end of a cooldown.
+ * * * Timer cooldown, registering to its signal.
+ *
+ * * Being able to check how long left for the cooldown to end.
+ * * * Either world.time or stoppable timer cooldowns, depending on the other factors. Regular timer cooldowns do not support this.
+ *
+ * * Being able to stop the timer before it ends.
+ * * * Either world.time or stoppable timer cooldowns, depending on the other factors. Regular timer cooldowns do not support this.
+*/
+
+
+/*
+ * Cooldown system based on an datum-level associative lazylist using timers.
+*/
+
+//INDEXES
+#define COOLDOWN_EMPLOYMENT_CABINET "employment cabinet"
+
+
+//TIMER COOLDOWN MACROS
+
+#define COMSIG_CD_STOP(cd_index) "cooldown_[cd_index]"
+#define COMSIG_CD_RESET(cd_index) "cd_reset_[cd_index]"
+
+#define TIMER_COOLDOWN_START(cd_source, cd_index, cd_time) LAZYSET(cd_source.cooldowns, cd_index, addtimer(CALLBACK(GLOBAL_PROC, /proc/end_cooldown, cd_source, cd_index), cd_time))
+
+#define TIMER_COOLDOWN_CHECK(cd_source, cd_index) LAZYACCESS(cd_source.cooldowns, cd_index)
+
+#define TIMER_COOLDOWN_END(cd_source, cd_index) LAZYREMOVE(cd_source.cooldowns, cd_index)
+
+/*
+ * Stoppable timer cooldowns.
+ * Use indexes the same as the regular tiemr cooldowns.
+ * They make use of the TIMER_COOLDOWN_CHECK() and TIMER_COOLDOWN_END() macros the same, just not the TIMER_COOLDOWN_START() one.
+ * A bit more expensive than the regular timers, but can be reset before they end and the time left can be checked.
+*/
+
+#define S_TIMER_COOLDOWN_START(cd_source, cd_index, cd_time) LAZYSET(cd_source.cooldowns, cd_index, addtimer(CALLBACK(GLOBAL_PROC, /proc/end_cooldown, cd_source, cd_index), cd_time, TIMER_STOPPABLE))
+
+#define S_TIMER_COOLDOWN_RESET(cd_source, cd_index) reset_cooldown(cd_source, cd_index)
+
+#define S_TIMER_COOLDOWN_TIMELEFT(cd_source, cd_index) (timeleft(TIMER_COOLDOWN_CHECK(cd_source, cd_index)))
+
+
+/*
+ * Cooldown system based on storing world.time on a variable, plus the cooldown time.
+ * Better performance over timer cooldowns, lower control. Same functionality.
+*/
+
+#define COOLDOWN_DECLARE(cd_index) var/##cd_index = 0
+
+#define COOLDOWN_START(cd_source, cd_index, cd_time) (cd_source.cd_index = world.time + cd_time)
+
+//Returns true if the cooldown has run its course, false otherwise
+#define COOLDOWN_FINISHED(cd_source, cd_index) (cd_source.cd_index < world.time)
+
+#define COOLDOWN_RESET(cd_source, cd_index) cd_source.cd_index = 0
+
+#define COOLDOWN_TIMELEFT(cd_source, cd_index) (max(0, cd_source.cd_index - world.time))
diff --git a/code/datums/datum.dm b/code/datums/datum.dm
index 6202ac444e..7756cfd906 100644
--- a/code/datums/datum.dm
+++ b/code/datums/datum.dm
@@ -39,6 +39,9 @@
/// A weak reference to another datum
var/datum/weakref/weak_reference
+ ///Lazy associative list of currently active cooldowns.
+ var/list/cooldowns
+
#ifdef TESTING
var/running_find_references
var/last_find_references = 0
@@ -201,3 +204,34 @@
qdel(D)
else
return returned
+
+/**
+ * Callback called by a timer to end an associative-list-indexed cooldown.
+ *
+ * Arguments:
+ * * source - datum storing the cooldown
+ * * index - string index storing the cooldown on the cooldowns associative list
+ *
+ * This sends a signal reporting the cooldown end.
+ */
+/proc/end_cooldown(datum/source, index)
+ if(QDELETED(source))
+ return
+ SEND_SIGNAL(source, COMSIG_CD_STOP(index))
+ TIMER_COOLDOWN_END(source, index)
+
+
+/**
+ * Proc used by stoppable timers to end a cooldown before the time has ran out.
+ *
+ * Arguments:
+ * * source - datum storing the cooldown
+ * * index - string index storing the cooldown on the cooldowns associative list
+ *
+ * This sends a signal reporting the cooldown end, passing the time left as an argument.
+ */
+/proc/reset_cooldown(datum/source, index)
+ if(QDELETED(source))
+ return
+ SEND_SIGNAL(source, COMSIG_CD_RESET(index), S_TIMER_COOLDOWN_TIMELEFT(source, index))
+ TIMER_COOLDOWN_END(source, index)
diff --git a/code/datums/dna.dm b/code/datums/dna.dm
index ed5104e296..80059bece7 100644
--- a/code/datums/dna.dm
+++ b/code/datums/dna.dm
@@ -678,7 +678,7 @@
holder.update_transform()
var/danger = CONFIG_GET(number/threshold_body_size_slowdown)
if(features["body_size"] < danger)
- var/slowdown = 1 + round(danger/features["body_size"], 0.1) * CONFIG_GET(number/body_size_slowdown_multiplier)
+ var/slowdown = (1 - round(features["body_size"] / danger, 0.1)) * CONFIG_GET(number/body_size_slowdown_multiplier)
holder.add_or_update_variable_movespeed_modifier(/datum/movespeed_modifier/small_stride, TRUE, slowdown)
else if(old_size < danger)
holder.remove_movespeed_modifier(/datum/movespeed_modifier/small_stride)
diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm
index 3b95b1281f..6312dc08a4 100644
--- a/code/game/gamemodes/objective.dm
+++ b/code/game/gamemodes/objective.dm
@@ -201,10 +201,13 @@ GLOBAL_LIST_EMPTY(objectives)
return won || ..()
/datum/objective/assassinate/once/process()
- won = check_completion()
+ won = check_midround_completion()
if(won)
STOP_PROCESSING(SSprocessing,src)
+/datum/objective/assassinate/once/proc/check_midround_completion()
+ return won || !considered_alive(target) //The target afking / logging off for a bit during the round doesn't complete it, but them being afk at roundend does.
+
/datum/objective/assassinate/internal
var/stolen = 0 //Have we already eliminated this target?
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index 2efc7f8cd3..aaee5c85f6 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -2322,14 +2322,16 @@ GLOBAL_LIST_EMPTY(preferences_datums)
var/min = CONFIG_GET(number/body_size_min)
var/max = CONFIG_GET(number/body_size_max)
var/danger = CONFIG_GET(number/threshold_body_size_slowdown)
- var/new_body_size = input(user, "Choose your desired sprite size:\n([min*100]%-[max*100]%), Warning: May make your character look distorted[danger > min ? ", and an exponential slowdown will occur for those smaller than [danger*100]%!" : "!"]", "Character Preference", features["body_size"]*100) as num|null
+ var/new_body_size = input(user, "Choose your desired sprite size: ([min*100]%-[max*100]%)\nWarning: This may make your character look distorted[danger > min ? "! Additionally, a proportional movement speed penalty will be applied to characters smaller than [danger*100]%." : "!"]", "Character Preference", features["body_size"]*100) as num|null
if (new_body_size)
new_body_size = clamp(new_body_size * 0.01, min, max)
var/dorfy
- if(danger > new_body_size)
- dorfy = alert(user, "The chosen size appears to be smaller than the threshold of [danger*100]%, which will lead to an added exponential slowdown. Are you sure about that?", "Dwarfism Alert", "Yes", "Move it to the threshold", "No")
- if(!dorfy || dorfy == "Move it above the threshold")
+ if((new_body_size + 0.01) < danger) // Adding 0.01 as a dumb fix to prevent the warning message from appearing when exactly at threshold... Not sure why that happens in the first place.
+ dorfy = alert(user, "You have chosen a size below the slowdown threshold of [danger*100]%. For balancing purposes, the further you go below this percentage, the slower your character will be. Do you wish to keep this size?", "Speed Penalty Alert", "Yes", "Move it to the threshold", "No")
+ if(dorfy == "Move it to the threshold")
new_body_size = danger
+ if(!dorfy) //Aborts if this var is somehow empty
+ return
if(dorfy != "No")
features["body_size"] = new_body_size
if("tongue")
diff --git a/code/modules/food_and_drinks/food/snacks/meat.dm b/code/modules/food_and_drinks/food/snacks/meat.dm
index a35dcc1dc4..fe70739ab5 100644
--- a/code/modules/food_and_drinks/food/snacks/meat.dm
+++ b/code/modules/food_and_drinks/food/snacks/meat.dm
@@ -83,6 +83,7 @@
/obj/item/reagent_containers/food/snacks/meat/slab/chicken
name = "chicken meat"
desc = "A slab of raw chicken. Remember to wash your hands!"
+ icon_state = "chickenbreast"
cooked_type = /obj/item/reagent_containers/food/snacks/meat/steak/chicken
slice_path = /obj/item/reagent_containers/food/snacks/meat/rawcutlet/chicken
tastes = list("chicken" = 1)
@@ -341,8 +342,14 @@
/obj/item/reagent_containers/food/snacks/meat/steak/chicken
name = "chicken steak" //Can you have chicken steaks? Maybe this should be renamed once it gets new sprites.
+ icon_state = "chickenbreast_cooked"
tastes = list("chicken" = 1)
+/obj/item/reagent_containers/food/snacks/meat/steak/fish
+ name = "fish fillet"
+ icon_state = "grilled_carp_slice"
+ tastes = list("charred sushi" = 1)
+
/obj/item/reagent_containers/food/snacks/meat/steak/plain
foodtype = MEAT
@@ -361,6 +368,7 @@
/obj/item/reagent_containers/food/snacks/meat/steak/bear
name = "bear steak"
+ icon_state = "bearcook"
tastes = list("meat" = 1, "salmon" = 1)
/obj/item/reagent_containers/food/snacks/meat/steak/xeno
diff --git a/code/modules/food_and_drinks/food/snacks_meat.dm b/code/modules/food_and_drinks/food/snacks_meat.dm
index c2a58b0821..e25f99c69e 100644
--- a/code/modules/food_and_drinks/food/snacks_meat.dm
+++ b/code/modules/food_and_drinks/food/snacks_meat.dm
@@ -22,6 +22,7 @@
list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/toxin/carpotoxin = 2, /datum/reagent/consumable/nutriment/vitamin = 2)
bitesize = 6
filling_color = "#FA8072"
+ cooked_type = /obj/item/reagent_containers/food/snacks/meat/steak/fish
tastes = list("fish" = 1)
foodtype = MEAT
diff --git a/code/modules/food_and_drinks/food/snacks_other.dm b/code/modules/food_and_drinks/food/snacks_other.dm
index bc80ffe621..7b0ffe2a19 100644
--- a/code/modules/food_and_drinks/food/snacks_other.dm
+++ b/code/modules/food_and_drinks/food/snacks_other.dm
@@ -136,6 +136,17 @@
tastes = list("fries" = 3, "cheese" = 1)
foodtype = VEGETABLES | GRAIN
+/obj/item/reagent_containers/food/snacks/chilicheesefries
+ name = "chili cheese fries"
+ desc = "Fries smothered in cheese -and- chilli."
+ icon_state = "chilicheesefries"
+ trash = /obj/item/trash/plate
+ bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 2)
+ list_reagents = list(/datum/reagent/consumable/nutriment = 7, /datum/reagent/consumable/nutriment/vitamin = 1)
+ filling_color = "#FFD700"
+ tastes = list("fries" = 3, "cheese" = 1)
+ foodtype = VEGETABLES | GRAIN
+
/obj/item/reagent_containers/food/snacks/badrecipe
name = "burned mess"
desc = "Someone should be demoted from cook for this."
@@ -537,6 +548,15 @@
tastes = list("butter" = 1)
foodtype = DAIRY
+/obj/item/reagent_containers/food/snacks/butter/margarine
+ name = "stick of margarine"
+ desc = "A stick of lightly salted vegetable oil."
+ icon_state = "marge"
+ list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/cornoil = 2, /datum/reagent/consumable/sodiumchloride = 1)
+ filling_color = "#FFD700"
+ tastes = list("butter" = 1)
+ foodtype = JUNKFOOD
+
/obj/item/reagent_containers/food/snacks/onionrings
name = "onion rings"
desc = "Onion slices coated in batter."
diff --git a/code/modules/food_and_drinks/food/snacks_sandwichtoast.dm b/code/modules/food_and_drinks/food/snacks_sandwichtoast.dm
index 9096429228..d812655b91 100644
--- a/code/modules/food_and_drinks/food/snacks_sandwichtoast.dm
+++ b/code/modules/food_and_drinks/food/snacks_sandwichtoast.dm
@@ -21,6 +21,17 @@
tastes = list("toast" = 1)
foodtype = GRAIN
+/obj/item/reagent_containers/food/snacks/baconlettucetomato
+ name = "blt sandwich"
+ desc = "The classic bacon, lettuce tomato sandwich."
+ icon = 'icons/obj/food/burgerbread.dmi'
+ icon_state = "blt"
+ trash = /obj/item/trash/plate
+ bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
+ list_reagents = list(/datum/reagent/consumable/nutriment = 8, /datum/reagent/consumable/nutriment/vitamin = 2)
+ tastes = list("bacon" = 1, "lettuce" = 1, "tomato" = 1, "mayo" = 1)
+ foodtype = GRAIN | MEAT | VEGETABLES
+
/obj/item/reagent_containers/food/snacks/grilledcheese
name = "grilled cheese sandwich"
desc = "Goes great with Tomato soup!"
@@ -136,8 +147,9 @@
/obj/item/reagent_containers/food/snacks/tuna_sandwich
name = "tuna sandwich"
desc = "Both a salad and a sandwich in one."
+ icon = 'icons/obj/food/burgerbread.dmi'
icon_state = "tunasandwich"
- trash = /obj/item/trash/plate
+ list_reagents = list(/datum/reagent/consumable/nutriment = 12, /datum/reagent/consumable/nutriment/vitamin = 4)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 3)
tastes = list("tuna" = 4, "mayonnaise" = 2, "bread" = 2)
foodtype = GRAIN | MEAT
diff --git a/code/modules/food_and_drinks/recipes/food_mixtures.dm b/code/modules/food_and_drinks/recipes/food_mixtures.dm
index ec96a4537c..541c972490 100644
--- a/code/modules/food_and_drinks/recipes/food_mixtures.dm
+++ b/code/modules/food_and_drinks/recipes/food_mixtures.dm
@@ -179,3 +179,14 @@
id = /datum/reagent/consumable/bbqsauce
results = list(/datum/reagent/consumable/bbqsauce = 5)
required_reagents = list(/datum/reagent/ash = 1, /datum/reagent/consumable/tomatojuice = 1, /datum/reagent/medicine/salglu_solution = 3, /datum/reagent/consumable/blackpepper = 1)
+
+/datum/chemical_reaction/margarine
+ name = "Margarine"
+ id = "margarine"
+ required_reagents = list(/datum/reagent/consumable/cornoil = 5, /datum/reagent/consumable/soymilk = 5, /datum/reagent/consumable/sodiumchloride = 1)
+ mix_message = "The ingredients solidify into a stick of margarine."
+
+/datum/chemical_reaction/margarine/on_reaction(datum/reagents/holder, multiplier)
+ var/location = get_turf(holder.my_atom)
+ for(var/i = 1, i <= multiplier, i++)
+ new /obj/item/reagent_containers/food/snacks/butter/margarine(location)
\ No newline at end of file
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_egg.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_egg.dm
index e8640886c2..53c3682e2c 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_egg.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_egg.dm
@@ -22,6 +22,15 @@
result = /obj/item/reagent_containers/food/snacks/baconegg
subcategory = CAT_EGG
+/datum/crafting_recipe/food/wrap
+ name = "Egg Wrap"
+ reqs = list(/datum/reagent/consumable/soysauce = 10,
+ /obj/item/reagent_containers/food/snacks/friedegg = 1,
+ /obj/item/reagent_containers/food/snacks/grown/cabbage = 1,
+ )
+ result = /obj/item/reagent_containers/food/snacks/eggwrap
+ subcategory = CAT_EGG
+
/datum/crafting_recipe/food/omelette
name = "Omelette"
reqs = list(
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm
index 359fadfb70..bbaa49a1eb 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm
@@ -14,15 +14,6 @@
result = /obj/item/reagent_containers/food/snacks/chawanmushi
subcategory = CAT_MISCFOOD
-/datum/crafting_recipe/food/wrap
- name = "Egg Wrap"
- reqs = list(/datum/reagent/consumable/soysauce = 10,
- /obj/item/reagent_containers/food/snacks/friedegg = 1,
- /obj/item/reagent_containers/food/snacks/grown/cabbage = 1,
- )
- result = /obj/item/reagent_containers/food/snacks/eggwrap
- subcategory = CAT_MISCFOOD
-
/datum/crafting_recipe/food/khachapuri
name = "Khachapuri"
reqs = list(
@@ -93,6 +84,16 @@
result = /obj/item/reagent_containers/food/snacks/cheesyfries
subcategory = CAT_MISCFOOD
+/datum/crafting_recipe/food/chilicheesefries
+ name = "Chilli cheese fries"
+ reqs = list(
+ /obj/item/reagent_containers/food/snacks/fries = 1,
+ /obj/item/reagent_containers/food/snacks/cheesewedge = 1,
+ /obj/item/reagent_containers/food/snacks/grown/chili = 1
+ )
+ result = /obj/item/reagent_containers/food/snacks/chilicheesefries
+ subcategory = CAT_MISCFOOD
+
/datum/crafting_recipe/food/eggplantparm
name ="Eggplant parmigiana"
reqs = list(
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_sandwich.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_sandwich.dm
index d2ea1da50a..60bcd65a80 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_sandwich.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_sandwich.dm
@@ -25,6 +25,17 @@
result = /obj/item/reagent_containers/food/snacks/grilledcheese
subcategory = CAT_SANDWICH
+/datum/crafting_recipe/food/baconlettucetomato
+ name = "BLT sandwich"
+ reqs = list(
+ /obj/item/reagent_containers/food/snacks/meat/bacon = 2,
+ /obj/item/reagent_containers/food/snacks/grown/cabbage = 1,
+ /obj/item/reagent_containers/food/snacks/grown/tomato = 1,
+ /datum/reagent/consumable/mayonnaise = 5
+ )
+ result = /obj/item/reagent_containers/food/snacks/baconlettucetomato
+ subcategory = CAT_SANDWICH
+
/datum/crafting_recipe/food/slimesandwich
name = "Jelly sandwich"
reqs = list(
@@ -99,7 +110,7 @@
/obj/item/reagent_containers/food/snacks/breadslice/plain = 2,
/obj/item/reagent_containers/food/snacks/tuna = 1,
/obj/item/reagent_containers/food/snacks/grown/onion = 1,
- /obj/item/reagent_containers/food/condiment/mayonnaise = 5
+ /datum/reagent/consumable/mayonnaise = 5
)
result = /obj/item/reagent_containers/food/snacks/tuna_sandwich
subcategory = CAT_SANDWICH
diff --git a/code/modules/hydroponics/grown/flowers.dm b/code/modules/hydroponics/grown/flowers.dm
index 8b0dcdaae1..abd06775af 100644
--- a/code/modules/hydroponics/grown/flowers.dm
+++ b/code/modules/hydroponics/grown/flowers.dm
@@ -277,7 +277,7 @@
growing_icon = 'icons/obj/hydroponics/growing_flowers.dmi'
icon_grow = "bee_balm-grow"
icon_dead = "bee_balm-dead"
- mutatelist = list(/obj/item/seeds/poppy/geranium, /obj/item/seeds/bee_balm/honey) //Lower odds of becoming honey
+ mutatelist = list(/obj/item/seeds/poppy/geranium, /obj/item/seeds/bee_balm/honey_balm) //Lower odds of becoming honey
reagents_add = list(/datum/reagent/medicine/spaceacillin = 0.1, /datum/reagent/space_cleaner/sterilizine = 0.05)
/obj/item/reagent_containers/food/snacks/grown/bee_balm
@@ -291,11 +291,11 @@
foodtype = GROSS
// Beebalm
-/obj/item/seeds/bee_balm/honey
+/obj/item/seeds/bee_balm/honey_balm
name = "pack of Honey Balm seeds"
desc = "These seeds grow into Honey Balms."
- icon_state = "seed-bee_balmalt"
- species = "seed-bee_balm_alt"
+ icon_state = "seed-honey_balm"
+ species = "honey_balm"
plantname = "Honey Balm Pods"
product = /obj/item/reagent_containers/food/snacks/grown/bee_balm/honey
endurance = 1
@@ -304,16 +304,16 @@
potency = 1
growthstages = 3
growing_icon = 'icons/obj/hydroponics/growing_flowers.dmi'
- icon_grow = "bee_balmalt-grow"
- icon_dead = "bee_balmalt-dead"
+ icon_grow = "honey_balm-grow"
+ icon_dead = "honey_balm-dead"
reagents_add = list(/datum/reagent/consumable/honey = 0.1, /datum/reagent/lye = 0.3) //To make wax
rarity = 30
/obj/item/reagent_containers/food/snacks/grown/bee_balm/honey
- seed = /obj/item/seeds/bee_balm/honey
+ seed = /obj/item/seeds/bee_balm/honey_balm
name = "honey balm"
desc = "A large honey filled pod of a flower."
- icon_state = "bee_balmalt"
+ icon_state = "honey_balm"
filling_color = "#FF6347"
bitesize_mod = 8
tastes = list("wax" = 1)
diff --git a/code/modules/paperwork/filingcabinet.dm b/code/modules/paperwork/filingcabinet.dm
index 5e882eb8d0..b368589bc3 100644
--- a/code/modules/paperwork/filingcabinet.dm
+++ b/code/modules/paperwork/filingcabinet.dm
@@ -186,9 +186,8 @@
GLOBAL_LIST_EMPTY(employmentCabinets)
/obj/structure/filingcabinet/employment
- var/cooldown = 0
icon_state = "employmentcabinet"
- var/virgin = 1
+ var/virgin = TRUE
/obj/structure/filingcabinet/employment/Initialize()
. = ..()
@@ -213,13 +212,12 @@ GLOBAL_LIST_EMPTY(employmentCabinets)
new /obj/item/paper/contract/employment(src, employee)
/obj/structure/filingcabinet/employment/interact(mob/user)
- if(!cooldown)
- if(virgin)
- fillCurrent()
- virgin = 0
- cooldown = 1
- sleep(100) // prevents the devil from just instantly emptying the cabinet, ensuring an easy win.
- cooldown = 0
- else
+ if(TIMER_COOLDOWN_CHECK(src, COOLDOWN_EMPLOYMENT_CABINET))
to_chat(user, "[src] is jammed, give it a few seconds.")
- ..()
+ return ..()
+
+ TIMER_COOLDOWN_START(src, COOLDOWN_EMPLOYMENT_CABINET, 10 SECONDS) // prevents the devil from just instantly emptying the cabinet, ensuring an easy win.
+ if(virgin)
+ fillCurrent()
+ virgin = FALSE
+ return ..()
diff --git a/code/modules/reagents/chemistry/machinery/chem_master.dm b/code/modules/reagents/chemistry/machinery/chem_master.dm
index 4df842d044..24c5200a54 100644
--- a/code/modules/reagents/chemistry/machinery/chem_master.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_master.dm
@@ -258,9 +258,9 @@
var/amount = text2num(params["amount"])
if(amount == null)
amount = text2num(input(usr,
- "Max 10. Buffer content will be split evenly.",
+ "Max 20. Buffer content will be split evenly.",
"How many to make?", 1))
- amount = clamp(round(amount), 0, 10)
+ amount = clamp(round(amount), 0, 20)
if (amount <= 0)
return FALSE
// Get units per item
diff --git a/html/changelog.html b/html/changelog.html
index 43271e20ff..f12ab97b29 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -50,6 +50,22 @@
-->
+
07 July 2020
+
KasparoVy updated:
+
+ - Fixes misaligned south-facing silver legwraps sprite.
+
+
Owai-Seek updated:
+
+ - Bee Balm is now visible.
+
+
Weblure updated:
+
+ - Fixed the slowdown formula for small character sprites; you guys don't use custom sprite sizes so just ignore these changes.
+ - Fixed the "Move it to the threshold" button; it now does what it says.
+ - Reworded some text to be clearer.
+
+
05 July 2020
Ghommie updated:
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index c0d0bc99f2..383bc23a00 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -26264,3 +26264,13 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
timothyteakettle:
- tweak: cooking oil is now far less lethal, requiring a higher volume of the reagent
to deal more damage
+2020-07-07:
+ KasparoVy:
+ - tweak: Fixes misaligned south-facing silver legwraps sprite.
+ Owai-Seek:
+ - bugfix: Bee Balm is now visible.
+ Weblure:
+ - bugfix: Fixed the slowdown formula for small character sprites; you guys don't
+ use custom sprite sizes so just ignore these changes.
+ - bugfix: Fixed the "Move it to the threshold" button; it now does what it says.
+ - tweak: Reworded some text to be clearer.
diff --git a/html/changelogs/AutoChangeLog-pr-12684.yml b/html/changelogs/AutoChangeLog-pr-12684.yml
new file mode 100644
index 0000000000..4736c9544e
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-12684.yml
@@ -0,0 +1,9 @@
+author: "Owai-Seek"
+delete-after: True
+changes:
+ - rscadd: "Margarine, Chili Cheese Fries."
+ - tweak: "Egg Wraps are now categorized under egg foods."
+ - bugfix: "Tuna Sandwich crafting/sprite is now visible."
+ - imageadd: "Icons for chicken, cooked chicken, steak, grilled carp, corndogs"
+ - imageadd: "Icons for chili cheese fries, margarine, BLT sandwich"
+ - imageadd: "(Unused) icons for raw meatballs, and lard"
diff --git a/html/changelogs/AutoChangeLog-pr-12697.yml b/html/changelogs/AutoChangeLog-pr-12697.yml
new file mode 100644
index 0000000000..28c74fcb3e
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-12697.yml
@@ -0,0 +1,8 @@
+author: "EmeraldSundisk"
+delete-after: True
+changes:
+ - rscadd: "CogStation now has an apothecary"
+ - rscdel: "Removes an outdated note on sleepers"
+ - tweak: "Readjusts CogStation's chemistry lab"
+ - tweak: "Slight area designation adjustments for Robotics"
+ - bugfix: "The arrivals plaque should be readable now"
diff --git a/html/changelogs/AutoChangeLog-pr-12702.yml b/html/changelogs/AutoChangeLog-pr-12702.yml
new file mode 100644
index 0000000000..5f95611fdd
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-12702.yml
@@ -0,0 +1,4 @@
+author: "DeltaFire15"
+delete-after: True
+changes:
+ - bugfix: "The kill-once objective now works properly."
diff --git a/icons/mob/clothing/feet_digi.dmi b/icons/mob/clothing/feet_digi.dmi
index 7815f3d0a4..f798850ee7 100644
Binary files a/icons/mob/clothing/feet_digi.dmi and b/icons/mob/clothing/feet_digi.dmi differ
diff --git a/icons/obj/food/burgerbread.dmi b/icons/obj/food/burgerbread.dmi
index 414930ac25..7ef3a7d418 100644
Binary files a/icons/obj/food/burgerbread.dmi and b/icons/obj/food/burgerbread.dmi differ
diff --git a/icons/obj/food/food.dmi b/icons/obj/food/food.dmi
index e7196190cf..e87a37d069 100644
Binary files a/icons/obj/food/food.dmi and b/icons/obj/food/food.dmi differ
diff --git a/icons/obj/hydroponics/growing_flowers.dmi b/icons/obj/hydroponics/growing_flowers.dmi
index 98d9af2ce6..b48051cc56 100644
Binary files a/icons/obj/hydroponics/growing_flowers.dmi and b/icons/obj/hydroponics/growing_flowers.dmi differ
diff --git a/icons/obj/hydroponics/harvest.dmi b/icons/obj/hydroponics/harvest.dmi
index 2ea5554741..d7800fc0a5 100644
Binary files a/icons/obj/hydroponics/harvest.dmi and b/icons/obj/hydroponics/harvest.dmi differ
diff --git a/icons/obj/hydroponics/seeds.dmi b/icons/obj/hydroponics/seeds.dmi
index 15b7e2b96c..a9d0845be3 100644
Binary files a/icons/obj/hydroponics/seeds.dmi and b/icons/obj/hydroponics/seeds.dmi differ
diff --git a/tgstation.dme b/tgstation.dme
index 3f9c5ff81b..2929a5a69e 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -38,6 +38,7 @@
#include "code\__DEFINES\configuration.dm"
#include "code\__DEFINES\construction.dm"
#include "code\__DEFINES\contracts.dm"
+#include "code\__DEFINES\cooldowns.dm"
#include "code\__DEFINES\cult.dm"
#include "code\__DEFINES\diseases.dm"
#include "code\__DEFINES\DNA.dm"