Merge branch 'master' into upstream-merge-33829

README.md

@@ -37,7 +37,7 @@ hassle if you want to make any changes at all, so it's not recommended.)
 ## INSTALLATION
 
 First-time installation should be fairly straightforward. First, you'll need
-BYOND installed. You can get it from http://www.byond.com/. Once you've done
+BYOND installed. You can get it from https://www.byond.com/download. Once you've done
 that, extract the game files to wherever you want to keep them. This is a
 sourcecode-only release, so the next step is to compile the server files.
 Open tgstation.dme by double-clicking it, open the Build menu, and click

_maps/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm

@@ -10,14 +10,11 @@
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/lavaland/surface/outdoors)
 "d" = (
-/turf/closed/wall{
-	baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
-	},
+/turf/closed/wall,
 /area/ruin/unpowered)
 "e" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating{
-	baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface;
 	initial_gas_mix = "o2=14;n2=23;TEMP=300"
 	},
 /area/ruin/unpowered)
@@ -25,7 +22,6 @@
 /obj/structure/table/wood,
 /obj/item/storage/box/cups,
 /turf/open/floor/wood{
-	baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface;
 	initial_gas_mix = "o2=14;n2=23;TEMP=300"
 	},
 /area/ruin/unpowered)
@@ -36,14 +32,12 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/wood{
-	baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface;
 	initial_gas_mix = "o2=14;n2=23;TEMP=300"
 	},
 /area/ruin/unpowered)
 "h" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/wood{
-	baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface;
 	initial_gas_mix = "o2=14;n2=23;TEMP=300"
 	},
 /area/ruin/unpowered)
@@ -51,7 +45,6 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/wood{
-	baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface;
 	initial_gas_mix = "o2=14;n2=23;TEMP=300"
 	},
 /area/ruin/unpowered)
@@ -59,7 +52,6 @@
 /obj/item/reagent_containers/food/snacks/pizzaslice/mushroom,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating{
-	baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface;
 	initial_gas_mix = "o2=14;n2=23;TEMP=300"
 	},
 /area/ruin/unpowered)
@@ -72,7 +64,6 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/wood{
-	baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface;
 	initial_gas_mix = "o2=14;n2=23;TEMP=300"
 	},
 /area/ruin/unpowered)
@@ -89,7 +80,6 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/cobweb/cobweb2,
 /turf/open/floor/wood{
-	baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface;
 	initial_gas_mix = "o2=14;n2=23;TEMP=300"
 	},
 /area/ruin/unpowered)
@@ -97,7 +87,6 @@
 /obj/item/chair/wood/wings,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating{
-	baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface;
 	initial_gas_mix = "o2=14;n2=23;TEMP=300"
 	},
 /area/ruin/unpowered)
@@ -105,7 +94,6 @@
 /obj/structure/glowshroom/single,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/wood{
-	baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface;
 	initial_gas_mix = "o2=14;n2=23;TEMP=300"
 	},
 /area/ruin/unpowered)
@@ -113,7 +101,6 @@
 /obj/item/trash/plate,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/wood{
-	baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface;
 	initial_gas_mix = "o2=14;n2=23;TEMP=300"
 	},
 /area/ruin/unpowered)
@@ -121,7 +108,6 @@
 /obj/effect/decal/remains/human,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/wood{
-	baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface;
 	initial_gas_mix = "o2=14;n2=23;TEMP=300"
 	},
 /area/ruin/unpowered)
@@ -129,7 +115,6 @@
 /obj/item/chair/wood/wings,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/wood{
-	baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface;
 	initial_gas_mix = "o2=14;n2=23;TEMP=300"
 	},
 /area/ruin/unpowered)
@@ -141,13 +126,11 @@
 	name = "party hat"
 	},
 /turf/open/floor/wood{
-	baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface;
 	initial_gas_mix = "o2=14;n2=23;TEMP=300"
 	},
 /area/ruin/unpowered)
 "s" = (
 /turf/open/floor/wood{
-	baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface;
 	initial_gas_mix = "o2=14;n2=23;TEMP=300"
 	},
 /area/ruin/unpowered)
@@ -155,14 +138,12 @@
 /obj/structure/chair/wood/wings,
 /obj/effect/decal/remains/human,
 /turf/open/floor/wood{
-	baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface;
 	initial_gas_mix = "o2=14;n2=23;TEMP=300"
 	},
 /area/ruin/unpowered)
 "u" = (
 /obj/structure/glowshroom/single,
 /turf/open/floor/wood{
-	baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface;
 	initial_gas_mix = "o2=14;n2=23;TEMP=300"
 	},
 /area/ruin/unpowered)
@@ -175,7 +156,6 @@
 /obj/item/kitchen/fork,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/wood{
-	baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface;
 	initial_gas_mix = "o2=14;n2=23;TEMP=300"
 	},
 /area/ruin/unpowered)
@@ -187,7 +167,6 @@
 	name = "pizza spawner"
 	},
 /turf/open/floor/wood{
-	baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface;
 	initial_gas_mix = "o2=14;n2=23;TEMP=300"
 	},
 /area/ruin/unpowered)
@@ -195,7 +174,6 @@
 /obj/structure/table/wood,
 /obj/item/trash/plate,
 /turf/open/floor/wood{
-	baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface;
 	initial_gas_mix = "o2=14;n2=23;TEMP=300"
 	},
 /area/ruin/unpowered)
@@ -204,7 +182,6 @@
 /obj/structure/glowshroom/single,
 /obj/item/a_gift,
 /turf/open/floor/wood{
-	baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface;
 	initial_gas_mix = "o2=14;n2=23;TEMP=300"
 	},
 /area/ruin/unpowered)
@@ -213,7 +190,6 @@
 /obj/item/trash/plate,
 /obj/item/kitchen/fork,
 /turf/open/floor/wood{
-	baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface;
 	initial_gas_mix = "o2=14;n2=23;TEMP=300"
 	},
 /area/ruin/unpowered)
@@ -224,7 +200,6 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating{
-	baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface;
 	initial_gas_mix = "o2=14;n2=23;TEMP=300"
 	},
 /area/ruin/unpowered)
@@ -233,7 +208,6 @@
 /obj/item/reagent_containers/food/snacks/pizzaslice/margherita,
 /obj/item/trash/plate,
 /turf/open/floor/wood{
-	baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface;
 	initial_gas_mix = "o2=14;n2=23;TEMP=300"
 	},
 /area/ruin/unpowered)
@@ -241,7 +215,6 @@
 /obj/structure/table/wood,
 /obj/item/reagent_containers/food/snacks/pizzaslice/meat,
 /turf/open/floor/wood{
-	baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface;
 	initial_gas_mix = "o2=14;n2=23;TEMP=300"
 	},
 /area/ruin/unpowered)
@@ -249,21 +222,18 @@
 /obj/structure/table/wood,
 /obj/item/reagent_containers/food/snacks/store/cake/birthday,
 /turf/open/floor/wood{
-	baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface;
 	initial_gas_mix = "o2=14;n2=23;TEMP=300"
 	},
 /area/ruin/unpowered)
 "G" = (
 /obj/structure/table/wood,
 /turf/open/floor/wood{
-	baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface;
 	initial_gas_mix = "o2=14;n2=23;TEMP=300"
 	},
 /area/ruin/unpowered)
 "H" = (
 /obj/item/chair/wood/wings,
 /turf/open/floor/wood{
-	baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface;
 	initial_gas_mix = "o2=14;n2=23;TEMP=300"
 	},
 /area/ruin/unpowered)
@@ -271,7 +241,6 @@
 /obj/item/kitchen/fork,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating{
-	baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface;
 	initial_gas_mix = "o2=14;n2=23;TEMP=300"
 	},
 /area/ruin/unpowered)
@@ -279,7 +248,6 @@
 /obj/structure/glowshroom/single,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating{
-	baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface;
 	initial_gas_mix = "o2=14;n2=23;TEMP=300"
 	},
 /area/ruin/unpowered)
@@ -291,7 +259,6 @@
 /obj/effect/decal/remains/human,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/wood{
-	baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface;
 	initial_gas_mix = "o2=14;n2=23;TEMP=300"
 	},
 /area/ruin/unpowered)
@@ -299,7 +266,6 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating{
-	baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface;
 	initial_gas_mix = "o2=14;n2=23;TEMP=300"
 	},
 /area/ruin/unpowered)
@@ -307,7 +273,6 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/item/a_gift,
 /turf/open/floor/wood{
-	baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface;
 	initial_gas_mix = "o2=14;n2=23;TEMP=300"
 	},
 /area/ruin/unpowered)
@@ -320,7 +285,6 @@
 /obj/item/kitchen/knife,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/wood{
-	baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface;
 	initial_gas_mix = "o2=14;n2=23;TEMP=300"
 	},
 /area/ruin/unpowered)
@@ -330,13 +294,11 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/wood{
-	baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface;
 	initial_gas_mix = "o2=14;n2=23;TEMP=300"
 	},
 /area/ruin/unpowered)
 "Q" = (
 /turf/open/floor/plating{
-	baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface;
 	initial_gas_mix = "o2=14;n2=23;TEMP=300"
 	},
 /area/ruin/unpowered)
@@ -344,7 +306,6 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/baseturf_helper/lava_land/surface,
 /turf/open/floor/wood{
-	baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface;
 	initial_gas_mix = "o2=14;n2=23;TEMP=300"
 	},
 /area/ruin/unpowered)

_maps/RandomRuins/SpaceRuins/spacehotel.dmm

@@ -4059,14 +4059,10 @@
 /area/ruin/space/has_grav/hotel/pool)
 "li" = (
 /obj/effect/light_emitter,
-/turf/open/floor/plating/beach/water{
-	baseturf = /turf/open/space
-	},
+/turf/open/floor/plating/beach/water,
 /area/ruin/space/has_grav/hotel/pool)
 "lj" = (
-/turf/open/floor/plating/beach/water{
-	baseturf = /turf/open/space
-	},
+/turf/open/floor/plating/beach/water,
 /area/ruin/space/has_grav/hotel/pool)
 "lk" = (
 /obj/structure/chair{
@@ -4274,9 +4270,7 @@
 /area/ruin/space/has_grav/hotel/security)
 "lP" = (
 /obj/item/bikehorn/rubberducky,
-/turf/open/floor/plating/beach/water{
-	baseturf = /turf/open/space
-	},
+/turf/open/floor/plating/beach/water,
 /area/ruin/space/has_grav/hotel/pool)
 "lQ" = (
 /obj/structure/table,
@@ -4655,6 +4649,10 @@
 	},
 /turf/open/floor/carpet,
 /area/ruin/space/has_grav/hotel)
+"mW" = (
+/obj/effect/baseturf_helper/space,
+/turf/closed/wall,
+/area/ruin/space/has_grav/hotel/pool)
 
 (1,1,1) = {"
 aa
@@ -7090,7 +7088,7 @@ ih
 fi
 cJ
 jt
-jQ
+mW
 jQ
 jQ
 jQ

_maps/RandomZLevels/beach2.dmm

@@ -91,22 +91,16 @@
 	density = 0;
 	pixel_y = 18
 	},
-/turf/open/floor/wood{
-	baseturf = /turf/open/floor/plating/beach/sand
-	},
+/turf/open/floor/wood,
 /area/awaymission/beach)
 "at" = (
-/turf/open/floor/wood{
-	baseturf = /turf/open/floor/plating/beach/sand
-	},
+/turf/open/floor/wood,
 /area/awaymission/beach)
 "au" = (
 /obj/machinery/computer/security/telescreen/entertainment{
 	pixel_y = 32
 	},
-/turf/open/floor/wood{
-	baseturf = /turf/open/floor/plating/beach/sand
-	},
+/turf/open/floor/wood,
 /area/awaymission/beach)
 "av" = (
 /obj/structure/toilet{
@@ -117,9 +111,7 @@
 /area/awaymission/beach)
 "aw" = (
 /obj/structure/closet/secure_closet/personal/cabinet,
-/turf/open/floor/wood{
-	baseturf = /turf/open/floor/plating/beach/sand
-	},
+/turf/open/floor/wood,
 /area/awaymission/beach)
 "ax" = (
 /obj/item/bedsheet/rainbow,
@@ -131,9 +123,7 @@
 	pixel_x = 24;
 	specialfunctions = 4
 	},
-/turf/open/floor/wood{
-	baseturf = /turf/open/floor/plating/beach/sand
-	},
+/turf/open/floor/wood,
 /area/awaymission/beach)
 "ay" = (
 /obj/effect/overlay/palmtree_r,
@@ -151,9 +141,7 @@
 /obj/item/reagent_containers/food/drinks/bottle/wine,
 /obj/item/reagent_containers/food/drinks/bottle/rum,
 /obj/structure/table/wood,
-/turf/open/floor/wood{
-	baseturf = /turf/open/floor/plating/beach/sand
-	},
+/turf/open/floor/wood,
 /area/awaymission/beach)
 "aB" = (
 /obj/effect/overlay/coconut,
@@ -174,9 +162,7 @@
 /obj/structure/mirror{
 	pixel_y = 28
 	},
-/turf/open/floor/wood{
-	baseturf = /turf/open/floor/plating/beach/sand
-	},
+/turf/open/floor/wood,
 /area/awaymission/beach)
 "aF" = (
 /obj/machinery/button/door{
@@ -186,9 +172,7 @@
 	pixel_x = 24;
 	specialfunctions = 4
 	},
-/turf/open/floor/wood{
-	baseturf = /turf/open/floor/plating/beach/sand
-	},
+/turf/open/floor/wood,
 /area/awaymission/beach)
 "aG" = (
 /obj/machinery/button/door{
@@ -198,9 +182,7 @@
 	pixel_x = 24;
 	specialfunctions = 4
 	},
-/turf/open/floor/wood{
-	baseturf = /turf/open/floor/plating/beach/sand
-	},
+/turf/open/floor/wood,
 /area/awaymission/beach)
 "aH" = (
 /obj/machinery/door/airlock/sandstone{
@@ -238,74 +220,52 @@
 /area/awaymission/beach)
 "aM" = (
 /obj/structure/closet/gmcloset,
-/turf/open/floor/wood{
-	baseturf = /turf/open/floor/plating/beach/sand
-	},
+/turf/open/floor/wood,
 /area/awaymission/beach)
 "aN" = (
 /obj/structure/closet/secure_closet/bar,
-/turf/open/floor/wood{
-	baseturf = /turf/open/floor/plating/beach/sand
-	},
+/turf/open/floor/wood,
 /area/awaymission/beach)
 "aO" = (
 /obj/structure/table/wood,
 /obj/item/book/manual/barman_recipes,
-/turf/open/floor/wood{
-	baseturf = /turf/open/floor/plating/beach/sand
-	},
+/turf/open/floor/wood,
 /area/awaymission/beach)
 "aP" = (
 /obj/structure/table/wood,
 /obj/item/reagent_containers/food/drinks/shaker,
-/turf/open/floor/wood{
-	baseturf = /turf/open/floor/plating/beach/sand
-	},
+/turf/open/floor/wood,
 /area/awaymission/beach)
 "aQ" = (
 /obj/structure/table/wood,
 /obj/item/reagent_containers/food/drinks/beer,
-/turf/open/floor/wood{
-	baseturf = /turf/open/floor/plating/beach/sand
-	},
+/turf/open/floor/wood,
 /area/awaymission/beach)
 "aR" = (
 /obj/structure/table/wood,
 /obj/item/clothing/glasses/sunglasses,
 /obj/item/reagent_containers/food/drinks/beer,
-/turf/open/floor/wood{
-	baseturf = /turf/open/floor/plating/beach/sand
-	},
+/turf/open/floor/wood,
 /area/awaymission/beach)
 "aS" = (
 /obj/effect/mob_spawn/human/bartender/alive,
-/turf/open/floor/wood{
-	baseturf = /turf/open/floor/plating/beach/sand
-	},
+/turf/open/floor/wood,
 /area/awaymission/beach)
 "aT" = (
 /obj/machinery/vending/boozeomat,
-/turf/open/floor/wood{
-	baseturf = /turf/open/floor/plating/beach/sand
-	},
+/turf/open/floor/wood,
 /area/awaymission/beach)
 "aU" = (
 /obj/machinery/vending/cigarette,
-/turf/open/floor/wood{
-	baseturf = /turf/open/floor/plating/beach/sand
-	},
+/turf/open/floor/wood,
 /area/awaymission/beach)
 "aV" = (
 /obj/machinery/vending/cola,
-/turf/open/floor/wood{
-	baseturf = /turf/open/floor/plating/beach/sand
-	},
+/turf/open/floor/wood,
 /area/awaymission/beach)
 "aW" = (
 /obj/machinery/vending/snack,
-/turf/open/floor/wood{
-	baseturf = /turf/open/floor/plating/beach/sand
-	},
+/turf/open/floor/wood,
 /area/awaymission/beach)
 "aX" = (
 /obj/structure/mineral_door/wood{
@@ -316,29 +276,21 @@
 "aY" = (
 /obj/structure/table/wood,
 /obj/item/reagent_containers/food/drinks/ale,
-/turf/open/floor/wood{
-	baseturf = /turf/open/floor/plating/beach/sand
-	},
+/turf/open/floor/wood,
 /area/awaymission/beach)
 "aZ" = (
 /obj/structure/table/wood,
-/turf/open/floor/wood{
-	baseturf = /turf/open/floor/plating/beach/sand
-	},
+/turf/open/floor/wood,
 /area/awaymission/beach)
 "ba" = (
 /obj/structure/table/wood,
 /obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb,
-/turf/open/floor/wood{
-	baseturf = /turf/open/floor/plating/beach/sand
-	},
+/turf/open/floor/wood,
 /area/awaymission/beach)
 "bb" = (
 /obj/structure/table/wood,
 /obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime,
-/turf/open/floor/wood{
-	baseturf = /turf/open/floor/plating/beach/sand
-	},
+/turf/open/floor/wood,
 /area/awaymission/beach)
 "bc" = (
 /obj/item/toy/beach_ball,
@@ -431,6 +383,10 @@
 "bt" = (
 /turf/open/floor/plating/beach/water,
 /area/awaymission/beach)
+"bu" = (
+/obj/effect/baseturf_helper/beach/sand,
+/turf/open/floor/plating/beach/sand,
+/area/awaymission/beach)
 
 (1,1,1) = {"
 aa
@@ -43447,7 +43403,7 @@ ab
 ab
 ab
 ab
-ac
+bu
 ac
 ac
 ac

_maps/map_files/BoxStation/BoxStation.dmm

@@ -22174,7 +22174,8 @@
 	req_access_txt = "20"
 	},
 /obj/structure/window/reinforced,
-/obj/item/aiModule/core/full/corp,
+/obj/effect/spawner/lootdrop/aimodule_harmless,
+/obj/effect/spawner/lootdrop/aimodule_neutral,
 /obj/structure/window/reinforced{
 	dir = 1
 	},
@@ -22235,7 +22236,7 @@
 	},
 /obj/item/aiModule/reset/purge,
 /obj/structure/window/reinforced,
-/obj/item/aiModule/core/full/antimov,
+/obj/effect/spawner/lootdrop/aimodule_harmful,
 /obj/structure/window/reinforced{
 	dir = 1
 	},

_maps/map_files/Deltastation/DeltaStation2.dmm

@@ -54219,14 +54219,10 @@
 	name = "Core Modules";
 	req_access_txt = "20"
 	},
-/obj/item/aiModule/core/full/paladin{
-	pixel_x = 3;
-	pixel_y = 3
-	},
-/obj/item/aiModule/core/full/asimov,
-/obj/item/aiModule/core/full/corp{
-	pixel_x = -3;
-	pixel_y = -3
+/obj/effect/spawner/lootdrop/aimodule_harmless{
+	fan_out_items = 1;
+	lootdoubles = 0;
+	lootcount = 3
 	},
 /obj/structure/sign/nanotrasen{
 	pixel_x = -32
@@ -54279,12 +54275,12 @@
 	name = "Core Modules";
 	req_access_txt = "20"
 	},
-/obj/item/aiModule/core/full/antimov{
-	pixel_x = 3;
-	pixel_y = 3
+/obj/effect/spawner/lootdrop/aimodule_harmful{
+	fan_out_items = 1;
+	lootdoubles = 0;
+	lootcount = 2
 	},
-/obj/item/aiModule/supplied/oxygen,
-/obj/item/aiModule/supplied/protectStation{
+/obj/item/aiModule/supplied/oxygen{
 	pixel_x = -3;
 	pixel_y = -3
 	},
@@ -55144,6 +55140,10 @@
 	pixel_y = 3
 	},
 /obj/item/aiModule/core/full/custom,
+/obj/item/aiModule/core/full/asimov{
+	pixel_x = -3;
+	pixel_y = -3
+	},
 /turf/open/floor/plasteel/vault{
 	dir = 8
 	},
@@ -55226,7 +55226,7 @@
 	req_access_txt = "20"
 	},
 /obj/structure/window/reinforced,
-/obj/item/aiModule/core/full/tyrant{
+/obj/item/aiModule/supplied/protectStation{
 	pixel_x = 3;
 	pixel_y = 3
 	},
@@ -57252,14 +57252,10 @@
 /area/ai_monitored/turret_protected/ai_upload)
 "clQ" = (
 /obj/structure/table/reinforced,
-/obj/item/aiModule/core/full/drone{
-	pixel_x = 3;
-	pixel_y = 3
-	},
-/obj/item/aiModule/core/full/reporter,
-/obj/item/aiModule/core/full/liveandletlive{
-	pixel_x = -3;
-	pixel_y = -3
+/obj/effect/spawner/lootdrop/aimodule_neutral{
+	fan_out_items = 1;
+	lootdoubles = 0;
+	lootcount = 3
 	},
 /turf/open/floor/plasteel/vault{
 	dir = 8

_maps/map_files/MetaStation/MetaStation.dmm

@@ -18443,6 +18443,7 @@
 "aMG" = (
 /obj/structure/table,
 /obj/item/aiModule/core/full/asimov,
+/obj/effect/spawner/lootdrop/aimodule_harmless,
 /obj/item/aiModule/core/freeformcore,
 /obj/machinery/door/window{
 	base_state = "right";
@@ -18452,7 +18453,7 @@
 	req_access_txt = "20"
 	},
 /obj/structure/window/reinforced,
-/obj/item/aiModule/core/full/corp,
+/obj/effect/spawner/lootdrop/aimodule_neutral,
 /obj/item/aiModule/core/full/custom,
 /obj/machinery/flasher{
 	pixel_y = 24;
@@ -18477,7 +18478,7 @@
 	pixel_y = 24;
 	id = "AI"
 	},
-/obj/item/aiModule/core/full/antimov,
+/obj/effect/spawner/lootdrop/aimodule_harmful,
 /obj/item/aiModule/supplied/oxygen,
 /obj/item/aiModule/supplied/protectStation,
 /obj/item/aiModule/zeroth/oneHuman,

_maps/map_files/OmegaStation/OmegaStation.dmm

@@ -2376,14 +2376,10 @@
 	name = "Core Modules";
 	req_access_txt = "20"
 	},
-/obj/item/aiModule/core/full/paladin{
-	pixel_x = 3;
-	pixel_y = 3
-	},
-/obj/item/aiModule/core/full/asimov,
-/obj/item/aiModule/core/full/corp{
-	pixel_x = -3;
-	pixel_y = -3
+/obj/effect/spawner/lootdrop/aimodule_harmless{
+	fan_out_items = 1;
+	lootdoubles = 0;
+	lootcount = 3
 	},
 /obj/structure/sign/nanotrasen{
 	pixel_x = -32
@@ -2499,12 +2495,12 @@
 	name = "Core Modules";
 	req_access_txt = "20"
 	},
-/obj/item/aiModule/core/full/antimov{
-	pixel_x = 3;
-	pixel_y = 3
+/obj/effect/spawner/lootdrop/aimodule_harmful{
+	fan_out_items = 1;
+	lootdoubles = 0;
+	lootcount = 2
 	},
-/obj/item/aiModule/supplied/oxygen,
-/obj/item/aiModule/supplied/protectStation{
+/obj/item/aiModule/supplied/oxygen{
 	pixel_x = -3;
 	pixel_y = -3
 	},
@@ -2875,6 +2871,10 @@
 	pixel_y = 3
 	},
 /obj/item/aiModule/core/full/custom,
+/obj/item/aiModule/core/full/asimov{
+	pixel_x = -3;
+	pixel_y = -3
+	},
 /obj/machinery/camera{
 	c_tag = "AI Core - Port";
 	dir = 4;
@@ -2900,7 +2900,7 @@
 	req_access_txt = "20"
 	},
 /obj/structure/window/reinforced,
-/obj/item/aiModule/core/full/tyrant{
+/obj/item/aiModule/supplied/protectStation{
 	pixel_x = 3;
 	pixel_y = 3
 	},
@@ -4361,14 +4361,10 @@
 /area/ai_monitored/turret_protected/ai)
 "ahV" = (
 /obj/structure/table/reinforced,
-/obj/item/aiModule/core/full/drone{
-	pixel_x = 3;
-	pixel_y = 3
-	},
-/obj/item/aiModule/core/full/reporter,
-/obj/item/aiModule/core/full/liveandletlive{
-	pixel_x = -3;
-	pixel_y = -3
+/obj/effect/spawner/lootdrop/aimodule_neutral{
+	fan_out_items = 1;
+	lootdoubles = 0;
+	lootcount = 3
 	},
 /turf/open/floor/plasteel/vault{
 	dir = 8
@@ -23737,7 +23733,6 @@
 /obj/structure/chair/office/light{
 	dir = 1
 	},
-/obj/effect/landmark/start/chemist,
 /obj/effect/turf_decal/bot,
 /turf/open/floor/plasteel,
 /area/medical/chemistry)
@@ -24229,7 +24224,6 @@
 /obj/structure/chair/office/light{
 	dir = 4
 	},
-/obj/effect/landmark/start/chemist,
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
@@ -74189,7 +74183,7 @@ aRf
 aSk
 aTr
 aUt
-aVk
+aVl
 aWg
 aRf
 aXr

_maps/map_files/OmegaStation/job_changes.dm

@@ -164,4 +164,5 @@ MAP_REMOVE_JOB(geneticist)
 MAP_REMOVE_JOB(virologist)
 MAP_REMOVE_JOB(rd)
 MAP_REMOVE_JOB(warden)
-MAP_REMOVE_JOB(lawyer)
+MAP_REMOVE_JOB(lawyer)
+MAP_REMOVE_JOB(chemist)

_maps/map_files/PubbyStation/PubbyStation.dmm

@@ -12140,6 +12140,7 @@
 "aED" = (
 /obj/structure/table,
 /obj/item/aiModule/core/full/asimov,
+/obj/effect/spawner/lootdrop/aimodule_harmless,
 /obj/item/aiModule/core/freeformcore,
 /obj/machinery/door/window{
 	base_state = "right";
@@ -12148,7 +12149,7 @@
 	name = "Core Modules";
 	req_access_txt = "20"
 	},
-/obj/item/aiModule/core/full/corp,
+/obj/effect/spawner/lootdrop/aimodule_neutral,
 /obj/item/aiModule/core/full/custom,
 /obj/structure/window/reinforced{
 	dir = 1;
@@ -12197,7 +12198,7 @@
 	req_access_txt = "20"
 	},
 /obj/item/aiModule/reset/purge,
-/obj/item/aiModule/core/full/antimov,
+/obj/effect/spawner/lootdrop/aimodule_harmful,
 /obj/item/aiModule/supplied/protectStation,
 /obj/structure/window/reinforced{
 	dir = 1;

_maps/shuttles/emergency_delta.dmm

@@ -353,7 +353,6 @@
 	name = "emergency shower"
 	},
 /turf/open/floor/plasteel/whiteblue/side{
-	baseturf = /turf/open/lava/smooth/lava_land_surface;
 	dir = 4
 	},
 /area/shuttle/escape)

code/__DEFINES/atmospherics.dm

@@ -129,38 +129,12 @@
 #define MAX_OUTPUT_PRESSURE					4500 // (kPa) What pressure pumps and powered equipment max out at.
 #define MAX_TRANSFER_RATE					200 // (L/s) Maximum speed powered equipment can work at.
 
-//used for device_type vars; used by DEVICE_TYPE_LOOP
+//used for device_type vars
 #define UNARY		1
 #define BINARY 		2
 #define TRINARY		3
 #define QUATERNARY	4
 
-//TODO: finally remove this bullshit
-//this is the standard for loop used by all sorts of atmos machinery procs
-#define DEVICE_TYPE_LOOP	var/I in 1 to device_type
-
-//defines for the various machinery lists
-//NODE_I, AIR_I, PARENT_I are used within DEVICE_TYPE_LOOP
-
-//nodes list - all atmos machinery
-#define NODE1	nodes[1]
-#define	NODE2	nodes[2]
-#define NODE3	nodes[3]
-#define NODE4	nodes[4]
-#define NODE_I	nodes[I]
-
-//airs list - components only
-#define AIR1	airs[1]
-#define AIR2	airs[2]
-#define AIR3	airs[3]
-#define AIR_I	airs[I]
-
-//parents list - components only
-#define PARENT1		parents[1]
-#define PARENT2		parents[2]
-#define PARENT3		parents[3]
-#define PARENT_I	parents[I]
-
 //TANKS
 #define TANK_MELT_TEMPERATURE				1000000	//temperature in kelvins at which a tank will start to melt
 #define TANK_LEAK_PRESSURE					(30.*ONE_ATMOSPHERE)	//Tank starts leaking

code/__DEFINES/cleaning.dm

@@ -4,4 +4,9 @@
 #define CLEAN_MEDIUM		3 // Acceptable tools
 #define CLEAN_STRONG		4 // Industrial strength
 #define CLEAN_IMPRESSIVE	5 // Cleaning strong enough your granny would be proud
-#define CLEAN_GOD			6 // Cleans things spotless down to the atomic structure
+#define CLEAN_GOD			6 // Cleans things spotless down to the atomic structure
+
+//How strong things have to be to wipe forensic evidence...
+#define CLEAN_STRENGTH_FINGERPRINTS CLEAN_IMPRESSIVE
+#define CLEAN_STRENGTH_BLOOD CLEAN_WEAK
+#define CLEAN_STRENGTH_FIBERS CLEAN_IMPRESSIVE

code/__DEFINES/components.dm

@@ -27,6 +27,13 @@
 	#define COMPONENT_NO_AFTERATTACK 1								//Return this in response if you don't want afterattack to be called
 #define COMSIG_ATOM_HULK_ATTACK "hulk_attack"					//from base of atom/attack_hulk(): (/mob/living/carbon/human)
 #define COMSIG_PARENT_EXAMINE "atom_examine"                    //from base of atom/examine(): (/mob)
+#define COMSIG_ATOM_GET_EXAMINE_NAME "atom_examine_name"		//from base of atom/get_examine_name(): (/mob, list/overrides)
+	//Positions for overrides list
+	#define EXAMINE_POSITION_ARTICLE 1
+	#define EXAMINE_POSITION_BEFORE 2
+	#define EXAMINE_POSITION_NAME 3
+	//End positions
+	#define COMPONENT_EXNAME_CHANGED 1
 #define COMSIG_ATOM_ENTERED "atom_entered"                      //from base of atom/Entered(): (/atom/movable, /atom)
 #define COMSIG_ATOM_EX_ACT "atom_ex_act"						//from base of atom/ex_act(): (severity, target)
 #define COMSIG_ATOM_EMP_ACT "atom_emp_act"						//from base of atom/emp_act(): (severity)

code/__DEFINES/forensics.dm

@@ -0,0 +1,2 @@
+#define IF_HAS_BLOOD_DNA(__thing) GET_COMPONENT_FROM(__FR##__thing, /datum/component/forensics, __thing); if(__FR##__thing && length(__FR##__thing.blood_DNA))
+#define IF_HAS_BLOOD_DNA_AND(__thing, __conditions...) GET_COMPONENT_FROM(__FR##__thing, /datum/component/forensics, __thing); if(__FR##__thing && length(__FR##__thing.blood_DNA) && (##__conditions))

code/__DEFINES/mobs.dm

@@ -108,6 +108,7 @@
 #define AI_ON		1
 #define AI_IDLE		2
 #define AI_OFF		3
+#define AI_Z_OFF	4
 
 //determines if a mob can smash through it
 #define ENVIRONMENT_SMASH_NONE 0

code/__DEFINES/stat.dm

@@ -32,6 +32,7 @@
 #define STASIS_MUTE "stasis"
 #define GENETICS_SPELL "genetics_spell"
 #define TRAUMA_DISABILITY "trauma"
+#define CHEMICAL_DISABILITY "chemical"
 
 // bitflags for machine stat variable
 #define BROKEN		1

code/__DEFINES/status_effects.dm

@@ -64,6 +64,8 @@
 
 #define STATUS_EFFECT_KINDLE /datum/status_effect/kindle //A knockdown reduced by 1 second for every 3 points of damage the target takes.
 
+#define STATUS_EFFECT_ICHORIAL_STAIN /datum/status_effect/ichorial_stain //Prevents a servant from being revived by vitality matrices for one minute.
+
 /////////////
 // NEUTRAL //
 /////////////

code/__DEFINES/subsystems.dm

@@ -70,6 +70,40 @@
 #define INIT_ORDER_SQUEAK -40
 #define INIT_ORDER_PERSISTENCE -100
 
+// Subsystem fire priority, from lowest to highest priority
+// If the subsystem isn't listed here it's either DEFAULT or PROCESS (if it's a processing subsystem child)
+
+#define FIRE_PRIORITY_IDLE_NPC		1
+#define FIRE_PRIORITY_SERVER_MAINT	1
+
+#define FIRE_PRIORITY_GARBAGE		4
+#define FIRE_PRIORITY_RESEARCH		4
+#define FIRE_PRIORITY_AIR			5
+#define FIRE_PRIORITY_NPC			5
+#define FIRE_PRIORITY_PROCESS		6
+#define FIRE_PRIORITY_THROWING		6
+#define FIRE_PRIORITY_FLIGHTPACKS	7
+#define FIRE_PRIORITY_SPACEDRIFT	7
+#define FIRE_PRIOTITY_SMOOTHING		8
+#define FIRE_PRIORITY_ORBIT			8
+#define FIRE_PRIORITY_OBJ			9
+#define FIRE_PRIORUTY_FIELDS		9
+#define FIRE_PRIORITY_ACID			9
+#define FIRE_PRIOTITY_BURNING		9
+#define FIRE_PRIORITY_INBOUNDS		9
+
+#define FIRE_PRIORITY_DEFAULT		10
+
+#define FIRE_PRIORITY_PARALLAX		11
+#define FIRE_PRIORITY_NETWORKS		12
+#define FIRE_PRIORITY_MOBS			13
+#define FIRE_PRIORITY_TGUI			14
+
+#define FIRE_PRIORITY_TICKER		19
+#define FIRE_PRIORITY_OVERLAYS		20
+
+#define FIRE_PRIORITY_INPUT			100 // This must always always be the max highest priority. Player input must never be lost.
+
 // SS runlevels
 
 #define RUNLEVEL_INIT 0

code/__DEFINES/turf_flags.dm

@@ -0,0 +1,3 @@
+#define CHANGETURF_DEFER_CHANGE		1
+#define CHANGETURF_IGNORE_AIR		2
+#define CHANGETURF_FORCEOP			4

code/__HELPERS/roundend.dm

@@ -18,6 +18,9 @@
 	//Antag information
 	gather_antag_data()
 
+	//Nuke disk
+	record_nuke_disk_location()
+
 /datum/controller/subsystem/ticker/proc/gather_antag_data()
 	var/team_gid = 1
 	var/list/team_ids = list()
@@ -46,11 +49,57 @@
 				antag_info["objectives"] += list(list("objective_type"=O.type,"text"=O.explanation_text,"result"=result))
 		SSblackbox.record_feedback("associative", "antagonists", 1, antag_info)
 
+/datum/controller/subsystem/ticker/proc/record_nuke_disk_location()
+	var/obj/item/disk/nuclear/N = locate() in GLOB.poi_list
+	if(N)
+		var/list/data = list()
+		var/turf/T = get_turf(N)
+		if(T)
+			data["x"] = T.x
+			data["y"] = T.y
+			data["z"] = T.z
+		var/atom/outer = get_atom_on_turf(N,/mob/living)
+		if(outer != N)
+			if(isliving(outer))
+				var/mob/living/L = outer
+				data["holder"] = L.real_name
+			else
+				data["holder"] = outer.name
+
+		SSblackbox.record_feedback("associative", "roundend_nukedisk", 1 , data)
+
+/datum/controller/subsystem/ticker/proc/gather_newscaster()
+	var/json_file = file("[GLOB.log_directory]/newscaster.json")
+	var/list/file_data = list()
+	var/pos = 1
+	for(var/V in GLOB.news_network.network_channels)
+		var/datum/newscaster/feed_channel/channel = V
+		if(!istype(channel))
+			stack_trace("Non-channel in newscaster channel list")
+			continue
+		file_data["[pos]"] = list("channel name" = "[channel.channel_name]", "author" = "[channel.author]", "censored" = channel.censored ? 1 : 0, "author censored" = channel.authorCensor ? 1 : 0, "messages" = list())
+		for(var/M in channel.messages)
+			var/datum/newscaster/feed_message/message = M
+			if(!istype(message))
+				stack_trace("Non-message in newscaster channel messages list")
+				continue
+			var/list/comment_data = list()
+			for(var/C in message.comments)
+				var/datum/newscaster/feed_comment/comment = C
+				if(!istype(comment))
+					stack_trace("Non-message in newscaster message comments list")
+					continue
+				comment_data += list(list("author" = "[comment.author]", "time stamp" = "[comment.time_stamp]", "body" = "[comment.body]"))
+			file_data["[pos]"]["messages"] += list(list("author" = "[message.author]", "time stamp" = "[message.time_stamp]", "censored" = message.bodyCensor ? 1 : 0, "author censored" = message.authorCensor ? 1 : 0, "photo file" = "[message.photo_file]", "photo caption" = "[message.caption]", "body" = "[message.body]", "comments" = comment_data))
+		pos++
+	if(GLOB.news_network.wanted_issue.active)
+		file_data["wanted"] = list("author" = "[GLOB.news_network.wanted_issue.scannedUser]", "criminal" = "[GLOB.news_network.wanted_issue.criminal]", "description" = "[GLOB.news_network.wanted_issue.body]", "photo file" = "[GLOB.news_network.wanted_issue.photo_file]")
+	WRITE_FILE(json_file, json_encode(file_data))
 
 /datum/controller/subsystem/ticker/proc/declare_completion()
 	set waitfor = FALSE
 
-	to_chat(world, "<BR><BR><BR><FONT size=3><B>The round has ended.</B></FONT>")
+	to_chat(world, "<BR><BR><BR><span class='big bold'>The round has ended.</span>")
 	if(LAZYLEN(GLOB.round_end_notifiees))
 		send2irc("Notice", "[GLOB.round_end_notifiees.Join(", ")] the round has ended.")
 
@@ -78,7 +127,7 @@
 
 	send2irc("Server", "Round just ended.")
 
-	if(CONFIG_GET(string/cross_server_address))
+	if(length(CONFIG_GET(keyed_string_list/cross_server)))
 		send_news_report()
 
 	CHECK_TICK
@@ -346,7 +395,7 @@
 			currrent_category = A.roundend_category
 			previous_category = A
 		result += A.roundend_report()
-		result += "<br>"
+		result += "<br><br>"
 
 	if(all_antagonists.len)
 		var/datum/antagonist/last = all_antagonists[all_antagonists.len]

code/_globalvars/lists/mobs.dm

@@ -22,7 +22,7 @@ GLOBAL_LIST_EMPTY(carbon_list)				//all instances of /mob/living/carbon and subt
 GLOBAL_LIST_EMPTY(ai_list)
 GLOBAL_LIST_EMPTY(pai_list)
 GLOBAL_LIST_EMPTY(available_ai_shells)
-GLOBAL_LIST_INIT(simple_animals, list(list(),list(),list())) // One for each AI_* status define
+GLOBAL_LIST_INIT(simple_animals, list(list(),list(),list(),list())) // One for each AI_* status define
 GLOBAL_LIST_EMPTY(spidermobs)				//all sentient spider mobs
 GLOBAL_LIST_EMPTY(bots_list)
 

code/_onclick/item_attack.dm

@@ -58,9 +58,11 @@
 	SendSignal(COMSIG_ITEM_ATTACK, M, user)
 	if(flags_1 & NOBLUDGEON_1)
 		return
-
-	if(user.has_disability(DISABILITY_PACIFISM))
+    
+	if(force && user.has_disability(DISABILITY_PACIFISM))
+		to_chat(user, "<span class='warning'>You don't want to harm other living beings!</span>")
 		return
+    
 	if(!force)
 		playsound(loc, 'sound/weapons/tap.ogg', get_clamped_volume(), 1, -1)
 	else if(hitsound)

code/citadel/cit_reagents.dm

@@ -21,7 +21,7 @@
 		S = new(T)
 	S.reagents.add_reagent("semen", reac_volume)
 	if(data["blood_DNA"])
-		S.blood_DNA[data["blood_DNA"]] = data["blood_type"]
+		S.add_blood_DNA(list(data["blood_DNA"] = data["blood_type"]))
 
 /obj/effect/decal/cleanable/semen
 	name = "semen"
@@ -62,17 +62,16 @@
 	icon = 'code/citadel/icons/effects.dmi'
 	icon_state = "fem1"
 	random_icon_states = list("fem1", "fem2", "fem3", "fem4")
-	blood_DNA = list()
 	blood_state = null
 	bloodiness = null
 
 /obj/effect/decal/cleanable/femcum/New()
 	..()
 	dir = pick(1,2,4,8)
+	add_blood_DNA(list("Non-human DNA" = "A+"))
 
 /obj/effect/decal/cleanable/femcum/replace_decal(obj/effect/decal/cleanable/femcum/F)
-	if (F.blood_DNA)
-		blood_DNA |= F.blood_DNA.Copy()
+	F.add_blood_DNA(return_blood_DNA())
 	..()
 
 /datum/reagent/consumable/femcum/reaction_turf(turf/T, reac_volume)
@@ -86,7 +85,7 @@
 		S = new(T)
 	S.reagents.add_reagent("femcum", reac_volume)
 	if(data["blood_DNA"])
-		S.blood_DNA[data["blood_DNA"]] = data["blood_type"]
+		S.add_blood_DNA(list(data["blood_DNA"] = data["blood_type"]))
 
 //aphrodisiac & anaphrodisiac
 

code/citadel/custom_loadout/custom_items.dm

@@ -10,6 +10,14 @@
 	w_class = WEIGHT_CLASS_TINY
 	flags_1 = NOBLUDGEON_1
 
+/obj/item/soap/cebu //real versions, for admin shenanigans. Adminspawn only
+	desc = "A bright blue bar of soap that smells of wolves"
+	icon = 'icons/obj/custom.dmi'
+	icon_state = "cebu"
+
+/obj/item/soap/cebu/fast //speedyquick cleaning version. Still not as fast as Syndiesoap. Adminspawn only.
+	cleanspeed = 15
+
 
 /*Inferno707*/
 

code/citadel/dogborgstuff.dm

@@ -259,7 +259,7 @@
 			to_chat(user,"<span class='notice'>You clean \the [target.name].</span>")
 			var/obj/effect/decal/cleanable/C = locate() in target
 			qdel(C)
-			target.clean_blood()
+			SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
 	else if(ishuman(target))
 		if(src.emagged)
 			var/mob/living/silicon/robot.R = user
@@ -292,7 +292,7 @@
 			to_chat(user, "<span class='notice'>You clean \the [target.name].</span>")
 			var/obj/effect/decal/cleanable/C = locate() in target
 			qdel(C)
-			target.clean_blood()
+			SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
 	return
 
 

code/controllers/subsystem.dm

@@ -4,7 +4,7 @@
 	name = "fire coderbus" //name of the subsystem
 	var/init_order = INIT_ORDER_DEFAULT		//order of initialization. Higher numbers are initialized first, lower numbers later. Use defines in __DEFINES/subsystems.dm for easy understanding of order.
 	var/wait = 20			//time to wait (in deciseconds) between each call to fire(). Must be a positive integer.
-	var/priority = 50		//When mutiple subsystems need to run in the same tick, higher priority subsystems will run first and be given a higher share of the tick before MC_TICK_CHECK triggers a sleep
+	var/priority = FIRE_PRIORITY_DEFAULT	//When mutiple subsystems need to run in the same tick, higher priority subsystems will run first and be given a higher share of the tick before MC_TICK_CHECK triggers a sleep
 
 	var/flags = 0			//see MC.dm in __DEFINES Most flags must be set on world start to take full effect. (You can also restart the mc to force them to process again)
 

code/controllers/subsystem/acid.dm

@@ -1,6 +1,6 @@
 SUBSYSTEM_DEF(acid)
 	name = "Acid"
-	priority = 40
+	priority = FIRE_PRIORITY_ACID
 	flags = SS_NO_INIT|SS_BACKGROUND
 	runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME
 

code/controllers/subsystem/air.dm

@@ -9,7 +9,7 @@
 SUBSYSTEM_DEF(air)
 	name = "Atmospherics"
 	init_order = INIT_ORDER_AIR
-	priority = 20
+	priority = FIRE_PRIORITY_AIR
 	wait = 5
 	flags = SS_BACKGROUND
 	runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME

code/controllers/subsystem/fire_burning.dm

@@ -1,6 +1,6 @@
 SUBSYSTEM_DEF(fire_burning)
 	name = "Fire Burning"
-	priority = 40
+	priority = FIRE_PRIOTITY_BURNING
 	flags = SS_NO_INIT|SS_BACKGROUND
 	runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME
 

code/controllers/subsystem/garbage.dm

@@ -1,6 +1,6 @@
 SUBSYSTEM_DEF(garbage)
 	name = "Garbage"
-	priority = 15
+	priority = FIRE_PRIORITY_GARBAGE
 	wait = 2 SECONDS
 	flags = SS_POST_FIRE_TIMING|SS_BACKGROUND|SS_NO_INIT
 	runlevels = RUNLEVELS_DEFAULT | RUNLEVEL_LOBBY

code/controllers/subsystem/icon_smooth.dm

@@ -2,7 +2,7 @@ SUBSYSTEM_DEF(icon_smooth)
 	name = "Icon Smoothing"
 	init_order = INIT_ORDER_ICON_SMOOTHING
 	wait = 1
-	priority = 35
+	priority = FIRE_PRIOTITY_SMOOTHING
 	flags = SS_TICKER
 
 	var/list/smooth_queue = list()

code/controllers/subsystem/idlenpcpool.dm

@@ -1,15 +1,21 @@
 SUBSYSTEM_DEF(idlenpcpool)
 	name = "Idling NPC Pool"
-	flags = SS_POST_FIRE_TIMING|SS_NO_INIT|SS_BACKGROUND
-	priority = 10
+	flags = SS_POST_FIRE_TIMING|SS_BACKGROUND
+	priority = FIRE_PRIORITY_IDLE_NPC
 	wait = 60
 	runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME
 
 	var/list/currentrun = list()
+	var/static/list/idle_mobs_by_zlevel[][]
 
 /datum/controller/subsystem/idlenpcpool/stat_entry()
 	var/list/idlelist = GLOB.simple_animals[AI_IDLE]
-	..("IdleNPCS:[idlelist.len]")
+	var/list/zlist = GLOB.simple_animals[AI_Z_OFF]
+	..("IdleNPCS:[idlelist.len]|Z:[zlist.len]")
+
+/datum/controller/subsystem/idlenpcpool/Initialize(start_timeofday)
+	idle_mobs_by_zlevel = new /list(world.maxz,0)
+	return ..()
 
 /datum/controller/subsystem/idlenpcpool/fire(resumed = FALSE)
 
@@ -24,6 +30,9 @@ SUBSYSTEM_DEF(idlenpcpool)
 	while(currentrun.len)
 		var/mob/living/simple_animal/SA = currentrun[currentrun.len]
 		--currentrun.len
+		if (!SA)
+			GLOB.simple_animals[AI_IDLE] -= SA
+			continue
 
 		if(!SA.ckey)
 			if(SA.stat != DEAD)
@@ -32,3 +41,4 @@ SUBSYSTEM_DEF(idlenpcpool)
 				SA.consider_wakeup()
 		if (MC_TICK_CHECK)
 			return
+

code/controllers/subsystem/inbounds.dm

@@ -1,6 +1,6 @@
 SUBSYSTEM_DEF(inbounds)
 	name = "Inbounds"
-	priority = 40
+	priority = FIRE_PRIORITY_INBOUNDS
 	flags = SS_NO_INIT
 	runlevels = RUNLEVEL_GAME
 

code/controllers/subsystem/input.dm

@@ -2,7 +2,7 @@ SUBSYSTEM_DEF(input)
 	name = "Input"
 	wait = 1 //SS_TICKER means this runs every tick
 	flags = SS_TICKER | SS_NO_INIT
-	priority = 1000
+	priority = FIRE_PRIORITY_INPUT
 	runlevels = RUNLEVELS_DEFAULT | RUNLEVEL_LOBBY
 
 /datum/controller/subsystem/input/fire()

code/controllers/subsystem/mobs.dm

@@ -1,6 +1,6 @@
 SUBSYSTEM_DEF(mobs)
 	name = "Mobs"
-	priority = 100
+	priority = FIRE_PRIORITY_MOBS
 	flags = SS_KEEP_TIMING
 	runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME
 

code/controllers/subsystem/npcpool.dm

@@ -6,7 +6,7 @@
 SUBSYSTEM_DEF(npcpool)
 	name = "NPC Pool"
 	flags = SS_POST_FIRE_TIMING|SS_NO_INIT|SS_BACKGROUND
-	priority = 20
+	priority = FIRE_PRIORITY_NPC
 	runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME
 
 	var/list/canBeUsed = list()

code/controllers/subsystem/orbit.dm

@@ -1,44 +1,42 @@
-SUBSYSTEM_DEF(orbit)
-	name = "Orbits"
-	priority = 35
-	wait = 2
-	flags = SS_NO_INIT|SS_TICKER
-
-	var/list/currentrun = list()
-	var/list/processing = list()
-
-/datum/controller/subsystem/orbit/stat_entry()
-	..("P:[processing.len]")
-
-
-/datum/controller/subsystem/orbit/fire(resumed = 0)
-	if (!resumed)
-		src.currentrun = processing.Copy()
-
-	//cache for sanic speed (lists are references anyways)
-	var/list/currentrun = src.currentrun
-
-	while (currentrun.len)
-		var/datum/orbit/O = currentrun[currentrun.len]
-		currentrun.len--
-		if (!O)
-			processing -= O
-			if (MC_TICK_CHECK)
-				return
-			continue
-		if (!O.orbiter)
-			qdel(O)
-			if (MC_TICK_CHECK)
-				return
-			continue
-		if (O.lastprocess >= world.time) //we already checked recently
-			if (MC_TICK_CHECK)
-				return
-			continue
-		var/targetloc = get_turf(O.orbiting)
-		if (targetloc != O.lastloc || O.orbiter.loc != targetloc)
-			O.Check(targetloc)
-		if (MC_TICK_CHECK)
-			return
-
-
+SUBSYSTEM_DEF(orbit)
+	name = "Orbits"
+	priority = FIRE_PRIORITY_ORBIT
+	wait = 2
+	flags = SS_NO_INIT|SS_TICKER
+
+	var/list/currentrun = list()
+	var/list/processing = list()
+
+/datum/controller/subsystem/orbit/stat_entry()
+	..("P:[processing.len]")
+
+
+/datum/controller/subsystem/orbit/fire(resumed = 0)
+	if (!resumed)
+		src.currentrun = processing.Copy()
+
+	//cache for sanic speed (lists are references anyways)
+	var/list/currentrun = src.currentrun
+
+	while (currentrun.len)
+		var/datum/orbit/O = currentrun[currentrun.len]
+		currentrun.len--
+		if (!O)
+			processing -= O
+			if (MC_TICK_CHECK)
+				return
+			continue
+		if (!O.orbiter)
+			qdel(O)
+			if (MC_TICK_CHECK)
+				return
+			continue
+		if (O.lastprocess >= world.time) //we already checked recently
+			if (MC_TICK_CHECK)
+				return
+			continue
+		var/targetloc = get_turf(O.orbiting)
+		if (targetloc != O.lastloc || O.orbiter.loc != targetloc)
+			O.Check(targetloc)
+		if (MC_TICK_CHECK)
+			return

code/controllers/subsystem/overlays.dm

@@ -2,7 +2,7 @@ SUBSYSTEM_DEF(overlays)
 	name = "Overlay"
 	flags = SS_TICKER
 	wait = 1
-	priority = 500
+	priority = FIRE_PRIORITY_OVERLAYS
 	init_order = INIT_ORDER_OVERLAY
 	runlevels = RUNLEVELS_DEFAULT | RUNLEVEL_SETUP
 

code/controllers/subsystem/parallax.dm

@@ -2,7 +2,7 @@ SUBSYSTEM_DEF(parallax)
 	name = "Parallax"
 	wait = 2
 	flags = SS_POST_FIRE_TIMING | SS_BACKGROUND | SS_NO_INIT
-	priority = 65
+	priority = FIRE_PRIORITY_PARALLAX
 	runlevels = RUNLEVEL_LOBBY | RUNLEVELS_DEFAULT
 	var/list/currentrun
 

code/controllers/subsystem/processing/fields.dm

@@ -1,6 +1,6 @@
 PROCESSING_SUBSYSTEM_DEF(fields)
 	name = "Fields"
 	wait = 2
-	priority = 40
+	priority = FIRE_PRIORUTY_FIELDS
 	flags = SS_KEEP_TIMING | SS_NO_INIT
 	runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME

code/controllers/subsystem/processing/flightpacks.dm

@@ -1,6 +1,6 @@
 PROCESSING_SUBSYSTEM_DEF(flightpacks)
 	name = "Flightpack Movement"
-	priority = 30
+	priority = FIRE_PRIORITY_FLIGHTPACKS
 	wait = 2
 	stat_tag = "FM"
 	flags = SS_NO_INIT|SS_TICKER|SS_KEEP_TIMING

code/controllers/subsystem/processing/networks.dm

@@ -1,36 +1,36 @@
-PROCESSING_SUBSYSTEM_DEF(networks)
-	name = "Networks"
-	priority = 80
-	wait = 1
-	stat_tag = "NET"
-	flags = SS_KEEP_TIMING
-	init_order = INIT_ORDER_NETWORKS
-	var/datum/ntnet/station/station_network
-	var/assignment_hardware_id = HID_RESTRICTED_END
-	var/list/networks_by_id = list()				//id = network
-	var/list/interfaces_by_id = list()				//hardware id = component interface
-
-/datum/controller/subsystem/processing/networks/Initialize()
-	station_network = new
-	station_network.register_map_supremecy()
-	. = ..()
-
-/datum/controller/subsystem/processing/networks/proc/register_network(datum/ntnet/network)
-	if(!networks_by_id[network.network_id])
-		networks_by_id[network.network_id] = network
-		return TRUE
-	return FALSE
-
-/datum/controller/subsystem/processing/networks/proc/unregister_network(datum/ntnet/network)
-	networks_by_id -= network.network_id
-	return TRUE
-
-/datum/controller/subsystem/processing/networks/proc/register_interface(datum/component/ntnet_interface/D)
-	if(!interfaces_by_id[D.hardware_id])
-		interfaces_by_id[D.hardware_id] = D
-		return TRUE
-	return FALSE
-
-/datum/controller/subsystem/processing/networks/proc/unregister_interface(datum/component/ntnet_interface/D)
-	interfaces_by_id -= D.hardware_id
-	return TRUE
+PROCESSING_SUBSYSTEM_DEF(networks)
+	name = "Networks"
+	priority = FIRE_PRIORITY_NETWORKS
+	wait = 1
+	stat_tag = "NET"
+	flags = SS_KEEP_TIMING
+	init_order = INIT_ORDER_NETWORKS
+	var/datum/ntnet/station/station_network
+	var/assignment_hardware_id = HID_RESTRICTED_END
+	var/list/networks_by_id = list()				//id = network
+	var/list/interfaces_by_id = list()				//hardware id = component interface
+
+/datum/controller/subsystem/processing/networks/Initialize()
+	station_network = new
+	station_network.register_map_supremecy()
+	. = ..()
+
+/datum/controller/subsystem/processing/networks/proc/register_network(datum/ntnet/network)
+	if(!networks_by_id[network.network_id])
+		networks_by_id[network.network_id] = network
+		return TRUE
+	return FALSE
+
+/datum/controller/subsystem/processing/networks/proc/unregister_network(datum/ntnet/network)
+	networks_by_id -= network.network_id
+	return TRUE
+
+/datum/controller/subsystem/processing/networks/proc/register_interface(datum/component/ntnet_interface/D)
+	if(!interfaces_by_id[D.hardware_id])
+		interfaces_by_id[D.hardware_id] = D
+		return TRUE
+	return FALSE
+
+/datum/controller/subsystem/processing/networks/proc/unregister_interface(datum/component/ntnet_interface/D)
+	interfaces_by_id -= D.hardware_id
+	return TRUE

code/controllers/subsystem/processing/obj.dm

@@ -1,6 +1,6 @@
 SUBSYSTEM_DEF(obj)
 	name = "Objects"
-	priority = 40
+	priority = FIRE_PRIORITY_OBJ
 	flags = SS_NO_INIT
 
 	var/list/processing = list()

code/controllers/subsystem/processing/processing.dm

@@ -2,7 +2,7 @@
 
 SUBSYSTEM_DEF(processing)
 	name = "Processing"
-	priority = 25
+	priority = FIRE_PRIORITY_PROCESS
 	flags = SS_BACKGROUND|SS_POST_FIRE_TIMING|SS_NO_INIT
 	wait = 10
 

code/controllers/subsystem/processing/projectiles.dm

@@ -1,6 +1,5 @@
 PROCESSING_SUBSYSTEM_DEF(projectiles)
 	name = "Projectiles"
-	priority = 25
 	wait = 1
 	stat_tag = "PP"
 	flags = SS_NO_INIT|SS_TICKER|SS_KEEP_TIMING

code/controllers/subsystem/radiation.dm

@@ -1,7 +1,6 @@
 PROCESSING_SUBSYSTEM_DEF(radiation)
 	name = "Radiation"
 	flags = SS_NO_INIT | SS_BACKGROUND
-	priority = 25
 
 	var/list/warned_atoms = list()
 

code/controllers/subsystem/research.dm

@@ -2,7 +2,7 @@
 SUBSYSTEM_DEF(research)
 	name = "Research"
 	flags = SS_KEEP_TIMING
-	priority = 15		//My powergame is priority.
+	priority = FIRE_PRIORITY_RESEARCH
 	wait = 10
 	init_order = INIT_ORDER_RESEARCH
 	var/list/invalid_design_ids = list()		//associative id = number of times

code/controllers/subsystem/server_maint.dm

@@ -4,7 +4,7 @@ SUBSYSTEM_DEF(server_maint)
 	name = "Server Tasks"
 	wait = 6
 	flags = SS_POST_FIRE_TIMING
-	priority = 10
+	priority = FIRE_PRIORITY_SERVER_MAINT
 	init_order = INIT_ORDER_SERVER_MAINT
 	runlevels = RUNLEVEL_LOBBY | RUNLEVELS_DEFAULT
 	var/list/currentrun

code/controllers/subsystem/spacedrift.dm

@@ -1,6 +1,6 @@
 SUBSYSTEM_DEF(spacedrift)
 	name = "Space Drift"
-	priority = 30
+	priority = FIRE_PRIORITY_SPACEDRIFT
 	wait = 5
 	flags = SS_NO_INIT|SS_KEEP_TIMING
 	runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME

code/controllers/subsystem/tgui.dm

@@ -2,7 +2,7 @@ SUBSYSTEM_DEF(tgui)
 	name = "tgui"
 	wait = 9
 	flags = SS_NO_INIT
-	priority = 110
+	priority = FIRE_PRIORITY_TGUI
 	runlevels = RUNLEVEL_LOBBY | RUNLEVELS_DEFAULT
 
 	var/list/currentrun = list()

code/controllers/subsystem/throwing.dm

@@ -3,7 +3,7 @@
 
 SUBSYSTEM_DEF(throwing)
 	name = "Throwing"
-	priority = 25
+	priority = FIRE_PRIORITY_THROWING
 	wait = 1
 	flags = SS_NO_INIT|SS_KEEP_TIMING|SS_TICKER
 	runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME

code/controllers/subsystem/ticker.dm

@@ -4,7 +4,7 @@ SUBSYSTEM_DEF(ticker)
 	name = "Ticker"
 	init_order = INIT_ORDER_TICKER
 
-	priority = 200
+	priority = FIRE_PRIORITY_TICKER
 	flags = SS_KEEP_TIMING
 	runlevels = RUNLEVEL_LOBBY | RUNLEVEL_SETUP | RUNLEVEL_GAME
 

code/datums/antagonists/monkey.dm

@@ -16,8 +16,7 @@
 
 	var/datum/disease/D = new /datum/disease/transformation/jungle_fever/monkeymode
 	if(!owner.current.HasDisease(D))
-		D.affected_mob = owner
-		owner.current.viruses += D
+		owner.current.AddDisease(D)
 	else
 		QDEL_NULL(D)
 

code/datums/components/_component.dm

@@ -205,13 +205,13 @@
 						new_comp = new nt(arglist(args))
 					if(!QDELETED(new_comp))
 						old_comp.InheritComponent(new_comp, TRUE)
-						qdel(new_comp)
+						QDEL_NULL(new_comp)
 				if(COMPONENT_DUPE_HIGHLANDER)
 					if(!new_comp)
 						new_comp = new nt(arglist(args))
 					if(!QDELETED(new_comp))
 						new_comp.InheritComponent(old_comp, FALSE)
-						qdel(old_comp)
+						QDEL_NULL(old_comp)
 				if(COMPONENT_DUPE_UNIQUE_PASSARGS)
 					if(!new_comp)
 						var/list/arguments = args.Copy(2)

code/datums/components/cleaning.dm

@@ -13,28 +13,28 @@
 	if(!isturf(tile))
 		return
 
-	tile.clean_blood()
+	tile.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
 	for(var/A in tile)
 		if(is_cleanable(A))
 			qdel(A)
 		else if(istype(A, /obj/item))
-			var/obj/item/cleaned_item = A
-			cleaned_item.clean_blood()
+			var/obj/item/I = A
+			I.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
 		else if(ishuman(A))
 			var/mob/living/carbon/human/cleaned_human = A
 			if(cleaned_human.lying)
 				if(cleaned_human.head)
-					cleaned_human.head.clean_blood()
+					cleaned_human.head.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
 					cleaned_human.update_inv_head()
 				if(cleaned_human.wear_suit)
-					cleaned_human.wear_suit.clean_blood()
+					cleaned_human.wear_suit.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
 					cleaned_human.update_inv_wear_suit()
 				else if(cleaned_human.w_uniform)
-					cleaned_human.w_uniform.clean_blood()
+					cleaned_human.w_uniform.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
 					cleaned_human.update_inv_w_uniform()
 				if(cleaned_human.shoes)
-					cleaned_human.shoes.clean_blood()
+					cleaned_human.shoes.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
 					cleaned_human.update_inv_shoes()
-				cleaned_human.clean_blood()
+				cleaned_human.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
 				cleaned_human.wash_cream()
 				to_chat(cleaned_human, "<span class='danger'>[AM] cleans your face!</span>")

code/datums/components/decal.dm

@@ -6,19 +6,11 @@
 	var/mutable_appearance/pic
 
 /datum/component/decal/Initialize(_icon, _icon_state, _dir, _cleanable=CLEAN_GOD, _color, _layer=TURF_LAYER, _description)
-	if(!isatom(parent) || !_icon || !_icon_state)
+	if(!isatom(parent) || !generate_appearance(_icon, _icon_state, _dir, _layer, _color))
 		. = COMPONENT_INCOMPATIBLE
 		CRASH("A turf decal was applied incorrectly to [parent.type]: icon:[_icon ? _icon : "none"] icon_state:[_icon_state ? _icon_state : "none"]")
-
-	// It has to be made from an image or dir breaks because of a byond bug
-	var/temp_image = image(_icon, null, _icon_state, _layer, _dir)
-	pic = new(temp_image)
-	pic.color = _color
-
-	cleanable = _cleanable
 	description = _description
-
-	apply()
+	cleanable = _cleanable
 
 	if(_dir) // If no dir is assigned at start then it follows the atom's dir
 		RegisterSignal(COMSIG_ATOM_DIR_CHANGE, .proc/rotate_react)
@@ -26,6 +18,7 @@
 		RegisterSignal(COMSIG_COMPONENT_CLEAN_ACT, .proc/clean_react)
 	if(_description)
 		RegisterSignal(COMSIG_PARENT_EXAMINE, .proc/examine)
+	apply()
 
 /datum/component/decal/Destroy()
 	remove()
@@ -36,6 +29,15 @@
 	remove(thing)
 	apply(thing)
 
+/datum/component/decal/proc/generate_appearance(_icon, _icon_state, _dir, _layer, _color)
+	if(!_icon || !_icon_state)
+		return FALSE
+	// It has to be made from an image or dir breaks because of a byond bug
+	var/temp_image = image(_icon, null, _icon_state, _layer, _dir)
+	pic = new(temp_image)
+	pic.color = _color
+	return TRUE
+
 /datum/component/decal/proc/apply(atom/thing)
 	var/atom/master = thing || parent
 	master.add_overlay(pic, TRUE)

code/datums/components/decals/blood.dm

@@ -0,0 +1,35 @@
+/datum/component/decal/blood
+	dupe_mode = COMPONENT_DUPE_UNIQUE
+
+/datum/component/decal/blood/Initialize(_icon, _icon_state, _dir, _cleanable=CLEAN_STRENGTH_BLOOD, _color, _layer=ABOVE_OBJ_LAYER)
+	if(!isitem(parent))
+		. = COMPONENT_INCOMPATIBLE
+		CRASH("Warning: Blood decal attempted to be added to non-item of type [parent.type]")
+	. = ..()
+	RegisterSignal(COMSIG_ATOM_GET_EXAMINE_NAME, .proc/get_examine_name)
+
+/datum/component/decal/blood/generate_appearance(_icon, _icon_state, _dir, _layer, _color)
+	var/obj/item/I = parent
+	if(!_icon)
+		_icon = 'icons/effects/blood.dmi'
+	if(!_icon_state)
+		_icon_state = "itemblood"
+	if(!initial(I.icon) || !initial(I.icon_state))
+		return FALSE
+	var/static/list/blood_splatter_appearances = list()
+	//try to find a pre-processed blood-splatter. otherwise, make a new one
+	var/index = "[REF(initial(I.icon))]-[initial(I.icon_state)]"
+	pic = blood_splatter_appearances[index]
+	if(!pic)
+		var/icon/blood_splatter_icon = icon(initial(I.icon), initial(I.icon_state), , 1)		//we only want to apply blood-splatters to the initial icon_state for each object
+		blood_splatter_icon.Blend("#fff", ICON_ADD) 			//fills the icon_state with white (except where it's transparent)
+		blood_splatter_icon.Blend(icon(_icon, _icon_state), ICON_MULTIPLY) //adds blood and the remaining white areas become transparant
+		pic = mutable_appearance(blood_splatter_icon, initial(I.icon_state), I.layer)
+		blood_splatter_appearances[index] = pic
+	return TRUE
+
+/datum/component/decal/blood/proc/get_examine_name(mob/user, list/override)
+	var/atom/A = parent
+	override[EXAMINE_POSITION_ARTICLE] = A.gender == PLURAL? "some" : "a"
+	override[EXAMINE_POSITION_BEFORE] = " blood-stained "
+	return COMPONENT_EXNAME_CHANGED

code/datums/components/forensics.dm

@@ -138,7 +138,7 @@
 		if(laststamppos)
 			LAZYSET(hiddenprints, M.key, copytext(hiddenprints[M.key], 1, laststamppos))
 		hiddenprints[M.key] += " Last: [M.real_name]\[[current_time]\][hasgloves]. Ckey: [M.ckey]"	//made sure to be existing by if(!LAZYACCESS);else
-	parent.fingerprintslast = M.ckey
+	fingerprintslast = M.ckey
 	return TRUE
 
 /datum/component/forensics/proc/add_blood_DNA(list/dna)		//list(dna_enzymes = type)

code/datums/components/thermite.dm

@@ -63,7 +63,7 @@
 
 	if(amount >= 50)
 		var/burning_time = max(100, 100-amount)
-		master = master.ChangeTurf(master.baseturf)
+		master = master.ScrapeAway()
 		master.burn_tile()
 		if(user)
 			master.add_hiddenprint(user)

code/datums/explosion.dm

@@ -55,6 +55,8 @@ GLOBAL_LIST_EMPTY(explosions)
 	var/orig_heavy_range = heavy_impact_range
 	var/orig_light_range = light_impact_range
 	
+	var/orig_max_distance = max(devastation_range, heavy_impact_range, light_impact_range, flash_range, flame_range)
+	
 	//Zlevel specific bomb cap multiplier
 	var/cap_multiplier = 1
 	switch(epicenter.z)
@@ -119,11 +121,13 @@ GLOBAL_LIST_EMPTY(explosions)
 				// If inside the blast radius + world.view - 2
 				if(dist <= round(max_range + world.view - 2, 1))
 					M.playsound_local(epicenter, null, 100, 1, frequency, falloff = 5, S = explosion_sound)
+					shake_camera(M, 25, min(orig_max_distance - dist, 100))
 				// You hear a far explosion if you're outside the blast radius. Small bombs shouldn't be heard all over the station.
 				else if(dist <= far_dist)
 					var/far_volume = CLAMP(far_dist, 30, 50) // Volume is based on explosion size and dist
 					far_volume += (dist <= far_dist * 0.5 ? 50 : 0) // add 50 volume if the mob is pretty close to the explosion
 					M.playsound_local(epicenter, null, far_volume, 1, frequency, falloff = 5, S = far_explosion_sound)
+					shake_camera(M, 10, min(orig_max_distance - dist, 50))
 			EX_PREPROCESS_CHECK_TICK
 
 	//postpone processing for a bit

code/datums/status_effects/debuffs.dm

@@ -479,3 +479,27 @@
 	desc = "Blinding light dances in your vision, stunning and silencing you. <i>Any damage taken will shorten the light's effects!</i>"
 	icon_state = "kindle"
 	alerttooltipstyle = "clockcult"
+
+
+//Ichorial Stain: Applied to servants revived by a vitality matrix. Prevents them from being revived by one again until the effect fades.
+/datum/status_effect/ichorial_stain
+	id = "ichorial_stain"
+	status_type = STATUS_EFFECT_UNIQUE
+	duration = 600
+	examine_text = "<span class='warning'>SUBJECTPRONOUN is drenched in thick, blue ichor!</span>"
+	alert_type = /obj/screen/alert/status_effect/ichorial_stain
+
+/datum/status_effect/ichorial_stain/on_apply()
+	owner.visible_message("<span class='danger'>[owner] gets back up, [owner.p_their()] body dripping blue ichor!</span>", \
+	"<span class='userdanger'>Thick blue ichor covers your body; you can't be revived like this again until it dries!</span>")
+	return TRUE
+
+/datum/status_effect/ichorial_stain/on_remove()
+	owner.visible_message("<span class='danger'>The blue ichor on [owner]'s body dries out!</span>", \
+	"<span class='boldnotice'>The ichor on your body is dry - you can now be revived by vitality matrices again!</span>")
+
+/obj/screen/alert/status_effect/ichorial_stain
+	name = "Ichorial Stain"
+	desc = "Your body is covered in blue ichor! You can't be revived by vitality matrices."
+	icon_state = "ichorial_stain"
+	alerttooltipstyle = "clockcult"

code/datums/status_effects/status_effect.dm

@@ -9,6 +9,7 @@
 	var/mob/living/owner //The mob affected by the status effect.
 	var/status_type = STATUS_EFFECT_UNIQUE //How many of the effect can be on one mob, and what happens when you try to add another
 	var/on_remove_on_mob_delete = FALSE //if we call on_remove() when the mob is deleted
+	var/examine_text //If defined, this text will appear when the mob is examined - to use he, she etc. use "SUBJECTPRONOUN" and replace it in the examines themselves
 	var/alert_type = /obj/screen/alert/status_effect //the alert thrown by the status effect, contains name and description
 	var/obj/screen/alert/status_effect/linked_alert = null //the alert itself, if it exists
 

code/game/atoms.dm

@@ -5,10 +5,6 @@
 
 	var/flags_1 = 0
 	var/flags_2 = 0
-
-	var/list/fingerprints
-	var/list/fingerprintshidden
-	var/list/blood_DNA
 	var/container_type = NONE
 	var/admin_spawned = 0	//was this spawned by an admin? used for stat tracking stuff.
 	var/datum/reagents/reagents = null
@@ -232,21 +228,22 @@
 /atom/proc/in_contents_of(container)//can take class or object instance as argument
 	if(ispath(container))
 		if(istype(src.loc, container))
-			return 1
+			return TRUE
 	else if(src in container)
-		return 1
+		return TRUE
+	return FALSE
+
+/atom/proc/get_examine_name(mob/user)
+	. = "\a [src]"
+	var/list/override = list(gender == PLURAL? "some" : "a" , " ", "[name]")
+	if(SendSignal(COMSIG_ATOM_GET_EXAMINE_NAME, user, override) & COMPONENT_EXNAME_CHANGED)
+		. = override.Join("")
+
+/atom/proc/get_examine_string(mob/user, thats = FALSE)
+	. = "[icon2html(src, user)] [thats? "That's ":""][get_examine_name(user)]"
 
 /atom/proc/examine(mob/user)
-	//This reformat names to get a/an properly working on item descriptions when they are bloody
-	var/f_name = "\a [src]."
-	if(src.blood_DNA && !istype(src, /obj/effect/decal))
-		if(gender == PLURAL)
-			f_name = "some "
-		else
-			f_name = "a "
-		f_name += "<span class='danger'>blood-stained</span> [name]!"
-
-	to_chat(user, "[icon2html(src, user)] That's [f_name]")
+	to_chat(user, get_examine_string(user, TRUE))
 
 	if(desc)
 		to_chat(user, desc)
@@ -303,11 +300,6 @@
 	if(AM && isturf(AM.loc))
 		step(AM, turn(AM.dir, 180))
 
-GLOBAL_LIST_EMPTY(blood_splatter_icons)
-
-/atom/proc/blood_splatter_index()
-	return "[REF(initial(icon))]-[initial(icon_state)]"
-
 //returns the mob's dna info as a list, to be inserted in an object's blood_DNA list
 /mob/living/proc/get_blood_dna_list()
 	if(get_blood_id() != "blood")
@@ -332,100 +324,28 @@ GLOBAL_LIST_EMPTY(blood_splatter_icons)
 	// Returns 0 if we have that blood already
 	var/new_blood_dna = L.get_blood_dna_list()
 	if(!new_blood_dna)
-		return 0
-	if(!blood_DNA)	//if our list of DNA doesn't exist yet, initialise it.
-		blood_DNA = list()
-	var/old_length = blood_DNA.len
-	blood_DNA |= new_blood_dna
-	if(blood_DNA.len == old_length)
-		return 0
-	return 1
-
-//to add blood dna info to the object's blood_DNA list
-/atom/proc/transfer_blood_dna(list/blood_dna)
-	if(!blood_DNA)
-		blood_DNA = list()
-	var/old_length = blood_DNA.len
-	blood_DNA |= blood_dna
-	if(blood_DNA.len > old_length)
-		return 1//some new blood DNA was added
-
+		return FALSE
+	var/old_length = blood_DNA_length()
+	add_blood_DNA(new_blood_dna)
+	if(blood_DNA_length() == old_length)
+		return FALSE
+	return TRUE
 
 //to add blood from a mob onto something, and transfer their dna info
 /atom/proc/add_mob_blood(mob/living/M)
 	var/list/blood_dna = M.get_blood_dna_list()
 	if(!blood_dna)
-		return 0
-	return add_blood(blood_dna)
-
-//to add blood onto something, with blood dna info to include.
-/atom/proc/add_blood(list/blood_dna)
-	return 0
-
-/obj/add_blood(list/blood_dna)
-	return transfer_blood_dna(blood_dna)
-
-/obj/item/add_blood(list/blood_dna)
-	var/blood_count = !blood_DNA ? 0 : blood_DNA.len
-	if(!..())
-		return 0
-	if(!blood_count)//apply the blood-splatter overlay if it isn't already in there
-		add_blood_overlay()
-	return 1 //we applied blood to the item
-
-/obj/item/proc/add_blood_overlay()
-	if(initial(icon) && initial(icon_state))
-		//try to find a pre-processed blood-splatter. otherwise, make a new one
-		var/index = blood_splatter_index()
-		var/icon/blood_splatter_icon = GLOB.blood_splatter_icons[index]
-		if(!blood_splatter_icon)
-			blood_splatter_icon = icon(initial(icon), initial(icon_state), , 1)		//we only want to apply blood-splatters to the initial icon_state for each object
-			blood_splatter_icon.Blend("#fff", ICON_ADD) 			//fills the icon_state with white (except where it's transparent)
-			blood_splatter_icon.Blend(icon('icons/effects/blood.dmi', "itemblood"), ICON_MULTIPLY) //adds blood and the remaining white areas become transparant
-			blood_splatter_icon = fcopy_rsc(blood_splatter_icon)
-			GLOB.blood_splatter_icons[index] = blood_splatter_icon
-		add_overlay(blood_splatter_icon)
-
-/obj/item/clothing/gloves/add_blood(list/blood_dna)
-	. = ..()
-	transfer_blood = rand(2, 4)
-
-/turf/add_blood(list/blood_dna, list/datum/disease/diseases)
-	var/obj/effect/decal/cleanable/blood/splatter/B = locate() in src
-	if(!B)
-		B = new /obj/effect/decal/cleanable/blood/splatter(src, diseases)
-	B.transfer_blood_dna(blood_dna) //give blood info to the blood decal.
-	return 1 //we bloodied the floor
-
-/mob/living/carbon/human/add_blood(list/blood_dna)
-	if(wear_suit)
-		wear_suit.add_blood(blood_dna)
-		update_inv_wear_suit()
-	else if(w_uniform)
-		w_uniform.add_blood(blood_dna)
-		update_inv_w_uniform()
-	if(gloves)
-		var/obj/item/clothing/gloves/G = gloves
-		G.add_blood(blood_dna)
-	else
-		transfer_blood_dna(blood_dna)
-		bloody_hands = rand(2, 4)
-	update_inv_gloves()	//handles bloody hands overlays and updating
-	return 1
-
-/atom/proc/clean_blood()
-	if(islist(blood_DNA))
-		blood_DNA = null
-		return 1
+		return FALSE
+	return add_blood_DNA(blood_dna)
 
 /atom/proc/wash_cream()
-	return 1
+	return TRUE
 
 /atom/proc/isinspace()
 	if(isspaceturf(get_turf(src)))
-		return 1
+		return TRUE
 	else
-		return 0
+		return FALSE
 
 /atom/proc/handle_fall()
 	return

code/game/atoms_movable.dm

@@ -144,27 +144,27 @@
 /atom/movable/proc/clean_on_move()
 	var/turf/tile = loc
 	if(isturf(tile))
-		tile.clean_blood()
+		tile.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
 		for(var/A in tile)
 			if(is_cleanable(A))
 				qdel(A)
 			else if(istype(A, /obj/item))
 				var/obj/item/cleaned_item = A
-				cleaned_item.clean_blood()
+				cleaned_item.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
 			else if(ishuman(A))
 				var/mob/living/carbon/human/cleaned_human = A
 				if(cleaned_human.lying)
 					if(cleaned_human.head)
-						cleaned_human.head.clean_blood()
+						cleaned_human.head.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
 						cleaned_human.update_inv_head()
 					if(cleaned_human.wear_suit)
-						cleaned_human.wear_suit.clean_blood()
+						cleaned_human.wear_suit.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
 						cleaned_human.update_inv_wear_suit()
 					else if(cleaned_human.w_uniform)
-						cleaned_human.w_uniform.clean_blood()
+						cleaned_human.w_uniform.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
 						cleaned_human.update_inv_w_uniform()
 					if(cleaned_human.shoes)
-						cleaned_human.shoes.clean_blood()
+						cleaned_human.shoes.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
 						cleaned_human.update_inv_shoes()
 					cleaned_human.clean_blood()
 					cleaned_human.wash_cream()

code/game/gamemodes/changeling/powers/headcrab.dm

@@ -8,6 +8,8 @@
 
 /obj/effect/proc_holder/changeling/headcrab/sting_action(mob/user)
 	set waitfor = FALSE
+	if(alert("Are we sure we wish to kill ourself and create a headslug?",,"Yes", "No") == "No")
+		return
 	var/datum/mind/M = user.mind
 	var/list/organs = user.getorganszone("head", 1)
 
@@ -35,4 +37,4 @@
 	if(crab.origin)
 		crab.origin.active = 1
 		crab.origin.transfer_to(crab)
-		to_chat(crab, "<span class='warning'>You burst out of the remains of your former body in a shower of gore!</span>")
+		to_chat(crab, "<span class='warning'>You burst out of the remains of your former body in a shower of gore!</span>")

code/game/gamemodes/clock_cult/clock_effects/clock_sigils.dm

@@ -278,7 +278,7 @@
 	animate(src, alpha = 255, time = 10, flags = ANIMATION_END_NOW) //we may have a previous animation going. finish it first, then do this one without delay.
 	sleep(10)
 //as long as they're still on the sigil and are either not a servant or they're a servant AND it has remaining vitality
-	while(L && (!is_servant_of_ratvar(L) || (is_servant_of_ratvar(L) && (GLOB.ratvar_awakens || GLOB.clockwork_vitality))) && get_turf(L) == get_turf(src))
+	while(L && (!is_servant_of_ratvar(L) || (is_servant_of_ratvar(L) && (GLOB.ratvar_awakens || GLOB.clockwork_vitality))) && get_turf(L) == get_turf(src) && !L.buckled)
 		sigil_active = TRUE
 		if(animation_number >= 4)
 			new /obj/effect/temp_visual/ratvar/sigil/vitality(get_turf(src))
@@ -313,21 +313,28 @@
 					revival_cost = 0
 				var/mob/dead/observer/ghost = L.get_ghost(TRUE)
 				if(GLOB.clockwork_vitality >= revival_cost && (ghost || (L.mind && L.mind.active)))
-					if(ghost)
-						ghost.reenter_corpse()
-					L.revive(1, 1)
-					var/obj/effect/temp_visual/ratvar/sigil/vitality/V = new /obj/effect/temp_visual/ratvar/sigil/vitality(get_turf(src))
-					animate(V, alpha = 0, transform = matrix()*2, time = 8)
-					playsound(L, 'sound/magic/staff_healing.ogg', 50, 1)
-					L.visible_message("<span class='warning'>[L] suddenly gets back up, [L.p_their()] body dripping blue ichor!</span>", "<span class='inathneq'>\"[text2ratvar("You will be okay, child.")]\"</span>")
-					GLOB.clockwork_vitality -= revival_cost
+					if(L.has_status_effect(STATUS_EFFECT_ICHORIAL_STAIN))
+						visible_message("<span class='boldwarning'>[src] strains, but nothing happens...</span>")
+						if(L.pulledby)
+							to_chat(L.pulledby, "<span class='userdanger'>[L] was already revived recently by a vitality matrix! Wait a bit longer!</span>")
+						break
+					else
+						if(ghost)
+							ghost.reenter_corpse()
+						L.revive(1, 1)
+						var/obj/effect/temp_visual/ratvar/sigil/vitality/V = new /obj/effect/temp_visual/ratvar/sigil/vitality(get_turf(src))
+						animate(V, alpha = 0, transform = matrix()*2, time = 8)
+						playsound(L, 'sound/magic/staff_healing.ogg', 50, 1)
+						to_chat(L, "<span class='inathneq'>\"[text2ratvar("You will be okay, child.")]\"</span>")
+						L.apply_status_effect(STATUS_EFFECT_ICHORIAL_STAIN)
+						GLOB.clockwork_vitality -= revival_cost
 				break
 			if(!L.client || L.client.is_afk())
 				set waitfor = FALSE
 				var/list/mob/dead/observer/candidates = pollCandidatesForMob("Do you want to play as a [L.name], an inactive clock cultist?", "[name]", null, "Clock Cultist", 50, L)
 				var/mob/dead/observer/theghost = null
 				if(candidates.len)
-					to_chat(L, "Your physical form has been taken over by another soul due to your inactivity! Ahelp if you wish to regain your form!")
+					to_chat(L, "<span class='userdanger'>Your physical form has been taken over by another soul due to your inactivity! Ahelp if you wish to regain your form!</span>")
 					message_admins("[key_name_admin(theghost)] has taken control of ([key_name_admin(L)]) to replace an inactive clock cultist.")
 					L.ghostize(0)
 					L.key = theghost.key

code/game/gamemodes/clock_cult/clock_scriptures/scripture_scripts.dm

@@ -70,6 +70,12 @@
 	quickbind = TRUE
 	quickbind_desc = "Creates a Vitality Matrix, which drains non-Servants on it to heal Servants that cross it."
 
+/datum/clockwork_scripture/create_object/vitality_matrix/check_special_requirements()
+	if(locate(object_path) in range(1, invoker))
+		to_chat(invoker, "<span class='danger'>Vitality matrices placed next to each other could interfere and cause a feedback loop! Move away from the other ones!</span>")
+		return FALSE
+	return ..()
+
 
 //Judicial Visor: Creates a judicial visor, which can smite an area.
 /datum/clockwork_scripture/create_object/judicial_visor

code/game/gamemodes/clock_cult/clock_structures/trap_triggers/pressure_sensor.dm

@@ -3,7 +3,7 @@
 	name = "pressure sensor"
 	desc = "A thin plate of brass, barely visible but clearly distinct."
 	clockwork_desc = "A trigger that will activate when a non-servant runs across it."
-	max_integrity = 25
+	max_integrity = 5
 	icon_state = "pressure_sensor"
 	alpha = 80
 	layer = LOW_ITEM_LAYER

code/game/gamemodes/clock_cult/clock_structures/traps/brass_skewer.dm

@@ -21,9 +21,10 @@
 	STOP_PROCESSING(SSfastprocess, src)
 	if(buckled_mobs && buckled_mobs.len)
 		var/mob/living/L = buckled_mobs[1]
-		L.Knockdown(100)
-		L.visible_message("<span class='warning'>[L] is maimed as the skewer shatters while still in their body!</span>")
-		L.adjustBruteLoss(15)
+		if(iscarbon(L))
+			L.Knockdown(100)
+			L.visible_message("<span class='warning'>[L] is maimed as the skewer shatters while still in their body!</span>")
+			L.adjustBruteLoss(15)
 		unbuckle_mob(L)
 	return ..()
 
@@ -48,14 +49,22 @@
 /obj/structure/destructible/clockwork/trap/brass_skewer/activate()
 	if(density)
 		return
-	var/mob/living/carbon/squirrel = locate() in get_turf(src)
+	var/mob/living/squirrel = locate() in get_turf(src)
 	if(squirrel)
-		squirrel.visible_message("<span class='boldwarning'>A massive brass spike erupts from the ground, impaling [squirrel]!</span>", \
-		"<span class='userdanger'>A massive brass spike rams through your chest, hoisting you into the air!</span>")
-		squirrel.emote("scream")
-		playsound(squirrel, 'sound/effects/splat.ogg', 50, TRUE)
-		playsound(squirrel, 'sound/misc/desceration-03.ogg', 50, TRUE)
-		squirrel.apply_damage(20, BRUTE, "chest")
+		if(iscyborg(squirrel))
+			if(!squirrel.stat)
+				squirrel.visible_message("<span class='boldwarning'>A massive brass spike erupts from the ground, rending [squirrel]'s chassis but shattering into pieces!</span>", \
+				"<span class='userdanger'>A massive brass spike rips through your chassis and bursts into shrapnel in your casing!</span>")
+				squirrel.adjustBruteLoss(50)
+				squirrel.Stun(20)
+				addtimer(CALLBACK(src, .proc/take_damage, max_integrity), 1)
+		else
+			squirrel.visible_message("<span class='boldwarning'>A massive brass spike erupts from the ground, impaling [squirrel]!</span>", \
+			"<span class='userdanger'>A massive brass spike rams through your chest, hoisting you into the air!</span>")
+			squirrel.emote("scream")
+			playsound(squirrel, 'sound/effects/splat.ogg', 50, TRUE)
+			playsound(squirrel, 'sound/misc/desceration-03.ogg', 50, TRUE)
+			squirrel.apply_damage(20, BRUTE, "chest")
 		mouse_opacity = MOUSE_OPACITY_OPAQUE //So players can interact with the tile it's on to pull them off
 		buckle_mob(squirrel, TRUE)
 	else

code/game/gamemodes/clock_cult/clock_structures/wall_gear.dm

@@ -59,9 +59,9 @@
 				brass_floor = TRUE
 			if(W.use(2 - brass_floor))
 				if(anchored)
-					T.ChangeTurf(/turf/closed/wall/clockwork)
+					T.PlaceOnTop(/turf/closed/wall/clockwork)
 				else
-					T.ChangeTurf(/turf/open/floor/clockwork)
+					T.PlaceOnTop(/turf/open/floor/clockwork)
 					new /obj/structure/falsewall/brass(T)
 				qdel(src)
 			else

code/game/gamemodes/devil/true_devil/_true_devil.dm

@@ -67,10 +67,7 @@
 	//Left hand items
 	for(var/obj/item/I in held_items)
 		if(!(I.flags_1 & ABSTRACT_1))
-			if(I.blood_DNA)
-				msg += "<span class='warning'>It is holding [icon2html(I, user)] [I.gender==PLURAL?"some":"a"] blood-stained [I.name] in its [get_held_index_name(get_held_index_of_item(I))]!</span>\n"
-			else
-				msg += "It is holding [icon2html(I, user)] \a [I] in its [get_held_index_name(get_held_index_of_item(I))].\n"
+			msg += "It is holding [I.get_examine_string(user)] in its [get_held_index_name(get_held_index_of_item(I))].\n"
 
 	//Braindead
 	if(!client && stat != DEAD)

code/game/gamemodes/miniantags/borer/borer_event.dm

@@ -27,7 +27,7 @@
 		if(QDELETED(temp_vent))
 			continue
 		if(temp_vent.loc.z == ZLEVEL_STATION_PRIMARY && !temp_vent.welded)
-			var/datum/pipeline/temp_vent_parent = temp_vent.PARENT1
+			var/datum/pipeline/temp_vent_parent = temp_vent.parents[1]
 			if(temp_vent_parent.other_atmosmch.len > 20)
 				vents += temp_vent
 

code/game/gamemodes/wizard/artefact.dm

@@ -213,7 +213,7 @@
 	righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
 	var/mob/living/carbon/human/target = null
 	var/list/mob/living/carbon/human/possible = list()
-	var/obj/item/linked_item = null
+	var/obj/item/voodoo_link = null
 	var/cooldown_time = 30 //3s
 	var/cooldown = 0
 	max_integrity = 10
@@ -237,10 +237,10 @@
 		cooldown = world.time +cooldown_time
 		return
 
-	if(!linked_item)
+	if(!voodoo_link)
 		if(I.loc == user && istype(I) && I.w_class <= WEIGHT_CLASS_SMALL)
 			if (user.transferItemToLoc(I,src))
-				linked_item = I
+				voodoo_link = I
 				to_chat(user, "You attach [I] to the doll.")
 				update_targets()
 
@@ -255,11 +255,11 @@
 		return
 
 	if(user.zone_selected == "chest")
-		if(linked_item)
+		if(voodoo_link)
 			target = null
-			linked_item.forceMove(drop_location())
-			to_chat(user, "<span class='notice'>You remove the [linked_item] from the doll.</span>")
-			linked_item = null
+			voodoo_link.forceMove(drop_location())
+			to_chat(user, "<span class='notice'>You remove the [voodoo_link] from the doll.</span>")
+			voodoo_link = null
 			update_targets()
 			return
 
@@ -291,10 +291,13 @@
 
 /obj/item/voodoo/proc/update_targets()
 	possible = list()
-	if(!linked_item)
+	if(!voodoo_link)
 		return
+	var/list/prints = voodoo_link.return_fingerprints()
+	if(!length(prints))
+		return FALSE
 	for(var/mob/living/carbon/human/H in GLOB.alive_mob_list)
-		if(md5(H.dna.uni_identity) in linked_item.fingerprints)
+		if(prints[md5(H.dna.uni_identity)])
 			possible |= H
 
 /obj/item/voodoo/proc/GiveHint(mob/victim,force=0)

code/game/machinery/autolathe.dm

@@ -149,8 +149,6 @@
 
 		if(href_list["make"])
 
-			var/turf/T = loc
-
 			/////////////////
 			//href protection
 			being_built = stored_research.isDesignResearchedID(href_list["make"])
@@ -174,34 +172,8 @@
 				use_power(power)
 				icon_state = "autolathe"
 				flick("autolathe_n",src)
-				if(is_stack)
-					spawn(32*coeff)
-						use_power(power)
-						var/list/materials_used = list(MAT_METAL=metal_cost*multiplier, MAT_GLASS=glass_cost*multiplier)
-						materials.use_amount(materials_used)
-
-						var/obj/item/stack/N = new being_built.build_path(T, multiplier)
-						N.update_icon()
-						N.autolathe_crafted(src)
-
-						for(var/obj/item/stack/S in T.contents - N)
-							if(istype(S, N.merge_type))
-								N.merge(S)
-						busy = FALSE
-						updateUsrDialog()
-
-				else
-					spawn(32*coeff*multiplier)
-						use_power(power)
-						var/list/materials_used = list(MAT_METAL=metal_cost*coeff*multiplier, MAT_GLASS=glass_cost*coeff*multiplier)
-						materials.use_amount(materials_used)
-						for(var/i=1, i<=multiplier, i++)
-							var/obj/item/new_item = new being_built.build_path(T)
-							for(var/mat in materials_used)
-								new_item.materials[mat] = materials_used[mat] / multiplier
-							new_item.autolathe_crafted(src)
-						busy = FALSE
-						updateUsrDialog()
+				var/time = is_stack ? 32 : 32*coeff*multiplier
+				addtimer(CALLBACK(src, .proc/make_item, power, metal_cost, glass_cost, multiplier, coeff, is_stack), time)
 
 		if(href_list["search"])
 			matching_designs.Cut()
@@ -218,6 +190,30 @@
 
 	return
 
+/obj/machinery/autolathe/proc/make_item(power, metal_cost, glass_cost, multiplier, coeff, is_stack)
+	GET_COMPONENT(materials, /datum/component/material_container)
+	var/atom/A = drop_location()
+	use_power(power)
+	var/list/materials_used = list(MAT_METAL=metal_cost*coeff*multiplier, MAT_GLASS=glass_cost*coeff*multiplier)
+	materials.use_amount(materials_used)
+
+	if(is_stack)
+		var/obj/item/stack/N = new being_built.build_path(A, multiplier)
+		N.update_icon()
+		N.autolathe_crafted(src)
+		for(var/obj/item/stack/S in (A.contents - N))
+			if(istype(S, N.merge_type))
+				N.merge(S)
+	else
+		for(var/i=1, i<=multiplier, i++)
+			var/obj/item/new_item = new being_built.build_path(A)
+			for(var/mat in materials_used)
+				new_item.materials[mat] = materials_used[mat] / multiplier
+			new_item.autolathe_crafted(src)
+
+	busy = FALSE
+	updateDialog()
+
 /obj/machinery/autolathe/RefreshParts()
 	var/T = 0
 	for(var/obj/item/stock_parts/matter_bin/MB in component_parts)

code/game/machinery/computer/arcade.dm

@@ -528,7 +528,7 @@
 							playsound(loc, 'sound/effects/bang.ogg', 100, 1)
 							var/turf/open/floor/F
 							for(F in orange(1, src))
-								F.ChangeTurf(F.baseturf)
+								F.ScrapeAway()
 							say("Something slams into the floor around [src], exposing it to space!")
 							if(hull)
 								sleep(10)

code/game/machinery/computer/buildandrepair.dm

@@ -121,7 +121,7 @@
 				to_chat(user, "<span class='notice'>You remove the glass panel.</span>")
 				state = 3
 				icon_state = "3"
-				var/obj/item/stack/sheet/glass/G = new (drop_location(), 2)
+				var/obj/item/stack/sheet/glass/G = new(drop_location(), 2)
 				G.add_fingerprint(user)
 				return
 			if(istype(P, /obj/item/screwdriver))

code/game/machinery/doors/airlock.dm

@@ -135,7 +135,7 @@
 				for(var/turf/closed/T in range(2, src))
 					here.ChangeTurf(T.type)
 					return INITIALIZE_HINT_QDEL
-				here.ChangeTurf(/turf/closed/wall)
+				here.PlaceOnTop(/turf/closed/wall)
 			if(9 to 11)
 				lights = FALSE
 				locked = TRUE

code/game/machinery/newscaster.dm

@@ -22,6 +22,7 @@ GLOBAL_LIST_EMPTY(allCasters)
 	var/creationTime
 	var/authorCensor
 	var/bodyCensor
+	var/photo_file
 
 /datum/newscaster/feed_message/proc/returnAuthor(censor)
 	if(censor == -1)
@@ -97,6 +98,7 @@ GLOBAL_LIST_EMPTY(allCasters)
 	var/scannedUser
 	var/isAdminMsg
 	var/icon/img
+	var/photo_file
 
 /datum/newscaster/feed_network
 	var/list/datum/newscaster/feed_channel/network_channels = list()
@@ -126,6 +128,7 @@ GLOBAL_LIST_EMPTY(allCasters)
 	if(photo)
 		newMsg.img = photo.img
 		newMsg.caption = photo.scribble
+		newMsg.photo_file = save_photo(photo.img)
 	for(var/datum/newscaster/feed_channel/FC in network_channels)
 		if(FC.channel_name == channel_name)
 			FC.messages += newMsg
@@ -143,6 +146,7 @@ GLOBAL_LIST_EMPTY(allCasters)
 	wanted_issue.isAdminMsg = adminMsg
 	if(photo)
 		wanted_issue.img = photo.img
+		wanted_issue.photo_file = save_photo(photo.img)
 	if(newMessage)
 		for(var/obj/machinery/newscaster/N in GLOB.allCasters)
 			N.newsAlert()
@@ -157,7 +161,12 @@ GLOBAL_LIST_EMPTY(allCasters)
 	for(var/obj/machinery/newscaster/NEWSCASTER in GLOB.allCasters)
 		NEWSCASTER.update_icon()
 
-
+/datum/newscaster/feed_network/proc/save_photo(icon/photo)
+	var/photo_file = copytext(md5("\icon[photo]"), 1, 6)
+	if(!fexists("[GLOB.log_directory]/photos/[photo_file].png"))
+		var/icon/p = icon(photo, frame = 1)
+		fcopy(p, "[GLOB.log_directory]/photos/[photo_file].png")
+	return photo_file
 
 /obj/item/wallframe/newscaster
 	name = "newscaster frame"

code/game/machinery/pipe/pipe_dispenser.dm

@@ -154,11 +154,8 @@
 				to_chat(usr, "<span class='warning'>There's not enough room to build that here!</span>")
 				qdel(C)
 				return
-
-
 			if(href_list["dir"])
 				C.setDir(text2num(href_list["dir"]))
-
 			C.add_fingerprint(usr)
 			C.update_icon()
 			wait = world.time + 15

code/game/machinery/suit_storage_unit.dm

@@ -236,8 +236,7 @@
 				visible_message("<span class='warning'>[src]'s door slides open, barraging you with the nauseating smell of charred flesh.</span>")
 			playsound(src, 'sound/machines/airlockclose.ogg', 25, 1)
 			for(var/obj/item/I in src) //Scorches away blood and forensic evidence, although the SSU itself is unaffected
-				I.clean_blood()
-				I.fingerprints = list()
+				I.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRONG)
 				var/datum/component/radioactive/contamination = I.GetComponent(/datum/component/radioactive)
 				if(contamination)
 					qdel(contamination)

code/game/machinery/vending.dm

@@ -684,10 +684,10 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
 	desc = "Uh oh!"
 
 /obj/machinery/vending/snack/random/Initialize()
-    ..()
-    var/T = pick(subtypesof(/obj/machinery/vending/snack) - /obj/machinery/vending/snack/random)
-    new T(get_turf(src))
-    return INITIALIZE_HINT_QDEL
+	..()
+	var/T = pick(subtypesof(/obj/machinery/vending/snack) - /obj/machinery/vending/snack/random)
+	new T(loc)
+	return INITIALIZE_HINT_QDEL
 
 /obj/machinery/vending/snack/blue
 	icon_state = "snackblue"
@@ -737,10 +737,10 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
 	desc = "Uh oh!"
 
 /obj/machinery/vending/cola/random/Initialize()
-    . = ..()
-    var/T = pick(subtypesof(/obj/machinery/vending/cola) - /obj/machinery/vending/cola/random)
-    new T(get_turf(src))
-    return INITIALIZE_HINT_QDEL
+	..()
+	var/T = pick(subtypesof(/obj/machinery/vending/cola) - /obj/machinery/vending/cola/random)
+	new T(loc)
+	return INITIALIZE_HINT_QDEL
 
 /obj/machinery/vending/cola/blue
 	icon_state = "Cola_Machine"

code/game/machinery/washing_machine.dm

@@ -12,6 +12,10 @@
 	var/obj/item/color_source
 	var/max_wash_capacity = 5
 
+/obj/machinery/washing_machine/ComponentInitialize()
+	. = ..()
+	AddComponent(/datum/component/redirect, list(COMSIG_COMPONENT_CLEAN_ACT), CALLBACK(src, .proc/clean_blood))
+
 /obj/machinery/washing_machine/examine(mob/user)
 	..()
 	to_chat(user, "<span class='notice'>Alt-click it to start a wash cycle.</span>")
@@ -36,20 +40,17 @@
 
 	busy = TRUE
 	update_icon()
-	sleep(200)
-	wash_cycle()
+	addtimer(CALLBACK(src, .proc/wash_cycle), 200)
 
-/obj/machinery/washing_machine/clean_blood()
-	..()
+/obj/machinery/washing_machine/proc/clean_blood()
 	if(!busy)
-		bloody_mess = 0
+		bloody_mess = FALSE
 		update_icon()
 
-
 /obj/machinery/washing_machine/proc/wash_cycle()
 	for(var/X in contents)
 		var/atom/movable/AM = X
-		AM.clean_blood()
+		AM.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
 		AM.machine_wash(src)
 
 	busy = FALSE

code/game/mecha/equipment/tools/work_tools.dm

@@ -222,14 +222,14 @@
 				occupant_message("Deconstructing [W]...")
 				if(do_after_cooldown(W))
 					chassis.spark_system.start()
-					W.ChangeTurf(/turf/open/floor/plating)
+					W.ScrapeAway()
 					playsound(W, 'sound/items/deconstruct.ogg', 50, 1)
 			else if(isfloorturf(target))
 				var/turf/open/floor/F = target
 				occupant_message("Deconstructing [F]...")
 				if(do_after_cooldown(target))
 					chassis.spark_system.start()
-					F.ChangeTurf(F.baseturf)
+					F.ScrapeAway()
 					playsound(F, 'sound/items/deconstruct.ogg', 50, 1)
 			else if (istype(target, /obj/machinery/door/airlock))
 				occupant_message("Deconstructing [target]...")
@@ -242,14 +242,14 @@
 				var/turf/open/space/S = target
 				occupant_message("Building Floor...")
 				if(do_after_cooldown(S))
-					S.ChangeTurf(/turf/open/floor/plating)
+					S.PlaceOnTop(/turf/open/floor/plating)
 					playsound(S, 'sound/items/deconstruct.ogg', 50, 1)
 					chassis.spark_system.start()
 			else if(isfloorturf(target))
 				var/turf/open/floor/F = target
 				occupant_message("Building Wall...")
 				if(do_after_cooldown(F))
-					F.ChangeTurf(/turf/closed/wall)
+					F.PlaceOnTop(/turf/closed/wall)
 					playsound(F, 'sound/items/deconstruct.ogg', 50, 1)
 					chassis.spark_system.start()
 		if(2)

code/game/mecha/mech_bay.dm

@@ -4,7 +4,7 @@
 	icon_state = "recharge_floor"                           //        Some people just want to watch the world burn i guess
 
 /turf/open/floor/mech_bay_recharge_floor/break_tile()
-	src.ChangeTurf(/turf/open/floor/plating)
+	ScrapeAway()
 
 /turf/open/floor/mech_bay_recharge_floor/airless
 	icon_state = "recharge_floor_asteroid"

code/game/objects/effects/decals/cleanable.dm

@@ -79,14 +79,11 @@
 				add_blood = bloodiness
 			bloodiness -= add_blood
 			S.bloody_shoes[blood_state] = min(MAX_SHOE_BLOODINESS,S.bloody_shoes[blood_state]+add_blood)
-			if(blood_DNA && blood_DNA.len)
-				S.add_blood(blood_DNA)
+			S.add_blood_DNA(return_blood_DNA())
 			S.blood_state = blood_state
 			update_icon()
 			H.update_inv_shoes()
 
-
-
 /obj/effect/decal/cleanable/proc/can_bloodcrawl_in()
 	if((blood_state != BLOOD_STATE_OIL) && (blood_state != BLOOD_STATE_NOT_BLOODY))
 		return bloodiness

code/game/objects/effects/decals/cleanable/aliens.dm

@@ -6,10 +6,13 @@
 	icon = 'icons/effects/blood.dmi'
 	icon_state = "xfloor1"
 	random_icon_states = list("xfloor1", "xfloor2", "xfloor3", "xfloor4", "xfloor5", "xfloor6", "xfloor7")
-	blood_DNA = list("UNKNOWN DNA" = "X*")
 	bloodiness = MAX_SHOE_BLOODINESS
 	blood_state = BLOOD_STATE_XENO
 
+/obj/effect/decal/cleanable/xenoblood/Initialize()
+	. = ..()
+	add_blood_DNA(list("UNKNOWN DNA" = "X*"))
+
 /obj/effect/decal/cleanable/xenoblood/xsplatter
 	random_icon_states = list("xgibbl1", "xgibbl2", "xgibbl3", "xgibbl4", "xgibbl5")
 
@@ -62,4 +65,7 @@
 /obj/effect/decal/cleanable/blood/xtracks
 	icon_state = "xtracks"
 	random_icon_states = null
-	blood_DNA = list("UNKNOWN DNA" = "X*")
+
+/obj/effect/decal/cleanable/blood/xtracks/Initialize()
+	. = ..()
+	add_blood_DNA(list("Unknown DNA" = "X*"))

code/game/objects/effects/decals/cleanable/humans.dm

@@ -4,13 +4,11 @@
 	icon = 'icons/effects/blood.dmi'
 	icon_state = "floor1"
 	random_icon_states = list("floor1", "floor2", "floor3", "floor4", "floor5", "floor6", "floor7")
-	blood_DNA = list()
 	blood_state = BLOOD_STATE_HUMAN
 	bloodiness = MAX_SHOE_BLOODINESS
 
 /obj/effect/decal/cleanable/blood/replace_decal(obj/effect/decal/cleanable/blood/C)
-	if (C.blood_DNA)
-		blood_DNA |= C.blood_DNA.Copy()
+	add_blood_DNA(C.return_blood_DNA())
 	..()
 
 /obj/effect/decal/cleanable/blood/old
@@ -21,7 +19,7 @@
 /obj/effect/decal/cleanable/blood/old/Initialize(mapload, list/datum/disease/diseases)
 	. = ..()
 	icon_state += "-old" //This IS necessary because the parent /blood type uses icon randomization.
-	blood_DNA["Non-human DNA"] = "A+"
+	add_blood_DNA(list("Non-human DNA" = "A+"))
 
 /obj/effect/decal/cleanable/blood/splatter
 	random_icon_states = list("gibbl1", "gibbl2", "gibbl3", "gibbl4", "gibbl5")
@@ -37,11 +35,9 @@
 	desc = "Your instincts say you shouldn't be following these."
 	random_icon_states = null
 	var/list/existing_dirs = list()
-	blood_DNA = list()
 
 /obj/effect/decal/cleanable/trail_holder/can_bloodcrawl_in()
-	return 1
-
+	return TRUE
 
 /obj/effect/decal/cleanable/blood/gibs
 	name = "gibs"
@@ -100,8 +96,7 @@
 	. = ..()
 	setDir(pick(1,2,4,8))
 	icon_state += "-old"
-	blood_DNA["Non-human DNA"] = "A+"
-
+	add_blood_DNA(list("Non-human DNA" = "A+"))
 
 /obj/effect/decal/cleanable/blood/drip
 	name = "drips of blood"
@@ -111,9 +106,8 @@
 	bloodiness = 0
 	var/drips = 1
 
-
 /obj/effect/decal/cleanable/blood/drip/can_bloodcrawl_in()
-	return 1
+	return TRUE
 
 
 //BLOODY FOOTPRINTS
@@ -151,7 +145,7 @@
 			if (!(exited_dirs & H.dir))
 				exited_dirs |= H.dir
 				update_icon()
-			
+
 
 /obj/effect/decal/cleanable/blood/footprints/update_icon()
 	cut_overlays()

code/game/objects/effects/effect_system/effects_foam.dm

@@ -76,7 +76,7 @@
 	if(metal)
 		var/turf/T = get_turf(src)
 		if(isspaceturf(T)) //Block up any exposed space
-			T.ChangeTurf(/turf/open/floor/plating/foam)
+			T.PlaceOnTop(/turf/open/floor/plating/foam)
 		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!

code/game/objects/effects/spawners/gibspawner.dm

@@ -30,9 +30,9 @@
 					digester.stomach_contents += gib
 
 				if(MobDNA)
-					gib.blood_DNA[MobDNA.unique_enzymes] = MobDNA.blood_type
+
 				else if(istype(src, /obj/effect/gibspawner/generic)) // Probably a monkey
-					gib.blood_DNA["Non-human DNA"] = "A+"
+					gib.add_blood_DNA(list("Non-human DNA" = "A+"))
 				var/list/directions = gibdirections[i]
 				if(isturf(loc))
 					if(directions.len)

code/game/objects/effects/spawners/lootdrop.dm

@@ -5,19 +5,29 @@
 	var/lootcount = 1		//how many items will be spawned
 	var/lootdoubles = TRUE	//if the same item can be spawned twice
 	var/list/loot			//a list of possible items to spawn e.g. list(/obj/item, /obj/structure, /obj/effect)
+	var/fan_out_items = FALSE //Whether the items should be distributed to offsets 0,3,-3,6,-6,9,-9.. This overrides pixel_x/y on the spawner itself
 
 /obj/effect/spawner/lootdrop/Initialize(mapload)
 	..()
 	if(loot && loot.len)
 		var/turf/T = get_turf(src)
-		while(lootcount && loot.len)
+		var/loot_spawned = 0
+		while((lootcount-loot_spawned) && loot.len)
 			var/lootspawn = pickweight(loot)
 			if(!lootdoubles)
 				loot.Remove(lootspawn)
 
 			if(lootspawn)
-				new lootspawn(T)
-			lootcount--
+				var/atom/movable/spawned_loot = new lootspawn(T)
+				if (!fan_out_items)
+					if (pixel_x != 0)
+						spawned_loot.pixel_x = pixel_x
+					if (pixel_y != 0)
+						spawned_loot.pixel_y = pixel_y
+				else
+					if (loot_spawned)
+						spawned_loot.pixel_x = spawned_loot.pixel_y = ((!(loot_spawned%2)*loot_spawned/2)*-3)+((loot_spawned%2)*(loot_spawned+1)/2*3)
+			loot_spawned++
 	return INITIALIZE_HINT_QDEL
 
 /obj/effect/spawner/lootdrop/armory_contraband

code/game/objects/effects/spawners/vaultspawner.dm

@@ -20,9 +20,9 @@
 		for(var/j = lowBoundY,j<=hiBoundY,j++)
 			var/turf/T = locate(i,j,z)
 			if(i == lowBoundX || i == hiBoundX || j == lowBoundY || j == hiBoundY)
-				T.ChangeTurf(/turf/closed/wall/vault)
+				T.PlaceOnTop(/turf/closed/wall/vault)
 			else
-				T.ChangeTurf(/turf/open/floor/vault)
+				T.PlaceOnTop(/turf/open/floor/vault)
 			T.icon_state = "[type]vault"
 
 	qdel(src)

code/game/objects/effects/spiders.dm

@@ -133,7 +133,7 @@
 	else if(entry_vent)
 		if(get_dist(src, entry_vent) <= 1)
 			var/list/vents = list()
-			var/datum/pipeline/entry_vent_parent = entry_vent.PARENT1
+			var/datum/pipeline/entry_vent_parent = entry_vent.parents[1]
 			for(var/obj/machinery/atmospherics/components/unary/vent_pump/temp_vent in entry_vent_parent.other_atmosmch)
 				vents.Add(temp_vent)
 			if(!vents.len)

code/game/objects/items.dm

@@ -553,20 +553,6 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
 			if(M.become_blind())
 				to_chat(M, "<span class='danger'>You go blind!</span>")
 
-/obj/item/clean_blood()
-	. = ..()
-	if(.)
-		if(initial(icon) && initial(icon_state))
-			var/index = blood_splatter_index()
-			var/icon/blood_splatter_icon = GLOB.blood_splatter_icons[index]
-			if(blood_splatter_icon)
-				cut_overlay(blood_splatter_icon)
-
-/obj/item/clothing/gloves/clean_blood()
-	. = ..()
-	if(.)
-		transfer_blood = 0
-
 /obj/item/singularity_pull(S, current_size)
 	..()
 	if(current_size >= STAGE_FOUR)

code/game/objects/items/clown_items.dm

@@ -86,7 +86,7 @@
 			var/obj/effect/decal/cleanable/C = locate() in target
 			qdel(C)
 			target.remove_atom_colour(WASHABLE_COLOUR_PRIORITY)
-			target.clean_blood()
+			target.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
 			target.wash_cream()
 	return
 

code/game/objects/items/devices/flashlight.dm

@@ -493,7 +493,7 @@
 	color = null
 
 /obj/item/device/flashlight/glowstick/random/Initialize()
-	. = ..()
+	..()
 	var/T = pick(typesof(/obj/item/device/flashlight/glowstick) - /obj/item/device/flashlight/glowstick/random)
 	new T(loc)
 	return INITIALIZE_HINT_QDEL

code/game/objects/items/devices/radio/intercom.dm

@@ -139,8 +139,8 @@
 		else
 			icon_state = initial(icon_state)
 
-/obj/item/device/radio/intercom/add_blood(list/blood_dna)
-	return 0
+/obj/item/device/radio/intercom/add_blood_DNA(list/blood_dna)
+	return FALSE
 
 //Created through the autolathe or through deconstructing intercoms. Can be applied to wall to make a new intercom on it!
 /obj/item/wallframe/intercom