Merge branch 'master' into upstream-merge-29647

2017-08-19 12:25:49 -05:00
parent 3e96c59bb7 9da30ff9f3
commit 46e7d7a9c4
517 changed files with 6381 additions and 3806 deletions
@@ -1,6 +1,3 @@
-[Feature Freeze!]: # We are currently not considering any balance or antagonist oriented pull requests. Full details, as well as ways to bypass this freeze, are available here https://github.com/tgstation/tgstation/pull/28223
-
-
 [Changelogs]: # (Please make a changelog if you're adding, removing or changing content that'll affect players. This includes, but is not limited to, new features, sprites, sounds; balance changes; map edits and important fixes)
 []: # (See here for how to easily make a changelog: https://github.com/tgstation/tgstation/wiki/Changelogs. An example changelog has been provided below. Please edit or remove)

@@ -1,5 +1,6 @@
 language: generic
 sudo: false
+dist: precise

 env:
    global:
@@ -0,0 +1,15 @@
+diff a/SQL/database_changelog.txt b/SQL/database_changelog.txt	(rejected hunks)
+@@ -1,10 +1,10 @@
+ Any time you make a change to the schema files, remember to increment the database schema version. Generally increment the minor number, major should be reserved for significant changes to the schema. Both values go up to 255.
+ 
+-The latest database version is 3.1; The query to update the schema revision table is:
+The latest database version is 3.0; The query to update the schema revision table is:
+ 
+-UPDATE `schema_revision` SET major = 3, minor = 1 LIMIT 1;
+INSERT INTO `schema_revision` (`major`, `minor`) VALUES (3, 0);
+ or
+-UPDATE `SS13_schema_revision` SET major = 3, minor = 1 LIMIT 1;
+INSERT INTO `SS13_schema_revision` (`major`, `minor`) VALUES (3, 0);
+ 
+ ----------------------------------------------------
+ 
@@ -460,7 +460,7 @@
 /area/ruin/powered/beach)
 "cz" = (
 /obj/effect/turf_decal/sand,
-/obj/effect/baseturf_helper,
+/obj/effect/baseturf_helper/lava_land/surface,
 /turf/open/floor/plating/beach/sand,
 /area/ruin/powered/beach)
 "cR" = (
@@ -896,7 +896,7 @@
 /area/ruin/powered/clownplanet)
 "dR" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/effect/baseturf_helper,
+/obj/effect/baseturf_helper/lava_land/surface,
 /turf/open/indestructible/sound{
 	icon_state = "bananium";
 	name = "bananium floor";
@@ -809,7 +809,7 @@
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/lavaland/surface/outdoors)
 "cF" = (
-/obj/effect/baseturf_helper,
+/obj/effect/baseturf_helper/lava_land/surface,
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ruin/powered/animal_hospital)

@@ -1071,7 +1071,7 @@
 /area/ruin/unpowered/ash_walkers)
 "cE" = (
 /obj/structure/stone_tile/surrounding/cracked,
-/obj/effect/baseturf_helper,
+/obj/effect/baseturf_helper/lava_land/surface,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/ruin/unpowered/ash_walkers)
 "cF" = (
@@ -275,7 +275,7 @@
 	},
 /area/ruin/powered/snow_biodome)
 "bS" = (
-/obj/effect/baseturf_helper,
+/obj/effect/baseturf_helper/lava_land/surface,
 /turf/open/floor/plating/asteroid/snow{
 	initial_gas_mix = "o2=22;n2=82;TEMP=180"
 	},
@@ -163,7 +163,7 @@
 /turf/open/floor/plasteel/cult{
 	initial_gas_mix = "o2=14;n2=23;TEMP=300"
 	},
-/obj/effect/baseturf_helper,
+/obj/effect/baseturf_helper/lava_land/surface,
 /turf/closed/wall/mineral/cult,
 /area/ruin/unpowered)

@@ -104,7 +104,7 @@
 /turf/open/floor/plating,
 /area/ruin/unpowered)
 "r" = (
-/obj/effect/baseturf_helper,
+/obj/effect/baseturf_helper/lava_land/surface,
 /turf/closed/wall/rust,
 /area/ruin/unpowered)

@@ -29,7 +29,7 @@
 /turf/open/floor/engine/cult,
 /area/ruin/unpowered)
 "i" = (
-/obj/effect/baseturf_helper,
+/obj/effect/baseturf_helper/lava_land/surface,
 /turf/open/floor/engine/cult,
 /area/ruin/unpowered)

@@ -85,7 +85,7 @@
 /turf/open/floor/plasteel/freezer,
 /area/ruin/powered/gluttony)
 "D" = (
-/obj/effect/baseturf_helper,
+/obj/effect/baseturf_helper/lava_land/surface,
 /turf/open/floor/plasteel/freezer,
 /area/ruin/powered/gluttony)
 "R" = (
@@ -285,7 +285,7 @@
 /turf/open/floor/plating,
 /area/ruin/powered/golem_ship)
 "Y" = (
-/obj/effect/baseturf_helper,
+/obj/effect/baseturf_helper/lava_land/surface,
 /turf/open/floor/mineral/titanium/purple,
 /area/ruin/powered/golem_ship)

@@ -123,7 +123,7 @@
 /turf/open/floor/engine/cult,
 /area/ruin/powered/greed)
 "z" = (
-/obj/effect/baseturf_helper,
+/obj/effect/baseturf_helper/lava_land/surface,
 /turf/open/floor/engine/cult,
 /area/ruin/powered/greed)
 "J" = (
@@ -180,7 +180,7 @@
 	},
 /area/ruin/powered)
 "L" = (
-/obj/effect/baseturf_helper,
+/obj/effect/baseturf_helper/lava_land/surface,
 /turf/open/floor/plating/asteroid/basalt,
 /area/ruin/powered)

@@ -342,7 +342,7 @@
 /area/ruin/unpowered)
 "S" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/effect/baseturf_helper,
+/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"
@@ -65,7 +65,7 @@
 /turf/open/floor/mineral/silver,
 /area/ruin/powered/pride)
 "u" = (
-/obj/effect/baseturf_helper,
+/obj/effect/baseturf_helper/lava_land/surface,
 /turf/open/floor/mineral/silver,
 /area/ruin/powered/pride)
 "G" = (
@@ -262,7 +262,7 @@
 /turf/open/floor/plasteel/freezer,
 /area/ruin/powered/seedvault)
 "Z" = (
-/obj/effect/baseturf_helper,
+/obj/effect/baseturf_helper/lava_land/surface,
 /turf/closed/wall/r_wall,
 /area/ruin/powered/seedvault)

@@ -42,7 +42,7 @@
 	},
 /area/ruin/unpowered)
 "h" = (
-/obj/effect/baseturf_helper,
+/obj/effect/baseturf_helper/lava_land/surface,
 /turf/open/floor/sepia{
 	blocks_air = 0;
 	slowdown = 10
@@ -169,7 +169,7 @@
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/lavaland/surface/outdoors)
 "B" = (
-/obj/effect/baseturf_helper,
+/obj/effect/baseturf_helper/lava_land/surface,
 /turf/closed/wall/mineral/titanium/survival/pod,
 /area/ruin/powered)

@@ -22,7 +22,7 @@
 /turf/open/floor/mineral/plastitanium,
 /area/ruin/unpowered)
 "g" = (
-/obj/effect/baseturf_helper,
+/obj/effect/baseturf_helper/lava_land/surface,
 /turf/closed/wall/mineral/plastitanium,
 /area/ruin/unpowered)

@@ -1285,7 +1285,7 @@
 	},
 /area/ruin/powered/syndicate_lava_base)
 "dd" = (
-/obj/effect/baseturf_helper,
+/obj/effect/baseturf_helper/lava_land/surface,
 /turf/open/floor/plasteel/vault{
 	dir = 5
 	},
@@ -105,7 +105,7 @@
 "s" = (
 /obj/structure/table/optable/abductor,
 /obj/item/weapon/cautery/alien,
-/obj/effect/baseturf_helper,
+/obj/effect/baseturf_helper/lava_land/surface,
 /turf/open/floor/plating/abductor{
 	initial_gas_mix = "o2=16;n2=23;TEMP=300"
 	},
@@ -269,7 +269,7 @@
 "W" = (
 /obj/structure/alien/weeds,
 /obj/structure/alien/resin/wall,
-/obj/effect/baseturf_helper,
+/obj/effect/baseturf_helper/lava_land/surface,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/ruin/xenonest)

@@ -0,0 +1,10 @@
+diff a/_maps/RandomRuins/LavaRuins/lavaland_surface_xeno_nest.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_xeno_nest.dmm	(rejected hunks)
+@@ -269,7 +269,7 @@
+ "W" = (
+ /obj/structure/alien/weeds,
+ /obj/structure/alien/resin/wall,
+-/obj/effect/baseturf_helper,
+/obj/effect/baseturf_helper/lava_land/surface,
+ /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
+ /area/ruin/unpowered/xenonest)
+ 
@@ -1817,7 +1817,7 @@
 /area/awaymission/centcomAway/courtroom)
 "fT" = (
 /obj/machinery/door/airlock/centcom{
-	name = "Centcom Security";
+	name = "CentCom Security";
 	opacity = 1;
 	req_access_txt = "101"
 	},
@@ -1932,7 +1932,7 @@
 /area/awaymission/centcomAway/courtroom)
 "gk" = (
 /obj/machinery/door/airlock/centcom{
-	name = "Centcom Security";
+	name = "CentCom Security";
 	opacity = 1;
 	req_access_txt = "101"
 	},
@@ -3830,7 +3830,7 @@
 /area/awaymission/centcomAway/thunderdome)
 "lO" = (
 /obj/machinery/door/airlock/centcom{
-	name = "Centcom Security";
+	name = "CentCom Security";
 	opacity = 1;
 	req_access_txt = "101"
 	},
@@ -4170,7 +4170,7 @@
 /area/awaymission/centcomAway/general)
 "mP" = (
 /obj/machinery/door/airlock/centcom{
-	name = "Centcom Security";
+	name = "CentCom Security";
 	opacity = 1;
 	req_access_txt = "101"
 	},
@@ -1,4 +1,4 @@
-#include "map_files\generic\Centcomm.dmm"
+#include "map_files\generic\CentCom.dmm"
 #include "map_files\generic\SpaceStation.dmm"
 #include "map_files\generic\Space.dmm"
 #include "map_files\generic\SpaceDock.dmm"
@@ -60788,9 +60788,6 @@
 /turf/open/floor/plasteel,
 /area/science/robotics/lab)
 "cHY" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 4
-	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
@@ -7457,9 +7457,6 @@
 /turf/open/floor/plating,
 /area/maintenance/port/fore)
 "aqr" = (
-/turf/open/floor/plating{
-	icon_state = "panelscorched"
-	},
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
@@ -68726,12 +68723,12 @@
 /obj/item/weapon/folder/blue,
 /obj/item/clothing/under/rank/centcom_commander{
 	desc = "A replica of a jumpsuit worn by the highest ranking commanders under Nanotrasen's central command.";
-	name = "Replica Centcom officer's jumpsuit"
+	name = "Replica CentCom officer's jumpsuit"
 	},
 /obj/item/clothing/head/centhat{
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0);
 	desc = "A replica hat of a Central Commander's attire. It has a small tag on it saying, 'It's good to be emperor.'";
-	name = "Replica Centcom hat"
+	name = "Replica CentCom hat"
 	},
 /obj/machinery/computer/security/telescreen/entertainment{
 	pixel_x = -32
@@ -112682,9 +112679,6 @@
 /turf/open/floor/plating,
 /area/engine/atmospherics_engine)
 "ept" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 4
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
 	},
@@ -79832,12 +79832,12 @@
 "cVT" = (
 /obj/structure/closet/wardrobe/mixed,
 /obj/item/clothing/under/rank/centcom_officer{
-	desc = "A badge on the arm indicates that it's meant to be worn by Centcom recovery teams. This one seems dusty and clearly hasn't been cleaned in some time.";
-	name = "\improper dusty old Centcom jumpsuit"
+	desc = "A badge on the arm indicates that it's meant to be worn by CentCom recovery teams. This one seems dusty and clearly hasn't been cleaned in some time.";
+	name = "\improper dusty old CentCom jumpsuit"
 	},
 /obj/item/clothing/under/rank/centcom_commander{
-	desc = "A badge on the arm indicates that it's meant to be worn by Centcom recovery teams. This one seems dusty and clearly hasn't been cleaned in some time.";
-	name = "\improper dusty old Centcom jumpsuit"
+	desc = "A badge on the arm indicates that it's meant to be worn by CentCom recovery teams. This one seems dusty and clearly hasn't been cleaned in some time.";
+	name = "\improper dusty old CentCom jumpsuit"
 	},
 /obj/effect/decal/cleanable/dirt{
 	desc = "A thin layer of dust coating the floor.";
@@ -1,4 +1,4 @@
-//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE 
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
 "aa" = (
 /turf/closed/indestructible/riveted/boss,
 /area/lavaland/surface/outdoors)
@@ -1241,6 +1241,7 @@
 	d2 = 4;
 	icon_state = "1-4"
 	},
+/obj/effect/baseturf_helper/lava_land/surface,
 /turf/open/floor/circuit,
 /area/mine/maintenance)
 "dy" = (
@@ -3399,17 +3400,27 @@
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/lavaland/surface/outdoors)
 "Wt" = (
-/obj/effect/baseturf_helper,
+/obj/effect/baseturf_helper/lava_land/surface,
 /turf/closed/wall,
 /area/mine/laborcamp/security)
 "Wu" = (
-/obj/effect/baseturf_helper,
+/obj/effect/baseturf_helper/lava_land/surface,
 /turf/closed/wall,
 /area/mine/laborcamp)
 "Ww" = (
-/obj/effect/baseturf_helper,
+/obj/effect/baseturf_helper/lava_land/surface,
 /turf/open/floor/plasteel,
 /area/mine/living_quarters)
+"Wx" = (
+/obj/effect/baseturf_helper/lava_land/surface,
+/turf/open/floor/plasteel/brown{
+	dir = 4
+	},
+/area/mine/eva)
+"Wy" = (
+/obj/effect/baseturf_helper/lava_land/surface,
+/turf/open/floor/plasteel,
+/area/mine/production)

 (1,1,1) = {"
 aa
@@ -19057,7 +19068,7 @@ cI
 cP
 cn
 bP
-bP
+Wy
 bP
 bP
 eD
@@ -19570,7 +19581,7 @@ bf
 cK
 bq
 bq
-dt
+br
 bq
 dV
 el
@@ -20335,7 +20346,7 @@ bf
 bp
 bu
 bI
-bW
+Wx
 cr
 bf
 ad
@@ -5039,7 +5039,6 @@
 	name = "Detective Privacy Blast door"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/open/floor/plating,
 /area/security/detectives_office)
 "aix" = (
@@ -32004,7 +32003,6 @@
 "bcM" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plasteel/vault{
 	dir = 5
 	},
@@ -1037,6 +1037,7 @@
 	icon_state = "1-8"
 	},
 /obj/machinery/turretid{
+	control_area = "AI Chamber";
 	name = "AI Chamber turret control";
 	pixel_x = 5;
 	pixel_y = -24
@@ -1055,7 +1056,8 @@
 /area/wreck/ai)
 "acs" = (
 /obj/machinery/turretid{
-	name = "AI Chamber turret control";
+	control_area = "AI Satellite Antechamber";
+	name = "AI Satellite turret control";
 	pixel_x = -5;
 	pixel_y = -24
 	},
@@ -1777,10 +1779,12 @@
 /turf/open/floor/plating,
 /area/ai_monitored/turret_protected/AIsatextAP)
 "aeg" = (
-/obj/structure/lattice,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/space,
-/area/ai_monitored/turret_protected/AIsatextAP)
+/obj/machinery/porta_turret/ai{
+	installation = /obj/item/weapon/gun/energy/e_gun
+	},
+/turf/open/floor/plating/airless,
+/area/ai_monitored/turret_protected/aisat_interior)
 "aeh" = (
 /obj/structure/window/reinforced/fulltile,
 /turf/open/floor/plating,
@@ -1794,10 +1798,12 @@
 /turf/open/floor/plasteel/black,
 /area/ai_monitored/turret_protected/aisat_interior)
 "aej" = (
-/obj/structure/lattice,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/space,
-/area/ai_monitored/turret_protected/AIsatextAS)
+/obj/machinery/porta_turret/ai{
+	installation = /obj/item/weapon/gun/energy/e_gun
+	},
+/turf/open/floor/plating/airless,
+/area/ai_monitored/turret_protected/aisat_interior)
 "aek" = (
 /obj/structure/window/reinforced/fulltile,
 /turf/open/floor/plating,
@@ -47042,7 +47048,6 @@
 	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/open/floor/plasteel/black,
 /area/engine/engine_smes)
 "bYi" = (
@@ -49670,7 +49675,7 @@
 /turf/open/floor/plating,
 /area/maintenance/department/engine)
 "cdF" = (
-/obj/structure/closet/secure_closet/miner,
+/obj/structure/closet/secure_closet/miner/unlocked,
 /turf/open/floor/plating,
 /area/shuttle/auxillary_base)
 "cdG" = (
@@ -53682,6 +53687,39 @@
 	dir = 4
 	},
 /area/science/research/lobby)
+"cnC" = (
+/obj/machinery/turretid{
+	control_area = "AI Satellite Antechamber";
+	name = "AI Satellite turret control";
+	pixel_x = -5;
+	pixel_y = -24
+	},
+/turf/open/floor/plasteel/darkblue/side{
+	dir = 8
+	},
+/area/ai_monitored/turret_protected/aisat_interior)
+"cnD" = (
+/turf/open/space/basic,
+/area/ai_monitored/turret_protected/AIsatextAP)
+"cnE" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/structure/lattice,
+/turf/open/space/basic,
+/area/ai_monitored/turret_protected/AIsatextAP)
+"cnF" = (
+/turf/open/space/basic,
+/area/ai_monitored/turret_protected/AIsatextAP)
+"cnG" = (
+/turf/open/space/basic,
+/area/ai_monitored/turret_protected/AIsatextAS)
+"cnH" = (
+/obj/structure/lattice,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/space/basic,
+/area/ai_monitored/turret_protected/AIsatextAS)
+"cnI" = (
+/turf/open/space/basic,
+/area/ai_monitored/turret_protected/AIsatextAS)

 (1,1,1) = {"
 aaa
@@ -71585,7 +71623,7 @@ bWV
 bWV
 bWV
 bWV
-ccI
+cbR
 bWV
 bWV
 ceP
@@ -84314,7 +84352,7 @@ aaa
 aaa
 aaa
 aaa
-aaa
+aby
 aby
 aby
 aby
@@ -84557,7 +84595,6 @@ aaa
 aaa
 aaa
 aaa
-aaa
 aby
 aby
 aby
@@ -84581,6 +84618,7 @@ aaa
 abI
 aaa
 aaa
+aaa
 acP
 acP
 acP
@@ -84816,7 +84854,6 @@ aaa
 aaa
 aaa
 aaa
-aaa
 abI
 aaa
 aaa
@@ -84838,6 +84875,7 @@ adS
 adS
 adS
 adS
+adS
 aeJ
 aeY
 aft
@@ -85071,7 +85109,6 @@ aaa
 aaa
 aaa
 aaa
-aaa
 aby
 aaa
 abO
@@ -85094,6 +85131,7 @@ adH
 adT
 aee
 aee
+aee
 aev
 adv
 aeZ
@@ -85328,7 +85366,6 @@ aaa
 aaa
 aaa
 aaa
-aaa
 aby
 abI
 abO
@@ -85351,6 +85388,7 @@ adI
 adU
 aef
 aef
+aef
 aew
 aeK
 afa
@@ -85585,7 +85623,6 @@ aaa
 aaa
 aaa
 aaa
-aaa
 aby
 aaa
 abO
@@ -85607,6 +85644,7 @@ adu
 adJ
 adV
 adV
+cnD
 adV
 adV
 aeL
@@ -85842,7 +85880,6 @@ aaa
 aaa
 aaa
 aaa
-aaa
 aby
 aaa
 abO
@@ -85864,6 +85901,7 @@ adv
 adK
 adW
 aeg
+cnE
 aeg
 aex
 aeM
@@ -86099,7 +86137,6 @@ aaa
 aaa
 aaa
 aaa
-aaa
 aby
 aaa
 abO
@@ -86121,6 +86158,7 @@ adw
 adL
 adV
 adV
+cnF
 adV
 adV
 aeN
@@ -86356,7 +86394,6 @@ aaa
 aaa
 aaa
 aaa
-aaa
 aby
 aaa
 abO
@@ -86379,12 +86416,13 @@ adL
 adX
 aeh
 aeh
+aeh
 adX
 aeN
 afe
 afx
 afx
-afx
+cnC
 adX
 adX
 adX
@@ -86613,7 +86651,6 @@ aaa
 aaa
 aaa
 aaa
-aaa
 aby
 abJ
 abO
@@ -86636,6 +86673,7 @@ adM
 adY
 aei
 aei
+aei
 aey
 aeO
 aff
@@ -86870,7 +86908,6 @@ aaa
 aaa
 aaa
 aaa
-aaa
 aby
 aaa
 abO
@@ -86893,6 +86930,7 @@ adL
 adX
 aeh
 aeh
+aeh
 adX
 aeN
 afg
@@ -87127,7 +87165,6 @@ aaa
 aaa
 aaa
 aaa
-aaa
 aby
 aaa
 abO
@@ -87149,6 +87186,7 @@ adA
 adL
 adZ
 adZ
+cnG
 adZ
 adZ
 aeP
@@ -87384,7 +87422,6 @@ aaa
 aaa
 aaa
 aaa
-aaa
 aby
 aaa
 abO
@@ -87406,6 +87443,7 @@ adB
 adN
 aea
 aej
+cnH
 aej
 aez
 aeQ
@@ -87641,7 +87679,6 @@ aaa
 aaa
 aaa
 aaa
-aaa
 aby
 aaa
 abO
@@ -87663,6 +87700,7 @@ adC
 adO
 adZ
 adZ
+cnI
 adZ
 adZ
 aeR
@@ -87898,7 +87936,6 @@ aaa
 aaa
 aaa
 aaa
-aaa
 aby
 abI
 abO
@@ -87921,6 +87958,7 @@ adP
 aeb
 aek
 aek
+aek
 aeA
 adF
 afk
@@ -88155,7 +88193,6 @@ aaa
 aaa
 aaa
 aaa
-aaa
 aby
 aaa
 abO
@@ -88178,6 +88215,7 @@ adQ
 aec
 ael
 ael
+ael
 aeB
 aeS
 afl
@@ -88414,7 +88452,6 @@ aaa
 aaa
 aaa
 aaa
-aaa
 abI
 aaa
 aaa
@@ -88437,6 +88474,7 @@ acU
 acU
 acU
 acU
+acU
 afm
 afB
 afT
@@ -88669,7 +88707,6 @@ aaa
 aaa
 aaa
 aaa
-aaa
 aby
 aby
 aby
@@ -88693,6 +88730,7 @@ aaa
 abI
 aaa
 aaa
+aaa
 acU
 acU
 acU
@@ -88939,7 +88977,6 @@ aaa
 aaa
 aaa
 aaa
-aaa
 acO
 aby
 aby
@@ -88949,6 +88986,7 @@ aby
 aby
 aby
 aby
+aby
 aaa
 abI
 aaa
@@ -2922,7 +2922,7 @@
 /area/centcom/prison)
 "iG" = (
 /turf/closed/indestructible/fakedoor{
-	name = "Centcom Cell"
+	name = "CentCom Cell"
 	},
 /area/centcom/prison)
 "iH" = (
@@ -2957,7 +2957,7 @@
 /area/centcom/supply)
 "iL" = (
 /turf/closed/indestructible/fakedoor{
-	name = "Centcom Warehouse"
+	name = "CentCom Warehouse"
 	},
 /area/centcom/supply)
 "iM" = (
@@ -3063,7 +3063,7 @@
 "jc" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/centcom{
-	name = "Centcom";
+	name = "CentCom";
 	opacity = 1;
 	req_access_txt = "0"
 	},
@@ -3326,7 +3326,7 @@
 	dwidth = 5;
 	height = 7;
 	id = "supply_away";
-	name = "Centcom";
+	name = "CentCom";
 	width = 12
 	},
 /turf/open/space,
@@ -3817,7 +3817,7 @@
 /area/centcom/supply)
 "kM" = (
 /turf/closed/indestructible/fakedoor{
-	name = "Centcom"
+	name = "CentCom"
 	},
 /area/centcom/control)
 "kN" = (
@@ -3866,7 +3866,7 @@
 /area/centcom/control)
 "kT" = (
 /obj/machinery/door/airlock/centcom{
-	name = "Centcom Security";
+	name = "CentCom Security";
 	opacity = 1;
 	req_access_txt = "101"
 	},
@@ -3880,7 +3880,7 @@
 	base_state = "rightsecure";
 	dir = 2;
 	icon_state = "leftsecure";
-	name = "Centcom Stand";
+	name = "CentCom Stand";
 	req_access_txt = "109"
 	},
 /obj/machinery/light{
@@ -3917,7 +3917,7 @@
 	base_state = "rightsecure";
 	dir = 2;
 	icon_state = "leftsecure";
-	name = "Centcom Stand";
+	name = "CentCom Stand";
 	req_access_txt = "109"
 	},
 /turf/open/floor/plasteel/grimy,
@@ -3936,7 +3936,7 @@
 	base_state = "rightsecure";
 	dir = 2;
 	icon_state = "leftsecure";
-	name = "Centcom Stand";
+	name = "CentCom Stand";
 	req_access_txt = "109"
 	},
 /obj/machinery/light{
@@ -3960,7 +3960,7 @@
 /area/centcom/supply)
 "lc" = (
 /obj/machinery/door/airlock/centcom{
-	name = "Centcom Supply";
+	name = "CentCom Supply";
 	req_access_txt = "106"
 	},
 /obj/effect/turf_decal/stripes/line{
@@ -4157,7 +4157,7 @@
 /area/centcom/control)
 "lB" = (
 /obj/machinery/door/airlock/centcom{
-	name = "Centcom Security";
+	name = "CentCom Security";
 	opacity = 1;
 	req_access_txt = "101"
 	},
@@ -4752,7 +4752,7 @@
 	base_state = "rightsecure";
 	dir = 2;
 	icon_state = "leftsecure";
-	name = "Centcom Stand";
+	name = "CentCom Stand";
 	req_access_txt = "109"
 	},
 /obj/machinery/firealarm{
@@ -4768,7 +4768,7 @@
 	base_state = "rightsecure";
 	dir = 2;
 	icon_state = "leftsecure";
-	name = "Centcom Stand";
+	name = "CentCom Stand";
 	req_access_txt = "109"
 	},
 /obj/machinery/firealarm{
@@ -5237,7 +5237,7 @@
 /obj/structure/table/reinforced,
 /obj/machinery/door/firedoor,
 /obj/machinery/door/window/brigdoor{
-	name = "Centcom Customs";
+	name = "CentCom Customs";
 	icon_state = "rightsecure";
 	dir = 4;
 	req_access_txt = "109";
@@ -5767,7 +5767,7 @@
 /area/centcom/ferry)
 "pu" = (
 /obj/machinery/door/airlock/centcom{
-	name = "Centcom Security";
+	name = "CentCom Security";
 	opacity = 1;
 	req_access_txt = "101"
 	},
@@ -5778,7 +5778,7 @@
 /area/centcom/supply)
 "pv" = (
 /obj/machinery/door/airlock/centcom{
-	name = "Centcom";
+	name = "CentCom";
 	opacity = 1;
 	req_access_txt = "0"
 	},
@@ -6455,7 +6455,7 @@
 /area/centcom/control)
 "qQ" = (
 /obj/machinery/door/airlock/centcom{
-	name = "Centcom Security";
+	name = "CentCom Security";
 	opacity = 1;
 	req_access_txt = "101"
 	},
@@ -6652,7 +6652,7 @@
 /area/centcom/ferry)
 "rw" = (
 /obj/machinery/door/airlock/centcom{
-	name = "Centcom Supply";
+	name = "CentCom Supply";
 	req_access_txt = "106"
 	},
 /obj/effect/turf_decal/stripes/line{
@@ -6906,7 +6906,7 @@
 "rW" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/centcom{
-	name = "Centcom";
+	name = "CentCom";
 	opacity = 1;
 	req_access_txt = "0"
 	},
@@ -7324,7 +7324,7 @@
 	base_state = "rightsecure";
 	dir = 1;
 	icon_state = "rightsecure";
-	name = "Centcom Customs";
+	name = "CentCom Customs";
 	req_access_txt = "109"
 	},
 /obj/machinery/door/window,
@@ -7352,7 +7352,7 @@
 	dwidth = 25;
 	height = 50;
 	id = "emergency_away";
-	name = "Centcom Emergency Shuttle Dock";
+	name = "CentCom Emergency Shuttle Dock";
 	width = 50
 	},
 /turf/open/space,
@@ -7733,7 +7733,7 @@
 "tZ" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/centcom{
-	name = "Centcom Security";
+	name = "CentCom Security";
 	opacity = 1;
 	req_access_txt = "101"
 	},
@@ -7787,7 +7787,7 @@
 /area/centcom/ferry)
 "ug" = (
 /obj/machinery/door/airlock/centcom{
-	name = "Centcom Customs";
+	name = "CentCom Customs";
 	opacity = 1;
 	req_access_txt = "109"
 	},
@@ -7928,7 +7928,7 @@
 	dwidth = 2;
 	height = 13;
 	id = "ferry_away";
-	name = "Centcom Ferry Dock";
+	name = "CentCom Ferry Dock";
 	width = 5
 	},
 /turf/open/space,
@@ -9168,7 +9168,7 @@
 	base_state = "rightsecure";
 	dir = 1;
 	icon_state = "rightsecure";
-	name = "Centcom Customs";
+	name = "CentCom Customs";
 	req_access_txt = "109"
 	},
 /obj/effect/turf_decal/bot,
@@ -9192,7 +9192,7 @@
 	base_state = "rightsecure";
 	dir = 1;
 	icon_state = "rightsecure";
-	name = "Centcom Customs";
+	name = "CentCom Customs";
 	req_access_txt = "109"
 	},
 /obj/effect/turf_decal/bot,
@@ -9759,7 +9759,7 @@
 /obj/item/weapon/folder/red,
 /obj/item/weapon/pen/red,
 /obj/machinery/door/window/brigdoor{
-	name = "Centcom Customs";
+	name = "CentCom Customs";
 	icon_state = "rightsecure";
 	dir = 4;
 	req_access_txt = "109";
@@ -9774,7 +9774,7 @@
 /obj/item/weapon/folder/white,
 /obj/item/weapon/pen/blue,
 /obj/machinery/door/window/brigdoor{
-	name = "Centcom Customs";
+	name = "CentCom Customs";
 	icon_state = "rightsecure";
 	dir = 8;
 	req_access_txt = "109";
@@ -10061,7 +10061,7 @@
 /area/tdome/tdomeobserve)
 "zT" = (
 /obj/machinery/door/airlock/centcom{
-	name = "Centcom Security";
+	name = "CentCom Security";
 	opacity = 1;
 	req_access_txt = "101"
 	},
@@ -13647,7 +13647,7 @@
 /area/centcom/evac)
 "Mb" = (
 /obj/machinery/door/airlock/centcom{
-	name = "Centcom Security";
+	name = "CentCom Security";
 	opacity = 1;
 	req_access_txt = "101"
 	},
@@ -13658,7 +13658,7 @@
 /area/centcom/evac)
 "Mc" = (
 /turf/closed/indestructible/fakedoor{
-	name = "Centcom"
+	name = "CentCom"
 	},
 /area/centcom/evac)
 "Md" = (
@@ -1,7 +1,7 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
 "aa" = (
 /turf/open/space,
-/obj/machinery/porta_turret/centcomm_shuttle{
+/obj/machinery/porta_turret/centcom_shuttle{
 	dir = 9
 	},
 /turf/closed/wall/mineral/plastitanium{
@@ -623,7 +623,7 @@
 /obj/docking_port/mobile/emergency{
 	dwidth = 14;
 	height = 18;
-	name = "Centcomm Raven Battlecruiser";
+	name = "CentCom Raven Battlecruiser";
 	timid = 1;
 	width = 32
 	},
@@ -980,7 +980,7 @@
 /area/shuttle/escape)
 "cr" = (
 /turf/open/space,
-/obj/machinery/porta_turret/centcomm_shuttle{
+/obj/machinery/porta_turret/centcom_shuttle{
 	dir = 5
 	},
 /turf/closed/wall/mineral/plastitanium{
@@ -1006,7 +1006,7 @@
 /area/shuttle/escape)
 "cw" = (
 /turf/open/space,
-/obj/machinery/porta_turret/centcomm_shuttle{
+/obj/machinery/porta_turret/centcom_shuttle{
 	dir = 5
 	},
 /turf/closed/wall/mineral/plastitanium{
@@ -1108,7 +1108,7 @@
 /area/shuttle/escape)
 "cR" = (
 /turf/open/space,
-/obj/machinery/porta_turret/centcomm_shuttle{
+/obj/machinery/porta_turret/centcom_shuttle{
 	dir = 5
 	},
 /turf/closed/wall/mineral/plastitanium{
@@ -1311,7 +1311,7 @@
 /area/shuttle/escape)
 "dQ" = (
 /turf/open/space,
-/obj/machinery/porta_turret/centcomm_shuttle{
+/obj/machinery/porta_turret/centcom_shuttle{
 	dir = 5
 	},
 /turf/closed/wall/mineral/plastitanium{
@@ -1333,7 +1333,7 @@
 /area/shuttle/escape)
 "dV" = (
 /turf/open/space,
-/obj/machinery/porta_turret/centcomm_shuttle{
+/obj/machinery/porta_turret/centcom_shuttle{
 	dir = 5
 	},
 /turf/closed/wall/mineral/plastitanium{
@@ -1379,7 +1379,7 @@
 /area/shuttle/escape)
 "ei" = (
 /turf/open/space,
-/obj/machinery/porta_turret/centcomm_shuttle{
+/obj/machinery/porta_turret/centcom_shuttle{
 	dir = 10
 	},
 /turf/closed/wall/mineral/plastitanium{
@@ -1400,7 +1400,7 @@
 /area/shuttle/escape)
 "en" = (
 /turf/open/space,
-/obj/machinery/porta_turret/centcomm_shuttle{
+/obj/machinery/porta_turret/centcom_shuttle{
 	dir = 6
 	},
 /turf/closed/wall/mineral/plastitanium{
@@ -1461,7 +1461,7 @@
 /area/shuttle/escape)
 "eA" = (
 /turf/open/space,
-/obj/machinery/porta_turret/centcomm_shuttle{
+/obj/machinery/porta_turret/centcom_shuttle{
 	dir = 5
 	},
 /turf/closed/wall/mineral/plastitanium{
@@ -131,12 +131,12 @@
 "aq" = (
 /obj/structure/closet/wardrobe/mixed,
 /obj/item/clothing/under/rank/centcom_officer{
-	desc = "A badge on the arm indicates that it's meant to be worn by Centcom recovery teams. This one seems dusty and clearly hasn't been cleaned in some time.";
-	name = "\improper dusty old Centcom jumpsuit"
+	desc = "A badge on the arm indicates that it's meant to be worn by CentCom recovery teams. This one seems dusty and clearly hasn't been cleaned in some time.";
+	name = "\improper dusty old CentCom jumpsuit"
 	},
 /obj/item/clothing/under/rank/centcom_commander{
-	desc = "A badge on the arm indicates that it's meant to be worn by Centcom recovery teams. This one seems dusty and clearly hasn't been cleaned in some time.";
-	name = "\improper dusty old Centcom jumpsuit"
+	desc = "A badge on the arm indicates that it's meant to be worn by CentCom recovery teams. This one seems dusty and clearly hasn't been cleaned in some time.";
+	name = "\improper dusty old CentCom jumpsuit"
 	},
 /obj/effect/decal/cleanable/dirt{
 	desc = "A thin layer of dust coating the floor.";
@@ -76,7 +76,7 @@
 #define ACCESS_CENT_STORAGE 106//Generic storage areas.
 #define ACCESS_CENT_TELEPORTER 107//Teleporter.
 #define ACCESS_CENT_CAPTAIN 109//Captain's office/ID comp/AI.
-#define ACCESS_CENT_BAR 110 // The non-existent Centcom Bar
+#define ACCESS_CENT_BAR 110 // The non-existent CentCom Bar

 	//The Syndicate
 #define ACCESS_SYNDICATE 150//General Syndicate Access
@@ -93,4 +93,9 @@
 #define ACCESS_AWAY_GENERIC1 205//Away generic access
 #define ACCESS_AWAY_GENERIC2 206
 #define ACCESS_AWAY_GENERIC3 207
-#define ACCESS_AWAY_GENERIC4 208
+#define ACCESS_AWAY_GENERIC4 208
+
+	//Special, for anything that's basically internal
+#define ACCESS_BLOODCULT 250
+#define ACCESS_CLOCKCULT 251
+
@@ -50,7 +50,7 @@
 #define ADMIN_SM(user) "(<a href='?_src_=holder;subtlemessage=\ref[user]'>SM</a>)"
 #define ADMIN_TP(user) "(<a href='?_src_=holder;traitor=\ref[user]'>TP</a>)"
 #define ADMIN_KICK(user) "(<a href='?_src_=holder;boot2=\ref[user]'>KICK</a>)"
-#define ADMIN_CENTCOM_REPLY(user) "(<a href='?_src_=holder;CentcommReply=\ref[user]'>RPLY</a>)"
+#define ADMIN_CENTCOM_REPLY(user) "(<a href='?_src_=holder;CentComReply=\ref[user]'>RPLY</a>)"
 #define ADMIN_SYNDICATE_REPLY(user) "(<a href='?_src_=holder;SyndicateReply=\ref[user]'>RPLY</a>)"
 #define ADMIN_SC(user) "(<a href='?_src_=holder;adminspawncookie=\ref[user]'>SC</a>)"
 #define ADMIN_SMITE(user) "(<a href='?_src_=holder;adminsmite=\ref[user]'>SMITE</a>)"
@@ -7,6 +7,7 @@

 GLOBAL_VAR_INIT(clockwork_construction_value, 0) //The total value of all structures built by the clockwork cult
 GLOBAL_VAR_INIT(clockwork_caches, 0) //How many clockwork caches exist in the world (not each individual)
+GLOBAL_VAR_INIT(clockwork_vitality, 0) //How much Vitality is stored, total
 GLOBAL_LIST_EMPTY(active_daemons) //A list of all active tinkerer's daemons
 GLOBAL_LIST_EMPTY(all_clockwork_objects) //All clockwork items, structures, and effects in existence
 GLOBAL_LIST_EMPTY(all_clockwork_mobs) //All clockwork SERVANTS (not creatures) in existence
@@ -1,15 +1,16 @@
 //Investigate logging defines
-#define INVESTIGATE_ATMOS			"atmos"
-#define INVESTIGATE_BOTANY			"botany"
-#define INVESTIGATE_CARGO			"cargo"
-#define INVESTIGATE_EXPERIMENTOR	"experimentor"
-#define INVESTIGATE_GRAVITY			"gravity"
-#define INVESTIGATE_RECORDS			"records"
-#define INVESTIGATE_SINGULO			"singulo"
-#define INVESTIGATE_SUPERMATTER		"supermatter"
-#define INVESTIGATE_TELESCI			"telesci"
-#define INVESTIGATE_WIRES			"wires"
+#define INVESTIGATE_ATMOS	         "atmos"
+#define INVESTIGATE_BOTANY 	         "botany"
+#define INVESTIGATE_CARGO 	         "cargo"
+#define INVESTIGATE_EXPERIMENTOR 	 "experimentor"
+#define INVESTIGATE_GRAVITY 	     "gravity"
+#define INVESTIGATE_RECORDS 	     "records"
+#define INVESTIGATE_SINGULO          "singulo"
+#define INVESTIGATE_SUPERMATTER      "supermatter"
+#define INVESTIGATE_TELESCI          "telesci"
+#define INVESTIGATE_WIRES            "wires"
 #define INVESTIGATE_PORTAL			"portals"
+#define INVESTIGATE_HALLUCINATIONS   "hallucinations"

 //Individual logging defines
 #define INDIVIDUAL_ATTACK_LOG   "Attack log"
@@ -0,0 +1,9 @@
+diff a/code/__DEFINES/logging.dm b/code/__DEFINES/logging.dm	(rejected hunks)
+@@ -9,6 +9,7 @@
+ #define INVESTIGATE_SUPERMATTER      "supermatter"
+ #define INVESTIGATE_TELESCI          "telesci"
+ #define INVESTIGATE_WIRES            "wires"
+#define INVESTIGATE_HALLUCINATIONS   "hallucinations"
+ 
+ //Individual logging defines
+ #define INDIVIDUAL_ATTACK_LOG   "Attack log"
@@ -5,7 +5,7 @@ Names of z-level do not matter, but order does greatly, for instances such as ch

 current as of 2016/6/2
 z1 = station
-z2 = centcomm
+z2 = centcom
 z5 = mining
 Everything else = randomized space
 Last space-z level = empty
@@ -16,7 +16,7 @@ Last space-z level = empty
 #define UNAFFECTED 0

 #define MAIN_STATION "Main Station"
-#define CENTCOMM "CentComm"
+#define CENTCOM "CentCom"
 #define EMPTY_AREA_1 "Empty Area 1"
 #define EMPTY_AREA_2 "Empty Area 2"
 #define MINING "Mining Asteroid"
@@ -8,7 +8,7 @@
 //You can use these defines to get the typepath of the currently running proc/verb (yes procs + verbs are objects)
 /* eg:
 /mob/living/carbon/human/death()
-	world << THIS_PROC_TYPE_STR //You can only output the string versions
+	to_chat(world, THIS_PROC_TYPE_STR) //You can only output the string versions
 Will print: "/mob/living/carbon/human/death" (you can optionally embed it in a string with () (eg: the _WITH_ARGS defines) to make it look nicer)
 */
 #define THIS_PROC_TYPE .....
@@ -46,8 +46,8 @@ Will print: "/mob/living/carbon/human/death" (you can optionally embed it in a s
 //Human Overlays Indexes/////////
 //citadel code
 #define MUTATIONS_LAYER			30		//mutations. Tk headglows, cold resistance glow, etc
-#define BODY_BEHIND_LAYER		29		//certain mutantrace features (tail when looking south) that must appear behind the body parts
-#define GENITALS_BEHIND_LAYER	28
+#define GENITALS_BEHIND_LAYER	29		//Some genitalia needs to be behind everything, such as with taurs (Taurs use body_behind_layer
+#define BODY_BEHIND_LAYER		28		//certain mutantrace features (tail when looking south) that must appear behind the body parts
 #define BODYPARTS_LAYER			27		//Initially "AUGMENTS", this was repurposed to be a catch-all bodyparts flag
 #define BODY_ADJ_LAYER			26		//certain mutantrace features (snout, body markings) that must appear above the body parts
 #define GENITALS_ADJ_LAYER		25
@@ -350,6 +350,7 @@ GLOBAL_LIST_INIT(ghost_others_options, list(GHOST_OTHERS_SIMPLE, GHOST_OTHERS_DE

 //debug printing macros
 #define debug_world(msg) if (GLOB.Debug2) to_chat(world, "DEBUG: [msg]")
+#define debug_usr(msg) if (GLOB.Debug2&&usr) to_chat(usr, "DEBUG: [msg]")
 #define debug_admins(msg) if (GLOB.Debug2) to_chat(GLOB.admins, "DEBUG: [msg]")
 #define debug_world_log(msg) if (GLOB.Debug2) log_world("DEBUG: [msg]")

@@ -4,6 +4,9 @@

 #define IRC_STATUS_THROTTLE 5

+#define PR_ANNOUNCEMENTS_PER_ROUND 5 //The number of unique PR announcements allowed per round
+									//This makes sure that a single person can only spam 3 reopens and 3 closes before being ignored
+
 //keep these in sync with TGS3
 #define SERVICE_WORLD_PARAM "server_service"
 #define SERVICE_PR_TEST_JSON "..\\..\\prtestjob.json"
@@ -17,7 +20,7 @@
 #define SERVICE_CMD_NAME_CHECK "namecheck"
 #define SERVICE_CMD_ADMIN_WHO "adminwho"

-//#define SERVICE_CMD_PARAM_KEY //defined in __compile_options.dm
+#define SERVICE_CMD_PARAM_KEY "serviceCommsKey"
 #define SERVICE_CMD_PARAM_COMMAND "command"
 #define SERVICE_CMD_PARAM_MESSAGE "message"
 #define SERVICE_CMD_PARAM_TARGET "target"
@@ -22,7 +22,7 @@
 #define SHUTTLE_ALREADY_DOCKED "we_are_already_docked"
 #define SHUTTLE_SOMEONE_ELSE_DOCKED "someone_else_docked"

-//Launching Shuttles to Centcomm
+//Launching Shuttles to CentCom
 #define NOLAUNCH -1
 #define UNLAUNCHED 0
 #define ENDGAME_LAUNCHED 1
@@ -91,16 +91,23 @@
 //returns a new list with only atoms that are in typecache L
 /proc/typecache_filter_list(list/atoms, list/typecache)
 	. = list()
-	for (var/thing in atoms)
+	for(var/thing in atoms)
 		var/atom/A = thing
 		if (typecache[A.type])
 			. += A

 /proc/typecache_filter_list_reverse(list/atoms, list/typecache)
 	. = list()
-	for (var/thing in atoms)
+	for(var/thing in atoms)
 		var/atom/A = thing
-		if (!typecache[A.type])
+		if(!typecache[A.type])
+			. += A
+
+/proc/typecache_filter_multi_list_exclusion(list/atoms, list/typecache_include, list/typecache_exclude)
+	. = list()
+	for(var/thing in atoms)
+		var/atom/A = thing
+		if(typecache_include[A.type] && !typecache_exclude[A.type])
 			. += A

 //Like typesof() or subtypesof(), but returns a typecache instead of a list
@@ -177,7 +184,11 @@
 		result = first ^ second
 	return result

-//Pretends to pick an element based on its weight but really just seems to pick a random element.
+//Picks a random element from a list based on a weighting system:
+//1. Adds up the total of weights for each element
+//2. Gets a number between 1 and that total
+//3. For each element in the list, subtracts its weighting from that number
+//4. If that makes the number 0 or less, return that element.
 /proc/pickweight(list/L)
 	var/total = 0
 	var/item
@@ -309,7 +320,7 @@
 	return r

 // Returns the key based on the index
-#define KEYBYINDEX(L, index) (((index <= L:len) && (index > 0)) ? L[index] : null)
+#define KEYBYINDEX(L, index) (((index <= length(L)) && (index > 0)) ? L[index] : null)

 /proc/count_by_type(list/L, type)
 	var/i = 0
@@ -457,7 +468,7 @@
 		. |= key_list[key]

 //Picks from the list, with some safeties, and returns the "default" arg if it fails
-#define DEFAULTPICK(L, default) ((islist(L) && L:len) ? pick(L) : default)
+#define DEFAULTPICK(L, default) ((islist(L) && length(L)) ? pick(L) : default)
 #define LAZYINITLIST(L) if (!L) L = list()
 #define UNSETEMPTY(L) if (L && !L.len) L = null
 #define LAZYREMOVE(L, I) if(L) { L -= I; if(!L.len) { L = null; } }
@@ -1,3 +1,10 @@
+//wrapper macros for easier grepping
+#define DIRECT_OUTPUT(A, B) A << B
+#define SEND_IMAGE(target, image) DIRECT_OUTPUT(target, image)
+#define SEND_SOUND(target, sound) DIRECT_OUTPUT(target, sound)
+#define SEND_TEXT(target, text) DIRECT_OUTPUT(target, text)
+#define WRITE_FILE(file, text) DIRECT_OUTPUT(file, text)
+
 //print a warning message to world.log
 #define WARNING(MSG) warning("[MSG] in [__FILE__] at line [__LINE__] src: [src] usr: [usr].")
 /proc/warning(msg)
@@ -20,13 +27,13 @@
 /proc/log_admin(text)
 	GLOB.admin_log.Add(text)
 	if (config.log_admin)
-		GLOB.world_game_log << "\[[time_stamp()]]ADMIN: [text]"
+		WRITE_FILE(GLOB.world_game_log, "\[[time_stamp()]]ADMIN: [text]")

 //Items using this proc are stripped from public logs - use with caution
 /proc/log_admin_private(text)
 	GLOB.admin_log.Add(text)
 	if (config.log_admin)
-		GLOB.world_game_log << "\[[time_stamp()]]ADMINPRIVATE: [text]"
+		WRITE_FILE(GLOB.world_game_log, "\[[time_stamp()]]ADMINPRIVATE: [text]")

 /proc/log_adminsay(text)
 	if (config.log_adminchat)
@@ -38,65 +45,65 @@

 /proc/log_game(text)
 	if (config.log_game)
-		GLOB.world_game_log << "\[[time_stamp()]]GAME: [text]"
+		WRITE_FILE(GLOB.world_game_log, "\[[time_stamp()]]GAME: [text]")

 /proc/log_vote(text)
 	if (config.log_vote)
-		GLOB.world_game_log << "\[[time_stamp()]]VOTE: [text]"
+		WRITE_FILE(GLOB.world_game_log, "\[[time_stamp()]]VOTE: [text]")

 /proc/log_access(text)
 	if (config.log_access)
-		GLOB.world_game_log << "\[[time_stamp()]]ACCESS: [text]"
+		WRITE_FILE(GLOB.world_game_log, "\[[time_stamp()]]ACCESS: [text]")

 /proc/log_say(text)
 	if (config.log_say)
-		GLOB.world_game_log << "\[[time_stamp()]]SAY: [text]"
+		WRITE_FILE(GLOB.world_game_log, "\[[time_stamp()]]SAY: [text]")

 /proc/log_prayer(text)
 	if (config.log_prayer)
-		GLOB.world_game_log << "\[[time_stamp()]]PRAY: [text]"
+		WRITE_FILE(GLOB.world_game_log, "\[[time_stamp()]]PRAY: [text]")

 /proc/log_law(text)
 	if (config.log_law)
-		GLOB.world_game_log << "\[[time_stamp()]]LAW: [text]"
+		WRITE_FILE(GLOB.world_game_log, "\[[time_stamp()]]LAW: [text]")

 /proc/log_ooc(text)
 	if (config.log_ooc)
-		GLOB.world_game_log << "\[[time_stamp()]]OOC: [text]"
+		WRITE_FILE(GLOB.world_game_log, "\[[time_stamp()]]OOC: [text]")

 /proc/log_whisper(text)
 	if (config.log_whisper)
-		GLOB.world_game_log << "\[[time_stamp()]]WHISPER: [text]"
+		WRITE_FILE(GLOB.world_game_log, "\[[time_stamp()]]WHISPER: [text]")

 /proc/log_emote(text)
 	if (config.log_emote)
-		GLOB.world_game_log << "\[[time_stamp()]]EMOTE: [text]"
+		WRITE_FILE(GLOB.world_game_log, "\[[time_stamp()]]EMOTE: [text]")

 /proc/log_attack(text)
 	if (config.log_attack)
-		GLOB.world_attack_log << "\[[time_stamp()]]ATTACK: [text]"
+		WRITE_FILE(GLOB.world_attack_log, "\[[time_stamp()]]ATTACK: [text]")

 /proc/log_pda(text)
 	if (config.log_pda)
-		GLOB.world_game_log << "\[[time_stamp()]]PDA: [text]"
+		WRITE_FILE(GLOB.world_game_log, "\[[time_stamp()]]PDA: [text]")

 /proc/log_comment(text)
 	if (config.log_pda)
 		//reusing the PDA option because I really don't think news comments are worth a config option
-		GLOB.world_game_log << "\[[time_stamp()]]COMMENT: [text]"
+		WRITE_FILE(GLOB.world_game_log, "\[[time_stamp()]]COMMENT: [text]")

 /proc/log_chat(text)
 	if (config.log_pda)
-		GLOB.world_game_log << "\[[time_stamp()]]CHAT: [text]"
+		WRITE_FILE(GLOB.world_game_log, "\[[time_stamp()]]CHAT: [text]")

 /proc/log_sql(text)
 	if(config.sql_enabled)
-		GLOB.world_game_log << "\[[time_stamp()]]SQL: [text]"
+		WRITE_FILE(GLOB.world_game_log, "\[[time_stamp()]]SQL: [text]")

 //This replaces world.log so it displays both in DD and the file
 /proc/log_world(text)
-	GLOB.world_runtime_log << text
-	world.log << text
+	WRITE_FILE(GLOB.world_runtime_log, text)
+	SEND_TEXT(world.log, text)

 // Helper procs for building detailed log lines

@@ -418,7 +418,7 @@
 /proc/showCandidatePollWindow(mob/M, poll_time, Question, list/candidates, ignore_category, time_passed, flashwindow = TRUE)
 	set waitfor = 0

-	M << 'sound/misc/notice2.ogg' //Alerting them to their consideration
+	SEND_SOUND(M, 'sound/misc/notice2.ogg') //Alerting them to their consideration
 	if(flashwindow)
 		window_flash(M.client)
 	switch(ignore_category ? askuser(M,Question,"Please answer in [poll_time/10] seconds!","Yes","No","Never for this round", StealFocus=0, Timeout=poll_time) : askuser(M,Question,"Please answer in [poll_time/10] seconds!","Yes","No", StealFocus=0, Timeout=poll_time))
@@ -426,7 +426,7 @@
 			to_chat(M, "<span class='notice'>Choice registered: Yes.</span>")
 			if(time_passed + poll_time <= world.time)
 				to_chat(M, "<span class='danger'>Sorry, you answered too late to be considered!</span>")
-				M << 'sound/machines/buzz-sigh.ogg'
+				SEND_SOUND(M, 'sound/machines/buzz-sigh.ogg')
 				candidates -= M
 			else
 				candidates += M
@@ -48,6 +48,11 @@
 	init_sprite_accessory_subtypes(/datum/sprite_accessory/xeno_dorsal, GLOB.xeno_dorsal_list)
 	//genitals
 	init_sprite_accessory_subtypes(/datum/sprite_accessory/penis, GLOB.cock_shapes_list)
+
+	for(var/K in GLOB.cock_shapes_list)
+		var/datum/sprite_accessory/penis/value = GLOB.cock_shapes_list[K]
+		GLOB.cock_shapes_icons[K] = value.icon_state
+
 	init_sprite_accessory_subtypes(/datum/sprite_accessory/vagina, GLOB.vagina_shapes_list)
 	init_sprite_accessory_subtypes(/datum/sprite_accessory/breasts, GLOB.breasts_shapes_list)
 	GLOB.breasts_size_list = list("a","b","c","d","e") //We need the list to choose from initialized, but it's no longer a sprite_accessory thing.
@@ -167,7 +167,7 @@ mob

 		Output_Icon()
 			set name = "2. Output Icon"
-			to_chat(src, "Icon is: [bicon(getFlatIcon(src))]")
+			to_chat(src, "Icon is: [icon2base64html(getFlatIcon(src))]")

 		Label_Icon()
 			set name = "3. Label Icon"
@@ -712,7 +712,8 @@ The _flatIcons list is a cache for generated icon files.
 			if(!current)
 				curIndex++ //Try the next layer
 				continue
-			currentLayer = current:layer
+			var/image/I = current
+			currentLayer = I.layer
 			if(currentLayer<0) // Special case for FLY_LAYER
 				if(currentLayer <= -1000) return flat
 				if(pSet == 0) // Underlay
@@ -747,22 +748,22 @@ The _flatIcons list is a cache for generated icon files.
 		// Dimensions of overlay being added
 	var/{addX1;addX2;addY1;addY2}

-	for(var/I in layers)
-
-		if(I:alpha == 0)
+	for(var/V in layers)
+		var/image/I = V
+		if(I.alpha == 0)
 			continue

 		if(I == copy) // 'I' is an /image based on the object being flattened.
 			curblend = BLEND_OVERLAY
-			add = icon(I:icon, I:icon_state, I:dir)
+			add = icon(I.icon, I.icon_state, I.dir)
 		else // 'I' is an appearance object.
 			add = getFlatIcon(new/image(I), curdir, curicon, curstate, curblend)

 		// Find the new dimensions of the flat icon to fit the added overlay
-		addX1 = min(flatX1, I:pixel_x+1)
-		addX2 = max(flatX2, I:pixel_x+add.Width())
-		addY1 = min(flatY1, I:pixel_y+1)
-		addY2 = max(flatY2, I:pixel_y+add.Height())
+		addX1 = min(flatX1, I.pixel_x+1)
+		addX2 = max(flatX2, I.pixel_x+add.Width())
+		addY1 = min(flatY1, I.pixel_y+1)
+		addY2 = max(flatY2, I.pixel_y+add.Height())

 		if(addX1!=flatX1 || addX2!=flatX2 || addY1!=flatY1 || addY2!=flatY2)
 			// Resize the flattened icon so the new icon fits
@@ -771,7 +772,7 @@ The _flatIcons list is a cache for generated icon files.
 			flatY1=addY1;flatY2=addY2

 		// Blend the overlay into the flattened icon
-		flat.Blend(add, blendMode2iconMode(curblend), I:pixel_x + 2 - flatX1, I:pixel_y + 2 - flatY1)
+		flat.Blend(add, blendMode2iconMode(curblend), I.pixel_x + 2 - flatX1, I.pixel_y + 2 - flatY1)

 	if(A.color)
 		flat.Blend(A.color, ICON_MULTIPLY)
@@ -782,10 +783,11 @@ The _flatIcons list is a cache for generated icon files.

 /proc/getIconMask(atom/A)//By yours truly. Creates a dynamic mask for a mob/whatever. /N
 	var/icon/alpha_mask = new(A.icon,A.icon_state)//So we want the default icon and icon state of A.
-	for(var/I in A.overlays)//For every image in overlays. var/image/I will not work, don't try it.
-		if(I:layer>A.layer)
+	for(var/V in A.overlays)//For every image in overlays. var/image/I will not work, don't try it.
+		var/image/I = V
+		if(I.layer>A.layer)
 			continue//If layer is greater than what we need, skip it.
-		var/icon/image_overlay = new(I:icon,I:icon_state)//Blend only works with icon objects.
+		var/icon/image_overlay = new(I.icon,I.icon_state)//Blend only works with icon objects.
 		//Also, icons cannot directly set icon_state. Slower than changing variables but whatever.
 		alpha_mask.Blend(image_overlay,ICON_OR)//OR so they are lumped together in a nice overlay.
 	return alpha_mask//And now return the mask.
@@ -968,32 +970,135 @@ GLOBAL_LIST_EMPTY(friendly_animal_types)
 /image/proc/setDir(newdir)
 	dir = newdir

-/atom/proc/freeze_icon_index()
-	return "\ref[initial(icon)]-[initial(icon_state)]"
+#define FROZEN_RED_COLOR "#2E5E69"
+#define FROZEN_GREEN_COLOR "#60A2A8"
+#define FROZEN_BLUE_COLOR "#A1AFB1"

 /obj/proc/make_frozen_visual()
 	// Used to make the frozen item visuals for Freon.
-	var/static/list/freeze_item_icons = list()
 	if(resistance_flags & FREEZE_PROOF)
 		return
-	if(!HAS_SECONDARY_FLAG(src, FROZEN) && (initial(icon) && initial(icon_state)))
-		var/index = freeze_icon_index()
-		var/icon/IC
-		var/icon/P = freeze_item_icons[index]
-		if(!P)
-			P = new /icon
-			for(var/iconstate in icon_states(icon))
-				var/icon/O = new('icons/effects/freeze.dmi', "ice_cube")
-				IC = new(icon, iconstate)
-				O.Blend(IC, ICON_ADD)
-				P.Insert(O, iconstate)
-			freeze_item_icons[index] = P
-		icon = P
+	if(!HAS_SECONDARY_FLAG(src, FROZEN))
 		name = "frozen [name]"
+		add_atom_colour(list(FROZEN_RED_COLOR, FROZEN_GREEN_COLOR, FROZEN_BLUE_COLOR, rgb(0,0,0)), TEMPORARY_COLOUR_PRIORITY)
+		alpha -= 25
 		SET_SECONDARY_FLAG(src, FROZEN)

 //Assumes already frozed
 /obj/proc/make_unfrozen()
-	icon = initial(icon)
-	name = replacetext(name, "frozen ", "")
-	CLEAR_SECONDARY_FLAG(src, FROZEN)
+	if(HAS_SECONDARY_FLAG(src, FROZEN))
+		name = replacetext(name, "frozen ", "")
+		remove_atom_colour(TEMPORARY_COLOUR_PRIORITY, list(FROZEN_RED_COLOR, FROZEN_GREEN_COLOR, FROZEN_BLUE_COLOR, rgb(0,0,0)))
+		alpha += 25
+		CLEAR_SECONDARY_FLAG(src, FROZEN)
+
+#undef FROZEN_RED_COLOR
+#undef FROZEN_GREEN_COLOR
+#undef FROZEN_BLUE_COLOR
+
+
+//Converts an icon to base64. Operates by putting the icon in the iconCache savefile,
+// exporting it as text, and then parsing the base64 from that.
+// (This relies on byond automatically storing icons in savefiles as base64)
+/proc/icon2base64(icon/icon, iconKey = "misc")
+	if (!isicon(icon))
+		return FALSE
+	WRITE_FILE(GLOB.iconCache[iconKey], icon)
+	var/iconData = GLOB.iconCache.ExportText(iconKey)
+	var/list/partial = splittext(iconData, "{")
+	return replacetext(copytext(partial[2], 3, -5), "\n", "")
+
+/proc/icon2html(thing, target, icon_state, dir, frame = 1, moving = FALSE)
+	if (!thing)
+		return
+
+	var/key
+	var/icon/I = thing
+	if (!target)
+		return
+	if (target == world)
+		target = GLOB.clients
+
+	var/list/targets
+	if (!islist(target))
+		targets = list(target)
+	else
+		targets = target
+		if (!targets.len)
+			return
+	if (!isicon(I))
+		if (isfile(thing)) //special snowflake
+			var/name = sanitize_filename("[generate_asset_name(thing)].png")
+			register_asset(name, thing)
+			for (var/thing2 in targets)
+				send_asset(thing2, key, FALSE)
+			return "<img class='icon icon-misc' src=\"[url_encode(name)]\">"
+		var/atom/A = thing
+		if (isnull(dir))
+			dir = A.dir
+		if (isnull(icon_state))
+			icon_state = A.icon_state
+		I = A.icon
+		if (ishuman(thing)) // Shitty workaround for a BYOND issue.
+			var/icon/temp = I
+			I = icon()
+			I.Insert(temp, dir = SOUTH)
+			dir = SOUTH
+	else
+		if (isnull(dir))
+			dir = SOUTH
+		if (isnull(icon_state))
+			icon_state = ""
+
+	I = icon(I, icon_state, dir, frame, moving)
+
+	key = "[generate_asset_name(I)].png"
+	register_asset(key, I)
+	for (var/thing2 in targets)
+		send_asset(thing2, key, FALSE)
+
+	return "<img class='icon icon-[icon_state]' src=\"[url_encode(key)]\">"
+
+/proc/icon2base64html(thing)
+	if (!thing)
+		return
+	var/static/list/bicon_cache = list()
+	if (isicon(thing))
+		var/icon/I = thing
+		var/icon_base64 = icon2base64(I)
+
+		if (I.Height() > world.icon_size || I.Width() > world.icon_size)
+			var/icon_md5 = md5(icon_base64)
+			icon_base64 = bicon_cache[icon_md5]
+			if (!icon_base64) // Doesn't exist yet, make it.
+				bicon_cache[icon_md5] = icon_base64 = icon2base64(I)
+
+
+		return "<img class='icon icon-misc' src='data:image/png;base64,[icon_base64]'>"
+
+	// Either an atom or somebody fucked up and is gonna get a runtime, which I'm fine with.
+	var/atom/A = thing
+	var/key = "[istype(A.icon, /icon) ? "\ref[A.icon]" : A.icon]:[A.icon_state]"
+
+
+	if (!bicon_cache[key]) // Doesn't exist, make it.
+		var/icon/I = icon(A.icon, A.icon_state, SOUTH, 1)
+		if (ishuman(thing)) // Shitty workaround for a BYOND issue.
+			var/icon/temp = I
+			I = icon()
+			I.Insert(temp, dir = SOUTH)
+
+		bicon_cache[key] = icon2base64(I, key)
+
+	return "<img class='icon icon-[A.icon_state]' src='data:image/png;base64,[bicon_cache[key]]'>"
+
+//Costlier version of icon2html() that uses getFlatIcon() to account for overlays, underlays, etc. Use with extreme moderation, ESPECIALLY on mobs.
+/proc/costly_icon2html(thing, target)
+	if (!thing)
+		return
+
+	if (isicon(thing))
+		return icon2html(thing, target)
+
+	var/icon/I = getFlatIcon(thing)
+	return icon2html(I, target)
@@ -1,6 +1,3 @@
-//wrapper macro for sending images that makes grepping easy
-#define SEND_IMAGE(target, image) target << image
-
 /proc/random_blood_type()
 	return pick(4;"O-", 36;"O+", 3;"A-", 28;"A+", 1;"B-", 20;"B+", 1;"AB-", 5;"AB+")

@@ -116,6 +113,7 @@
 		"xenohead" 			= "None",
 		"xenotail" 			= "None",
 		"exhibitionist" 	= FALSE,
+		"genitals_use_skintone"	= FALSE,
 		"has_cock"			= FALSE,
 		"cock_shape"		= pick(GLOB.cock_shapes_list),
 		"cock_length"		= 6,
@@ -158,8 +156,9 @@
 		"womb_cum_rate"		= CUM_RATE,
 		"womb_cum_mult"		= CUM_RATE_MULT,
 		"womb_efficiency"	= CUM_EFFICIENCY,
-		"womb_fluid" 		= "femcum"))
-		
+		"womb_fluid" 		= "femcum",
+		"flavor_text"		= ""))
+
 /proc/random_hair_style(gender)
 	switch(gender)
 		if(MALE)
@@ -24,11 +24,12 @@
 	announcement += "<br><span class='alert'>[html_encode(text)]</span><br>"
 	announcement += "<br>"

+	var/s = sound(sound)
 	for(var/mob/M in GLOB.player_list)
 		if(!isnewplayer(M) && M.can_hear())
 			to_chat(M, announcement)
 			if(M.client.prefs.toggles & SOUND_ANNOUNCEMENTS)
-				M << sound(sound)
+				SEND_SOUND(M, s)

 /proc/print_command_report(text = "", title = null, announce=TRUE)
 	if(!title)
@@ -55,6 +56,6 @@
 			to_chat(M, "<b><font size = 3><font color = red>[title]</font color><BR>[message]</font size></b><BR>")
 			if(M.client.prefs.toggles & SOUND_ANNOUNCEMENTS)
 				if(alert)
-					M << sound('sound/misc/notice1.ogg')
+					SEND_SOUND(M, sound('sound/misc/notice1.ogg'))
 				else
-					M << sound('sound/misc/notice2.ogg')
+					SEND_SOUND(M, sound('sound/misc/notice2.ogg'))
@@ -45,6 +45,9 @@
 			index = findtext(t, char, index+1)
 	return t

+/proc/sanitize_filename(t)
+	return sanitize_simple(t, list("\n"="", "\t"="", "/"="", "\\"="", "?"="", "%"="", "*"="", ":"="", "|"="", "\""="", "<"="", ">"=""))
+
 //Runs byond's sanitization proc along-side sanitize_simple
 /proc/sanitize(t,list/repl_chars = null)
 	return html_encode(sanitize_simple(t,repl_chars))
@@ -553,14 +556,14 @@ GLOBAL_LIST_INIT(binary, list("0","1"))

 	var/list/tosend = list()
 	tosend["data"] = finalized
-	log << json_encode(tosend)
+	WRITE_FILE(log, json_encode(tosend))

 //Used for applying byonds text macros to strings that are loaded at runtime
 /proc/apply_text_macros(string)
 	var/next_backslash = findtext(string, "\\")
 	if(!next_backslash)
 		return string
-	
+
 	var/leng = length(string)

 	var/next_space = findtext(string, " ", next_backslash + 1)
@@ -537,3 +537,18 @@
 	if(!istype(the_matrix) || the_matrix.len != 20)
 		return "#ffffffff"
 	return rgb(the_matrix[1]*255, the_matrix[6]*255, the_matrix[11]*255, the_matrix[16]*255)
+
+/proc/type2parent(child)
+	var/string_type = "[child]"
+	var/last_slash = findlasttext(string_type, "/")
+	if(last_slash == 1)
+		switch(child)
+			if(/datum)
+				return null
+			if(/obj || /mob)
+				return /atom/movable
+			if(/area || /turf)
+				return /atom
+			else
+				return /datum
+	return text2path(copytext(string_type, 1, last_slash))
@@ -289,7 +289,7 @@ Turf and target are separate in case you want to teleport some distance from a t
 	var/list/pois = list()
 	for(var/mob/M in mobs)
 		if(skip_mindless && (!M.mind && !M.ckey))
-			if(!isbot(M) && !istype(M, /mob/camera/))
+			if(!isbot(M) && !istype(M, /mob/camera) && !ismegafauna(M))
 				continue
 		if(M.client && M.client.holder && M.client.holder.fakekey) //stealthmins
 			continue
@@ -491,17 +491,26 @@ Turf and target are separate in case you want to teleport some distance from a t
 	var/y=arcsin(x/sqrt(1+x*x))
 	return y

-/atom/proc/GetAllContents()
+/atom/proc/GetAllContents(list/ignore_typecache)
 	var/list/processing_list = list(src)
 	var/list/assembled = list()
+	if(ignore_typecache)		//If there's a typecache, use it.
+		while(processing_list.len)
+			var/atom/A = processing_list[1]
+			processing_list -= A
+			if(ignore_typecache[A.type])
+				continue
+			processing_list |= (A.contents - assembled)
+			assembled |= A

-	while(processing_list.len)
-		var/atom/A = processing_list[1]
-		processing_list -= A
+	else		//If there's none, only make this check once for performance.
+		while(processing_list.len)
+			var/atom/A = processing_list[1]
+			processing_list -= A

-		processing_list |= (A.contents - assembled)
+			processing_list |= (A.contents - assembled)

-		assembled |= A
+			assembled |= A

 	return assembled

@@ -836,11 +845,11 @@ GLOBAL_LIST_INIT(WALLITEMS_INVERSE, typecacheof(list(

 /obj/proc/atmosanalyzer_scan(datum/gas_mixture/air_contents, mob/user, obj/target = src)
 	var/obj/icon = target
-	user.visible_message("[user] has used the analyzer on [bicon(icon)] [target].", "<span class='notice'>You use the analyzer on [bicon(icon)] [target].</span>")
+	user.visible_message("[user] has used the analyzer on [icon2html(icon, viewers(src))] [target].", "<span class='notice'>You use the analyzer on [icon2html(icon, user)] [target].</span>")
 	var/pressure = air_contents.return_pressure()
 	var/total_moles = air_contents.total_moles()

-	to_chat(user, "<span class='notice'>Results of analysis of [bicon(icon)] [target].</span>")
+	to_chat(user, "<span class='notice'>Results of analysis of [icon2html(icon, user)] [target].</span>")
 	if(total_moles>0)
 		to_chat(user, "<span class='notice'>Pressure: [round(pressure,0.1)] kPa</span>")

@@ -69,8 +69,6 @@
 #error You need version 511 or higher
 #endif

- #define SERVICE_CMD_PARAM_KEY "serviceCommsKey"
-
 //Update this whenever the db schema changes 
 //make sure you add an update to the schema_version stable in the db changelog
 #define DB_MAJOR_VERSION 3
@@ -205,7 +205,7 @@ or something covering your eyes."
 /obj/screen/alert/embeddedobject
 	name = "Embedded Object"
 	desc = "Something got lodged into your flesh and is causing major bleeding. It might fall out with time, but surgery is the safest way. \
-If you're feeling frisky, click yourself in help intent to pull the object out."
+If you're feeling frisky, examine yourself and click the underlined item to pull the object out."
 	icon_state = "embeddedobject"

 /obj/screen/alert/embeddedobject/Click()
@@ -15,6 +15,7 @@
 		return
 	new /obj/effect/temp_visual/telekinesis(loc)
 	user.UnarmedAttack(src,0) // attack_hand, attack_paw, etc
+	add_hiddenprint(user)
 	return

 /obj/attack_tk(mob/user)
@@ -34,6 +35,7 @@
 	O.tk_user = user
 	if(O.focus_object(src))
 		user.put_in_active_hand(O)
+		add_hiddenprint(user)

 /mob/attack_tk(mob/user)
 	return
@@ -53,6 +53,7 @@ GLOBAL_LIST_EMPTY(xeno_dorsal_list)

 	//Genitals and Arousal Lists
 GLOBAL_LIST_EMPTY(cock_shapes_list)//global_lists.dm for the list initializations //Now also _DATASTRUCTURES globals.dm
+GLOBAL_LIST_EMPTY(cock_shapes_icons) //Associated list for names->icon_states for cockshapes.
 GLOBAL_LIST_EMPTY(breasts_size_list)
 GLOBAL_LIST_EMPTY(breasts_shapes_list)
 GLOBAL_LIST_EMPTY(vagina_shapes_list)
@@ -6,7 +6,7 @@
 	var/arousal_rate = 1		//The base rate that arousal will increase in this mob.
 	var/arousal_loss_rate = 1	//How easily arousal can be relieved for this mob.
 	var/canbearoused = FALSE	//Mob-level disabler for arousal. Starts off and can be enabled as features are added for different mob types.
-	var/mb_cd_length = 50		//5 second cooldown for masturbating because fuck spam
+	var/mb_cd_length = 100		//5 second cooldown for masturbating because fuck spam.
 	var/mb_cd_timer = 0			//The timer itself

 /mob/living/carbon/human
@@ -150,14 +150,14 @@
 		return 0
 	var/mob/living/M = usr
 	if(M.canbearoused)
-		M.mob_masturbate()
+		M.mob_climax()
 		return 1
 	else
-		M << "<span class='warning'>Arousal is disabled. Feature is unavailable.</span>"
+		to_chat(M, "<span class='warning'>Arousal is disabled. Feature is unavailable.</span>")



-/mob/living/proc/mob_masturbate()//This is just so I can test this shit without being forced to add actual content to get rid of arousal. Will be a very basic proc for a while.
+/mob/living/proc/mob_climax()//This is just so I can test this shit without being forced to add actual content to get rid of arousal. Will be a very basic proc for a while.
 	set name = "Masturbate"
 	set category = "IC"
 	if(canbearoused && !restrained() && !stat)
@@ -179,45 +179,93 @@
 							PoolOrNew(/obj/effect/decal/cleanable/femcum, loc)
 					*/
 			else
-				src << "<span class='notice'>You aren't aroused enough for that.</span>"
+				to_chat(src, "<span class='notice'>You aren't aroused enough for that.</span>")

-/mob/living/carbon/human/mob_masturbate()
+/mob/living/carbon/human/mob_climax(forced_climax=FALSE) //Forced is instead of the other proc, makes you cum if you have the tools for it, ignoring restraints
 	if(mb_cd_timer > world.time)
-		src << "<span class='warning'>You need to wait [round((mb_cd_timer - world.time)/(20))] seconds before you can do that again!</span>"
+		if(!forced_climax) //Don't spam the message to the victim if forced to come too fast
+			to_chat(src, "<span class='warning'>You need to wait [round((mb_cd_timer - world.time)/(20))] seconds before you can do that again!</span>")
 		return
+	mb_cd_timer = (world.time + mb_cd_length)
 	var/list/genitals_list = list()
 	var/obj/item/organ/genital/SG = null//originally selected_genital
 	var/list/containers_list = list()
 	var/obj/item/weapon/reagent_containers/SC = null
 	var/datum/reagents/fluid_source = null
 	var/into_container = 0
-	var/arms = get_num_arms()
-	var/free_hands = arms
+	var/free_hands = get_num_arms() //arms was only used to know if we had ANY at all
 	var/total_cum = 0
 	var/finished = 0
 	var/mb_time = 30
-	mb_cd_timer = (world.time + mb_cd_length)
 	if(canbearoused && has_dna())
-		if(restrained())
-			src << "<span class='warning'>You can't do that while restrained!</span>"
+		if(stat==2)
+			to_chat(src, "<span class='warning'>You can't do that while dead!</span>")
 			return
-		if(stat)
-			src << "<span class='warning'>You must be conscious to do that!</span>"
+		if(forced_climax) //Something forced us to cum, this is not a masturbation thing and does not progress to the other checks
+			for(var/obj/item/organ/genital/G in internal_organs)
+				if(G.can_masturbate_with) //All capable genitals will orgasm with this
+					var/unable_to_come = FALSE
+					switch(G.type)
+						if(/obj/item/organ/genital/penis)
+							var/obj/item/organ/genital/penis/P = G
+							if(!P.linked_balls)
+								unable_to_come = TRUE
+							else
+								fluid_source = P.linked_balls.reagents
+
+
+						if(/obj/item/organ/genital/vagina)
+							var/obj/item/organ/genital/vagina/V = G
+							if(!V.linked_womb)
+								unable_to_come = TRUE
+							else
+								fluid_source = V.linked_womb.reagents
+						else //Weird, undefined genitalia behaviour
+							unable_to_come = TRUE
+
+					if(unable_to_come)
+						src.visible_message("<span class='danger'>[src] shudders, their [G.name] unable to cum.</span>", \
+						"<span class='userdanger'>Your [G.name] cannot cum, giving no relief.</span>", \
+						"<span class='userdanger'>Your [G.name] cannot cum, giving no relief.</span>")
+					else
+						if(fluid_source)
+							total_cum = fluid_source.total_volume
+							src.visible_message("<span class='danger'>[src] looks like they're about to cum.</span>", \
+							"<span class='green'>You feel yourself about to orgasm.</span>", \
+							"<span class='green'>You feel yourself about to orgasm.</span>")
+							if(do_after(src, mb_time, target = src))
+								if(total_cum > 5)
+									fluid_source.reaction(src.loc, TOUCH, 1, 0)
+								fluid_source.clear_reagents()
+								fluid_source = null //cleanup so this can be used for the next genitalia
+
+								src.visible_message("<span class='danger'>[src] orgasms, cumming[istype(src.loc, /turf/open/floor) ? " onto [src.loc]" : ""]!</span>", \
+								"<span class='green'>You're forced to cum[istype(src.loc, /turf/open/floor) ? " onto [src.loc]" : ""] with your [G].</span>", \
+								"<span class='green'>Your [G] have been forced to climax.</span>")
+								finished = 1
+			if(finished)
+				setArousalLoss(min_arousal)
+			return //Do not proceed to masturbating if all genitals have been forced to orgasm.
+		if(stat==1) //Sleeping people can be forced chemically or with electrical stimulants, for example.
+			to_chat(src, "<span class='warning'>You must be conscious to do that!</span>")
+			return
+		if(restrained())
+			to_chat(src, "<span class='warning'>You can't do that while restrained!</span>")
 			return
 		if(getArousalLoss() < 33)//flat number instead of percentage
-			src << "<span class='warning'>You aren't aroused enough for that!</span>"
+			to_chat(src, "<span class='warning'>You aren't aroused enough for that!</span>")
 			return
 		if(!is_groin_exposed())
-			src << "<span class='warning'>You need to undress, first!</span>"
+			to_chat(src, "<span class='warning'>You need to undress, first!</span>")
 			return
-		if(!arms)
-			src << "<span class='warning'>You need at least one arm.</span>"
+		if(!free_hands)
+			to_chat(src, "<span class='warning'>You need at least one free arm.</span>")
 			return
 		for(var/helditem in held_items)//how many hands are free
 			if(isobj(helditem))
 				free_hands--
 		if(free_hands <= 0)
-			src << "<span class='warning'>You need at least one free hand.</span>"
+			to_chat(src, "<span class='warning'>You need at least one free hand.</span>")
 			return
 		for(var/obj/item/organ/genital/G in internal_organs)
 			if(G.can_masturbate_with)//filter out what you can't masturbate with
@@ -240,12 +288,12 @@
 					if(/obj/item/organ/genital/penis)
 						var/obj/item/organ/genital/penis/P = SG
 						if(!P.linked_balls)
-							src << "<span class='warning'>Grow a pair!</span>"
+							to_chat(src, "<span class='warning'>You need a pair of testicles to do this.</span>")
 							return
 						fluid_source = P.linked_balls.reagents
 						total_cum = fluid_source.total_volume
 						if(into_container)//into a glass or beaker or whatever
-							src.visible_message("<span class='danger'>[src] starts [pick("jerking off","stroking")] their [SG] over [SC].</span>", \
+							src.visible_message("<span class='danger'>[src] starts [pick("jerking off","stroking")] their [SG.name] over [SC].</span>", \
 								"<span class='userdanger'>You start jerking off over [SC.name].</span>", \
 								"<span class='userdanger'>You start masturbating.</span>")
 							if(do_after(src, mb_time, target = src) && in_range(src, SC))
@@ -254,16 +302,71 @@
 									"<span class='green'>You cum into [SC].</span>", \
 									"<span class='green'>You have relieved yourself.</span>")
 								finished = 1
-								
+						else //Not in a container
+							if(src.pulling)
+								if(iscarbon(src.pulling))
+									var/mob/living/carbon/C = src.pulling
+									if(!C.is_groin_exposed())
+										to_chat(src, "<span class='warning'>You must undress someone to climax inside them.</span>")
+										return
+								if(isliving(src.pulling)) //Gotta be alive to fuck it, don't wanna have to code fucking objects that ain't containers...
+									var/mob/living/partner = src.pulling
+									src.visible_message("[src] is about to climax inside [partner]!", \
+									"You're about to climax inside [partner]!", \
+									"<span class='danger'>You're preparing to climax inside someone!</span>")
+									switch(grab_state)
+										if(GRAB_PASSIVE)
+											if(do_after(src, mb_time, target = src) && in_range(src, partner))
+												var/spillage = 0.5 //Leaks a bit on passive grab
+												var/did_spill = FALSE
+												fluid_source.trans_to(partner, total_cum*(1-spillage))
+												total_cum = total_cum*spillage
+												if(total_cum > 5)
+													fluid_source.reaction(partner.loc, TOUCH, 1, 0)
+													did_spill = TRUE
+												fluid_source.clear_reagents()
+
+												src.visible_message("<span class='danger'>[src] ejaculates inside [partner][did_spill ? ", overflowing and spilling":""]!</span>", \
+												"<span class='green'>You ejaculate inside [partner][did_spill ? ", spilling out of them":""].</span>", \
+												"<span class='green'>You have climaxed inside someone[did_spill ? ", spilling out of them":""].</span>")
+												finished = 1
+										else //Aggressive or higher
+											if(do_after(src, mb_time, target = src) && in_range(src, partner))
+												var/spillage = 0.0 //Leakproofing seals
+												fluid_source.trans_to(partner, total_cum*(1-spillage))
+												total_cum = total_cum*spillage
+												if(total_cum > 5)
+													fluid_source.reaction(partner.loc, TOUCH, 1, 0)
+												fluid_source.clear_reagents()
+
+												src.visible_message("<span class='danger'>[src] ejaculates inside [partner], spilling nothing!</span>", \
+												"<span class='green'>You ejaculate inside [partner], spilling nothing.</span>", \
+												"<span class='green'>You have climaxed inside someone, spilling nothing.</span>")
+												finished = 1
+								//Don't care, not coding you fucking a unanchored girder
+							else //No pulling, or pulling non-living things
+								src.visible_message("<span class='danger'>[src] starts [pick("jerking off","stroking")] their [SG].</span>", \
+								"<span class='green'>You start masturbating.</span>", \
+								"<span class='green'>You start masturbating.</span>")
+								if(do_after(src, mb_time, target = src))
+									if(total_cum > 5)
+										fluid_source.reaction(src.loc, TOUCH, 1, 0)
+									fluid_source.clear_reagents()
+
+									src.visible_message("<span class='danger'>[src] orgasms, cumming[istype(src.loc, /turf/open/floor) ? " onto [src.loc]" : ""]!</span>", \
+									"<span class='green'>You cum[istype(src.loc, /turf/open/floor) ? " onto [src.loc]" : ""].</span>", \
+									"<span class='green'>You have relieved yourself.</span>")
+									finished = 1
+
 					if(/obj/item/organ/genital/vagina)
 						var/obj/item/organ/genital/vagina/V = SG
 						if(!V.linked_womb)
-							src << "<span class='warning'>No womb!</span>"
+							to_chat(src, "<span class='warning'>You need a womb to do this.</span>")
 							return
 						fluid_source = V.linked_womb.reagents
 						total_cum = fluid_source.total_volume
 						if(into_container)//into a glass or beaker or whatever
-							src.visible_message("<span class='danger'>[src] starts fingering their vagina over [SC].</span>", \
+							src.visible_message("<span class='danger'>[src] starts fingering their [SG.name] over [SC].</span>", \
 								"<span class='userdanger'>You start fingering over [SC.name].</span>", \
 								"<span class='userdanger'>You start masturbating.</span>")
 							if(do_after(src, mb_time, target = src) && in_range(src, SC))
@@ -272,7 +375,7 @@
 									"<span class='green'>You cum into [SC].</span>", \
 									"<span class='green'>You have relieved yourself.</span>")
 								finished = 1
-								
+
 						else//not into a container
 							src.visible_message("<span class='danger'>[src] starts fingering their vagina.</span>", \
 								"<span class='userdanger'>You start fingering your vagina.</span>", \
@@ -297,10 +400,5 @@
 					setArousalLoss(min_arousal)

 		else
-			src << "<span class='warning'>You have no genitals!</span>"
+			to_chat(src, "<span class='warning'>You have no genitals!</span>")
 			return
-
-/mob/living/carbon/proc/force_orgasm(intensity)
-	if(canbearoused && has_dna() && (has_penis() || has_vagina()))
-		return 1
-	return 0
@@ -105,7 +105,7 @@
 		M.emote(pick("moan","blush"))
 	if(prob(5))
 		var/aroused_message = pick("You feel frisky.", "You're having trouble suppressing your urges.", "You feel in the mood.")
-		M << "<span class='love'>[aroused_message]</span>"
+		to_chat(M, "<span class='love'>[aroused_message]</span>")
 	..()

 /datum/reagent/aphrodisiacplus
@@ -128,15 +128,13 @@
 		else
 			M.emote(pick("moan","blush"))
 	if(prob(5))
+		var/aroused_message
 		if(M.getArousalLoss() > 90)
-			var/aroused_message = pick("You need to fuck someone!", "You're bursting with sexual tension!", "You can't get sex off your mind!")
-			M << "<span class='love'>[aroused_message]</span>"
+			aroused_message = pick("You need to fuck someone!", "You're bursting with sexual tension!", "You can't get sex off your mind!")
 		else
-			var/aroused_message = pick("You feel a bit hot.", "You feel strong sexual urges.", "You feel in the mood.", "You're ready to go down on someone.")
-			M << "<span class='love'>[aroused_message]</span>"
-//	if(iscarbon(M) && has_dna(M))
-//		M.force_ejaculation()
-	..()
+			aroused_message = pick("You feel a bit hot.", "You feel strong sexual urges.", "You feel in the mood.", "You're ready to go down on someone.")
+		to_chat(M, "<span class='love'>[aroused_message]</span>")
+
 /datum/reagent/aphrodisiacplus/addiction_act_stage2(mob/living/M)
 	if(prob(30))
 		M.adjustBrainLoss(2)
@@ -152,11 +150,17 @@
 	..()

 /datum/reagent/aphrodisiacplus/overdose_process(mob/living/M)
-	if(prob(66))
+	if(prob(33))
+		if(M.getArousalLoss() >= 100 && ishuman(M) && M.has_dna())
+			var/mob/living/carbon/human/H = M
+			to_chat(H, "<span class='love'>Your libido is going haywire!</span>")
+			H.mob_climax(forced_climax=TRUE)
 		if(M.min_arousal < 50)
 			M.min_arousal += 1
-		if(M.max_arousal < 200)
-			M.max_arousal += 1
+			to_chat(M, "<span class='love'>You're having a hard time thinkin about things other than sex!</span>")
+		if(M.min_arousal < M.max_arousal)
+			M.min_arousal += 1
+			to_chat(M, "<span class='love'>You feel your libido permanently increasing.</span>")
 		M.adjustArousalLoss(2)
 	..()

@@ -193,8 +197,10 @@
 	if(prob(33))
 		if(M.min_arousal > 0)
 			M.min_arousal -= 1
-		if(M.max_arousal > 75)
+			to_chat(M, "<span class='notice'>You feel your libido returning to more normal levels.</span>")
+		if(M.min_arousal > 50)
 			M.min_arousal -= 1
+			to_chat(M, "<span class='notice'>You feel like your overactive libido is calming down.</span>")
 		M.adjustArousalLoss(-2)
 	..()

@@ -1,5 +1,5 @@
 /obj/item/organ/genital/breasts
-	name 					= "breasts"
+	name 					= "Breasts"
 	desc 					= "Female milk producing organs."
 	icon_state 				= "breasts"
 	icon 					= 'code/citadel/icons/breasts.dmi'
@@ -1,5 +1,5 @@
 /obj/item/organ/genital/eggsack
-	name 			= "egg sack"
+	name 			= "Egg sack"
 	desc 			= "An egg producing reproductive organ."
 	icon_state 		= "egg_sack"
 	icon 			= 'code/citadel/icons/ovipositor.dmi'
@@ -243,8 +243,10 @@
 				G.aroused_state = FALSE
 			icon_string = "[G.slot]_[S.icon_state]_[size]_[G.aroused_state]_[layertext]"
 			I = image("icon" = S.icon, "icon_state" = icon_string, "layer" =- layer)
+
 			if(S.center)
 				I = center_image(I,S.dimension_x,S.dimension_y)
+
 			if(use_skintones && H.dna.features["genitals_use_skintone"])
 				I.color = "#[skintone2hex(H.skin_tone)]"
 			else
@@ -31,6 +31,33 @@
 	icon_state = "tapered"
 	name = "Tapered"

+////////////////////////
+// Taur cocks go here //
+////////////////////////
+/datum/sprite_accessory/penis/taur_flared
+	icon = 'code/citadel/icons/taur_penis_onmob.dmi' //Needed larger width
+	icon_state = "flared"
+	name = "Taur, Flared"
+	center = TRUE //Center the image 'cause 2-tile wide.
+	dimension_x = 64
+
+/datum/sprite_accessory/penis/taur_knotted
+	icon = 'code/citadel/icons/taur_penis_onmob.dmi' //Needed larger width
+	icon_state = "knotted"
+	name = "Taur, Knotted"
+	center = TRUE //Center the image 'cause 2-tile wide.
+	dimension_x = 64
+
+/datum/sprite_accessory/penis/taur_tapered
+	icon = 'code/citadel/icons/taur_penis_onmob.dmi' //Needed larger width
+	icon_state = "tapered"
+	name = "Taur, Tapered"
+	center = TRUE //Center the image 'cause 2-tile wide.
+	dimension_x = 64
+
+
+
+
 //Vaginas
 /datum/sprite_accessory/vagina
 	icon = 'code/citadel/icons/vagina_onmob.dmi'
@@ -1,5 +1,5 @@
 /obj/item/organ/genital/ovipositor
-	name = "ovipositor"
+	name = "Ovipositor"
 	desc = "An egg laying reproductive organ."
 	icon_state = "ovi_knotted_2"
 	icon = 'code/citadel/icons/ovipositor.dmi'
@@ -1,5 +1,5 @@
 /obj/item/organ/genital/penis
-	name 		= "penis"
+	name 		= "Penis"
 	desc 		= "A male reproductive organ."
 	icon_state 	= "penis"
 	icon 		= 'code/citadel/icons/penis.dmi'
@@ -35,7 +35,7 @@
 	cached_length = length

 /obj/item/organ/genital/penis/update_appearance()
-	var/string = "penis_[lowertext(shape)]_[size]"
+	var/string = "penis_[GLOB.cock_shapes_icons[shape]]_[size]"
 	icon_state = sanitize_text(string)
 	var/lowershape = lowertext(shape)
 	if(lowershape in knotted_types)
@@ -1,5 +1,5 @@
 /obj/item/organ/genital/testicles
-	name = "testicles"
+	name = "Testicles"
 	desc = "A male reproductive organ."
 	icon_state = "testicles"
 	icon = 'code/citadel/icons/penis.dmi'
@@ -1,5 +1,5 @@
 /obj/item/organ/genital/vagina
-	name 					= "vagina"
+	name 					= "Vagina"
 	desc 					= "A female reproductive organ."
 	icon					= 'code/citadel/icons/vagina.dmi'
 	icon_state 				= "vagina"
@@ -1,5 +1,5 @@
 /obj/item/organ/genital/womb
-	name 			= "womb"
+	name 			= "Womb"
 	desc 			= "A female reproductive organ."
 	icon			= 'code/citadel/icons/vagina.dmi'
 	icon_state 		= "womb"
@@ -10,7 +10,7 @@
 	fluid_id 		= "femcum"
 	producing		= TRUE
 	var/obj/item/organ/genital/vagina/linked_vag
-	
+
 /obj/item/organ/genital/womb/Initialize()
 	. = ..()
 	reagents.add_reagent(fluid_id, fluid_max_volume)
@@ -275,7 +275,7 @@

 		if(M.config_tag)
 			if(!(M.config_tag in modes))		// ensure each mode is added only once
-				GLOB.config_error_log << "Adding game mode [M.name] ([M.config_tag]) to configuration."
+				WRITE_FILE(GLOB.config_error_log, "Adding game mode [M.name] ([M.config_tag]) to configuration.")
 				modes += M.config_tag
 				mode_names[M.config_tag] = M.name
 				probabilities[M.config_tag] = M.probability
@@ -548,7 +548,7 @@
 				if("irc_announce_new_game")
 					irc_announce_new_game = TRUE
 				else
-					GLOB.config_error_log << "Unknown setting in configuration: '[name]'"
+					WRITE_FILE(GLOB.config_error_log, "Unknown setting in configuration: '[name]'")

 		else if(type == "game_options")
 			switch(name)
@@ -611,13 +611,13 @@
 					if(mode_name in modes)
 						continuous[mode_name] = 1
 					else
-						GLOB.config_error_log << "Unknown continuous configuration definition: [mode_name]."
+						WRITE_FILE(GLOB.config_error_log, "Unknown continuous configuration definition: [mode_name].")
 				if("midround_antag")
 					var/mode_name = lowertext(value)
 					if(mode_name in modes)
 						midround_antag[mode_name] = 1
 					else
-						GLOB.config_error_log << "Unknown midround antagonist configuration definition: [mode_name]."
+						WRITE_FILE(GLOB.config_error_log, "Unknown midround antagonist configuration definition: [mode_name].")
 				if("midround_antag_time_check")
 					midround_antag_time_check = text2num(value)
 				if("midround_antag_life_check")
@@ -633,9 +633,9 @@
 						if(mode_name in modes)
 							min_pop[mode_name] = text2num(mode_value)
 						else
-							GLOB.config_error_log << "Unknown minimum population configuration definition: [mode_name]."
+							WRITE_FILE(GLOB.config_error_log, "Unknown minimum population configuration definition: [mode_name].")
 					else
-						GLOB.config_error_log << "Incorrect minimum population configuration definition: [mode_name]  [mode_value]."
+						WRITE_FILE(GLOB.config_error_log, "Incorrect minimum population configuration definition: [mode_name]  [mode_value].")
 				if("max_pop")
 					var/pop_pos = findtext(value, " ")
 					var/mode_name = null
@@ -647,9 +647,9 @@
 						if(mode_name in modes)
 							max_pop[mode_name] = text2num(mode_value)
 						else
-							GLOB.config_error_log << "Unknown maximum population configuration definition: [mode_name]."
+							WRITE_FILE(GLOB.config_error_log, "Unknown maximum population configuration definition: [mode_name].")
 					else
-						GLOB.config_error_log << "Incorrect maximum population configuration definition: [mode_name]  [mode_value]."
+						WRITE_FILE(GLOB.config_error_log, "Incorrect maximum population configuration definition: [mode_name]  [mode_value].")
 				if("shuttle_refuel_delay")
 					shuttle_refuel_delay     = text2num(value)
 				if("show_game_type_odds")
@@ -677,9 +677,9 @@
 						if(prob_name in modes)
 							probabilities[prob_name] = text2num(prob_value)
 						else
-							GLOB.config_error_log << "Unknown game mode probability configuration definition: [prob_name]."
+							WRITE_FILE(GLOB.config_error_log, "Unknown game mode probability configuration definition: [prob_name].")
 					else
-						GLOB.config_error_log << "Incorrect probability configuration definition: [prob_name]  [prob_value]."
+						WRITE_FILE(GLOB.config_error_log, "Incorrect probability configuration definition: [prob_name]  [prob_value].")

 				if("protect_roles_from_antagonist")
 					protect_roles_from_antagonist	= 1
@@ -726,7 +726,7 @@
 					// Value is in the form "LAWID,NUMBER"
 					var/list/L = splittext(value, ",")
 					if(L.len != 2)
-						GLOB.config_error_log << "Invalid LAW_WEIGHT: " + t
+						WRITE_FILE(GLOB.config_error_log, "Invalid LAW_WEIGHT: " + t)
 						continue
 					var/lawid = L[1]
 					var/weight = text2num(L[2])
@@ -781,7 +781,7 @@
 				if("mice_roundstart")
 					mice_roundstart = text2num(value)
 				else
-					GLOB.config_error_log << "Unknown setting in configuration: '[name]'"
+					WRITE_FILE(GLOB.config_error_log, "Unknown setting in configuration: '[name]'")
 		else if(type == "policies")
 			policies[name] = value

@@ -839,7 +839,7 @@
 			if ("disabled")
 				currentmap = null
 			else
-				GLOB.config_error_log << "Unknown command in map vote config: '[command]'"
+				WRITE_FILE(GLOB.config_error_log, "Unknown command in map vote config: '[command]'")


 /datum/configuration/proc/loadsql(filename)
@@ -883,7 +883,7 @@
 			if("feedback_tableprefix")
 				global.sqlfdbktableprefix = value
 			else
-				GLOB.config_error_log << "Unknown setting in configuration: '[name]'"
+				WRITE_FILE(GLOB.config_error_log, "Unknown setting in configuration: '[name]'")

 /datum/configuration/proc/pick_mode(mode_name)
 	// I wish I didn't have to instance the game modes in order to look up
@@ -3,12 +3,15 @@ SUBSYSTEM_DEF(assets)
 	init_order = INIT_ORDER_ASSETS
 	flags = SS_NO_FIRE
 	var/list/cache = list()
+	var/list/preload = list()

 /datum/controller/subsystem/assets/Initialize(timeofday)
 	for(var/type in typesof(/datum/asset) - list(/datum/asset, /datum/asset/simple))
 		var/datum/asset/A = new type()
 		A.register()

+	preload = cache.Copy() //don't preload assets generated during the round
+
 	for(var/client/C in GLOB.clients)
-		addtimer(CALLBACK(GLOBAL_PROC, .proc/getFilesSlow, C, cache, FALSE), 10)
+		addtimer(CALLBACK(GLOBAL_PROC, .proc/getFilesSlow, C, preload, FALSE), 10)
 	..()
@@ -250,7 +250,7 @@ SUBSYSTEM_DEF(blackbox)
 		return 0
 	return value

-/datum/feedback_variable/proc/get_variable()
+/datum/feedback_variable/proc/get_variable()
 	return variable

 /datum/feedback_variable/proc/set_details(text)
@@ -260,12 +260,12 @@ SUBSYSTEM_DEF(blackbox)
 /datum/feedback_variable/proc/add_details(text)
 	if (istext(text))
 		if (!details)
-			details = text
+			details = "\"[text]\""
 		else
-			details += " [text]"
+			details += " | \"[text]\""

-/datum/feedback_variable/proc/get_details()
+/datum/feedback_variable/proc/get_details()
 	return details

 /datum/feedback_variable/proc/get_parsed()
-	return list(variable,value,details)
+	return list(variable,value,details)
@@ -283,13 +283,12 @@ SUBSYSTEM_DEF(garbage)

 /client/verb/purge_all_destroyed_objects()
 	set category = "Debug"
-	if(SSgarbage)
-		while(SSgarbage.queue.len)
-			var/datum/o = locate(SSgarbage.queue[1])
-			if(istype(o) && o.gc_destroyed)
-				del(o)
-				SSgarbage.totaldels++
-			SSgarbage.queue.Cut(1, 2)
+	while(SSgarbage.queue.len)
+		var/datum/o = locate(SSgarbage.queue[1])
+		if(istype(o) && o.gc_destroyed)
+			del(o)
+			SSgarbage.totaldels++
+		SSgarbage.queue.Cut(1, 2)

 /datum/verb/qdel_then_find_references()
 	set category = "Debug"
@@ -217,10 +217,9 @@ SUBSYSTEM_DEF(job)
 	Debug("Running DO")

 	//Holder for Triumvirate is stored in the SSticker, this just processes it
-	if(SSticker)
+	if(SSticker.triai)
 		for(var/datum/job/ai/A in occupations)
-			if(SSticker.triai)
-				A.spawn_positions = 3
+			A.spawn_positions = 3

 	//Get the players who are ready
 	for(var/mob/dead/new_player/player in GLOB.player_list)
@@ -149,7 +149,6 @@ SUBSYSTEM_DEF(pai)
 				continue
 			if(!(ROLE_PAI in G.client.prefs.be_special))
 				continue
-			//G << 'sound/misc/server-ready.ogg' //Alerting them to their consideration
 			to_chat(G, "<span class='ghostalert'>[user] is requesting a pAI personality! Use the pAI button to submit yourself as one.</span>")
 		addtimer(CALLBACK(src, .proc/spam_again), spam_delay)
 	var/list/available = list()
@@ -49,7 +49,7 @@ SUBSYSTEM_DEF(persistence)
 		satchel_string = pick_n_take(expanded_old_satchels)

 	old_secret_satchels = jointext(expanded_old_satchels,"#")
-	secret_satchels[SSmapping.config.map_name] << old_secret_satchels
+	WRITE_FILE(secret_satchels[SSmapping.config.map_name], old_secret_satchels)

 	var/list/chosen_satchel = splittext(satchel_string,"|")
 	if(!chosen_satchel || isemptylist(chosen_satchel) || chosen_satchel.len != 3) //Malformed
@@ -171,7 +171,7 @@ SUBSYSTEM_DEF(persistence)
 		if(isemptylist(savable_obj))
 			continue
 		old_secret_satchels += "[F.x]|[F.y]|[pick(savable_obj)]#"
-	secret_satchels[SSmapping.config.map_name] << old_secret_satchels
+	WRITE_FILE(secret_satchels[SSmapping.config.map_name], old_secret_satchels)

 /datum/controller/subsystem/persistence/proc/CollectChiselMessages()
 	var/savefile/chisel_messages_sav = new /savefile("data/npc_saves/ChiselMessages.sav")
@@ -181,14 +181,14 @@ SUBSYSTEM_DEF(persistence)

 	log_world("Saved [saved_messages.len] engraved messages on map [SSmapping.config.map_name]")

-	chisel_messages_sav[SSmapping.config.map_name] << json_encode(saved_messages)
+	WRITE_FILE(chisel_messages_sav[SSmapping.config.map_name], json_encode(saved_messages))

 /datum/controller/subsystem/persistence/proc/SaveChiselMessage(obj/structure/chisel_message/M)
 	saved_messages += list(M.pack()) // dm eats one list


 /datum/controller/subsystem/persistence/proc/CollectTrophies()
-	trophy_sav << json_encode(saved_trophies)
+	WRITE_FILE(trophy_sav, json_encode(saved_trophies))

 /datum/controller/subsystem/persistence/proc/SaveTrophy(obj/structure/displaycase/trophy/T)
 	if(!T.added_roundstart && T.showpiece)
@@ -40,9 +40,15 @@ SUBSYSTEM_DEF(server_maint)

 /datum/controller/subsystem/server_maint/Shutdown()
 	kick_clients_in_lobby("<span class='boldannounce'>The round came to an end with you in the lobby.</span>", TRUE) //second parameter ensures only afk clients are kicked
+	var/server = config.server
 	for(var/thing in GLOB.clients)
+		if(!thing)
+			continue
 		var/client/C = thing
-		if(C && config.server)	//if you set a server location in config.txt, it sends you there instead of trying to reconnect to the same world address. -- NeoFite
-			C << link("byond://[config.server]")
+		var/datum/chatOutput/co = C.chatOutput
+		if(co)
+			co.ehjax_send(data = "roundrestart")
+		if(server)	//if you set a server location in config.txt, it sends you there instead of trying to reconnect to the same world address. -- NeoFite
+			C << link("byond://[server]")

 #undef PING_BUFFER_TIME
@@ -34,8 +34,8 @@ SUBSYSTEM_DEF(shuttle)
 	var/obj/docking_port/mobile/supply/supply
 	var/ordernum = 1					//order number given to next order
 	var/points = 5000					//number of trade-points we have
-	var/centcom_message = ""			//Remarks from Centcom on how well you checked the last order.
-	var/list/discoveredPlants = list()	//Typepaths for unusual plants we've already sent CentComm, associated with their potencies
+	var/centcom_message = ""			//Remarks from CentCom on how well you checked the last order.
+	var/list/discoveredPlants = list()	//Typepaths for unusual plants we've already sent CentCom, associated with their potencies

 	var/list/supply_packs = list()
 	var/list/shoppinglist = list()
@@ -101,8 +101,6 @@ SUBSYSTEM_DEF(shuttle)
 			T.color = "#00ffff"
 #endif

-	//world.log << "[transit_turfs.len] transit turfs registered"
-
 /datum/controller/subsystem/shuttle/fire()
 	for(var/thing in mobile)
 		if(!thing)
@@ -185,7 +183,7 @@ SUBSYSTEM_DEF(shuttle)

 	switch(emergency.mode)
 		if(SHUTTLE_RECALL)
-			to_chat(user, "The emergency shuttle may not be called while returning to Centcom.")
+			to_chat(user, "The emergency shuttle may not be called while returning to CentCom.")
 			return
 		if(SHUTTLE_CALL)
 			to_chat(user, "The emergency shuttle is already on its way.")
@@ -200,7 +198,7 @@ SUBSYSTEM_DEF(shuttle)
 			to_chat(user, "The emergency shuttle is moving away to a safe distance.")
 			return
 		if(SHUTTLE_STRANDED)
-			to_chat(user, "The emergency shuttle has been disabled by Centcom.")
+			to_chat(user, "The emergency shuttle has been disabled by CentCom.")
 			return

 	call_reason = trim(html_encode(call_reason))
@@ -225,7 +225,7 @@ SUBSYSTEM_DEF(ticker)
 	round_start_time = world.time

 	to_chat(world, "<FONT color='blue'><B>Welcome to [station_name()], enjoy your stay!</B></FONT>")
-	world << sound('sound/ai/welcome.ogg')
+	SEND_SOUND(world, sound('sound/ai/welcome.ogg'))

 	current_state = GAME_STATE_PLAYING
 	Master.SetRunLevel(RUNLEVEL_GAME)
@@ -300,7 +300,7 @@ SUBSYSTEM_DEF(ticker)
 				if("nuclear emergency") //Nuke wasn't on station when it blew up
 					flick("intro_nuke",cinematic)
 					sleep(35)
-					world << sound('sound/effects/explosionfar.ogg')
+					SEND_SOUND(world, sound('sound/effects/explosion_distant.ogg'))
 					station_explosion_detonation(bomb)
 					flick("station_intact_fade_red",cinematic)
 					cinematic.icon_state = "summary_nukefail"
@@ -308,12 +308,12 @@ SUBSYSTEM_DEF(ticker)
 					cinematic.icon_state = null
 					flick("intro_cult",cinematic)
 					sleep(25)
-					world << sound('sound/magic/enter_blood.ogg')
+					SEND_SOUND(world, sound('sound/magic/enter_blood.ogg'))
 					sleep(28)
-					world << sound('sound/machines/terminal_off.ogg')
+					SEND_SOUND(world, sound('sound/machines/terminal_off.ogg'))
 					sleep(20)
 					flick("station_corrupted",cinematic)
-					world << sound('sound/effects/ghost.ogg')
+					SEND_SOUND(world, sound('sound/effects/ghost.ogg'))
 					actually_blew_up = FALSE
 				if("gang war") //Gang Domination (just show the override screen)
 					cinematic.icon_state = "intro_malf_still"
@@ -323,19 +323,19 @@ SUBSYSTEM_DEF(ticker)
 				if("fake") //The round isn't over, we're just freaking people out for fun
 					flick("intro_nuke",cinematic)
 					sleep(35)
-					world << sound('sound/items/bikehorn.ogg')
+					SEND_SOUND(world, sound('sound/items/bikehorn.ogg'))
 					flick("summary_selfdes",cinematic)
 					actually_blew_up = FALSE
 				else
 					flick("intro_nuke",cinematic)
 					sleep(35)
-					world << sound('sound/effects/explosionfar.ogg')
+					SEND_SOUND(world, sound('sound/effects/explosion_distant.ogg'))
 					station_explosion_detonation(bomb)


 		if(NUKE_MISS_STATION || NUKE_SYNDICATE_BASE)	//nuke was nowhere nearby	//TODO: a really distant explosion animation
 			sleep(50)
-			world << sound('sound/effects/explosionfar.ogg')
+			SEND_SOUND(world, sound('sound/effects/explosion_distant.ogg'))
 			station_explosion_detonation(bomb)
 			actually_blew_up = station_missed == NUKE_SYNDICATE_BASE	//don't kill everyone on station if it detonated off station
 		else	//station was destroyed
@@ -346,42 +346,42 @@ SUBSYSTEM_DEF(ticker)
 					flick("intro_nuke",cinematic)
 					sleep(35)
 					flick("station_explode_fade_red",cinematic)
-					world << sound('sound/effects/explosionfar.ogg')
+					SEND_SOUND(world, sound('sound/effects/explosion_distant.ogg'))
 					station_explosion_detonation(bomb)
 					cinematic.icon_state = "summary_nukewin"
 				if("AI malfunction") //Malf (screen,explosion,summary)
 					flick("intro_malf",cinematic)
 					sleep(76)
 					flick("station_explode_fade_red",cinematic)
-					world << sound('sound/effects/explosionfar.ogg')
+					SEND_SOUND(world, sound('sound/effects/explosion_distant.ogg'))
 					station_explosion_detonation(bomb)	//TODO: If we ever decide to actually detonate the vault bomb
 					cinematic.icon_state = "summary_malf"
 				if("blob") //Station nuked (nuke,explosion,summary)
 					flick("intro_nuke",cinematic)
 					sleep(35)
 					flick("station_explode_fade_red",cinematic)
-					world << sound('sound/effects/explosionfar.ogg')
+					SEND_SOUND(world, sound('sound/effects/explosion_distant.ogg'))
 					station_explosion_detonation(bomb)	//TODO: no idea what this case could be
 					cinematic.icon_state = "summary_selfdes"
 				if("cult") //Station nuked (nuke,explosion,summary)
 					flick("intro_nuke",cinematic)
 					sleep(35)
 					flick("station_explode_fade_red",cinematic)
-					world << sound('sound/effects/explosionfar.ogg')
+					SEND_SOUND(world, sound('sound/effects/explosion_distant.ogg'))
 					station_explosion_detonation(bomb)	//TODO: no idea what this case could be
 					cinematic.icon_state = "summary_cult"
 				if("no_core") //Nuke failed to detonate as it had no core
 					flick("intro_nuke",cinematic)
 					sleep(35)
 					flick("station_intact",cinematic)
-					world << sound('sound/ambience/signal.ogg')
+					SEND_SOUND(world, sound('sound/ambience/signal.ogg'))
 					addtimer(CALLBACK(src, .proc/finish_cinematic, null, FALSE), 100)
 					return	//Faster exit, since nothing happened
 				else //Station nuked (nuke,explosion,summary)
 					flick("intro_nuke",cinematic)
 					sleep(35)
 					flick("station_explode_fade_red", cinematic)
-					world << sound('sound/effects/explosionfar.ogg')
+					SEND_SOUND(world, sound('sound/effects/explosion_distant.ogg'))
 					station_explosion_detonation(bomb)
 					cinematic.icon_state = "summary_selfdes"
 	//If its actually the end of the round, wait for it to end.
@@ -479,7 +479,7 @@ SUBSYSTEM_DEF(ticker)
 					var/list/area/shuttle_areas
 					if(SSshuttle && SSshuttle.emergency)
 						shuttle_areas = SSshuttle.emergency.shuttle_areas
-					if(!Player.onCentcom() && !Player.onSyndieBase())
+					if(!Player.onCentCom() && !Player.onSyndieBase())
 						to_chat(Player, "<font color='blue'><b>You managed to survive, but were marooned on [station_name()]...</b></FONT>")
 					else
 						num_escapees++
@@ -636,7 +636,7 @@ SUBSYSTEM_DEF(ticker)
 			if(living_player_count() < config.hard_popcap)
 				if(next_in_line && next_in_line.client)
 					to_chat(next_in_line, "<span class='userdanger'>A slot has opened! You have approximately 20 seconds to join. <a href='?src=\ref[next_in_line];late_join=override'>\>\>Join Game\<\<</a></span>")
-					next_in_line << sound('sound/misc/notice1.ogg')
+					SEND_SOUND(next_in_line, sound('sound/misc/notice1.ogg'))
 					next_in_line.LateChoices()
 					return
 				queued_players -= next_in_line //Client disconnected, remove he
@@ -804,7 +804,7 @@ SUBSYSTEM_DEF(ticker)
 /datum/controller/subsystem/ticker/proc/save_mode(the_mode)
 	var/F = file("data/mode.txt")
 	fdel(F)
-	F << the_mode
+	WRITE_FILE(F, the_mode)

 /datum/controller/subsystem/ticker/proc/SetRoundEndSound(the_sound)
 	set waitfor = FALSE
@@ -858,4 +858,4 @@ SUBSYSTEM_DEF(ticker)
 		'sound/roundend/disappointed.ogg'\
 		)

-	world << sound(round_end_sound)
+	SEND_SOUND(world, sound(round_end_sound))
@@ -53,7 +53,7 @@ SUBSYSTEM_DEF(title)
 /datum/controller/subsystem/title/Shutdown()
 	if(file_path)
 		var/F = file("data/previous_title.dat")
-		F << file_path
+		WRITE_FILE(F, file_path)

 	for(var/thing in GLOB.clients)
 		if(!thing)
@@ -169,7 +169,7 @@

 /datum/action/item_action/toggle_firemode
 	name = "Toggle Firemode"
-	
+
 /datum/action/item_action/rcl
 	name = "Change Cable Color"
 	button_icon_state = "rcl_rainbow"
@@ -417,6 +417,7 @@
 	button_icon_state = "smoke"

 /datum/action/item_action/ninjaboost
+	check_flags = AB_CHECK_RESTRAINED|AB_CHECK_CONSCIOUS
 	name = "Adrenaline Boost"
 	desc = "Inject a secret chemical that will counteract all movement-impairing effect."
 	button_icon_state = "repulse"
@@ -489,7 +490,8 @@
 	var/obj/effect/proc_holder/spell/S = target
 	S.action = src
 	name = S.name
-	icon_icon = S.action_icon
+	desc = S.desc
+	button_icon = S.action_icon
 	button_icon_state = S.action_icon_state
 	background_icon_state = S.action_background_icon_state
 	button.name = name
@@ -23,6 +23,7 @@
 /datum/antagonist/traitor/human
 	should_specialise = FALSE
 	var/should_equip = TRUE
+
 /datum/antagonist/traitor/human/custom
 	silent = TRUE
 	should_give_codewords = FALSE
@@ -31,6 +32,7 @@

 /datum/antagonist/traitor/AI
 	should_specialise = FALSE
+
 /datum/antagonist/traitor/AI/custom
 	silent = TRUE
 	should_give_codewords = FALSE
@@ -38,9 +40,8 @@


 /datum/antagonist/traitor/on_body_transfer(mob/living/old_body, mob/living/new_body)
-	if(issilicon(new_body) && issilicon(old_body))
-		..()
-	else
+	// human <-> silicon only
+	if(old_body && issilicon(new_body) ^ issilicon(old_body))
 		silent = TRUE
 		owner.add_antag_datum(base_datum_custom)
 		for(var/datum/antagonist/traitor/new_datum in owner.antag_datums)
@@ -49,13 +50,14 @@
 			transfer_important_variables(new_datum)
 			break
 		on_removal()
-
-
+	else
+		..()

 /datum/antagonist/traitor/human/custom //used to give custom objectives
 	silent = TRUE
 	give_objectives = FALSE
 	should_give_codewords = FALSE
+
 /datum/antagonist/traitor/AI/custom //used to give custom objectives
 	silent = TRUE
 	give_objectives = FALSE
@@ -83,7 +85,8 @@
 	if(owner.assigned_role == "Clown")
 		var/mob/living/carbon/human/traitor_mob = owner.current
 		if(traitor_mob&&istype(traitor_mob))
-			if(!silent) to_chat(traitor_mob, "Your training has allowed you to overcome your clownish nature, allowing you to wield weapons without harming yourself.")
+			if(!silent) 
+				to_chat(traitor_mob, "Your training has allowed you to overcome your clownish nature, allowing you to wield weapons without harming yourself.")
 			traitor_mob.dna.remove_mutation(CLOWNMUT)

 /datum/antagonist/traitor/remove_innate_effects()
@@ -280,7 +280,7 @@ GLOBAL_LIST_INIT(devil_suffix, list(" the Red", " the Soulless", " the Master",
 	if(!D)
 		return
 	to_chat(world, "<font size=5><span class='danger'><b>\"SLOTH, WRATH, GLUTTONY, ACEDIA, ENVY, GREED, PRIDE! FIRES OF HELL AWAKEN!!\"</font></span>")
-	world << 'sound/hallucinations/veryfar_noise.ogg'
+	SEND_SOUND(world, sound('sound/hallucinations/veryfar_noise.ogg'))
 	give_appropriate_spells()
 	D.convert_to_archdevil()
 	if(istype(D.loc, /obj/effect/dummy/slaughter/))
@@ -141,7 +141,7 @@


 /datum/antagonist/ninja/greet()
-	owner.current << sound('sound/effects/ninja_greeting.ogg')
+	SEND_SOUND(owner.current, sound('sound/effects/ninja_greeting.ogg'))
 	to_chat(owner.current, "I am an elite mercenary assassin of the mighty Spider Clan. A <font color='red'><B>SPACE NINJA</B></font>!")
 	to_chat(owner.current, "Surprise is my weapon. Shadows are my armor. Without them, I am nothing. (//initialize your suit by right clicking on it, to use abilities like stealth)!")
 	to_chat(owner.current, "Officially, [helping_station?"Nanotrasen":"The Syndicate"] are my employer.")
@@ -100,3 +100,57 @@
 	if (object == GLOBAL_PROC)
 		return call(delegate)(arglist(calling_arguments))
 	return call(object, delegate)(arglist(calling_arguments))
+
+
+/datum/callback_select
+	var/list/finished
+	var/pendingcount
+	var/total
+
+/datum/callback_select/New(count, savereturns)
+	total = count
+	if (savereturns)
+		finished = new(count)
+
+
+/datum/callback_select/proc/invoke_callback(index, datum/callback/callback, list/callback_args, savereturn = TRUE)
+	set waitfor = FALSE
+	if (!callback || !istype(callback))
+		//This check only exists because the alternative is callback_select would block forever if given invalid data
+		CRASH("invalid callback passed to invoke_callback")
+	if (!length(callback_args))
+		callback_args = list()
+	pendingcount++
+	var/rtn = callback.Invoke(arglist(callback_args))
+	pendingcount--
+	if (savereturn)
+		finished[index] = rtn
+
+
+
+
+//runs a list of callbacks asynchronously, returning once all of them return.
+//callbacks can be repeated.
+//callbacks-args is a optional list of argument lists, in the same order as the callbacks,
+//	the inner lists will be sent to the callbacks when invoked() as additional args.
+//can optionly save and return a list of return values, in the same order as the original list of callbacks
+//resolution is the number of byond ticks between checks.
+/proc/callback_select(list/callbacks, list/callback_args, savereturns = TRUE, resolution = 1)
+	if (!callbacks)
+		return
+	var/count = length(callbacks)
+	if (!count)
+		return
+	if (!callback_args)
+		callback_args = list()
+
+	callback_args.len = count
+
+	var/datum/callback_select/CS = new(count, savereturns)
+	for (var/i in 1 to count)
+		CS.invoke_callback(i, callbacks[i], callback_args[i], savereturns)
+	
+	while(CS.pendingcount)
+		sleep(resolution*world.tick_lag)
+	return CS.finished
+
@@ -0,0 +1,62 @@
+diff a/code/datums/callback.dm b/code/datums/callback.dm	(rejected hunks)
+@@ -100,60 +100,3 @@
+ 	if (object == GLOBAL_PROC)
+ 		return call(delegate)(arglist(calling_arguments))
+ 	return call(object, delegate)(arglist(calling_arguments))
+-
+-
+-/datum/callback_select
+-	var/list/finished
+-	var/pendingcount
+-	var/total
+-
+-/datum/callback_select/New(count, savereturns)
+-	total = count
+-	if (savereturns)
+-		finished = new(count)
+-
+-
+-/datum/callback_select/proc/invoke_callback(index, datum/callback/callback, list/callback_args, savereturn = TRUE)
+-	set waitfor = FALSE
+-	if (!callback || !istype(callback))
+-		//This check only exists because the alternative is callback_select would block forever if given invalid data
+-		CRASH("invalid callback passed to invoke_callback")
+-	if (!length(callback_args))
+-		callback_args = list()
+-	pendingcount++
+-	debug_usr("calling callback")
+-	var/rtn = callback.Invoke(arglist(callback_args))
+-	debug_usr("callback returned")
+-	pendingcount--
+-	if (savereturn)
+-		finished[index] = rtn
+-
+-
+-
+-
+-//runs a list of callbacks asynchronously, returning once all of them return.
+-//callbacks can be repeated.
+-//callbacks-args is a optional list of argument lists, in the same order as the callbacks,
+-//	the inner lists will be sent to the callbacks when invoked() as additional args.
+-//can optionly save and return a list of return values, in the same order as the original list of callbacks
+-//resolution is the number of byond ticks between checks.
+-/proc/callback_select(list/callbacks, list/callback_args, savereturns = TRUE, resolution = 1)
+-	if (!callbacks)
+-		return
+-	var/count = length(callbacks)
+-	if (!count)
+-		return
+-	if (!callback_args)
+-		callback_args = list()
+-
+-	callback_args.len = count
+-
+-	var/datum/callback_select/CS = new(count, savereturns)
+-	for (var/i in 1 to count)
+-		CS.invoke_callback(i, callbacks[i], callback_args[i], savereturns)
+-	debug_usr("starting callbacks: [CS.pendingcount]")
+-	while(CS.pendingcount)
+-		debug_usr("callbacks: [CS.pendingcount]")
+-		sleep(resolution*world.tick_lag)
+-	return CS.finished
+-
@@ -18,7 +18,38 @@
 					qdel(src)
 					return
 	P.SendSignal(COMSIG_COMPONENT_ADDED, src)
-	LAZYADD(P.datum_components, src)
+	
+	//lazy init the parent's dc list
+	var/list/dc = P.datum_components
+	if(!dc)
+		P.datum_components = dc = list()
+	
+	//set up the typecache
+	var/our_type = type
+	for(var/I in _GetInverseTypeListExceptRoot(our_type))
+		var/test = dc[I]
+		if(test)	//already another component of this type here
+			var/list/components_of_type
+			if(!islist(test))
+				components_of_type = list(test)
+				dc[I] = components_of_type
+			else
+				components_of_type = test
+			if(I == our_type)	//exact match, take priority
+				var/inserted = FALSE
+				for(var/J in 1 to components_of_type.len)
+					var/datum/component/C = components_of_type[J]
+					if(C.type != our_type) //but not over other exact matches
+						components_of_type.Insert(J, I)
+						inserted = TRUE
+						break
+				if(!inserted)
+					components_of_type += src
+			else	//indirect match, back of the line with ya
+				components_of_type += src
+		else	//only component of this type, no list
+			dc[I] = src
+
 	parent = P

 /datum/component/Destroy()
@@ -33,7 +64,20 @@
 /datum/component/proc/_RemoveNoSignal()
 	var/datum/P = parent
 	if(P)
-		LAZYREMOVE(P.datum_components, src)
+		var/list/dc = P.datum_components
+		var/our_type = type
+		for(var/I in _GetInverseTypeListExceptRoot(our_type))
+			var/list/components_of_type = dc[I]
+			if(islist(components_of_type))	//
+				var/list/subtracted = components_of_type - src
+				if(subtracted.len == 1)	//only 1 guy left
+					dc[I] = subtracted[1]	//make him special
+				else
+					dc[I] = subtracted
+			else	//just us
+				dc -= I
+		if(!dc.len)
+			P.datum_components = null
 		parent = null

 /datum/component/proc/RegisterSignal(sig_type, proc_on_self, override = FALSE)
@@ -66,6 +110,13 @@
 /datum/component/proc/OnTransfer(datum/new_parent)
 	return

+/datum/component/proc/_GetInverseTypeListExceptRoot(our_type_cached)
+	var/datum/component/current_type = our_type_cached
+	. = list()
+	while (current_type != /datum/component)
+		. += current_type
+		current_type = type2parent(current_type)
+
 /datum/proc/SendSignal(sigtype, ...)
 	var/list/comps = datum_components
 	. = FALSE
@@ -81,21 +132,32 @@
 	return

 /datum/proc/GetComponent(c_type)
-	for(var/I in datum_components)
-		if(istype(I, c_type))
-			return I
+	var/list/dc = datum_components
+	if(!dc)
+		return null
+	. = dc[c_type]
+	if(islist(.))
+		return .[1]

 /datum/proc/GetExactComponent(c_type)
-	for(var/I in datum_components)
-		var/datum/component/C = I
+	var/list/dc = datum_components
+	if(!dc)
+		return null
+	var/datum/component/C = dc[c_type]
+	if(C)
+		if(islist(C))
+			C = C[1]
 		if(C.type == c_type)
-			return I
+			return C
+	return null

 /datum/proc/GetComponents(c_type)
-	. = list()
-	for(var/I in datum_components)
-		if(istype(I, c_type))
-			. += I
+	var/list/dc = datum_components
+	if(!dc)
+		return null
+	. = dc[c_type]
+	if(!islist(.))
+		return list(.)

 /datum/proc/AddComponent(new_type, ...)
 	var/nt = new_type
@@ -1,63 +1 @@
-diff a/code/datums/components/component.dm b/code/datums/components/component.dm	(rejected hunks)
-@@ -26,7 +26,7 @@
- 	
- 	//set up the typecache
- 	var/our_type = type
-	for(var/I in _GetInverseTypeListExceptRoot(our_type))
-+	for(var/I in _GetInverseTypeList(our_type))
- 		var/test = dc[I]
- 		if(test)	//already another component of this type here
- 			var/list/components_of_type
-@@ -66,7 +66,7 @@
- 	if(P)
- 		var/list/dc = P.datum_components
- 		var/our_type = type
-		for(var/I in _GetInverseTypeListExceptRoot(our_type))
-+		for(var/I in _GetInverseTypeList(our_type))
- 			var/list/components_of_type = dc[I]
- 			if(islist(components_of_type))	//
- 				var/list/subtracted = components_of_type - src
-@@ -110,25 +110,33 @@
- /datum/component/proc/OnTransfer(datum/new_parent)
- 	return
- 
-/datum/component/proc/_GetInverseTypeListExceptRoot(our_type_cached)
-	var/datum/component/current_type = our_type_cached
-	. = list()
-+/datum/component/proc/_GetInverseTypeList(current_type)
-+	. = list(current_type)
- 	while (current_type != /datum/component)
-		. += current_type
- 		current_type = type2parent(current_type)
-+		. += current_type
- 
- /datum/var/list/datum_components //special typecache of /datum/component
- 
- /datum/proc/SendSignal(sigtype, ...)
- 	var/list/comps = datum_components
- 	. = FALSE
-	for(var/I in comps)
-		var/datum/component/C = I
-		if(!C.enabled)
-			continue
-		if(C.ReceiveSignal(arglist(args)))
-+	if(!comps)
-+		return
-+	var/target = comps[/datum/component]
-+	if(!islist(target))
-+		var/datum/component/C = target
-+		if(C.enabled && C.ReceiveSignal(arglist(args)))
- 			ComponentActivated(C)
-			. = TRUE
-+			return TRUE
-+	else
-+		for(var/I in target)
-+			var/datum/component/C = I
-+			if(!C.enabled)
-+				continue
-+			if(C.ReceiveSignal(arglist(args)))
-+				ComponentActivated(C)
-+				. = TRUE
- 
- /datum/proc/ComponentActivated(datum/component/C)
- 	return
+-
@@ -929,6 +929,26 @@
 			manipulate_organs(C)
 			href_list["datumrefresh"] = href_list["editorgans"]

+		else if(href_list["hallucinate"])
+			if(!check_rights(0))
+				return
+
+			var/mob/living/carbon/C = locate(href_list["hallucinate"]) in GLOB.mob_list
+			if(!istype(C))
+				to_chat(usr, "This can only be done to instances of type /mob/living/carbon")
+				return
+
+			var/list/hallucinations = subtypesof(/datum/hallucination)
+			var/result = input(usr, "Choose the hallucination to apply","Send Hallucination") as null|anything in hallucinations
+			if(!usr)
+				return
+			if(QDELETED(C))
+				to_chat(usr, "Mob doesn't exist anymore")
+				return
+
+			if(result)
+				new result(C, TRUE)
+
 		else if(href_list["makehuman"])
 			if(!check_rights(R_SPAWN))
 				return
@@ -59,4 +59,4 @@ Bonus
 		else
 			if(prob(base_message_chance))
 				to_chat(M, "<span class='userdanger'>[pick("Oh, your head...", "Your head pounds.", "They're everywhere! Run!", "Something in the shadows...")]</span>")
-			M.hallucination += (15 * power)
+			M.hallucination += (45 * power)
@@ -29,6 +29,10 @@
 	destination.dna.temporary_mutations = temporary_mutations.Copy()
 	if(transfer_SE)
 		destination.dna.struc_enzymes = struc_enzymes
+	if(ishuman(destination))
+		var/mob/living/carbon/human/H = destination
+		H.give_genitals(TRUE)//This gives the body the genitals of this DNA. Used for any transformations based on DNA
+	destination.flavor_text = destination.dna.features["flavor_text"] //Update the flavor_text to use new dna text

 /datum/dna/proc/copy_dna(datum/dna/new_dna)
 	new_dna.unique_enzymes = unique_enzymes
@@ -228,6 +232,7 @@

 	if(newfeatures)
 		dna.features = newfeatures
+		flavor_text = dna.features["flavor_text"] //Update the flavor_text to use new dna text

 	if(mrace)
 		set_species(mrace, icon_update=0)
@@ -247,6 +252,8 @@
 		dna.struc_enzymes = se
 		domutcheck()

+	give_genitals(TRUE)//Give all genitalia that DNA says you should have, remove any pre-existing ones as this is a hardset!
+
 	if(mrace || newfeatures || ui)
 		update_body()
 		update_hair()
@@ -11,7 +11,7 @@

    var/minetype = "lavaland"

-    var/list/transition_config = list(CENTCOMM = SELFLOOPING,
+    var/list/transition_config = list(CENTCOM = SELFLOOPING,
 									MAIN_STATION = CROSSLINKED,
                                    EMPTY_AREA_1 = CROSSLINKED,
                                    EMPTY_AREA_2 = CROSSLINKED,
@@ -115,8 +115,8 @@
            return UNAFFECTED
        if("MAIN_STATION")
            return MAIN_STATION
-        if("CENTCOMM")
-            return CENTCOMM
+        if("CENTCOM")
+            return CENTCOM
        if("MINING")
            return MINING
        if("EMPTY_AREA_1")
@@ -120,6 +120,10 @@
 	transfer_martial_arts(new_character)
 	if(active || force_key_move)
 		new_character.key = key		//now transfer the key to link the client to our new body
+	if(isliving(new_character)) //New humans and such are by default enabled arousal. Let's always use the new mind's prefs.
+		var/mob/living/L = new_character
+		L.canbearoused = L.client.prefs.arousable //Technically this should make taking over a character mean the body gain the new minds setting...
+		L.update_arousal_hud() //Removes the old icon

 /datum/mind/proc/store_memory(new_text)
 	memory += "[new_text]<BR>"
@@ -396,7 +400,15 @@
 		if (assigned_role in GLOB.command_positions)
 			text += "<b>HEAD</b>|loyal|employee|headrev|rev"
 		else if (src in SSticker.mode.head_revolutionaries)
-			text += "head|loyal|<a href='?src=\ref[src];revolution=clear'>employee</a>|<b>HEADREV</b>|<a href='?src=\ref[src];revolution=rev'>rev</a>"
+			var/last_healthy_headrev = TRUE
+			for(var/I in SSticker.mode.head_revolutionaries)
+				if(I == src)
+					continue
+				var/mob/M = I
+				if(M.z == ZLEVEL_STATION && !M.stat)
+					last_healthy_headrev = FALSE
+					break
+			text += "head|loyal|<a href='?src=\ref[src];revolution=clear'>employee</a>|<b>[last_healthy_headrev ? "<font color='red'>LAST </font> " : ""]HEADREV</b>|<a href='?src=\ref[src];revolution=rev'>rev</a>"
 			text += "<br>Flash: <a href='?src=\ref[src];revolution=flash'>give</a>"

 			var/list/L = current.get_contents()
@@ -801,11 +813,11 @@
 						possible_targets += possible_target.current

 				var/mob/def_target = null
-				var/objective_list[] = list(/datum/objective/assassinate, /datum/objective/protect, /datum/objective/debrain, /datum/objective/maroon)
-				if (objective&&(objective.type in objective_list) && objective:target)
-					def_target = objective:target.current
+				var/list/objective_list = typecacheof(list(/datum/objective/assassinate, /datum/objective/protect, /datum/objective/debrain, /datum/objective/maroon))
+				if (is_type_in_typecache(objective, objective_list) && objective.target)
+					def_target = objective.target.current

-				var/new_target = input("Select target:", "Objective target", def_target) as null|anything in possible_targets
+				var/mob/new_target = input("Select target:", "Objective target", def_target) as null|anything in possible_targets
 				if (!new_target)
 					return

@@ -813,12 +825,12 @@
 				if (new_target == "Free objective")
 					new_objective = new objective_path
 					new_objective.owner = src
-					new_objective:target = null
+					new_objective.target = null
 					new_objective.explanation_text = "Free objective"
 				else
 					new_objective = new objective_path
 					new_objective.owner = src
-					new_objective:target = new_target:mind
+					new_objective.target = new_target.mind
 					//Will display as special role if the target is set as MODE. Ninjas/commandos/nuke ops.
 					new_objective.update_explanation_text()

@@ -1690,10 +1702,7 @@

 	else
 		mind = new /datum/mind(key)
-		if(SSticker)
-			SSticker.minds += mind
-		else
-			stack_trace("mind_initialize(): No SSticker ready")
+		SSticker.minds += mind
 	if(!mind.name)
 		mind.name = real_name
 	mind.current = src
@@ -82,7 +82,7 @@
 	id = "derelict4"
 	suffix = "derelict4.dmm"
 	name = "Derelict 4"
-	description = "Centcom ferries have never crashed, will never crash, there is no current investigation into a crashed ferry, and we will not let Internal Affairs trample over high security \
+	description = "CentCom ferries have never crashed, will never crash, there is no current investigation into a crashed ferry, and we will not let Internal Affairs trample over high security \
 	information in the name of this baseless witchhunt."

 /datum/map_template/ruin/space/derelict5
@@ -133,7 +133,7 @@
 /datum/map_template/shuttle/emergency/cramped
 	suffix = "cramped"
 	name = "Secure Transport Vessel 5 (STV5)"
-	description = "Well, looks like Centcomm only had this ship in the area, they probably weren't expecting you to need evac for a while. \
+	description = "Well, looks like CentCom only had this ship in the area, they probably weren't expecting you to need evac for a while. \
 	Probably best if you don't rifle around in whatever equipment they were transporting. I hope you're friendly with your coworkers, because there is very little space in this thing.\n\
 	\n\
 	Contains contraband armory guns, maintenance loot, and abandoned crates!"
@@ -181,7 +181,7 @@
 	suffix = "supermatter"
 	name = "Hyperfractal Gigashuttle"
 	description = "\"I dunno, this seems kinda needlessly complicated.\"\n\
-	\"This shuttle has very a very high safety record, according to Centcom Officer Cadet Yins.\"\n\
+	\"This shuttle has very a very high safety record, according to CentCom Officer Cadet Yins.\"\n\
 	\"Are you sure?\"\n\
 	\"Yes, it has a safety record of N-A-N, which is apparently larger than 100%.\""
 	admin_notes = "Supermatter that spawns on shuttle is special anchored 'hugbox' supermatter that cannot take damage and does not take in or emit gas. \
@@ -215,7 +215,7 @@
 /datum/map_template/shuttle/ferry/base
 	suffix = "base"
 	name = "transport ferry"
-	description = "Standard issue Box/Metastation Centcom ferry."
+	description = "Standard issue Box/Metastation CentCom ferry."

 /datum/map_template/shuttle/ferry/meat
 	suffix = "meat"
@@ -267,7 +267,7 @@

 /datum/map_template/shuttle/emergency/raven
 	suffix = "raven"
-	name = "Centcomm Raven Battlecruiser"
-	description = "The Centcomm Raven Battlecruiser is currently docked at the Centcomm ship bay awaiting a mission, this Battlecruiser has been reassigned as an emergency escape shuttle for currently unknown reasons. The Centcomm Raven Battlecruiser should comfortably fit a medium to large crew size crew and is complete with all required facitlities including a top of the range Centcomm Medical Bay."
+	name = "CentCom Raven Battlecruiser"
+	description = "The CentCom Raven Battlecruiser is currently docked at the CentCom ship bay awaiting a mission, this Battlecruiser has been reassigned as an emergency escape shuttle for currently unknown reasons. The CentCom Raven Battlecruiser should comfortably fit a medium to large crew size crew and is complete with all required facitlities including a top of the range CentCom Medical Bay."
 	admin_notes = "The long way home"
 	credit_cost = 12500
@@ -37,7 +37,7 @@
 	icon_state = "shadow_mend"

 /datum/status_effect/void_price/tick()
-	owner << sound('sound/magic/summon_karp.ogg', volume = 25)
+	SEND_SOUND(owner, sound('sound/magic/summon_karp.ogg', volume = 25))
 	owner.adjustBruteLoss(3)


@@ -247,7 +247,7 @@
 	for(var/datum/mind/B in SSticker.mode.cult)
 		if(isliving(B.current))
 			var/mob/living/M = B.current
-			M << 'sound/hallucinations/veryfar_noise.ogg'
+			SEND_SOUND(M, sound('sound/hallucinations/veryfar_noise.ogg'))
 			to_chat(M, "<span class='cultlarge'>The Cult's Master, [owner], has fallen in \the [A]!</span>")

 /datum/status_effect/cult_master/tick()
@@ -69,7 +69,7 @@
 			if(telegraph_message)
 				to_chat(M, telegraph_message)
 			if(telegraph_sound)
-				M << sound(telegraph_sound)
+				SEND_SOUND(M, sound(telegraph_sound))
 	addtimer(CALLBACK(src, .proc/start), telegraph_duration)

 /datum/weather/proc/start()
@@ -83,7 +83,7 @@
 			if(weather_message)
 				to_chat(M, weather_message)
 			if(weather_sound)
-				M << sound(weather_sound)
+				SEND_SOUND(M, sound(weather_sound))
 	START_PROCESSING(SSweather, src)
 	addtimer(CALLBACK(src, .proc/wind_down), weather_duration)

@@ -98,7 +98,7 @@
 			if(end_message)
 				to_chat(M, end_message)
 			if(end_sound)
-				M << sound(end_sound)
+				SEND_SOUND(M, sound(end_sound))
 	STOP_PROCESSING(SSweather, src)
 	addtimer(CALLBACK(src, .proc/end), end_duration)

--- a/Show More
+++ b/Show More