diff --git a/.editorconfig b/.editorconfig
index df93ae3a16..13dcd5e029 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -6,3 +6,6 @@ indent_size = 4
[*.yml]
indent_style = space
indent_size = 2
+
+[*.txt]
+insert_final_newline = false
diff --git a/README.md b/README.md
index ed82fb08e6..2a1ffe65ec 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,5 @@
-
-##Citadel Station 13
-Based and maintained from /tg/station.
+## Citadel Station 13
+Based and maintained from /tg/station.
[](https://forthebadge.com) [](https://forthebadge.com) [](http://forthebadge.com)
@@ -10,18 +9,19 @@ Based and maintained from /tg/station.
[](http://isitmaintained.com/project/Citadel-Station-13/Citadel-Station-13 "Percentage of issues still open") [](http://isitmaintained.com/project/Citadel-Station-13/Citadel-Station-13 "Average time to resolve an issue")
-**Upstream Information**
-**Website:** http://www.tgstation13.org
-**Code:** https://github.com/tgstation/tgstation
-**Wiki** http://tgstation13.org/wiki/Main_Page
-**IRC:** irc://irc.rizon.net/coderbus or if you dont have an IRC client, you can click [here](https://kiwiirc.com/client/irc.rizon.net:6667/?&theme=cli#coderbus).
-
-**Citadel Station Information**
-**Forums:** http://citadel-station.net/forum/
-**Ban Appeals:** http://citadel-station.net/forum/forumdisplay.php?fid=8
-**Code:** https://github.com/Citadel-Station-13/Citadel-Station-13
-**Discord:** [Here](https://discord.gg/E6SQuhz).
-
+**Upstream Information**
+**Website:** https://tgstation13.org
+**Code:** https://github.com/tgstation/tgstation
+**Wiki** https://tgstation13.org/wiki/Main_Page
+**IRC:** irc://irc.rizon.net/coderbus or if you dont have an IRC client, you can click [here](https://kiwiirc.com/client/irc.rizon.net:6667/?&theme=cli#coderbus).
+
+**Citadel Station Information**
+**Website:** http://citadel-station.net
+**Forums:** http://citadel-station.net/forum
+**Ban Appeals:** http://citadel-station.net/forum/forumdisplay.php?fid=8
+**Code:** https://github.com/Citadel-Station-13/Citadel-Station-13
+**Discord:** [Here](https://discord.gg/E6SQuhz)
+
## DOWNLOADING
There are a number of ways to download the source code. Some are described here, an alternative all-inclusive guide is also located at http://www.tgstation13.org/wiki/Downloading_the_source_code
diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm
index 56126c6e37..d41fbc69e1 100644
--- a/_maps/map_files/BoxStation/BoxStation.dmm
+++ b/_maps/map_files/BoxStation/BoxStation.dmm
@@ -173,6 +173,19 @@
"aay" = (
/turf/open/floor/plating,
/area/security/prison)
+"aaz" = (
+/obj/structure/lattice/catwalk,
+/obj/item/stack/marker_beacon{
+ anchored = 1;
+ icon_state = "markerburgundy-on";
+ light_color = "#FA644B";
+ light_power = 3;
+ light_range = 3;
+ name = "Docking Beacon";
+ picked_color = "Burgundy"
+ },
+/turf/open/space/basic,
+/area/space/nearstation)
"aaA" = (
/obj/machinery/seed_extractor,
/turf/open/floor/plasteel,
@@ -234,10 +247,46 @@
/obj/structure/chair/stool,
/turf/open/floor/plasteel,
/area/security/prison)
+"aaK" = (
+/obj/structure/lattice/catwalk,
+/obj/item/stack/marker_beacon{
+ anchored = 1;
+ icon_state = "markerburgundy-on";
+ light_color = "#FA644B";
+ light_power = 3;
+ light_range = 3;
+ name = "Docking Beacon";
+ picked_color = "Burgundy"
+ },
+/turf/open/floor/plating,
+/area/space/nearstation)
+"aaL" = (
+/obj/machinery/photocopier,
+/turf/open/floor/wood,
+/area/library)
+"aaM" = (
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/effect/turf_decal/tile/brown,
+/obj/effect/turf_decal/tile/brown{
+ dir = 8
+ },
+/turf/open/floor/plasteel,
+/area/quartermaster/office)
"aaN" = (
/obj/structure/chair/sofa/right,
/turf/open/floor/plasteel,
/area/security/prison)
+"aaO" = (
+/obj/effect/spawner/lootdrop/keg,
+/turf/open/floor/plating,
+/area/maintenance/starboard/aft)
"aaP" = (
/obj/machinery/computer/cryopod{
dir = 8;
@@ -248,6 +297,12 @@
},
/turf/open/floor/plasteel,
/area/security/prison)
+"aaQ" = (
+/obj/structure/sign/poster/contraband/random{
+ pixel_y = 32
+ },
+/turf/open/floor/plating,
+/area/maintenance/starboard/aft)
"aaR" = (
/obj/structure/lattice,
/obj/structure/sign/warning/securearea{
@@ -285,6 +340,15 @@
},
/turf/open/floor/plasteel,
/area/security/prison)
+"aaY" = (
+/obj/structure/closet,
+/obj/effect/spawner/lootdrop/maintenance{
+ lootcount = 4;
+ name = "4maintenance loot spawner"
+ },
+/obj/item/poster/random_official,
+/turf/open/floor/plating,
+/area/maintenance/starboard/aft)
"aaZ" = (
/turf/closed/wall/r_wall,
/area/ai_monitored/security/armory)
@@ -505,6 +569,11 @@
"abF" = (
/turf/open/floor/plasteel/freezer,
/area/security/prison)
+"abG" = (
+/obj/structure/door_assembly/door_assembly_mai,
+/obj/item/electronics/airlock,
+/turf/open/floor/plating,
+/area/maintenance/starboard/aft)
"abH" = (
/obj/structure/table,
/obj/item/storage/box/chemimp{
@@ -1565,6 +1634,10 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/carpet,
/area/crew_quarters/heads/hos)
+"adO" = (
+/obj/effect/spawner/structure/window/shuttle,
+/turf/open/floor/plating/airless,
+/area/space/nearstation)
"adP" = (
/obj/structure/cable{
icon_state = "2-8"
@@ -1979,6 +2052,34 @@
},
/turf/open/floor/plating,
/area/maintenance/fore/secondary)
+"aeD" = (
+/obj/structure/grille/broken,
+/turf/open/floor/plating/airless,
+/area/space/nearstation)
+"aeE" = (
+/obj/structure/girder,
+/turf/open/floor/plating/airless,
+/area/space/nearstation)
+"aeF" = (
+/obj/machinery/airalarm{
+ dir = 4;
+ pixel_x = -23
+ },
+/obj/machinery/computer/station_alert{
+ dir = 4
+ },
+/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
+ },
+/turf/open/floor/plasteel/dark,
+/area/ai_monitored/turret_protected/aisat_interior)
"aeG" = (
/obj/structure/cable,
/obj/machinery/power/solar{
@@ -2357,6 +2458,12 @@
},
/turf/open/floor/plasteel,
/area/security/main)
+"afn" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+ dir = 4
+ },
+/turf/open/floor/plasteel/grimy,
+/area/ai_monitored/turret_protected/aisat_interior)
"afo" = (
/obj/machinery/door/airlock/external{
name = "Escape Pod Three"
@@ -2377,6 +2484,39 @@
},
/turf/open/space/basic,
/area/space)
+"afq" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/turf/open/floor/plasteel/grimy,
+/area/ai_monitored/turret_protected/aisat_interior)
+"afr" = (
+/obj/machinery/atmospherics/pipe/manifold4w/scrubbers,
+/turf/open/floor/plasteel/grimy,
+/area/ai_monitored/turret_protected/aisat_interior)
+"afs" = (
+/obj/machinery/computer/security/telescreen/entertainment{
+ pixel_x = -31
+ },
+/obj/machinery/computer/monitor{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/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
+ },
+/turf/open/floor/plasteel/dark,
+/area/ai_monitored/turret_protected/aisat_interior)
"aft" = (
/obj/machinery/atmospherics/pipe/simple/general/visible{
dir = 5
@@ -2687,6 +2827,15 @@
/obj/machinery/atmospherics/pipe/manifold4w/general/visible,
/turf/open/floor/plasteel,
/area/engine/atmos)
+"age" = (
+/obj/structure/chair/office/dark{
+ dir = 8
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel/grimy,
+/area/ai_monitored/turret_protected/aisat_interior)
"agf" = (
/obj/structure/table,
/obj/item/stack/sheet/metal,
@@ -2836,6 +2985,10 @@
/obj/machinery/suit_storage_unit/security,
/turf/open/floor/plasteel/showroomfloor,
/area/security/warden)
+"agv" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/plasteel/grimy,
+/area/ai_monitored/turret_protected/aisat_interior)
"agw" = (
/obj/structure/table,
/obj/machinery/syndicatebomb/training,
@@ -2965,6 +3118,14 @@
},
/turf/open/floor/plasteel,
/area/security/main)
+"agH" = (
+/obj/machinery/bluespace_beacon,
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/effect/landmark/start/cyborg,
+/turf/open/floor/plasteel/dark,
+/area/ai_monitored/turret_protected/aisat_interior)
"agI" = (
/obj/machinery/airalarm{
pixel_y = 23
@@ -3094,6 +3255,12 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/security/warden)
+"agX" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 4
+ },
+/turf/open/floor/plasteel/grimy,
+/area/ai_monitored/turret_protected/aisat_interior)
"agY" = (
/obj/structure/table,
/obj/item/storage/fancy/donut_box,
@@ -3334,6 +3501,16 @@
},
/turf/open/floor/plasteel/showroomfloor,
/area/security/warden)
+"ahw" = (
+/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden,
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel/grimy,
+/area/ai_monitored/turret_protected/aisat_interior)
"ahx" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -4474,6 +4651,16 @@
/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden,
/turf/open/floor/plasteel,
/area/security/brig)
+"ajC" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel/grimy,
+/area/ai_monitored/turret_protected/aisat_interior)
"ajD" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -4682,6 +4869,18 @@
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/turf/open/floor/plating,
/area/maintenance/solars/port/fore)
+"ajX" = (
+/obj/machinery/computer/teleporter{
+ dir = 8
+ },
+/turf/open/floor/plating,
+/area/ai_monitored/turret_protected/aisat_interior)
+"ajY" = (
+/obj/machinery/holopad,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/effect/landmark/start/cyborg,
+/turf/open/floor/plasteel/dark,
+/area/ai_monitored/turret_protected/aisat/atmos)
"ajZ" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/sign/warning/vacuum/external{
@@ -4965,6 +5164,18 @@
},
/turf/open/floor/plasteel,
/area/security/courtroom)
+"akz" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/holopad,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/obj/effect/landmark/start/cyborg,
+/turf/open/floor/plasteel/dark,
+/area/ai_monitored/turret_protected/aisat_interior)
"akA" = (
/obj/structure/chair{
dir = 8;
@@ -29979,17 +30190,6 @@
},
/turf/open/floor/plasteel,
/area/hallway/primary/central)
-"bwc" = (
-/obj/structure/disposalpipe/segment,
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/structure/cable{
- icon_state = "2-8"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel,
-/area/quartermaster/office)
"bwd" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -49288,47 +49488,9 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/aisat_interior)
-"ctu" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
- dir = 4
- },
-/obj/effect/landmark/start/cyborg,
-/turf/open/floor/plasteel/grimy,
-/area/ai_monitored/turret_protected/aisat_interior)
"ctv" = (
/turf/closed/wall/r_wall,
/area/space/nearstation)
-"ctw" = (
-/obj/machinery/airalarm{
- dir = 4;
- pixel_x = -23
- },
-/obj/machinery/computer/station_alert,
-/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
- },
-/turf/open/floor/plasteel/dark,
-/area/ai_monitored/turret_protected/aisat_interior)
-"ctx" = (
-/obj/machinery/atmospherics/pipe/manifold4w/scrubbers,
-/obj/effect/landmark/start/cyborg,
-/turf/open/floor/plasteel/grimy,
-/area/ai_monitored/turret_protected/aisat_interior)
-"cty" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
- },
-/obj/effect/landmark/start/cyborg,
-/turf/open/floor/plasteel/grimy,
-/area/ai_monitored/turret_protected/aisat_interior)
"ctz" = (
/obj/machinery/door/poddoor/shutters{
id = "teledoor";
@@ -49373,41 +49535,6 @@
},
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/aisat_interior)
-"ctG" = (
-/obj/structure/chair/office/dark{
- dir = 8
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/effect/landmark/start/cyborg,
-/turf/open/floor/plasteel/grimy,
-/area/ai_monitored/turret_protected/aisat_interior)
-"ctH" = (
-/obj/machinery/computer/security/telescreen/entertainment{
- pixel_x = -31
- },
-/obj/machinery/computer/monitor,
-/obj/structure/cable{
- icon_state = "0-4"
- },
-/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
- },
-/turf/open/floor/plasteel/dark,
-/area/ai_monitored/turret_protected/aisat_interior)
-"ctI" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/effect/landmark/start/cyborg,
-/turf/open/floor/plasteel/grimy,
-/area/ai_monitored/turret_protected/aisat_interior)
"ctJ" = (
/obj/machinery/holopad,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -49431,13 +49558,6 @@
},
/turf/open/floor/plating,
/area/ai_monitored/turret_protected/aisat_interior)
-"ctM" = (
-/obj/machinery/bluespace_beacon,
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/turf/open/floor/plasteel/dark,
-/area/ai_monitored/turret_protected/aisat_interior)
"ctN" = (
/obj/machinery/atmospherics/pipe/simple/yellow/visible{
dir = 10
@@ -49445,13 +49565,6 @@
/obj/structure/lattice,
/turf/open/space,
/area/space/nearstation)
-"ctP" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
- dir = 4
- },
-/obj/effect/landmark/start/cyborg,
-/turf/open/floor/plasteel/grimy,
-/area/ai_monitored/turret_protected/aisat_interior)
"ctQ" = (
/obj/structure/table,
/obj/machinery/microwave{
@@ -49477,28 +49590,6 @@
/obj/structure/sign/warning/radiation/rad_area,
/turf/closed/wall,
/area/engine/engineering)
-"ctS" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/effect/landmark/start/cyborg,
-/turf/open/floor/plasteel/grimy,
-/area/ai_monitored/turret_protected/aisat_interior)
-"ctT" = (
-/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden,
-/obj/structure/cable{
- icon_state = "2-4"
- },
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/effect/landmark/start/cyborg,
-/turf/open/floor/plasteel/grimy,
-/area/ai_monitored/turret_protected/aisat_interior)
"ctU" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -49521,10 +49612,6 @@
/obj/structure/chair,
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/aisat_interior)
-"ctW" = (
-/obj/machinery/computer/teleporter,
-/turf/open/floor/plating,
-/area/ai_monitored/turret_protected/aisat_interior)
"ctX" = (
/obj/machinery/camera{
c_tag = "MiniSat Teleporter";
@@ -49805,11 +49892,6 @@
},
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/aisat/atmos)
-"cuC" = (
-/obj/machinery/holopad,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel/dark,
-/area/ai_monitored/turret_protected/aisat/atmos)
"cuD" = (
/obj/machinery/light/small{
dir = 8
@@ -49858,17 +49940,6 @@
},
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/aisat_interior)
-"cuG" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/machinery/holopad,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
- },
-/turf/open/floor/plasteel/dark,
-/area/ai_monitored/turret_protected/aisat_interior)
"cuH" = (
/obj/machinery/light/small{
dir = 8
@@ -53259,13 +53330,6 @@
},
/turf/open/floor/mineral/titanium/blue,
/area/crew_quarters/dorms)
-"dkk" = (
-/obj/machinery/photocopier{
- pixel_x = -5;
- pixel_y = -5
- },
-/turf/open/floor/wood,
-/area/library)
"dok" = (
/obj/item/twohanded/required/kirbyplants{
icon_state = "plant-22"
@@ -53692,18 +53756,6 @@
dir = 1
},
/area/crew_quarters/fitness)
-"fsk" = (
-/obj/structure/lattice/catwalk,
-/obj/item/stack/marker_beacon{
- anchored = 1;
- icon_state = "markerburgundy-on";
- light_power = 3;
- light_range = 3;
- name = "Docking Beacon";
- picked_color = "Burgundy"
- },
-/turf/open/floor/plating,
-/area/space/nearstation)
"ftv" = (
/obj/structure/table,
/obj/effect/spawner/lootdrop/maintenance{
@@ -54203,18 +54255,6 @@
dir = 1
},
/area/crew_quarters/fitness)
-"hho" = (
-/obj/structure/lattice/catwalk,
-/obj/item/stack/marker_beacon{
- anchored = 1;
- icon_state = "markerburgundy-on";
- light_power = 3;
- light_range = 3;
- name = "Docking Beacon";
- picked_color = "Burgundy"
- },
-/turf/open/space/basic,
-/area/space/nearstation)
"hik" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable{
@@ -54439,9 +54479,6 @@
"iiW" = (
/turf/open/floor/wood,
/area/maintenance/bar)
-"ikx" = (
-/turf/open/floor/plating/foam,
-/area/space/nearstation)
"ilJ" = (
/obj/effect/turf_decal/tile/red,
/obj/machinery/light{
@@ -55678,10 +55715,6 @@
/obj/structure/extinguisher_cabinet,
/turf/closed/wall/r_wall,
/area/hallway/primary/central)
-"mwb" = (
-/obj/effect/spawner/structure/window/shuttle,
-/turf/open/floor/plating,
-/area/space/nearstation)
"mwO" = (
/obj/structure/cable{
icon_state = "1-4"
@@ -56489,7 +56522,8 @@
icon_state = "4-8"
},
/obj/machinery/door/airlock/command{
- name = "Command Access To Vault"
+ name = "Command Access To Vault";
+ req_access = "19"
},
/turf/open/floor/plasteel/dark,
/area/bridge/meeting_room)
@@ -56803,10 +56837,6 @@
/obj/item/target/syndicate,
/turf/open/floor/plating,
/area/security/prison)
-"rxH" = (
-/obj/structure/girder,
-/turf/open/floor/plating,
-/area/space/nearstation)
"rzg" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -57253,12 +57283,6 @@
},
/turf/open/floor/plating,
/area/maintenance/port/aft)
-"thr" = (
-/obj/structure/frame/computer{
- dir = 1
- },
-/turf/open/floor/plating,
-/area/space/nearstation)
"tkU" = (
/turf/open/floor/wood{
icon_state = "wood-broken5"
@@ -58002,10 +58026,10 @@
},
/obj/item/clothing/head/russobluecamohat,
/obj/item/clothing/head/russobluecamohat,
-/obj/item/clothing/head/russofurhat,
-/obj/item/clothing/head/russofurhat,
-/obj/item/clothing/head/russofurhat,
-/obj/item/clothing/head/russofurhat,
+/obj/item/clothing/head/helmet/rus_ushanka,
+/obj/item/clothing/head/helmet/rus_ushanka,
+/obj/item/clothing/head/helmet/rus_ushanka,
+/obj/item/clothing/head/helmet/rus_ushanka,
/obj/item/clothing/under/mw2_russian_para,
/obj/item/clothing/under/mw2_russian_para,
/obj/item/clothing/under/mw2_russian_para,
@@ -58554,10 +58578,6 @@
},
/turf/open/space/basic,
/area/space/nearstation)
-"xWM" = (
-/obj/structure/grille/broken,
-/turf/open/floor/plating,
-/area/space/nearstation)
"xXY" = (
/obj/structure/closet/lasertag/red,
/obj/item/clothing/under/pj/red,
@@ -64623,11 +64643,11 @@ aaa
aaa
aaa
aaa
-fsk
+aaK
aaa
aaa
aaa
-fsk
+aaK
aaa
aaa
aaa
@@ -64874,9 +64894,9 @@ aaa
aaa
aaa
aaa
-fsk
+aaK
aaa
-fsk
+aaK
aaa
aaa
aaa
@@ -64888,9 +64908,9 @@ gXs
aaa
aaa
aaa
-fsk
+aaK
aaa
-fsk
+aaK
aaa
aaa
aaa
@@ -81103,7 +81123,7 @@ bpB
bpB
brR
bsV
-bwc
+aaM
bxA
bvI
bwX
@@ -95688,9 +95708,9 @@ aaa
aaa
aaa
aaa
-hho
+aaz
aaa
-hho
+aaz
aaa
aaa
aaa
@@ -96072,7 +96092,7 @@ aaf
ctZ
cui
cuq
-cuC
+ajY
cuO
cuz
cvm
@@ -96580,8 +96600,8 @@ czk
cti
cua
cua
-ctw
-ctH
+aeF
+afs
ctQ
cuc
cuj
@@ -96837,9 +96857,9 @@ ctb
cth
cua
ctr
-ctu
-ctG
-ctP
+afn
+age
+agX
cub
cuj
cur
@@ -97094,13 +97114,13 @@ ctc
ctc
cto
ctt
-cty
+afq
ctJ
-ctT
+ahw
cue
cul
cuu
-cuG
+akz
cuS
cve
cvo
@@ -97351,9 +97371,9 @@ ctb
ctj
ctk
cts
-ctx
-ctI
-ctS
+afr
+agv
+ajC
cud
cuk
cus
@@ -98123,7 +98143,7 @@ aaa
aaf
cua
ctF
-ctM
+agH
ctX
cuf
cum
@@ -98381,7 +98401,7 @@ aaf
cua
ctE
ctL
-ctW
+ajX
cuf
cum
cuw
@@ -101379,7 +101399,7 @@ bbE
aIr
bav
aLf
-dkk
+aaL
kLR
aRO
aQp
@@ -101961,10 +101981,10 @@ aaa
aaa
aaa
aaa
-ikx
-mwb
-xWM
-rxH
+aaH
+adO
+aeD
+aeE
aaa
aaa
aaa
@@ -102219,10 +102239,10 @@ xNY
kvb
aaa
aaa
-ikx
-ikx
-ikx
-rxH
+aaH
+aaH
+aaH
+aeE
aaa
aaa
aaa
@@ -102473,13 +102493,13 @@ czZ
cOT
aaa
jmC
-dbM
-dbM
-ikx
-ikx
-ikx
-thr
-mwb
+aaH
+aaH
+aaH
+aaH
+aaH
+aaH
+adO
aaa
aaa
aaa
@@ -102732,8 +102752,8 @@ gXs
xNY
kvb
gJg
-dbM
-dbM
+aaH
+aaH
aaa
aaa
gJg
@@ -102990,8 +103010,8 @@ aaa
aaa
gJg
gJg
-mwb
-ikx
+adO
+aaH
gXs
aaa
aaa
@@ -106072,7 +106092,7 @@ cNW
clt
cQw
cNW
-cNW
+abG
cNW
cNW
aaf
@@ -106328,7 +106348,7 @@ aaa
cOT
clt
cQw
-cOe
+aaO
cOe
cOe
cNW
@@ -106585,11 +106605,11 @@ aaa
cOT
clt
cQw
+aaQ
cOe
cOe
-cOe
-cOe
-sQX
+cNW
+aaa
jzi
jzi
jzi
@@ -106842,11 +106862,11 @@ aaa
cNW
clt
cQw
-cOe
+bNB
cOe
cOe
cNW
-aaf
+lCL
aaS
aaa
aaf
@@ -107099,7 +107119,7 @@ cNW
cNW
clt
cQw
-cOe
+aaY
cOe
cOe
cNW
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index 7fbd2921e8..cd50d90edb 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -44934,7 +44934,7 @@
/area/maintenance/port)
"bKY" = (
/obj/machinery/power/apc{
- areastring = "/area/vacant_room/office";
+ areastring = "/area/security/vacantoffice";
dir = 8;
name = "Vacant Office APC";
pixel_x = -25
diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm
index a0467cde6c..905b2cdb1b 100644
--- a/_maps/map_files/generic/CentCom.dmm
+++ b/_maps/map_files/generic/CentCom.dmm
@@ -506,6 +506,7 @@
"bx" = (
/obj/structure/table,
/obj/machinery/readybutton,
+/obj/item/storage/lockbox/dueling/hugbox/stamina,
/turf/open/floor/holofloor/basalt,
/area/holodeck/rec_center/thunderdome)
"by" = (
@@ -522,6 +523,7 @@
/area/holodeck/rec_center/thunderdome)
"bA" = (
/obj/machinery/readybutton,
+/obj/item/storage/lockbox/dueling/hugbox/stamina,
/obj/effect/turf_decal/tile/red{
dir = 1
},
diff --git a/code/__DEFINES/DNA.dm b/code/__DEFINES/DNA.dm
index 4052dce40d..6913473e88 100644
--- a/code/__DEFINES/DNA.dm
+++ b/code/__DEFINES/DNA.dm
@@ -136,8 +136,12 @@
#define ORGAN_SLOT_TESTICLES "testicles"
#define ORGAN_SLOT_BREASTS "breasts"
-
////organ defines
#define STANDARD_ORGAN_THRESHOLD 100
#define STANDARD_ORGAN_HEALING 0.001
-#define STANDARD_ORGAN_DECAY 0.00222 //designed to fail organs when left to decay for ~15 minutes
\ No newline at end of file
+#define STANDARD_ORGAN_DECAY 0.00222 //designed to fail organs when left to decay for ~15 minutes
+
+#define G_MALE 1
+#define G_FEMALE 2
+#define G_PLURAL 3
+#define G_NEUTER 4
diff --git a/code/__DEFINES/admin.dm b/code/__DEFINES/admin.dm
index 3acd1443af..c6be8318fd 100644
--- a/code/__DEFINES/admin.dm
+++ b/code/__DEFINES/admin.dm
@@ -87,5 +87,5 @@
#define MAX_KEYPRESS_COMMANDLENGTH 16
///Max amount of keypress messages per second over two seconds before client is autokicked
#define MAX_KEYPRESS_AUTOKICK 100
-///Length of held key rolling buffer
-#define HELD_KEY_BUFFER_LENGTH 15
+///Length of max held keys
+#define MAX_HELD_KEYS 15
diff --git a/code/__DEFINES/combat.dm b/code/__DEFINES/combat.dm
index cc1b474c49..4304af77f3 100644
--- a/code/__DEFINES/combat.dm
+++ b/code/__DEFINES/combat.dm
@@ -184,7 +184,7 @@ GLOBAL_LIST_INIT(shove_disarming_types, typecacheof(list(
#define BODY_ZONE_PRECISE_R_FOOT "r_foot"
//We will round to this value in damage calculations.
-#define DAMAGE_PRECISION 0.1
+#define DAMAGE_PRECISION 0.01
//items total mass, used to calculate their attacks' stamina costs. If not defined, the cost will be (w_class * 1.25)
#define TOTAL_MASS_TINY_ITEM 1.25
@@ -202,4 +202,4 @@ GLOBAL_LIST_INIT(shove_disarming_types, typecacheof(list(
#define BULLET_ACT_HIT "HIT" //It's a successful hit, whatever that means in the context of the thing it's hitting.
#define BULLET_ACT_BLOCK "BLOCK" //It's a blocked hit, whatever that means in the context of the thing it's hitting.
#define BULLET_ACT_FORCE_PIERCE "PIERCE" //It pierces through the object regardless of the bullet being piercing by default.
-#define BULLET_ACT_TURF "TURF" //It hit us but it should hit something on the same turf too. Usually used for turfs.
\ No newline at end of file
+#define BULLET_ACT_TURF "TURF" //It hit us but it should hit something on the same turf too. Usually used for turfs.
diff --git a/code/__DEFINES/configuration.dm b/code/__DEFINES/configuration.dm
index 3034876e36..6b70eb1e0f 100644
--- a/code/__DEFINES/configuration.dm
+++ b/code/__DEFINES/configuration.dm
@@ -1,6 +1,7 @@
//config files
#define CONFIG_GET(X) global.config.Get(/datum/config_entry/##X)
#define CONFIG_SET(X, Y) global.config.Set(/datum/config_entry/##X, ##Y)
+#define CONFIG_GET_ENTRY(X) global.config.GetEntryDatum(/datum/config_entry/##X)
#define CONFIG_MAPS_FILE "maps.txt"
diff --git a/code/__DEFINES/reagents.dm b/code/__DEFINES/reagents.dm
index 36ea64de2c..54f4648006 100644
--- a/code/__DEFINES/reagents.dm
+++ b/code/__DEFINES/reagents.dm
@@ -8,7 +8,7 @@
#define REAGENT_PURITY_ACCURACY 0.001
#define DEFAULT_SPECIFIC_HEAT 200
-// container_type defines
+//reagents_holder_flags defines
#define INJECTABLE (1<<0) // Makes it possible to add reagents through droppers and syringes.
#define DRAWABLE (1<<1) // Makes it possible to remove reagents through syringes.
@@ -29,6 +29,11 @@
#define PATCH 4 // patches
#define INJECT 5 // injection
+//container_flags
+#define PH_WEAK (1 << 0)
+#define TEMP_WEAK (1 << 1)
+#define APTFT_VERB (1 << 2) //APTFT stands for "amount per transfer from this"
+#define APTFT_ALTCLICK (1 << 3)
//defines passed through to the on_reagent_change proc
#define DEL_REAGENT 1 // reagent deleted (fully cleared)
diff --git a/code/__DEFINES/role_preferences.dm b/code/__DEFINES/role_preferences.dm
index d5e3f828b8..28a04c2a51 100644
--- a/code/__DEFINES/role_preferences.dm
+++ b/code/__DEFINES/role_preferences.dm
@@ -37,7 +37,7 @@
#define ROLE_GANG "gangster"
#define ROLE_BLOODSUCKER "bloodsucker"
//#define ROLE_MONSTERHUNTER "monster hunter" Disabled for now
-
+#define ROLE_GHOSTCAFE "ghostcafe"
//Missing assignment means it's not a gamemode specific role, IT'S NOT A BUG OR ERROR.
//The gamemode specific ones are just so the gamemodes can query whether a player is old enough
//(in game days played) to play that role
diff --git a/code/__HELPERS/_logging.dm b/code/__HELPERS/_logging.dm
index 41dfce6261..db8f4a1d0d 100644
--- a/code/__HELPERS/_logging.dm
+++ b/code/__HELPERS/_logging.dm
@@ -165,6 +165,12 @@
/proc/log_mapping(text)
WRITE_LOG(GLOB.world_map_error_log, text)
+/proc/log_reagent(text)
+ WRITE_LOG(GLOB.reagent_log, text)
+
+/proc/log_reagent_transfer(text)
+ log_reagent("TRANSFER: [text]")
+
/* For logging round startup. */
/proc/start_log(log)
WRITE_LOG(log, "Starting up round ID [GLOB.round_id].\n-------------------------")
diff --git a/code/__HELPERS/areas.dm b/code/__HELPERS/areas.dm
index 4b52187e13..d7378abfa6 100644
--- a/code/__HELPERS/areas.dm
+++ b/code/__HELPERS/areas.dm
@@ -1,5 +1,81 @@
#define BP_MAX_ROOM_SIZE 300
+//Repopulates sortedAreas list
+/proc/repopulate_sorted_areas()
+ GLOB.sortedAreas = list()
+
+ for(var/area/A in world)
+ GLOB.sortedAreas.Add(A)
+
+ sortTim(GLOB.sortedAreas, /proc/cmp_name_asc)
+
+/area/proc/addSorted()
+ GLOB.sortedAreas.Add(src)
+ sortTim(GLOB.sortedAreas, /proc/cmp_name_asc)
+
+//Takes: Area type as a text string from a variable.
+//Returns: Instance for the area in the world.
+/proc/get_area_instance_from_text(areatext)
+ if(istext(areatext))
+ areatext = text2path(areatext)
+ return GLOB.areas_by_type[areatext]
+
+//Takes: Area type as text string or as typepath OR an instance of the area.
+//Returns: A list of all areas of that type in the world.
+/proc/get_areas(areatype, subtypes=TRUE)
+ if(istext(areatype))
+ areatype = text2path(areatype)
+ else if(isarea(areatype))
+ var/area/areatemp = areatype
+ areatype = areatemp.type
+ else if(!ispath(areatype))
+ return null
+
+ var/list/areas = list()
+ if(subtypes)
+ var/list/cache = typecacheof(areatype)
+ for(var/V in GLOB.sortedAreas)
+ var/area/A = V
+ if(cache[A.type])
+ areas += V
+ else
+ for(var/V in GLOB.sortedAreas)
+ var/area/A = V
+ if(A.type == areatype)
+ areas += V
+ return areas
+
+//Takes: Area type as text string or as typepath OR an instance of the area.
+//Returns: A list of all turfs in areas of that type of that type in the world.
+/proc/get_area_turfs(areatype, target_z = 0, subtypes=FALSE)
+ if(istext(areatype))
+ areatype = text2path(areatype)
+ else if(isarea(areatype))
+ var/area/areatemp = areatype
+ areatype = areatemp.type
+ else if(!ispath(areatype))
+ return null
+
+ var/list/turfs = list()
+ if(subtypes)
+ var/list/cache = typecacheof(areatype)
+ for(var/V in GLOB.sortedAreas)
+ var/area/A = V
+ if(!cache[A.type])
+ continue
+ for(var/turf/T in A)
+ if(target_z == 0 || target_z == T.z)
+ turfs += T
+ else
+ for(var/V in GLOB.sortedAreas)
+ var/area/A = V
+ if(A.type != areatype)
+ continue
+ for(var/turf/T in A)
+ if(target_z == 0 || target_z == T.z)
+ turfs += T
+ return turfs
+
// Gets an atmos isolated contained space
// Returns an associative list of turf|dirs pairs
// The dirs are connected turfs in the same space
@@ -103,4 +179,62 @@
to_chat(creator, "You have created a new area, named [newA.name]. It is now weather proof, and constructing an APC will allow it to be powered.")
return TRUE
+
+/**
+ * Returns the base area the target is located in if there is one.
+ * Alternatively, returns the area as is.
+ */
+/proc/get_base_area(atom/target)
+ var/area/A = get_area(target)
+ if(A?.base_area)
+ return A.base_area
+ return A
+
+/**
+ * Returns either null, or a list containing every sub area associated with our base area.
+ * If include_base is TRUE, the base area will also be added to the return list.
+ */
+/proc/get_sub_areas(atom/target, include_base = TRUE)
+ var/area/A = get_area(target)
+ if(!A)
+ return
+ . = list()
+ if(A.base_area)
+ A = A.base_area
+ if(include_base)
+ . += A
+ if(A.sub_areas)
+ . += A.sub_areas
+
+/**
+ * Proc used for purposes similar to get_areas_turfs(), but aimed to include associated areas.
+ * Only accepts area instances and paths for the first arg, no text strings.
+ * Returns a list of all turfs found in the sub areas (including the base's if include_base is TRUE)
+ * and located in a z level matching target_z, or anywhere if target_z is 0
+ */
+
+/proc/get_sub_areas_turfs(area/A, target_z = 0, include_base = TRUE)
+ var/list/contents = get_sub_areas_contents(A, include_base)
+ . = list()
+ for(var/turf/T in contents)
+ if(target_z == 0 || target_z == T.z)
+ . += T
+/**
+ * Simple proc that returns a sum of all contents from every sub area,
+ * Think of the above but for all contents, not just turfs, and without target z.
+ */
+
+/proc/get_sub_areas_contents(area/A, include_base = TRUE)
+ if(ispath(A))
+ A = GLOB.areas_by_type[A]
+ else
+ A = get_area(A) //in case it's called on other atoms.
+ if(!A)
+ return
+ if(A.base_area)
+ A = A.base_area
+ . = list(A.contents)
+ for(var/i in A.sub_areas)
+ . += A.sub_areas[i].contents
+
#undef BP_MAX_ROOM_SIZE
diff --git a/code/__HELPERS/game.dm b/code/__HELPERS/game.dm
index ca4b913369..605f7f8ae7 100644
--- a/code/__HELPERS/game.dm
+++ b/code/__HELPERS/game.dm
@@ -8,8 +8,8 @@
#define Z_TURFS(ZLEVEL) block(locate(1,1,ZLEVEL), locate(world.maxx, world.maxy, ZLEVEL))
#define CULT_POLL_WAIT 2400
-/proc/get_area_name(atom/X, format_text = FALSE)
- var/area/A = isarea(X) ? X : get_area(X)
+/proc/get_area_name(atom/X, format_text = FALSE, get_base_area = FALSE)
+ var/area/A = get_base_area ? get_base_area(X) : get_area(X)
if(!A)
return null
return format_text ? format_text(A.name) : A.name
@@ -145,20 +145,6 @@
turfs += T
return turfs
-
-//This is the new version of recursive_mob_check, used for say().
-//The other proc was left intact because morgue trays use it.
-//Sped this up again for real this time
-/proc/recursive_hear_check(O)
- var/list/processing_list = list(O)
- . = list()
- while(processing_list.len)
- var/atom/A = processing_list[1]
- if(A.flags_1 & HEAR_1)
- . += A
- processing_list.Cut(1, 2)
- processing_list += A.contents
-
/** recursive_organ_check
* inputs: O (object to start with)
* outputs:
@@ -238,35 +224,30 @@
return found_mobs
-
/proc/get_hearers_in_view(R, atom/source)
- // Returns a list of hearers in view(R) from source (ignoring luminosity). Used in saycode.
var/turf/T = get_turf(source)
. = list()
-
if(!T)
return
-
- var/list/processing_list = list()
- if (R == 0) // if the range is zero, we know exactly where to look for, we can skip view
- processing_list += T.contents // We can shave off one iteration by assuming turfs cannot hear
- else // A variation of get_hear inlined here to take advantage of the compiler's fastpath for obj/mob in view
+ var/list/processing = list()
+ if(R == 0)
+ processing += T.contents
+ else
var/lum = T.luminosity
- T.luminosity = 6 // This is the maximum luminosity
- var/list/cachedview = view(R, T)
- for(var/mob/M in cachedview)
- processing_list += M
- for(var/obj/O in cachedview)
- processing_list += O
+ T.luminosity = 6
+ var/list/cached_view = view(R, T)
+ for(var/mob/M in cached_view)
+ processing += M
+ for(var/obj/O in cached_view)
+ processing += O
T.luminosity = lum
-
- while(processing_list.len) // recursive_hear_check inlined here
- var/atom/A = processing_list[1]
+ var/i = 0
+ while(i < length(processing))
+ var/atom/A = processing[++i]
if(A.flags_1 & HEAR_1)
. += A
- SEND_SIGNAL(A, COMSIG_ATOM_HEARER_IN_VIEW, processing_list, .)
- processing_list.Cut(1, 2)
- processing_list += A.contents
+ SEND_SIGNAL(A, COMSIG_ATOM_HEARER_IN_VIEW, processing, .)
+ processing += A.contents
/proc/get_mobs_in_radio_ranges(list/obj/item/radio/radios)
. = list()
diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm
index 012a7fa02f..b803a328a5 100644
--- a/code/__HELPERS/unsorted.dm
+++ b/code/__HELPERS/unsorted.dm
@@ -457,36 +457,35 @@ Turf and target are separate in case you want to teleport some distance from a t
/atom/proc/GetAllContents(var/T)
var/list/processing_list = list(src)
- var/list/assembled = list()
if(T)
- while(processing_list.len)
- var/atom/A = processing_list[1]
- processing_list.Cut(1, 2)
+ . = list()
+ var/i = 0
+ while(i < length(processing_list))
+ var/atom/A = processing_list[++i]
//Byond does not allow things to be in multiple contents, or double parent-child hierarchies, so only += is needed
//This is also why we don't need to check against assembled as we go along
processing_list += A.contents
if(istype(A,T))
- assembled += A
+ . += A
else
- while(processing_list.len)
- var/atom/A = processing_list[1]
- processing_list.Cut(1, 2)
+ var/i = 0
+ while(i < length(processing_list))
+ var/atom/A = processing_list[++i]
processing_list += A.contents
- assembled += A
- return assembled
+ return processing_list
/atom/proc/GetAllContentsIgnoring(list/ignore_typecache)
if(!length(ignore_typecache))
return GetAllContents()
var/list/processing = list(src)
- var/list/assembled = list()
- while(processing.len)
- var/atom/A = processing[1]
- processing.Cut(1,2)
+ . = list()
+ var/i = 0
+ while(i < length(processing))
+ var/atom/A = processing[++i]
if(!ignore_typecache[A.type])
processing += A.contents
- assembled += A
- return assembled
+ . += A
+
//Step-towards method of determining whether one atom can see another. Similar to viewers()
/proc/can_see(atom/source, atom/target, length=5) // I couldnt be arsed to do actual raycasting :I This is horribly inaccurate.
@@ -566,82 +565,6 @@ Turf and target are separate in case you want to teleport some distance from a t
else
return 0
-//Repopulates sortedAreas list
-/proc/repopulate_sorted_areas()
- GLOB.sortedAreas = list()
-
- for(var/area/A in world)
- GLOB.sortedAreas.Add(A)
-
- sortTim(GLOB.sortedAreas, /proc/cmp_name_asc)
-
-/area/proc/addSorted()
- GLOB.sortedAreas.Add(src)
- sortTim(GLOB.sortedAreas, /proc/cmp_name_asc)
-
-//Takes: Area type as a text string from a variable.
-//Returns: Instance for the area in the world.
-/proc/get_area_instance_from_text(areatext)
- if(istext(areatext))
- areatext = text2path(areatext)
- return GLOB.areas_by_type[areatext]
-
-//Takes: Area type as text string or as typepath OR an instance of the area.
-//Returns: A list of all areas of that type in the world.
-/proc/get_areas(areatype, subtypes=TRUE)
- if(istext(areatype))
- areatype = text2path(areatype)
- else if(isarea(areatype))
- var/area/areatemp = areatype
- areatype = areatemp.type
- else if(!ispath(areatype))
- return null
-
- var/list/areas = list()
- if(subtypes)
- var/list/cache = typecacheof(areatype)
- for(var/V in GLOB.sortedAreas)
- var/area/A = V
- if(cache[A.type])
- areas += V
- else
- for(var/V in GLOB.sortedAreas)
- var/area/A = V
- if(A.type == areatype)
- areas += V
- return areas
-
-//Takes: Area type as text string or as typepath OR an instance of the area.
-//Returns: A list of all turfs in areas of that type of that type in the world.
-/proc/get_area_turfs(areatype, target_z = 0, subtypes=FALSE)
- if(istext(areatype))
- areatype = text2path(areatype)
- else if(isarea(areatype))
- var/area/areatemp = areatype
- areatype = areatemp.type
- else if(!ispath(areatype))
- return null
-
- var/list/turfs = list()
- if(subtypes)
- var/list/cache = typecacheof(areatype)
- for(var/V in GLOB.sortedAreas)
- var/area/A = V
- if(!cache[A.type])
- continue
- for(var/turf/T in A)
- if(target_z == 0 || target_z == T.z)
- turfs += T
- else
- for(var/V in GLOB.sortedAreas)
- var/area/A = V
- if(A.type != areatype)
- continue
- for(var/turf/T in A)
- if(target_z == 0 || target_z == T.z)
- turfs += T
- return turfs
-
/proc/get_cardinal_dir(atom/A, atom/B)
var/dx = abs(B.x - A.x)
var/dy = abs(B.y - A.y)
diff --git a/code/_globalvars/logging.dm b/code/_globalvars/logging.dm
index f9b9927e72..ba75fbfc9c 100644
--- a/code/_globalvars/logging.dm
+++ b/code/_globalvars/logging.dm
@@ -32,6 +32,8 @@ GLOBAL_VAR(world_map_error_log)
GLOBAL_PROTECT(world_map_error_log)
GLOBAL_VAR(subsystem_log)
GLOBAL_PROTECT(subsystem_log)
+GLOBAL_VAR(reagent_log)
+GLOBAL_PROTECT(reagent_log)
GLOBAL_VAR(world_crafting_log)
GLOBAL_PROTECT(world_crafting_log)
diff --git a/code/_onclick/hud/parallax.dm b/code/_onclick/hud/parallax.dm
index 8592383a4f..25a49c8d6b 100755
--- a/code/_onclick/hud/parallax.dm
+++ b/code/_onclick/hud/parallax.dm
@@ -146,6 +146,8 @@
/datum/hud/proc/update_parallax_motionblur(client/C, animatedir, new_parallax_movedir, matrix/newtransform)
+ if(!C)
+ return
C.parallax_animate_timer = FALSE
for(var/thing in C.parallax_layers)
var/obj/screen/parallax_layer/L = thing
@@ -167,7 +169,7 @@
/datum/hud/proc/update_parallax()
var/client/C = mymob.client
var/turf/posobj = get_turf(C.eye)
- if(!posobj)
+ if(!posobj)
return
var/area/areaobj = posobj.loc
diff --git a/code/controllers/configuration/configuration.dm b/code/controllers/configuration/configuration.dm
index 4ce0ccf361..ad1f869057 100644
--- a/code/controllers/configuration/configuration.dm
+++ b/code/controllers/configuration/configuration.dm
@@ -193,6 +193,13 @@
stat("[name]:", statclick)
/datum/controller/configuration/proc/Get(entry_type)
+ var/datum/config_entry/E = GetEntryDatum(entry_type)
+ if((E.protection & CONFIG_ENTRY_HIDDEN) && IsAdminAdvancedProcCall() && GLOB.LastAdminCalledProc == "Get" && GLOB.LastAdminCalledTargetRef == "[REF(src)]")
+ log_admin_private("Config access of [entry_type] attempted by [key_name(usr)]")
+ return
+ return E.config_entry_value
+
+/datum/controller/configuration/proc/GetEntryDatum(entry_type)
var/datum/config_entry/E = entry_type
var/entry_is_abstract = initial(E.abstract_type) == entry_type
if(entry_is_abstract)
@@ -200,10 +207,7 @@
E = entries_by_type[entry_type]
if(!E)
CRASH("Missing config entry for [entry_type]!")
- if((E.protection & CONFIG_ENTRY_HIDDEN) && IsAdminAdvancedProcCall() && GLOB.LastAdminCalledProc == "Get" && GLOB.LastAdminCalledTargetRef == "[REF(src)]")
- log_admin_private("Config access of [entry_type] attempted by [key_name(usr)]")
- return
- return E.config_entry_value
+ return E
/datum/controller/configuration/proc/Set(entry_type, new_val)
var/datum/config_entry/E = entry_type
diff --git a/code/controllers/configuration/entries/game_options.dm b/code/controllers/configuration/entries/game_options.dm
index 6efc9eab12..a3bc47ac91 100644
--- a/code/controllers/configuration/entries/game_options.dm
+++ b/code/controllers/configuration/entries/game_options.dm
@@ -249,6 +249,18 @@
/datum/config_entry/number/movedelay/walk_delay
+/datum/config_entry/number/movedelay/sprint_speed_increase
+ config_entry_value = 1
+
+/datum/config_entry/number/movedelay/sprint_buffer_max
+ config_entry_value = 42
+
+/datum/config_entry/number/movedelay/sprint_stamina_cost
+ config_entry_value = 0.7
+
+/datum/config_entry/number/movedelay/sprint_buffer_regen_per_ds
+ config_entry_value = 0.3
+
/////////////////////////////////////////////////Outdated move delay
/datum/config_entry/number/outdated_movedelay
deprecated_by = /datum/config_entry/keyed_list/multiplicative_movespeed
diff --git a/code/controllers/subsystem/air.dm b/code/controllers/subsystem/air.dm
index 2a59558bcd..52d2fe45cd 100644
--- a/code/controllers/subsystem/air.dm
+++ b/code/controllers/subsystem/air.dm
@@ -239,7 +239,6 @@ SUBSYSTEM_DEF(air)
if (MC_TICK_CHECK)
return
-
/datum/controller/subsystem/air/proc/remove_from_active(turf/open/T)
active_turfs -= T
SSair_turfs.currentrun -= T
@@ -257,7 +256,7 @@ SUBSYSTEM_DEF(air)
#ifdef VISUALIZE_ACTIVE_TURFS
T.add_atom_colour("#00ff00", TEMPORARY_COLOUR_PRIORITY)
#endif
- T.excited = 1
+ T.excited = TRUE
active_turfs |= T
SSair_turfs.currentrun |= T
if(blockchanges && T.excited_group)
diff --git a/code/controllers/subsystem/air_turfs.dm b/code/controllers/subsystem/air_turfs.dm
index 2902940bf9..9dd41aede5 100644
--- a/code/controllers/subsystem/air_turfs.dm
+++ b/code/controllers/subsystem/air_turfs.dm
@@ -11,7 +11,6 @@ SUBSYSTEM_DEF(air_turfs)
/datum/controller/subsystem/air_turfs/fire(resumed = 0)
var/fire_count = times_fired
- //cache for sanic speed
if (!resumed)
src.currentrun = SSair.active_turfs.Copy()
//cache for sanic speed (lists are references anyways)
diff --git a/code/controllers/subsystem/fail2topic.dm b/code/controllers/subsystem/fail2topic.dm
index a589ae2462..b358cc2c5f 100644
--- a/code/controllers/subsystem/fail2topic.dm
+++ b/code/controllers/subsystem/fail2topic.dm
@@ -31,10 +31,9 @@ SUBSYSTEM_DEF(fail2topic)
return ..()
/datum/controller/subsystem/fail2topic/fire()
- while (rate_limiting.len)
- var/ip = rate_limiting[1]
+ for(var/i in 1 to length(rate_limiting))
+ var/ip = rate_limiting[i]
var/last_attempt = rate_limiting[ip]
-
if (world.time - last_attempt > rate_limit)
rate_limiting -= ip
fail_counts -= ip
diff --git a/code/controllers/subsystem/input.dm b/code/controllers/subsystem/input.dm
index cc09ca816e..0970b23a16 100644
--- a/code/controllers/subsystem/input.dm
+++ b/code/controllers/subsystem/input.dm
@@ -114,6 +114,6 @@ SUBSYSTEM_DEF(input)
/datum/controller/subsystem/input/fire()
var/list/clients = GLOB.clients // Let's sing the list cache song
- for(var/i in 1 to clients.len)
+ for(var/i in 1 to length(clients))
var/client/C = clients[i]
C.keyLoop()
diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm
index 8c8ad2d337..4850a67646 100644
--- a/code/controllers/subsystem/mapping.dm
+++ b/code/controllers/subsystem/mapping.dm
@@ -37,6 +37,8 @@ SUBSYSTEM_DEF(mapping)
var/datum/space_level/empty_space
var/num_of_res_levels = 1
+ var/stat_map_name = "Loading..."
+
//dlete dis once #39770 is resolved
/datum/controller/subsystem/mapping/proc/HACK_LoadMapConfig()
if(!config)
@@ -45,6 +47,7 @@ SUBSYSTEM_DEF(mapping)
#else
config = load_map_config(error_if_missing = FALSE)
#endif
+ stat_map_name = config.map_name
/datum/controller/subsystem/mapping/Initialize(timeofday)
HACK_LoadMapConfig()
@@ -330,7 +333,10 @@ GLOBAL_LIST_EMPTY(the_station_areas)
return
next_map_config = VM
- return TRUE
+
+ . = TRUE
+
+ stat_map_name = "[config.map_name] (Next: [next_map_config.map_name])"
/datum/controller/subsystem/mapping/proc/preloadTemplates(path = "_maps/templates/") //see master controller setup
var/list/filelist = flist(path)
diff --git a/code/controllers/subsystem/shuttle.dm b/code/controllers/subsystem/shuttle.dm
index b406a8ccad..4d9eefae5b 100644
--- a/code/controllers/subsystem/shuttle.dm
+++ b/code/controllers/subsystem/shuttle.dm
@@ -30,6 +30,7 @@ SUBSYSTEM_DEF(shuttle)
var/list/hostileEnvironments = list() //Things blocking escape shuttle from leaving
var/list/tradeBlockade = list() //Things blocking cargo from leaving.
var/supplyBlocked = FALSE
+ var/emergency_shuttle_stat_text
//supply shuttle stuff
var/obj/docking_port/mobile/supply/supply
@@ -118,6 +119,9 @@ SUBSYSTEM_DEF(shuttle)
points += point_gain
//Cargo stuff end
+ var/esETA = emergency?.getModeStr()
+ emergency_shuttle_stat_text = "[esETA? "[esETA] [emergency.getTimerStr()]" : ""]"
+
if(!SSmapping.clearing_reserved_turfs)
while(transit_requesters.len)
var/requester = popleft(transit_requesters)
diff --git a/code/controllers/subsystem/time_track.dm b/code/controllers/subsystem/time_track.dm
index 3b19ae31cd..779b186d08 100644
--- a/code/controllers/subsystem/time_track.dm
+++ b/code/controllers/subsystem/time_track.dm
@@ -1,6 +1,6 @@
SUBSYSTEM_DEF(time_track)
name = "Time Tracking"
- wait = 600
+ wait = 1 SECONDS
flags = SS_NO_INIT|SS_NO_TICK_CHECK
runlevels = RUNLEVEL_LOBBY | RUNLEVELS_DEFAULT
@@ -16,23 +16,33 @@ SUBSYSTEM_DEF(time_track)
var/last_tick_byond_time = 0
var/last_tick_tickcount = 0
+ var/last_measurement = 0
+ var/measurement_delay = 60
+
+ var/stat_time_text
+ var/time_dilation_text
+
/datum/controller/subsystem/time_track/fire()
+ stat_time_text = "Server Time: [time2text(world.timeofday, "YYYY-MM-DD hh:mm:ss")]\n\nRound Time: [WORLDTIME2TEXT("hh:mm:ss")]\n\nStation Time: [STATION_TIME_TIMESTAMP("hh:mm:ss")]\n\n[time_dilation_text]"
- var/current_realtime = REALTIMEOFDAY
- var/current_byondtime = world.time
- var/current_tickcount = world.time/world.tick_lag
+ if(++last_measurement == measurement_delay)
+ last_measurement = 0
+ var/current_realtime = REALTIMEOFDAY
+ var/current_byondtime = world.time
+ var/current_tickcount = world.time/world.tick_lag
- if (!first_run)
- var/tick_drift = max(0, (((current_realtime - last_tick_realtime) - (current_byondtime - last_tick_byond_time)) / world.tick_lag))
+ if (!first_run)
+ var/tick_drift = max(0, (((current_realtime - last_tick_realtime) - (current_byondtime - last_tick_byond_time)) / world.tick_lag))
- time_dilation_current = tick_drift / (current_tickcount - last_tick_tickcount) * 100
+ time_dilation_current = tick_drift / (current_tickcount - last_tick_tickcount) * 100
- time_dilation_avg_fast = MC_AVERAGE_FAST(time_dilation_avg_fast, time_dilation_current)
- time_dilation_avg = MC_AVERAGE(time_dilation_avg, time_dilation_avg_fast)
- time_dilation_avg_slow = MC_AVERAGE_SLOW(time_dilation_avg_slow, time_dilation_avg)
- else
- first_run = FALSE
- last_tick_realtime = current_realtime
- last_tick_byond_time = current_byondtime
- last_tick_tickcount = current_tickcount
- SSblackbox.record_feedback("associative", "time_dilation_current", 1, list("[SQLtime()]" = list("current" = "[time_dilation_current]", "avg_fast" = "[time_dilation_avg_fast]", "avg" = "[time_dilation_avg]", "avg_slow" = "[time_dilation_avg_slow]")))
+ time_dilation_avg_fast = MC_AVERAGE_FAST(time_dilation_avg_fast, time_dilation_current)
+ time_dilation_avg = MC_AVERAGE(time_dilation_avg, time_dilation_avg_fast)
+ time_dilation_avg_slow = MC_AVERAGE_SLOW(time_dilation_avg_slow, time_dilation_avg)
+ else
+ first_run = FALSE
+ last_tick_realtime = current_realtime
+ last_tick_byond_time = current_byondtime
+ last_tick_tickcount = current_tickcount
+ SSblackbox.record_feedback("associative", "time_dilation_current", 1, list("[SQLtime()]" = list("current" = "[time_dilation_current]", "avg_fast" = "[time_dilation_avg_fast]", "avg" = "[time_dilation_avg]", "avg_slow" = "[time_dilation_avg_slow]")))
+ time_dilation_text = "Time Dilation: [round(time_dilation_current,1)]% AVG:([round(time_dilation_avg_fast,1)]%, [round(time_dilation_avg,1)]%, [round(time_dilation_avg_slow,1)]%)"
diff --git a/code/datums/brain_damage/brain_trauma.dm b/code/datums/brain_damage/brain_trauma.dm
index 1aa1341c9c..eaaab8da45 100644
--- a/code/datums/brain_damage/brain_trauma.dm
+++ b/code/datums/brain_damage/brain_trauma.dm
@@ -14,7 +14,7 @@
var/can_gain = TRUE
var/random_gain = TRUE //can this be gained through random traumas?
var/resilience = TRAUMA_RESILIENCE_BASIC //how hard is this to cure?
- var/clonable = TRUE // will this transfer if the brain is cloned?
+ var/clonable = TRUE // will this transfer if the brain is cloned? - currently has no effect
/datum/brain_trauma/Destroy()
if(brain && brain.traumas)
diff --git a/code/datums/components/virtual_reality.dm b/code/datums/components/virtual_reality.dm
index 2f0405af2e..63e4f4f092 100644
--- a/code/datums/components/virtual_reality.dm
+++ b/code/datums/components/virtual_reality.dm
@@ -229,7 +229,7 @@
UnregisterSignal(mastermind, COMSIG_PRE_MIND_TRANSFER)
mastermind = null
if(cleanup)
- var/obj/effect/vr_clean_master/cleanbot = locate() in get_area(M)
+ var/obj/effect/vr_clean_master/cleanbot = locate() in get_base_area(M)
if(cleanbot)
LAZYOR(cleanbot.corpse_party, M)
qdel(src)
diff --git a/code/datums/datacore.dm b/code/datums/datacore.dm
index ebfba43852..1622cc9dbf 100644
--- a/code/datums/datacore.dm
+++ b/code/datums/datacore.dm
@@ -236,7 +236,12 @@
G.fields["fingerprint"] = md5(H.dna.uni_identity)
G.fields["p_stat"] = "Active"
G.fields["m_stat"] = "Stable"
- G.fields["sex"] = H.gender
+ if(H.gender == MALE)
+ G.fields["gender"] = "Male"
+ else if(H.gender == FEMALE)
+ G.fields["gender"] = "Female"
+ else
+ G.fields["gender"] = "Other"
G.fields["photo_front"] = photo_front
G.fields["photo_side"] = photo_side
general += G
@@ -274,7 +279,12 @@
L.fields["name"] = H.real_name
L.fields["rank"] = H.mind.assigned_role
L.fields["age"] = H.age
- L.fields["sex"] = H.gender
+ if(H.gender == MALE)
+ G.fields["gender"] = "Male"
+ else if(H.gender == FEMALE)
+ G.fields["gender"] = "Female"
+ else
+ G.fields["gender"] = "Other"
L.fields["blood_type"] = H.dna.blood_type
L.fields["b_dna"] = H.dna.unique_enzymes
L.fields["enzymes"] = H.dna.struc_enzymes
diff --git a/code/datums/diseases/advance/advance.dm b/code/datums/diseases/advance/advance.dm
index 6b72f2fdfc..1c21fb9528 100644
--- a/code/datums/diseases/advance/advance.dm
+++ b/code/datums/diseases/advance/advance.dm
@@ -110,7 +110,7 @@
// Randomly pick a symptom to activate.
/datum/disease/advance/stage_act()
..()
- if(carrier)
+ if(carrier || QDELETED(src)) // Could be cured in parent call.
return
if(symptoms && symptoms.len)
diff --git a/code/datums/diseases/advance/symptoms/choking.dm b/code/datums/diseases/advance/symptoms/choking.dm
index 134bdfc814..5ca4a095d9 100644
--- a/code/datums/diseases/advance/symptoms/choking.dm
+++ b/code/datums/diseases/advance/symptoms/choking.dm
@@ -43,7 +43,7 @@ Bonus
suppress_warning = TRUE
/datum/symptom/choking/Activate(datum/disease/advance/A)
- if(!..())
+ if(!..() || HAS_TRAIT(A.affected_mob,TRAIT_NOBREATH))
return
var/mob/living/M = A.affected_mob
switch(A.stage)
@@ -116,7 +116,7 @@ Bonus
power = 2
/datum/symptom/asphyxiation/Activate(datum/disease/advance/A)
- if(!..())
+ if(!..() || HAS_TRAIT(A.affected_mob,TRAIT_NOBREATH))
return
var/mob/living/M = A.affected_mob
switch(A.stage)
diff --git a/code/datums/diseases/advance/symptoms/cough.dm b/code/datums/diseases/advance/symptoms/cough.dm
index ef318d7da3..cf15ec407a 100644
--- a/code/datums/diseases/advance/symptoms/cough.dm
+++ b/code/datums/diseases/advance/symptoms/cough.dm
@@ -51,7 +51,7 @@ BONUS
symptom_delay_max = 10
/datum/symptom/cough/Activate(datum/disease/advance/A)
- if(!..())
+ if(!..() || HAS_TRAIT(A.affected_mob,TRAIT_NOBREATH))
return
var/mob/living/M = A.affected_mob
switch(A.stage)
diff --git a/code/datums/diseases/advance/symptoms/sneeze.dm b/code/datums/diseases/advance/symptoms/sneeze.dm
index 5655cbc9c7..439f391fe4 100644
--- a/code/datums/diseases/advance/symptoms/sneeze.dm
+++ b/code/datums/diseases/advance/symptoms/sneeze.dm
@@ -41,7 +41,7 @@ Bonus
suppress_warning = TRUE
/datum/symptom/sneeze/Activate(datum/disease/advance/A)
- if(!..())
+ if(!..() || HAS_TRAIT(A.affected_mob,TRAIT_NOBREATH))
return
var/mob/living/M = A.affected_mob
switch(A.stage)
diff --git a/code/datums/diseases/wizarditis.dm b/code/datums/diseases/wizarditis.dm
index 230a074bb1..71a5bcb99e 100644
--- a/code/datums/diseases/wizarditis.dm
+++ b/code/datums/diseases/wizarditis.dm
@@ -94,7 +94,7 @@ STI KALY - blind
var/area/thearea = pick(theareas)
var/list/L = list()
- for(var/turf/T in get_area_turfs(thearea.type))
+ for(var/turf/T in thearea)
if(T.z != affected_mob.z)
continue
if(T.name == "space")
diff --git a/code/datums/dna.dm b/code/datums/dna.dm
index 67dbbdfef7..5fa991c10c 100644
--- a/code/datums/dna.dm
+++ b/code/datums/dna.dm
@@ -92,7 +92,15 @@
. = ""
var/list/L = new /list(DNA_UNI_IDENTITY_BLOCKS)
- L[DNA_GENDER_BLOCK] = construct_block((holder.gender!=MALE)+1, 2)
+ switch(holder.gender)
+ if(MALE)
+ L[DNA_GENDER_BLOCK] = construct_block(G_MALE, 4)
+ if(FEMALE)
+ L[DNA_GENDER_BLOCK] = construct_block(G_FEMALE, 4)
+ if(PLURAL)
+ L[DNA_GENDER_BLOCK] = construct_block(G_PLURAL, 4)
+ else
+ L[DNA_GENDER_BLOCK] = construct_block(G_NEUTER, 4)
if(ishuman(holder))
var/mob/living/carbon/human/H = holder
if(!GLOB.hair_styles_list.len)
@@ -165,7 +173,15 @@
if(DNA_EYE_COLOR_BLOCK)
setblock(uni_identity, blocknumber, sanitize_hexcolor(H.eye_color))
if(DNA_GENDER_BLOCK)
- setblock(uni_identity, blocknumber, construct_block((H.gender!=MALE)+1, 2))
+ switch(H.gender)
+ if(MALE)
+ setblock(uni_identity, blocknumber, construct_block(G_MALE, 4))
+ if(FEMALE)
+ setblock(uni_identity, blocknumber, construct_block(G_FEMALE, 4))
+ if(PLURAL)
+ setblock(uni_identity, blocknumber, construct_block(G_PLURAL, 4))
+ else
+ setblock(uni_identity, blocknumber, construct_block(G_NEUTER, 4))
if(DNA_FACIAL_HAIR_STYLE_BLOCK)
setblock(uni_identity, blocknumber, construct_block(GLOB.facial_hair_styles_list.Find(H.facial_hair_style), GLOB.facial_hair_styles_list.len))
if(DNA_HAIR_STYLE_BLOCK)
@@ -307,7 +323,16 @@
/mob/living/carbon/proc/updateappearance(icon_update=1, mutcolor_update=0, mutations_overlay_update=0)
if(!has_dna())
return
- gender = (deconstruct_block(getblock(dna.uni_identity, DNA_GENDER_BLOCK), 2)-1) ? FEMALE : MALE
+
+ switch(deconstruct_block(getblock(dna.uni_identity, DNA_GENDER_BLOCK), 4))
+ if(G_MALE)
+ gender = MALE
+ if(G_FEMALE)
+ gender = FEMALE
+ if(G_PLURAL)
+ gender = PLURAL
+ else
+ gender = NEUTER
/mob/living/carbon/human/updateappearance(icon_update=1, mutcolor_update=0, mutations_overlay_update=0)
..()
diff --git a/code/datums/elements/dusts_on_leaving_area.dm b/code/datums/elements/dusts_on_leaving_area.dm
new file mode 100644
index 0000000000..9527e1fd3a
--- /dev/null
+++ b/code/datums/elements/dusts_on_leaving_area.dm
@@ -0,0 +1,28 @@
+/datum/element/dusts_on_leaving_area
+ element_flags = ELEMENT_DETACH | ELEMENT_BESPOKE
+ id_arg_index = 2
+ var/list/attached_mobs = list()
+ var/list/area_types = list()
+
+/datum/element/dusts_on_leaving_area/Attach(datum/target,types)
+ . = ..()
+ if(!ismob(target))
+ return ELEMENT_INCOMPATIBLE
+ attached_mobs += target
+ area_types = types
+ START_PROCESSING(SSprocessing,src)
+
+/datum/element/dusts_on_leaving_area/Detach(mob/M)
+ . = ..()
+ if(M in attached_mobs)
+ attached_mobs -= M
+ if(!attached_mobs.len)
+ STOP_PROCESSING(SSprocessing,src)
+
+/datum/element/dusts_on_leaving_area/process()
+ for(var/m in attached_mobs)
+ var/mob/M = m
+ var/area/A = get_area(M)
+ if(!(A.type in area_types))
+ M.dust(force = TRUE)
+ Detach(M)
diff --git a/code/datums/traits/_quirk.dm b/code/datums/traits/_quirk.dm
index 12e34b0c90..d68b11135f 100644
--- a/code/datums/traits/_quirk.dm
+++ b/code/datums/traits/_quirk.dm
@@ -15,6 +15,7 @@
/datum/quirk/New(mob/living/quirk_mob, spawn_effects)
if(!quirk_mob || (human_only && !ishuman(quirk_mob)) || quirk_mob.has_quirk(type))
qdel(src)
+ return
quirk_holder = quirk_mob
SSquirks.quirk_objects += src
to_chat(quirk_holder, gain_text)
diff --git a/code/datums/traits/good.dm b/code/datums/traits/good.dm
index b74f24c469..0d4a6a7b3f 100644
--- a/code/datums/traits/good.dm
+++ b/code/datums/traits/good.dm
@@ -201,13 +201,12 @@
medical_record_text = "Patient's blood tests report an abnormal concentration of red blood cells in their bloodstream."
/datum/quirk/bloodpressure/add()
- var/mob/living/M = quirk_holder
- M.blood_ratio = 1.2
- M.blood_volume += 150
+ quirk_holder.blood_ratio = 1.2
+ quirk_holder.blood_volume += 150
/datum/quirk/bloodpressure/remove()
- var/mob/living/M = quirk_holder
- M.blood_ratio = 1
+ if(quirk_holder)
+ quirk_holder.blood_ratio = 1
/datum/quirk/night_vision
name = "Night Vision"
diff --git a/code/datums/weather/weather.dm b/code/datums/weather/weather.dm
index a3b666dcc6..01b9facbb8 100644
--- a/code/datums/weather/weather.dm
+++ b/code/datums/weather/weather.dm
@@ -50,7 +50,10 @@
stage = STARTUP_STAGE
var/list/affectareas = list()
for(var/V in get_areas(area_type))
- affectareas += V
+ var/area/A = V
+ affectareas |= A
+ if(A.sub_areas)
+ affectareas |= A.sub_areas
for(var/V in protected_areas)
affectareas -= get_areas(V)
for(var/V in affectareas)
diff --git a/code/datums/wires/airalarm.dm b/code/datums/wires/airalarm.dm
index 6eb4dc04db..0c4715e27e 100644
--- a/code/datums/wires/airalarm.dm
+++ b/code/datums/wires/airalarm.dm
@@ -46,7 +46,7 @@
A.mode = 1 // AALARM_MODE_SCRUB
A.apply_mode()
if(WIRE_ALARM) // Clear alarms.
- var/area/AA = get_area(A)
+ var/area/AA = get_base_area(A)
if(AA.atmosalert(0, holder))
A.post_alert(0)
A.update_icon()
@@ -68,7 +68,7 @@
A.mode = 3 // AALARM_MODE_PANIC
A.apply_mode()
if(WIRE_ALARM) // Post alarm.
- var/area/AA = get_area(A)
+ var/area/AA = get_base_area(A)
if(AA.atmosalert(2, holder))
A.post_alert(2)
A.update_icon()
\ No newline at end of file
diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm
index 2d256aad27..99b8165306 100644
--- a/code/game/area/areas.dm
+++ b/code/game/area/areas.dm
@@ -63,6 +63,15 @@
var/xenobiology_compatible = FALSE //Can the Xenobio management console transverse this area by default?
var/list/canSmoothWithAreas //typecache to limit the areas that atoms in this area can smooth with
+/**
+ * These two vars allow for multiple unique areas to be linked to a master area
+ * and share some functionalities such as APC powernet nodes, fire alarms etc, without sacrificing
+ * their own flags, statuses, variables and more snowflakes.
+ * Friendly reminder: no map edited areas.
+ */
+ var/list/area/sub_areas //list of typepaths of the areas you wish to link here, will be replaced with a list of references on mapload.
+ var/area/base_area //The area we wish to use in place of src for certain actions such as APC area linking.
+
var/nightshift_public_area = NIGHTSHIFT_AREA_NONE //considered a public area for nightshift
/*Adding a wizard area teleport list because motherfucking lag -- Urist*/
@@ -123,10 +132,35 @@ GLOBAL_LIST_EMPTY(teleportlocs)
reg_in_areas_in_z()
+ //so far I'm only implementing it on mapped unique areas, it's easier this way.
+ if(unique && sub_areas)
+ if(type in sub_areas)
+ WARNING("\"[src]\" typepath found inside its own sub-areas list, please make sure it doesn't share its parent type initial sub-areas value.")
+ sub_areas = null
+ else
+ var/paths = sub_areas.Copy()
+ sub_areas = null
+ for(var/type in paths)
+ var/area/A = GLOB.areas_by_type[type]
+ if(!A) //By chance an area not loaded in the current world, no warning report.
+ continue
+ if(A == src)
+ WARNING("\"[src]\" area a attempted to link with itself.")
+ continue
+ if(A.base_area)
+ WARNING("[src] attempted to link with [A] while the latter is already linked to another area ([A.base_area]).")
+ continue
+ LAZYADD(sub_areas, A)
+ A.base_area = src
+ else if(LAZYLEN(sub_areas))
+ WARNING("sub-areas are currently not supported for non-unique areas such as [src].")
+ sub_areas = null
+
return INITIALIZE_HINT_LATELOAD
/area/LateInitialize()
- power_change() // all machines set to current power level, also updates icon
+ if(!base_area) //we don't want to run it twice.
+ power_change() // all machines set to current power level, also updates icon
/area/proc/reg_in_areas_in_z()
if(contents.len)
@@ -149,6 +183,19 @@ GLOBAL_LIST_EMPTY(teleportlocs)
/area/Destroy()
if(GLOB.areas_by_type[type] == src)
GLOB.areas_by_type[type] = null
+ if(base_area)
+ LAZYREMOVE(base_area, src)
+ base_area = null
+ if(sub_areas)
+ for(var/i in sub_areas)
+ var/area/A = i
+ A.base_area = null
+ sub_areas -= A
+ if(A.requires_power)
+ A.power_light = FALSE
+ A.power_equip = FALSE
+ A.power_environ = FALSE
+ INVOKE_ASYNC(A, .proc/power_change)
STOP_PROCESSING(SSobj, src)
return ..()
@@ -214,9 +261,12 @@ GLOBAL_LIST_EMPTY(teleportlocs)
var/datum/computer_file/program/alarm_monitor/p = item
p.cancelAlarm("Atmosphere", src, source)
- src.atmosalm = danger_level
- return 1
- return 0
+ atmosalm = danger_level
+ for(var/i in sub_areas)
+ var/area/A = i
+ A.atmosalm = danger_level
+ return TRUE
+ return FALSE
/area/proc/ModifyFiredoors(opening)
if(firedoors)
@@ -241,11 +291,8 @@ GLOBAL_LIST_EMPTY(teleportlocs)
return
if (!fire)
- set_fire_alarm_effect()
+ set_fire_alarm_effects(TRUE)
ModifyFiredoors(FALSE)
- for(var/item in firealarms)
- var/obj/machinery/firealarm/F = item
- F.update_icon()
for (var/item in GLOB.alert_consoles)
var/obj/machinery/computer/station_alert/a = item
@@ -264,11 +311,8 @@ GLOBAL_LIST_EMPTY(teleportlocs)
/area/proc/firereset(obj/source)
if (fire)
- unset_fire_alarm_effects()
+ set_fire_alarm_effects(FALSE)
ModifyFiredoors(TRUE)
- for(var/item in firealarms)
- var/obj/machinery/firealarm/F = item
- F.update_icon()
for (var/item in GLOB.silicon_mobs)
var/mob/living/silicon/aiPlayer = item
@@ -300,9 +344,9 @@ GLOBAL_LIST_EMPTY(teleportlocs)
return
//Trigger alarm effect
- set_fire_alarm_effect()
+ set_fire_alarm_effects(TRUE)
//Lockdown airlocks
- for(var/obj/machinery/door/DOOR in src)
+ for(var/obj/machinery/door/DOOR in get_sub_areas_contents(src))
close_and_lock_door(DOOR)
for (var/i in GLOB.silicon_mobs)
@@ -311,23 +355,20 @@ GLOBAL_LIST_EMPTY(teleportlocs)
//Cancel silicon alert after 1 minute
addtimer(CALLBACK(SILICON, /mob/living/silicon.proc/cancelAlarm,"Burglar",src,trigger), 600)
-/area/proc/set_fire_alarm_effect()
- fire = TRUE
+/area/proc/set_fire_alarm_effects(boolean)
+ fire = boolean
+ for(var/i in sub_areas)
+ var/area/A = i
+ A.fire = boolean
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
for(var/alarm in firealarms)
var/obj/machinery/firealarm/F = alarm
F.update_fire_light(fire)
- for(var/obj/machinery/light/L in src)
+ F.update_icon()
+ for(var/obj/machinery/light/L in get_sub_areas_contents(src))
L.update()
-/area/proc/unset_fire_alarm_effects()
- fire = FALSE
- mouse_opacity = MOUSE_OPACITY_TRANSPARENT
- for(var/alarm in firealarms)
- var/obj/machinery/firealarm/F = alarm
- F.update_fire_light(fire)
- for(var/obj/machinery/light/L in src)
- L.update()
+/area/proc/updateicon()
/**
* Update the icon state of the area
*
@@ -380,26 +421,35 @@ GLOBAL_LIST_EMPTY(teleportlocs)
/area/proc/power_change()
for(var/obj/machinery/M in src) // for each machine in the area
M.power_change() // reverify power status (to update icons etc.)
+ if(sub_areas)
+ for(var/i in sub_areas)
+ var/area/A = i
+ A.power_light = power_light
+ A.power_equip = power_equip
+ A.power_environ = power_environ
+ INVOKE_ASYNC(A, .proc/power_change)
update_icon()
/area/proc/usage(chan)
- var/used = 0
switch(chan)
if(LIGHT)
- used += used_light
+ . += used_light
if(EQUIP)
- used += used_equip
+ . += used_equip
if(ENVIRON)
- used += used_environ
+ . += used_environ
if(TOTAL)
- used += used_light + used_equip + used_environ
+ . += used_light + used_equip + used_environ
if(STATIC_EQUIP)
- used += static_equip
+ . += static_equip
if(STATIC_LIGHT)
- used += static_light
+ . += static_light
if(STATIC_ENVIRON)
- used += static_environ
- return used
+ . += static_environ
+ if(sub_areas)
+ for(var/i in sub_areas)
+ var/area/A = i
+ . += A.usage(chan)
/area/proc/addStaticPower(value, powerchannel)
switch(powerchannel)
@@ -414,6 +464,10 @@ GLOBAL_LIST_EMPTY(teleportlocs)
used_equip = 0
used_light = 0
used_environ = 0
+ if(sub_areas)
+ for(var/i in sub_areas)
+ var/area/A = i
+ A.clear_usage()
/area/proc/use_power(amount, chan)
diff --git a/code/game/gamemodes/brother/traitor_bro.dm b/code/game/gamemodes/brother/traitor_bro.dm
index df4a38cf60..718ed2c103 100644
--- a/code/game/gamemodes/brother/traitor_bro.dm
+++ b/code/game/gamemodes/brother/traitor_bro.dm
@@ -5,6 +5,7 @@
/datum/game_mode/traitor/bros
name = "traitor+brothers"
config_tag = "traitorbro"
+ required_players = 25
restricted_jobs = list("AI", "Cyborg")
protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster")
diff --git a/code/game/gamemodes/events.dm b/code/game/gamemodes/events.dm
index d010da465e..b296ba7273 100644
--- a/code/game/gamemodes/events.dm
+++ b/code/game/gamemodes/events.dm
@@ -12,7 +12,7 @@
var/list/skipped_areas = list(/area/engine/engineering, /area/engine/supermatter, /area/engine/atmospherics_engine, /area/ai_monitored/turret_protected/ai)
for(var/area/A in world)
- if( !A.requires_power || A.always_unpowered )
+ if( !A.requires_power || A.always_unpowered || A.base_area)
continue
var/skip = 0
@@ -61,8 +61,9 @@
S.output_attempt = 1
S.update_icon()
S.power_change()
+
for(var/area/A in world)
- if(!istype(A, /area/space) && !istype(A, /area/shuttle) && !istype(A, /area/arrival))
+ if(!istype(A, /area/space) && !istype(A, /area/shuttle) && !istype(A, /area/arrival) && !A.always_unpowered && !A.base_area)
A.power_light = TRUE
A.power_equip = TRUE
A.power_environ = TRUE
diff --git a/code/game/gamemodes/gangs/dominator.dm b/code/game/gamemodes/gangs/dominator.dm
index 8c1272dcbd..db060a6539 100644
--- a/code/game/gamemodes/gangs/dominator.dm
+++ b/code/game/gamemodes/gangs/dominator.dm
@@ -101,7 +101,7 @@
playsound(loc, 'sound/items/timer.ogg', 10, 0)
if(!warned && (time_remaining < 180))
warned = TRUE
- var/area/domloc = get_area(loc)
+ var/area/domloc = get_base_area(loc)
gang.message_gangtools("Less than 3 minutes remains in hostile takeover. Defend your dominator at [domloc.map_name]!")
for(var/G in GLOB.gangs)
var/datum/team/gang/tempgang = G
@@ -179,7 +179,7 @@
if((tempgang.domination_time != NOT_DOMINATING) || !tempgang.dom_attempts || !in_range(src, user) || !isturf(loc))
return 0
- var/area/A = get_area(loc)
+ var/area/A = get_base_area(loc)
var/locname = A.map_name
gang = tempgang
diff --git a/code/game/gamemodes/gangs/gang_decals.dm b/code/game/gamemodes/gangs/gang_decals.dm
index 6e5cb58891..7aaed769d9 100644
--- a/code/game/gamemodes/gangs/gang_decals.dm
+++ b/code/game/gamemodes/gangs/gang_decals.dm
@@ -19,7 +19,7 @@
return INITIALIZE_HINT_QDEL
gang = G
var/newcolor = G.color
- var/area/territory = get_area(src)
+ var/area/territory = get_base_area(src)
icon_state = G.name
G.new_territories |= list(territory.type = territory.name)
//If this isn't tagged by a specific gangster there's no bonus income.
@@ -27,7 +27,7 @@
/obj/effect/decal/cleanable/crayon/gang/Destroy()
if(gang)
- var/area/territory = get_area(src)
+ var/area/territory = get_base_area(src)
gang.territories -= territory.type
gang.new_territories -= territory.type
gang.lost_territories |= list(territory.type = territory.name)
diff --git a/code/game/gamemodes/gangs/gang_items.dm b/code/game/gamemodes/gangs/gang_items.dm
index 2e9ca4dcc0..4dba8dae93 100644
--- a/code/game/gamemodes/gangs/gang_items.dm
+++ b/code/game/gamemodes/gangs/gang_items.dm
@@ -290,12 +290,6 @@ datum/gang_item/clothing/shades //Addition: Why not have cool shades on a gang m
cost = 5
item_path = /obj/item/grenade/syndieminibomb/concussion/frag
-/datum/gang_item/equipment/stimpack
- name = "Black Market Stimulants"
- id = "stimpack"
- cost = 12
- item_path = /obj/item/reagent_containers/syringe/stimulants
-
/datum/gang_item/equipment/implant_breaker
name = "Implant Breaker"
id = "implant_breaker"
@@ -401,7 +395,7 @@ datum/gang_item/equipment/gangsheild
return "This device requires a 5x5 area clear of walls to FUNCTION. (Estimated Takeover Time: [round(gang.determine_domination_time()/60,0.1)] minutes)"
/datum/gang_item/equipment/dominator/purchase(mob/living/carbon/user, datum/team/gang/gang, obj/item/device/gangtool/gangtool)
- var/area/userarea = get_area(user)
+ var/area/userarea = get_base_area(user)
if(!(userarea.type in gang.territories|gang.new_territories))
to_chat(user,"The dominator can be spawned only on territory controlled by your gang!")
return FALSE
diff --git a/code/game/gamemodes/meteor/meteors.dm b/code/game/gamemodes/meteor/meteors.dm
index 6d681f8108..cfb4c9a120 100644
--- a/code/game/gamemodes/meteor/meteors.dm
+++ b/code/game/gamemodes/meteor/meteors.dm
@@ -21,16 +21,16 @@ GLOBAL_LIST_INIT(meteorsC, list(/obj/effect/meteor/dust)) //for space dust event
//Meteor spawning global procs
///////////////////////////////
-/proc/spawn_meteors(number = 10, list/meteortypes)
+/proc/spawn_meteors(number = 10, list/meteortypes, dir)
for(var/i = 0; i < number; i++)
- spawn_meteor(meteortypes)
+ spawn_meteor(meteortypes, dir)
-/proc/spawn_meteor(list/meteortypes)
+/proc/spawn_meteor(list/meteortypes, dir)
var/turf/pickedstart
var/turf/pickedgoal
var/max_i = 10//number of tries to spawn meteor.
while(!isspaceturf(pickedstart))
- var/startSide = pick(GLOB.cardinals)
+ var/startSide = dir || pick(GLOB.cardinals)
var/startZ = pick(SSmapping.levels_by_trait(ZTRAIT_STATION))
pickedstart = spaceDebrisStartLoc(startSide, startZ)
pickedgoal = spaceDebrisFinishLoc(startSide, startZ)
diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm
index f99fe5c3e4..b7003e4f1e 100644
--- a/code/game/gamemodes/objective.dm
+++ b/code/game/gamemodes/objective.dm
@@ -527,7 +527,7 @@ GLOBAL_LIST_EMPTY(possible_items)
else if(targetinfo.check_special_completion(I))//Returns 1 by default. Items with special checks will return 1 if the conditions are fulfilled.
return TRUE
- if(targetinfo && I.type in targetinfo.altitems) //Ok, so you don't have the item. Do you have an alternative, at least?
+ if(targetinfo && (I.type in targetinfo.altitems)) //Ok, so you don't have the item. Do you have an alternative, at least?
if(targetinfo.check_special_completion(I))//Yeah, we do! Don't return 0 if we don't though - then you could fail if you had 1 item that didn't pass and got checked first!
return TRUE
return FALSE
diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm
index bef5effb54..22c1ff811c 100644
--- a/code/game/machinery/camera/camera.dm
+++ b/code/game/machinery/camera/camera.dm
@@ -319,7 +319,8 @@
if(status)
change_msg = "reactivates"
triggerCameraAlarm()
- addtimer(CALLBACK(src, .proc/cancelCameraAlarm), 100)
+ if(!QDELETED(src)) //We'll be doing it anyway in destroy
+ addtimer(CALLBACK(src, .proc/cancelCameraAlarm), 100)
if(displaymessage)
if(user)
visible_message("[user] [change_msg] [src]!")
diff --git a/code/game/machinery/cell_charger.dm b/code/game/machinery/cell_charger.dm
index fc6cac785a..991577e123 100644
--- a/code/game/machinery/cell_charger.dm
+++ b/code/game/machinery/cell_charger.dm
@@ -46,7 +46,7 @@
var/area/a = loc.loc // Gets our locations location, like a dream within a dream
if(!isarea(a))
return
- if(a.power_equip == 0) // There's no APC in this area, don't try to cheat power!
+ if(!a.powered(EQUIP)) // There's no APC in this area, don't try to cheat power!
to_chat(user, "[src] blinks red as you try to insert the cell!")
return
if(!user.transferItemToLoc(W,src))
diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm
index a238c4a451..b007bc0161 100644
--- a/code/game/machinery/constructable_frame.dm
+++ b/code/game/machinery/constructable_frame.dm
@@ -119,6 +119,9 @@
if(istype(P, /obj/item/circuitboard/machine))
var/obj/item/circuitboard/machine/B = P
+ if(!B.build_path)
+ to_chat(user, "This circuitboard seems to be broken.")
+ return
if(!anchored && B.needs_anchored)
to_chat(user, "The frame needs to be secured first!")
return
diff --git a/code/game/machinery/dance_machine.dm b/code/game/machinery/dance_machine.dm
index 91306585b8..c6b4f2fcf5 100644
--- a/code/game/machinery/dance_machine.dm
+++ b/code/game/machinery/dance_machine.dm
@@ -406,12 +406,11 @@
lying_prev = 0
/obj/machinery/jukebox/proc/dance_over()
- SSjukeboxes.removejukebox(SSjukeboxes.findjukeboxindex(src))
+ var/position = SSjukeboxes.findjukeboxindex(src)
+ if(!position)
+ return
+ SSjukeboxes.removejukebox(position)
STOP_PROCESSING(SSobj, src)
- for(var/mob/living/L in rangers)
- if(!L || !L.client)
- continue
- L.stop_sound_channel(CHANNEL_JUKEBOX)
rangers = list()
/obj/machinery/jukebox/disco/dance_over()
diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm
index ad0f372530..9db98b8314 100644
--- a/code/game/machinery/doors/door.dm
+++ b/code/game/machinery/doors/door.dm
@@ -288,9 +288,10 @@
return
operating = TRUE
-
do_animate("closing")
layer = closingLayer
+ if(!safe)
+ crush()
sleep(5)
density = TRUE
sleep(5)
@@ -302,8 +303,6 @@
update_freelook_sight()
if(safe)
CheckForMobs()
- else
- crush()
return 1
/obj/machinery/door/proc/CheckForMobs()
diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm
index f5bf8c8a1b..cb133978b2 100644
--- a/code/game/machinery/doors/firedoor.dm
+++ b/code/game/machinery/doors/firedoor.dm
@@ -44,7 +44,7 @@
/obj/machinery/door/firedoor/proc/CalculateAffectingAreas()
remove_from_areas()
- affecting_areas = get_adjacent_open_areas(src) | get_area(src)
+ affecting_areas = get_adjacent_open_areas(src) | get_base_area(src)
for(var/I in affecting_areas)
var/area/A = I
LAZYADD(A.firedoors, src)
diff --git a/code/game/machinery/firealarm.dm b/code/game/machinery/firealarm.dm
index 1ef3fc0a74..5555e05eb0 100644
--- a/code/game/machinery/firealarm.dm
+++ b/code/game/machinery/firealarm.dm
@@ -44,7 +44,7 @@
pixel_x = (dir & 3)? 0 : (dir == 4 ? -24 : 24)
pixel_y = (dir & 3)? (dir ==1 ? -24 : 24) : 0
update_icon()
- myarea = get_area(src)
+ myarea = get_base_area(src)
LAZYADD(myarea.firealarms, src)
/obj/machinery/firealarm/Destroy()
@@ -124,7 +124,7 @@
if(!is_operational() || (last_alarm+FIREALARM_COOLDOWN > world.time))
return
last_alarm = world.time
- var/area/A = get_area(src)
+ var/area/A = get_base_area(src)
A.firealert(src)
playsound(loc, 'goon/sound/machinery/FireAlarm.ogg', 75)
if(user)
@@ -133,7 +133,7 @@
/obj/machinery/firealarm/proc/reset(mob/user)
if(!is_operational())
return
- var/area/A = get_area(src)
+ var/area/A = get_base_area(src)
A.firereset(src)
if(user)
log_game("[user] reset a fire alarm at [COORD(src)]")
@@ -142,7 +142,7 @@
if(buildstage != 2)
return ..()
add_fingerprint(user)
- var/area/A = get_area(src)
+ var/area/A = get_base_area(src)
if(A.fire)
reset(user)
else
@@ -198,7 +198,7 @@
return
else if(W.force) //hit and turn it on
..()
- var/area/A = get_area(src)
+ var/area/A = get_base_area(src)
if(!A.fire)
alarm()
return
@@ -322,7 +322,7 @@
/obj/machinery/firealarm/partyalarm/reset()
if (stat & (NOPOWER|BROKEN))
return
- var/area/A = get_area(src)
+ var/area/A = get_base_area(src)
if (!A || !A.party)
return
A.party = FALSE
@@ -331,7 +331,7 @@
/obj/machinery/firealarm/partyalarm/alarm()
if (stat & (NOPOWER|BROKEN))
return
- var/area/A = get_area(src)
+ var/area/A = get_base_area(src)
if (!A || A.party || A.name == "Space")
return
A.party = TRUE
diff --git a/code/game/machinery/recharger.dm b/code/game/machinery/recharger.dm
index 2211397f3e..f777c893f8 100755
--- a/code/game/machinery/recharger.dm
+++ b/code/game/machinery/recharger.dm
@@ -70,7 +70,7 @@
//Checks to make sure he's not in space doing it, and that the area got proper power.
var/area/a = get_area(src)
- if(!isarea(a) || a.power_equip == 0)
+ if(!a || !a.powered(EQUIP))
to_chat(user, "[src] blinks red as you try to insert [G].")
return 1
diff --git a/code/game/machinery/telecomms/computers/message.dm b/code/game/machinery/telecomms/computers/message.dm
index 07028ba2d3..884c2bb37d 100644
--- a/code/game/machinery/telecomms/computers/message.dm
+++ b/code/game/machinery/telecomms/computers/message.dm
@@ -421,7 +421,7 @@
"name" = "[customsender]",
"job" = "[customjob]",
"message" = custommessage,
- "emoji_message" = emoji_parse(custommessage),
+ "emojis" = TRUE,
"targets" = list("[customrecepient.owner] ([customrecepient.ownjob])")
))
// this will log the signal and transmit it to the target
diff --git a/code/game/machinery/telecomms/machines/message_server.dm b/code/game/machinery/telecomms/machines/message_server.dm
index 0cf356ad3d..1960080856 100644
--- a/code/game/machinery/telecomms/machines/message_server.dm
+++ b/code/game/machinery/telecomms/machines/message_server.dm
@@ -106,11 +106,10 @@
return "Everyone"
return data["targets"][1]
-/datum/signal/subspace/pda/proc/format_message(emojify = FALSE)
- var/message = emojify ? data["emoji_message"] : data["message"]
+/datum/signal/subspace/pda/proc/format_message()
if (logged && data["photo"])
- return "\"[message]\" (Photo)"
- return "\"[message]\""
+ return "\"[data["message"]]\" (Photo)"
+ return "\"[data["message"]]\""
/datum/signal/subspace/pda/broadcast()
if (!logged) // Can only go through if a message server logs it
diff --git a/code/game/mecha/equipment/tools/other_tools.dm b/code/game/mecha/equipment/tools/other_tools.dm
index fdb620cc67..5a907804ce 100644
--- a/code/game/mecha/equipment/tools/other_tools.dm
+++ b/code/game/mecha/equipment/tools/other_tools.dm
@@ -283,7 +283,7 @@
/obj/item/mecha_parts/mecha_equipment/tesla_energy_relay/proc/get_charge()
if(equip_ready) //disabled
return
- var/area/A = get_area(chassis)
+ var/area/A = get_base_area(chassis)
var/pow_chan = get_power_channel(A)
if(pow_chan)
return 1000 //making magic
@@ -328,7 +328,7 @@
occupant_message("No powercell detected.")
return
if(cur_charge < chassis.cell.maxcharge)
- var/area/A = get_area(chassis)
+ var/area/A = get_base_area(chassis)
if(A)
var/pow_chan
for(var/c in list(EQUIP,ENVIRON,LIGHT))
diff --git a/code/game/objects/effects/effect_system/effect_system.dm b/code/game/objects/effects/effect_system/effect_system.dm
index ddc805f3ff..05077bf898 100644
--- a/code/game/objects/effects/effect_system/effect_system.dm
+++ b/code/game/objects/effects/effect_system/effect_system.dm
@@ -48,6 +48,8 @@ would spawn and follow the beaker, even if it is carried or thrown.
holder = atom
/datum/effect_system/proc/start()
+ if(QDELETED(src))
+ return
for(var/i in 1 to number)
if(total_effects > 20)
return
@@ -69,7 +71,8 @@ would spawn and follow the beaker, even if it is carried or thrown.
for(var/j in 1 to steps_amt)
sleep(5)
step(E,direction)
- addtimer(CALLBACK(src, .proc/decrement_total_effect), 20)
+ if(!QDELETED(src))
+ addtimer(CALLBACK(src, .proc/decrement_total_effect), 20)
/datum/effect_system/proc/decrement_total_effect()
total_effects--
diff --git a/code/game/objects/effects/effect_system/effects_foam.dm b/code/game/objects/effects/effect_system/effects_foam.dm
index aabf9acafa..38a1a6089e 100644
--- a/code/game/objects/effects/effect_system/effects_foam.dm
+++ b/code/game/objects/effects/effect_system/effects_foam.dm
@@ -126,7 +126,7 @@
T.PlaceOnTop(/turf/open/floor/plating/foam, flags = CHANGETURF_INHERIT_AIR)
for(var/direction in GLOB.cardinals)
var/turf/cardinal_turf = get_step(T, direction)
- if(get_area(cardinal_turf) != get_area(T)) //We're at an area boundary, so let's block off this turf!
+ if(get_base_area(cardinal_turf) != get_area(T)) //We're at an area boundary, so let's block off this turf!
new/obj/structure/foamedmetal(T)
break
flick("[icon_state]-disolve", src)
diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm
index 8f09827bd2..3d63f4a553 100644
--- a/code/game/objects/effects/landmarks.dm
+++ b/code/game/objects/effects/landmarks.dm
@@ -456,7 +456,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player)
if(!SSmapping.station_room_templates[t])
log_world("Station room spawner placed at ([T.x], [T.y], [T.z]) has invalid ruin name of \"[t]\" in its list")
templates -= t
- template_name = pickweight(templates)
+ template_name = pickweightAllowZero(templates)
if(!template_name)
GLOB.stationroom_landmarks -= src
qdel(src)
@@ -485,4 +485,4 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player)
// Landmark for the mining station
/obj/effect/landmark/stationroom/lavaland/station
templates = list("Public Mining Base" = 3)
- icon = 'icons/rooms/Lavaland/Mining.dmi'
\ No newline at end of file
+ icon = 'icons/rooms/Lavaland/Mining.dmi'
diff --git a/code/game/objects/items/cigs_lighters.dm b/code/game/objects/items/cigs_lighters.dm
index 49985f5c23..1186ea8001 100644
--- a/code/game/objects/items/cigs_lighters.dm
+++ b/code/game/objects/items/cigs_lighters.dm
@@ -146,7 +146,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
if(!proximity || lit) //can't dip if cigarette is lit (it will heat the reagents in the glass instead)
return
if(istype(glass)) //you can dip cigarettes into beakers
- if(glass.reagents.trans_to(src, chem_volume)) //if reagents were transfered, show the message
+ if(glass.reagents.trans_to(src, chem_volume, log = "cigar fill: dip cigarette")) //if reagents were transfered, show the message
to_chat(user, "You dip \the [src] into \the [glass].")
else //if not, either the beaker was empty, or the cigarette was full
if(!glass.reagents.total_volume)
@@ -154,7 +154,6 @@ CIGARETTE PACKETS ARE IN FANCY.DM
else
to_chat(user, "[src] is full.")
-
/obj/item/clothing/mask/cigarette/proc/light(flavor_text = null)
if(lit)
return
@@ -438,7 +437,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
packeditem = 1
name = "[O.name]-packed [initial(name)]"
if(O.reagents)
- O.reagents.trans_to(src, O.reagents.total_volume)
+ O.reagents.trans_to(src, O.reagents.total_volume, log = "cigar fill: pipe pack")
qdel(O)
else
to_chat(user, "It has to be dried first!")
@@ -687,7 +686,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
if(O.dry)
var/obj/item/clothing/mask/cigarette/rollie/R = new /obj/item/clothing/mask/cigarette/rollie(user.loc)
R.chem_volume = target.reagents.total_volume
- target.reagents.trans_to(R, R.chem_volume)
+ target.reagents.trans_to(R, R.chem_volume, log = "cigar fill: rolling paper afterattack")
qdel(target)
qdel(src)
user.put_in_active_hand(R)
@@ -903,7 +902,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
//Transfer reagents and remove the plant
user.show_message("You stuff the [DP] into the [src]'s bowl.", MSG_VISUAL)
- DP.reagents.trans_to(src, 100)
+ DP.reagents.trans_to(src, 100, log = "cigar fill: bong")
qdel(DP)
return
else
diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm
index 143354b496..cb77a58769 100644
--- a/code/game/objects/items/crayons.dm
+++ b/code/game/objects/items/crayons.dm
@@ -427,7 +427,7 @@
/obj/item/toy/crayon/proc/can_claim_for_gang(mob/user, atom/target)
// Check area validity.
// Reject space, player-created areas, and non-station z-levels.
- var/area/A = get_area(target)
+ var/area/A = get_base_area(target)
if(!A || (!is_station_level(A.z)) || !A.valid_territory)
to_chat(user, "[A] is unsuitable for tagging.")
return FALSE
@@ -461,7 +461,7 @@
qdel(old_marking)
var/datum/antagonist/gang/G = user.mind.has_antag_datum(/datum/antagonist/gang)
- var/area/territory = get_area(target)
+ var/area/territory = get_base_area(target)
new /obj/effect/decal/cleanable/crayon/gang(target,G.gang,"graffiti",0,user) // Heres the gang tag.
to_chat(user, "You tagged [territory] for your gang!")
diff --git a/code/game/objects/items/defib.dm b/code/game/objects/items/defib.dm
index 07d58c1754..386b1fe668 100644
--- a/code/game/objects/items/defib.dm
+++ b/code/game/objects/items/defib.dm
@@ -452,14 +452,15 @@
return TRUE
/obj/item/twohanded/shockpaddles/proc/shock_touching(dmg, mob/H)
- if(req_defib)
- if(defib.pullshocksafely && isliving(H.pulledby))
- H.visible_message("The defibrillator safely discharges the excessive charge into the floor!")
- else
- var/mob/living/M = H.pulledby
- if(M.electrocute_act(30, src))
- M.visible_message("[M] is electrocuted by [M.p_their()] contact with [H]!")
- M.emote("scream")
+ if(!H.pulledby || !isliving(H.pulledby))
+ return
+ if(req_defib && defib.pullshocksafely)
+ H.visible_message("The defibrillator safely discharges the excessive charge into the floor!")
+ return
+ var/mob/living/M = H.pulledby
+ if(M.electrocute_act(30, src))
+ M.visible_message("[M] is electrocuted by [M.p_their()] contact with [H]!")
+ M.emote("scream")
/obj/item/twohanded/shockpaddles/proc/do_disarm(mob/living/M, mob/living/user)
if(req_defib && defib.safety)
diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm
index f80dd366be..abab4af770 100644
--- a/code/game/objects/items/devices/PDA/PDA.dm
+++ b/code/game/objects/items/devices/PDA/PDA.dm
@@ -1,4 +1,3 @@
-
//The advanced pea-green monochrome lcd of tomorrow.
GLOBAL_LIST_EMPTY(PDAs)
@@ -77,6 +76,7 @@ GLOBAL_LIST_EMPTY(PDAs)
var/hidden = FALSE // Is the PDA hidden from the PDA list?
var/emped = FALSE
var/equipped = FALSE //used here to determine if this is the first time its been picked up
+ var/allow_emojis = TRUE //if the pda can send emojis and actually have them parsed as such
var/obj/item/card/id/id = null //Making it possible to slot an ID card into the PDA so it can function as both.
var/ownjob = null //related to above
@@ -255,10 +255,14 @@ GLOBAL_LIST_EMPTY(PDAs)
var/datum/asset/spritesheet/assets = get_asset_datum(/datum/asset/spritesheet/simple/pda)
assets.send(user)
+ var/datum/asset/spritesheet/emoji_s = get_asset_datum(/datum/asset/spritesheet/goonchat)
+ emoji_s.send(user) //Already sent by chat but no harm doing this
+
user.set_machine(src)
var/dat = "
Personal Data Assistant"
dat += assets.css_tag()
+ dat += emoji_s.css_tag()
dat += "[PDAIMG(refresh)]Refresh"
@@ -338,6 +342,8 @@ GLOBAL_LIST_EMPTY(PDAs)
dat += "
"
+ emoji_table = collate.Join()
+
+ menu += " To use an emoji in a pda message, refer to the guide and add \":\" around the emoji. Your PDA supports the following emoji: "
+ menu += emoji_table
+
if (99) //Newscaster message permission error
menu = "
ERROR : NOT AUTHORIZED [host_pda.id ? "" : "- ID SLOT EMPTY"]
"
@@ -679,6 +695,11 @@ Code:
return
playsound(src, 'sound/machines/terminal_select.ogg', 50, 1)
+ //emoji previews
+ if(href_list["emoji"])
+ var/parse = emoji_parse(":[href_list["emoji"]]:")
+ to_chat(usr, parse)
+
//Bot control section! Viciously ripped from radios for being laggy and terrible.
if(href_list["op"])
switch(href_list["op"])
diff --git a/code/game/objects/items/devices/desynchronizer.dm b/code/game/objects/items/devices/desynchronizer.dm
index ff58af2405..0fa557f666 100644
--- a/code/game/objects/items/devices/desynchronizer.dm
+++ b/code/game/objects/items/devices/desynchronizer.dm
@@ -14,6 +14,7 @@
var/last_use = 0
var/next_use = 0
var/obj/effect/abstract/sync_holder/sync_holder
+ var/resync_timer
/obj/item/desynchronizer/attack_self(mob/living/user)
if(world.time < next_use)
@@ -56,16 +57,20 @@
SEND_SIGNAL(AM, COMSIG_MOVABLE_SECLUDED_LOCATION)
last_use = world.time
icon_state = "desynchronizer-on"
- addtimer(CALLBACK(src, .proc/resync), duration)
+ resync_timer = addtimer(CALLBACK(src, .proc/resync), duration , TIMER_STOPPABLE)
/obj/item/desynchronizer/proc/resync()
new /obj/effect/temp_visual/desynchronizer(sync_holder.drop_location())
QDEL_NULL(sync_holder)
+ if(resync_timer)
+ deltimer(resync_timer)
+ resync_timer = null
icon_state = initial(icon_state)
next_use = world.time + (world.time - last_use) // Could be 2*world.time-last_use but that would just be confusing
/obj/item/desynchronizer/Destroy()
- resync()
+ if(sync_holder)
+ resync()
return ..()
/obj/effect/abstract/sync_holder
diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm
index e958345d4f..31dd6d32a3 100644
--- a/code/game/objects/items/stacks/sheets/sheet_types.dm
+++ b/code/game/objects/items/stacks/sheets/sheet_types.dm
@@ -309,6 +309,15 @@ GLOBAL_LIST_INIT(bamboo_recipes, list ( \
recipes = GLOB.bamboo_recipes
return ..()
+/obj/item/stack/sheet/mineral/bamboo/ten
+ amount = 10
+
+/obj/item/stack/sheet/mineral/bamboo/twenty
+ amount = 20
+
+/obj/item/stack/sheet/mineral/bamboo/fifty
+ amount = 50
+
/*
* Cloth
*/
diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm
index 5f3fc48eb7..0c1239e887 100644
--- a/code/game/objects/objs.dm
+++ b/code/game/objects/objs.dm
@@ -178,7 +178,7 @@
machine = null
//called when the user unsets the machine.
-/atom/movable/proc/on_unset_machine(mob/user)
+/atom/proc/on_unset_machine(mob/user)
return
/mob/proc/set_machine(obj/O)
diff --git a/code/game/objects/structures/ai_core.dm b/code/game/objects/structures/ai_core.dm
index 5b9a764925..fcd1f80a4f 100644
--- a/code/game/objects/structures/ai_core.dm
+++ b/code/game/objects/structures/ai_core.dm
@@ -52,7 +52,7 @@
var/area/A = get_area(src)
if(!A.blob_allowed)
return FALSE
- if(!A.power_equip)
+ if(!A.powered(EQUIP))
return FALSE
if(!SSmapping.level_trait(T.z,ZTRAIT_STATION))
return FALSE
diff --git a/code/game/objects/structures/barsigns.dm b/code/game/objects/structures/barsigns.dm
index 053512a256..b72a4b816e 100644
--- a/code/game/objects/structures/barsigns.dm
+++ b/code/game/objects/structures/barsigns.dm
@@ -305,7 +305,7 @@
/datum/barsign/meow_mix
name = "Meow Mix"
- icon = "meow_mix"
+ icon = "Meow Mix"
desc = "No, we don't serve catnip, officer!"
/datum/barsign/hiddensigns
diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm
index 9a095bf69d..daf15832fb 100644
--- a/code/game/objects/structures/crates_lockers/closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets.dm
@@ -532,7 +532,7 @@
/obj/structure/closet/CtrlShiftClick(mob/living/user)
if(!HAS_TRAIT(user, TRAIT_SKITTISH))
return ..()
- if(!user.canUseTopic(src) || !isturf(user.loc))
+ if(!user.canUseTopic(src) || !isturf(user.loc) || !user.Adjacent(src) || !user.CanReach(src))
return
dive_into(user)
diff --git a/code/game/objects/structures/displaycase.dm b/code/game/objects/structures/displaycase.dm
index 8c25a2ca5c..70533df0ad 100644
--- a/code/game/objects/structures/displaycase.dm
+++ b/code/game/objects/structures/displaycase.dm
@@ -80,7 +80,7 @@
/obj/structure/displaycase/proc/trigger_alarm()
//Activate Anti-theft
if(alert)
- var/area/alarmed = get_area(src)
+ var/area/alarmed = get_base_area(src)
alarmed.burglaralert(src)
playsound(src, 'sound/effects/alert.ogg', 50, 1)
diff --git a/code/game/objects/structures/door_assembly.dm b/code/game/objects/structures/door_assembly.dm
index 271ae72d47..f35e9e7d55 100644
--- a/code/game/objects/structures/door_assembly.dm
+++ b/code/game/objects/structures/door_assembly.dm
@@ -205,6 +205,9 @@
if(!mineral)
if(istype(G, /obj/item/stack/sheet/mineral) && G.sheettype)
var/M = G.sheettype
+ var/mineralassembly = text2path("/obj/structure/door_assembly/door_assembly_[M]")
+ if(!mineralassembly)
+ return
if(G.get_amount() >= 2)
playsound(src, 'sound/items/crowbar.ogg', 100, 1)
user.visible_message("[user] adds [G.name] to the airlock assembly.", \
@@ -214,7 +217,6 @@
return
to_chat(user, "You install [M] plating into the airlock assembly.")
G.use(2)
- var/mineralassembly = text2path("/obj/structure/door_assembly/door_assembly_[M]")
var/obj/structure/door_assembly/MA = new mineralassembly(loc)
transfer_assembly_vars(src, MA, TRUE)
else
diff --git a/code/game/objects/structures/false_walls.dm b/code/game/objects/structures/false_walls.dm
index d7e2d5564a..52441c2987 100644
--- a/code/game/objects/structures/false_walls.dm
+++ b/code/game/objects/structures/false_walls.dm
@@ -7,7 +7,7 @@
anchored = TRUE
icon = 'icons/turf/walls/wall.dmi'
icon_state = "wall"
- layer = CLOSED_TURF_LAYER
+ layer = LOW_OBJ_LAYER
density = TRUE
opacity = 1
max_integrity = 100
diff --git a/code/game/objects/structures/ghost_role_spawners.dm b/code/game/objects/structures/ghost_role_spawners.dm
index 7690320159..e9d9e4ce77 100644
--- a/code/game/objects/structures/ghost_role_spawners.dm
+++ b/code/game/objects/structures/ghost_role_spawners.dm
@@ -637,7 +637,7 @@
short_desc = "You are a Ghost Cafe Visitor!"
flavour_text = "You know one thing for sure. You arent actually alive. Are you in a simulation?"
skip_reentry_check = TRUE
- banType = "ghostcafe"
+ banType = ROLE_GHOSTCAFE
/datum/action/toggle_dead_chat_mob
icon_icon = 'icons/mob/mob.dmi'
@@ -660,12 +660,14 @@
/obj/effect/mob_spawn/human/ghostcafe/special(mob/living/carbon/human/new_spawn)
if(new_spawn.client)
new_spawn.client.prefs.copy_to(new_spawn)
+ var/area/A = get_area(src)
var/datum/outfit/O = new /datum/outfit/ghostcafe()
O.equip(new_spawn, FALSE, new_spawn.client)
SSjob.equip_loadout(null, new_spawn, FALSE)
SSquirks.AssignQuirks(new_spawn, new_spawn.client, TRUE, TRUE, null, FALSE, new_spawn)
new_spawn.AddElement(/datum/element/ghost_role_eligibility)
new_spawn.AddElement(/datum/element/dusts_on_catatonia)
+ new_spawn.AddElement(/datum/element/dusts_on_leaving_area,list(A.type,/area/hilbertshotel))
ADD_TRAIT(new_spawn, TRAIT_SIXTHSENSE, GHOSTROLE_TRAIT)
ADD_TRAIT(new_spawn,TRAIT_EXEMPT_HEALTH_EVENTS,GHOSTROLE_TRAIT)
ADD_TRAIT(new_spawn,TRAIT_PACIFISM,GHOSTROLE_TRAIT)
diff --git a/code/game/objects/structures/girders.dm b/code/game/objects/structures/girders.dm
index 94619e1858..7c373f2734 100644
--- a/code/game/objects/structures/girders.dm
+++ b/code/game/objects/structures/girders.dm
@@ -166,6 +166,9 @@
if(S.sheettype && S.sheettype != "runed")
var/M = S.sheettype
if(state == GIRDER_DISPLACED)
+ var/F = text2path("/obj/structure/falsewall/[M]")
+ if(!F)
+ return
if(S.get_amount() < 2)
to_chat(user, "You need at least two sheets to create a false wall!")
return
@@ -174,11 +177,13 @@
return
S.use(2)
to_chat(user, "You create a false wall. Push on it to open or close the passage.")
- var/F = text2path("/obj/structure/falsewall/[M]")
var/obj/structure/FW = new F (loc)
transfer_fingerprints_to(FW)
qdel(src)
else
+ var/F = text2path("/turf/closed/wall/mineral/[M]")
+ if(!F)
+ return
if(S.get_amount() < 2)
to_chat(user, "You need at least two sheets to add plating!")
return
@@ -189,7 +194,7 @@
S.use(2)
to_chat(user, "You add the plating.")
var/turf/T = get_turf(src)
- T.PlaceOnTop(text2path("/turf/closed/wall/mineral/[M]"))
+ T.PlaceOnTop(F)
transfer_fingerprints_to(T)
qdel(src)
return
diff --git a/code/game/objects/structures/guillotine.dm b/code/game/objects/structures/guillotine.dm
index 3b4bbea559..611a6d024d 100644
--- a/code/game/objects/structures/guillotine.dm
+++ b/code/game/objects/structures/guillotine.dm
@@ -97,7 +97,7 @@
icon_state = "guillotine_raised"
/obj/structure/guillotine/proc/drop_blade(mob/user)
- if (buckled_mobs.len && blade_sharpness)
+ if (has_buckled_mobs() && blade_sharpness)
var/mob/living/carbon/human/H = buckled_mobs[1]
if (!H)
diff --git a/code/game/objects/structures/headpike.dm b/code/game/objects/structures/headpike.dm
index ceed9cb759..81433b562d 100644
--- a/code/game/objects/structures/headpike.dm
+++ b/code/game/objects/structures/headpike.dm
@@ -42,8 +42,9 @@
if(.)
return
to_chat(user, "You take down [src].")
- victim.forceMove(drop_location())
- victim = null
+ if(victim)
+ victim.forceMove(drop_location())
+ victim = null
spear.forceMove(drop_location())
spear = null
qdel(src)
\ No newline at end of file
diff --git a/code/game/objects/structures/mirror.dm b/code/game/objects/structures/mirror.dm
index 0a5794c59d..90408472e9 100644
--- a/code/game/objects/structures/mirror.dm
+++ b/code/game/objects/structures/mirror.dm
@@ -20,14 +20,14 @@
return
if(broken || !Adjacent(user))
return
-
+
if(ishuman(user))
var/mob/living/carbon/human/H = user
//see code/modules/mob/dead/new_player/preferences.dm at approx line 545 for comments!
//this is largely copypasted from there.
//handle facial hair (if necessary)
- if(H.gender == MALE)
+ if(H.gender != FEMALE)
var/new_style = input(user, "Select a facial hair style", "Grooming") as null|anything in GLOB.facial_hair_styles_list
if(!user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK))
return //no tele-grooming
diff --git a/code/game/turfs/simulated/wall/mineral_walls.dm b/code/game/turfs/simulated/wall/mineral_walls.dm
index be46d124ea..d55cb0b475 100644
--- a/code/game/turfs/simulated/wall/mineral_walls.dm
+++ b/code/game/turfs/simulated/wall/mineral_walls.dm
@@ -138,7 +138,8 @@
var/duration = (48/W.force) * 2 //In seconds, for now.
if(istype(W, /obj/item/hatchet) || istype(W, /obj/item/twohanded/fireaxe))
duration /= 4 //Much better with hatchets and axes.
- if(do_after(user, duration*10, target=src)) //Into deciseconds.
+ var/src_type = type
+ if(do_after(user, duration*10, target=src) && type == src_type) //Into deciseconds.
dismantle_wall(FALSE,FALSE)
return
return ..()
diff --git a/code/game/world.dm b/code/game/world.dm
index 3c067a5038..8e18f2ea51 100644
--- a/code/game/world.dm
+++ b/code/game/world.dm
@@ -117,6 +117,7 @@ GLOBAL_LIST(topic_status_cache)
GLOB.world_job_debug_log = "[GLOB.log_directory]/job_debug.log"
GLOB.tgui_log = "[GLOB.log_directory]/tgui.log"
GLOB.subsystem_log = "[GLOB.log_directory]/subsystem.log"
+ GLOB.reagent_log = "[GLOB.log_directory]/reagents.log"
GLOB.world_crafting_log = "[GLOB.log_directory]/crafting.log"
@@ -135,6 +136,7 @@ GLOBAL_LIST(topic_status_cache)
start_log(GLOB.world_job_debug_log)
start_log(GLOB.tgui_log)
start_log(GLOB.subsystem_log)
+ start_log(GLOB.reagent_log)
start_log(GLOB.world_crafting_log)
GLOB.changelog_hash = md5('html/changelog.html') //for telling if the changelog has changed recently
diff --git a/code/modules/VR/vr_sleeper.dm b/code/modules/VR/vr_sleeper.dm
index 7cda24d98b..29d7224950 100644
--- a/code/modules/VR/vr_sleeper.dm
+++ b/code/modules/VR/vr_sleeper.dm
@@ -222,18 +222,23 @@
/obj/effect/vr_clean_master/Initialize()
. = ..()
- vr_area = get_area(src)
- addtimer(CALLBACK(src, .proc/clean_up), 3 MINUTES)
+ vr_area = get_base_area(src)
+ if(!vr_area)
+ return INITIALIZE_HINT_QDEL
+ addtimer(CALLBACK(src, .proc/clean_up), 3 MINUTES, TIMER_LOOP)
/obj/effect/vr_clean_master/proc/clean_up()
- if (vr_area)
- for (var/obj/item/ammo_casing/casing in vr_area)
- qdel(casing)
- for(var/obj/effect/decal/cleanable/C in vr_area)
- qdel(C)
- for (var/A in corpse_party)
- var/mob/M = A
- if(M && M.stat == DEAD && get_area(M) == vr_area)
- qdel(M)
- corpse_party -= M
- addtimer(CALLBACK(src, .proc/clean_up), 3 MINUTES)
+ if (!vr_area)
+ qdel(src)
+ return
+ var/list/contents = get_sub_areas_contents(vr_area)
+ for (var/obj/item/ammo_casing/casing in contents)
+ qdel(casing)
+ for(var/obj/effect/decal/cleanable/C in contents)
+ qdel(C)
+ for (var/A in corpse_party)
+ var/mob/M = A
+ if(!QDELETED(M) && (M in contents) && M.stat == DEAD)
+ qdel(M)
+ corpse_party -= M
+ addtimer(CALLBACK(src, .proc/clean_up), 3 MINUTES)
diff --git a/code/modules/admin/secrets.dm b/code/modules/admin/secrets.dm
index 70ae133a31..d7af763244 100644
--- a/code/modules/admin/secrets.dm
+++ b/code/modules/admin/secrets.dm
@@ -408,7 +408,7 @@
var/obj/item/organ/tail/cat/tail = new
ears.Insert(H, drop_if_replaced=FALSE)
tail.Insert(H, drop_if_replaced=FALSE)
- var/list/honorifics = list("[MALE]" = list("kun"), "[FEMALE]" = list("chan","tan"), "[NEUTER]" = list("san")) //John Robust -> Robust-kun
+ var/list/honorifics = list("[MALE]" = list("kun"), "[FEMALE]" = list("chan","tan"), "[NEUTER]" = list("san"), "[PLURAL]" = list("san")) //John Robust -> Robust-kun
var/list/names = splittext(H.real_name," ")
var/forename = names.len > 1 ? names[2] : names[1]
var/newname = "[forename]-[pick(honorifics["[H.gender]"])]"
diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index c66927b856..c76ecb52f5 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -845,7 +845,11 @@
dat += "
the user of a sepia slime extract is no longer immune to the time field
+
chilling sepia is now the support extract - it always freezes the user, but not other marked people. give one to your golem!
+
burning sepia spawns the rewind camera. Take a selfie with someone and give it to them to make sure they remember the moment forever! You don't actually need to give them the photo, they'll remember anyway. Keep it as a reminder.
+
rewinding (deja vu) effect resets your location to the turf you were on after 10 seconds as well as resetting limbs/mobs/objects damage to the point it was added.
+
The deja vu effect cannot resurrect the dead, but will heal their corpse. New limbs fall off, old ones re-attach
+
Regenerative sepia cores add a deja vu effect before healing instead of a timestop remove: timefreeze camera is admin spawn only.
+
recurring sepia recalls to the hand of the last person to touch it after activating. Reusable timestop grenades!
+
some special cameras don't prompt for customisation
+
timefreeze camera actually makes a photo
+
timestop stops pathing and mechs.
+
adds a check to make sure simple_animals don't get their AI toggled while sentient
+
Adds the timestop overlay to frozen projectiles
+
Timestopped things have INFINITY move_resist as opposed to being anchored
+
Timestop will now unfreeze things that somehow leave it
+
mobs in the middle of a walk_to will have their walk stopped by timestop
+
mobs that are stunned will be stopped mid walk as well
+
pulling respects changes in move_force
+
swapping places respects move_force if the participant is not willing
+
timestop is properly defeated by antimagic.
+
timestop only checks antimagic once
+
Time stop now applies its visual effect on floors, walls and static structures (with no change otherwise)
+
Movable structures are now anchored while time stopped.
+
Timestop effects now prevent speech.
+
+
AffectedArc07 updated:
+
+
All code files are now in the LF line format, please stick to it
+
Added CI step to check for CRLF files
+
Line ending CI works now
+
+
Arkatos, Zxaber, Ghommie updated:
+
+
Certain AI abilities now dynamically show their remaining uses on the mouse hover over their respective action buttons.
+
Malfunctioning AIs can no longer abuse the confirmation popup to create extra (unstoppable) doomsdays.
+
Fixed AIs being able to use some of their abilities such as the doomsday whilst dead, and the doomsday loading phase not halting upon AI death.
+
+
Arturlang updated:
+
+
Vampires are no longer as tanky
+
Added modular computers to the loadout
+
+
Bhijn updated:
+
+
Limbs now regenerate their stamina faster while disabled
+
Limbs now have the same incoming stamina damage multiplier mechanics as spacemen, where the more staminaloss they take while disabled, the less staminaloss they'll take.
+
Limbs have had their base stamina regen rate doubled to match the doubled stamina regen rate of standard spacemen.
+
Added a preference to make the sprint hotkey be a toggle instead of a hold bind
+
Added a preference to bind the sprint hotkey to space instead of shift.
+
server_hop can no longer be used to remotely lobotomize a spaceman
+
+
Bhijn helped updated:
+
+
Fixes Dragon's Tooth Sword 50% armor penetration by making it 35%
+
+
BonniePandora updated:
+
+
Added another SDQL option. Using "UPDATE selectors SET #null=value" will now resolve value and discard the return. This is useful if you only care about the side effect of a proc.
+
+
CameronWoof updated:
+
+
Ghost Cafe patrons now spawn with chameleon kits. Dress up! Be fancy!
+
Robots can now check the crew manifest from anywhere with the "View Crew Manifest" verb.
+
Lizard tails are now viable options for humans and anthromorphs.
+
+
Commandersand updated:
+
+
fixed some clothnig sprites
+
lightning bolt,tesla,forcewall,emp spells have lower cooldown
+
fireball has a 10 second starting cooldown
+
+
DeltaFire15 updated:
+
+
Vitality matrixes now correctly succ slimes
+
+
Denton, ported by Hatterhat updated:
+
+
Most upgradeable machines now show their upgrade status when examined while standing right next to them.
+
Added examine messages to teleporter stations that hint at their multitool/wirecutter interactions.
+
Renamed teleporter stations from station to teleporter station.
+
Changed the teleporter hub accurate var to accuracy; the old name misled people into thinking that it was a boolean.
+
+
Detective-Google updated:
+
+
replaced the sprites with new ones requested.
+
+
EmeraldSundisk updated:
+
+
Adds a sign outside MetaStation's custodial closet
+
+
FantasticFwoosh, ported by Hatterhat updated:
+
+
Both reagent universal enzyme & sacks of flour are now available for their respective costs from the biogenerator.
+
New crafting recipies for donut boxes, eggboxes & candle boxes have been added to cardboard recipes for the collective benefit of service personnel and the station.
+
+
Ghommie updated:
+
+
Attached kevlar/soft/plastic padding accessories are now stealthier and will no longer be displayed on mob examine.
+
Refactored that mess of a code for alternate worn clothing sprites for digitigrade and taurs.
+
Fixed some issues with the aforementioned feature you may or may not have experienced because it was pretty lame.
+
Fixed missing digi versions fishnet sprites and wrong digitigrade left dir purple stockings sprite.
+
Add digitigrade versions for boxers and the long johns.
+
Fixed the secret sauce recipe being randomized every round.
+
Fixed singularity pulls duping rods out of engine floors.
+
Removed an old pair of zipties from the captain closet.
+
Chestbursters won't delete the host's brain somewhat anymore.
+
Fixed roundstart mushpeople being unable to MUSH PUUUUUUUUUUUUNCH!!
+
Lattices can be examined yet again.
+
Made reagent containers examine text less annoying.
+
Virus food dispensers dispense virus food again.
+
Borg hypos inputs do not display typepaths anymore.
+
Restored chem dispensers alphabetical order.
+
Sanitized cargo export messages for reagents.
+
Riot foam dart (not the ammo box) design cost is yet again consistent with the result's material amount.
+
Fixed a little exploit with ventcrawlers being capable of escaping closed turfs by printing scrubbers/vents into them.
+
deconstructing a rubber toolbox with the destructive analyzer won't "lock" the machine anymore.
+
Something about empty hand combat mode right click waving hands defying common sense and being spammy.
+
Towels are now "digitigrade-friendly".
+
The Barefoot drink and mousetraps will now work even if wearing certain "feet-less shoes".
+
Refactored code to allow all living mobs to use shields and not only humans.
+
Monkys will now retaliate against aliens attacking them (as if they even posed a threat to start with).
+
add a click cooldown to the overly spammable table slamming.
All atom movables now have move force and move resist, and pull force An atom can only pull another atom if its pull force is stronger than that atom's move resist
+
Mobs with a higher move force than an atom's move resist will automatically try to force the atom out of its way. This might not always work, depending on how snowflakey code is. experimental: As of right now, everything has a move force and resist of 100, and a pull force of 101. Things take (resist - force) damage when bumped into experimental: Failing to move onto a tile will now still bump up your last move timer. However, successfully pushing something out of your way will result in you automatically moving into where it was.
+
Bolted AIs can no longer be teleported by launchpads.
+
Megafauna cannot teleport
+
+
Hatterhat updated:
+
+
Beakers are generally more useful now, with slight capacity increases.
+
Transfer amounts are different now. Adjust your muscle memory to compensate.
+
ore redemption machines actually get affected by lasers again kthx
+
crusher trophy drop chance on mining mobs increased to 1 in 4 (from 1 in 20)
+
Blood-drunk buff from blood-drunk eye crusher trophy is less likely to cripple its user.
+
Forcefield projectors now fit on toolbelts.
+
New sprites for ATMOS holofan and forcefield projectors!
+
tweaks some values around with beaker transfer amounts, adds a transfer value verb (altclick)
+
Syndicate sleepers (read: the ones that're red and have controls in them) can now be recreated with a sufficient basis in nonstandard (read: illegal) technologies!
+
Explorer hoods on standard explorer suits can be reinforced with goliath hide plates again.
+
A shipment of Staff Assistant jumpsuits from the Goon-operated stations appear to have made their way into your loadout selections - and into the contraband list from ClothesMates...
+
Dropped Exo-suit armor to put it more in line with being an explorer suit sidegrade and not a straight upgrade for Lavaland usage.
+
You can now print .357 AP speedloaders from Security techfabs after you pick up the Advanced Non-Standard Ballistics node.
+
Forensic scanner removed from Advanced Biotechnology node.
+
Ash Drake armor now has goliath resistance, same as the Exo-suit.
+
+
KathrinBailey updated:
+
+
Empty engineering lockers for mappers.
+
Industrial welding tools to the engineer welding locker.
+
Removed the multitool, airlock painter, mechanical toolbox, brown sneakers, hazard vest and airlock painter from the CE's locker.
+
+
KeRSedChaplain updated:
+
+
The clockwork cuirass can now support slithering taur bodies.
+
+
Kevinz000 updated:
+
+
Fixes successful projectile hits also striking another atom on the same turf should the first one be not the target the projectile was meant for.
+
Removes infinite reflector loops.
+
+
Kraseo updated:
+
+
Jelly donuts and pink jelly donuts will now properly display sprinkled icon state.
+
Jelly donuts and its variants will properly spawn with berry juice.
+
Slime jelly donuts have slime jelly in them now. (thanks ghommie)
+
Virgo hairstyles no longer have those annoying quotation marks. Rejoice for you will no longer have to use the scrollbar.
+
Got rid of some strange-looking hairstyles. (Tbob, fingerweave, etc.)
+
+
LetterN updated:
+
+
Doppler logs
+
Shockcolar and electropack uses the new signaler ui
+
Renaming shockcolar requires a pen
+
Adds banjo
+
+
Linzolle updated:
+
+
fixes matchboxes runtiming every time they spawn
+
+
MrJWhit updated:
+
+
Increases plasma usage in radiation collectors
+
+
Naksu updated:
+
+
reagent IDs have been removed in favor using reagent typepaths where applicable
+
mechas, borg hyposprays etc no longer display internal reagent ids to the player
+
+
Owai-Seek updated:
+
+
Four New Bounties
+
tweaked several bounties
+
reorganised several bounties
+
balanced several bounties
+
added shady jims to vendor
+
Towel, Bedsheet, and Colored bedsheet bins to Dojo. Some lockers with carpets and wood, another bathroom/shower, tons of cleaning supplies, some additional trash cans, a tiny medical area, and some vendors/vendor resupplies. Also added some Ambrosia Gaia seeds.
+
Moved some lights around, extended the dojo a bit to make it feel more spacious.
+
Cafe Newsfeed Frame
+
+
PersianXerxes updated:
+
+
Reduces the range of the forcefield projector from 7 tiles to 2 tiles.
+
+
Putnam updated:
+
+
Alcohol intolerance trait, which forces vomiting on any alcohol ingestion
+
Arousal damage is gone, and with it the arousal damage heart on the UI.
+
As exhibitionist relied on arousal damage, that's gone too.
+
Bonermeter and electronic stimulation circuit modules are gone.
+
Masturbation is no longer an option in the climax menu. It was identical to climax alone in every way but text. Emote it out.
+
Arousal on genitals can now be displayed manually, on a case-by-case basis.
+
"Climax alone" and "climax with partner" now only display to the people directly involved in the interaction. rework: Catnip tea, catnip, crocin, hexacrocin, camphor, hexacamphor all had functions or bits of functions reworked.
+
"Climax with partner" now requires consent from both parties--it can no longer be used on mindless mobs, and it asks the mob getting climaxed with if they consent first.
+
A lot of MKUltra behaviors have been moved to hypno checks or removed due to reliance on maso/nympho/exhib.
+
Cold-blooded quirk
+
Two relief valves for atmospherics, available in your RPD today: a unary one that opens to air and a binary one that connects two pipenets, like a manual valve.
+
The atmos waste outlet injector on box has been replaced with an atmos waste relief valve.
+
+
Putnam3145 updated:
+
+
Dynamic storytellers, a new voting paradigm for dynamic
+
Support for approval voting and condorcet (ranked choice) voting in server votes
+
Ghost cafe mobs can now ghostize
+
Ghost cafe now has a cremator
+
Ghost cafe mobs are now eligible for ghost roles
+
Ghost roles now use an element for eligibility purposes
+
You can toggle some prefs properly now.
+
no ass slap is no longer the same thing as no aphro
+
Devastating bombs kills bomb armor'd mobs again
+
Added a sort of "game mode ban" by way of having people rank their game modes favorite to least favorite after the secret/extended vote.
+
Turns out the schulze scoring was written wrong and it was setting things to 0 that shouldn't have been, so that's fixed.
+
Random engines are now weighted.
+
Ghost dojo now has an autoylathe.
+
Ghost dojo no longer has VR or modular computer access.
+
Ghost dojo mobs are pacifists.
+
Ghost dojo booze-o-mat is now all access.
+
Ghost dojo crematorium now has a button.
+
Traitor objectives don't take a dump when they try to add an assassinate anymore
+
Objective removal with antag panel no longer commented out silently while still being an option that gives useful feedback on stuff it's not doing in any respect
+
Second, temporary flavor text!
+
Limb damage works now
+
Score instead of ranked choice for mode tiers
+
Chemistry not :b:roke
+
Ghost dojo spawns will dust if their owner suicides or uses the "ghost" verb.
+
Crafting is logged in a file now
+
temporary flavor text now pops up properly
+
demodularized player panel code, mostly
+
added ghost role eligibility delay removal to player panel
+
Metabolic synthesis disables if user isn't well-fed rather than if user is starving
+
Gibtonite no longer instantly explodes upon being pickaxe'd.
+
Cold-blooded costs -2 quirk points now
+
Added suicide to the config.
+
Ghost cafe mobs are super duper attached to the ghost cafe.
+
Meow Mix bar sign works
+
Fixed a few relief valve behaviors
+
+
Ryll/Shaps, ported by Hatterhat updated:
+
+
Point-blanking people with shotguns actually throws them backwards!
+
+
Savotta updated:
+
+
snout
+
+
Seris02 updated:
+
+
made it so trait blacklisting removes random positives instead of removing everything
+
added atmos holofirelocks and temperature blocking
+
tweaked how atmos holofan looks
+
stunglasses
+
disabler sechuds
+
adds coconut
+
adds a coconut bong
+
Auto ooc
+
changed "assume direct control" from m.ckey = src.ckey to adminmob.transfer_ckey(M) so it works with auto ooc
+
marshmallow
+
telescopic IV drip
+
cardboard box speed
+
makes gorilla shuttle emag only
+
changed where the observe verb is.
+
the way chameleon clothes update on change
+
chameleon cloak icon
+
Explosions now cause knockdown instead of KOs, with the amount of time scaling off bomb armor. Heavy explosions still cause a ~2 second KO for follow up attacks.
+
Devastating explosions now no longer gib players with more than 50 bomb armor. This used to be more or less random depending on the amount of bomb armor.
+
Removed reagent explosion code that would trigger for <1 amount reactions.
+
traitor tool for bowmanizing headsets + bowmanizing headsets
+
durathread winter coats from hyper station
+
conveyor belt now are stacks instead of single item
+
conveyor crate has 30 belts
+
printing a conveyor costs 3000 metal
+
you can press the conveyor switch in hand to link any not deployed belts to it
+
sniffing sneezing etc doing anything if they don't breathe
+
probably fixes the make mentor button
+
the sprites for the conveyor belts to look more directional
+
+
Skoglol updated:
+
+
Falsewalls now properly hide pipes and wires.
+
+
SpaceManiac, bobbahbrown, ShizCalev, SpaceManiac (ported by Ghommie) updated:
+
+
It is now possible to set a different most-base-turf per z-level.
+
Removed unlawful reference to Disney's Star Wars franchise in map logging.
+
Moved mapping related errors to their own log file.
+
Destruction on Lavaland will no longer reveal space in rare situations.
+
+
Tlaltecuhtli, Nemvar, Trilby, Hatterhat updated:
+
+
russian surplus crate, sec ammo crate, meat/veggie/fruit crate, rped crate, bomb suit crate, bio suit crate, parrot crate, chem crate, db crate
+
lowered price of some crates which are overpriced for no reason aka the tablet crate and the mech circuits crates, track implant crate has also track .38 ammo
+
sectech vendor has a refill pack
+
+
Trilbyspaceclone updated:
+
+
Fermi plushie can be made once again
+
range on Engi Tray scanners and Rad-Scanners
+
issues with mapping done my Trilby
+
Grass now makes light beer when distilled
+
allows bandoliers to hold any ammo type as long as it has a casing
+
Cleans out the last years of changlogs
+
rouge cases of #$39; in bottle/pill/patch/condiments
+
Adds missing but needed flags to MASON RIG
+
missing sprites with crushed cans
+
Halfs the nutriments in sugar
+
Glitter is now makeable with ground plastic and some crayons
+
Makes more folders and files for uplink.
+
Seed packs now have RnD points inside them
+
New tips that reflect the now use seed packs have for Rnd / Chems affect on plants
+
Made the research file look nice rather then an eye harming list
+
Fixed fragile space suits breaking from weak and non-damaging "weapons" (such as the Sord, toys and foam darts).
+
tip of the round: Cleanbot can withstand lava and burning hot ash. Its a god
+
more glassware
+
Few new packs and glassmaker kit!
+
prices/chems of crates/autobottler
+
some crates ungettable as well as some broken crates
+
+
Trilbyspaceclone, Ghommie updated:
+
+
More types of glass can now be used to make a solar panel, with different sturdiness and efficiency depending the type.
+
+
Tupinambis updated:
+
+
Replaces new fire alarms with a slightly updated version of the old ones.
+
Fixed bug where Amber alert had no proper alert lights, and red alert had amber lights.
+
RLDs now cost more to use, have reduced matter capacity, and sheets are worth less when refilling them.
+
+
Unit2E & JMoldy, ported by Hatterhat updated:
+
+
the powerfist now punches people away at high velocity depending on setting.
+
the powerfist now leaks the gas it uses onto the tile you're on.
+
Adds weak punch variations for empty and near-empty punching.
+
+
Xantholne updated:
+
+
Christmas clothes that where missing stuff should work again
+
Christmas clothes moved from clothesmate and loadout to premium autodrobe, hoodies and boots remain.
+
Botany bee pet, Bumbles
+
New bee models that aren't 1 tile big of 0 opacity pixels
+
Cheongsam and Qipao clothing added to loadout and clothesmates
+
+
dapnee updated:
+
+
new toxin's uniform and accessories
+
old toxin's uniform and accessories
+
+
deathride58 updated:
+
+
The stamina buffer no longer uses stamina while recharging.
+
+
jakeramsay007 updated:
+
+
The assorted .357 revolvers (except russian revolver) can now also load .38, like real life.
+
+
kappa-sama updated:
+
+
loot crates in cargo contraband
+
modular_citadel file movement
+
modular citadel loses some files
+
dragnet snares can now be removed in 5 seconds
+
+
keronshb updated:
+
+
Adds new features for nanites
+
fixed the missing icons from Dermal Button nanites
+
Ports the special nanite remote, mood programs, and research generating nanites
+
rebalances some nanites
+
fixed my messup
+
+
kevinz000 updated:
+
+
throwing things no longer makes them randomly turned as long as you aren't on harm intent
+
Custom holoforms have been added for pAIs and AIs. oh and cyborg holograms of specific modules too.
+
pais are no longer indestructible-flagged while in card form. pai radios now short out if they are forcefully collapsed from damage.
+
telescopic iv drips now have the proper sanity checks for deployment.
+
megafauna can hear again
+
Cargo passive gen is now 500 down from 750.
+
Added a few more nightshift config entries
+
nightshift_public_area variable in areas to determine how public an area is.
+
NIGHT_SHIFT_PUBLIC_AREAS_ONLY config entry allows the server to be configured to only nightshift areas of that level and below (so areas that are more public)
+
Config entries added for requiring authorizations to toggle nightshift. Defaults to only requiring on public areas as determined by above
+
nuclear fist buffed.
+
cogscarabs are now fulltile-hitbox.
+
emitters are now hitscan
+
monkies gorrilize easier now
+
Ghosting no longer stops abductors from using you.
+
guests can now looc
+
tableslamming has 0.4 second cooldown instead of 0.8
+
health analyzers now work
+
Mapping helpers added for power cables and atmos pipes.
+
Blood duplication is gone, but viruses now react up to 5 times, 1 time per unit, for virus mix.
+
you can now block people on your PDA
+
Grenades can now have their timers adjusted.
+
Cloning has been nerfed.
+
hilbert hotel is now less of an exploity mess
+
Doorcrushes are once again instant.
+
+
nik707 updated:
+
+
engraving light_power from 1 to 0.3
+
+
r4d6 updated:
+
+
Added a Radiation Hardsuit
+
Added a Radiation Hardsuit crate
+
Added 3 SM Engine variations.
+
Added a way to make opaque plastic flaps change: Change the already existing flap recipe to show that they are see-through
+
Animations for the RCD
+
Said animations being pulled by the Singulo
+
Prevent Reinforced Doors from being RCD'ed
+
Deconstructing Floors now cost MUs like everything else
+
changed the RCD's upgrades into flags
+
Allow RCDs to print APC, Firelocks and Fire Alarms with the right upgrade
+
Allow Engineers to print RCDs and RPDs from their protolathe without needing to hack one.
+
Added a playback device
+
Made the Voice Analyzer actually care about languages
+
fixed SM's piping
+
Added a message when pulsing the open wire.
+
fixed being able to use a playback device and a voice analyzer to activate each others
+
added passive vent to the arsenal of atmospheric devices.
+
Mining base now has a common area accessible via a new shuttle on the medium-highpop maps, and a security office connecting the gulag and the mining base. Gulag also has functional atmos.
+
Added more Cyborg Landmarks
+
better code for passive vents
+
fixed a hole in Meta
+
Added the ability to easily add variations of the mining base
+
fixed a sprite
+
+
timothyteakettle updated:
+
+
fixed not being able to remove trait genes without a disk being inserted into the dna manipulator
+
+
30 December 2019
AnturK updated:
@@ -371,503 +828,6 @@
Adds Insect markings
Adds three new moth wings.
-
-
07 December 2019
-
AffectedArc07 updated:
-
-
Fixes a LOT of code edge cases
-
-
Anonymous updated:
-
-
Added NEET-- I mean, DAB Suit and Helmet into loadout. Exclusive to Assistants, for obvious reasons, and don't provide any armor. Goes well with balaclava, finger-less gloves and jackboots for that true tactic~~f~~ool experience.
-
Renamed loadout name appropriately (ASSU -> DAB)
-
-
Arturlang updated:
-
-
PDA catridges cant be irradiated anymore.
-
-
Bhijn updated:
-
-
Item mousedrop() now provides a return value indicating whether or not behavior has been overridden somehow.
-
Defibs now properly check that their loc is the same as the user for mousedrop() calls, meaning ghosts can no longer make you equip defibs. Plus extra sanity checks.
-
Pet carriers no longer attack turfs while trying to unload their contents.
-
Decks of cards now function as they originally intended when attempting to use their drag and drop behavior.
-
Paper bins and papercutters no longer act wonky when you're trying to pull a piece of paper from them.
-
Adds clothing drag n drop sanity checks.
-
Sythetic hats now have extra sanity checks
-
-
Coconutwarrior97 updated:
-
-
Can only wrench down two transit tubes per turf.
-
-
Commandersand updated:
-
-
Added more stuff to loadout,check uniforms mask and backpack
-
-
DeltaFire15 updated:
-
-
Adds eight new plushies
-
Adds icons for the new plushies and adds a new icon for the skylar plush
-
Deleted a old, no-longer used icon for the skylar plush
Organ fridges to all maps near surgery with a random sensible organ, steralizine and synthtissue.
-
the med hand scanner to be less of a mishmash of random things
-
a little icon to the HUD if someone's heart has failed.
-
Lets neurine's brain splash attack work via syringe.
-
a new surgery; Emergency Cardioversion Induction for use on the recently deceased
-
Synthtissue to be less demanding on growth size for organ regeneration and improves clarify of it's growth gated effects.
-
Synthtissue now is more useful than synthflesh on the dead
-
-
Fox McCloud updated:
-
-
Fixes a very longstanding LINDA bug where turfs adjacent to a hotspot would be less prone to igniting
-
-
Fox McCloud, Ghommie updated:
-
-
Fixes being able to mech-punch other mobs, as a pacifist
-
Fixes being able to hurt people, as a pacifist, by throwing them into a wall or other mob, or by using most martial arts (save for the unpredictable psychotic brawl, and the stamina-damage-only boxing).
-
Buffs boxing to outdamage natural stamina regeneration. Made the chance of outright missing your opponent actually possible.
-
Pacifists can now engage in the (laughably not harmful) sweet sweet art of boxing now.
-
-
Ghommie updated:
-
-
Fixing implant cases being lost inside implant pads when trying to eject them with your active hand full.
-
Moved the implant pad's case ejection from attack_hand() to AltClick(), added examination infos about it.
-
Fixed holodeck sleepers leaving sleeper buffers behind when deleted.
-
Fixed traitor codewords highlight and some other hear signal hooks spans highlight (phobias, split personality, hypnosis) or modifiers (mind echo)
-
Fixed traitor codewords highlight not passing down with the mind datum and stickying to the first mob.
-
Fixed the incongruent bone satchel description.
-
Fixed sofa overlays doing nothing, because their layer wasn't properly set.
-
Suicide and cryo now prevents ghost/midround roles for a definite duration of 30 minutes (and more if that was done before 30 minutes in the game passed), down from the rest of the round.
-
fixed several midround roles bypassing and nulling the aforementioned prevention measures.
-
Fixed the little issue of PDA skins not updating on job equip.
-
Anomaly Crystals of the clowning type will now rename the victim to their clown name preference when triggered, instead of giving them a random clown name.
-
Lowered blob event earliest start from 1 hour to 40 minutes (ergo one third), and the required player population from 40 to 35.
-
Several fixes and QoL for dullahans. They can see and hear visible and audible messages now, don't need a space helmet they can't wear anyway to be space/temperature proof, can examine things through shiftclick, and, most of all, fixed their head being unpickable. Fixed dullahans gibbing when revived or had their limbs regenerated.
-
humans should now drop gibs when gibbed again.
-
synths (not to be confused with IPCs), android and corporate species, as well as robotic simple mobs, will now spawn robotic giblets instead of organic ones.
-
You can't wear dakimakuras in any other inappropriate slots save for the back slot anymore, degenerates.
-
Insert snarky remark about clock welders actually displaying the welder flame overlay when turned on now here.
-
Minor ninja tweaks and stealth nerfs. The stealth penalty for the many combat-related actions, bumping and now teleporting/dashing or firing guns has been increased a by a third. There is now a cooldown of 5 seconds on toggling stealth as well as a slighty slowed stealth in/out animation.
-
Ported slighty better matchbox sprites from CEV-Eris, also resprited cigar boxes myself.
-
Fixed abductors/abductees objectives by porting an objective code.
-
Riding component fix
-
fixing a few runtimes on lightgeists, libido trait, rcd, one admin transformation topic, chem dispensers, glowing robotic eyes...
-
Porting CEV-eris delivery packages sprites and dunking the old syndie cybernetics box sprite.
-
Certain objects shouldn't be able to become radioactive because of a bitflag that previously was checked nowhere in the code anymore.
-
Added a new PDA reskin, sprites from CEV-Eris
-
Clock cult starts with some spare vitality matrix charge scaled of the number of starter servants.
-
Made the vitality matrix sigil slighty more visible, also allowed conversion runes to heal fresh converts at the cost of some vitality charge.
-
Crawling won't save you from the wrath of ocular wardens and pressure sensors anymore, heretics. fix: Pressure sensors are no more triggered by floating/flying mobs.
-
Strawberry milk and tea have sprites now.
-
Fixed the Aux base camera door settings and toggle window type actions. Also enabling the user to modify both door access and type.
-
Improved the two grayscale towel item sprites a little.
-
Fixed towels onmob suit overlays. Again.
-
Fixed some reagents taste descriptions.
-
Fixed hidden random event reports only priting a paper message without sending the message to the consoles' message list.
-
Rosary beads prayer now works on non-carbon mobs too, and won't break when performed on a monkey or other humanoids.
-
You can flagellate people with rosary beads on harm intent. It's even mediocrer than the sord though.
-
Moved the `Stealth and Camouflage Items` uplink category next to `Devices and Tools`.
-
Deleted a duplicate phatom thief mask entry from the uplink.
-
Fixed missing delivery packages sprites
-
fixed a few minor issues with console frames building.
-
Wizards can use the teleport spell from their den once again.
-
Wizards will now receive feedback messages when attempting to cast teleport or use the warp whistle while in a no-teleport area.
-
New clockwork cultist, gondola, monkey and securitron cardboard cutouts.
-
Fixed aliens gasping randomly once in a while.
-
fixed superlube waterflower, my bad.
-
Fixed closing the aux base construction RCD's door access settings window throwing you out of camera mode when closed.
-
Removed not functional aux base RCD's door type menu. Use airlock painters, maybe.
-
Honkbot oil spills are of the slippery kind now. Honk.
-
local code scavenger finds forgotten slighty improved apc sprites left buried in old dusty folders.
-
Seven old and otherwordly pAI holochassis icons have crawled their way out of the modular citadel catacombs.
-
chem dispenser beakers end up in your hand yet again.
-
Bikehorns squeak yet again, the world is safe.
-
Cyborgs can now actually use cameras from a distance.
-
Suicides are yet again painful and instant and won't throw people in deep crit from full health.
-
fixed rogue pixels on the energy gu- ahem blaster carbine... and a few apc lights states being neigh-indistinguishable.
-
Fixed several "behind" layer tail sprites skipping areas normally covered by bodyparts.
-
Morgues' original alert beeping sound has been restored, they no longer go "ammunition depleted"
-
Fixed missing hypereutactic left inhand sprites.
-
Dying, ghosting, having your mind / ckey transferred to another mob, going softcrit or otherwise unconscious now properly turn off combat mode.
-
combat mode can't be toggled on while non fully conscious anymore.
-
Fixed limbs' set_disabled NOT dropping your held items, updating your hand slot inventory screen image, prompting chat messages and making your character scream like a sissy.
-
Lusty xenomoprh maids will now actually clean tiles they travel onto yet again.
-
Fixed double whitespace gap in human and AI examine. Fixed single whitespace in carbon examine.
-
Removed a few useless supply packs: "Siezed" power cells, means of production and promiscous organs.
-
Merged the synthetic blood supply pack into the standard blood supply pack, effectively removing a random type blood pack in favor of two synthetic ones.
-
Merged together premium carpet pack n°1 and n°2 to hold one of each standard pattern.
-
You can no longer estimate the amount of reagents found inside a damp rag.
-
You can now squeeze a rag's reagents into another open container, as long as the other one is not full.
-
Fixed ED-209 being unbuildable past the welding step.
-
Fixed ai displays status being reset to "Neutral" on login, regardless of choice.
-
Fixed tinfoil hats giving random traumas.
-
-
Ghommie (original PR by Denton) updated:
-
-
Added three new .38 ammo types. TRAC bullets, which embed a tracking implant inside the target's body. The implant only lasts for five minutes and doesn't work as a teleport beacon. Hot Shot bullets set targets on fire; Iceblox bullets drastically lower the target's body temperature. They are available after researching the Subdermal Implants node (TRAC) or Exotic Ammunition node (Hot Shot/Iceblox).
-
Renamed the Technological Shells research node to Exotic Ammunition.
-
The "lifespan_postmortem" var now determines how long tracking implants work after death.
-
.357 AP speedloaders can now be ordered from syndicate uplinks.
-
lowered the cost of uplink's .357 speedloaderd from 4 to 3.
-
-
Ghommie (original PR by nicbn and Menshin) updated:
-
-
You can click on things that are under flaps or holo barriers.
-
-
Ghommie (original PRs by ShizCalev, CRTXBacon and Niknakflak) updated:
-
-
Adds the intelliLantern, a big ol' spooky intelliCard skin
-
crafting recipe for the new intelliCard skin (requires 1 pumpkin, 1 intelliCard, 5 cables and a wirecutter as a tool)
-
changed the intelliTater crafting recipe to match the intelliLantern recipe (but with a potato for obvious reasons) add:cute pai gameboy face :3
-
-
Ghommie, porting lot of PRs by MrDoomBringer, AnturK, nemvar and coiax. updated:
-
-
Admins can now launch supplypods the old, slightly quicker way as well
-
Centcom-launched supplypods will now properly delimb you (if they are designated to do so) instead of touching you then literally yeeting all of your internal organs out of your body.
-
Centcom can now specify if they want to yeet all of your organs out of your body with a supplypod
-
Supplypods sound a bit nicer as the land now.
-
admins can now adjust the animation duration for centcom-launched supplypods
-
admins can adjust any sounds that are played as the supplypod lands
-
Reverse-Supplypods (the admin-launched ones) no longer stay behind after rising up, and also auto-delete from centcom.
-
The centcom podlauncher now has better logging
-
Admins can now allow ghosts to follow the delivery of Centcom-launched supply pods
-
Admins can now use the Centcom Podlauncher to launch things without the things looking like they're being sent inside a pod.
-
sparks will not generate if the quietLanding effect is on, for the centcom podlauncher
-
makes input text clearer for the centcom podlauncher
-
New 'Podspawn' verb, which functions like 'Spawn', except any atoms movable spawned will be dropped in via a no-damage, no-explosion Centcom supply pod.
-
Removed an oversight that made many obj/effect subtypes accidentally bombproof.
-
-
GrayRachnid updated:
-
-
Added saboteur syndicate engiborg
-
changed cyborg tool icons and the secborg taser/laser icons.
-
Fixes golden toolbox missing inhand sprite
-
Added traumas
-
Added science powergame tool
-
a few hearing args
-
fixed my mistakes
-
tweaked the number of ingredients/pancakes you can stack.
-
-
Hatterhat updated:
-
-
The Big Red Button now sets bomb timers to 2 seconds, instead of 5.
-
Gloves of the North Star (not Hugs of the North Star) now use all their intents very, very fast. This does not apply to grabs' click cooldown, nor shoving people.
-
The seedvault/alien plant DNA manipulator can now be printed off with Alien Biotechnology.
-
-
Iroquois-Pliskin updated:
-
-
Removed Clockwork Cult Surgical facility from Reebe
-
-
Jerry Derpington, baldest of the balds, and nemvar. updated:
-
-
Nanotrasen has lost communication to two away mission sites that contained a beach for Nanotrasen employees.
-
Nanotrasen has been able to locate a new away mission site that ALSO has a beach. Nanotrasen employees will be able to enjoy the beach after all!
-
Seashells have been added to the game.
-
-
KathrinBailey updated:
-
-
Two extra 'luxury' dorms rooms!
-
Gas miners to atmos.
-
Posters around the station.
-
Vacant room added to the Starboard Bow with it's own APC, above electrical maintenance.
-
New trendy clothes to the locker room, giving variety and bringing fashion back onto Nanotrasen stations.
-
Coloured bedsheet and towel bin.
-
Maid uniforms for the janitor.
-
Completely reworked bar. Milk kegs added in bar office. The bar has been changed for a homey restaurant feel just in time for Christmas! You can now run it as an actual restaurant! Local Bartender Icktsie III loved it so much he rolled around on the new floor smiling happily.
-
Dorms rework. Fitness room now has lots of costumes and outfits.
-
Junk removed from engineering, welding goggles added.
-
Welding tools in engineering replaced with industrial welding tools.
-
Package wrappers and hand labellers now in major departments.
-
Cell charger moved from engineering lobby to the protolathe room, just like how it is in all of the other maps and just where the cell charger is actually needed.
-
Library redesigned to have a private room and a 3x3 private study that is cleaned up.
-
Paper bins have gone big or gone home, with premium stationery scattered around. Engineering and security now have a labeller and packaging supplies.
-
Dark spot top left of Botany fixed.
-
Huge galactic-sized dark spot in bar fixed.
-
Light replacers now are less horrifically overpowered and PTSD-inducing for the server.
-
Fixes issue 9706: https://github.com/Citadel-Station-13/Citadel-Station-13/issues/9706 Part of maint getting hit by radstorms.
-_Kathrin's Box Beautification:_
Added support for Multi-Z power, atmospherics and disposals
-
massive service department nerf: space can no longer be extra crispy.
-
-
Knouli updated:
-
-
attack_self proc for the legion core which triggers a self-heal al la the previous 'afterattack' proc, as if clicking on the character's own sprite to self-heal
-
admin logging for all three use cases of legion core healing - afterattack, attack_self, and implanted ui_action_click
-
-
Krysonism, Ghommie updated:
-
-
NT has made breakthroughs in ice cream science, ice creams can now be flavoured with any reagent!
-
The ice cream vat now accepts beakers.
-
Grape and Peach icecreams have scoop overlays yet again.
-
-
Linzolle updated:
-
-
butchering component update
-
hat tossing can no longer knock hats off
-
strange reagent being unable to revive simplemobs
-
jitter animation and more clear text to strange reagent revival
-
-
Mickyy5 updated:
-
-
Nanotrasen are now issuing Plasmamen with plasma in their survival boxes
-
-
MrJWhit updated:
-
-
tweaked brain damage line
-
-
Naksu, ShizCalev updated:
-
-
Refactored examine-code
-
Examining a human with a burned prosthetic limb will no longer tell you that the limb is blistered.
-
Items will now inform you if they are resistant to frost, fire, acid, and lava when examined.
-
-
Owai-Seek updated:
-
-
"silly" bounties
-
"gardenchef" bounties
-
several bounties that require seriously good RNG to pull off.
-
moved several chef and assistant bounties to silly and gardenchef
-
modified several bounty point rewards
-
added new files "silly.dm" and "gardenchef.dm"
-
15+ new crates for cargo
-
organizes crates and moving them to proper categories
-
some dumb stuff like toner crates re
-
leg wraps and sweaters to clothesmate
-
screwdriver and cable coil to janidrobe
-
screwdriver and cable coil to janibelt whitelist (for fixing/placing light fixtures)
-
monkey cube, syringe, enzyme, soy sauce, and cryoxadone to chef's vendor (contraband and premium)
-
add cracker, beans, honey bars, lollipops, chocolate coin, and spider lollipop to snack vendors (contraband and premium)
-
newspaper to loadout menu for bapping purposes
-
removed poppy pretzels from snack vendor premium
-
maid uniform (janimaid alt) to kinkmate.
-
moves gear harness from premium to normal stock in kinkmate
-
re-balanced metal shield bounty
-
cryoxadone bottle (for use in chef vendor)
-
-
PersianXerxes updated:
-
-
Reduces the grace period for meteors from a minimum of 5 and maximum of 10 to 3 and 6 minutes respectively.
-
Adds a pair of VR sleepers to Box Station's permabrig
-
Adds a pair of VR sleepers to Delta Station's permabrig
-
Adds a pair of VR sleepers to Pubby Station's permabrig
-
Adds a pair of VR sleepers to Meta Station's permabrig
-
-
Putnam updated:
-
-
From-ghosts dynamic rulesets now actually listen to "required candidates"
-
Every dynamic-triggered event is now blacklisted from being triggered by the random events system when dynamic can trigger them.
-
Dynamic voting now features extended, if recent rounds have been chaotic.
-
Roundstart rulesets now scale on population ready rather than total population.
-
Threat log now accurately represents what actually used the threat.
-
Verbose threat log (admin-only) now shows ALL threat level changes.
-
VR mobs can no longer be dynamic midround antags.
-
Personal closets can use anything that holds an ID card now.
-
-
Putnam3145 updated:
-
-
traitors work now
-
Gas filters now push gas the same way volume pumps do.
-
Gas filters now won't clog if only one output is clogged.
-
Glowsticks can no longer be radioactively contaminated (one more supermatter contam exploit gone)
-
traitor removal is no longer borked
-
Dynamic voting
-
Added DYNAMIC_VOTING to game_options
-
SDGF now copies memories as well as antag data and factions.
-
Summon events now properly costs threat.
-
Refunded spells refund threat, too.
-
Made wizard spells inherently have a requirement and cost.
-
Meteor wave is no longer repeatable in dynamic.
-
tweaked nuke ops
-
Organs can no longer be radioactively contaminated.
-
-
Robustin, Subject217 updated:
-
-
The NukeOp Shuttle hull has been dramatically hardened. The walls are now "R-Walls" with far greater explosion resistance.
-
The NukeOp Shuttle guns have been significantly buffed. They now rapidly fire a new type of penetrator round, at a greater range, and have far greater explosion resistance.
-
The nuclear device on the NukeOp Shuttle is now in an anchored state by default, the Nuke can only be unanchored by inserting the disk and entering the proper code.
-
Non-Syndicate cyborgs are now unable to access the NukeOp Shuttle Console.
-
You can now unanchor Nukes even when the floor under them has been destroyed
adds the mining winter coat to mining wardrobes and mining lockers
-
-
ShizCalev updated:
-
-
Ghosts can now see active AI cameras.
-
Fixed a couple of laser / energy guns never switching to the empty icon despite being unable to fire.
-
-
Swindly updated:
-
-
Fixed MMIs not being able to use mecha equipment
-
Fixed MMIs not getting mecha mouse pointers
-
Fixed MMIs not getting medical HUDs in Odysseuses
-
Brains can now switch to harm intent
-
-
Tetr4 updated:
-
-
Turning a tile with gas effects into space now gets rid of the effects.
-
-
Trilbyspaceclone updated:
-
-
plastic trash cart crafting with plastic
-
wallets are known for now holding more items
-
shades and clowns HP
-
six more crates, A barrel, A Loom, 40 cotton sheets, two sets of fruit crates, raw lumber crate
-
All fermi chems, Boozes, Medical, food chems now sell
-
Loads more to sell - Mech gear, Cooking and more!
-
Moved around the vaule of some things and removed elastic of most items
-
Rebreather implants will now loss vaule, Do to being just metal and glass
-
lowered how many chems are in lewd chem kegs to be around 150-100 as well as the fancy booze kegs
-
bad returns and tools used
-
8 new cargo crates!
-
tablet cargo crate by -3k
-
Closes a bunch of issues
-
updates changlogs and such
-
fixed a catnip not having sprites
-
Boh cant hold WEIGHT_CLASS_GIGANTIC, just Bulky. Makes katana, chainsaw and base ball bat into bulky items so they may fit
-
changes header to be more cit-like
-
new clothing for the hotel staff and a hat
-
-
Ty-the-Smonk updated:
-
-
You can now interact with self sustaining crossbreeds
-
-
Useroth updated:
-
-
Colored fairygrass variants.
-
Added a missing cherrybulb seedpack sprite
-
numbered storages now are sorted in a consistent way, instead of depending on ordering of their contents var
-
strange seeds as a buyable traitor botanist item
-
resolves the issues revolving around blackpowder exploding where the reaction happened, instead of where it actually is through making it explode instantly
-
the explosion delay moved from blackpowder directly into bomb cherries, to keep them functioning as intended
-
A bunch of newer tg plants
-
A bunch of newer tg plant traits
-
A couple of newer tg plant reagents
-
the new plants now properly get their reagents and reagent genes instead of being empty with UNKNOWN reagents listed in the DNA machine
-
extradimensional oranges now contain haloperidol
-
extradimensional oranges now actually grow properly and give proper seeds.
-
-
Weblure updated:
-
-
Button added to slime console that prints out the hotkey commands to the user. [Includes DMI update]
-
Shift-click a slime to pick it up, or the floor to drop all held slimes. (Requires Basic Slime Console upgrade)
-
Ctrl-click a slime to scan it.
-
Alt-click a slime to feed it a potion. (Requires Advanced Slime Console upgrade)
-
Ctrl-click on a dead monkey to recycle it, or the floor to place a new monkey. (Requires Monkey Console upgrade)
-
If the console does not have the required upgrade, an error message will print to the user.
-
You can now pick up a single slime from a pile, instead of all of them at once.
-
When recycling monkeys, the console will now report how many monkeys it has (will not report decimal increases).
-
Console now alerts you when you're out of monkeys and reports your current decimal amount.
-
Console messages are now styled consistently.
-
-
XDTM, ShizCalev, Naksu, Skoglol, cacogen, Rohesie (ported by Ghommie) updated:
-
-
Holding an ID in your hands uses it instead of your worn ID for authentication purposes.
-
If you don't have an ID in your id slot, the belt slot will be checked as well.
-
small cleanup to id and bounty console html generation
-
Hop console now hurts your eyes less. Red button text replaced with green.
-
IDs with ID console access now go into the Confirm Identity slot by default like they used to, similarly IDs without it go into the Target slot by default again
-
Can easily swap out IDs by clicking the machine or the UI fields with another ID
-
ID console now names which IDs are added/removed in its visible messages
-
Labels the ID slot fields when logged in so you know which is which
-
Can use Job Management without an ID provided the console is logged in (matches how the console now stays logged in even without an ID)
-
Can log in without an ID in the Target field (matches how the machine now stays logged in even after the ID is removed from the Target field)
-
Cleans up UI slightly (had some duplicate/conflicting buttons)
-
Fixes ID console duping issues. Includes some ID containers, such as PDAs, tablets and wallets, into the swapping behavior when an ID card is being removed and the item is being held.
-
-
Xantholne updated:
-
-
New Berets for most heads and departments available in their autodrobes or lockers
-
-
YakumoChen updated:
-
-
New AI Holograms and Displays! Ported from /vg/station.
-
-
actioninja updated:
-
-
med records no longer can eat id cards for no reason
-
Chat is properly sent to legacy window if goonchat fails to load again.
-
-
dapnee updated:
-
-
fixed closet initialisation being broken
-
emergency closets no longer have a 1% chance to delete themselves
-
Communications console window no longer updates, won't steal focus anymore.
-
Trimline neutral end exists now.
-
-
dzahlus updated:
-
-
added a new gun sounds
-
removed an old gun sounds
-
-
him updated:
-
-
hos and aeg guns now conform to le epic taser rework standards
-
-
kappa-sama updated:
-
-
changed flavor text of alien tech on uplink
-
added TG's icons for traitor, russian, and golden revolver
-
-
kevinz000 updated:
-
-
you can now choose never for this round for magical antags
-
Cargo has passive point generation again at 750 points/minute
-
Mindshield crate price increased from 3000 to 4000
-
Miasma sell price reduced from 15/mol to 4/mol
-
bluespace wizard apprentice now has blink instead of targeted area teleportation
it now takes 4 strands to make one piece of durathread cloth
-
Looms can now be attacked.
-
Durathread golem weaves his magic
-
Supply ordered looms are unanchored. Bring a wrench.
-
-
r4d6 updated:
-
-
Added Departements Winter Coats to the loadout list.
-
GoonStation 13 Development Team
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index db9c8e6d08..464340ef24 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -23980,3 +23980,475 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
shellspeed1:
- rscadd: Adds Insect markings
- rscadd: Adds three new moth wings.
+2020-01-27:
+ 4dplanner, CRITAWAKETS, XDTM, ninjanomnom:
+ - rscadd: sepia slime extract has a delay before activating
+ - balance: the user of a sepia slime extract is no longer immune to the time field
+ - balance: chilling sepia is now the support extract - it always freezes the user,
+ but not other marked people. give one to your golem!
+ - rscadd: burning sepia spawns the rewind camera. Take a selfie with someone and
+ give it to them to make sure they remember the moment forever! You don't actually
+ need to give them the photo, they'll remember anyway. Keep it as a reminder.
+ - rscadd: rewinding (deja vu) effect resets your location to the turf you were on
+ after 10 seconds as well as resetting limbs/mobs/objects damage to the point
+ it was added.
+ - rscadd: The deja vu effect cannot resurrect the dead, but will heal their corpse.
+ New limbs fall off, old ones re-attach
+ - rscadd: 'Regenerative sepia cores add a deja vu effect before healing instead
+ of a timestop remove: timefreeze camera is admin spawn only.'
+ - rscadd: recurring sepia recalls to the hand of the last person to touch it after
+ activating. Reusable timestop grenades!
+ - tweak: some special cameras don't prompt for customisation
+ - bugfix: timefreeze camera actually makes a photo
+ - bugfix: timestop stops pathing and mechs.
+ - bugfix: adds a check to make sure simple_animals don't get their AI toggled while
+ sentient
+ - bugfix: Adds the timestop overlay to frozen projectiles
+ - bugfix: Timestopped things have INFINITY move_resist as opposed to being anchored
+ - bugfix: Timestop will now unfreeze things that somehow leave it
+ - bugfix: mobs in the middle of a walk_to will have their walk stopped by timestop
+ - bugfix: mobs that are stunned will be stopped mid walk as well
+ - bugfix: pulling respects changes in move_force
+ - bugfix: swapping places respects move_force if the participant is not willing
+ - bugfix: timestop is properly defeated by antimagic.
+ - bugfix: timestop only checks antimagic once
+ - tweak: Time stop now applies its visual effect on floors, walls and static structures
+ (with no change otherwise)
+ - tweak: Movable structures are now anchored while time stopped.
+ - tweak: Timestop effects now prevent speech.
+ AffectedArc07:
+ - code_imp: All code files are now in the LF line format, please stick to it
+ - tweak: Added CI step to check for CRLF files
+ - code_imp: Line ending CI works now
+ Arkatos, Zxaber, Ghommie:
+ - rscadd: Certain AI abilities now dynamically show their remaining uses on the
+ mouse hover over their respective action buttons.
+ - bugfix: Malfunctioning AIs can no longer abuse the confirmation popup to create
+ extra (unstoppable) doomsdays.
+ - bugfix: Fixed AIs being able to use some of their abilities such as the doomsday
+ whilst dead, and the doomsday loading phase not halting upon AI death.
+ Arturlang:
+ - tweak: Vampires are no longer as tanky
+ - rscadd: Added modular computers to the loadout
+ Bhijn:
+ - rscadd: Limbs now regenerate their stamina faster while disabled
+ - rscadd: Limbs now have the same incoming stamina damage multiplier mechanics as
+ spacemen, where the more staminaloss they take while disabled, the less staminaloss
+ they'll take.
+ - balance: Limbs have had their base stamina regen rate doubled to match the doubled
+ stamina regen rate of standard spacemen.
+ - rscadd: Added a preference to make the sprint hotkey be a toggle instead of a
+ hold bind
+ - rscadd: Added a preference to bind the sprint hotkey to space instead of shift.
+ - bugfix: server_hop can no longer be used to remotely lobotomize a spaceman
+ Bhijn helped:
+ - bugfix: Fixes Dragon's Tooth Sword 50% armor penetration by making it 35%
+ BonniePandora:
+ - admin: 'Added another SDQL option. Using "UPDATE selectors SET #null=value" will
+ now resolve value and discard the return. This is useful if you only care about
+ the side effect of a proc.'
+ CameronWoof:
+ - rscadd: Ghost Cafe patrons now spawn with chameleon kits. Dress up! Be fancy!
+ - rscadd: Robots can now check the crew manifest from anywhere with the "View Crew
+ Manifest" verb.
+ - tweak: Lizard tails are now viable options for humans and anthromorphs.
+ Commandersand:
+ - bugfix: fixed some clothnig sprites
+ - balance: lightning bolt,tesla,forcewall,emp spells have lower cooldown
+ - balance: fireball has a 10 second starting cooldown
+ DeltaFire15:
+ - bugfix: Vitality matrixes now correctly succ slimes
+ Denton, ported by Hatterhat:
+ - tweak: Most upgradeable machines now show their upgrade status when examined while
+ standing right next to them.
+ - tweak: Added examine messages to teleporter stations that hint at their multitool/wirecutter
+ interactions.
+ - tweak: Renamed teleporter stations from station to teleporter station.
+ - code_imp: Changed the teleporter hub accurate var to accuracy; the old name misled
+ people into thinking that it was a boolean.
+ Detective-Google:
+ - tweak: replaced the sprites with new ones requested.
+ EmeraldSundisk:
+ - rscadd: Adds a sign outside MetaStation's custodial closet
+ FantasticFwoosh, ported by Hatterhat:
+ - rscadd: Both reagent universal enzyme & sacks of flour are now available for their
+ respective costs from the biogenerator.
+ - rscadd: New crafting recipies for donut boxes, eggboxes & candle boxes have been
+ added to cardboard recipes for the collective benefit of service personnel and
+ the station.
+ Ghommie:
+ - tweak: Attached kevlar/soft/plastic padding accessories are now stealthier and
+ will no longer be displayed on mob examine.
+ - refactor: Refactored that mess of a code for alternate worn clothing sprites for
+ digitigrade and taurs.
+ - bugfix: Fixed some issues with the aforementioned feature you may or may not have
+ experienced because it was pretty lame.
+ - bugfix: Fixed missing digi versions fishnet sprites and wrong digitigrade left
+ dir purple stockings sprite.
+ - imageadd: Add digitigrade versions for boxers and the long johns.
+ - bugfix: Fixed the secret sauce recipe being randomized every round.
+ - bugfix: Fixed singularity pulls duping rods out of engine floors.
+ - rscdel: Removed an old pair of zipties from the captain closet.
+ - bugfix: Chestbursters won't delete the host's brain somewhat anymore.
+ - bugfix: Fixed roundstart mushpeople being unable to MUSH PUUUUUUUUUUUUNCH!!
+ - bugfix: Lattices can be examined yet again.
+ - bugfix: Made reagent containers examine text less annoying.
+ - bugfix: Virus food dispensers dispense virus food again.
+ - bugfix: Borg hypos inputs do not display typepaths anymore.
+ - bugfix: Restored chem dispensers alphabetical order.
+ - bugfix: Sanitized cargo export messages for reagents.
+ - bugfix: Riot foam dart (not the ammo box) design cost is yet again consistent
+ with the result's material amount.
+ - bugfix: Fixed a little exploit with ventcrawlers being capable of escaping closed
+ turfs by printing scrubbers/vents into them.
+ - bugfix: deconstructing a rubber toolbox with the destructive analyzer won't "lock"
+ the machine anymore.
+ - bugfix: Something about empty hand combat mode right click waving hands defying
+ common sense and being spammy.
+ - imageadd: Towels are now "digitigrade-friendly".
+ - bugfix: The Barefoot drink and mousetraps will now work even if wearing certain
+ "feet-less shoes".
+ - rscadd: Refactored code to allow all living mobs to use shields and not only humans.
+ - tweak: Monkys will now retaliate against aliens attacking them (as if they even
+ posed a threat to start with).
+ - tweak: add a click cooldown to the overly spammable table slamming.
+ Ghommie (original PRs by Kevinz000, ShivCalez, 4dplanner, Barhandar, 81Denton, zxaber, Fox-McCloud):
+ - rscadd: All atom movables now have move force and move resist, and pull force
+ An atom can only pull another atom if its pull force is stronger than that atom's
+ move resist
+ - rscadd: 'Mobs with a higher move force than an atom''s move resist will automatically
+ try to force the atom out of its way. This might not always work, depending
+ on how snowflakey code is. experimental: As of right now, everything has a move
+ force and resist of 100, and a pull force of 101. Things take (resist - force)
+ damage when bumped into experimental: Failing to move onto a tile will now still
+ bump up your last move timer. However, successfully pushing something out of
+ your way will result in you automatically moving into where it was.'
+ - bugfix: Bolted AIs can no longer be teleported by launchpads.
+ - balance: Megafauna cannot teleport
+ Hatterhat:
+ - balance: Beakers are generally more useful now, with slight capacity increases.
+ - tweak: Transfer amounts are different now. Adjust your muscle memory to compensate.
+ - balance: ore redemption machines actually get affected by lasers again kthx
+ - tweak: crusher trophy drop chance on mining mobs increased to 1 in 4 (from 1 in
+ 20)
+ - bugfix: Blood-drunk buff from blood-drunk eye crusher trophy is less likely to
+ cripple its user.
+ - tweak: Forcefield projectors now fit on toolbelts.
+ - imageadd: New sprites for ATMOS holofan and forcefield projectors!
+ - tweak: tweaks some values around with beaker transfer amounts, adds a transfer
+ value verb (altclick)
+ - rscadd: 'Syndicate sleepers (read: the ones that''re red and have controls in
+ them) can now be recreated with a sufficient basis in nonstandard (read: illegal)
+ technologies!'
+ - bugfix: Explorer hoods on standard explorer suits can be reinforced with goliath
+ hide plates again.
+ - rscadd: A shipment of Staff Assistant jumpsuits from the Goon-operated stations
+ appear to have made their way into your loadout selections - and into the contraband
+ list from ClothesMates...
+ - balance: Dropped Exo-suit armor to put it more in line with being an explorer
+ suit sidegrade and not a straight upgrade for Lavaland usage.
+ - rscadd: You can now print .357 AP speedloaders from Security techfabs after you
+ pick up the Advanced Non-Standard Ballistics node.
+ - rscdel: Forensic scanner removed from Advanced Biotechnology node.
+ - tweak: Ash Drake armor now has goliath resistance, same as the Exo-suit.
+ KathrinBailey:
+ - rscadd: Empty engineering lockers for mappers.
+ - rscadd: Industrial welding tools to the engineer welding locker.
+ - rscdel: Removed the multitool, airlock painter, mechanical toolbox, brown sneakers,
+ hazard vest and airlock painter from the CE's locker.
+ KeRSedChaplain:
+ - imageadd: The clockwork cuirass can now support slithering taur bodies.
+ Kevinz000:
+ - bugfix: Fixes successful projectile hits also striking another atom on the same
+ turf should the first one be not the target the projectile was meant for.
+ - rscdel: Removes infinite reflector loops.
+ Kraseo:
+ - bugfix: Jelly donuts and pink jelly donuts will now properly display sprinkled
+ icon state.
+ - bugfix: Jelly donuts and its variants will properly spawn with berry juice.
+ - bugfix: Slime jelly donuts have slime jelly in them now. (thanks ghommie)
+ - bugfix: Virgo hairstyles no longer have those annoying quotation marks. Rejoice
+ for you will no longer have to use the scrollbar.
+ - imagedel: Got rid of some strange-looking hairstyles. (Tbob, fingerweave, etc.)
+ LetterN:
+ - rscadd: Doppler logs
+ - tweak: Shockcolar and electropack uses the new signaler ui
+ - tweak: Renaming shockcolar requires a pen
+ - rscadd: Adds banjo
+ Linzolle:
+ - bugfix: fixes matchboxes runtiming every time they spawn
+ MrJWhit:
+ - tweak: Increases plasma usage in radiation collectors
+ Naksu:
+ - code_imp: reagent IDs have been removed in favor using reagent typepaths where
+ applicable
+ - bugfix: mechas, borg hyposprays etc no longer display internal reagent ids to
+ the player
+ Owai-Seek:
+ - rscadd: Four New Bounties
+ - tweak: tweaked several bounties
+ - tweak: reorganised several bounties
+ - balance: balanced several bounties
+ - bugfix: added shady jims to vendor
+ - rscadd: Towel, Bedsheet, and Colored bedsheet bins to Dojo. Some lockers with
+ carpets and wood, another bathroom/shower, tons of cleaning supplies, some additional
+ trash cans, a tiny medical area, and some vendors/vendor resupplies. Also added
+ some Ambrosia Gaia seeds.
+ - tweak: Moved some lights around, extended the dojo a bit to make it feel more
+ spacious.
+ - rscdel: Cafe Newsfeed Frame
+ PersianXerxes:
+ - tweak: Reduces the range of the forcefield projector from 7 tiles to 2 tiles.
+ Putnam:
+ - rscadd: Alcohol intolerance trait, which forces vomiting on any alcohol ingestion
+ - rscdel: Arousal damage is gone, and with it the arousal damage heart on the UI.
+ - rscdel: As exhibitionist relied on arousal damage, that's gone too.
+ - rscdel: Bonermeter and electronic stimulation circuit modules are gone.
+ - rscdel: Masturbation is no longer an option in the climax menu. It was identical
+ to climax alone in every way but text. Emote it out.
+ - rscadd: Arousal on genitals can now be displayed manually, on a case-by-case basis.
+ - rscadd: '"Climax alone" and "climax with partner" now only display to the people
+ directly involved in the interaction. rework: Catnip tea, catnip, crocin, hexacrocin,
+ camphor, hexacamphor all had functions or bits of functions reworked.'
+ - tweak: '"Climax with partner" now requires consent from both parties--it can no
+ longer be used on mindless mobs, and it asks the mob getting climaxed with if
+ they consent first.'
+ - tweak: A lot of MKUltra behaviors have been moved to hypno checks or removed due
+ to reliance on maso/nympho/exhib.
+ - rscadd: Cold-blooded quirk
+ - rscadd: 'Two relief valves for atmospherics, available in your RPD today: a unary
+ one that opens to air and a binary one that connects two pipenets, like a manual
+ valve.'
+ - tweak: The atmos waste outlet injector on box has been replaced with an atmos
+ waste relief valve.
+ Putnam3145:
+ - rscadd: Dynamic storytellers, a new voting paradigm for dynamic
+ - rscadd: Support for approval voting and condorcet (ranked choice) voting in server
+ votes
+ - rscadd: Ghost cafe mobs can now ghostize
+ - rscadd: Ghost cafe now has a cremator
+ - rscadd: Ghost cafe mobs are now eligible for ghost roles
+ - refactor: Ghost roles now use an element for eligibility purposes
+ - bugfix: You can toggle some prefs properly now.
+ - bugfix: no ass slap is no longer the same thing as no aphro
+ - balance: Devastating bombs kills bomb armor'd mobs again
+ - rscadd: Added a sort of "game mode ban" by way of having people rank their game
+ modes favorite to least favorite after the secret/extended vote.
+ - bugfix: Turns out the schulze scoring was written wrong and it was setting things
+ to 0 that shouldn't have been, so that's fixed.
+ - config: Random engines are now weighted.
+ - rscadd: Ghost dojo now has an autoylathe.
+ - rscdel: Ghost dojo no longer has VR or modular computer access.
+ - tweak: Ghost dojo mobs are pacifists.
+ - tweak: Ghost dojo booze-o-mat is now all access.
+ - bugfix: Ghost dojo crematorium now has a button.
+ - bugfix: Traitor objectives don't take a dump when they try to add an assassinate
+ anymore
+ - admin: Objective removal with antag panel no longer commented out silently while
+ still being an option that gives useful feedback on stuff it's not doing in
+ any respect
+ - rscadd: Second, temporary flavor text!
+ - bugfix: Limb damage works now
+ - tweak: Score instead of ranked choice for mode tiers
+ - bugfix: Chemistry not :b:roke
+ - tweak: Ghost dojo spawns will dust if their owner suicides or uses the "ghost"
+ verb.
+ - admin: Crafting is logged in a file now
+ - bugfix: temporary flavor text now pops up properly
+ - code_imp: demodularized player panel code, mostly
+ - admin: added ghost role eligibility delay removal to player panel
+ - balance: Metabolic synthesis disables if user isn't well-fed rather than if user
+ is starving
+ - bugfix: Gibtonite no longer instantly explodes upon being pickaxe'd.
+ - balance: Cold-blooded costs -2 quirk points now
+ - config: Added suicide to the config.
+ - tweak: Ghost cafe mobs are super duper attached to the ghost cafe.
+ - bugfix: Meow Mix bar sign works
+ - bugfix: Fixed a few relief valve behaviors
+ Ryll/Shaps, ported by Hatterhat:
+ - rscadd: Point-blanking people with shotguns actually throws them backwards!
+ Savotta:
+ - rscadd: snout
+ - imageadd: snout
+ Seris02:
+ - tweak: made it so trait blacklisting removes random positives instead of removing
+ everything
+ - rscadd: added atmos holofirelocks and temperature blocking
+ - tweak: tweaked how atmos holofan looks
+ - rscadd: stunglasses
+ - rscadd: disabler sechuds
+ - rscadd: adds coconut
+ - rscadd: adds a coconut bong
+ - rscadd: Auto ooc
+ - admin: changed "assume direct control" from m.ckey = src.ckey to adminmob.transfer_ckey(M)
+ so it works with auto ooc
+ - rscadd: marshmallow
+ - rscadd: telescopic IV drip
+ - bugfix: cardboard box speed
+ - tweak: makes gorilla shuttle emag only
+ - tweak: changed where the observe verb is.
+ - tweak: the way chameleon clothes update on change
+ - bugfix: chameleon cloak icon
+ - balance: Explosions now cause knockdown instead of KOs, with the amount of time
+ scaling off bomb armor. Heavy explosions still cause a ~2 second KO for follow
+ up attacks.
+ - balance: Devastating explosions now no longer gib players with more than 50 bomb
+ armor. This used to be more or less random depending on the amount of bomb armor.
+ - code_imp: Removed reagent explosion code that would trigger for <1 amount reactions.
+ - rscadd: traitor tool for bowmanizing headsets + bowmanizing headsets
+ - rscadd: durathread winter coats from hyper station
+ - tweak: conveyor belt now are stacks instead of single item
+ - tweak: conveyor crate has 30 belts
+ - tweak: printing a conveyor costs 3000 metal
+ - rscadd: you can press the conveyor switch in hand to link any not deployed belts
+ to it
+ - tweak: sniffing sneezing etc doing anything if they don't breathe
+ - bugfix: probably fixes the make mentor button
+ - tweak: the sprites for the conveyor belts to look more directional
+ Skoglol:
+ - bugfix: Falsewalls now properly hide pipes and wires.
+ SpaceManiac, bobbahbrown, ShizCalev, SpaceManiac (ported by Ghommie):
+ - code_imp: It is now possible to set a different most-base-turf per z-level.
+ - spellcheck: Removed unlawful reference to Disney's Star Wars franchise in map
+ logging.
+ - tweak: Moved mapping related errors to their own log file.
+ - bugfix: Destruction on Lavaland will no longer reveal space in rare situations.
+ Tlaltecuhtli, Nemvar, Trilby, Hatterhat:
+ - rscadd: russian surplus crate, sec ammo crate, meat/veggie/fruit crate, rped crate,
+ bomb suit crate, bio suit crate, parrot crate, chem crate, db crate
+ - tweak: lowered price of some crates which are overpriced for no reason aka the
+ tablet crate and the mech circuits crates, track implant crate has also track
+ .38 ammo
+ - bugfix: sectech vendor has a refill pack
+ Trilbyspaceclone:
+ - bugfix: Fermi plushie can be made once again
+ - tweak: range on Engi Tray scanners and Rad-Scanners
+ - bugfix: issues with mapping done my Trilby
+ - rscadd: Grass now makes light beer when distilled
+ - tweak: allows bandoliers to hold any ammo type as long as it has a casing
+ - server: Cleans out the last years of changlogs
+ - bugfix: 'rouge cases of #$39; in bottle/pill/patch/condiments'
+ - tweak: Adds missing but needed flags to MASON RIG
+ - bugfix: missing sprites with crushed cans
+ - tweak: Halfs the nutriments in sugar
+ - rscadd: Glitter is now makeable with ground plastic and some crayons
+ - code_imp: Makes more folders and files for uplink.
+ - rscadd: Seed packs now have RnD points inside them
+ - rscadd: New tips that reflect the now use seed packs have for Rnd / Chems affect
+ on plants
+ - code_imp: Made the research file look nice rather then an eye harming list
+ - bugfix: Fixed fragile space suits breaking from weak and non-damaging "weapons"
+ (such as the Sord, toys and foam darts).
+ - rscadd: 'tip of the round: Cleanbot can withstand lava and burning hot ash. Its
+ a god'
+ - rscadd: more glassware
+ - rscadd: Few new packs and glassmaker kit!
+ - tweak: prices/chems of crates/autobottler
+ - bugfix: some crates ungettable as well as some broken crates
+ Trilbyspaceclone, Ghommie:
+ - rscadd: More types of glass can now be used to make a solar panel, with different
+ sturdiness and efficiency depending the type.
+ Tupinambis:
+ - tweak: Replaces new fire alarms with a slightly updated version of the old ones.
+ - bugfix: Fixed bug where Amber alert had no proper alert lights, and red alert
+ had amber lights.
+ - balance: RLDs now cost more to use, have reduced matter capacity, and sheets are
+ worth less when refilling them.
+ Unit2E & JMoldy, ported by Hatterhat:
+ - balance: the powerfist now punches people away at high velocity depending on setting.
+ - rscadd: the powerfist now leaks the gas it uses onto the tile you're on.
+ - tweak: Adds weak punch variations for empty and near-empty punching.
+ Xantholne:
+ - bugfix: Christmas clothes that where missing stuff should work again
+ - tweak: Christmas clothes moved from clothesmate and loadout to premium autodrobe,
+ hoodies and boots remain.
+ - rscadd: Botany bee pet, Bumbles
+ - rscadd: New bee models that aren't 1 tile big of 0 opacity pixels
+ - rscadd: Cheongsam and Qipao clothing added to loadout and clothesmates
+ dapnee:
+ - imageadd: new toxin's uniform and accessories
+ - imagedel: old toxin's uniform and accessories
+ deathride58:
+ - balance: The stamina buffer no longer uses stamina while recharging.
+ jakeramsay007:
+ - rscadd: The assorted .357 revolvers (except russian revolver) can now also load
+ .38, like real life.
+ kappa-sama:
+ - rscadd: loot crates in cargo contraband
+ - code_imp: modular_citadel file movement
+ - code_imp: modular citadel loses some files
+ - balance: dragnet snares can now be removed in 5 seconds
+ keronshb:
+ - rscadd: Adds new features for nanites
+ - bugfix: fixed the missing icons from Dermal Button nanites
+ - rscadd: Ports the special nanite remote, mood programs, and research generating
+ nanites
+ - balance: rebalances some nanites
+ - bugfix: fixed my messup
+ kevinz000:
+ - rscadd: throwing things no longer makes them randomly turned as long as you aren't
+ on harm intent
+ - rscadd: Custom holoforms have been added for pAIs and AIs. oh and cyborg holograms
+ of specific modules too.
+ - balance: pais are no longer indestructible-flagged while in card form. pai radios
+ now short out if they are forcefully collapsed from damage.
+ - bugfix: telescopic iv drips now have the proper sanity checks for deployment.
+ - bugfix: megafauna can hear again
+ - balance: Cargo passive gen is now 500 down from 750.
+ - config: Added a few more nightshift config entries
+ - rscadd: nightshift_public_area variable in areas to determine how public an area
+ is.
+ - rscadd: NIGHT_SHIFT_PUBLIC_AREAS_ONLY config entry allows the server to be configured
+ to only nightshift areas of that level and below (so areas that are more public)
+ - rscadd: Config entries added for requiring authorizations to toggle nightshift.
+ Defaults to only requiring on public areas as determined by above
+ - balance: nuclear fist buffed.
+ - balance: cogscarabs are now fulltile-hitbox.
+ - balance: emitters are now hitscan
+ - balance: monkies gorrilize easier now
+ - rscadd: Ghosting no longer stops abductors from using you.
+ - rscadd: guests can now looc
+ - tweak: tableslamming has 0.4 second cooldown instead of 0.8
+ - bugfix: health analyzers now work
+ - code_imp: Mapping helpers added for power cables and atmos pipes.
+ - rscdel: Blood duplication is gone, but viruses now react up to 5 times, 1 time
+ per unit, for virus mix.
+ - rscadd: you can now block people on your PDA
+ - bugfix: Grenades can now have their timers adjusted.
+ - balance: Cloning has been nerfed.
+ - bugfix: hilbert hotel is now less of an exploity mess
+ - balance: Doorcrushes are once again instant.
+ nik707:
+ - tweak: engraving light_power from 1 to 0.3
+ r4d6:
+ - rscadd: Added a Radiation Hardsuit
+ - rscadd: Added a Radiation Hardsuit crate
+ - rscadd: Added 3 SM Engine variations.
+ - rscadd: 'Added a way to make opaque plastic flaps change: Change the already existing
+ flap recipe to show that they are see-through'
+ - rscadd: Animations for the RCD
+ - bugfix: Said animations being pulled by the Singulo
+ - balance: Prevent Reinforced Doors from being RCD'ed
+ - bugfix: Deconstructing Floors now cost MUs like everything else
+ - tweak: changed the RCD's upgrades into flags
+ - rscadd: Allow RCDs to print APC, Firelocks and Fire Alarms with the right upgrade
+ - balance: Allow Engineers to print RCDs and RPDs from their protolathe without
+ needing to hack one.
+ - rscadd: Added a playback device
+ - bugfix: Made the Voice Analyzer actually care about languages
+ - bugfix: fixed SM's piping
+ - rscadd: Added a message when pulsing the open wire.
+ - bugfix: fixed being able to use a playback device and a voice analyzer to activate
+ each others
+ - rscadd: added passive vent to the arsenal of atmospheric devices.
+ - rscadd: Mining base now has a common area accessible via a new shuttle on the
+ medium-highpop maps, and a security office connecting the gulag and the mining
+ base. Gulag also has functional atmos.
+ - rscadd: Added more Cyborg Landmarks
+ - refactor: better code for passive vents
+ - bugfix: fixed a hole in Meta
+ - rscadd: Added the ability to easily add variations of the mining base
+ - bugfix: fixed a sprite
+ timothyteakettle:
+ - bugfix: fixed not being able to remove trait genes without a disk being inserted
+ into the dna manipulator
diff --git a/html/changelogs/AutoChangeLog-pr-10073.yml b/html/changelogs/AutoChangeLog-pr-10073.yml
deleted file mode 100644
index 6764500fe5..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10073.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-author: "4dplanner, CRITAWAKETS, XDTM, ninjanomnom"
-delete-after: True
-changes:
- - rscadd: "sepia slime extract has a delay before activating"
- - balance: "the user of a sepia slime extract is no longer immune to the time field"
- - balance: "chilling sepia is now the support extract - it always freezes the user, but not other marked people. give one to your golem!"
- - rscadd: "burning sepia spawns the rewind camera. Take a selfie with someone and give it to them to make sure they remember the moment forever! You don't actually need to give them the photo, they'll remember anyway. Keep it as a reminder."
- - rscadd: "rewinding (deja vu) effect resets your location to the turf you were on after 10 seconds as well as resetting limbs/mobs/objects damage to the point it was added."
- - rscadd: "The deja vu effect cannot resurrect the dead, but will heal their corpse. New limbs fall off, old ones re-attach"
- - rscadd: "Regenerative sepia cores add a deja vu effect before healing instead of a timestop
-remove: timefreeze camera is admin spawn only."
- - rscadd: "recurring sepia recalls to the hand of the last person to touch it after activating. Reusable timestop grenades!"
- - tweak: "some special cameras don't prompt for customisation"
- - bugfix: "timefreeze camera actually makes a photo"
- - bugfix: "timestop stops pathing and mechs."
- - bugfix: "adds a check to make sure simple_animals don't get their AI toggled while sentient"
- - bugfix: "Adds the timestop overlay to frozen projectiles"
- - bugfix: "Timestopped things have INFINITY move_resist as opposed to being anchored"
- - bugfix: "Timestop will now unfreeze things that somehow leave it"
- - bugfix: "mobs in the middle of a walk_to will have their walk stopped by timestop"
- - bugfix: "mobs that are stunned will be stopped mid walk as well"
- - bugfix: "pulling respects changes in move_force"
- - bugfix: "swapping places respects move_force if the participant is not willing"
- - bugfix: "timestop is properly defeated by antimagic."
- - bugfix: "timestop only checks antimagic once"
- - tweak: "Time stop now applies its visual effect on floors, walls and static structures (with no change otherwise)"
- - tweak: "Movable structures are now anchored while time stopped."
- - tweak: "Timestop effects now prevent speech."
diff --git a/html/changelogs/AutoChangeLog-pr-10097.yml b/html/changelogs/AutoChangeLog-pr-10097.yml
deleted file mode 100644
index 9b9a2c9a58..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10097.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Ghommie"
-delete-after: True
-changes:
- - tweak: "Attached kevlar/soft/plastic padding accessories are now stealthier and will no longer be displayed on mob examine."
diff --git a/html/changelogs/AutoChangeLog-pr-10112.yml b/html/changelogs/AutoChangeLog-pr-10112.yml
deleted file mode 100644
index f09d8fa9ef..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10112.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Ghommie"
-delete-after: True
-changes:
- - refactor: "Refactored that mess of a code for alternate worn clothing sprites for digitigrade and taurs."
- - bugfix: "Fixed some issues with the aforementioned feature you may or may not have experienced because it was pretty lame."
diff --git a/html/changelogs/AutoChangeLog-pr-10123.yml b/html/changelogs/AutoChangeLog-pr-10123.yml
deleted file mode 100644
index 208b17b930..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10123.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "kevinz000"
-delete-after: True
-changes:
- - rscadd: "throwing things no longer makes them randomly turned as long as you aren't on harm intent"
diff --git a/html/changelogs/AutoChangeLog-pr-10125.yml b/html/changelogs/AutoChangeLog-pr-10125.yml
deleted file mode 100644
index 951b69ccb3..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10125.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Kevinz000"
-delete-after: True
-changes:
- - bugfix: "Fixes successful projectile hits also striking another atom on the same turf should the first one be not the target the projectile was meant for."
- - rscdel: "Removes infinite reflector loops."
diff --git a/html/changelogs/AutoChangeLog-pr-10165.yml b/html/changelogs/AutoChangeLog-pr-10165.yml
deleted file mode 100644
index be6f9dedf7..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10165.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Ghommie"
-delete-after: True
-changes:
- - bugfix: "Fixed missing digi versions fishnet sprites and wrong digitigrade left dir purple stockings sprite."
- - imageadd: "Add digitigrade versions for boxers and the long johns."
diff --git a/html/changelogs/AutoChangeLog-pr-10189.yml b/html/changelogs/AutoChangeLog-pr-10189.yml
deleted file mode 100644
index 5889e127d2..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10189.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Putnam3145"
-delete-after: True
-changes:
- - rscadd: "Dynamic storytellers, a new voting paradigm for dynamic"
- - rscadd: "Support for approval voting and condorcet (ranked choice) voting in server votes"
diff --git a/html/changelogs/AutoChangeLog-pr-10191.yml b/html/changelogs/AutoChangeLog-pr-10191.yml
deleted file mode 100644
index c1366727bd..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10191.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "kevinz000"
-delete-after: True
-changes:
- - rscadd: "Custom holoforms have been added for pAIs and AIs. oh and cyborg holograms of specific modules too."
- - balance: "pais are no longer indestructible-flagged while in card form. pai radios now short out if they are forcefully collapsed from damage."
diff --git a/html/changelogs/AutoChangeLog-pr-10224.yml b/html/changelogs/AutoChangeLog-pr-10224.yml
deleted file mode 100644
index b7d07abe5c..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10224.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Seris02"
-delete-after: True
-changes:
- - tweak: "made it so trait blacklisting removes random positives instead of removing everything"
diff --git a/html/changelogs/AutoChangeLog-pr-10238.yml b/html/changelogs/AutoChangeLog-pr-10238.yml
deleted file mode 100644
index dda40c86c9..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10238.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-author: "SpaceManiac, bobbahbrown, ShizCalev, SpaceManiac (ported by Ghommie)"
-delete-after: True
-changes:
- - code_imp: "It is now possible to set a different most-base-turf per z-level."
- - spellcheck: "Removed unlawful reference to Disney's Star Wars franchise in map logging."
- - tweak: "Moved mapping related errors to their own log file."
- - bugfix: "Destruction on Lavaland will no longer reveal space in rare situations."
diff --git a/html/changelogs/AutoChangeLog-pr-10247.yml b/html/changelogs/AutoChangeLog-pr-10247.yml
deleted file mode 100644
index b78e5c415d..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10247.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Seris02"
-delete-after: True
-changes:
- - rscadd: "added atmos holofirelocks and temperature blocking"
- - tweak: "tweaked how atmos holofan looks"
diff --git a/html/changelogs/AutoChangeLog-pr-10255.yml b/html/changelogs/AutoChangeLog-pr-10255.yml
deleted file mode 100644
index ebaccd0af6..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10255.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Xantholne"
-delete-after: True
-changes:
- - bugfix: "Christmas clothes that where missing stuff should work again"
diff --git a/html/changelogs/AutoChangeLog-pr-10256.yml b/html/changelogs/AutoChangeLog-pr-10256.yml
deleted file mode 100644
index eb14f716cc..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10256.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Putnam"
-delete-after: True
-changes:
- - rscadd: "Alcohol intolerance trait, which forces vomiting on any alcohol ingestion"
diff --git a/html/changelogs/AutoChangeLog-pr-10270.yml b/html/changelogs/AutoChangeLog-pr-10270.yml
deleted file mode 100644
index b47a249f9a..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10270.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Ghommie"
-delete-after: True
-changes:
- - bugfix: "Fixed the secret sauce recipe being randomized every round."
diff --git a/html/changelogs/AutoChangeLog-pr-10278.yml b/html/changelogs/AutoChangeLog-pr-10278.yml
deleted file mode 100644
index 76ada12f20..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10278.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Trilbyspaceclone"
-delete-after: True
-changes:
- - bugfix: "Fermi plushie can be made once again"
diff --git a/html/changelogs/AutoChangeLog-pr-10285.yml b/html/changelogs/AutoChangeLog-pr-10285.yml
deleted file mode 100644
index 89b0bbae43..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10285.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Ghommie"
-delete-after: True
-changes:
- - bugfix: "Fixed singularity pulls duping rods out of engine floors."
diff --git a/html/changelogs/AutoChangeLog-pr-10287.yml b/html/changelogs/AutoChangeLog-pr-10287.yml
deleted file mode 100644
index f59cd0bd7f..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10287.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Ghommie"
-delete-after: True
-changes:
- - rscdel: "Removed an old pair of zipties from the captain closet."
diff --git a/html/changelogs/AutoChangeLog-pr-10295.yml b/html/changelogs/AutoChangeLog-pr-10295.yml
new file mode 100644
index 0000000000..a776275e6e
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10295.yml
@@ -0,0 +1,4 @@
+author: "kevinz000"
+delete-after: True
+changes:
+ - balance: "Abductor mindsnapping (aka abductee objectives) can now be \"cured\" with brain surgery."
diff --git a/html/changelogs/AutoChangeLog-pr-10301.yml b/html/changelogs/AutoChangeLog-pr-10301.yml
deleted file mode 100644
index 2acac559e9..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10301.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Trilbyspaceclone"
-delete-after: True
-changes:
- - tweak: "range on Engi Tray scanners and Rad-Scanners"
diff --git a/html/changelogs/AutoChangeLog-pr-10306.yml b/html/changelogs/AutoChangeLog-pr-10306.yml
deleted file mode 100644
index 9ab82dbda0..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10306.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Arturlang"
-delete-after: True
-changes:
- - tweak: "Vampires are no longer as tanky"
diff --git a/html/changelogs/AutoChangeLog-pr-10309.yml b/html/changelogs/AutoChangeLog-pr-10309.yml
deleted file mode 100644
index a59ebff156..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10309.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Seris02"
-delete-after: True
-changes:
- - rscadd: "disabler sechuds"
diff --git a/html/changelogs/AutoChangeLog-pr-10319.yml b/html/changelogs/AutoChangeLog-pr-10319.yml
deleted file mode 100644
index 88235aab8e..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10319.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Seris02"
-delete-after: True
-changes:
- - rscadd: "adds coconut"
- - rscadd: "adds a coconut bong"
diff --git a/html/changelogs/AutoChangeLog-pr-10329.yml b/html/changelogs/AutoChangeLog-pr-10329.yml
deleted file mode 100644
index e5d78ddf96..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10329.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Naksu"
-delete-after: True
-changes:
- - code_imp: "reagent IDs have been removed in favor using reagent typepaths where applicable"
- - bugfix: "mechas, borg hyposprays etc no longer display internal reagent ids to the player"
diff --git a/html/changelogs/AutoChangeLog-pr-10330.yml b/html/changelogs/AutoChangeLog-pr-10330.yml
deleted file mode 100644
index b2a46ef605..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10330.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "keronshb"
-delete-after: True
-changes:
- - rscadd: "Adds new features for nanites"
diff --git a/html/changelogs/AutoChangeLog-pr-10333.yml b/html/changelogs/AutoChangeLog-pr-10333.yml
deleted file mode 100644
index b5c11a4646..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10333.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Trilbyspaceclone"
-delete-after: True
-changes:
- - rscadd: "Grass now makes light beer when distilled"
diff --git a/html/changelogs/AutoChangeLog-pr-10337.yml b/html/changelogs/AutoChangeLog-pr-10337.yml
deleted file mode 100644
index 370a8fdc04..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10337.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Seris02"
-delete-after: True
-changes:
- - rscadd: "Auto ooc"
- - admin: "changed \"assume direct control\" from m.ckey = src.ckey to adminmob.transfer_ckey(M) so it works with auto ooc"
diff --git a/html/changelogs/AutoChangeLog-pr-10338.yml b/html/changelogs/AutoChangeLog-pr-10338.yml
deleted file mode 100644
index c4816a3fbe..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10338.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Seris02"
-delete-after: True
-changes:
- - rscadd: "marshmallow"
diff --git a/html/changelogs/AutoChangeLog-pr-10339.yml b/html/changelogs/AutoChangeLog-pr-10339.yml
deleted file mode 100644
index c313c4bf80..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10339.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Seris02"
-delete-after: True
-changes:
- - rscadd: "telescopic IV drip"
diff --git a/html/changelogs/AutoChangeLog-pr-10344.yml b/html/changelogs/AutoChangeLog-pr-10344.yml
deleted file mode 100644
index e0381c6a43..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10344.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Ghommie"
-delete-after: True
-changes:
- - bugfix: "Chestbursters won't delete the host's brain somewhat anymore."
diff --git a/html/changelogs/AutoChangeLog-pr-10345.yml b/html/changelogs/AutoChangeLog-pr-10345.yml
deleted file mode 100644
index a95653cdda..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10345.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Trilbyspaceclone"
-delete-after: True
-changes:
- - tweak: "allows bandoliers to hold any ammo type as long as it has a casing"
diff --git a/html/changelogs/AutoChangeLog-pr-10346.yml b/html/changelogs/AutoChangeLog-pr-10346.yml
deleted file mode 100644
index 3a0cd6dae4..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10346.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: "Bhijn"
-delete-after: True
-changes:
- - rscadd: "Limbs now regenerate their stamina faster while disabled"
- - rscadd: "Limbs now have the same incoming stamina damage multiplier mechanics as spacemen, where the more staminaloss they take while disabled, the less staminaloss they'll take."
- - balance: "Limbs have had their base stamina regen rate doubled to match the doubled stamina regen rate of standard spacemen."
diff --git a/html/changelogs/AutoChangeLog-pr-10347.yml b/html/changelogs/AutoChangeLog-pr-10347.yml
deleted file mode 100644
index c0508aa279..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10347.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "deathride58"
-delete-after: True
-changes:
- - balance: "The stamina buffer no longer uses stamina while recharging."
diff --git a/html/changelogs/AutoChangeLog-pr-10349.yml b/html/changelogs/AutoChangeLog-pr-10349.yml
deleted file mode 100644
index fad3179c6e..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10349.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: "KathrinBailey"
-delete-after: True
-changes:
- - rscadd: "Empty engineering lockers for mappers."
- - rscadd: "Industrial welding tools to the engineer welding locker."
- - rscdel: "Removed the multitool, airlock painter, mechanical toolbox, brown sneakers, hazard vest and airlock painter from the CE's locker."
diff --git a/html/changelogs/AutoChangeLog-pr-10350.yml b/html/changelogs/AutoChangeLog-pr-10350.yml
deleted file mode 100644
index 580f1d68cf..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10350.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-author: "Putnam3145"
-delete-after: True
-changes:
- - rscadd: "Ghost cafe mobs can now ghostize"
- - rscadd: "Ghost cafe now has a cremator"
- - rscadd: "Ghost cafe mobs are now eligible for ghost roles"
- - refactor: "Ghost roles now use an element for eligibility purposes"
diff --git a/html/changelogs/AutoChangeLog-pr-10356.yml b/html/changelogs/AutoChangeLog-pr-10356.yml
deleted file mode 100644
index 1016b559ee..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10356.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Bhijn"
-delete-after: True
-changes:
- - rscadd: "Added a preference to make the sprint hotkey be a toggle instead of a hold bind"
- - rscadd: "Added a preference to bind the sprint hotkey to space instead of shift."
diff --git a/html/changelogs/AutoChangeLog-pr-10357.yml b/html/changelogs/AutoChangeLog-pr-10357.yml
deleted file mode 100644
index 048baa3041..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10357.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Putnam3145"
-delete-after: True
-changes:
- - bugfix: "You can toggle some prefs properly now."
diff --git a/html/changelogs/AutoChangeLog-pr-10358.yml b/html/changelogs/AutoChangeLog-pr-10358.yml
deleted file mode 100644
index a578e6e336..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10358.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Trilbyspaceclone"
-delete-after: True
-changes:
- - server: "Cleans out the last years of changlogs"
diff --git a/html/changelogs/AutoChangeLog-pr-10361.yml b/html/changelogs/AutoChangeLog-pr-10361.yml
deleted file mode 100644
index 0224bdcb49..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10361.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "CameronWoof"
-delete-after: True
-changes:
- - rscadd: "Ghost Cafe patrons now spawn with chameleon kits. Dress up! Be fancy!"
diff --git a/html/changelogs/AutoChangeLog-pr-10362.yml b/html/changelogs/AutoChangeLog-pr-10362.yml
deleted file mode 100644
index f92e16302a..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10362.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Trilbyspaceclone"
-delete-after: True
-changes:
- - bugfix: "rouge cases of #$39; in bottle/pill/patch/condiments"
diff --git a/html/changelogs/AutoChangeLog-pr-10364.yml b/html/changelogs/AutoChangeLog-pr-10364.yml
deleted file mode 100644
index 8834c494ad..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10364.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "kevinz000"
-delete-after: True
-changes:
- - bugfix: "telescopic iv drips now have the proper sanity checks for deployment."
diff --git a/html/changelogs/AutoChangeLog-pr-10365.yml b/html/changelogs/AutoChangeLog-pr-10365.yml
deleted file mode 100644
index f7ba047fc7..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10365.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Putnam3145"
-delete-after: True
-changes:
- - bugfix: "no ass slap is no longer the same thing as no aphro"
diff --git a/html/changelogs/AutoChangeLog-pr-10366.yml b/html/changelogs/AutoChangeLog-pr-10366.yml
deleted file mode 100644
index ec8d234edd..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10366.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Hatterhat"
-delete-after: True
-changes:
- - balance: "Beakers are generally more useful now, with slight capacity increases."
- - tweak: "Transfer amounts are different now. Adjust your muscle memory to compensate."
diff --git a/html/changelogs/AutoChangeLog-pr-10368.yml b/html/changelogs/AutoChangeLog-pr-10368.yml
deleted file mode 100644
index e6486f2815..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10368.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Hatterhat"
-delete-after: True
-changes:
- - balance: "ore redemption machines actually get affected by lasers again kthx"
diff --git a/html/changelogs/AutoChangeLog-pr-10369.yml b/html/changelogs/AutoChangeLog-pr-10369.yml
deleted file mode 100644
index c292d948fb..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10369.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Hatterhat"
-delete-after: True
-changes:
- - tweak: "crusher trophy drop chance on mining mobs increased to 1 in 4 (from 1 in 20)"
diff --git a/html/changelogs/AutoChangeLog-pr-10370.yml b/html/changelogs/AutoChangeLog-pr-10370.yml
deleted file mode 100644
index 6674fd2e17..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10370.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Hatterhat"
-delete-after: True
-changes:
- - bugfix: "Blood-drunk buff from blood-drunk eye crusher trophy is less likely to cripple its user."
diff --git a/html/changelogs/AutoChangeLog-pr-10371.yml b/html/changelogs/AutoChangeLog-pr-10371.yml
deleted file mode 100644
index e4322d70f1..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10371.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "kappa-sama"
-delete-after: True
-changes:
- - rscadd: "loot crates in cargo contraband"
diff --git a/html/changelogs/AutoChangeLog-pr-10372.yml b/html/changelogs/AutoChangeLog-pr-10372.yml
deleted file mode 100644
index 6bb60c3d8d..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10372.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Hatterhat"
-delete-after: True
-changes:
- - tweak: "Forcefield projectors now fit on toolbelts."
- - imageadd: "New sprites for ATMOS holofan and forcefield projectors!"
diff --git a/html/changelogs/AutoChangeLog-pr-10374.yml b/html/changelogs/AutoChangeLog-pr-10374.yml
deleted file mode 100644
index 376f49a4d4..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10374.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Bhijn helped"
-delete-after: True
-changes:
- - bugfix: "Fixes Dragon's Tooth Sword 50% armor penetration by making it 35%"
diff --git a/html/changelogs/AutoChangeLog-pr-10375.yml b/html/changelogs/AutoChangeLog-pr-10375.yml
deleted file mode 100644
index 7d0cc2bf44..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10375.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "r4d6"
-delete-after: True
-changes:
- - rscadd: "Added a Radiation Hardsuit"
- - rscadd: "Added a Radiation Hardsuit crate"
diff --git a/html/changelogs/AutoChangeLog-pr-10378.yml b/html/changelogs/AutoChangeLog-pr-10378.yml
deleted file mode 100644
index c7ab7d42c1..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10378.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "EmeraldSundisk"
-delete-after: True
-changes:
- - rscadd: "Adds a sign outside MetaStation's custodial closet"
diff --git a/html/changelogs/AutoChangeLog-pr-10379.yml b/html/changelogs/AutoChangeLog-pr-10379.yml
deleted file mode 100644
index 9623f815d6..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10379.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Ryll/Shaps, ported by Hatterhat"
-delete-after: True
-changes:
- - rscadd: "Point-blanking people with shotguns actually throws them backwards!"
diff --git a/html/changelogs/AutoChangeLog-pr-10380.yml b/html/changelogs/AutoChangeLog-pr-10380.yml
deleted file mode 100644
index 4604329137..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10380.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: "Unit2E & JMoldy, ported by Hatterhat"
-delete-after: True
-changes:
- - balance: "the powerfist now punches people away at high velocity depending on setting."
- - rscadd: "the powerfist now leaks the gas it uses onto the tile you're on."
- - tweak: "Adds weak punch variations for empty and near-empty punching."
diff --git a/html/changelogs/AutoChangeLog-pr-10383.yml b/html/changelogs/AutoChangeLog-pr-10383.yml
deleted file mode 100644
index c6787bbafe..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10383.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "kevinz000"
-delete-after: True
-changes:
- - bugfix: "megafauna can hear again"
diff --git a/html/changelogs/AutoChangeLog-pr-10384.yml b/html/changelogs/AutoChangeLog-pr-10384.yml
deleted file mode 100644
index 315a62dadd..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10384.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: "Tlaltecuhtli, Nemvar, Trilby, Hatterhat"
-delete-after: True
-changes:
- - rscadd: "russian surplus crate, sec ammo crate, meat/veggie/fruit crate, rped crate, bomb suit crate, bio suit crate, parrot crate, chem crate, db crate"
- - tweak: "lowered price of some crates which are overpriced for no reason aka the tablet crate and the mech circuits crates, track implant crate has also track .38 ammo"
- - bugfix: "sectech vendor has a refill pack"
diff --git a/html/changelogs/AutoChangeLog-pr-10388.yml b/html/changelogs/AutoChangeLog-pr-10388.yml
deleted file mode 100644
index fd06a5db3f..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10388.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "CameronWoof"
-delete-after: True
-changes:
- - rscadd: "Robots can now check the crew manifest from anywhere with the \"View Crew Manifest\" verb."
diff --git a/html/changelogs/AutoChangeLog-pr-10399.yml b/html/changelogs/AutoChangeLog-pr-10399.yml
deleted file mode 100644
index cbdb00630c..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10399.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "kevinz000"
-delete-after: True
-changes:
- - balance: "Cargo passive gen is now 500 down from 750."
diff --git a/html/changelogs/AutoChangeLog-pr-10401.yml b/html/changelogs/AutoChangeLog-pr-10401.yml
deleted file mode 100644
index 2aa8d91244..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10401.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "r4d6"
-delete-after: True
-changes:
- - rscadd: "Added 3 SM Engine variations."
diff --git a/html/changelogs/AutoChangeLog-pr-10403.yml b/html/changelogs/AutoChangeLog-pr-10403.yml
deleted file mode 100644
index 321789a546..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10403.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "r4d6"
-delete-after: True
-changes:
- - rscadd: "Added a way to make opaque plastic flaps
-change: Change the already existing flap recipe to show that they are see-through"
diff --git a/html/changelogs/AutoChangeLog-pr-10404.yml b/html/changelogs/AutoChangeLog-pr-10404.yml
deleted file mode 100644
index 5f88a991ff..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10404.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Xantholne"
-delete-after: True
-changes:
- - tweak: "Christmas clothes moved from clothesmate and loadout to premium autodrobe, hoodies and boots remain."
diff --git a/html/changelogs/AutoChangeLog-pr-10410.yml b/html/changelogs/AutoChangeLog-pr-10410.yml
deleted file mode 100644
index c6c9d24749..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10410.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "CameronWoof"
-delete-after: True
-changes:
- - tweak: "Lizard tails are now viable options for humans and anthromorphs."
diff --git a/html/changelogs/AutoChangeLog-pr-10412.yml b/html/changelogs/AutoChangeLog-pr-10412.yml
deleted file mode 100644
index b838dbb680..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10412.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Linzolle"
-delete-after: True
-changes:
- - bugfix: "fixes matchboxes runtiming every time they spawn"
diff --git a/html/changelogs/AutoChangeLog-pr-10413.yml b/html/changelogs/AutoChangeLog-pr-10413.yml
deleted file mode 100644
index 6d6378675b..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10413.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "nik707"
-delete-after: True
-changes:
- - tweak: "engraving light_power from 1 to 0.3"
diff --git a/html/changelogs/AutoChangeLog-pr-10414.yml b/html/changelogs/AutoChangeLog-pr-10414.yml
new file mode 100644
index 0000000000..25750a889d
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10414.yml
@@ -0,0 +1,4 @@
+author: "CameronWoof"
+delete-after: True
+changes:
+ - tweak: "Lighting looks better now. I can say that because the PR wouldn't be merged and you wouldn't be reading this if it wasn't true."
diff --git a/html/changelogs/AutoChangeLog-pr-10416.yml b/html/changelogs/AutoChangeLog-pr-10416.yml
deleted file mode 100644
index 13432b283c..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10416.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-author: "r4d6"
-delete-after: True
-changes:
- - rscadd: "Animations for the RCD"
- - bugfix: "Said animations being pulled by the Singulo"
- - balance: "Prevent Reinforced Doors from being RCD'ed"
- - bugfix: "Deconstructing Floors now cost MUs like everything else"
- - tweak: "changed the RCD's upgrades into flags"
- - rscadd: "Allow RCDs to print APC, Firelocks and Fire Alarms with the right upgrade"
- - balance: "Allow Engineers to print RCDs and RPDs from their protolathe without needing to hack one."
diff --git a/html/changelogs/AutoChangeLog-pr-10417.yml b/html/changelogs/AutoChangeLog-pr-10417.yml
deleted file mode 100644
index 31ac154ac9..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10417.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-author: "kevinz000"
-delete-after: True
-changes:
- - config: "Added a few more nightshift config entries"
- - rscadd: "nightshift_public_area variable in areas to determine how public an area is."
- - rscadd: "NIGHT_SHIFT_PUBLIC_AREAS_ONLY config entry allows the server to be configured to only nightshift areas of that level and below (so areas that are more public)"
- - rscadd: "Config entries added for requiring authorizations to toggle nightshift. Defaults to only requiring on public areas as determined by above"
diff --git a/html/changelogs/AutoChangeLog-pr-10420.yml b/html/changelogs/AutoChangeLog-pr-10420.yml
deleted file mode 100644
index b719eca84c..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10420.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "MrJWhit"
-delete-after: True
-changes:
- - tweak: "Increases plasma usage in radiation collectors"
diff --git a/html/changelogs/AutoChangeLog-pr-10427.yml b/html/changelogs/AutoChangeLog-pr-10427.yml
deleted file mode 100644
index 5f4fe73988..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10427.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Hatterhat"
-delete-after: True
-changes:
- - tweak: "tweaks some values around with beaker transfer amounts, adds a transfer value verb (altclick)"
diff --git a/html/changelogs/AutoChangeLog-pr-10428.yml b/html/changelogs/AutoChangeLog-pr-10428.yml
deleted file mode 100644
index 2cd635d0a2..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10428.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Putnam3145"
-delete-after: True
-changes:
- - balance: "Devastating bombs kills bomb armor'd mobs again"
diff --git a/html/changelogs/AutoChangeLog-pr-10429.yml b/html/changelogs/AutoChangeLog-pr-10429.yml
deleted file mode 100644
index cc83f8abb6..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10429.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Trilbyspaceclone"
-delete-after: True
-changes:
- - tweak: "Adds missing but needed flags to MASON RIG"
diff --git a/html/changelogs/AutoChangeLog-pr-10430.yml b/html/changelogs/AutoChangeLog-pr-10430.yml
deleted file mode 100644
index 4fd03a5b2b..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10430.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "kevinz000"
-delete-after: True
-changes:
- - balance: "nuclear fist buffed."
diff --git a/html/changelogs/AutoChangeLog-pr-10432.yml b/html/changelogs/AutoChangeLog-pr-10432.yml
deleted file mode 100644
index a0b40baa45..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10432.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Trilbyspaceclone"
-delete-after: True
-changes:
- - bugfix: "missing sprites with crushed cans"
diff --git a/html/changelogs/AutoChangeLog-pr-10433.yml b/html/changelogs/AutoChangeLog-pr-10433.yml
deleted file mode 100644
index 036e74a804..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10433.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "kevinz000"
-delete-after: True
-changes:
- - balance: "cogscarabs are now fulltile-hitbox."
diff --git a/html/changelogs/AutoChangeLog-pr-10435.yml b/html/changelogs/AutoChangeLog-pr-10435.yml
deleted file mode 100644
index 6b684a57a5..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10435.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "FantasticFwoosh, ported by Hatterhat"
-delete-after: True
-changes:
- - rscadd: "Both reagent universal enzyme & sacks of flour are now available for their respective costs from the biogenerator."
- - rscadd: "New crafting recipies for donut boxes, eggboxes & candle boxes have been added to cardboard recipes for the collective benefit of service personnel and the station."
diff --git a/html/changelogs/AutoChangeLog-pr-10437.yml b/html/changelogs/AutoChangeLog-pr-10437.yml
deleted file mode 100644
index ee454f47b9..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10437.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Ghommie"
-delete-after: True
-changes:
- - bugfix: "Fixed roundstart mushpeople being unable to MUSH PUUUUUUUUUUUUNCH!!"
diff --git a/html/changelogs/AutoChangeLog-pr-10439.yml b/html/changelogs/AutoChangeLog-pr-10439.yml
deleted file mode 100644
index 92b151b883..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10439.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "LetterN"
-delete-after: True
-changes:
- - rscadd: "Doppler logs"
diff --git a/html/changelogs/AutoChangeLog-pr-10440.yml b/html/changelogs/AutoChangeLog-pr-10440.yml
deleted file mode 100644
index e942f4056f..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10440.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Putnam3145"
-delete-after: True
-changes:
- - rscadd: "Added a sort of \"game mode ban\" by way of having people rank their game modes favorite to least favorite after the secret/extended vote."
- - bugfix: "Turns out the schulze scoring was written wrong and it was setting things to 0 that shouldn't have been, so that's fixed."
diff --git a/html/changelogs/AutoChangeLog-pr-10450.yml b/html/changelogs/AutoChangeLog-pr-10450.yml
deleted file mode 100644
index d2c5d8b40a..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10450.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "kevinz000"
-delete-after: True
-changes:
- - balance: "emitters are now hitscan"
diff --git a/html/changelogs/AutoChangeLog-pr-10452.yml b/html/changelogs/AutoChangeLog-pr-10452.yml
deleted file mode 100644
index e51b9ff752..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10452.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Ghommie"
-delete-after: True
-changes:
- - bugfix: "Lattices can be examined yet again."
diff --git a/html/changelogs/AutoChangeLog-pr-10454.yml b/html/changelogs/AutoChangeLog-pr-10454.yml
deleted file mode 100644
index d89603959e..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10454.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Commandersand"
-delete-after: True
-changes:
- - bugfix: "fixed some clothnig sprites"
diff --git a/html/changelogs/AutoChangeLog-pr-10456.yml b/html/changelogs/AutoChangeLog-pr-10456.yml
deleted file mode 100644
index 4c94455e47..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10456.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-author: "Putnam"
-delete-after: True
-changes:
- - rscdel: "Arousal damage is gone, and with it the arousal damage heart on the UI."
- - rscdel: "As exhibitionist relied on arousal damage, that's gone too."
- - rscdel: "Bonermeter and electronic stimulation circuit modules are gone."
- - rscdel: "Masturbation is no longer an option in the climax menu. It was identical to climax alone in every way but text. Emote it out."
- - rscadd: "Arousal on genitals can now be displayed manually, on a case-by-case basis."
- - rscadd: "\"Climax alone\" and \"climax with partner\" now only display to the people directly involved in the interaction.
-rework: Catnip tea, catnip, crocin, hexacrocin, camphor, hexacamphor all had functions or bits of functions reworked."
- - tweak: "\"Climax with partner\" now requires consent from both parties--it can no longer be used on mindless mobs, and it asks the mob getting climaxed with if they consent first."
- - tweak: "A lot of MKUltra behaviors have been moved to hypno checks or removed due to reliance on maso/nympho/exhib."
diff --git a/html/changelogs/AutoChangeLog-pr-10457.yml b/html/changelogs/AutoChangeLog-pr-10457.yml
deleted file mode 100644
index 203842b0b6..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10457.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "r4d6"
-delete-after: True
-changes:
- - rscadd: "Added a playback device"
- - bugfix: "Made the Voice Analyzer actually care about languages"
diff --git a/html/changelogs/AutoChangeLog-pr-10459.yml b/html/changelogs/AutoChangeLog-pr-10459.yml
deleted file mode 100644
index 77de8eb193..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10459.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Putnam"
-delete-after: True
-changes:
- - rscadd: "Cold-blooded quirk"
diff --git a/html/changelogs/AutoChangeLog-pr-10463.yml b/html/changelogs/AutoChangeLog-pr-10463.yml
deleted file mode 100644
index 70e97975ce..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10463.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Putnam3145"
-delete-after: True
-changes:
- - config: "Random engines are now weighted."
diff --git a/html/changelogs/AutoChangeLog-pr-10465.yml b/html/changelogs/AutoChangeLog-pr-10465.yml
deleted file mode 100644
index 26dff901b2..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10465.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-author: "Putnam3145"
-delete-after: True
-changes:
- - rscadd: "Ghost dojo now has an autoylathe."
- - rscdel: "Ghost dojo no longer has VR or modular computer access."
- - tweak: "Ghost dojo mobs are pacifists."
- - tweak: "Ghost dojo booze-o-mat is now all access."
- - bugfix: "Ghost dojo crematorium now has a button."
diff --git a/html/changelogs/AutoChangeLog-pr-10467.yml b/html/changelogs/AutoChangeLog-pr-10467.yml
deleted file mode 100644
index 7fa379f088..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10467.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Seris02"
-delete-after: True
-changes:
- - bugfix: "cardboard box speed"
diff --git a/html/changelogs/AutoChangeLog-pr-10468.yml b/html/changelogs/AutoChangeLog-pr-10468.yml
deleted file mode 100644
index 055411d0f2..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10468.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "kevinz000"
-delete-after: True
-changes:
- - rscadd: "Ghosting no longer stops abductors from using you."
diff --git a/html/changelogs/AutoChangeLog-pr-10472.yml b/html/changelogs/AutoChangeLog-pr-10472.yml
deleted file mode 100644
index 9404d70b7b..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10472.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "keronshb"
-delete-after: True
-changes:
- - bugfix: "fixed the missing icons from Dermal Button nanites"
diff --git a/html/changelogs/AutoChangeLog-pr-10473.yml b/html/changelogs/AutoChangeLog-pr-10473.yml
deleted file mode 100644
index f1821a3cce..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10473.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Bhijn"
-delete-after: True
-changes:
- - bugfix: "server_hop can no longer be used to remotely lobotomize a spaceman"
diff --git a/html/changelogs/AutoChangeLog-pr-10474.yml b/html/changelogs/AutoChangeLog-pr-10474.yml
deleted file mode 100644
index ae7b5b3fcb..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10474.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Putnam3145"
-delete-after: True
-changes:
- - bugfix: "Traitor objectives don't take a dump when they try to add an assassinate anymore"
- - admin: "Objective removal with antag panel no longer commented out silently while still being an option that gives useful feedback on stuff it's not doing in any respect"
diff --git a/html/changelogs/AutoChangeLog-pr-10478.yml b/html/changelogs/AutoChangeLog-pr-10478.yml
deleted file mode 100644
index b174a5e8ee..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10478.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Seris02"
-delete-after: True
-changes:
- - tweak: "makes gorilla shuttle emag only"
diff --git a/html/changelogs/AutoChangeLog-pr-10480.yml b/html/changelogs/AutoChangeLog-pr-10480.yml
deleted file mode 100644
index 7ecfd7057e..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10480.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Putnam3145"
-delete-after: True
-changes:
- - rscadd: "Second, temporary flavor text!"
diff --git a/html/changelogs/AutoChangeLog-pr-10481.yml b/html/changelogs/AutoChangeLog-pr-10481.yml
deleted file mode 100644
index c884a45ec9..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10481.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "dapnee"
-delete-after: True
-changes:
- - imageadd: "new toxin's uniform and accessories"
- - imagedel: "old toxin's uniform and accessories"
diff --git a/html/changelogs/AutoChangeLog-pr-10482.yml b/html/changelogs/AutoChangeLog-pr-10482.yml
deleted file mode 100644
index e97c8870d4..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10482.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "kappa-sama"
-delete-after: True
-changes:
- - code_imp: "modular_citadel file movement"
diff --git a/html/changelogs/AutoChangeLog-pr-10483.yml b/html/changelogs/AutoChangeLog-pr-10483.yml
deleted file mode 100644
index 1f016b1591..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10483.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Putnam3145"
-delete-after: True
-changes:
- - bugfix: "Limb damage works now"
diff --git a/html/changelogs/AutoChangeLog-pr-10485.yml b/html/changelogs/AutoChangeLog-pr-10485.yml
deleted file mode 100644
index 6bf082f8ba..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10485.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Detective-Google"
-delete-after: True
-changes:
- - tweak: "replaced the sprites with new ones requested."
diff --git a/html/changelogs/AutoChangeLog-pr-10486.yml b/html/changelogs/AutoChangeLog-pr-10486.yml
deleted file mode 100644
index 448bbc162c..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10486.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Seris02"
-delete-after: True
-changes:
- - tweak: "changed where the observe verb is."
diff --git a/html/changelogs/AutoChangeLog-pr-10489.yml b/html/changelogs/AutoChangeLog-pr-10489.yml
deleted file mode 100644
index 4e393bd4b1..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10489.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Seris02"
-delete-after: True
-changes:
- - tweak: "the way chameleon clothes update on change"
- - bugfix: "chameleon cloak icon"
diff --git a/html/changelogs/AutoChangeLog-pr-10492.yml b/html/changelogs/AutoChangeLog-pr-10492.yml
deleted file mode 100644
index de6ab309ab..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10492.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Trilbyspaceclone"
-delete-after: True
-changes:
- - rscadd: "Glitter is now makeable with ground plastic and some crayons"
diff --git a/html/changelogs/AutoChangeLog-pr-10493.yml b/html/changelogs/AutoChangeLog-pr-10493.yml
deleted file mode 100644
index 201eaad5b5..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10493.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Putnam3145"
-delete-after: True
-changes:
- - tweak: "Score instead of ranked choice for mode tiers"
diff --git a/html/changelogs/AutoChangeLog-pr-10497.yml b/html/changelogs/AutoChangeLog-pr-10497.yml
deleted file mode 100644
index 5acb6f8c47..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10497.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Trilbyspaceclone"
-delete-after: True
-changes:
- - code_imp: "Makes more folders and files for uplink."
diff --git a/html/changelogs/AutoChangeLog-pr-10498.yml b/html/changelogs/AutoChangeLog-pr-10498.yml
deleted file mode 100644
index 986abc77c2..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10498.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "kevinz000"
-delete-after: True
-changes:
- - tweak: "tableslamming has 0.4 second cooldown instead of 0.8"
diff --git a/html/changelogs/AutoChangeLog-pr-10501.yml b/html/changelogs/AutoChangeLog-pr-10501.yml
deleted file mode 100644
index 27e7ddbb8e..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10501.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Putnam"
-delete-after: True
-changes:
- - rscadd: "Two relief valves for atmospherics, available in your RPD today: a unary one that opens to air and a binary one that connects two pipenets, like a manual valve."
- - tweak: "The atmos waste outlet injector on box has been replaced with an atmos waste relief valve."
diff --git a/html/changelogs/AutoChangeLog-pr-10503.yml b/html/changelogs/AutoChangeLog-pr-10503.yml
deleted file mode 100644
index b067aa6c55..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10503.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "r4d6"
-delete-after: True
-changes:
- - bugfix: "fixed SM's piping"
diff --git a/html/changelogs/AutoChangeLog-pr-10504.yml b/html/changelogs/AutoChangeLog-pr-10504.yml
deleted file mode 100644
index 7e35ac6e72..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10504.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Xantholne"
-delete-after: True
-changes:
- - rscadd: "Botany bee pet, Bumbles"
- - rscadd: "New bee models that aren't 1 tile big of 0 opacity pixels"
diff --git a/html/changelogs/AutoChangeLog-pr-10505.yml b/html/changelogs/AutoChangeLog-pr-10505.yml
deleted file mode 100644
index dd0932c50e..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10505.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "LetterN"
-delete-after: True
-changes:
- - tweak: "Shockcolar and electropack uses the new signaler ui"
- - tweak: "Renaming shockcolar requires a pen"
diff --git a/html/changelogs/AutoChangeLog-pr-10507.yml b/html/changelogs/AutoChangeLog-pr-10507.yml
deleted file mode 100644
index 70d82d9cf6..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10507.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "LetterN"
-delete-after: True
-changes:
- - rscadd: "Adds banjo"
diff --git a/html/changelogs/AutoChangeLog-pr-10509.yml b/html/changelogs/AutoChangeLog-pr-10509.yml
deleted file mode 100644
index 4e1ede0631..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10509.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Ghommie"
-delete-after: True
-changes:
- - bugfix: "Made reagent containers examine text less annoying."
diff --git a/html/changelogs/AutoChangeLog-pr-10511.yml b/html/changelogs/AutoChangeLog-pr-10511.yml
deleted file mode 100644
index 5f3bf739cb..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10511.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "kevinz000"
-delete-after: True
-changes:
- - bugfix: "health analyzers now work"
diff --git a/html/changelogs/AutoChangeLog-pr-10513.yml b/html/changelogs/AutoChangeLog-pr-10513.yml
deleted file mode 100644
index 6428c4e281..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10513.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "r4d6"
-delete-after: True
-changes:
- - rscadd: "Added a message when pulsing the open wire."
diff --git a/html/changelogs/AutoChangeLog-pr-10516.yml b/html/changelogs/AutoChangeLog-pr-10516.yml
deleted file mode 100644
index 39dd05a4db..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10516.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "BonniePandora"
-delete-after: True
-changes:
- - admin: "Added another SDQL option. Using \"UPDATE selectors SET #null=value\" will now resolve value and discard the return. This is useful if you only care about the side effect of a proc."
diff --git a/html/changelogs/AutoChangeLog-pr-10518.yml b/html/changelogs/AutoChangeLog-pr-10518.yml
deleted file mode 100644
index 29de186e50..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10518.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: "Seris02"
-delete-after: True
-changes:
- - balance: "Explosions now cause knockdown instead of KOs, with the amount of time scaling off bomb armor. Heavy explosions still cause a ~2 second KO for follow up attacks."
- - balance: "Devastating explosions now no longer gib players with more than 50 bomb armor. This used to be more or less random depending on the amount of bomb armor."
- - code_imp: "Removed reagent explosion code that would trigger for <1 amount reactions."
diff --git a/html/changelogs/AutoChangeLog-pr-10520.yml b/html/changelogs/AutoChangeLog-pr-10520.yml
deleted file mode 100644
index ae23c082d8..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10520.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-author: "Denton, ported by Hatterhat"
-delete-after: True
-changes:
- - tweak: "Most upgradeable machines now show their upgrade status when examined while standing right next to them."
- - tweak: "Added examine messages to teleporter stations that hint at their multitool/wirecutter interactions."
- - tweak: "Renamed teleporter stations from station to teleporter station."
- - code_imp: "Changed the teleporter hub accurate var to accuracy; the old name misled people into thinking that it was a boolean."
diff --git a/html/changelogs/AutoChangeLog-pr-10522.yml b/html/changelogs/AutoChangeLog-pr-10522.yml
deleted file mode 100644
index b03b990762..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10522.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Hatterhat"
-delete-after: True
-changes:
- - rscadd: "Syndicate sleepers (read: the ones that're red and have controls in them) can now be recreated with a sufficient basis in nonstandard (read: illegal) technologies!"
diff --git a/html/changelogs/AutoChangeLog-pr-10523.yml b/html/changelogs/AutoChangeLog-pr-10523.yml
deleted file mode 100644
index 999fc1dd92..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10523.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Hatterhat"
-delete-after: True
-changes:
- - bugfix: "Explorer hoods on standard explorer suits can be reinforced with goliath hide plates again."
diff --git a/html/changelogs/AutoChangeLog-pr-10526.yml b/html/changelogs/AutoChangeLog-pr-10526.yml
deleted file mode 100644
index d5f9b8f1b0..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10526.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Seris02"
-delete-after: True
-changes:
- - rscadd: "traitor tool for bowmanizing headsets + bowmanizing headsets"
diff --git a/html/changelogs/AutoChangeLog-pr-10530.yml b/html/changelogs/AutoChangeLog-pr-10530.yml
deleted file mode 100644
index 16cc66adb9..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10530.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "kappa-sama"
-delete-after: True
-changes:
- - code_imp: "modular citadel loses some files"
diff --git a/html/changelogs/AutoChangeLog-pr-10531.yml b/html/changelogs/AutoChangeLog-pr-10531.yml
deleted file mode 100644
index 6c1125a687..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10531.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: "Trilbyspaceclone"
-delete-after: True
-changes:
- - rscadd: "Seed packs now have RnD points inside them"
- - rscadd: "New tips that reflect the now use seed packs have for Rnd / Chems affect on plants"
- - code_imp: "Made the research file look nice rather then an eye harming list"
diff --git a/html/changelogs/AutoChangeLog-pr-10532.yml b/html/changelogs/AutoChangeLog-pr-10532.yml
deleted file mode 100644
index cf742b47f7..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10532.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: "Ghommie"
-delete-after: True
-changes:
- - bugfix: "Virus food dispensers dispense virus food again."
- - bugfix: "Borg hypos inputs do not display typepaths anymore."
- - bugfix: "Restored chem dispensers alphabetical order."
diff --git a/html/changelogs/AutoChangeLog-pr-10535.yml b/html/changelogs/AutoChangeLog-pr-10535.yml
deleted file mode 100644
index db37120317..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10535.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Hatterhat"
-delete-after: True
-changes:
- - rscadd: "A shipment of Staff Assistant jumpsuits from the Goon-operated stations appear to have made their way into your loadout selections - and into the contraband list from ClothesMates..."
diff --git a/html/changelogs/AutoChangeLog-pr-10539.yml b/html/changelogs/AutoChangeLog-pr-10539.yml
deleted file mode 100644
index 66a03ee573..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10539.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Savotta"
-delete-after: True
-changes:
- - rscadd: "snout"
- - imageadd: "snout"
diff --git a/html/changelogs/AutoChangeLog-pr-10544.yml b/html/changelogs/AutoChangeLog-pr-10544.yml
deleted file mode 100644
index a27ffad716..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10544.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "AffectedArc07"
-delete-after: True
-changes:
- - code_imp: "All code files are now in the LF line format, please stick to it"
diff --git a/html/changelogs/AutoChangeLog-pr-10546.yml b/html/changelogs/AutoChangeLog-pr-10546.yml
deleted file mode 100644
index a49c2027e5..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10546.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "r4d6"
-delete-after: True
-changes:
- - bugfix: "fixed being able to use a playback device and a voice analyzer to activate each others"
diff --git a/html/changelogs/AutoChangeLog-pr-10547.yml b/html/changelogs/AutoChangeLog-pr-10547.yml
deleted file mode 100644
index 41d255e991..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10547.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Putnam3145"
-delete-after: True
-changes:
- - tweak: "Ghost dojo spawns will dust if their owner suicides or uses the \"ghost\" verb."
diff --git a/html/changelogs/AutoChangeLog-pr-10549.yml b/html/changelogs/AutoChangeLog-pr-10549.yml
deleted file mode 100644
index 11a770945d..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10549.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Seris02"
-delete-after: True
-changes:
- - rscadd: "durathread winter coats from hyper station"
diff --git a/html/changelogs/AutoChangeLog-pr-10552.yml b/html/changelogs/AutoChangeLog-pr-10552.yml
deleted file mode 100644
index 846667ea2a..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10552.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Tupinambis"
-delete-after: True
-changes:
- - tweak: "Replaces new fire alarms with a slightly updated version of the old ones."
- - bugfix: "Fixed bug where Amber alert had no proper alert lights, and red alert had amber lights."
diff --git a/html/changelogs/AutoChangeLog-pr-10556.yml b/html/changelogs/AutoChangeLog-pr-10556.yml
deleted file mode 100644
index af42a9eee6..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10556.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "AffectedArc07"
-delete-after: True
-changes:
- - tweak: "Added CI step to check for CRLF files"
diff --git a/html/changelogs/AutoChangeLog-pr-10557.yml b/html/changelogs/AutoChangeLog-pr-10557.yml
deleted file mode 100644
index f5b37f6cee..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10557.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "timothyteakettle"
-delete-after: True
-changes:
- - bugfix: "fixed not being able to remove trait genes without a disk being inserted into the dna manipulator"
diff --git a/html/changelogs/AutoChangeLog-pr-10558.yml b/html/changelogs/AutoChangeLog-pr-10558.yml
deleted file mode 100644
index 09186767f3..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10558.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "DeltaFire15"
-delete-after: True
-changes:
- - bugfix: "Vitality matrixes now correctly succ slimes"
diff --git a/html/changelogs/AutoChangeLog-pr-10563.yml b/html/changelogs/AutoChangeLog-pr-10563.yml
deleted file mode 100644
index 5efc4cfdb1..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10563.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Trilbyspaceclone"
-delete-after: True
-changes:
- - bugfix: "Fixed fragile space suits breaking from weak and non-damaging \"weapons\" (such as the Sord, toys and foam darts)."
diff --git a/html/changelogs/AutoChangeLog-pr-10567.yml b/html/changelogs/AutoChangeLog-pr-10567.yml
deleted file mode 100644
index 9d73d1d947..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10567.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Ghommie"
-delete-after: True
-changes:
- - bugfix: "Sanitized cargo export messages for reagents."
diff --git a/html/changelogs/AutoChangeLog-pr-10568.yml b/html/changelogs/AutoChangeLog-pr-10568.yml
deleted file mode 100644
index 6916f1289f..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10568.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "r4d6"
-delete-after: True
-changes:
- - rscadd: "added passive vent to the arsenal of atmospheric devices."
diff --git a/html/changelogs/AutoChangeLog-pr-10569.yml b/html/changelogs/AutoChangeLog-pr-10569.yml
deleted file mode 100644
index 0b9cb0b992..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10569.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "keronshb"
-delete-after: True
-changes:
- - rscadd: "Ports the special nanite remote, mood programs, and research generating nanites"
- - balance: "rebalances some nanites"
diff --git a/html/changelogs/AutoChangeLog-pr-10570.yml b/html/changelogs/AutoChangeLog-pr-10570.yml
deleted file mode 100644
index 9eaf2168a8..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10570.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "kevinz000"
-delete-after: True
-changes:
- - code_imp: "Mapping helpers added for power cables and atmos pipes."
diff --git a/html/changelogs/AutoChangeLog-pr-10571.yml b/html/changelogs/AutoChangeLog-pr-10571.yml
deleted file mode 100644
index 1d6844aa53..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10571.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Ghommie"
-delete-after: True
-changes:
- - bugfix: "Riot foam dart (not the ammo box) design cost is yet again consistent with the result's material amount."
diff --git a/html/changelogs/AutoChangeLog-pr-10578.yml b/html/changelogs/AutoChangeLog-pr-10578.yml
deleted file mode 100644
index a84fa5ba21..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10578.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "r4d6"
-delete-after: True
-changes:
- - rscadd: "Mining base now has a common area accessible via a new shuttle on the medium-highpop maps, and a security office connecting the gulag and the mining base. Gulag also has functional atmos."
diff --git a/html/changelogs/AutoChangeLog-pr-10579.yml b/html/changelogs/AutoChangeLog-pr-10579.yml
deleted file mode 100644
index c428c0109d..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10579.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "r4d6"
-delete-after: True
-changes:
- - rscadd: "Added more Cyborg Landmarks"
diff --git a/html/changelogs/AutoChangeLog-pr-10580.yml b/html/changelogs/AutoChangeLog-pr-10580.yml
deleted file mode 100644
index 6cb625d7af..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10580.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Putnam3145"
-delete-after: True
-changes:
- - admin: "Crafting is logged in a file now"
diff --git a/html/changelogs/AutoChangeLog-pr-10582.yml b/html/changelogs/AutoChangeLog-pr-10582.yml
deleted file mode 100644
index 2024088fb8..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10582.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Putnam3145"
-delete-after: True
-changes:
- - bugfix: "temporary flavor text now pops up properly"
diff --git a/html/changelogs/AutoChangeLog-pr-10584.yml b/html/changelogs/AutoChangeLog-pr-10584.yml
deleted file mode 100644
index e2c9f93ac8..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10584.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "AffectedArc07"
-delete-after: True
-changes:
- - code_imp: "Line ending CI works now"
diff --git a/html/changelogs/AutoChangeLog-pr-10586.yml b/html/changelogs/AutoChangeLog-pr-10586.yml
deleted file mode 100644
index eb90213398..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10586.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Tupinambis"
-delete-after: True
-changes:
- - balance: "RLDs now cost more to use, have reduced matter capacity, and sheets are worth less when refilling them."
diff --git a/html/changelogs/AutoChangeLog-pr-10588.yml b/html/changelogs/AutoChangeLog-pr-10588.yml
deleted file mode 100644
index d3771298b2..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10588.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "PersianXerxes"
-delete-after: True
-changes:
- - tweak: "Reduces the range of the forcefield projector from 7 tiles to 2 tiles."
diff --git a/html/changelogs/AutoChangeLog-pr-10590.yml b/html/changelogs/AutoChangeLog-pr-10590.yml
new file mode 100644
index 0000000000..e59c8decf0
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10590.yml
@@ -0,0 +1,11 @@
+author: "KathrinBailey"
+delete-after: True
+changes:
+ - bugfix: "Missing turf_decals in Cargo Office."
+ - bugfix: "Turns on the docking beacons on Box."
+ - bugfix: "Fixes Starboard Quarter maint room being spaced. It was never intended to be like how it was."
+ - bugfix: "The aforementioned maint room not having stuff in it."
+ - bugfix: "varedited photocopier sometimes not opening any UI."
+ - bugfix: "Atmos differences in Starboard Quarter maint."
+ - bugfix: "Atmos differences in destroyed shuttle/EVA bridge. Plating replaced with airless plating."
+ - bugfix: "Rotates AI satellite computers. These have probably been like this since computers had the old sprites and no directional ones. You shouldn't sit at a chair to operate a sideways computer."
diff --git a/html/changelogs/AutoChangeLog-pr-10591.yml b/html/changelogs/AutoChangeLog-pr-10591.yml
deleted file mode 100644
index ac8504ec9c..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10591.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "kevinz000"
-delete-after: True
-changes:
- - rscdel: "Blood duplication is gone, but viruses now react up to 5 times, 1 time per unit, for virus mix."
diff --git a/html/changelogs/AutoChangeLog-pr-10597.yml b/html/changelogs/AutoChangeLog-pr-10597.yml
deleted file mode 100644
index 9f28c4f84c..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10597.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Putnam3145"
-delete-after: True
-changes:
- - code_imp: "demodularized player panel code, mostly"
- - admin: "added ghost role eligibility delay removal to player panel"
diff --git a/html/changelogs/AutoChangeLog-pr-10598.yml b/html/changelogs/AutoChangeLog-pr-10598.yml
deleted file mode 100644
index 91b52b7043..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10598.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Putnam3145"
-delete-after: True
-changes:
- - balance: "Metabolic synthesis disables if user isn't well-fed rather than if user is starving"
diff --git a/html/changelogs/AutoChangeLog-pr-10599.yml b/html/changelogs/AutoChangeLog-pr-10599.yml
deleted file mode 100644
index 33435979c7..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10599.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Putnam3145"
-delete-after: True
-changes:
- - bugfix: "Gibtonite no longer instantly explodes upon being pickaxe'd."
diff --git a/html/changelogs/AutoChangeLog-pr-10600.yml b/html/changelogs/AutoChangeLog-pr-10600.yml
deleted file mode 100644
index ab0c5ac964..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10600.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: "Kraseo"
-delete-after: True
-changes:
- - bugfix: "Jelly donuts and pink jelly donuts will now properly display sprinkled icon state."
- - bugfix: "Jelly donuts and its variants will properly spawn with berry juice."
- - bugfix: "Slime jelly donuts have slime jelly in them now. (thanks ghommie)"
diff --git a/html/changelogs/AutoChangeLog-pr-10602.yml b/html/changelogs/AutoChangeLog-pr-10602.yml
deleted file mode 100644
index 9394c83671..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10602.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Ghommie"
-delete-after: True
-changes:
- - bugfix: "Fixed a little exploit with ventcrawlers being capable of escaping closed turfs by printing scrubbers/vents into them."
diff --git a/html/changelogs/AutoChangeLog-pr-10603.yml b/html/changelogs/AutoChangeLog-pr-10603.yml
deleted file mode 100644
index 0f1acbf0be..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10603.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "KeRSedChaplain"
-delete-after: True
-changes:
- - imageadd: "The clockwork cuirass can now support slithering taur bodies."
diff --git a/html/changelogs/AutoChangeLog-pr-10606.yml b/html/changelogs/AutoChangeLog-pr-10606.yml
deleted file mode 100644
index c6cc269cbe..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10606.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "r4d6"
-delete-after: True
-changes:
- - refactor: "better code for passive vents"
diff --git a/html/changelogs/AutoChangeLog-pr-10608.yml b/html/changelogs/AutoChangeLog-pr-10608.yml
deleted file mode 100644
index 1c2015813e..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10608.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "kevinz000"
-delete-after: True
-changes:
- - rscadd: "you can now block people on your PDA"
diff --git a/html/changelogs/AutoChangeLog-pr-10609.yml b/html/changelogs/AutoChangeLog-pr-10609.yml
deleted file mode 100644
index e28d929687..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10609.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Putnam3145"
-delete-after: True
-changes:
- - balance: "Cold-blooded costs -2 quirk points now"
diff --git a/html/changelogs/AutoChangeLog-pr-10610.yml b/html/changelogs/AutoChangeLog-pr-10610.yml
deleted file mode 100644
index e413574fa1..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10610.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-author: "Owai-Seek"
-delete-after: True
-changes:
- - rscadd: "Four New Bounties"
- - tweak: "tweaked several bounties"
- - tweak: "reorganised several bounties"
- - balance: "balanced several bounties"
- - bugfix: "added shady jims to vendor"
diff --git a/html/changelogs/AutoChangeLog-pr-10614.yml b/html/changelogs/AutoChangeLog-pr-10614.yml
deleted file mode 100644
index 4c4d8bfdbd..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10614.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Putnam3145"
-delete-after: True
-changes:
- - config: "Added suicide to the config."
diff --git a/html/changelogs/AutoChangeLog-pr-10615.yml b/html/changelogs/AutoChangeLog-pr-10615.yml
deleted file mode 100644
index f67392cd7f..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10615.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "keronshb"
-delete-after: True
-changes:
- - bugfix: "fixed my messup"
diff --git a/html/changelogs/AutoChangeLog-pr-10617.yml b/html/changelogs/AutoChangeLog-pr-10617.yml
deleted file mode 100644
index 923913a043..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10617.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "kevinz000"
-delete-after: True
-changes:
- - bugfix: "Grenades can now have their timers adjusted."
diff --git a/html/changelogs/AutoChangeLog-pr-10619.yml b/html/changelogs/AutoChangeLog-pr-10619.yml
deleted file mode 100644
index acb76034ac..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10619.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-author: "Seris02"
-delete-after: True
-changes:
- - tweak: "conveyor belt now are stacks instead of single item"
- - tweak: "conveyor crate has 30 belts"
- - tweak: "printing a conveyor costs 3000 metal"
- - rscadd: "you can press the conveyor switch in hand to link any not deployed belts to it"
diff --git a/html/changelogs/AutoChangeLog-pr-10620.yml b/html/changelogs/AutoChangeLog-pr-10620.yml
deleted file mode 100644
index 8f5c990234..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10620.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Hatterhat"
-delete-after: True
-changes:
- - balance: "Dropped Exo-suit armor to put it more in line with being an explorer suit sidegrade and not a straight upgrade for Lavaland usage."
diff --git a/html/changelogs/AutoChangeLog-pr-10621.yml b/html/changelogs/AutoChangeLog-pr-10621.yml
deleted file mode 100644
index 0bb08dee2c..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10621.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Hatterhat"
-delete-after: True
-changes:
- - rscadd: "You can now print .357 AP speedloaders from Security techfabs after you pick up the Advanced Non-Standard Ballistics node."
diff --git a/html/changelogs/AutoChangeLog-pr-10622.yml b/html/changelogs/AutoChangeLog-pr-10622.yml
deleted file mode 100644
index 3aa4159cb8..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10622.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-author: "Owai-Seek"
-delete-after: True
-changes:
- - rscadd: "Towel, Bedsheet, and Colored bedsheet bins to Dojo. Some lockers with carpets and wood, another bathroom/shower, tons of cleaning supplies, some additional trash cans, a tiny medical area, and some vendors/vendor resupplies. Also added some Ambrosia Gaia seeds."
- - tweak: "Moved some lights around, extended the dojo a bit to make it feel more spacious."
- - rscdel: "Cafe Newsfeed Frame"
- - rscadd: "Towel, Bedsheet, and Colored bedsheet bins to Dojo. Some lockers with carpets and wood, another bathroom/shower, tons of cleaning supplies, some additional trash cans, a tiny medical area, and some vendors/vendor resupplies. Also added some Ambrosia Gaia seeds."
- - tweak: "Moved some lights around, extended the dojo a bit to make it feel more spacious."
- - rscdel: "Cafe Newsfeed Frame"
- - rscadd: "Towel, Bedsheet, and Colored bedsheet bins to Dojo. Some lockers with carpets and wood, another bathroom/shower, tons of cleaning supplies, some additional trash cans, a tiny medical area, and some vendors/vendor resupplies. Also added some Ambrosia Gaia seeds."
- - tweak: "Moved some lights around, extended the dojo a bit to make it feel more spacious."
diff --git a/html/changelogs/AutoChangeLog-pr-10628.yml b/html/changelogs/AutoChangeLog-pr-10628.yml
deleted file mode 100644
index f9d24a3a28..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10628.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Ghommie"
-delete-after: True
-changes:
- - bugfix: "deconstructing a rubber toolbox with the destructive analyzer won't \"lock\" the machine anymore."
diff --git a/html/changelogs/AutoChangeLog-pr-10630.yml b/html/changelogs/AutoChangeLog-pr-10630.yml
deleted file mode 100644
index ca4e75fdf1..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10630.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "kevinz000"
-delete-after: True
-changes:
- - balance: "Cloning has been nerfed."
diff --git a/html/changelogs/AutoChangeLog-pr-10632.yml b/html/changelogs/AutoChangeLog-pr-10632.yml
deleted file mode 100644
index 39d74002e4..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10632.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Commandersand"
-delete-after: True
-changes:
- - balance: "lightning bolt,tesla,forcewall,emp spells have lower cooldown"
- - balance: "fireball has a 10 second starting cooldown"
diff --git a/html/changelogs/AutoChangeLog-pr-10635.yml b/html/changelogs/AutoChangeLog-pr-10635.yml
deleted file mode 100644
index 66c90808d6..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10635.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Hatterhat"
-delete-after: True
-changes:
- - rscdel: "Forensic scanner removed from Advanced Biotechnology node."
diff --git a/html/changelogs/AutoChangeLog-pr-10636.yml b/html/changelogs/AutoChangeLog-pr-10636.yml
deleted file mode 100644
index a6354ef6b5..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10636.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Trilbyspaceclone, Ghommie"
-delete-after: True
-changes:
- - rscadd: "More types of glass can now be used to make a solar panel, with different sturdiness and efficiency depending the type."
diff --git a/html/changelogs/AutoChangeLog-pr-10640.yml b/html/changelogs/AutoChangeLog-pr-10640.yml
deleted file mode 100644
index f51f892d8d..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10640.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "r4d6"
-delete-after: True
-changes:
- - bugfix: "fixed a hole in Meta"
diff --git a/html/changelogs/AutoChangeLog-pr-10641.yml b/html/changelogs/AutoChangeLog-pr-10641.yml
deleted file mode 100644
index 479729e1f2..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10641.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "jakeramsay007"
-delete-after: True
-changes:
- - rscadd: "The assorted .357 revolvers (except russian revolver) can now also load .38, like real life."
diff --git a/html/changelogs/AutoChangeLog-pr-10643.yml b/html/changelogs/AutoChangeLog-pr-10643.yml
deleted file mode 100644
index 8fd496e0bc..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10643.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Trilbyspaceclone"
-delete-after: True
-changes:
- - rscadd: "tip of the round: Cleanbot can withstand lava and burning hot ash. Its a god"
diff --git a/html/changelogs/AutoChangeLog-pr-10645.yml b/html/changelogs/AutoChangeLog-pr-10645.yml
deleted file mode 100644
index 16ef8b2056..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10645.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "r4d6"
-delete-after: True
-changes:
- - rscadd: "Added the ability to easily add variations of the mining base"
diff --git a/html/changelogs/AutoChangeLog-pr-10650.yml b/html/changelogs/AutoChangeLog-pr-10650.yml
deleted file mode 100644
index d4794291d1..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10650.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Arturlang"
-delete-after: True
-changes:
- - rscadd: "Added modular computers to the loadout"
diff --git a/html/changelogs/AutoChangeLog-pr-10664.yml b/html/changelogs/AutoChangeLog-pr-10664.yml
deleted file mode 100644
index e38ce50b24..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10664.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "kappa-sama"
-delete-after: True
-changes:
- - balance: "dragnet snares can now be removed in 5 seconds"
diff --git a/html/changelogs/AutoChangeLog-pr-10667.yml b/html/changelogs/AutoChangeLog-pr-10667.yml
deleted file mode 100644
index 85a60c285a..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10667.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Ghommie"
-delete-after: True
-changes:
- - bugfix: "Something about empty hand combat mode right click waving hands defying common sense and being spammy."
diff --git a/html/changelogs/AutoChangeLog-pr-10676.yml b/html/changelogs/AutoChangeLog-pr-10676.yml
deleted file mode 100644
index c586123b12..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10676.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Kraseo"
-delete-after: True
-changes:
- - bugfix: "Virgo hairstyles no longer have those annoying quotation marks. Rejoice for you will no longer have to use the scrollbar."
- - imagedel: "Got rid of some strange-looking hairstyles. (Tbob, fingerweave, etc.)"
diff --git a/html/changelogs/AutoChangeLog-pr-10706.yml b/html/changelogs/AutoChangeLog-pr-10706.yml
new file mode 100644
index 0000000000..8bf1cd449c
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10706.yml
@@ -0,0 +1,5 @@
+author: "Ghommie"
+delete-after: True
+changes:
+ - bugfix: "Stopped the ellipsis question mark from being displayed twice in the examine message for masked/unknown human mobs."
+ - tweak: "Made the aforementioned ellipsis question mark display on flavor-text-less masked/unknown human mobs too for consistency."
diff --git a/html/changelogs/AutoChangeLog-pr-10307.yml b/html/changelogs/AutoChangeLog-pr-10709.yml
similarity index 50%
rename from html/changelogs/AutoChangeLog-pr-10307.yml
rename to html/changelogs/AutoChangeLog-pr-10709.yml
index 279dbe2840..8c9d74c5f1 100644
--- a/html/changelogs/AutoChangeLog-pr-10307.yml
+++ b/html/changelogs/AutoChangeLog-pr-10709.yml
@@ -1,4 +1,4 @@
author: "Seris02"
delete-after: True
changes:
- - rscadd: "stunglasses"
+ - rscadd: "recipe for mammal mutation toxin"
diff --git a/html/changelogs/AutoChangeLog-pr-10728.yml b/html/changelogs/AutoChangeLog-pr-10728.yml
new file mode 100644
index 0000000000..9023844565
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10728.yml
@@ -0,0 +1,4 @@
+author: "kevinz000"
+delete-after: True
+changes:
+ - balance: "meteor waves are now directional and announces the direction on the command report."
diff --git a/html/changelogs/AutoChangeLog-pr-10733.yml b/html/changelogs/AutoChangeLog-pr-10733.yml
new file mode 100644
index 0000000000..33e2ee216c
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10733.yml
@@ -0,0 +1,4 @@
+author: "Hatterhat"
+delete-after: True
+changes:
+ - balance: "Zombie powder is now instant when ingested, but delayed when injected or applied through touch."
diff --git a/html/changelogs/AutoChangeLog-pr-10737.yml b/html/changelogs/AutoChangeLog-pr-10737.yml
new file mode 100644
index 0000000000..fa4023c148
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10737.yml
@@ -0,0 +1,4 @@
+author: "Ghommie"
+delete-after: True
+changes:
+ - bugfix: "Stopped an APTFT exploit with spray bottles."
diff --git a/html/changelogs/AutoChangeLog-pr-10742.yml b/html/changelogs/AutoChangeLog-pr-10742.yml
new file mode 100644
index 0000000000..ece862d112
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10742.yml
@@ -0,0 +1,4 @@
+author: "Ghommie"
+delete-after: True
+changes:
+ - bugfix: "Fixed the detective revolver being quite risky to use."
diff --git a/html/changelogs/AutoChangeLog-pr-10743.yml b/html/changelogs/AutoChangeLog-pr-10743.yml
new file mode 100644
index 0000000000..d9775f7bc3
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10743.yml
@@ -0,0 +1,4 @@
+author: "necromanceranne"
+delete-after: True
+changes:
+ - rscdel: "You can no longer order spinfusors or their ammo from cargo."
diff --git a/html/changelogs/AutoChangeLog-pr-10495.yml b/html/changelogs/AutoChangeLog-pr-10746.yml
similarity index 59%
rename from html/changelogs/AutoChangeLog-pr-10495.yml
rename to html/changelogs/AutoChangeLog-pr-10746.yml
index 02ffedf5fc..232c7a26b9 100644
--- a/html/changelogs/AutoChangeLog-pr-10495.yml
+++ b/html/changelogs/AutoChangeLog-pr-10746.yml
@@ -1,4 +1,4 @@
author: "kevinz000"
delete-after: True
changes:
- - rscadd: "guests can now looc"
+ - rscadd: "CTF CLAYMORES"
diff --git a/html/changelogs/AutoChangeLog-pr-10317.yml b/html/changelogs/AutoChangeLog-pr-10748.yml
similarity index 52%
rename from html/changelogs/AutoChangeLog-pr-10317.yml
rename to html/changelogs/AutoChangeLog-pr-10748.yml
index 7db50240e3..a2afda81aa 100644
--- a/html/changelogs/AutoChangeLog-pr-10317.yml
+++ b/html/changelogs/AutoChangeLog-pr-10748.yml
@@ -1,4 +1,4 @@
author: "Trilbyspaceclone"
delete-after: True
changes:
- - bugfix: "issues with mapping done my Trilby"
+ - bugfix: "Vault hallway door being all access"
diff --git a/html/changelogs/AutoChangeLog-pr-10749.yml b/html/changelogs/AutoChangeLog-pr-10749.yml
new file mode 100644
index 0000000000..a3ed5989d1
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10749.yml
@@ -0,0 +1,4 @@
+author: "AnturK ported by kevinz000"
+delete-after: True
+changes:
+ - rscadd: "Dueling pistols have been added."
diff --git a/html/changelogs/AutoChangeLog-pr-10751.yml b/html/changelogs/AutoChangeLog-pr-10751.yml
new file mode 100644
index 0000000000..c5b54bd4ed
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10751.yml
@@ -0,0 +1,4 @@
+author: "kevinz000"
+delete-after: True
+changes:
+ - balance: "traitor+bro gamemode minimum population set to 25 until there can be more in depth configuration systems for gamemodes."
diff --git a/html/changelogs/AutoChangeLog-pr-10752.yml b/html/changelogs/AutoChangeLog-pr-10752.yml
new file mode 100644
index 0000000000..9bb50f1da1
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10752.yml
@@ -0,0 +1,9 @@
+author: "Owai-Seek"
+delete-after: True
+changes:
+ - rscadd: "Burger, Cargo Packaging, Dirty Magazine, Air Pump, and Scrubber crates."
+ - rscdel: "Duplicate Crate, Festive Wrapping Paper Crate, Contraband Monkey Meat Crate"
+ - tweak: "Gave Seed Crate Ambrosia Seed, gave Biker Gang Crate Spraypaint."
+ - tweak: "Organised some crates with sub-categories. Also, moved all vendor refills to a new tab."
+ - tweak: "Moved Grill to Service Tab"
+ - bugfix: "Engineering Hardsuit Access"
diff --git a/html/changelogs/AutoChangeLog-pr-10442.yml b/html/changelogs/AutoChangeLog-pr-10753.yml
similarity index 56%
rename from html/changelogs/AutoChangeLog-pr-10442.yml
rename to html/changelogs/AutoChangeLog-pr-10753.yml
index f407ae9e15..c1b3615c3d 100644
--- a/html/changelogs/AutoChangeLog-pr-10442.yml
+++ b/html/changelogs/AutoChangeLog-pr-10753.yml
@@ -1,4 +1,4 @@
author: "Trilbyspaceclone"
delete-after: True
changes:
- - tweak: "Halfs the nutriments in sugar"
+ - server: "Updates change logs"
diff --git a/html/changelogs/AutoChangeLog-pr-10754.yml b/html/changelogs/AutoChangeLog-pr-10754.yml
new file mode 100644
index 0000000000..0537347443
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10754.yml
@@ -0,0 +1,5 @@
+author: "MalricB"
+delete-after: True
+changes:
+ - rscadd: "\"Shaggy\" sprite from virgo"
+ - rscadd: "\"shaggy\" option in the character customization"
diff --git a/html/changelogs/AutoChangeLog-pr-10761.yml b/html/changelogs/AutoChangeLog-pr-10761.yml
new file mode 100644
index 0000000000..5a5b7281ef
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10761.yml
@@ -0,0 +1,4 @@
+author: "Putnam3145"
+delete-after: True
+changes:
+ - bugfix: "gender change potion now respects prefs"
diff --git a/html/changelogs/AutoChangeLog-pr-10764.yml b/html/changelogs/AutoChangeLog-pr-10764.yml
new file mode 100644
index 0000000000..25dfebd5fb
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10764.yml
@@ -0,0 +1,4 @@
+author: "deathride58"
+delete-after: True
+changes:
+ - bugfix: "Spacemen no longer run at lightspeed on local servers."
diff --git a/html/changelogs/AutoChangeLog-pr-10765.yml b/html/changelogs/AutoChangeLog-pr-10765.yml
new file mode 100644
index 0000000000..975a3ac5c5
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10765.yml
@@ -0,0 +1,4 @@
+author: "kevinz000"
+delete-after: True
+changes:
+ - bugfix: "no more bluespace skittish locker diving,"
diff --git a/html/changelogs/AutoChangeLog-pr-10538.yml b/html/changelogs/AutoChangeLog-pr-10773.yml
similarity index 56%
rename from html/changelogs/AutoChangeLog-pr-10538.yml
rename to html/changelogs/AutoChangeLog-pr-10773.yml
index 01119f886f..64ab5ce124 100644
--- a/html/changelogs/AutoChangeLog-pr-10538.yml
+++ b/html/changelogs/AutoChangeLog-pr-10773.yml
@@ -1,4 +1,4 @@
author: "Putnam3145"
delete-after: True
changes:
- - bugfix: "Chemistry not :b:roke"
+ - bugfix: "Hypno prefs work better."
diff --git a/html/changelogs/AutoChangeLog-pr-9601.yml b/html/changelogs/AutoChangeLog-pr-9601.yml
deleted file mode 100644
index c54279627f..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9601.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-author: "Ghommie (original PRs by Kevinz000, ShivCalez, 4dplanner, Barhandar, 81Denton, zxaber, Fox-McCloud)"
-delete-after: True
-changes:
- - rscadd: "All atom movables now have move force and move resist, and pull force An atom can only pull another atom if its pull force is stronger than that atom's move resist"
- - rscadd: "Mobs with a higher move force than an atom's move resist will automatically try to force the atom out of its way. This might not always work, depending on how snowflakey code is.
-experimental: As of right now, everything has a move force and resist of 100, and a pull force of 101. Things take (resist - force) damage when bumped into
-experimental: Failing to move onto a tile will now still bump up your last move timer. However, successfully pushing something out of your way will result in you automatically moving into where it was."
- - bugfix: "Bolted AIs can no longer be teleported by launchpads."
- - balance: "Megafauna cannot teleport"
diff --git a/html/changelogs/AutoChangeLog-pr-9856.yml b/html/changelogs/AutoChangeLog-pr-9856.yml
deleted file mode 100644
index 697c1c78f5..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9856.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Ghommie"
-delete-after: True
-changes:
- - rscadd: "Refactored code to allow all living mobs to use shields and not only humans."
- - tweak: "Monkys will now retaliate against aliens attacking them (as if they even posed a threat to start with)."
diff --git a/html/changelogs/AutoChangeLog-pr-9860.yml b/html/changelogs/AutoChangeLog-pr-9860.yml
new file mode 100644
index 0000000000..c9d75aa7b9
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-9860.yml
@@ -0,0 +1,5 @@
+author: "tralezab, bandit, Skoglol"
+delete-after: True
+changes:
+ - rscadd: "The mime's PDA messages are silent now!"
+ - rscadd: "30 new emoji have been added. Mime buff, mime now OP."
diff --git a/html/changelogs/AutoChangeLog-pr-9878.yml b/html/changelogs/AutoChangeLog-pr-9878.yml
deleted file mode 100644
index ef9c704003..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9878.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Ghommie"
-delete-after: True
-changes:
- - tweak: "add a click cooldown to the overly spammable table slamming."
diff --git a/html/changelogs/AutoChangeLog-pr-9905.yml b/html/changelogs/AutoChangeLog-pr-9905.yml
deleted file mode 100644
index a0330b8103..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9905.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-author: "Trilbyspaceclone"
-delete-after: True
-changes:
- - rscadd: "more glassware"
- - rscadd: "Few new packs and glassmaker kit!"
- - tweak: "prices/chems of crates/autobottler"
- - bugfix: "some crates ungettable as well as some broken crates"
diff --git a/icons/emoji.dmi b/icons/emoji.dmi
index 925b072a5f..931cb7a916 100644
Binary files a/icons/emoji.dmi and b/icons/emoji.dmi differ
diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi
index f8785ae2f7..d3028c9b47 100644
Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ
diff --git a/icons/mob/human_face.dmi b/icons/mob/human_face.dmi
index a22901d3e2..6e95eae960 100644
Binary files a/icons/mob/human_face.dmi and b/icons/mob/human_face.dmi differ
diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi
index 24d654b743..bddc3e6a56 100644
Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ
diff --git a/icons/mob/suit_digi.dmi b/icons/mob/suit_digi.dmi
index e181c65cdb..f8210ed48e 100644
Binary files a/icons/mob/suit_digi.dmi and b/icons/mob/suit_digi.dmi differ
diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi
index 04e2e3cc75..69d8966329 100644
Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ
diff --git a/icons/mob/uniform_digi.dmi b/icons/mob/uniform_digi.dmi
index 3b86511013..0b8c495c5a 100644
Binary files a/icons/mob/uniform_digi.dmi and b/icons/mob/uniform_digi.dmi differ
diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi
index a79ca3be45..552dc76f9c 100644
Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ
diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi
index be091c596d..5d70eab5f7 100644
Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ
diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi
index 89f9a6fd93..ce458a1de3 100644
Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ
diff --git a/icons/obj/guns/energy.dmi b/icons/obj/guns/energy.dmi
index bba3efc951..c30e8aa6bd 100644
Binary files a/icons/obj/guns/energy.dmi and b/icons/obj/guns/energy.dmi differ
diff --git a/icons/obj/recycling.dmi b/icons/obj/recycling.dmi
index 4e072c9006..9604d6b97e 100644
Binary files a/icons/obj/recycling.dmi and b/icons/obj/recycling.dmi differ
diff --git a/icons/pda_icons/pda_emoji.png b/icons/pda_icons/pda_emoji.png
new file mode 100644
index 0000000000..39f789f520
Binary files /dev/null and b/icons/pda_icons/pda_emoji.png differ
diff --git a/icons/turf/areas.dmi b/icons/turf/areas.dmi
index fe60cf6c0d..aad3e78590 100644
Binary files a/icons/turf/areas.dmi and b/icons/turf/areas.dmi differ
diff --git a/modular_citadel/code/_onclick/other_mobs.dm b/modular_citadel/code/_onclick/other_mobs.dm
index 8b9f3b3184..6d9ffdd6ca 100644
--- a/modular_citadel/code/_onclick/other_mobs.dm
+++ b/modular_citadel/code/_onclick/other_mobs.dm
@@ -18,7 +18,7 @@
if(!has_active_hand())
to_chat(src, "You ponder your life choices and sigh.")
return TRUE
- var/list/src_viewers = get_hearers_in_view(DEFAULT_MESSAGE_RANGE, src) - src // src has a different message.
+ var/list/src_viewers = viewers(DEFAULT_MESSAGE_RANGE, src) - src // src has a different message.
var/the_action = "waves to [A]"
var/what_action = "waves to something you can't see"
var/self_action = "wave to [A]"
diff --git a/modular_citadel/code/datums/status_effects/chems.dm b/modular_citadel/code/datums/status_effects/chems.dm
index 89086ab1e5..82f4fbf1d9 100644
--- a/modular_citadel/code/datums/status_effects/chems.dm
+++ b/modular_citadel/code/datums/status_effects/chems.dm
@@ -211,10 +211,10 @@
/mob/living/verb/toggle_hypno()
set category = "IC"
- set name = "Toggle Lewd MKUltra"
- set desc = "Allows you to toggle if you'd like lewd flavour messages for MKUltra."
+ set name = "Toggle Lewd Hypno"
+ set desc = "Allows you to toggle if you'd like lewd flavour messages for hypno features, such as MKUltra."
client.prefs.cit_toggles ^= HYPNO
- to_chat(usr, "You [((client.prefs.cit_toggles & HYPNO) ?"will":"no longer")] receive lewd flavour messages for MKUltra.")
+ to_chat(usr, "You [((client.prefs.cit_toggles & HYPNO) ?"will":"no longer")] receive lewd flavour messages for hypno.")
/datum/status_effect/chem/enthrall
id = "enthrall"
diff --git a/modular_citadel/code/modules/client/loadout/__donator.dm b/modular_citadel/code/modules/client/loadout/__donator.dm
index cf68666532..92a1b26f01 100644
--- a/modular_citadel/code/modules/client/loadout/__donator.dm
+++ b/modular_citadel/code/modules/client/loadout/__donator.dm
@@ -305,7 +305,7 @@ datum/gear/darksabresheath
/datum/gear/flagcape
name = "US Flag Cape"
category = SLOT_IN_BACKPACK
- path = /obj/item/bedsheet/custom/flagcape
+ path = /obj/item/clothing/neck/flagcape
ckeywhitelist = list("darnchacha")
/datum/gear/luckyjack
@@ -488,3 +488,9 @@ datum/gear/darksabresheath
category = SLOT_SHOES
path = /obj/item/clothing/shoes/sneakers/mikuleggings
ckeywhitelist = list("grandvegeta")
+
+/datum/gear/cosmos
+ name = "cosmic space bedsheet"
+ category = SLOT_IN_BACKPACK
+ path = /obj/item/bedsheet/cosmos
+ ckeywhitelist = list("grunnyyy")
diff --git a/modular_citadel/code/modules/client/loadout/uniform.dm b/modular_citadel/code/modules/client/loadout/uniform.dm
index 46692ea7a9..b6b72669c2 100644
--- a/modular_citadel/code/modules/client/loadout/uniform.dm
+++ b/modular_citadel/code/modules/client/loadout/uniform.dm
@@ -424,3 +424,38 @@
path = /obj/item/clothing/under/stripper_green
cost = 3
+/datum/gear/qipao
+ name = "Qipao, Black"
+ category = SLOT_W_UNIFORM
+ path = /obj/item/clothing/under/lunar/qipao
+ cost = 3
+
+/datum/gear/qipao/white
+ name = "Qipao, White"
+ category = SLOT_W_UNIFORM
+ path = /obj/item/clothing/under/lunar/qipao/white
+ cost = 3
+
+/datum/gear/qipao/red
+ name = "Qipao, Red"
+ category = SLOT_W_UNIFORM
+ path = /obj/item/clothing/under/lunar/qipao/red
+ cost = 3
+
+/datum/gear/cheongsam
+ name = "Cheongsam, Black"
+ category = SLOT_W_UNIFORM
+ path = /obj/item/clothing/under/lunar/cheongsam
+ cost = 3
+
+/datum/gear/cheongsam/white
+ name = "Cheongsam, White"
+ category = SLOT_W_UNIFORM
+ path = /obj/item/clothing/under/lunar/cheongsam/white
+ cost = 3
+
+/datum/gear/cheongsam/red
+ name = "Cheongsam, Red"
+ category = SLOT_W_UNIFORM
+ path = /obj/item/clothing/under/lunar/cheongsam/red
+ cost = 3
\ No newline at end of file
diff --git a/modular_citadel/code/modules/custom_loadout/custom_items.dm b/modular_citadel/code/modules/custom_loadout/custom_items.dm
index eaf128626d..03a4a56147 100644
--- a/modular_citadel/code/modules/custom_loadout/custom_items.dm
+++ b/modular_citadel/code/modules/custom_loadout/custom_items.dm
@@ -364,10 +364,11 @@
worn_x_dimension = 64
worn_y_dimension = 34
-/obj/item/bedsheet/custom/flagcape
+/obj/item/clothing/neck/flagcape
name = "Flag Cape"
desc = "A truly patriotic form of heroic attire."
icon = 'icons/obj/custom.dmi'
+ resistance_flags = FLAMMABLE
alternate_worn_icon = 'icons/mob/custom_w.dmi'
icon_state = "flagcape"
item_state = "flagcape"
diff --git a/modular_citadel/code/modules/mob/living/carbon/human/human_movement.dm b/modular_citadel/code/modules/mob/living/carbon/human/human_movement.dm
index 0b6903c9fe..bd43d96ba4 100644
--- a/modular_citadel/code/modules/mob/living/carbon/human/human_movement.dm
+++ b/modular_citadel/code/modules/mob/living/carbon/human/human_movement.dm
@@ -12,8 +12,11 @@
/mob/living/carbon/human/movement_delay()
. = 0
- if(!resting && m_intent == MOVE_INTENT_RUN && !sprinting)
- . += 1
+ if(!resting && m_intent == MOVE_INTENT_RUN && sprinting)
+ var/static/datum/config_entry/number/movedelay/sprint_speed_increase/SSI
+ if(!SSI)
+ SSI = CONFIG_GET_ENTRY(number/movedelay/sprint_speed_increase)
+ . -= SSI.config_entry_value
if(wrongdirmovedelay)
. += 1
. += ..()
diff --git a/modular_citadel/code/modules/mob/living/living.dm b/modular_citadel/code/modules/mob/living/living.dm
index 513a80cae0..0caf548196 100644
--- a/modular_citadel/code/modules/mob/living/living.dm
+++ b/modular_citadel/code/modules/mob/living/living.dm
@@ -17,6 +17,12 @@
var/sprint_stamina_cost = 0.70 //stamina loss per tile while insufficient sprint buffer.
//---End
+/mob/living/update_config_movespeed()
+ . = ..()
+ sprint_buffer_max = CONFIG_GET(number/movedelay/sprint_buffer_max)
+ sprint_buffer_regen_ds = CONFIG_GET(number/movedelay/sprint_buffer_regen_per_ds)
+ sprint_stamina_cost = CONFIG_GET(number/movedelay/sprint_stamina_cost)
+
/mob/living/movement_delay(ignorewalk = 0)
. = ..()
if(resting)
diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/MKUltra.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/MKUltra.dm
index 86325faa91..f935fc5092 100644
--- a/modular_citadel/code/modules/reagents/chemistry/reagents/MKUltra.dm
+++ b/modular_citadel/code/modules/reagents/chemistry/reagents/MKUltra.dm
@@ -333,6 +333,8 @@ Creating a chem with a low purity will make you permanently fall in love with so
..()
/datum/reagent/fermi/proc/FallInLove(mob/living/carbon/Lover, mob/living/carbon/Love)
+ if(Lover.client?.prefs.cit_toggles & NEVER_HYPNO)
+ return // doesn't even give a message, it's just ignored
if(Lover.has_status_effect(STATUS_EFFECT_INLOVE))
to_chat(Lover, "You are already fully devoted to someone else!")
return
diff --git a/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm b/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm
index 31e319edd3..63c0c01a58 100644
--- a/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm
+++ b/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm
@@ -200,8 +200,10 @@
FermiExplode = TRUE
PurityMin = 0.1
-/datum/chemical_reaction/fermi/breast_enlarger/FermiFinish(datum/reagents/holder, var/atom/my_atom)
+/datum/chemical_reaction/fermi/breast_enlarger/FermiFinish(datum/reagents/holder, atom/my_atom)
var/datum/reagent/fermi/breast_enlarger/BE = locate(/datum/reagent/fermi/breast_enlarger) in my_atom.reagents.reagent_list
+ if(!BE)
+ return
var/cached_volume = BE.volume
if(BE.purity < 0.35)
holder.remove_reagent(type, cached_volume)
@@ -249,8 +251,10 @@
P.length = ((PE.volume * PE.purity) / 10)//half as effective.
my_atom.reagents.clear_reagents()
-/datum/chemical_reaction/fermi/penis_enlarger/FermiFinish(datum/reagents/holder, var/atom/my_atom)
+/datum/chemical_reaction/fermi/penis_enlarger/FermiFinish(datum/reagents/holder, atom/my_atom)
var/datum/reagent/fermi/penis_enlarger/PE = locate(/datum/reagent/fermi/penis_enlarger) in my_atom.reagents.reagent_list
+ if(!PE)
+ return
var/cached_volume = PE.volume
if(PE.purity < 0.35)
holder.remove_reagent(type, cached_volume)
@@ -306,13 +310,11 @@
/datum/chemical_reaction/fermi/enthrall/FermiFinish(datum/reagents/holder, var/atom/my_atom)
var/datum/reagent/blood/B = locate(/datum/reagent/blood) in my_atom.reagents.reagent_list
var/datum/reagent/fermi/enthrall/E = locate(/datum/reagent/fermi/enthrall) in my_atom.reagents.reagent_list
- if(!B)
+ if(!B || !E)
return
if(!B.data)
- var/list/seen = viewers(5, get_turf(my_atom))
- for(var/mob/M in seen)
- to_chat(M, "The reaction splutters and fails to react properly.") //Just in case
- E.purity = 0
+ my_atom.visible_message("The reaction splutters and fails to react properly.") //Just in case
+ E.purity = 0
if (B.data["gender"] == "female")
E.data["creatorGender"] = "Mistress"
E.creatorGender = "Mistress"
@@ -332,11 +334,11 @@
/datum/chemical_reaction/fermi/enthrall/slime/FermiFinish(datum/reagents/holder, var/atom/my_atom)
var/datum/reagent/blood/jellyblood/B = locate(/datum/reagent/blood/jellyblood) in my_atom.reagents.reagent_list//The one line change.
var/datum/reagent/fermi/enthrall/E = locate(/datum/reagent/fermi/enthrall) in my_atom.reagents.reagent_list
+ if(!B || !E)
+ return
if(!B.data)
- var/list/seen = viewers(5, get_turf(my_atom))
- for(var/mob/M in seen)
- to_chat(M, "The reaction splutters and fails to react.") //Just in case
- E.purity = 0
+ my_atom.visible_message("The reaction splutters and fails to react properly.") //Just in case
+ E.purity = 0
if (B.data["gender"] == "female")
E.data["creatorGender"] = "Mistress"
E.creatorGender = "Mistress"
@@ -466,9 +468,9 @@
/datum/chemical_reaction/fermi/acidic_buffer/FermiFinish(datum/reagents/holder, var/atom/my_atom) //might need this
- if(!locate(/datum/reagent/fermi/acidic_buffer) in my_atom.reagents.reagent_list)
- return
var/datum/reagent/fermi/acidic_buffer/Fa = locate(/datum/reagent/fermi/acidic_buffer) in my_atom.reagents.reagent_list
+ if(!Fa)
+ return
Fa.data = 0.1//setting it to 0 means byond thinks it's not there.
/datum/chemical_reaction/fermi/basic_buffer//done test
@@ -493,10 +495,10 @@
FermiChem = TRUE
-/datum/chemical_reaction/fermi/basic_buffer/FermiFinish(datum/reagents/holder, var/atom/my_atom) //might need this
- if(!locate(/datum/reagent/fermi/basic_buffer) in my_atom.reagents.reagent_list)
- return
+/datum/chemical_reaction/fermi/basic_buffer/FermiFinish(datum/reagents/holder, atom/my_atom) //might need this
var/datum/reagent/fermi/basic_buffer/Fb = locate(/datum/reagent/fermi/basic_buffer) in my_atom.reagents.reagent_list
+ if(!Fb)
+ return
Fb.data = 14
//secretcatchemcode, shh!! Of couse I hide it amongst cats. Though, I moved it with your requests.
diff --git a/modular_citadel/icons/mob/citadel/uniforms.dmi b/modular_citadel/icons/mob/citadel/uniforms.dmi
index 855872e9ab..717999c9f0 100644
Binary files a/modular_citadel/icons/mob/citadel/uniforms.dmi and b/modular_citadel/icons/mob/citadel/uniforms.dmi differ
diff --git a/modular_citadel/icons/obj/clothing/vg_clothes.dmi b/modular_citadel/icons/obj/clothing/vg_clothes.dmi
deleted file mode 100644
index a1d25aebf5..0000000000
Binary files a/modular_citadel/icons/obj/clothing/vg_clothes.dmi and /dev/null differ
diff --git a/tgstation.dme b/tgstation.dme
index 597938acc0..212384da0f 100755
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -475,6 +475,7 @@
#include "code\datums\elements\_element.dm"
#include "code\datums\elements\cleaning.dm"
#include "code\datums\elements\dusts_on_catatonia.dm"
+#include "code\datums\elements\dusts_on_leaving_area.dm"
#include "code\datums\elements\earhealing.dm"
#include "code\datums\elements\ghost_role_eligibility.dm"
#include "code\datums\elements\wuv.dm"
@@ -1228,7 +1229,9 @@
#include "code\modules\antagonists\_common\antag_spawner.dm"
#include "code\modules\antagonists\_common\antag_team.dm"
#include "code\modules\antagonists\abductor\abductor.dm"
+#include "code\modules\antagonists\abductor\abductee\abductee.dm"
#include "code\modules\antagonists\abductor\abductee\abductee_objectives.dm"
+#include "code\modules\antagonists\abductor\abductee\trauma.dm"
#include "code\modules\antagonists\abductor\equipment\abduction_gear.dm"
#include "code\modules\antagonists\abductor\equipment\abduction_outfits.dm"
#include "code\modules\antagonists\abductor\equipment\abduction_surgery.dm"
@@ -1600,6 +1603,7 @@
#include "code\modules\cargo\packs\science.dm"
#include "code\modules\cargo\packs\security.dm"
#include "code\modules\cargo\packs\service.dm"
+#include "code\modules\cargo\packs\vending.dm"
#include "code\modules\chatter\chatter.dm"
#include "code\modules\client\asset_cache.dm"
#include "code\modules\client\client_colour.dm"
@@ -1627,12 +1631,10 @@
#include "code\modules\clothing\glasses\engine_goggles.dm"
#include "code\modules\clothing\glasses\hud.dm"
#include "code\modules\clothing\glasses\phantomthief.dm"
-#include "code\modules\clothing\glasses\vg_glasses.dm"
#include "code\modules\clothing\gloves\_gloves.dm"
#include "code\modules\clothing\gloves\boxing.dm"
#include "code\modules\clothing\gloves\color.dm"
#include "code\modules\clothing\gloves\miscellaneous.dm"
-#include "code\modules\clothing\gloves\vg_gloves.dm"
#include "code\modules\clothing\head\_head.dm"
#include "code\modules\clothing\head\beanie.dm"
#include "code\modules\clothing\head\cit_hats.dm"
@@ -1643,14 +1645,12 @@
#include "code\modules\clothing\head\misc.dm"
#include "code\modules\clothing\head\misc_special.dm"
#include "code\modules\clothing\head\soft_caps.dm"
-#include "code\modules\clothing\head\vg_hats.dm"
#include "code\modules\clothing\masks\_masks.dm"
#include "code\modules\clothing\masks\boxing.dm"
#include "code\modules\clothing\masks\breath.dm"
#include "code\modules\clothing\masks\gasmask.dm"
#include "code\modules\clothing\masks\hailer.dm"
#include "code\modules\clothing\masks\miscellaneous.dm"
-#include "code\modules\clothing\masks\vg_masks.dm"
#include "code\modules\clothing\neck\_neck.dm"
#include "code\modules\clothing\outfits\ert.dm"
#include "code\modules\clothing\outfits\event.dm"
@@ -1664,14 +1664,12 @@
#include "code\modules\clothing\shoes\magboots.dm"
#include "code\modules\clothing\shoes\miscellaneous.dm"
#include "code\modules\clothing\shoes\taeclowndo.dm"
-#include "code\modules\clothing\shoes\vg_shoes.dm"
#include "code\modules\clothing\spacesuits\_spacesuits.dm"
#include "code\modules\clothing\spacesuits\chronosuit.dm"
#include "code\modules\clothing\spacesuits\hardsuit.dm"
#include "code\modules\clothing\spacesuits\miscellaneous.dm"
#include "code\modules\clothing\spacesuits\plasmamen.dm"
#include "code\modules\clothing\spacesuits\syndi.dm"
-#include "code\modules\clothing\spacesuits\vg_spess.dm"
#include "code\modules\clothing\suits\_suits.dm"
#include "code\modules\clothing\suits\armor.dm"
#include "code\modules\clothing\suits\bio.dm"
@@ -1682,7 +1680,6 @@
#include "code\modules\clothing\suits\reactive_armour.dm"
#include "code\modules\clothing\suits\toggles.dm"
#include "code\modules\clothing\suits\utility.dm"
-#include "code\modules\clothing\suits\vg_suits.dm"
#include "code\modules\clothing\suits\wiz_robe.dm"
#include "code\modules\clothing\under\_under.dm"
#include "code\modules\clothing\under\accessories.dm"
@@ -1693,7 +1690,6 @@
#include "code\modules\clothing\under\shorts.dm"
#include "code\modules\clothing\under\syndicate.dm"
#include "code\modules\clothing\under\trek.dm"
-#include "code\modules\clothing\under\vg_under.dm"
#include "code\modules\clothing\under\jobs\civilian.dm"
#include "code\modules\clothing\under\jobs\engineering.dm"
#include "code\modules\clothing\under\jobs\medsci.dm"
@@ -2624,6 +2620,7 @@
#include "code\modules\projectiles\guns\ballistic\revolver.dm"
#include "code\modules\projectiles\guns\ballistic\shotgun.dm"
#include "code\modules\projectiles\guns\ballistic\toy.dm"
+#include "code\modules\projectiles\guns\energy\dueling.dm"
#include "code\modules\projectiles\guns\energy\energy_gun.dm"
#include "code\modules\projectiles\guns\energy\kinetic_accelerator.dm"
#include "code\modules\projectiles\guns\energy\laser.dm"