diff --git a/.gitignore b/.gitignore
index 1d5f6007c8..172b470be4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -201,4 +201,4 @@ tools/MapAtmosFixer/MapAtmosFixer/bin/*
.atom-build.json
#Jukebox audio files
-/config/jukebox_music/**/*
\ No newline at end of file
+/config/jukebox_music/**/*
diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm
index e00b845e55..14099640b7 100644
--- a/_maps/map_files/PubbyStation/PubbyStation.dmm
+++ b/_maps/map_files/PubbyStation/PubbyStation.dmm
@@ -16023,22 +16023,13 @@
},
/turf/open/floor/plasteel,
/area/hallway/secondary/exit/departure_lounge)
-"aQA" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- dir = 8
- },
-/turf/open/floor/plasteel,
-/area/hallway/primary/central)
"aQB" = (
-/obj/structure/disposalpipe/junction/flip{
- dir = 8
- },
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 8
},
+/obj/structure/disposalpipe/segment{
+ dir = 6
+ },
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"aQC" = (
@@ -24471,18 +24462,11 @@
},
/area/medical/medbay/central)
"bmB" = (
-/obj/item/twohanded/required/kirbyplants{
- icon_state = "plant-21";
- pixel_y = 3
- },
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 5
},
-/obj/structure/sign/poster/official/random{
- pixel_y = -32
- },
-/turf/open/floor/plasteel/yellow/corner{
- dir = 1
+/turf/open/floor/plasteel/blue/corner{
+ dir = 8
},
/area/hallway/primary/central)
"bmC" = (
@@ -26314,39 +26298,27 @@
"brl" = (
/obj/item/reagent_containers/glass/beaker/large,
/obj/item/reagent_containers/glass/beaker/large,
-/obj/structure/table/glass,
/obj/item/reagent_containers/glass/beaker/large,
/obj/item/reagent_containers/glass/beaker/large,
/obj/item/reagent_containers/dropper,
/obj/item/reagent_containers/dropper,
+/obj/structure/table,
/turf/open/floor/plasteel/whiteyellow/side{
dir = 1
},
/area/medical/chemistry)
"brm" = (
/obj/machinery/chem_master,
-/obj/machinery/button/door{
- id = "chemistry_shutters";
- name = "Shutters Control";
- pixel_x = 26;
- pixel_y = 4;
- req_access_txt = "5; 33"
+/obj/machinery/requests_console{
+ department = "Chemistry";
+ departmentType = 2;
+ pixel_x = 32;
+ receive_ore_updates = 1
},
/turf/open/floor/plasteel/whiteyellow/side{
dir = 5
},
/area/medical/chemistry)
-"bro" = (
-/obj/structure/plasticflaps/opaque,
-/obj/effect/turf_decal/delivery,
-/turf/open/floor/plasteel,
-/area/maintenance/department/engine)
-"brp" = (
-/obj/item/storage/toolbox/mechanical,
-/turf/open/floor/plasteel/whitepurple/side{
- dir = 1
- },
-/area/science/lab)
"brq" = (
/obj/structure/sink/kitchen{
desc = "A sink used for washing one's hands and face. It looks rusty and home-made";
@@ -26354,6 +26326,7 @@
pixel_y = 28
},
/obj/item/stack/cable_coil/orange,
+/obj/item/storage/toolbox/mechanical,
/turf/open/floor/plasteel/whitepurple/side{
dir = 1
},
@@ -26917,7 +26890,7 @@
/area/medical/chemistry)
"bsL" = (
/obj/item/storage/box/beakers,
-/obj/structure/table/glass,
+/obj/structure/table,
/turf/open/floor/plasteel/white,
/area/medical/chemistry)
"bsM" = (
@@ -27453,7 +27426,6 @@
/turf/open/floor/plasteel/whiteblue/corner,
/area/medical/medbay/central)
"buj" = (
-/obj/machinery/chem_heater,
/obj/machinery/light{
dir = 8
},
@@ -27464,21 +27436,22 @@
c_tag = "Chemistry";
dir = 4
},
+/obj/structure/disposalpipe/trunk{
+ dir = 4
+ },
+/obj/machinery/disposal/bin,
/turf/open/floor/plasteel/whiteyellow/corner{
dir = 1
},
/area/medical/chemistry)
"buk" = (
/obj/structure/disposalpipe/segment{
- dir = 6
+ dir = 10
},
/turf/open/floor/plasteel/white,
/area/medical/chemistry)
"bul" = (
-/obj/structure/disposalpipe/trunk{
- dir = 8
- },
-/obj/machinery/disposal/bin,
+/obj/machinery/chem_heater,
/turf/open/floor/plasteel/white,
/area/medical/chemistry)
"bum" = (
@@ -27486,8 +27459,12 @@
/turf/open/floor/plasteel/white,
/area/medical/chemistry)
"bun" = (
-/turf/open/floor/plasteel/whiteyellow/corner{
- dir = 4
+/obj/machinery/firealarm{
+ dir = 4;
+ pixel_x = 28
+ },
+/turf/open/floor/plasteel/whiteyellow/side{
+ dir = 5
},
/area/medical/chemistry)
"bup" = (
@@ -27894,11 +27871,13 @@
/turf/open/floor/plasteel/white,
/area/medical/chemistry)
"bvu" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+ dir = 1
},
-/turf/closed/wall,
-/area/maintenance/department/engine)
+/turf/open/floor/plasteel/blue/corner{
+ dir = 8
+ },
+/area/hallway/primary/aft)
"bvw" = (
/obj/machinery/computer/rdconsole/core{
dir = 4
@@ -28464,18 +28443,12 @@
/obj/item/hand_labeler,
/obj/item/clothing/glasses/science,
/obj/item/clothing/glasses/science,
-/obj/machinery/light_switch{
- pixel_x = 25
- },
/turf/open/floor/plasteel/whiteyellow/side{
dir = 6
},
/area/medical/chemistry)
"bxa" = (
/obj/structure/table/glass,
-/obj/structure/extinguisher_cabinet{
- pixel_x = -24
- },
/obj/item/book/manual/research_and_development,
/obj/item/disk/tech_disk,
/obj/item/disk/design_disk,
@@ -29174,14 +29147,6 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/plasteel/white,
/area/medical/chemistry)
-"byy" = (
-/obj/structure/chair/office/light{
- dir = 4
- },
-/turf/open/floor/plasteel/whiteyellow/side{
- dir = 4
- },
-/area/medical/chemistry)
"byz" = (
/obj/structure/window/reinforced{
dir = 8;
@@ -29215,28 +29180,34 @@
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
"byD" = (
-/obj/structure/disposalpipe/segment{
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 6
},
/obj/structure/cable{
icon_state = "2-4"
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+/obj/machinery/door/airlock/research{
+ name = "R&D Lab";
+ req_access_txt = "0";
+ req_one_access_txt = "7;29;30"
+ },
+/obj/effect/turf_decal/delivery,
+/obj/structure/disposalpipe/segment{
dir = 6
},
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
/area/science/lab)
"byE" = (
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/structure/cable{
- icon_state = "4-8"
- },
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/turf/open/floor/plasteel/whitepurple/side,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel/dark,
/area/science/lab)
"byF" = (
/obj/structure/chair/office/light{
@@ -29905,21 +29876,14 @@
},
/obj/item/stack/cable_coil/random,
/obj/item/book/manual/wiki/chemistry,
-/turf/open/floor/plasteel/whiteyellow/side,
-/area/medical/chemistry)
-"bAh" = (
-/obj/structure/table/glass,
+/obj/item/grenade/chem_grenade,
+/obj/item/grenade/chem_grenade,
/obj/item/stack/sheet/mineral/plasma{
amount = 2;
layer = 2.9
},
-/obj/item/grenade/chem_grenade,
-/obj/item/grenade/chem_grenade,
-/obj/item/grenade/chem_grenade,
/obj/item/screwdriver,
-/turf/open/floor/plasteel/whiteyellow/side{
- dir = 6
- },
+/turf/open/floor/plasteel/whiteyellow/side,
/area/medical/chemistry)
"bAi" = (
/obj/machinery/smoke_machine,
@@ -29935,24 +29899,16 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/structure/sign/poster/random{
- pixel_y = 32
- },
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
"bAm" = (
-/obj/machinery/door/airlock/maintenance{
- name = "Research Lab Maintenance";
- req_access_txt = "0";
- req_one_access_txt = "7;29"
- },
/obj/structure/disposalpipe/segment,
/obj/structure/cable{
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plating,
-/area/maintenance/department/engine)
+/turf/closed/wall/r_wall,
+/area/hallway/primary/aft)
"bAo" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/door/poddoor/shutters/preopen{
@@ -30263,15 +30219,20 @@
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 8
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/open/floor/plasteel/whiteblue/side{
dir = 8
},
/area/medical/medbay/central)
"bBf" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 8
},
+/obj/structure/disposalpipe/junction/flip{
+ dir = 1
+ },
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"bBg" = (
@@ -31333,8 +31294,10 @@
/obj/machinery/light/small{
dir = 4
},
-/turf/open/floor/plating,
-/area/maintenance/department/engine)
+/turf/open/floor/plasteel/purple/side{
+ icon_state = "purplecorner"
+ },
+/area/hallway/primary/aft)
"bDB" = (
/obj/machinery/airalarm/unlocked{
dir = 4;
@@ -31946,8 +31909,10 @@
},
/obj/item/stock_parts/matter_bin,
/obj/item/stock_parts/matter_bin,
-/turf/open/floor/plating,
-/area/maintenance/department/engine)
+/turf/open/floor/plasteel/purple/side{
+ icon_state = "purplecorner"
+ },
+/area/hallway/primary/aft)
"bER" = (
/obj/machinery/computer/mecha{
dir = 4
@@ -33900,6 +33865,7 @@
/obj/structure/sign/departments/engineering{
pixel_y = -32
},
+/obj/machinery/door/firedoor,
/turf/open/floor/plasteel/green/side,
/area/hallway/primary/aft)
"bJE" = (
@@ -46330,13 +46296,6 @@
/obj/item/flashlight/lantern,
/turf/open/floor/plasteel/dark,
/area/chapel/main/monastery)
-"cwP" = (
-/obj/machinery/firealarm{
- dir = 4;
- pixel_x = 28
- },
-/turf/closed/wall,
-/area/medical/chemistry)
"cwR" = (
/obj/structure/window/reinforced{
dir = 8;
@@ -47248,6 +47207,16 @@
},
/turf/open/floor/plasteel,
/area/science/explab)
+"cKV" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
+/obj/machinery/airalarm{
+ dir = 4;
+ pixel_x = -23
+ },
+/turf/open/floor/plasteel/blue/corner{
+ dir = 8
+ },
+/area/hallway/primary/aft)
"cOp" = (
/obj/item/clothing/mask/gas,
/obj/item/clothing/mask/gas,
@@ -47386,8 +47355,8 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/turf/open/floor/plating,
-/area/maintenance/department/engine)
+/turf/open/floor/plasteel,
+/area/hallway/primary/aft)
"dgz" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -47415,8 +47384,14 @@
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plating,
-/area/maintenance/department/engine)
+/obj/structure/chair{
+ dir = 8;
+ name = "Defense"
+ },
+/turf/open/floor/plasteel/purple/side{
+ icon_state = "purplecorner"
+ },
+/area/hallway/primary/aft)
"dir" = (
/obj/machinery/atmospherics/pipe/simple/general/visible{
dir = 5
@@ -47607,6 +47582,22 @@
icon_state = "platingdmg1"
},
/area/maintenance/department/engine)
+"dHZ" = (
+/obj/structure/chair/office/light{
+ dir = 1
+ },
+/obj/effect/landmark/start/chemist,
+/obj/machinery/button/door{
+ id = "chemistry_shutters";
+ name = "Shutters Control";
+ pixel_x = 26;
+ pixel_y = 4;
+ req_access_txt = "5; 33"
+ },
+/turf/open/floor/plasteel/whiteyellow/side{
+ dir = 1
+ },
+/area/medical/chemistry)
"dJm" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -47739,14 +47730,8 @@
/turf/open/floor/plasteel/white,
/area/science/xenobiology)
"eeF" = (
-/obj/structure/chair{
- dir = 8
- },
-/obj/structure/sign/poster/official/random{
- pixel_y = -32
- },
-/turf/open/floor/plasteel/yellow/corner{
- dir = 4
+/turf/open/floor/plasteel/purple/side{
+ icon_state = "purplecorner"
},
/area/hallway/primary/central)
"eeQ" = (
@@ -47859,7 +47844,7 @@
dir = 1
},
/turf/open/floor/plasteel/neutral,
-/area/maintenance/department/security/brig)
+/area/hallway/secondary/exit/departure_lounge)
"eCw" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -47966,6 +47951,11 @@
icon_state = "platingdmg3"
},
/area/maintenance/department/security/brig)
+"eRp" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/machinery/door/firedoor,
+/turf/open/floor/plasteel,
+/area/hallway/primary/aft)
"eSL" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/item/beacon,
@@ -48026,8 +48016,8 @@
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 1
},
-/turf/open/floor/plating,
-/area/maintenance/department/engine)
+/turf/open/floor/plasteel,
+/area/hallway/primary/aft)
"fdS" = (
/obj/machinery/door/window/southleft{
base_state = "left";
@@ -48423,8 +48413,8 @@
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 4
},
-/turf/open/floor/plating,
-/area/maintenance/department/engine)
+/turf/open/floor/plasteel,
+/area/hallway/primary/aft)
"gkX" = (
/obj/machinery/door/airlock/maintenance{
name = "Storage";
@@ -48557,6 +48547,15 @@
/obj/item/flashlight/lamp/green,
/turf/open/floor/carpet,
/area/lawoffice)
+"gDR" = (
+/obj/machinery/camera{
+ c_tag = "Central Primary Hallway Escape";
+ dir = 4
+ },
+/turf/open/floor/plasteel/blue/corner{
+ dir = 8
+ },
+/area/hallway/primary/aft)
"gDZ" = (
/obj/effect/turf_decal/box/corners{
dir = 1
@@ -48601,12 +48600,6 @@
/turf/open/floor/plating,
/area/maintenance/department/security/brig)
"gGA" = (
-/obj/machinery/requests_console{
- department = "Chemistry";
- departmentType = 2;
- pixel_x = 32;
- receive_ore_updates = 1
- },
/obj/structure/table/glass,
/obj/machinery/reagentgrinder,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -48919,6 +48912,14 @@
},
/turf/open/floor/plating,
/area/maintenance/department/security/brig)
+"hIZ" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 1
+ },
+/turf/open/floor/plasteel/blue/corner{
+ dir = 8
+ },
+/area/hallway/primary/aft)
"hOx" = (
/obj/structure/cable{
icon_state = "2-4"
@@ -49108,6 +49109,12 @@
/obj/machinery/processor/slime,
/turf/open/floor/plasteel/white,
/area/science/xenobiology)
+"imE" = (
+/turf/open/floor/plasteel/purple/side{
+ icon_state = "purple";
+ dir = 4
+ },
+/area/hallway/primary/aft)
"ioj" = (
/obj/effect/turf_decal/stripes/line{
dir = 10
@@ -49151,6 +49158,12 @@
dir = 8
},
/area/science/xenobiology)
+"iwe" = (
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
+/turf/open/floor/plasteel/blue/corner{
+ dir = 8
+ },
+/area/hallway/primary/aft)
"iyg" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -49537,12 +49550,6 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 6
},
-/obj/structure/sign/poster/random{
- pixel_y = 32
- },
-/obj/item/twohanded/required/kirbyplants{
- icon_state = "plant-17"
- },
/obj/structure/sign/poster/official/random{
pixel_x = -32
},
@@ -49624,10 +49631,6 @@
},
/turf/open/floor/plating,
/area/maintenance/department/science)
-"jSA" = (
-/obj/structure/sign/departments/science,
-/turf/closed/wall,
-/area/maintenance/department/engine)
"jTh" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -49693,6 +49696,10 @@
icon_state = "platingdmg3"
},
/area/maintenance/department/engine)
+"jZG" = (
+/obj/effect/spawner/structure/window,
+/turf/open/floor/plating,
+/area/medical/chemistry)
"kfh" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 9
@@ -50059,6 +50066,14 @@
},
/turf/open/floor/plating/airless,
/area/engine/engineering)
+"kYM" = (
+/obj/structure/extinguisher_cabinet{
+ pixel_x = 27
+ },
+/turf/open/floor/plasteel/purple/side{
+ icon_state = "purplecorner"
+ },
+/area/hallway/primary/aft)
"lcU" = (
/obj/effect/turf_decal/stripes/line{
dir = 5
@@ -50127,6 +50142,11 @@
/obj/machinery/door/firedoor,
/turf/open/floor/plasteel/dark,
/area/library/lounge)
+"ltE" = (
+/turf/open/floor/plasteel/purple/side{
+ icon_state = "purplecorner"
+ },
+/area/hallway/primary/aft)
"lzJ" = (
/obj/structure/closet/crate/bin,
/turf/open/floor/carpet,
@@ -50221,6 +50241,12 @@
/obj/item/wrench,
/turf/open/floor/plating,
/area/maintenance/department/science)
+"lJI" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/structure/disposalpipe/segment,
+/obj/machinery/door/firedoor,
+/turf/open/floor/plasteel,
+/area/hallway/primary/aft)
"lKL" = (
/obj/machinery/door/airlock/abandoned{
name = "Starboard Emergency Storage";
@@ -50347,12 +50373,6 @@
dir = 1
},
/area/engine/engineering)
-"mcf" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/turf/open/floor/plasteel/white,
-/area/medical/chemistry)
"mci" = (
/obj/machinery/portable_atmospherics/canister/toxins,
/obj/structure/disposalpipe/segment{
@@ -50382,6 +50402,19 @@
},
/turf/open/floor/plating,
/area/engine/engineering)
+"mhn" = (
+/obj/machinery/door/firedoor,
+/obj/structure/sign/poster/random{
+ pixel_x = 32
+ },
+/turf/open/floor/plasteel/purple/side{
+ icon_state = "purplecorner"
+ },
+/area/hallway/primary/aft)
+"mjn" = (
+/obj/machinery/jukebox,
+/turf/open/floor/plasteel/dark,
+/area/crew_quarters/bar)
"mlr" = (
/obj/structure/lattice,
/obj/structure/disposalpipe/junction{
@@ -50423,6 +50456,18 @@
dir = 1
},
/area/science/xenobiology)
+"mqp" = (
+/obj/machinery/firealarm{
+ dir = 8;
+ pixel_x = -28
+ },
+/obj/machinery/light{
+ dir = 8
+ },
+/turf/open/floor/plasteel/blue/corner{
+ dir = 8
+ },
+/area/hallway/primary/aft)
"msX" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable{
@@ -50696,9 +50741,6 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel/dark,
/area/chapel/office)
-"nnf" = (
-/turf/open/floor/plasteel/whiteyellow/side,
-/area/medical/chemistry)
"nnh" = (
/obj/structure/chair{
dir = 8
@@ -50981,6 +51023,11 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/wood,
/area/lawoffice)
+"nTr" = (
+/turf/open/floor/plasteel/blue/corner{
+ dir = 8
+ },
+/area/hallway/primary/aft)
"nVU" = (
/obj/item/twohanded/spear,
/turf/open/floor/plating,
@@ -51518,8 +51565,8 @@
"phJ" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plating,
-/area/maintenance/department/engine)
+/turf/open/floor/plasteel,
+/area/hallway/primary/aft)
"pjH" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -51589,6 +51636,13 @@
},
/turf/open/space/basic,
/area/space/nearstation)
+"pxD" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/effect/spawner/structure/window,
+/turf/open/floor/plating,
+/area/medical/chemistry)
"pBD" = (
/obj/structure/cable{
icon_state = "0-8"
@@ -51691,12 +51745,6 @@
},
/turf/closed/wall/r_wall,
/area/medical/virology)
-"pSc" = (
-/obj/machinery/chem_heater,
-/turf/open/floor/plasteel/whiteyellow/side{
- dir = 5
- },
-/area/medical/chemistry)
"pVD" = (
/obj/machinery/light/small{
dir = 1
@@ -51767,6 +51815,9 @@
/obj/item/twohanded/required/kirbyplants{
icon_state = "plant-03"
},
+/obj/structure/extinguisher_cabinet{
+ pixel_x = -24
+ },
/turf/open/floor/plasteel/dark,
/area/science/lab)
"pYC" = (
@@ -52027,6 +52078,15 @@
/obj/effect/turf_decal/stripes/corner,
/turf/open/floor/plating/airless,
/area/engine/engineering)
+"qTV" = (
+/obj/item/radio/intercom{
+ name = "Station Intercom (General)";
+ pixel_x = -27
+ },
+/turf/open/floor/plasteel/blue/corner{
+ dir = 8
+ },
+/area/hallway/primary/aft)
"qUw" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel/neutral,
@@ -52683,6 +52743,16 @@
},
/turf/open/space,
/area/engine/engineering)
+"sYQ" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/door/firedoor,
+/turf/open/floor/plasteel,
+/area/hallway/primary/aft)
"sZh" = (
/obj/structure/closet/crate,
/turf/open/floor/plating,
@@ -52843,6 +52913,14 @@
icon_state = "panelscorched"
},
/area/maintenance/department/security/brig)
+"tqO" = (
+/obj/structure/sign/poster/official/random{
+ pixel_x = -32
+ },
+/turf/open/floor/plasteel/blue/corner{
+ dir = 8
+ },
+/area/hallway/primary/aft)
"tqX" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable{
@@ -52919,6 +52997,10 @@
},
/turf/open/floor/plating,
/area/maintenance/department/security/brig)
+"tzH" = (
+/obj/effect/spawner/structure/window,
+/turf/open/floor/plating,
+/area/science/lab)
"tAK" = (
/obj/structure/table,
/obj/structure/window/reinforced{
@@ -52951,6 +53033,11 @@
},
/turf/open/floor/plating/airless,
/area/engine/engineering)
+"tJr" = (
+/obj/structure/plasticflaps/opaque,
+/obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
+/area/science/lab)
"tPm" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -52970,8 +53057,8 @@
/area/maintenance/department/science)
"tTl" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plating,
-/area/maintenance/department/engine)
+/turf/open/floor/plasteel,
+/area/hallway/primary/aft)
"tXn" = (
/obj/structure/sink{
dir = 4;
@@ -53200,6 +53287,28 @@
/obj/machinery/field/generator,
/turf/open/floor/plating,
/area/maintenance/department/engine)
+"uxP" = (
+/obj/structure/disposalpipe/segment{
+ dir = 9
+ },
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 9
+ },
+/obj/structure/chair{
+ dir = 8;
+ name = "Defense"
+ },
+/obj/machinery/camera{
+ c_tag = "Atmospherics Starboard";
+ dir = 8
+ },
+/turf/open/floor/plasteel/purple/side{
+ icon_state = "purplecorner"
+ },
+/area/hallway/primary/aft)
"uzn" = (
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
/obj/structure/cable{
@@ -53440,6 +53549,20 @@
},
/turf/open/floor/plating,
/area/maintenance/department/cargo)
+"vsG" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/obj/machinery/door/airlock/maintenance{
+ name = "Research Lab Maintenance";
+ req_access_txt = "0";
+ req_one_access_txt = "7;29"
+ },
+/turf/open/floor/plating,
+/area/maintenance/department/engine)
"vsJ" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel/neutral/corner{
@@ -53495,6 +53618,14 @@
},
/turf/open/floor/plasteel,
/area/crew_quarters/fitness/recreation)
+"vzA" = (
+/obj/machinery/light{
+ dir = 8
+ },
+/turf/open/floor/plasteel/blue/corner{
+ dir = 8
+ },
+/area/hallway/primary/aft)
"vzP" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plating,
@@ -53550,6 +53681,15 @@
},
/turf/open/floor/plating,
/area/maintenance/department/security/brig)
+"vKq" = (
+/obj/machinery/door/firedoor,
+/obj/structure/sign/poster/official/random{
+ pixel_x = -32
+ },
+/turf/open/floor/plasteel/blue/corner{
+ dir = 8
+ },
+/area/hallway/primary/aft)
"vMx" = (
/obj/structure/disposalpipe/segment{
dir = 6
@@ -54121,12 +54261,10 @@
/turf/open/floor/plasteel/dark,
/area/library)
"xje" = (
-/obj/machinery/door/airlock/maintenance{
- req_access_txt = "12"
- },
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plating,
-/area/maintenance/department/engine)
+/obj/machinery/door/firedoor,
+/turf/open/floor/plasteel,
+/area/hallway/primary/aft)
"xjK" = (
/obj/item/radio/intercom{
name = "Station Intercom (General)";
@@ -54276,11 +54414,13 @@
/obj/structure/sign/poster/official/random{
pixel_x = -32
},
-/obj/structure/chair{
- dir = 4
+/obj/machinery/light{
+ dir = 8
},
-/turf/open/floor/plating,
-/area/maintenance/department/engine)
+/turf/open/floor/plasteel/blue/corner{
+ dir = 8
+ },
+/area/hallway/primary/aft)
"xFl" = (
/obj/machinery/power/apc/highcap/five_k{
dir = 1;
@@ -78201,7 +78341,7 @@ aAL
aMR
aAL
aAL
-aQA
+aHE
aAL
aAL
aTO
@@ -85423,7 +85563,7 @@ bmz
bnG
boN
bpW
-brk
+dHZ
bsK
buk
bvs
@@ -85942,8 +86082,8 @@ bsM
bum
bvt
bwV
-byy
-bAh
+byz
+ooh
bpY
bCA
bDy
@@ -86174,7 +86314,7 @@ aSS
aUg
aVf
aWi
-bah
+mjn
aYe
aZb
bag
@@ -86197,10 +86337,10 @@ bpV
brm
bsN
bun
-mcf
-nnf
-byz
-ooh
+gGA
+bwW
+byA
+bAi
bpY
bCB
bDz
@@ -86452,14 +86592,14 @@ bmA
bjd
bpY
bpY
-cwP
-pSc
-gGA
-bwW
-byA
-bAi
bpY
-pwj
+bpY
+pxD
+jZG
+bpY
+bpY
+bpY
+vsG
bva
bva
bva
@@ -86707,19 +86847,19 @@ bls
aBI
aBI
bmB
-bva
-bsn
-bva
-bva
+vKq
+nTr
+gDR
+vzA
bvu
-bva
-bva
-bva
-bva
-pwj
-hVx
+hIZ
+tqO
+mqp
+cKV
+iwe
+qTV
xDj
-bva
+blt
jCv
bOK
bEN
@@ -86976,7 +87116,7 @@ tTl
dgg
phJ
phJ
-xje
+lJI
bAk
bIt
bJB
@@ -87221,19 +87361,19 @@ blu
aDZ
aDZ
eeF
-bBX
-bBX
-bBX
-bro
-bBX
-bBX
-bBX
-bBX
-bva
+mhn
+ltE
+ltE
+ltE
+ltE
+ltE
+imE
+kYM
+bmC
fdQ
-npE
-npE
-bFZ
+bmD
+bmD
+eRp
bAl
bIu
bJC
@@ -87479,20 +87619,20 @@ blt
cqh
bKM
cCl
-pYw
-gFo
-cSK
-duF
-bxa
+cCl
+cCl
+tJr
+tzH
+tzH
byD
bAm
dhz
-bCD
+uxP
bDA
bEQ
-jSA
-bHg
-bIv
+bGa
+bHp
+sYQ
bJD
bBo
bBo
@@ -87736,11 +87876,11 @@ bmC
cqi
boP
bqb
-brp
-byF
-cCt
-byF
-cCt
+pYw
+gFo
+cSK
+duF
+bxa
byE
bBp
bBp
@@ -87994,9 +88134,9 @@ cqi
boQ
cCl
brq
+byF
cCt
-cCt
-cCt
+byF
bxc
nIU
bAo
diff --git a/code/datums/martial/boxing.dm b/code/datums/martial/boxing.dm
index 68b021bc7d..20c3570bc1 100644
--- a/code/datums/martial/boxing.dm
+++ b/code/datums/martial/boxing.dm
@@ -34,8 +34,8 @@
D.apply_damage(damage, STAMINA, affecting, armor_block)
add_logs(A, D, "punched (boxing) ")
- if(D.getStaminaLoss() > 50)
- var/knockout_prob = D.getStaminaLoss() + rand(-15,15)
+ if(D.getStaminaLoss() > 100)
+ var/knockout_prob = (D.getStaminaLoss() + rand(-15,15))*0.75
if((D.stat != DEAD) && prob(knockout_prob))
D.visible_message("[A] has knocked [D] out with a haymaker!", \
"[A] has knocked [D] out with a haymaker!")
diff --git a/code/datums/shuttles.dm b/code/datums/shuttles.dm
index 3517f92060..b53b334132 100644
--- a/code/datums/shuttles.dm
+++ b/code/datums/shuttles.dm
@@ -126,7 +126,6 @@
var/datum/supply_pack/P = SSshuttle.supply_packs[/datum/supply_pack/engineering/shuttle_engine]
P.special_enabled = TRUE
-
/datum/map_template/shuttle/emergency/asteroid
suffix = "asteroid"
name = "Asteroid Station Emergency Shuttle"
@@ -229,7 +228,7 @@
suffix = "scrapheap"
name = "Standby Evacuation Vessel \"Scrapheap Challenge\""
credit_cost = -1000
- description = "Due to a lack of functional emergency shuttles, we bought this second hand from a scrapyard and pressed it into service. Please do not lean to heavily on the exterior windows, they are fragile."
+ description = "Due to a lack of functional emergency shuttles, we bought this second hand from a scrapyard and pressed it into service. Please do not lean to heavily on the exterior windows, they are fragile. VIRUS ALERT: This entry seems to be booby-trapped with a redirector trap. Buy this at your own risk."
admin_notes = "An abomination with no functional medbay, sections missing, and some very fragile windows. Surprisingly airtight."
/datum/map_template/shuttle/emergency/narnar
diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm
index 2ae00f9348..8e3d89dbd0 100644
--- a/code/modules/client/client_procs.dm
+++ b/code/modules/client/client_procs.dm
@@ -729,6 +729,9 @@ GLOBAL_LIST_EMPTY(external_rsc_urls)
if (clicklimiter[SECOND_COUNT] > scl)
to_chat(src, "Your previous click was ignored because you've done too many in a second")
return
+
+ if(ab)
+ return
if (prefs.hotkeys)
// If hotkey mode is enabled, then clicking the map will automatically
diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm
index 3e7cd539d0..a150e5c138 100644
--- a/code/modules/reagents/reagent_containers/syringes.dm
+++ b/code/modules/reagents/reagent_containers/syringes.dm
@@ -224,7 +224,7 @@
list_reagents = list("chloralhydrate" = 50)
/obj/item/reagent_containers/syringe/lethal/execution
- list_reagents = list("plasma" = 15, "formaldehyde" = 15, "cyanide" = 10, "facid" = 10)
+ list_reagents = list("amatoxin" = 15, "formaldehyde" = 15, "cyanide" = 10, "facid" = 10)
/obj/item/reagent_containers/syringe/mulligan
name = "Mulligan"
diff --git a/html/changelogs/AutoChangeLog-pr-7360.yml b/html/changelogs/AutoChangeLog-pr-7360.yml
new file mode 100644
index 0000000000..9b65502bd0
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7360.yml
@@ -0,0 +1,4 @@
+author: "Hatterhat"
+delete-after: True
+changes:
+ - tweak: "The plasma formerly present in some execution syringes was replaced with amatoxin."
diff --git a/html/changelogs/AutoChangeLog-pr-7368.yml b/html/changelogs/AutoChangeLog-pr-7368.yml
new file mode 100644
index 0000000000..bfb405f356
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7368.yml
@@ -0,0 +1,4 @@
+author: "deathride58"
+delete-after: True
+changes:
+ - rscadd: "Added Raiq's boombox as a donor item"
diff --git a/html/changelogs/AutoChangeLog-pr-7405.yml b/html/changelogs/AutoChangeLog-pr-7405.yml
new file mode 100644
index 0000000000..5deecc21c5
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7405.yml
@@ -0,0 +1,5 @@
+author: "deathride58"
+delete-after: True
+changes:
+ - balance: "The combat rework's training wheels have been removed. Knockdowns no longer have any noticeable stun. This indirectly means stunbatons and tasers will always deal their full stamloss on hit."
+ - balance: "The stamloss required for boxing gloves to throw a knockout punch has been increased from 50 to 100."
diff --git a/html/changelogs/AutoChangeLog-pr-7409.yml b/html/changelogs/AutoChangeLog-pr-7409.yml
new file mode 100644
index 0000000000..d20dd0bd90
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7409.yml
@@ -0,0 +1,6 @@
+author: "slate3"
+delete-after: True
+changes:
+ - rscadd: "ported a new alternative sprite for engineering borgs, mr. handy"
+ - rscadd: "ported a new alternative sprite for security borgs, a spider-like walker"
+ - rscadd: "ported a new alternative sprite for medical borgs, an eyebot"
diff --git a/icons/mob/custom_w.dmi b/icons/mob/custom_w.dmi
index e5a83945b1..d1f69fe649 100644
Binary files a/icons/mob/custom_w.dmi and b/icons/mob/custom_w.dmi differ
diff --git a/icons/obj/custom.dmi b/icons/obj/custom.dmi
index ea8c278053..75cdf427cd 100644
Binary files a/icons/obj/custom.dmi and b/icons/obj/custom.dmi differ
diff --git a/modular_citadel/code/datums/status_effects/debuffs.dm b/modular_citadel/code/datums/status_effects/debuffs.dm
index 4c201861a2..a57902d0cf 100644
--- a/modular_citadel/code/datums/status_effects/debuffs.dm
+++ b/modular_citadel/code/datums/status_effects/debuffs.dm
@@ -3,7 +3,7 @@
new_owner.resting = TRUE
new_owner.adjustStaminaLoss(isnull(override_stam)? set_duration*0.25 : override_stam)
if(isnull(override_duration) && (set_duration > 80))
- set_duration = set_duration*0.15
+ set_duration = set_duration*0.01
return ..()
else if(!isnull(override_duration))
set_duration = override_duration
diff --git a/modular_citadel/code/game/objects/items/boombox.dm b/modular_citadel/code/game/objects/items/boombox.dm
new file mode 100644
index 0000000000..10d12f1973
--- /dev/null
+++ b/modular_citadel/code/game/objects/items/boombox.dm
@@ -0,0 +1,61 @@
+/obj/item/boombox
+ name = "boombox"
+ desc = "A dusty, gray, bulky, battery-powered, auto-looping stereo cassette player. An ancient relic from prehistoric times on that one planet with humans and stuff. Yeah, that one."
+ icon = 'modular_citadel/icons/obj/boombox.dmi'
+ icon_state = "raiqbawks_off"//PLACEHOLDER UNTIL SOMEONE SPRITES PLAIN NON-FANCY BOOMBOXES
+ w_class = WEIGHT_CLASS_NORMAL
+ force = 3
+ var/baseiconstate = "raiqbawks"
+ var/boomingandboxing = FALSE
+ var/list/availabletrackids
+
+/obj/item/boombox/attack_self(mob/user)
+ . = ..()
+ if(boomingandboxing)
+ SSjukeboxes.removejukebox(SSjukeboxes.findjukeboxindex(src))
+ boomingandboxing = FALSE
+ to_chat(user, "You flip a switch on [src], and the music immediately stops.")
+ update_icon()
+ return
+ if(!availabletrackids || !availabletrackids.len)
+ to_chat(user, "[src] flashes as you prod it senselessly. It doesn't have any songs stored on it.")
+ return
+ if(!boomingandboxing)
+ var/list/tracklist = list()
+ for(var/datum/track/S in SSjukeboxes.songs)
+ if(istype(S) && S.song_associated_id in availabletrackids)
+ tracklist[S.song_name] = S
+ var/selected = input(user, "Play song", "Track:") as null|anything in tracklist
+ if(QDELETED(src) || !selected || !istype(tracklist[selected], /datum/track))
+ return
+ var/jukeboxslottotake = SSjukeboxes.addjukebox(src, tracklist[selected])
+ if(jukeboxslottotake)
+ boomingandboxing = TRUE
+ update_icon()
+
+/obj/item/boombox/Destroy(mob/user)
+ SSjukeboxes.removejukebox(SSjukeboxes.findjukeboxindex(src))
+ . = ..()
+
+/obj/item/boombox/update_icon()
+ icon_state = "[baseiconstate]_[boomingandboxing ? "on" : "off"]"
+ return
+
+/obj/item/boombox/raiq
+ name = "Miami Boomer"
+ desc = "A shiny, fashionable boombox filled to the brim with neon lights, synthesizers, gang violence, and broken R keys. A worn-out sticker on the back states \"Includes three kickin' beats!\""
+ icon_state = "raiqbawks_off"
+ baseiconstate = "raiqbawks"
+ availabletrackids = list("hotline.ogg","chiptune.ogg","genesis.ogg")
+
+/obj/item/boombox/raiq/update_icon()
+ . = ..()
+ if(boomingandboxing)
+ START_PROCESSING(SSobj, src)
+ else
+ STOP_PROCESSING(SSobj, src)
+ set_light(0)
+
+/obj/item/boombox/raiq/process()
+ set_light(5,0.95,pick("#d87aff","#7a7aff","#89ecff","#b88eff","#ff59ad"))
+ return
diff --git a/modular_citadel/code/modules/client/loadout/__donator.dm b/modular_citadel/code/modules/client/loadout/__donator.dm
index b53cbe4712..9d28dd8749 100644
--- a/modular_citadel/code/modules/client/loadout/__donator.dm
+++ b/modular_citadel/code/modules/client/loadout/__donator.dm
@@ -313,3 +313,16 @@ datum/gear/darksabresheath
category = SLOT_IN_BACKPACK
path = /obj/item/clothing/shoes/lucky
ckeywhitelist = list("donaldtrumpthecommunist")
+
+/datum/gear/raiqbawks
+ name = "Miami Boombox"
+ category = SLOT_HANDS
+ cost = 2
+ path = /obj/item/boombox/raiq
+ ckeywhitelist = list("chefferz")
+
+/datum/gear/m41
+ name = "Toy M41"
+ category = SLOT_IN_BACKPACK
+ path = /obj/item/toy/gun/m41
+ ckeywhitelist = list("ThalVerscholen")
diff --git a/modular_citadel/code/modules/custom_loadout/custom_items.dm b/modular_citadel/code/modules/custom_loadout/custom_items.dm
index 113f0546d9..6bdf7f4dff 100644
--- a/modular_citadel/code/modules/custom_loadout/custom_items.dm
+++ b/modular_citadel/code/modules/custom_loadout/custom_items.dm
@@ -176,8 +176,8 @@
desc = "Sometimes things are too much to hide."
icon = 'icons/obj/custom.dmi'
icon_override = 'icons/mob/custom_w.dmi'
- icon_state = "sexymime"
- item_state = "sexymime"
+ icon_state = "hheart"
+ item_state = "hheart"
flags_inv = HIDEFACE|HIDEFACIALHAIR
/obj/item/clothing/suit/trenchcoat/green
diff --git a/modular_citadel/code/modules/mob/living/silicon/robot/robot_modules.dm b/modular_citadel/code/modules/mob/living/silicon/robot/robot_modules.dm
index 1db0c51349..e4b41398a3 100644
--- a/modular_citadel/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/modular_citadel/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -179,7 +179,7 @@
/obj/item/robot_module/medical/be_transformed_to(obj/item/robot_module/old_module)
var/mob/living/silicon/robot/R = loc
- var/borg_icon = input(R, "Select an icon!", "Robot Icon", null) as null|anything in list("Default", "Droid")
+ var/borg_icon = input(R, "Select an icon!", "Robot Icon", null) as null|anything in list("Default", "Droid", "Eyebot")
if(!borg_icon)
return FALSE
switch(borg_icon)
@@ -189,11 +189,15 @@
cyborg_base_icon = "medical"
cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi'
hat_offset = 4
+ if("Eyebot")
+ cyborg_base_icon = "eyebotmed"
+ cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi'
+ special_light_key = "eyebotmed"
return ..()
/obj/item/robot_module/security/be_transformed_to(obj/item/robot_module/old_module)
var/mob/living/silicon/robot/R = loc
- var/borg_icon = input(R, "Select an icon!", "Robot Icon", null) as null|anything in list("Default", "Default - Treads", "Droid")
+ var/borg_icon = input(R, "Select an icon!", "Robot Icon", null) as null|anything in list("Default", "Default - Treads", "Droid", "Spider")
if(!borg_icon)
return FALSE
switch(borg_icon)
@@ -207,11 +211,15 @@
cyborg_base_icon = "Security"
special_light_key = "service"
hat_offset = 0
+ if("Spider")
+ cyborg_base_icon = "spidersec"
+ special_light_key = "spidersec"
+ cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi'
return ..()
/obj/item/robot_module/engineering/be_transformed_to(obj/item/robot_module/old_module)
var/mob/living/silicon/robot/R = loc
- var/borg_icon = input(R, "Select an icon!", "Robot Icon", null) as null|anything in list("Default", "Default - Treads")
+ var/borg_icon = input(R, "Select an icon!", "Robot Icon", null) as null|anything in list("Default", "Default - Treads","Handy")
if(!borg_icon)
return FALSE
switch(borg_icon)
@@ -225,6 +233,10 @@
cyborg_base_icon = "loader"
cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi'
has_snowflake_deadsprite = TRUE
+ if("Handy")
+ cyborg_base_icon = "handyeng"
+ special_light_key = "handyeng"
+ cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi'
return ..()
/obj/item/robot_module/miner/be_transformed_to(obj/item/robot_module/old_module)
diff --git a/modular_citadel/code/modules/projectiles/guns/toys.dm b/modular_citadel/code/modules/projectiles/guns/toys.dm
index d6b80a95e5..a90ea999a4 100644
--- a/modular_citadel/code/modules/projectiles/guns/toys.dm
+++ b/modular_citadel/code/modules/projectiles/guns/toys.dm
@@ -57,4 +57,12 @@
desc = "An authentic cap-firing reproduction of a F3 Justicar big-bore revolver! Pretend to blow your friend's brains out with this 100% safe toy! Satisfaction guaranteed!"
icon_state = "justicar"
icon = 'modular_citadel/icons/obj/guns/toys.dmi'
- materials = list(MAT_METAL=2000, MAT_GLASS=250)
\ No newline at end of file
+ materials = list(MAT_METAL=2000, MAT_GLASS=250)
+
+
+/obj/item/toy/gun/m41
+ name = "Toy M41A Pulse Rifle"
+ desc = "A toy replica of the Corporate Mercenaries' standard issue rifle. For Avtomat is inscribed on the side."
+ icon_state = "toym41"
+ icon = 'modular_citadel/icons/obj/guns/toys.dmi'
+ materials = list(MAT_METAL=2000, MAT_GLASS=250)
diff --git a/modular_citadel/code/modules/reagents/reagent container/hypospraymkii.dm b/modular_citadel/code/modules/reagents/reagent container/hypospraymkii.dm
index f39896b953..0eb50836f6 100755
--- a/modular_citadel/code/modules/reagents/reagent container/hypospraymkii.dm
+++ b/modular_citadel/code/modules/reagents/reagent container/hypospraymkii.dm
@@ -1,15 +1,15 @@
#define HYPO_SPRAY 0
#define HYPO_INJECT 1
-#define WAIT_SPRAY 50
-#define WAIT_INJECT 50
-#define SELF_SPRAY 30
-#define SELF_INJECT 30
+#define WAIT_SPRAY 25
+#define WAIT_INJECT 25
+#define SELF_SPRAY 15
+#define SELF_INJECT 15
-#define DELUXE_WAIT_SPRAY 40
-#define DELUXE_WAIT_INJECT 40
-#define DELUXE_SELF_SPRAY 20
-#define DELUXE_SELF_INJECT 20
+#define DELUXE_WAIT_SPRAY 20
+#define DELUXE_WAIT_INJECT 20
+#define DELUXE_SELF_SPRAY 10
+#define DELUXE_SELF_INJECT 10
#define COMBAT_WAIT_SPRAY 0
#define COMBAT_WAIT_INJECT 0
@@ -284,4 +284,4 @@
to_chat(M, "[src] is now set to inject contents on application.")
if(HYPO_INJECT)
mode = HYPO_SPRAY
- to_chat(M, "[src] is now set to spray contents on application.")
\ No newline at end of file
+ to_chat(M, "[src] is now set to spray contents on application.")
diff --git a/modular_citadel/code/modules/reagents/reagent container/hypovial.dm b/modular_citadel/code/modules/reagents/reagent container/hypovial.dm
index c55050c4e0..a58a7fc825 100755
--- a/modular_citadel/code/modules/reagents/reagent container/hypovial.dm
+++ b/modular_citadel/code/modules/reagents/reagent container/hypovial.dm
@@ -67,11 +67,11 @@
/obj/item/reagent_containers/glass/bottle/vial/small
name = "hypovial"
- volume = 30
+ volume = 60
possible_transfer_amounts = list(5,10)
/obj/item/reagent_containers/glass/bottle/vial/small/bluespace
- volume = 60
+ volume = 120
possible_transfer_amounts = list(5,10)
name = "bluespace hypovial"
icon_state = "hypovialbs"
@@ -81,7 +81,7 @@
name = "large hypovial"
desc = "A large hypovial, for deluxe hypospray models."
icon_state = "hypoviallarge"
- volume = 60
+ volume = 120
possible_transfer_amounts = list(5,10,15,20)
unique_reskin = list("large hypovial" = "hypoviallarge",
"large red hypovial" = "hypoviallarge-b",
@@ -116,7 +116,7 @@
/obj/item/reagent_containers/glass/bottle/vial/large/bluespace
possible_transfer_amounts = list(5,10,15,20)
name = "bluespace large hypovial"
- volume = 120
+ volume = 240
icon_state = "hypoviallargebs"
unique_reskin = null
diff --git a/modular_citadel/icons/mob/robots.dmi b/modular_citadel/icons/mob/robots.dmi
index 9da2a97cc6..230a01f4d4 100644
Binary files a/modular_citadel/icons/mob/robots.dmi and b/modular_citadel/icons/mob/robots.dmi differ
diff --git a/modular_citadel/icons/obj/boombox.dmi b/modular_citadel/icons/obj/boombox.dmi
new file mode 100644
index 0000000000..c68b8ced40
Binary files /dev/null and b/modular_citadel/icons/obj/boombox.dmi differ
diff --git a/modular_citadel/icons/obj/guns/toys.dmi b/modular_citadel/icons/obj/guns/toys.dmi
index 3c8595f405..4c58734754 100644
Binary files a/modular_citadel/icons/obj/guns/toys.dmi and b/modular_citadel/icons/obj/guns/toys.dmi differ
diff --git a/tgstation.dme b/tgstation.dme
index 69c9fbb3de..1a393c172e 100755
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -2720,6 +2720,7 @@
#include "modular_citadel\code\game\objects\effects\temporary_visuals\projectiles\muzzle.dm"
#include "modular_citadel\code\game\objects\effects\temporary_visuals\projectiles\tracer.dm"
#include "modular_citadel\code\game\objects\items\balls.dm"
+#include "modular_citadel\code\game\objects\items\boombox.dm"
#include "modular_citadel\code\game\objects\items\handcuffs.dm"
#include "modular_citadel\code\game\objects\items\holy_weapons.dm"
#include "modular_citadel\code\game\objects\items\honk.dm"