diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm
index 2e1c6db8..3e1fd9ee 100644
--- a/_maps/map_files/BoxStation/BoxStation.dmm
+++ b/_maps/map_files/BoxStation/BoxStation.dmm
@@ -26835,6 +26835,9 @@
/obj/effect/turf_decal/tile/yellow{
dir = 4
},
+/obj/machinery/light{
+ dir = 1
+ },
/turf/open/floor/plasteel/white,
/area/medical/chemistry)
"bgY" = (
@@ -26846,6 +26849,11 @@
/obj/effect/turf_decal/tile/yellow{
dir = 4
},
+/obj/machinery/button/door{
+ id = "chem_window_top";
+ name = "chemistry shutters";
+ pixel_x = 28
+ },
/turf/open/floor/plasteel/white,
/area/medical/chemistry)
"bgZ" = (
@@ -27573,6 +27581,10 @@
req_access_txt = "33"
},
/obj/machinery/door/firedoor,
+/obj/machinery/door/poddoor/shutters/preopen{
+ id = "chem_window_top";
+ name = "chemistry shutters"
+ },
/turf/open/floor/plating,
/area/medical/chemistry)
"biw" = (
@@ -28999,11 +29011,11 @@
/turf/open/floor/plasteel/white,
/area/science/lab)
"bls" = (
-/obj/structure/table/glass,
/obj/machinery/reagentgrinder,
/obj/structure/extinguisher_cabinet{
pixel_x = -27
},
+/obj/structure/table/glass,
/turf/open/floor/plasteel/white,
/area/medical/chemistry)
"blt" = (
@@ -29020,7 +29032,6 @@
/turf/open/floor/plasteel/white,
/area/medical/chemistry)
"blv" = (
-/obj/structure/table/glass,
/obj/item/storage/box/beakers{
pixel_x = 2;
pixel_y = 2
@@ -29037,6 +29048,7 @@
/obj/effect/turf_decal/tile/yellow{
dir = 4
},
+/obj/structure/table/glass,
/turf/open/floor/plasteel/white,
/area/medical/chemistry)
"blw" = (
@@ -29667,7 +29679,6 @@
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"bmM" = (
-/obj/structure/table/glass,
/obj/item/storage/box/syringes,
/obj/item/clothing/glasses/science{
pixel_x = 2;
@@ -29679,6 +29690,7 @@
name = "Station Intercom (General)";
pixel_x = -28
},
+/obj/structure/table/glass,
/turf/open/floor/plasteel/white,
/area/medical/chemistry)
"bmN" = (
@@ -29702,6 +29714,10 @@
req_access_txt = "33"
},
/obj/machinery/door/firedoor,
+/obj/machinery/door/poddoor/shutters/preopen{
+ id = "chem_window_bottom";
+ name = "chemistry shutters"
+ },
/turf/open/floor/plating,
/area/medical/chemistry)
"bmQ" = (
@@ -30362,7 +30378,6 @@
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"bon" = (
-/obj/structure/table/glass,
/obj/machinery/airalarm{
dir = 4;
pixel_x = -22
@@ -30372,6 +30387,7 @@
/obj/item/stack/sheet/mineral/plasma,
/obj/item/stack/sheet/mineral/plasma,
/obj/item/reagent_containers/glass/bottle/epinephrine,
+/obj/structure/table/glass,
/turf/open/floor/plasteel/white,
/area/medical/chemistry)
"boo" = (
@@ -30403,6 +30419,11 @@
/obj/effect/turf_decal/tile/yellow{
dir = 8
},
+/obj/machinery/button/door{
+ id = "chem_window_bottom";
+ name = "chemistry shutters";
+ pixel_x = 28
+ },
/turf/open/floor/plasteel/white,
/area/medical/chemistry)
"bos" = (
@@ -31126,14 +31147,9 @@
/area/hallway/primary/central)
"bpR" = (
/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/door/poddoor/preopen{
- id = "medshut1";
- name = "shutters"
- },
-/turf/open/floor/plating,
-/area/medical/chemistry)
+/turf/open/floor/plasteel/white,
+/area/medical/sleeper)
"bpS" = (
-/obj/structure/table/glass,
/obj/item/grenade/chem_grenade,
/obj/item/grenade/chem_grenade,
/obj/item/grenade/chem_grenade,
@@ -31145,6 +31161,7 @@
/obj/machinery/light{
dir = 8
},
+/obj/structure/table/glass,
/turf/open/floor/plasteel/white,
/area/medical/chemistry)
"bpT" = (
@@ -31156,6 +31173,9 @@
/obj/structure/table,
/obj/item/folder/white,
/obj/item/radio/headset/headset_med,
+/obj/machinery/light{
+ dir = 4
+ },
/turf/open/floor/plasteel/white,
/area/medical/chemistry)
"bpV" = (
@@ -32509,7 +32529,7 @@
name = "drain"
},
/mob/living/simple_animal/bot/cleanbot{
- name = "C.L.E.A.N."
+ name = "Scrubs, MD"
},
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
@@ -33113,31 +33133,34 @@
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"buj" = (
-/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
+/obj/structure/plasticflaps/opaque,
/obj/machinery/door/poddoor/preopen{
id = "medshut1";
name = "shutters"
},
-/turf/open/floor/plating,
+/obj/effect/turf_decal/bot,
+/obj/machinery/navbeacon{
+ codes_txt = "delivery;dir=4";
+ dir = 4;
+ freq = 1400;
+ location = "Medbay"
+ },
+/turf/open/floor/plasteel,
/area/medical/medbay/central)
"buk" = (
-/obj/structure/table,
-/obj/item/crowbar,
-/obj/item/clothing/neck/stethoscope,
-/obj/item/reagent_containers/spray/cleaner,
-/obj/structure/sign/warning/nosmoking{
- pixel_y = 30
- },
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
+/obj/effect/turf_decal/delivery,
+/obj/machinery/door/window/eastleft{
+ name = "Medical Delivery";
+ req_access_txt = "5"
},
-/turf/open/floor/plasteel/white,
+/obj/structure/window/reinforced,
+/turf/open/floor/plasteel,
/area/medical/medbay/central)
"bul" = (
/obj/structure/cable{
@@ -33167,6 +33190,9 @@
/obj/effect/turf_decal/tile/yellow{
dir = 4
},
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"bun" = (
@@ -33200,9 +33226,6 @@
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/structure/noticeboard{
- pixel_y = 32
- },
/obj/machinery/camera{
c_tag = "Medbay West";
network = list("ss13","medbay")
@@ -33210,6 +33233,9 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
+/obj/machinery/airalarm{
+ pixel_y = 23
+ },
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"buq" = (
@@ -33826,26 +33852,18 @@
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"bvH" = (
-/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/obj/machinery/door/poddoor/preopen{
- id = "medshut1";
- name = "shutters"
- },
-/turf/open/floor/plating,
+/turf/closed/wall,
/area/medical/medbay/central)
"bvI" = (
-/obj/structure/table,
-/obj/item/storage/box/masks,
-/obj/item/storage/box/gloves{
- pixel_x = 3;
- pixel_y = 4
- },
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"bvJ" = (
@@ -33858,15 +33876,25 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"bvL" = (
/obj/structure/disposalpipe/segment{
- dir = 6
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
+/obj/effect/turf_decal/loading_area{
+ icon_state = "drain";
+ name = "drain"
+ },
+/obj/structure/table,
+/obj/item/storage/box/gloves{
+ pixel_x = 3;
+ pixel_y = 4
+ },
+/obj/item/storage/box/masks,
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"bvM" = (
@@ -33879,9 +33907,6 @@
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"bvN" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/item/radio/intercom{
frequency = 1485;
name = "Station Intercom (Medbay)";
@@ -33891,6 +33916,10 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
+/obj/machinery/disposal/bin,
+/obj/structure/disposalpipe/trunk{
+ dir = 4
+ },
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"bvO" = (
@@ -33946,6 +33975,7 @@
icon_state = "drain";
name = "drain"
},
+/obj/structure/table,
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"bvT" = (
@@ -34442,15 +34472,14 @@
/turf/open/floor/plasteel/dark,
/area/quartermaster/storage)
"bwX" = (
-/obj/machinery/requests_console{
- department = "Medbay";
- departmentType = 1;
- name = "Medbay RC";
- pixel_x = -30
- },
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel/white,
-/area/medical/medbay/central)
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/door/poddoor/preopen{
+ id = "psych_med_window";
+ name = "Psychology Privacy Shutters"
+ },
+/turf/open/floor/plasteel,
+/area/medical/psych)
"bwY" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -35047,52 +35076,41 @@
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"byo" = (
-/obj/machinery/navbeacon{
- codes_txt = "delivery;dir=4";
- dir = 4;
- freq = 1400;
- location = "Medbay"
- },
-/obj/structure/plasticflaps/opaque,
-/obj/effect/turf_decal/bot,
-/obj/machinery/door/poddoor/preopen{
- id = "medshut1";
- name = "shutters"
- },
-/turf/open/floor/plasteel,
-/area/medical/medbay/central)
+/turf/closed/wall,
+/area/medical/psych)
"byp" = (
-/obj/machinery/door/window/eastleft{
- name = "Medical Delivery";
- req_access_txt = "5"
+/obj/structure/medkit_cabinet{
+ pixel_y = 27
},
-/obj/effect/turf_decal/delivery,
-/turf/open/floor/plasteel,
-/area/medical/medbay/central)
-"byq" = (
-/obj/machinery/airalarm{
- dir = 1;
- pixel_y = -22
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/effect/turf_decal/loading_area{
- dir = 4
- },
-/turf/open/floor/plasteel/white,
-/area/medical/medbay/central)
-"byr" = (
-/obj/structure/disposalpipe/segment{
- dir = 5
- },
-/turf/open/floor/plasteel/white,
-/area/medical/medbay/central)
-"bys" = (
-/obj/machinery/disposal/bin,
-/obj/structure/disposalpipe/trunk{
+/obj/structure/closet/secure_closet/psychology,
+/obj/machinery/light{
dir = 8
},
-/turf/open/floor/plasteel/white,
-/area/medical/medbay/central)
+/turf/open/floor/plasteel/white/corner,
+/area/medical/psych)
+"byq" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/plasteel/white/side,
+/area/medical/psych)
+"byr" = (
+/obj/structure/chair/comfy/brown,
+/turf/open/floor/carpet/blue,
+/area/medical/psych)
+"bys" = (
+/obj/structure/table/wood,
+/obj/item/flashlight/lamp/green{
+ pixel_x = -4;
+ pixel_y = 14
+ },
+/obj/machinery/airalarm{
+ pixel_y = 23
+ },
+/obj/item/folder/white{
+ pixel_x = 6;
+ pixel_y = -1
+ },
+/turf/open/floor/carpet/blue,
+/area/medical/psych)
"byt" = (
/obj/structure/table,
/obj/item/paper/fluff/holodeck/disclaimer,
@@ -35136,8 +35154,7 @@
/turf/open/floor/plasteel,
/area/medical/sleeper)
"byA" = (
-/obj/structure/table,
-/obj/machinery/cell_charger,
+/obj/machinery/portable_atmospherics/canister/oxygen,
/turf/open/floor/plasteel,
/area/medical/sleeper)
"byB" = (
@@ -35739,16 +35756,8 @@
/area/maintenance/port)
"bzH" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/closed/wall,
-/area/medical/sleeper)
-"bzI" = (
-/obj/machinery/door/airlock/medical/glass{
- name = "Surgery Observation"
- },
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel/dark,
-/area/medical/sleeper)
+/turf/open/floor/plasteel/white,
+/area/medical/psych)
"bzJ" = (
/obj/structure/sink{
dir = 8;
@@ -35780,18 +35789,20 @@
/turf/open/floor/plasteel,
/area/medical/sleeper)
"bzO" = (
-/obj/machinery/atmospherics/pipe/simple/general/visible{
- dir = 4
+/obj/machinery/atmospherics/pipe/manifold/general/visible{
+ dir = 1
},
/turf/open/floor/plasteel,
/area/medical/sleeper)
"bzP" = (
-/obj/machinery/atmospherics/pipe/manifold/general/visible,
+/obj/machinery/atmospherics/pipe/simple/general/visible{
+ dir = 9
+ },
/turf/open/floor/plasteel,
/area/medical/sleeper)
"bzQ" = (
/obj/machinery/atmospherics/pipe/simple/general/visible{
- dir = 10
+ dir = 6
},
/turf/open/floor/plasteel,
/area/medical/sleeper)
@@ -36315,57 +36326,62 @@
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"bAW" = (
-/obj/machinery/airalarm{
- dir = 8;
- pixel_x = 24
- },
-/obj/machinery/light{
- dir = 4
- },
/obj/effect/turf_decal/loading_area{
dir = 4;
icon_state = "drain";
name = "drain"
},
+/obj/machinery/camera{
+ c_tag = "Central Hallway South-East";
+ dir = 8
+ },
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"bAX" = (
-/obj/structure/chair,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 4
},
-/turf/open/floor/plasteel/dark,
-/area/medical/sleeper)
-"bAY" = (
-/obj/structure/chair,
-/obj/machinery/camera{
- c_tag = "Surgery Observation";
- network = list("ss13","medbay")
+/obj/structure/chair/office/light,
+/obj/effect/landmark/start/psychologist,
+/turf/open/floor/plasteel/white/side{
+ dir = 4
},
+/area/medical/psych)
+"bAY" = (
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 4
},
-/turf/open/floor/plasteel/dark,
-/area/medical/sleeper)
+/turf/open/floor/plasteel/white,
+/area/medical/psych)
"bAZ" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel/dark,
-/area/medical/sleeper)
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel/white/side{
+ dir = 8
+ },
+/area/medical/psych)
"bBa" = (
-/obj/structure/chair,
-/obj/machinery/airalarm{
- pixel_y = 23
- },
-/turf/open/floor/plasteel/dark,
-/area/medical/sleeper)
+/turf/open/floor/carpet/blue,
+/area/medical/psych)
"bBb" = (
-/obj/structure/chair,
-/obj/structure/medkit_cabinet{
- pixel_y = 27
+/obj/structure/chair/sofa/left{
+ desc = "More inviting than the average couch.";
+ dir = 8;
+ name = "comfy couch"
},
-/turf/open/floor/plasteel/dark,
-/area/medical/sleeper)
+/obj/item/toy/plush/mothplushie/moffplush{
+ name = "Mender Moff";
+ pixel_x = -3;
+ pixel_y = 5
+ },
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/turf/open/floor/carpet/blue,
+/area/medical/psych)
"bBc" = (
/obj/machinery/airalarm{
dir = 4;
@@ -36381,20 +36397,12 @@
/turf/open/floor/plasteel/white,
/area/medical/sleeper)
"bBe" = (
-/obj/machinery/atmospherics/pipe/simple/general/visible{
- dir = 6
- },
+/obj/machinery/atmospherics/pipe/manifold4w/general/visible,
/turf/open/floor/plasteel,
/area/medical/sleeper)
"bBf" = (
-/obj/machinery/atmospherics/pipe/manifold/general/visible{
- dir = 1
- },
-/turf/open/floor/plasteel,
-/area/medical/sleeper)
-"bBg" = (
-/obj/machinery/atmospherics/pipe/manifold/general/visible{
- dir = 4
+/obj/machinery/atmospherics/pipe/simple/general/visible{
+ dir = 10
},
/turf/open/floor/plasteel,
/area/medical/sleeper)
@@ -36907,36 +36915,80 @@
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"bCk" = (
-/obj/structure/chair,
/obj/structure/sign/warning/nosmoking{
pixel_x = -28
},
-/turf/open/floor/plasteel/dark,
-/area/medical/sleeper)
+/obj/structure/table/wood,
+/obj/machinery/computer/med_data/laptop{
+ dir = 1;
+ pixel_x = -2;
+ pixel_y = 4
+ },
+/obj/structure/sign/poster/official/help_others{
+ pixel_y = -30
+ },
+/turf/open/floor/plasteel/white/corner{
+ dir = 4
+ },
+/area/medical/psych)
"bCl" = (
-/obj/structure/chair,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel/dark,
-/area/medical/sleeper)
+/obj/structure/table/wood,
+/obj/machinery/light_switch{
+ pixel_x = -7;
+ pixel_y = -2
+ },
+/obj/machinery/button/door{
+ id = "psych_med_window";
+ name = "Medical Window Shutters";
+ pixel_x = 5;
+ pixel_y = 5;
+ req_access_txt = "71"
+ },
+/obj/machinery/button/door{
+ id = "psych_hall_window";
+ name = "Hallway Window Shutters";
+ pixel_x = -5;
+ pixel_y = 5;
+ req_access_txt = "71"
+ },
+/turf/open/floor/plasteel/white/side{
+ dir = 1
+ },
+/area/medical/psych)
"bCm" = (
-/obj/machinery/holopad,
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 8
},
-/turf/open/floor/plasteel/dark,
-/area/medical/sleeper)
+/obj/machinery/light{
+ light_color = "#cee5d2"
+ },
+/obj/structure/reagent_dispensers/water_cooler,
+/turf/open/floor/plasteel/white/corner{
+ dir = 1
+ },
+/area/medical/psych)
"bCn" = (
-/obj/structure/chair,
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 8
},
-/turf/open/floor/plasteel/dark,
-/area/medical/sleeper)
+/obj/machinery/firealarm{
+ dir = 1;
+ pixel_y = -24
+ },
+/turf/open/floor/carpet/blue,
+/area/medical/psych)
"bCo" = (
-/obj/structure/chair,
-/turf/open/floor/plasteel/dark,
-/area/medical/sleeper)
+/obj/structure/table/wood,
+/obj/structure/cable,
+/obj/machinery/power/apc/auto_name/south,
+/obj/item/paper_bin{
+ pixel_x = 5;
+ pixel_y = 4
+ },
+/turf/open/floor/carpet/blue,
+/area/medical/psych)
"bCp" = (
/obj/structure/closet/secure_closet/medical1,
/obj/machinery/light{
@@ -36960,25 +37012,19 @@
/turf/open/floor/plasteel,
/area/medical/sleeper)
"bCr" = (
-/obj/machinery/portable_atmospherics/canister/oxygen,
-/turf/open/floor/plasteel,
-/area/medical/sleeper)
-"bCs" = (
/obj/structure/table/reinforced,
/obj/item/wrench/medical,
/turf/open/floor/plasteel,
/area/medical/sleeper)
"bCt" = (
-/obj/machinery/atmospherics/components/unary/portables_connector/visible{
- dir = 1;
- name = "Connector Port (Air Supply)"
- },
-/obj/machinery/portable_atmospherics/canister/oxygen,
/obj/machinery/firealarm{
dir = 1;
pixel_y = -24
},
/obj/machinery/light,
+/obj/machinery/atmospherics/components/unary/thermomachine/freezer{
+ dir = 1
+ },
/turf/open/floor/plasteel,
/area/medical/sleeper)
"bCu" = (
@@ -36990,9 +37036,8 @@
/turf/open/floor/plasteel,
/area/medical/sleeper)
"bCv" = (
-/obj/machinery/atmospherics/components/unary/thermomachine/freezer{
- dir = 1
- },
+/obj/machinery/cell_charger,
+/obj/structure/table/reinforced,
/turf/open/floor/plasteel,
/area/medical/sleeper)
"bCw" = (
@@ -37697,31 +37742,32 @@
icon_state = "drain";
name = "drain"
},
+/obj/machinery/airalarm{
+ dir = 8;
+ pixel_x = 24
+ },
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"bDJ" = (
/obj/structure/disposalpipe/segment{
dir = 6
},
-/obj/effect/spawner/structure/window,
-/turf/open/floor/plating,
-/area/medical/sleeper)
+/turf/closed/wall,
+/area/medical/psych)
"bDK" = (
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/effect/spawner/structure/window,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plating,
-/area/medical/sleeper)
+/turf/closed/wall,
+/area/medical/psych)
"bDL" = (
/obj/structure/disposalpipe/segment{
dir = 9
},
-/obj/effect/spawner/structure/window,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plating,
-/area/medical/sleeper)
+/turf/closed/wall,
+/area/medical/psych)
"bDM" = (
/obj/machinery/door/airlock/medical/glass{
name = "Recovery Room"
@@ -38172,34 +38218,39 @@
"bEH" = (
/obj/structure/disposalpipe/segment,
/obj/structure/table,
-/obj/item/surgicaldrill,
+/obj/item/storage/backpack/duffelbag/med/surgery,
/turf/open/floor/plasteel,
/area/medical/sleeper)
"bEI" = (
-/obj/structure/table,
-/obj/item/hemostat,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/machinery/light{
+ dir = 1;
+ pixel_y = 16
+ },
/turf/open/floor/plasteel/white/side,
/area/medical/sleeper)
"bEJ" = (
-/obj/structure/table,
-/obj/item/scalpel{
- pixel_y = 12
- },
-/obj/item/circular_saw,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel/white,
/area/medical/sleeper)
"bEK" = (
-/obj/structure/table,
-/obj/item/retractor,
+/obj/machinery/light{
+ dir = 1;
+ pixel_y = 16
+ },
/turf/open/floor/plasteel/white/side,
/area/medical/sleeper)
"bEL" = (
/obj/structure/table,
-/obj/item/cautery{
- pixel_x = 4
+/obj/item/storage/box/masks{
+ pixel_y = 12
},
+/obj/item/storage/box/gloves{
+ pixel_x = 5;
+ pixel_y = 11
+ },
+/obj/item/clothing/suit/apron/surgical,
+/obj/item/clothing/suit/apron/surgical,
/turf/open/floor/plasteel,
/area/medical/sleeper)
"bEM" = (
@@ -38646,13 +38697,17 @@
/area/maintenance/aft)
"bFO" = (
/obj/structure/disposalpipe/segment,
-/obj/structure/table,
-/obj/item/clothing/gloves/color/latex,
-/obj/item/clothing/mask/surgical,
-/obj/item/clothing/suit/apron/surgical,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 6
},
+/obj/structure/sink{
+ dir = 8;
+ pixel_x = -12;
+ pixel_y = 2
+ },
+/obj/structure/sign/poster/official/cleanliness{
+ pixel_x = -28
+ },
/turf/open/floor/plasteel/white/side{
dir = 4
},
@@ -38662,11 +38717,11 @@
/turf/open/floor/plasteel/white,
/area/medical/sleeper)
"bFQ" = (
-/obj/effect/landmark/start/medical_doctor,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
+/obj/machinery/computer/operating,
/turf/open/floor/plasteel/white,
/area/medical/sleeper)
"bFR" = (
@@ -38676,9 +38731,6 @@
/turf/open/floor/plasteel/white,
/area/medical/sleeper)
"bFS" = (
-/obj/structure/table,
-/obj/item/surgical_drapes,
-/obj/item/razor,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
@@ -39392,12 +39444,12 @@
/turf/open/floor/plating,
/area/maintenance/aft)
"bHr" = (
-/obj/structure/disposalpipe/segment{
- dir = 9
- },
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 9
},
+/obj/structure/disposalpipe/junction/yjunction{
+ dir = 8
+ },
/turf/open/floor/plasteel/white,
/area/medical/sleeper)
"bHs" = (
@@ -39407,8 +39459,8 @@
/turf/open/floor/plasteel/white,
/area/medical/sleeper)
"bHt" = (
-/obj/structure/table/optable,
/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
+/obj/structure/table/optable,
/turf/open/floor/plasteel/white,
/area/medical/sleeper)
"bHu" = (
@@ -39923,6 +39975,10 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
+/obj/structure/disposalpipe/trunk{
+ dir = 1
+ },
+/obj/machinery/disposal/bin,
/turf/open/floor/plasteel/white/side{
dir = 4
},
@@ -39934,11 +39990,19 @@
/turf/open/floor/plasteel/white,
/area/medical/sleeper)
"bIJ" = (
-/obj/machinery/computer/operating{
- dir = 1
+/obj/structure/disposalpipe/segment{
+ dir = 4
},
+/obj/effect/turf_decal/loading_area{
+ icon_state = "drain";
+ name = "drain"
+ },
+/obj/structure/table,
+/obj/item/reagent_containers/spray/cleaner,
+/obj/item/crowbar,
+/obj/item/clothing/neck/stethoscope,
/turf/open/floor/plasteel/white,
-/area/medical/sleeper)
+/area/medical/medbay/central)
"bIK" = (
/obj/structure/closet/crate/freezer/surplus_limbs,
/obj/item/reagent_containers/glass/beaker/synthflesh,
@@ -39947,9 +40011,6 @@
},
/area/medical/sleeper)
"bIL" = (
-/obj/structure/sign/warning/nosmoking{
- pixel_x = -28
- },
/obj/structure/bed,
/obj/item/bedsheet/medical,
/obj/effect/turf_decal/tile/blue{
@@ -40624,6 +40685,10 @@
/obj/item/storage/belt/medical{
pixel_y = 2
},
+/obj/item/storage/backpack/duffelbag/med/surgery,
+/obj/item/storage/backpack/duffelbag/med/surgery{
+ pixel_y = 12
+ },
/turf/open/floor/plasteel/white,
/area/medical/sleeper)
"bKm" = (
@@ -47386,7 +47451,7 @@
"bZH" = (
/obj/machinery/door/airlock/research/glass{
dir = 4;
- name = "Circuitry Lab";
+ name = "Experimentation Lab";
req_access_txt = "47"
},
/obj/machinery/door/firedoor,
@@ -60388,12 +60453,13 @@
/turf/open/floor/plasteel/stairs/left,
/area/hallway/primary/central)
"cGu" = (
-/obj/machinery/camera{
- c_tag = "Central Hallway South-East";
- dir = 8
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/door/poddoor/preopen{
+ id = "psych_med_window";
+ name = "Psychology Privacy Shutters"
},
-/turf/open/floor/plasteel/stairs/right,
-/area/hallway/primary/central)
+/turf/open/floor/plasteel,
+/area/medical/psych)
"cGv" = (
/obj/machinery/power/terminal{
dir = 1
@@ -62532,6 +62598,14 @@
/obj/item/ashtray,
/turf/open/floor/carpet/black,
/area/crew_quarters/bar)
+"hfQ" = (
+/obj/structure/chair/sofa/right{
+ desc = "More inviting than the average couch.";
+ dir = 8;
+ name = "comfy couch"
+ },
+/turf/open/floor/carpet/blue,
+/area/medical/psych)
"hhu" = (
/obj/structure/closet/secure_closet/miner,
/obj/effect/turf_decal/tile/brown{
@@ -62701,6 +62775,12 @@
},
/turf/open/floor/carpet,
/area/quartermaster/miningdock)
+"jOu" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/carpet/blue,
+/area/medical/psych)
"jSq" = (
/obj/effect/turf_decal/tile/brown,
/obj/effect/turf_decal/tile/brown{
@@ -62916,6 +62996,19 @@
},
/turf/open/floor/plasteel,
/area/hallway/primary/starboard)
+"nkD" = (
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/machinery/door/airlock/medical{
+ name = "Psychology Office";
+ req_access_txt = "71"
+ },
+/obj/machinery/door/firedoor,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel/white,
+/area/medical/psych)
"nni" = (
/obj/structure/table/plasmaglass,
/obj/item/ashtray,
@@ -63097,6 +63190,14 @@
},
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
+"pis" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/door/poddoor/preopen{
+ id = "psych_hall_window";
+ name = "Psychology Privacy Shutters"
+ },
+/turf/open/floor/plasteel,
+/area/medical/psych)
"pkR" = (
/obj/structure/pool/ladder{
dir = 2;
@@ -63201,6 +63302,16 @@
/obj/machinery/door/firedoor/border_only,
/turf/open/floor/plasteel,
/area/hallway/primary/central)
+"qhI" = (
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/turf/open/floor/plasteel/white/side{
+ dir = 8
+ },
+/area/medical/psych)
"qhL" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -63304,6 +63415,16 @@
/obj/item/twohanded/required/kirbyplants/random,
/turf/open/floor/plasteel/white,
/area/medical/virology)
+"rgX" = (
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel/white/corner{
+ dir = 8
+ },
+/area/medical/psych)
"rja" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/door/poddoor/shutters/preopen{
@@ -63451,6 +63572,11 @@
/obj/item/twohanded/required/kirbyplants/random,
/turf/open/floor/wood,
/area/security/vacantoffice)
+"tNb" = (
+/turf/open/floor/plasteel/white/side{
+ dir = 4
+ },
+/area/medical/psych)
"ugb" = (
/obj/machinery/pool/drain,
/turf/open/pool,
@@ -63620,6 +63746,13 @@
},
/turf/open/floor/plasteel/dark,
/area/quartermaster/qm)
+"who" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plasteel/white,
+/area/medical/sleeper)
"wmy" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -63753,6 +63886,15 @@
/obj/effect/landmark/barthpot,
/turf/open/floor/carpet,
/area/library)
+"xRN" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/obj/machinery/vending/medical{
+ pixel_x = -2
+ },
+/turf/open/floor/plasteel/white,
+/area/medical/medbay/central)
"xYc" = (
/obj/item/crowbar,
/obj/item/wrench,
@@ -91650,7 +91792,7 @@ aSh
aTG
aUY
aWm
-bfk
+aXX
aXZ
baO
bbK
@@ -91907,7 +92049,7 @@ aTH
aTH
aUX
aWn
-bfk
+aXY
aZz
aZA
aZA
@@ -92164,7 +92306,7 @@ aSj
aTI
aUZ
aWo
-bfk
+aXY
aZA
aZA
aZA
@@ -92421,7 +92563,7 @@ aSk
aTJ
aVa
aWp
-bfk
+aXZ
aZA
baP
baP
@@ -97064,10 +97206,10 @@ bpQ
bsM
bMm
bWx
-bjD
-bjD
-cGu
bAW
+axx
+aRm
+bjD
bjD
bDI
bEG
@@ -97316,17 +97458,17 @@ bfv
bfv
bfv
bfv
-bpR
+bfv
bfv
bfv
buj
bvH
-bjE
byo
-bxa
-bxa
-bxa
-bxa
+byo
+pis
+pis
+byo
+byo
bxa
bxa
bHq
@@ -97577,10 +97719,10 @@ bpS
brj
bfv
buk
-bvI
-bjE
+xRN
+byo
byp
-bxa
+tNb
bAX
bCk
bDJ
@@ -98092,16 +98234,16 @@ brk
bsO
bum
bvK
-bwY
-bwY
-bzI
+nkD
+rgX
bAZ
+qhI
bCm
bDL
bEJ
bFQ
bHt
-bIJ
+bBd
bKf
bFT
bMP
@@ -98348,13 +98490,13 @@ bit
brl
bsP
bun
-bvL
-bsW
+bKs
+cGu
byr
-bxa
bBa
+jOu
bCn
-bxb
+byo
bEK
bFR
bHu
@@ -98605,13 +98747,13 @@ bpU
brm
bfv
buo
-bvM
-bwZ
+bKs
+byo
bys
-bxa
+hfQ
bBb
bCo
-bxb
+byo
bEL
bFS
bHv
@@ -98863,14 +99005,14 @@ bfv
bfv
bup
bvN
-bxa
-bxa
-bxa
-bxa
-bxa
-bxa
-bxa
-bFT
+byo
+byo
+byo
+byo
+byo
+byo
+bpR
+who
bHw
bxa
bxa
@@ -99119,7 +99261,7 @@ bjE
brn
bhc
buq
-bvM
+bvI
bxb
byu
bzJ
@@ -100661,12 +100803,12 @@ bpZ
bjE
bsU
but
-bvR
+bvL
bxa
byz
bzN
-bzM
-bCs
+bzQ
+bCu
bxa
bER
bFV
@@ -100918,7 +101060,7 @@ bpX
bpX
bsS
but
-bvR
+bIJ
bxb
byA
bzO
@@ -101435,8 +101577,8 @@ buv
bvT
bxb
byB
-bzQ
-bBg
+bzM
+bzM
bCv
bxa
bEU
diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm
index 670f1d08..ff2a7786 100644
--- a/_maps/map_files/generic/CentCom.dmm
+++ b/_maps/map_files/generic/CentCom.dmm
@@ -9239,7 +9239,9 @@
pixel_x = -17;
pixel_y = 3
},
-/obj/machinery/recharger,
+/obj/machinery/recharger{
+ pixel_y = 4
+ },
/turf/open/floor/plasteel/grimy,
/area/centcom/ferry)
"tR" = (
@@ -9518,6 +9520,7 @@
id_tag = "CCDormChemlight";
name = "Kenshin Midori's Bunk"
},
+/obj/effect/mapping_helpers/airlock/locked,
/turf/open/floor/plasteel,
/area/centcom/ferry)
"uy" = (
@@ -11091,7 +11094,13 @@
/area/centcom/evac)
"yh" = (
/obj/structure/table/wood,
-/obj/item/paper/monitorkey,
+/obj/item/paper/monitorkey{
+ pixel_x = 10;
+ pixel_y = -3
+ },
+/obj/machinery/recharger{
+ pixel_y = 4
+ },
/turf/open/floor/plasteel/dark,
/area/centcom/ferry)
"yi" = (
@@ -14324,12 +14333,22 @@
/turf/open/floor/plasteel/white,
/area/centcom/holding)
"Fk" = (
-/obj/machinery/door/airlock/centcom{
- name = "CentCom";
- opacity = 1
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
},
-/turf/open/floor/carpet/black,
-/area/centcom/ferry)
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/machinery/recharger{
+ pixel_y = 4
+ },
+/obj/structure/table/reinforced,
+/turf/open/floor/plasteel/dark,
+/area/centcom/control)
"Fm" = (
/obj/machinery/shower{
dir = 4
@@ -17854,7 +17873,6 @@
/area/centcom/ferry)
"MY" = (
/obj/structure/table/reinforced,
-/obj/item/reagent_containers/glass/bowl,
/turf/open/floor/plasteel/cafeteria,
/area/centcom/ferry)
"Nc" = (
@@ -20271,21 +20289,6 @@
name = "plating"
},
/area/centcom/control)
-"Wm" = (
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/machinery/recharger,
-/obj/structure/table/reinforced,
-/turf/open/floor/plasteel/dark,
-/area/centcom/control)
"Wn" = (
/obj/effect/turf_decal/loading_area{
dir = 6;
@@ -21287,10 +21290,12 @@
damtype = "stamina";
desc = "An old and dusty book, the pages look faded from time while looking at the pages alone makes you tired.";
force = 80;
- hitsound = punch;
+ hitsound = "punch";
name = "very heavy book";
throwforce = 160
},
+/obj/item/storage/box/zipties,
+/obj/item/clothing/mask/gas/sechailer,
/turf/open/floor/wood,
/area/centcom/ferry)
"Zz" = (
@@ -55028,7 +55033,7 @@ mD
oe
mD
mD
-Fk
+ZT
mD
mD
mD
@@ -63234,7 +63239,7 @@ iu
io
rN
CX
-Wm
+Fk
DF
DT
io
diff --git a/code/__DEFINES/access.dm b/code/__DEFINES/access.dm
index d9eb48d7..bef80869 100644
--- a/code/__DEFINES/access.dm
+++ b/code/__DEFINES/access.dm
@@ -66,6 +66,7 @@
#define ACCESS_CLONING 68 //Cloning room and clone pod ejection
#define ACCESS_ENTER_GENPOP 69
#define ACCESS_LEAVE_GENPOP 70
+#define ACCESS_PSYCH 71
//BEGIN CENTCOM ACCESS
/*Should leave plenty of room if we need to add more access levels.
diff --git a/code/__DEFINES/jobs.dm b/code/__DEFINES/jobs.dm
index c2c160b0..3a64637a 100644
--- a/code/__DEFINES/jobs.dm
+++ b/code/__DEFINES/jobs.dm
@@ -27,6 +27,7 @@
#define VIROLOGIST (1<<6)
#define JR_DOCTOR (1<<7)
#define JR_SCIENTIST (1<<9)
+#define MED_PSYCH (1<<14)
#define CIVILIAN (1<<2)
diff --git a/code/__DEFINES/sound.dm b/code/__DEFINES/sound.dm
index 581bb2bc..77964258 100644
--- a/code/__DEFINES/sound.dm
+++ b/code/__DEFINES/sound.dm
@@ -5,10 +5,10 @@
#define CHANNEL_JUKEBOX 1021
#define CHANNEL_JUKEBOX_START 1016 //The gap between this and CHANNEL_JUKEBOX determines the amount of free jukebox channels. This currently allows 6 jukebox channels to exist.
#define CHANNEL_JUSTICAR_ARK 1015
-#define CHANNEL_HEARTBEAT 1014 //sound channel for heartbeats
-#define CHANNEL_AMBIENCE 1013
-#define CHANNEL_BUZZ 1012
-#define CHANNEL_BICYCLE 1011
+#define CHANNEL_HEARTBEAT 1020 //sound channel for heartbeats
+#define CHANNEL_AMBIENCE 1019
+#define CHANNEL_BUZZ 1018
+#define CHANNEL_BICYCLE 1017
//CIT CHANNELS - TRY NOT TO REGRESS
#define CHANNEL_PRED 1010
@@ -79,3 +79,51 @@
'sound/hallucinations/growl3.ogg', 'sound/hallucinations/im_here1.ogg', 'sound/hallucinations/im_here2.ogg', 'sound/hallucinations/i_see_you1.ogg', 'sound/hallucinations/i_see_you2.ogg',\
'sound/hallucinations/look_up1.ogg', 'sound/hallucinations/look_up2.ogg', 'sound/hallucinations/over_here1.ogg', 'sound/hallucinations/over_here2.ogg', 'sound/hallucinations/over_here3.ogg',\
'sound/hallucinations/turn_around1.ogg', 'sound/hallucinations/turn_around2.ogg', 'sound/hallucinations/veryfar_noise.ogg', 'sound/hallucinations/wail.ogg')
+
+
+//default byond sound environments
+#define SOUND_ENVIRONMENT_NONE -1
+#define SOUND_ENVIRONMENT_GENERIC 0
+#define SOUND_ENVIRONMENT_PADDED_CELL 1
+#define SOUND_ENVIRONMENT_ROOM 2
+#define SOUND_ENVIRONMENT_BATHROOM 3
+#define SOUND_ENVIRONMENT_LIVINGROOM 4
+#define SOUND_ENVIRONMENT_STONEROOM 5
+#define SOUND_ENVIRONMENT_AUDITORIUM 6
+#define SOUND_ENVIRONMENT_CONCERT_HALL 7
+#define SOUND_ENVIRONMENT_CAVE 8
+#define SOUND_ENVIRONMENT_ARENA 9
+#define SOUND_ENVIRONMENT_HANGAR 10
+#define SOUND_ENVIRONMENT_CARPETED_HALLWAY 11
+#define SOUND_ENVIRONMENT_HALLWAY 12
+#define SOUND_ENVIRONMENT_STONE_CORRIDOR 13
+#define SOUND_ENVIRONMENT_ALLEY 14
+#define SOUND_ENVIRONMENT_FOREST 15
+#define SOUND_ENVIRONMENT_CITY 16
+#define SOUND_ENVIRONMENT_MOUNTAINS 17
+#define SOUND_ENVIRONMENT_QUARRY 18
+#define SOUND_ENVIRONMENT_PLAIN 19
+#define SOUND_ENVIRONMENT_PARKING_LOT 20
+#define SOUND_ENVIRONMENT_SEWER_PIPE 21
+#define SOUND_ENVIRONMENT_UNDERWATER 22
+#define SOUND_ENVIRONMENT_DRUGGED 23
+#define SOUND_ENVIRONMENT_DIZZY 24
+#define SOUND_ENVIRONMENT_PSYCHOTIC 25
+//If we ever make custom ones add them here
+
+//"sound areas": easy way of keeping different types of areas consistent.
+#define SOUND_AREA_STANDARD_STATION SOUND_ENVIRONMENT_PARKING_LOT
+#define SOUND_AREA_LARGE_ENCLOSED SOUND_ENVIRONMENT_QUARRY
+#define SOUND_AREA_SMALL_ENCLOSED SOUND_ENVIRONMENT_BATHROOM
+#define SOUND_AREA_TUNNEL_ENCLOSED SOUND_ENVIRONMENT_STONEROOM
+#define SOUND_AREA_LARGE_SOFTFLOOR SOUND_ENVIRONMENT_CARPETED_HALLWAY
+#define SOUND_AREA_MEDIUM_SOFTFLOOR SOUND_ENVIRONMENT_LIVINGROOM
+#define SOUND_AREA_SMALL_SOFTFLOOR SOUND_ENVIRONMENT_ROOM
+#define SOUND_AREA_ASTEROID SOUND_ENVIRONMENT_CAVE
+#define SOUND_AREA_SPACE SOUND_ENVIRONMENT_UNDERWATER
+#define SOUND_AREA_LAVALAND SOUND_ENVIRONMENT_MOUNTAINS
+#define SOUND_AREA_ICEMOON SOUND_ENVIRONMENT_CAVE
+#define SOUND_AREA_WOODFLOOR SOUND_ENVIRONMENT_CITY
+
+#define INTERACTION_SOUND_RANGE_MODIFIER -3
+#define EQUIP_SOUND_VOLUME 30
\ No newline at end of file
diff --git a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm
index df5ea45d..d6673894 100644
--- a/code/controllers/subsystem/vote.dm
+++ b/code/controllers/subsystem/vote.dm
@@ -149,9 +149,14 @@ SUBSYSTEM_DEF(vote)
if("5")
v += winners[option] //Add the number votes to the pool
numbers += (winners[option]*5) //Add the value of the vote to numbers
- while (v < DYNAMIC_VOTE_NORMALIZATION) //For low low pop, low vote rounds.
- numbers += DYNAMIC_DEFAULT_CHAOS //stops the one person voting from setting the chaos to five and flooding the station with anomalies
- v += 1
+ if(v < DYNAMIC_VOTE_NORMALIZATION)
+ while (v < DYNAMIC_VOTE_NORMALIZATION) //For low low pop, low vote rounds.
+ numbers += DYNAMIC_DEFAULT_CHAOS //stops the one person voting from setting the chaos to five and flooding the station with anomalies
+ v += 1
+ else if (voted.len < GLOB.clients.len) //Have non-voters "vote" 2, if we're not lowpop
+ for(var/I in 1 to (GLOB.clients.len - voted.len))
+ v += 1
+ numbers += 2
var/total = 0
for (var/i in numbers)
total += i
diff --git a/code/game/area/Space_Station_13_areas.dm b/code/game/area/Space_Station_13_areas.dm
index 8e1ec730..f5c2b368 100644
--- a/code/game/area/Space_Station_13_areas.dm
+++ b/code/game/area/Space_Station_13_areas.dm
@@ -792,6 +792,10 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
name = "Chemistry"
icon_state = "chem"
+/area/medical/psych
+ name = "Psychology Office"
+ icon_state = "medbay"
+
/area/medical/surgery
name = "Surgery"
icon_state = "surgery"
diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm
index 68a5d34e..2d69b4d8 100644
--- a/code/game/objects/effects/landmarks.dm
+++ b/code/game/objects/effects/landmarks.dm
@@ -171,6 +171,10 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark)
name = "Geneticist"
icon_state = "Geneticist"
+/obj/effect/landmark/start/psychologist
+ name = "Psychologist"
+ icon_state = "Medical Doctor"
+
/obj/effect/landmark/start/chief_medical_officer
name = "Chief Medical Officer"
icon_state = "Chief Medical Officer"
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index a0090bde..8cb1f333 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -29,9 +29,13 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
obj_flags = NONE
var/item_flags = NONE
- var/hitsound = null
- var/usesound = null
- var/throwhitsound = null
+
+ var/hitsound
+ var/usesound
+ var/throwhitsound
+ ///Sound used when equipping the item into a valid slot
+ var/equip_sound
+
var/w_class = WEIGHT_CLASS_NORMAL
var/total_mass //Total mass in arbitrary pound-like values. If there's no balance reasons for an item to have otherwise, this var should be the item's weight in pounds.
var/slot_flags = 0 //This is used to determine on which slots an item can fit.
@@ -423,6 +427,9 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
A.Grant(user)
item_flags |= IN_INVENTORY
+ if(equip_sound && (slot_flags & slotdefine2slotbit(slot)))
+ playsound(src, equip_sound, EQUIP_SOUND_VOLUME, TRUE, ignore_walls = FALSE)
+
//sometimes we only want to grant the item's action if it's equipped in a specific slot.
/obj/item/proc/item_action_slot_check(slot, mob/user)
if(slot == SLOT_IN_BACKPACK || slot == SLOT_LEGCUFFED) //these aren't true slots, so avoid granting actions there
diff --git a/code/game/objects/items/cigs_lighters.dm b/code/game/objects/items/cigs_lighters.dm
index 1ea8b361..3d56fdb6 100644
--- a/code/game/objects/items/cigs_lighters.dm
+++ b/code/game/objects/items/cigs_lighters.dm
@@ -232,7 +232,6 @@ CIGARETTE PACKETS ARE IN FANCY.DM
if(lit)
user.visible_message("[user] calmly drops and treads on \the [src], putting it out instantly.")
new type_butt(user.loc)
- new /obj/effect/decal/cleanable/ash(user.loc)
qdel(src)
. = ..()
diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm
index a91b592c..78d3d057 100644
--- a/code/game/objects/items/storage/belt.dm
+++ b/code/game/objects/items/storage/belt.dm
@@ -11,6 +11,7 @@
max_integrity = 300
var/content_overlays = FALSE //If this is true, the belt will gain overlays based on what it's holding
var/worn_overlays = FALSE //worn counterpart of the above.
+ equip_sound = 'sound/items/equip/toolbelt_equip.ogg'
/obj/item/storage/belt/suicide_act(mob/living/carbon/user)
user.visible_message("[user] begins belting [user.p_them()]self with \the [src]! It looks like [user.p_theyre()] trying to commit suicide!")
diff --git a/code/game/objects/items/storage/firstaid.dm b/code/game/objects/items/storage/firstaid.dm
index dd2d613b..12aa5559 100644
--- a/code/game/objects/items/storage/firstaid.dm
+++ b/code/game/objects/items/storage/firstaid.dm
@@ -389,3 +389,28 @@
/obj/item/organ_storage
))
+//Psych Pillbottles
+
+/obj/item/storage/pill_bottle/happinesspsych
+ name = "happiness pill bottle"
+ desc = "Contains pills used as a last resort means to temporarily stabilize depression and anxiety. WARNING: side effects may include slurred speech, drooling, and severe addiction."
+
+/obj/item/storage/pill_bottle/happinesspsych/PopulateContents()
+ for(var/i in 1 to 5)
+ new /obj/item/reagent_containers/pill/happinesspsych(src)
+
+/obj/item/storage/pill_bottle/lsdpsych
+ name = "mindbreaker toxin pill bottle"
+ desc = "!FOR THERAPEUTIC USE ONLY! Contains pills used to alleviate the symptoms of Reality Dissociation Syndrome."
+
+/obj/item/storage/pill_bottle/lsdpsych/PopulateContents()
+ for(var/i in 1 to 5)
+ new /obj/item/reagent_containers/pill/lsdpsych(src)
+
+/obj/item/storage/pill_bottle/paxpsych
+ name = "pacification pill"
+ desc = "Contains pills used to temporarily pacify patients that are deemed a harm to themselves or others."
+
+/obj/item/storage/pill_bottle/paxpsych/PopulateContents()
+ for(var/i in 1 to 5)
+ new /obj/item/reagent_containers/pill/paxpsych(src)
\ No newline at end of file
diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm
index e14646e2..1d960b21 100644
--- a/code/game/objects/structures/crates_lockers/closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets.dm
@@ -27,8 +27,8 @@
var/mob_storage_capacity = 3 // how many human sized mob/living can fit together inside a closet.
var/storage_capacity = 30 //This is so that someone can't pack hundreds of items in a locker/crate then open it in a populated area to crash clients.
var/cutting_tool = /obj/item/weldingtool
- var/open_sound = 'sound/machines/click.ogg'
- var/close_sound = 'sound/machines/click.ogg'
+ var/open_sound = 'sound/effects/locker_open.ogg'
+ var/close_sound = 'sound/effects/locker_close.ogg'
var/material_drop = /obj/item/stack/sheet/metal
var/material_drop_amount = 2
var/delivery_icon = "deliverycloset" //which icon to use when packagewrapped. null to be unwrappable.
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/psychology.dm b/code/game/objects/structures/crates_lockers/closets/secure/psychology.dm
new file mode 100644
index 00000000..0724b40b
--- /dev/null
+++ b/code/game/objects/structures/crates_lockers/closets/secure/psychology.dm
@@ -0,0 +1,17 @@
+/obj/structure/closet/secure_closet/psychology
+ name = "psychology locker"
+ req_access = list(ACCESS_PSYCH)
+ icon_state = "cabinet"
+
+/obj/structure/closet/secure_closet/psychology/PopulateContents()
+ ..()
+ new /obj/item/clothing/under/lawyer/blacksuit(src)
+ new /obj/item/clothing/under/lawyer/blacksuit/skirt(src)
+ new /obj/item/clothing/shoes/laceup(src)
+ new /obj/item/storage/backpack/medic(src)
+ new /obj/item/radio/headset/headset_med(src)
+ new /obj/item/clipboard(src)
+ new /obj/item/clothing/suit/straight_jacket(src)
+ new /obj/item/clothing/ears/earmuffs(src)
+ new /obj/item/clothing/mask/muzzle(src)
+ new /obj/item/clothing/glasses/sunglasses/blindfold(src)
\ No newline at end of file
diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm
index ce320d26..5a9688b5 100644
--- a/code/modules/clothing/gloves/miscellaneous.dm
+++ b/code/modules/clothing/gloves/miscellaneous.dm
@@ -11,6 +11,20 @@
cold_protection = HANDS
min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT
+/obj/item/clothing/gloves/guncaster
+ name = "fingerless leather gloves"
+ desc = "Sturdy leather gloves with no fingertips, buckled at the wrist."
+ icon_state = "guncaster"
+ item_state = "guncaster"
+ icon = 'hyperstation/icons/obj/clothing/gloves.dmi'
+ alternate_worn_icon = 'hyperstation/icons/mobs/gloves.dmi'
+ item_color = null //So they don't wash.
+ transfer_prints = TRUE
+ strip_delay = 40
+ equip_delay_other = 20
+ cold_protection = HANDS
+ min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT
+
/obj/item/clothing/gloves/botanic_leather
name = "botanist's leather gloves"
desc = "These leather gloves protect against thorns, barbs, prickles, spikes and other harmful objects of floral origin. They're also quite warm."
diff --git a/code/modules/clothing/under/_under.dm b/code/modules/clothing/under/_under.dm
index 2889242c..d581f8b2 100644
--- a/code/modules/clothing/under/_under.dm
+++ b/code/modules/clothing/under/_under.dm
@@ -16,6 +16,7 @@
var/obj/item/clothing/accessory/attached_accessory
var/mutable_appearance/accessory_overlay
mutantrace_variation = MUTANTRACE_VARIATION //Are there special sprites for specific situations? Don't use this unless you need to.
+ equip_sound = 'sound/items/equip/jumpsuit_equip.ogg'
/obj/item/clothing/under/worn_overlays(isinhands = FALSE)
. = list()
@@ -156,4 +157,4 @@
if(SENSOR_COORDS)
. += "Its vital tracker and tracking beacon appear to be enabled."
if(attached_accessory)
- . += "\A [attached_accessory] is attached to it."
+ . += "\A [attached_accessory] is attached to it."
diff --git a/code/modules/jobs/access.dm b/code/modules/jobs/access.dm
index 61960572..c0fba370 100644
--- a/code/modules/jobs/access.dm
+++ b/code/modules/jobs/access.dm
@@ -137,7 +137,7 @@
ACCESS_HYDROPONICS, ACCESS_LIBRARY, ACCESS_LAWYER, ACCESS_VIROLOGY, ACCESS_CMO, ACCESS_QM, ACCESS_SURGERY,
ACCESS_THEATRE, ACCESS_RESEARCH, ACCESS_MINING, ACCESS_MAILSORTING, ACCESS_WEAPONS,
ACCESS_VAULT, ACCESS_MINING_STATION, ACCESS_XENOBIOLOGY, ACCESS_CE, ACCESS_HOP, ACCESS_HOS, ACCESS_RC_ANNOUNCE,
- ACCESS_KEYCARD_AUTH, ACCESS_TCOMSAT, ACCESS_GATEWAY, ACCESS_MINERAL_STOREROOM, ACCESS_MINISAT, ACCESS_NETWORK, ACCESS_CLONING)
+ ACCESS_KEYCARD_AUTH, ACCESS_TCOMSAT, ACCESS_GATEWAY, ACCESS_MINERAL_STOREROOM, ACCESS_MINISAT, ACCESS_NETWORK, ACCESS_CLONING, ACCESS_PSYCH)
/proc/get_all_centcom_access()
return list(ACCESS_CENT_GENERAL, ACCESS_CENT_THUNDER, ACCESS_CENT_SPECOPS, ACCESS_CENT_MEDICAL, ACCESS_CENT_LIVING, ACCESS_CENT_STORAGE, ACCESS_CENT_TELEPORTER, ACCESS_CENT_CAPTAIN)
@@ -165,7 +165,7 @@
if(2) //security
return list(ACCESS_SEC_DOORS, ACCESS_WEAPONS, ACCESS_SECURITY, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_FORENSICS_LOCKERS, ACCESS_COURT, ACCESS_HOS, ACCESS_ENTER_GENPOP, ACCESS_LEAVE_GENPOP)
if(3) //medbay
- return list(ACCESS_MEDICAL, ACCESS_GENETICS, ACCESS_CLONING, ACCESS_MORGUE, ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_SURGERY, ACCESS_CMO)
+ return list(ACCESS_MEDICAL, ACCESS_GENETICS, ACCESS_CLONING, ACCESS_MORGUE, ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_SURGERY, ACCESS_CMO, ACCESS_PSYCH)
if(4) //research
return list(ACCESS_RESEARCH, ACCESS_TOX, ACCESS_TOX_STORAGE, ACCESS_GENETICS, ACCESS_ROBOTICS, ACCESS_XENOBIOLOGY, ACCESS_MINISAT, ACCESS_RD, ACCESS_NETWORK)
if(5) //engineering and maintenance
@@ -332,6 +332,8 @@
return "Network Access"
if(ACCESS_CLONING)
return "Cloning Room"
+ if(ACCESS_PSYCH)
+ return "Psychology Office"
/proc/get_centcom_access_desc(A)
switch(A)
@@ -357,7 +359,7 @@
/proc/get_all_jobs()
return list("Assistant", "Captain", "Head of Personnel", "Bartender", "Cook", "Botanist", "Quartermaster", "Cargo Technician",
"Shaft Miner", "Clown", "Mime", "Janitor", "Curator", "Lawyer", "Chaplain", "Chief Engineer", "Station Engineer", "Engineering Intern",
- "Atmospheric Technician", "Chief Medical Officer", "Medical Doctor", "Chemist", "Geneticist", "Virologist", "Medical Resident",
+ "Atmospheric Technician", "Chief Medical Officer", "Medical Doctor", "Chemist", "Geneticist", "Virologist", "Psychologist", "Medical Resident",
"Research Director", "Scientist", "Roboticist", "Research Student", "Head of Security", "Warden", "Detective", "Security Officer", "Rookie")
/proc/get_all_job_icons() //For all existing HUD icons
diff --git a/code/modules/jobs/job_types/captain.dm b/code/modules/jobs/job_types/captain.dm
index 592c3640..ee1a0228 100644
--- a/code/modules/jobs/job_types/captain.dm
+++ b/code/modules/jobs/job_types/captain.dm
@@ -95,13 +95,13 @@ Head of Personnel
ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_MAINT_TUNNELS, ACCESS_BAR, ACCESS_JANITOR, ACCESS_CONSTRUCTION, ACCESS_MORGUE,
ACCESS_CREMATORIUM, ACCESS_KITCHEN, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_MAILSORTING, ACCESS_QM, ACCESS_HYDROPONICS, ACCESS_LAWYER,
ACCESS_THEATRE, ACCESS_CHAPEL_OFFICE, ACCESS_LIBRARY, ACCESS_RESEARCH, ACCESS_MINING, ACCESS_VAULT, ACCESS_MINING_STATION,
- ACCESS_HOP, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_MINERAL_STOREROOM)
+ ACCESS_HOP, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_MINERAL_STOREROOM, ACCESS_PSYCH)
minimal_access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_COURT, ACCESS_WEAPONS,
ACCESS_MEDICAL, ACCESS_ENGINE, ACCESS_CHANGE_IDS, ACCESS_AI_UPLOAD, ACCESS_EVA, ACCESS_HEADS,
ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_MAINT_TUNNELS, ACCESS_BAR, ACCESS_JANITOR, ACCESS_CONSTRUCTION, ACCESS_MORGUE,
ACCESS_CREMATORIUM, ACCESS_KITCHEN, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_MAILSORTING, ACCESS_QM, ACCESS_HYDROPONICS, ACCESS_LAWYER,
ACCESS_THEATRE, ACCESS_CHAPEL_OFFICE, ACCESS_LIBRARY, ACCESS_RESEARCH, ACCESS_MINING, ACCESS_VAULT, ACCESS_MINING_STATION,
- ACCESS_HOP, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_MINERAL_STOREROOM)
+ ACCESS_HOP, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_MINERAL_STOREROOM, ACCESS_PSYCH)
blacklisted_quirks = list(/datum/quirk/mute, /datum/quirk/brainproblems, /datum/quirk/prosopagnosia, /datum/quirk/insanity)
diff --git a/code/modules/jobs/job_types/job_alt_titles.dm b/code/modules/jobs/job_types/job_alt_titles.dm
index 08f04def..310d7e56 100644
--- a/code/modules/jobs/job_types/job_alt_titles.dm
+++ b/code/modules/jobs/job_types/job_alt_titles.dm
@@ -71,6 +71,9 @@
/datum/job/geneticist
alt_titles = list("Gene Therapist")
+/datum/job/psychologist
+ alt_titles = list("Therapist", "Psychiatrist")
+
/datum/job/junior_doctor
//Security
diff --git a/code/modules/jobs/job_types/medical.dm b/code/modules/jobs/job_types/medical.dm
index 9b07a2ad..a3ba4590 100644
--- a/code/modules/jobs/job_types/medical.dm
+++ b/code/modules/jobs/job_types/medical.dm
@@ -22,10 +22,10 @@ Chief Medical Officer
access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_GENETICS, ACCESS_CLONING, ACCESS_HEADS, ACCESS_MINERAL_STOREROOM,
ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_CMO, ACCESS_SURGERY, ACCESS_RC_ANNOUNCE,
- ACCESS_KEYCARD_AUTH, ACCESS_SEC_DOORS, ACCESS_MAINT_TUNNELS)
+ ACCESS_KEYCARD_AUTH, ACCESS_SEC_DOORS, ACCESS_MAINT_TUNNELS, ACCESS_PSYCH)
minimal_access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_GENETICS, ACCESS_CLONING, ACCESS_HEADS, ACCESS_MINERAL_STOREROOM,
ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_CMO, ACCESS_SURGERY, ACCESS_RC_ANNOUNCE,
- ACCESS_KEYCARD_AUTH, ACCESS_SEC_DOORS, ACCESS_MAINT_TUNNELS)
+ ACCESS_KEYCARD_AUTH, ACCESS_SEC_DOORS, ACCESS_MAINT_TUNNELS, ACCESS_PSYCH)
blacklisted_quirks = list(/datum/quirk/mute, /datum/quirk/brainproblems, /datum/quirk/insanity)
@@ -221,7 +221,6 @@ Virologist
satchel = /obj/item/storage/backpack/satchel/vir
duffelbag = /obj/item/storage/backpack/duffelbag/med
-
/*
Junior Doctor
*/
@@ -262,3 +261,41 @@ Junior Doctor
duffelbag = /obj/item/storage/backpack/duffelbag/med
chameleon_extras = /obj/item/gun/syringe
+
+/*
+Psychologist
+*/
+/datum/job/psychologist
+ title = "Psychologist"
+ flag = MED_PSYCH
+ department_head = list("Chief Medical Officer", "Head of Personnel")
+ department_flag = MEDSCI
+ faction = "Station"
+ total_positions = 1
+ spawn_positions = 1
+ minimal_player_age = 1
+ supervisors = "the chief medical officer, and head of personnel"
+ selection_color = "#ffeef0"
+ exp_requirements = 240
+ exp_type = EXP_TYPE_CREW
+
+ outfit = /datum/outfit/job/doctor/psychologist
+
+ access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_CLONING, ACCESS_MINERAL_STOREROOM, ACCESS_PSYCH)
+ minimal_access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_CLONING, ACCESS_MINERAL_STOREROOM, ACCESS_PSYCH)
+
+/datum/outfit/job/doctor/psychologist
+ name = "Psychologist"
+ jobtype = /datum/job/psychologist
+
+ belt = /obj/item/pda/medical
+ ears = /obj/item/radio/headset/headset_med
+ uniform = /obj/item/clothing/under/lawyer/blacksuit
+ shoes = /obj/item/clothing/shoes/laceup
+ l_hand = /obj/item/clipboard
+
+ backpack_contents = list(/obj/item/storage/pill_bottle/mannitol, /obj/item/storage/pill_bottle/psicodine, /obj/item/storage/pill_bottle/paxpsych, /obj/item/storage/pill_bottle/happinesspsych, /obj/item/storage/pill_bottle/lsdpsych)
+
+ backpack = /obj/item/storage/backpack/medic
+ satchel = /obj/item/storage/backpack/satchel/med
+ duffelbag = /obj/item/storage/backpack/duffelbag/med
diff --git a/code/modules/jobs/jobs.dm b/code/modules/jobs/jobs.dm
index 1121b399..df3f48aa 100644
--- a/code/modules/jobs/jobs.dm
+++ b/code/modules/jobs/jobs.dm
@@ -20,6 +20,7 @@ GLOBAL_LIST_INIT(medical_positions, list(
"Geneticist",
"Virologist",
"Chemist",
+ "Psychologist",
"Medical Resident"))
diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm
index 49a720a6..aa87217b 100644
--- a/code/modules/reagents/chemistry/reagents/other_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm
@@ -2065,7 +2065,7 @@
color = "#AAAAAA55"
taste_description = "water"
metabolization_rate = 0.25 * REAGENTS_METABOLISM
- pH = 15
+ pH = 9.75
/datum/reagent/pax/on_mob_metabolize(mob/living/L)
..()
diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm
index 02e50832..35b507c5 100644
--- a/code/modules/reagents/reagent_containers/pill.dm
+++ b/code/modules/reagents/reagent_containers/pill.dm
@@ -204,7 +204,25 @@
icon_state = "pill9"
color = "#454545"
list_reagents = list(/datum/reagent/mutationtoxin/shadow = 1)
-//////////////////////////////////////// drugs
+//////////////////////////////////////// drugs#
+/obj/item/reagent_containers/pill/lsdpsych
+ name = "antipsychotic pill"
+ desc = "Talk to your healthcare provider immediately if hallucinations worsen or new hallucinations emerge."
+ icon_state = "pill14"
+ list_reagents = list(/datum/reagent/toxin/mindbreaker = 5)
+
+/obj/item/reagent_containers/pill/happinesspsych
+ name = "mood stabilizer pill"
+ desc = "Used to temporarily alleviate anxiety and depression, take only as prescribed."
+ icon_state = "pill_happy"
+ list_reagents = list(/datum/reagent/drug/happiness = 5)
+
+/obj/item/reagent_containers/pill/paxpsych
+ name = "pacification pill"
+ desc = "Used to temporarily suppress violent, homicidal, or suicidal behavior in patients."
+ list_reagents = list(/datum/reagent/pax = 5)
+ icon_state = "pill12"
+
/obj/item/reagent_containers/pill/zoom
name = "zoom pill"
list_reagents = list(/datum/reagent/medicine/synaptizine = 10, /datum/reagent/drug/nicotine = 10, /datum/reagent/drug/methamphetamine = 1)
@@ -257,3 +275,4 @@
name = "breast enlargement pill"
list_reagents = list(/datum/reagent/fermi/breast_enlarger = 10)
price = 4
+
diff --git a/code/modules/vending/clothesmate.dm b/code/modules/vending/clothesmate.dm
index b5ec7e12..92d5b25a 100644
--- a/code/modules/vending/clothesmate.dm
+++ b/code/modules/vending/clothesmate.dm
@@ -129,6 +129,9 @@
/obj/item/clothing/under/syndicate/tacticool/skirt = 3,
/obj/item/clothing/mask/balaclava = 3,
/obj/item/clothing/head/ushanka = 3,
+ /obj/item/clothing/suit/gcvest = 2,
+ /obj/item/clothing/suit/gcvest/alt = 2,
+ /obj/item/clothing/gloves/guncaster = 4,
/obj/item/clothing/under/soviet = 3,
/obj/item/storage/belt/fannypack/black = 3,
/obj/item/clothing/suit/jacket/letterman_syndie = 5,
diff --git a/config/jobs.txt b/config/jobs.txt
index a0c1ffa9..4d00392a 100644
--- a/config/jobs.txt
+++ b/config/jobs.txt
@@ -34,6 +34,7 @@ Medical Doctor=5,3
Chemist=2,2
Geneticist=2,2
Virologist=1,1
+Psychologist=1,1
Scientist=5,3
Roboticist=2,2
diff --git a/html/statbrowser.html b/html/statbrowser.html
index 1a8b229b..f293891a 100644
--- a/html/statbrowser.html
+++ b/html/statbrowser.html
@@ -87,7 +87,7 @@ li a:hover:not(.active) {
font-size: 12px;
margin: 2px 2px;
cursor: pointer;
- border-radius: 10%;
+ border-radius: 0%;
transition-duration: 0.25s;
order: 3;
}
@@ -954,26 +954,26 @@ function draw_verbs(cat){
function set_theme(which) {
if (which == "light") {
+ document.body.style.backgroundColor = "white";
+ document.body.style.color = "black";
document.body.className = "";
set_style_sheet("browserOutput_white");
+ setCookie("theme", "white", 365);
} else if (which == "dark") {
+ document.body.style.backgroundColor = "#171717";
+ document.body.style.color = "#a4bad6";
document.body.className = "dark";
set_style_sheet("browserOutput");
+ setCookie("theme", "dark", 365);
}
}
function set_light_theme() {
- document.body.style.backgroundColor = "white";
- document.body.style.color = "black";
- document.body.className = "";
- set_style_sheet("browserOutput_white")
+ set_theme("light");
}
function set_dark_theme() {
- document.body.style.backgroundColor = "#171717";
- document.body.style.color = "#a4bad6";
- document.body.className = "dark";
- set_style_sheet("browserOutput")
+ set_theme("dark");
}
function set_style_sheet(sheet) {
@@ -1008,6 +1008,22 @@ function create_debug(){
}
}
+function checkCookie() {
+ var stylecookie=getCookie("theme");
+ if (stylecookie == "dark") {
+ set_dark_theme();
+ } else {
+ set_light_theme();
+ }
+}
+
+function setCookie(cname,cvalue,exdays) {
+ var d = new Date();
+ d.setTime(d.getTime() + (exdays*24*60*60*1000));
+ var expires = "expires=" + d.toGMTString();
+ document.cookie = cname + "=" + cvalue + ";" + expires + ";path=/";
+}
+
function getCookie(cname) {
var name = cname + '=';
var ca = document.cookie.split(';');
@@ -1021,5 +1037,6 @@ function getCookie(cname) {
return '';
}
+