Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into explosionport

2020-01-11 11:29:30 +08:00
parent 0b0b80f174 86beeb513c
commit 29b66db9e3
930 changed files with 28101 additions and 20202 deletions
@@ -28,7 +28,7 @@
 "g" = (
 /obj/structure/reagent_dispensers/water_cooler{
 	name = "punch cooler";
-	reagent_id = "bacchus_blessing"
+	reagent_id = /datum/reagent/consumable/ethanol/bacchus_blessing
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/wood{
@@ -3410,7 +3410,7 @@
 "lq" = (
 /obj/structure/table,
 /obj/item/reagent_containers/glass/beaker{
-	list_reagents = list("sacid" = 50)
+	list_reagents = list(/datum/reagent/toxin/acid = 50)
 	},
 /obj/item/paper/crumpled/bloody/ruins/thederelict/unfinished,
 /obj/item/pen,
@@ -967,10 +967,6 @@
 	},
 /turf/open/floor/plating,
 /area/awaymission/cabin)
-"dw" = (
-/obj/effect/mapping_helpers/planet_z,
-/turf/closed/indestructible/rock/snow,
-/area/space)

 (1,1,1) = {"
 aa
@@ -1227,7 +1223,7 @@ aa
 aa
 aa
 aa
-dw
+aa
 "}
 (2,1,1) = {"
 aa
@@ -4,9 +4,15 @@
 /turf/closed/indestructible/rock/snow,
 /area/awaymission/snowdin/cave/mountain)
 "ab" = (
-/obj/effect/mapping_helpers/planet_z,
-/turf/closed/indestructible/rock/snow,
-/area/awaymission/snowdin/cave/mountain)
+/obj/effect/turf_decal/tile/neutral{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 8
+	},
+/mob/living/simple_animal/hostile/netherworld/migo,
+/turf/open/floor/plasteel,
+/area/awaymission/snowdin/post/mining_dock)
 "ac" = (
 /turf/closed/indestructible/rock/snow,
 /area/awaymission/snowdin/cave/mountain)
@@ -10267,16 +10273,6 @@
 /obj/item/shard,
 /turf/open/floor/plating,
 /area/awaymission/snowdin/post/mining_dock)
-"xA" = (
-/mob/living/simple_animal/hostile/netherworld/migo,
-/obj/effect/turf_decal/tile/neutral{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 8
-	},
-/turf/open/floor/plasteel,
-/area/awaymission/snowdin/post/mining_dock)
 "xB" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
@@ -16013,7 +16009,7 @@ ac
 ac
 "}
 (2,1,1) = {"
-ab
+ac
 ac
 ac
 ac
@@ -66518,7 +66514,7 @@ wD
 wT
 xe
 xs
-xA
+ab
 xI
 xN
 wL
@@ -2251,10 +2251,6 @@
 	initial_gas_mix = "n2=23;o2=14"
 	},
 /area/awaymission/caves/BMP_asteroid)
-"gW" = (
-/obj/effect/mapping_helpers/planet_z,
-/turf/closed/indestructible/rock,
-/area/space/nearstation)
 "gX" = (
 /obj/effect/baseturf_helper/lava,
 /turf/closed/mineral/volcanic,
@@ -2536,7 +2532,7 @@ aa
 aa
 aa
 aa
-gW
+aa
 "}
 (2,1,1) = {"
 aa
@@ -7215,10 +7215,6 @@
 	heat_capacity = 1e+006
 	},
 /area/awaymission/moonoutpost19/research)
-"oV" = (
-/obj/effect/mapping_helpers/planet_z,
-/turf/open/space,
-/area/space)
 "vV" = (
 /obj/machinery/door/airlock/external,
 /obj/effect/mapping_helpers/airlock/cyclelink_helper{
@@ -7512,7 +7508,7 @@ aa
 aa
 aa
 aa
-oV
+aa
 "}
 (2,1,1) = {"
 aa
@@ -4,9 +4,15 @@
 /turf/closed/indestructible/rock/snow,
 /area/awaymission/snowdin/cave/mountain)
 "ab" = (
-/obj/effect/mapping_helpers/planet_z,
-/turf/closed/indestructible/rock/snow,
-/area/awaymission/snowdin/cave/mountain)
+/obj/effect/turf_decal/tile/neutral{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 8
+	},
+/mob/living/simple_animal/hostile/netherworld/migo,
+/turf/open/floor/plasteel,
+/area/awaymission/snowdin/post/mining_dock)
 "ac" = (
 /turf/closed/indestructible/rock/snow,
 /area/awaymission/snowdin/cave/mountain)
@@ -10331,16 +10337,6 @@
 /obj/item/shard,
 /turf/open/floor/plating,
 /area/awaymission/snowdin/post/mining_dock)
-"xA" = (
-/mob/living/simple_animal/hostile/netherworld/migo,
-/obj/effect/turf_decal/tile/neutral{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 8
-	},
-/turf/open/floor/plasteel,
-/area/awaymission/snowdin/post/mining_dock)
 "xB" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
@@ -16108,7 +16104,7 @@ ac
 ac
 "}
 (2,1,1) = {"
-ab
+ac
 ac
 ac
 ac
@@ -66613,7 +66609,7 @@ wD
 wT
 xe
 xs
-xA
+ab
 xI
 xN
 wL
@@ -5,6 +5,16 @@
 "ab" = (
 /turf/open/space,
 /area/space)
+"ac" = (
+/obj/effect/turf_decal/tile/blue{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/blue{
+	dir = 8
+	},
+/mob/living/simple_animal/hostile/syndicate/melee/sword,
+/turf/open/floor/plasteel,
+/area/awaymission/spacebattle/cruiser)
 "ad" = (
 /obj/structure/shuttle/engine/propulsion/right{
 	dir = 1
@@ -2597,16 +2607,6 @@
 /obj/effect/spawner/lootdrop/armory_contraband,
 /turf/open/floor/plating,
 /area/awaymission/spacebattle/cruiser)
-"jK" = (
-/mob/living/simple_animal/hostile/syndicate/melee/sword,
-/obj/effect/turf_decal/tile/blue{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/blue{
-	dir = 8
-	},
-/turf/open/floor/plasteel,
-/area/awaymission/spacebattle/cruiser)
 "jL" = (
 /obj/machinery/door/poddoor{
 	id = "spacebattlearmory";
@@ -2894,10 +2894,6 @@
 /obj/item/mecha_parts/mecha_equipment/weapon/energy/ion,
 /turf/open/floor/plating,
 /area/awaymission/spacebattle/cruiser)
-"kM" = (
-/obj/effect/mapping_helpers/planet_z,
-/turf/closed/mineral/random,
-/area/space/nearstation)
 "vw" = (
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/awaymission/spacebattle/syndicate5)
@@ -3175,7 +3171,7 @@ aa
 aa
 aa
 aa
-kM
+aa
 "}
 (2,1,1) = {"
 aa
@@ -35686,10 +35682,10 @@ eC
 cn
 fL
 cp
-jK
+ac
 fs
 fO
-jK
+ac
 eM
 eM
 eM
@@ -25,6 +25,9 @@
 "ag" = (
 /turf/closed/wall/mineral/titanium,
 /area/awaymission/undergroundoutpost45/central)
+"ah" = (
+/turf/open/space,
+/area/space/nearstation)
 "aj" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel{
@@ -13945,10 +13948,6 @@
 	temperature = 363.9
 	},
 /area/awaymission/undergroundoutpost45/caves)
-"zi" = (
-/obj/effect/mapping_helpers/planet_z,
-/turf/open/space,
-/area/space/nearstation)
 "KE" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on{
 	dir = 4
@@ -14211,7 +14210,7 @@ aa
 aa
 aa
 aa
-zi
+ah
 "}
 (2,1,1) = {"
 aa
@@ -3528,7 +3528,6 @@
 	pixel_x = -22
 	},
 /obj/structure/rack,
-/obj/item/storage/fancy/donut_box,
 /obj/item/gun/energy/e_gun/dragnet,
 /obj/item/gun/energy/e_gun/dragnet,
 /obj/effect/turf_decal/tile/neutral{
@@ -4004,8 +4003,7 @@
 	dir = 8
 	},
 /obj/structure/rack,
-/obj/item/gun/energy/pumpaction/blaster,
-/obj/item/gun/energy/pumpaction/blaster,
+/obj/item/storage/fancy/donut_box,
 /turf/open/floor/plasteel/dark,
 /area/ai_monitored/security/armory)
 "ahJ" = (
@@ -27117,6 +27115,10 @@
 /obj/effect/turf_decal/tile/neutral{
 	dir = 2
 	},
+/obj/structure/sign/departments/custodian{
+	pixel_x = 32;
+	pixel_y = -32
+	},
 /turf/open/floor/plasteel,
 /area/hallway/primary/central)
 "baI" = (
@@ -83444,6 +83446,10 @@
 	},
 /turf/open/floor/plasteel/white,
 /area/science/lab)
+"iCn" = (
+/obj/machinery/vr_sleeper,
+/turf/open/floor/plasteel,
+/area/security/prison)
 "iLj" = (
 /obj/structure/table,
 /turf/open/floor/plating,
@@ -83462,6 +83468,16 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/open/floor/plasteel/dark,
 /area/crew_quarters/fitness/recreation)
+"jhu" = (
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/machinery/door/airlock/public/glass{
+	id_tag = "permahydro";
+	name = "Recreation Module"
+	},
+/turf/open/floor/plasteel,
+/area/security/prison)
 "jwW" = (
 /turf/closed/wall/mineral/plastitanium,
 /area/crew_quarters/fitness/recreation)
@@ -83519,16 +83535,6 @@
 "krD" = (
 /turf/closed/wall,
 /area/science/circuit)
-"kwg" = (
-/obj/structure/cable/yellow{
-	icon_state = "1-2"
-	},
-/obj/machinery/door/airlock/public/glass{
-	id_tag = "permahydro";
-	name = "Recreation Module"
-	},
-/turf/open/floor/plasteel,
-/area/security/prison)
 "kwI" = (
 /obj/item/wrench,
 /obj/item/clothing/suit/apron,
@@ -83589,10 +83595,6 @@
 	},
 /turf/open/floor/plasteel/white,
 /area/science/circuit)
-"kRT" = (
-/obj/machinery/vr_sleeper,
-/turf/open/floor/plasteel,
-/area/security/prison)
 "kVo" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
@@ -83612,13 +83614,6 @@
 /obj/item/integrated_circuit_printer,
 /turf/open/floor/plasteel/white,
 /area/science/circuit)
-"lmg" = (
-/obj/machinery/computer/arcade{
-	icon_state = "arcade";
-	dir = 1
-	},
-/turf/open/floor/plasteel,
-/area/security/prison)
 "lsv" = (
 /obj/machinery/power/apc{
 	areastring = "/area/science/circuit";
@@ -83667,6 +83662,10 @@
 	},
 /turf/open/floor/plating,
 /area/maintenance/starboard/fore)
+"lWL" = (
+/obj/machinery/smartfridge/organ/preloaded,
+/turf/closed/wall,
+/area/medical/surgery)
 "lWY" = (
 /obj/machinery/door/airlock/hatch{
 	name = "Telecomms Server Room"
@@ -83788,13 +83787,6 @@
 /obj/item/storage/fancy/candle_box,
 /turf/open/floor/engine/cult,
 /area/library)
-"oba" = (
-/obj/structure/chair/stool,
-/obj/machinery/light/small{
-	dir = 4
-	},
-/turf/open/floor/plasteel,
-/area/security/prison)
 "obb" = (
 /obj/structure/target_stake,
 /obj/effect/turf_decal/stripes/line{
@@ -84063,6 +84055,20 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/crew_quarters/cryopod)
+"ram" = (
+/obj/machinery/computer/arcade{
+	icon_state = "arcade";
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/security/prison)
+"roa" = (
+/obj/structure/chair/stool,
+/obj/machinery/light/small{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/security/prison)
 "rzX" = (
 /obj/structure/chair/office/light{
 	dir = 1;
@@ -84076,6 +84082,17 @@
 	},
 /turf/open/floor/plasteel/white,
 /area/science/lab)
+"rLV" = (
+/obj/structure/table,
+/obj/item/folder,
+/obj/item/paper/guides/jobs/hydroponics,
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/item/pen,
+/obj/item/storage/crayons,
+/turf/open/floor/plasteel,
+/area/security/prison)
 "rMS" = (
 /obj/machinery/status_display/supply,
 /turf/closed/wall,
@@ -84271,15 +84288,6 @@
 	},
 /turf/open/floor/plating,
 /area/maintenance/starboard)
-"uHA" = (
-/obj/structure/cable/yellow{
-	icon_state = "1-2"
-	},
-/obj/structure/cable/yellow{
-	icon_state = "2-8"
-	},
-/turf/open/floor/plasteel,
-/area/security/prison)
 "uJU" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
@@ -84364,10 +84372,6 @@
 /obj/structure/lattice,
 /turf/open/space/basic,
 /area/space)
-"vPN" = (
-/obj/machinery/smartfridge/organ/preloaded,
-/turf/closed/wall,
-/area/medical/surgery)
 "wdu" = (
 /obj/structure/grille,
 /obj/structure/lattice,
@@ -84440,17 +84444,6 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plasteel,
 /area/science/misc_lab)
-"xcb" = (
-/obj/structure/table,
-/obj/item/folder,
-/obj/item/paper/guides/jobs/hydroponics,
-/obj/structure/cable/yellow{
-	icon_state = "1-2"
-	},
-/obj/item/pen,
-/obj/item/storage/crayons,
-/turf/open/floor/plasteel,
-/area/security/prison)
 "xeC" = (
 /obj/machinery/light,
 /turf/open/floor/plasteel/dark,
@@ -84507,6 +84500,15 @@
 	},
 /turf/open/floor/plating,
 /area/maintenance/port/aft)
+"xIi" = (
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "2-8"
+	},
+/turf/open/floor/plasteel,
+/area/security/prison)
 "xVl" = (
 /turf/closed/wall,
 /area/hallway/secondary/service)
@@ -104237,7 +104239,7 @@ cia
 cia
 cpX
 cia
-vPN
+lWL
 cia
 ceu
 dyg
@@ -106710,11 +106712,11 @@ aaa
 aaf
 aaf
 aay
-xcb
-uHA
+rLV
+xIi
 abC
-kwg
-uHA
+jhu
+xIi
 abC
 abC
 acr
@@ -106968,10 +106970,10 @@ aaf
 aaa
 aax
 abl
-oba
-lmg
+roa
+ram
 aax
-kRT
+iCn
 aaR
 aaR
 aaI
@@ -3571,14 +3571,6 @@
 	},
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/lavaland/surface/outdoors)
-"Wt" = (
-/obj/effect/baseturf_helper/lava_land/surface,
-/turf/closed/wall,
-/area/mine/laborcamp/security)
-"Wz" = (
-/obj/effect/mapping_helpers/planet_z,
-/turf/open/lava/smooth/lava_land_surface,
-/area/lavaland/surface/outdoors)
 "WA" = (
 /obj/effect/mapping_helpers/airlock/cyclelink_helper{
 	dir = 8
@@ -3630,26 +3622,6 @@
 	},
 /turf/open/floor/plasteel,
 /area/mine/production)
-"WF" = (
-/obj/effect/baseturf_helper/lava_land/surface,
-/turf/closed/wall,
-/area/mine/laborcamp)
-"WH" = (
-/obj/effect/baseturf_helper/lava_land/surface,
-/turf/closed/wall,
-/area/mine/eva)
-"WI" = (
-/obj/effect/baseturf_helper/lava_land/surface,
-/turf/closed/wall,
-/area/mine/production)
-"WJ" = (
-/obj/effect/baseturf_helper/lava_land/surface,
-/turf/closed/wall/r_wall,
-/area/mine/maintenance)
-"WK" = (
-/obj/effect/baseturf_helper/lava_land/surface,
-/turf/closed/wall,
-/area/mine/living_quarters)

 (1,1,1) = {"
 aa
@@ -3906,7 +3878,7 @@ aj
 aj
 aj
 aj
-Wz
+aj
 "}
 (2,1,1) = {"
 aa
@@ -8751,7 +8723,7 @@ aq
 WB
 aq
 bi
-WF
+aq
 WC
 aq
 bZ
@@ -9012,7 +8984,7 @@ az
 az
 aq
 ca
-Wt
+ca
 ca
 aj
 aj
@@ -12102,7 +12074,7 @@ ai
 cQ
 dk
 dA
-WJ
+cQ
 ed
 er
 eM
@@ -13134,7 +13106,7 @@ dR
 ef
 es
 dZ
-WK
+cM
 fg
 cM
 cM
@@ -20320,9 +20292,9 @@ bt
 bH
 bV
 cq
-WH
+bf
+bq
 bq
-WI
 db
 bP
 bP
@@ -50,9 +50,7 @@
 /area/survivalpod)
 "l" = (
 /obj/structure/tubes,
-/obj/structure/chair/comfy/black{
-	dir = 8
-	},
+/obj/machinery/recharge_station,
 /turf/open/floor/pod,
 /area/survivalpod)
 "m" = (
@@ -67,8 +67,7 @@
 	layer = 3
 	},
 /obj/machinery/door/window/survival_pod{
-	dir = 1;
-	icon_state = "windoor"
+	dir = 1
 	},
 /turf/open/floor/carpet/black,
 /area/survivalpod)
@@ -133,7 +132,6 @@
 /area/survivalpod)
 "u" = (
 /obj/machinery/door/window/survival_pod{
-	icon_state = "windoor";
 	dir = 1
 	},
 /turf/open/floor/carpet/black,
@@ -169,10 +167,10 @@
 /area/survivalpod)
 "y" = (
 /obj/structure/sink/kitchen{
-	icon_state = "sink_alt";
 	dir = 4;
 	pixel_x = -13
 	},
+/obj/machinery/recharge_station/upgraded,
 /turf/open/floor/carpet/black,
 /area/survivalpod)
 "z" = (
@@ -0,0 +1,418 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/closed/wall/mineral/titanium/survival/pod,
+/area/survivalpod)
+"b" = (
+/obj/structure/sign/mining/survival{
+	dir = 1
+	},
+/turf/closed/wall/mineral/titanium/survival/pod,
+/area/survivalpod)
+"c" = (
+/turf/closed/wall/mineral/titanium/survival/nodiagonal,
+/area/survivalpod)
+"d" = (
+/obj/structure/sign/mining/survival{
+	dir = 1
+	},
+/turf/closed/wall/mineral/titanium/survival/nodiagonal,
+/area/survivalpod)
+"e" = (
+/obj/structure/sign/mining/survival{
+	dir = 8
+	},
+/turf/closed/wall/mineral/titanium/survival/nodiagonal,
+/area/survivalpod)
+"f" = (
+/obj/structure/table/wood/fancy/black,
+/obj/machinery/chem_dispenser/drinks,
+/turf/open/floor/pod/dark,
+/area/survivalpod)
+"g" = (
+/obj/structure/table/wood/fancy/black,
+/obj/machinery/chem_dispenser/drinks/beer,
+/obj/machinery/light{
+	dir = 1
+	},
+/turf/open/floor/pod/dark,
+/area/survivalpod)
+"h" = (
+/obj/machinery/vending/boozeomat,
+/turf/open/floor/pod/dark,
+/area/survivalpod)
+"i" = (
+/obj/item/book/manual/wiki/barman_recipes,
+/obj/item/reagent_containers/food/drinks/shaker,
+/obj/item/reagent_containers/rag,
+/obj/structure/table/wood/fancy/black,
+/turf/open/floor/pod/dark,
+/area/survivalpod)
+"j" = (
+/obj/structure/table/wood/fancy/black,
+/obj/item/clipboard,
+/obj/item/toy/figure/bartender,
+/turf/open/floor/pod/dark,
+/area/survivalpod)
+"k" = (
+/obj/structure/table/wood/fancy/black,
+/obj/item/storage/fancy/cigarettes/cigars,
+/obj/item/storage/fancy/cigarettes/cigars/cohiba{
+	pixel_y = 4
+	},
+/obj/item/storage/fancy/cigarettes/cigars/havana{
+	pixel_y = 8
+	},
+/turf/open/floor/pod/dark,
+/area/survivalpod)
+"l" = (
+/obj/structure/table/wood/fancy/black,
+/obj/structure/reagent_dispensers/beerkeg,
+/turf/open/floor/pod/dark,
+/area/survivalpod)
+"m" = (
+/obj/structure/closet/secure_closet/bar,
+/obj/machinery/light{
+	dir = 1
+	},
+/turf/open/floor/pod/dark,
+/area/survivalpod)
+"n" = (
+/obj/structure/disposalpipe/trunk{
+	dir = 4
+	},
+/obj/machinery/disposal/bin,
+/turf/open/floor/pod/dark,
+/area/survivalpod)
+"o" = (
+/obj/structure/sign/mining/survival{
+	dir = 4
+	},
+/obj/structure/disposalpipe/junction{
+	dir = 4
+	},
+/turf/closed/wall/mineral/titanium/survival/pod,
+/area/survivalpod)
+"p" = (
+/obj/machinery/door/airlock/survival_pod/glass{
+	req_access_txt = "25"
+	},
+/obj/structure/fans/tiny,
+/turf/open/floor/pod/dark,
+/area/survivalpod)
+"q" = (
+/turf/open/floor/pod/dark,
+/area/survivalpod)
+"r" = (
+/obj/structure/disposalpipe/segment,
+/turf/closed/wall/mineral/titanium/survival/nodiagonal,
+/area/survivalpod)
+"s" = (
+/obj/structure/table/reinforced,
+/obj/item/lighter{
+	pixel_x = -4;
+	pixel_y = 4
+	},
+/obj/item/lighter,
+/turf/open/floor/pod/dark,
+/area/survivalpod)
+"t" = (
+/obj/structure/table/reinforced,
+/turf/open/floor/pod/dark,
+/area/survivalpod)
+"u" = (
+/obj/structure/table/reinforced,
+/obj/item/storage/box/matches{
+	pixel_x = -4;
+	pixel_y = 8
+	},
+/turf/open/floor/pod/dark,
+/area/survivalpod)
+"v" = (
+/obj/machinery/door/window/survival_pod{
+	req_access_txt = "25"
+	},
+/turf/open/floor/pod/dark,
+/area/survivalpod)
+"w" = (
+/obj/structure/sign/mining/survival{
+	dir = 4
+	},
+/obj/structure/disposalpipe/segment,
+/turf/closed/wall/mineral/titanium/survival/nodiagonal,
+/area/survivalpod)
+"x" = (
+/obj/structure/chair/stool/bar,
+/turf/open/floor/carpet/black,
+/area/survivalpod)
+"y" = (
+/turf/open/floor/carpet/black,
+/area/survivalpod)
+"z" = (
+/obj/machinery/vending/cigarette/beach,
+/turf/open/floor/carpet/black,
+/area/survivalpod)
+"A" = (
+/obj/structure/disposalpipe/trunk{
+	dir = 4
+	},
+/obj/machinery/disposal/bin,
+/turf/open/floor/carpet/black,
+/area/survivalpod)
+"B" = (
+/obj/structure/sign/mining/survival{
+	dir = 4
+	},
+/obj/structure/disposalpipe/segment{
+	dir = 9
+	},
+/turf/closed/wall/mineral/titanium/survival/nodiagonal,
+/area/survivalpod)
+"C" = (
+/obj/structure/window/reinforced/survival_pod{
+	dir = 8
+	},
+/obj/structure/window/reinforced/survival_pod{
+	dir = 4
+	},
+/obj/structure/window/reinforced/survival_pod{
+	dir = 1
+	},
+/obj/structure/window/reinforced/survival_pod,
+/obj/structure/grille,
+/turf/open/floor/pod/dark,
+/area/survivalpod)
+"D" = (
+/obj/structure/chair/comfy/black,
+/turf/open/floor/carpet/black,
+/area/survivalpod)
+"E" = (
+/obj/machinery/door/airlock/survival_pod,
+/turf/open/floor/pod/light,
+/area/survivalpod)
+"F" = (
+/obj/structure/table/wood/fancy,
+/obj/item/reagent_containers/food/condiment/peppermill{
+	pixel_x = -4;
+	pixel_y = 12
+	},
+/obj/item/reagent_containers/food/condiment/saltshaker{
+	pixel_x = 4;
+	pixel_y = 4
+	},
+/turf/open/floor/carpet/black,
+/area/survivalpod)
+"G" = (
+/obj/structure/urinal{
+	pixel_y = 24
+	},
+/turf/open/floor/pod/light,
+/area/survivalpod)
+"H" = (
+/turf/open/floor/pod/light,
+/area/survivalpod)
+"I" = (
+/obj/structure/sink{
+	dir = 4;
+	pixel_x = 11
+	},
+/obj/machinery/light/small{
+	dir = 4
+	},
+/turf/open/floor/pod/light,
+/area/survivalpod)
+"J" = (
+/obj/structure/sign/mining/survival{
+	dir = 4
+	},
+/turf/closed/wall/mineral/titanium/survival/nodiagonal,
+/area/survivalpod)
+"K" = (
+/obj/structure/chair/comfy/black{
+	dir = 1
+	},
+/turf/open/floor/carpet/black,
+/area/survivalpod)
+"L" = (
+/obj/machinery/vending/snack/random,
+/turf/open/floor/carpet/black,
+/area/survivalpod)
+"M" = (
+/obj/machinery/light,
+/turf/open/floor/carpet/black,
+/area/survivalpod)
+"N" = (
+/obj/structure/toilet{
+	dir = 8
+	},
+/obj/machinery/light/small{
+	dir = 4
+	},
+/turf/open/floor/pod/light,
+/area/survivalpod)
+"O" = (
+/obj/structure/sign/mining/survival{
+	dir = 4
+	},
+/turf/closed/wall/mineral/titanium/survival/pod,
+/area/survivalpod)
+"P" = (
+/obj/structure/sign/mining/survival,
+/turf/closed/wall/mineral/titanium/survival/pod,
+/area/survivalpod)
+"Q" = (
+/obj/structure/sign/mining/survival,
+/turf/closed/wall/mineral/titanium/survival/nodiagonal,
+/area/survivalpod)
+"R" = (
+/obj/machinery/door/airlock/survival_pod/glass,
+/obj/structure/fans/tiny,
+/turf/open/floor/carpet/black,
+/area/survivalpod)
+"T" = (
+/obj/machinery/recharge_station/fullupgrade,
+/turf/open/floor/carpet/black,
+/area/survivalpod)
+
+(1,1,1) = {"
+a
+e
+p
+e
+c
+e
+C
+e
+C
+e
+a
+"}
+(2,1,1) = {"
+b
+f
+q
+s
+T
+y
+D
+F
+K
+L
+P
+"}
+(3,1,1) = {"
+c
+g
+q
+t
+x
+y
+y
+y
+y
+M
+c
+"}
+(4,1,1) = {"
+d
+h
+q
+t
+x
+y
+D
+F
+K
+y
+Q
+"}
+(5,1,1) = {"
+c
+i
+q
+u
+x
+y
+D
+F
+K
+y
+c
+"}
+(6,1,1) = {"
+d
+j
+q
+t
+x
+y
+y
+y
+y
+y
+R
+"}
+(7,1,1) = {"
+c
+k
+q
+t
+x
+y
+c
+c
+c
+c
+c
+"}
+(8,1,1) = {"
+d
+l
+q
+t
+x
+y
+c
+G
+H
+H
+Q
+"}
+(9,1,1) = {"
+c
+m
+q
+v
+y
+y
+E
+H
+c
+E
+c
+"}
+(10,1,1) = {"
+b
+n
+q
+t
+z
+A
+c
+I
+c
+N
+P
+"}
+(11,1,1) = {"
+a
+o
+r
+w
+r
+B
+c
+J
+c
+O
+a
+"}
@@ -9,13 +9,12 @@
 #define META_GAS_FUSION_POWER   7
 //ATMOS
 //stuff you should probably leave well alone!
-#define R_IDEAL_GAS_EQUATION	8.31446261815324	//kPa*L/(K*mol)
-#define ONE_ATMOSPHERE			101.325				//kPa
-#define TCMB					2.7					// -270.3degC
-#define TCRYO					225					// -48.15degC
-#define T0C						273.15				// 0degC
-#define T20C					293.15				// 20degC
-#define STEFANBOLTZMANN			(5.670373*10e-8) 	// W/(m^2*K^4)
+#define R_IDEAL_GAS_EQUATION	8.31	//kPa*L/(K*mol)
+#define ONE_ATMOSPHERE			101.325	//kPa
+#define TCMB					2.7		// -270.3degC
+#define TCRYO					225		// -48.15degC
+#define T0C						273.15	// 0degC
+#define T20C					293.15	// 20degC

 #define MOLES_CELLSTANDARD		(ONE_ATMOSPHERE*CELL_VOLUME/(T20C*R_IDEAL_GAS_EQUATION))	//moles in a 2.5 m^3 cell at 101.325 Pa and 20 degC
 #define M_CELL_WITH_RATIO		(MOLES_CELLSTANDARD * 0.005) //compared against for superconductivity
@@ -150,9 +149,9 @@

 //OPEN TURF ATMOS
 #define OPENTURF_DEFAULT_ATMOS		"o2=22;n2=82;TEMP=293.15" //the default air mix that open turfs spawn
-#define TCOMMS_ATMOS				"n2=100;TEMP=80" //-193,15°C telecommunications. also used for xenobiology slime killrooms
+#define TCOMMS_ATMOS				"n2=100;TEMP=80" //-193,15°C telecommunications. also used for xenobiology slime killrooms
 #define AIRLESS_ATMOS				"TEMP=2.7" //space
-#define FROZEN_ATMOS				"o2=22;n2=82;TEMP=180" //-93.15°C snow and ice turfs
+#define FROZEN_ATMOS				"o2=22;n2=82;TEMP=180" //-93.15°C snow and ice turfs
 #define BURNMIX_ATMOS				"o2=2500;plasma=5000;TEMP=370" //used in the holodeck burn test program

 //ATMOSPHERICS DEPARTMENT GAS TANK TURFS
@@ -109,8 +109,16 @@
 #define MEDIHOUND_SLEEPER	(1<<0)
 #define EATING_NOISES		(1<<1)
 #define DIGESTION_NOISES	(1<<2)
+#define BREAST_ENLARGEMENT	(1<<3)
+#define PENIS_ENLARGEMENT	(1<<4)
+#define FORCED_FEM			(1<<5)
+#define FORCED_MASC			(1<<6)
+#define HYPNO				(1<<7)
+#define NEVER_HYPNO			(1<<8)
+#define NO_APHRO			(1<<9)
+#define NO_ASS_SLAP			(1<<10)

-#define TOGGLES_CITADEL (EATING_NOISES|DIGESTION_NOISES)
+#define TOGGLES_CITADEL (EATING_NOISES|DIGESTION_NOISES|BREAST_ENLARGEMENT|PENIS_ENLARGEMENT)

 //component stuff
 #define COMSIG_COMBAT_TOGGLED "combatmode_toggled" //called by combat mode toggle on all equipped items. args: (mob/user, combatmode)
@@ -177,6 +177,7 @@
 #define COMSIG_MOB_PRE_PLAYER_CHANGE "mob_pre_player_change"	//sent to the target mob from base of /mob/transfer_ckey() and /mind/transfer_to(): (our_character, their_character)
 //	#define COMPONENT_STOP_MIND_TRANSFER 1
 #define COMSIG_MOB_UPDATE_SIGHT "mob_update_sight"				//from base of /mob/update_sight(): ()
+#define COMSIG_MOB_ON_NEW_MIND "mob_on_new_mind"			//called when a new mind is assigned to a mob: ()
 #define COMSIG_MOB_SAY "mob_say" // from /mob/living/say(): (proc args list)
 	#define COMPONENT_UPPERCASE_SPEECH 1
 	// used to access COMSIG_MOB_SAY argslist
@@ -0,0 +1,14 @@
+#define CURRENT_LIVING_PLAYERS	1
+#define CURRENT_LIVING_ANTAGS	2
+#define CURRENT_DEAD_PLAYERS	3
+#define CURRENT_OBSERVERS	    4
+
+#define NO_ASSASSIN				(1<<0)
+#define WAROPS_ALWAYS_ALLOWED	(1<<1)
+
+#define ONLY_RULESET       (1<<0)
+#define HIGHLANDER_RULESET (1<<1)
+#define TRAITOR_RULESET    (1<<2)
+#define MINOR_RULESET      (1<<3)
+
+#define RULESET_STOP_PROCESSING 1
@@ -130,33 +130,24 @@
 #define NECK		(1<<11)
 #define FULL_BODY	(~0)

+//flags for alternate styles: These are hard sprited so don't set this if you didn't put the effort in
+#define NORMAL_STYLE		0
+#define ALT_STYLE			1
+
 //flags for female outfits: How much the game can safely "take off" the uniform without it looking weird
 #define NO_FEMALE_UNIFORM			0
 #define FEMALE_UNIFORM_FULL			1
 #define FEMALE_UNIFORM_TOP			2

-//flags for alternate styles: These are hard sprited so don't set this if you didn't put the effort in
-#define NORMAL_STYLE		0
-#define ALT_STYLE			1
-
-#define NORMAL_SUIT_STYLE		0
-#define DIGITIGRADE_SUIT_STYLE 	1
-
-//Tauric Specific suits
-#define NOT_TAURIC			0
-#define SNEK_TAURIC			1
-#define PAW_TAURIC			2
-#define HOOF_TAURIC			3
-
-//Helmets/masks for muzzles or beaks
-#define NORMAL_FACED		0
-#define	MUZZLE_FACED		1
-#define	BEAKED_FACED		2
-
-//flags for outfits that have mutantrace variants (try not to use this): Currently only needed if you're trying to add tight fitting bootyshorts
-#define NO_MUTANTRACE_VARIATION		0
-#define MUTANTRACE_VARIATION		1
+//flags for outfits that have mutantrace variants: These are hard sprited too.
+#define STYLE_DIGITIGRADE		(1<<0) //jumpsuits, suits and shoes
+#define STYLE_MUZZLE			(1<<1) //hats or masks
+#define STYLE_SNEK_TAURIC		(1<<2) //taur-friendly suits
+#define STYLE_PAW_TAURIC		(1<<3)
+#define STYLE_HOOF_TAURIC		(1<<4)
+#define STYLE_ALL_TAURIC		(STYLE_SNEK_TAURIC|STYLE_PAW_TAURIC|STYLE_HOOF_TAURIC)

+//digitigrade legs settings.
 #define NOT_DIGITIGRADE				0
 #define FULL_DIGITIGRADE			1
 #define SQUISHED_DIGITIGRADE		2
@@ -38,8 +38,6 @@ require only minor tweaks.
 #define ZTRAIT_SPACE_RUINS "Space Ruins"
 #define ZTRAIT_LAVA_RUINS "Lava Ruins"
 #define ZTRAIT_ISOLATED_RUINS "Isolated Ruins" //Placing ruins on z levels with this trait will use turf reservation instead of usual placement.
-// prevents certain turfs from being stripped by a singularity
-#define ZTRAIT_PLANET "Planet"

 // number - bombcap is multiplied by this before being applied to bombs
 #define ZTRAIT_BOMBCAP_MULTIPLIER "Bombcap Multiplier"
@@ -60,11 +58,18 @@ require only minor tweaks.
 	// CROSSLINKED - mixed in with the cross-linked space pool
 	#define CROSSLINKED "Cross"

+// string - type path of the z-level's baseturf (defaults to space)
+#define ZTRAIT_BASETURF "Baseturf"
+
 // default trait definitions, used by SSmapping
 #define ZTRAITS_CENTCOM list(ZTRAIT_CENTCOM = TRUE)
 #define ZTRAITS_STATION list(ZTRAIT_LINKAGE = CROSSLINKED, ZTRAIT_STATION = TRUE)
 #define ZTRAITS_SPACE list(ZTRAIT_LINKAGE = CROSSLINKED, ZTRAIT_SPACE_RUINS = TRUE)
-#define ZTRAITS_LAVALAND list(ZTRAIT_MINING = TRUE, ZTRAIT_LAVA_RUINS = TRUE, ZTRAIT_BOMBCAP_MULTIPLIER = 5)
+#define ZTRAITS_LAVALAND list(\
+    ZTRAIT_MINING = TRUE, \
+    ZTRAIT_LAVA_RUINS = TRUE, \
+    ZTRAIT_BOMBCAP_MULTIPLIER = 5, \
+    ZTRAIT_BASETURF = /turf/open/lava/smooth/lava_land_surface)
 #define ZTRAITS_REEBE list(ZTRAIT_REEBE = TRUE, ZTRAIT_BOMBCAP_MULTIPLIER = 0.5)

 #define DL_NAME "name"
@@ -427,6 +427,7 @@ GLOBAL_LIST_INIT(pda_reskins, list(PDA_SKIN_CLASSIC = 'icons/obj/pda.dmi', PDA_S

 //Dummy mob reserve slots
 #define DUMMY_HUMAN_SLOT_PREFERENCES "dummy_preference_preview"
+#define DUMMY_HUMAN_SLOT_HOLOFORM			"dummy_holoform_generation"
 #define DUMMY_HUMAN_SLOT_ADMIN "admintools"
 #define DUMMY_HUMAN_SLOT_MANIFEST "dummy_manifest_generation"

@@ -528,3 +529,11 @@ GLOBAL_LIST_INIT(pda_reskins, list(PDA_SKIN_CLASSIC = 'icons/obj/pda.dmi', PDA_S
 #define FOURSPACES "&nbsp;&nbsp;&nbsp;&nbsp;"

 #define CRYOMOBS 'icons/obj/cryo_mobs.dmi'
+
+#define CUSTOM_HOLOFORM_DELAY		10 SECONDS			//prevents spamming to make lag. it's pretty expensive to do this.
+
+#define HOLOFORM_FILTER_AI		"FILTER_AI"
+#define HOLOFORM_FILTER_PAI		"FILTER_PAI"
+#define HOLOFORM_FILTER_STATIC	"FILTER_STATIC"
+
+#define CANT_REENTER_ROUND -1
@@ -47,6 +47,7 @@
 // Subsystems shutdown in the reverse of the order they initialize in
 // The numbers just define the ordering, they are meaningless otherwise.

+#define INIT_ORDER_FAIL2TOPIC		22
 #define INIT_ORDER_TITLE			20
 #define INIT_ORDER_GARBAGE			19
 #define INIT_ORDER_DBCORE			18
@@ -134,6 +134,7 @@
 #define TRAIT_NORUNNING			"norunning"		// You walk!
 #define TRAIT_NOMARROW			"nomarrow"		// You don't make blood, with chemicals or nanites.
 #define TRAIT_NOPULSE			"nopulse"		// Your heart doesn't beat.
+#define TRAIT_EXEMPT_HEALTH_EVENTS	"exempt-health-events"


 //non-mob traits
@@ -160,19 +161,18 @@
 #define TRAIT_TAGGER			"tagger"
 #define TRAIT_PHOTOGRAPHER		"photographer"
 #define TRAIT_MUSICIAN			"musician"
-#define TRAIT_CROCRIN_IMMUNE    "crocin_immune"
 #define TRAIT_NYMPHO			"nymphomania"
 #define TRAIT_MASO              "masochism"
 #define TRAIT_EXHIBITIONIST		"exhibitionist"
 #define	TRAIT_HIGH_BLOOD        "high_blood"
-#define TRAIT_PHARMA            "hepatic_pharmacokinesis"
 #define TRAIT_PARA              "paraplegic"
 #define TRAIT_EMPATH			"empath"
 #define TRAIT_FRIENDLY			"friendly"
-#define TRAIT_ASSBLASTUSA       "assblastusa"
 #define TRAIT_CULT_EYES 		"cult_eyes"
+#define TRAIT_AUTO_CATCH_ITEM	"auto_catch_item"
+#define TRAIT_CLOWN_MENTALITY	"clown_mentality" // The future is now, clownman.
 #define TRAIT_FREESPRINT		"free_sprinting"
-
+#define TRAIT_NO_ALCOHOL		"alcohol_intolerance"

 // common trait sources
 #define TRAIT_GENERIC "generic"
@@ -193,6 +193,7 @@
 #define ABSTRACT_ITEM_TRAIT "abstract-item"
 #define STATUS_EFFECT_TRAIT "status-effect"
 #define ROUNDSTART_TRAIT "roundstart" //cannot be removed without admin intervention
+#define GHOSTROLE_TRAIT "ghostrole"

 // unique trait sources, still defines
 #define STATUE_MUTE "statue"
@@ -228,6 +229,7 @@
 #define SLEEPING_CARP_TRAIT "sleeping_carp"
 #define RISING_BASS_TRAIT "rising_bass"
 #define ABDUCTOR_ANTAGONIST "abductor-antagonist"
+#define NUKEOP_ANTAGONIST "nukeop-antagonist"
 #define MADE_UNCLONEABLE "made-uncloneable"
 #define NUKEOP_TRAIT "nuke-op"
 #define DEATHSQUAD_TRAIT "deathsquad"
@@ -0,0 +1,6 @@
+#define PLURALITY_VOTING 0
+#define APPROVAL_VOTING 1
+#define RANKED_CHOICE_VOTING 2
+#define SCORE_VOTING 3
+
+GLOBAL_LIST_INIT(vote_score_options,list("Bad","Poor","Acceptable","Good","Great"))
@@ -78,7 +78,6 @@
 	if (CONFIG_GET(flag/log_manifest))
 		WRITE_LOG(GLOB.world_manifest_log, "[ckey] \\ [body.real_name] \\ [mind.assigned_role] \\ [mind.special_role ? mind.special_role : "NONE"] \\ [latejoin ? "LATEJOIN":"ROUNDSTART"]")

-
 /proc/log_say(text)
 	if (CONFIG_GET(flag/log_say))
 		WRITE_LOG(GLOB.world_game_log, "SAY: [text]")
@@ -121,7 +120,6 @@
 	if (CONFIG_GET(flag/log_vote))
 		WRITE_LOG(GLOB.world_game_log, "VOTE: [text]")

-
 /proc/log_topic(text)
 	WRITE_LOG(GLOB.world_game_log, "TOPIC: [text]")

@@ -141,6 +139,9 @@
 	if (CONFIG_GET(flag/log_job_debug))
 		WRITE_LOG(GLOB.world_job_debug_log, "JOB: [text]")

+/proc/log_subsystem(subsystem, text)
+	WRITE_LOG(GLOB.subsystem_log, "[subsystem]: [text]")
+
 /* Log to both DD and the logfile. */
 /proc/log_world(text)
 #ifdef USE_CUSTOM_ERROR_HANDLER
@@ -157,6 +158,8 @@
 	WRITE_LOG(GLOB.config_error_log, text)
 	SEND_TEXT(world.log, text)

+/proc/log_mapping(text)
+	WRITE_LOG(GLOB.world_map_error_log, text)

 /* For logging round startup. */
 /proc/start_log(log)
@@ -43,6 +43,13 @@
 	var/static/blacklisted_areas = typecacheof(list(
 		/area/space,
 		))
+
+	if(creator)
+		if(creator.create_area_cooldown >= world.time)
+			to_chat(creator, "<span class='warning'>You're trying to create a new area a little too fast.</span>")
+			return
+		creator.create_area_cooldown = world.time + 10
+
 	var/list/turfs = detect_room(get_turf(creator), area_or_turf_fail_types)
 	if(!turfs)
 		to_chat(creator, "<span class='warning'>The new area must be completely airtight and not a part of a shuttle.</span>")
@@ -97,6 +97,9 @@ GLOBAL_VAR_INIT(cmp_field, "name")
 /proc/cmp_numbered_displays_name_dsc(datum/numbered_display/A, datum/numbered_display/B)
 	return sorttext(B.sample_object.name, A.sample_object.name)

+/proc/cmp_reagents_asc(datum/reagent/a, datum/reagent/b)
+	return sorttext(initial(b.name),initial(a.name))
+
 /proc/cmp_quirk_asc(datum/quirk/A, datum/quirk/B)
 	var/a_sign = num2sign(initial(A.value) * -1)
 	var/b_sign = num2sign(initial(B.value) * -1)
@@ -0,0 +1,62 @@
+// Generates a holoform appearance
+// Equipment list is slot = path.
+/proc/generate_custom_holoform_from_prefs(datum/preferences/prefs, list/equipment_by_slot, list/inhand_equipment, copy_job = FALSE, apply_loadout = FALSE)
+	ASSERT(prefs)
+	var/mob/living/carbon/human/dummy/mannequin = generate_or_wait_for_human_dummy(DUMMY_HUMAN_SLOT_HOLOFORM)
+	prefs.copy_to(mannequin)
+	if(apply_loadout && prefs.parent)
+		SSjob.equip_loadout(prefs.parent.mob, mannequin, bypass_prereqs = TRUE)
+	if(copy_job)
+		var/datum/job/highest = prefs.get_highest_job()
+		if(highest && !istype(highest, /datum/job/ai) && !istype(highest, /datum/job/cyborg))
+			highest.equip(mannequin, TRUE, preference_source = prefs.parent)
+
+	if(length(equipment_by_slot))
+		for(var/slot in equipment_by_slot)
+			var/obj/item/I = new equipment_by_slot[slot]
+			mannequin.equip_to_slot_if_possible(I, slot, TRUE, TRUE, TRUE, TRUE)
+	if(length(inhand_equipment))
+		for(var/path in inhand_equipment)
+			var/obj/item/I = new path
+			mannequin.equip_to_slot_if_possible(I, SLOT_HANDS, TRUE, TRUE, TRUE, TRUE)
+
+
+	var/icon/combined = new
+	for(var/d in GLOB.cardinals)
+		mannequin.setDir(d)
+		COMPILE_OVERLAYS(mannequin)
+		CHECK_TICK
+		var/icon/capture = getFlatIcon(mannequin)
+		CHECK_TICK
+		combined.Insert(capture, dir = d)
+		CHECK_TICK
+
+	unset_busy_human_dummy(DUMMY_HUMAN_SLOT_HOLOFORM)
+	return combined
+
+/proc/process_holoform_icon_filter(icon/I, filter_type, clone = TRUE)
+	if(clone)
+		I = icon(I)		//Clone
+	switch(filter_type)
+		if(HOLOFORM_FILTER_AI)
+			I = getHologramIcon(I)
+		if(HOLOFORM_FILTER_STATIC)
+			I = getStaticIcon(I)
+		if(HOLOFORM_FILTER_PAI)
+			I = getPAIHologramIcon(I)
+	return I
+
+//Errors go to user.
+/proc/generate_custom_holoform_from_prefs_safe(datum/preferences/prefs, mob/user)
+	if(user)
+		if(user.client.prefs.last_custom_holoform > world.time - CUSTOM_HOLOFORM_DELAY)
+			to_chat(user, "<span class='boldwarning'>You are attempting to set your custom holoform too fast!</span>")
+			return
+	return generate_custom_holoform_from_prefs(prefs, null, null, TRUE, TRUE)
+
+//Prompts this client for custom holoform parameters.
+/proc/user_interface_custom_holoform(client/C)
+	var/datum/preferences/target_prefs = C.prefs
+	ASSERT(target_prefs)
+	//In the future, maybe add custom path allowances a la admin create outfit but for now..
+	return generate_custom_holoform_from_prefs_safe(target_prefs, C.mob)
@@ -444,12 +444,8 @@
 			candidates -= M

 /proc/pollGhostCandidates(Question, jobbanType, datum/game_mode/gametypeCheck, be_special_flag = 0, poll_time = 300, ignore_category = null, flashwindow = TRUE)
-	var/list/candidates = list()
-
-	for(var/mob/dead/observer/G in GLOB.player_list)
-		if(G.reenter_round_timeout < world.realtime)
-			candidates += G
-
+	var/datum/element/ghost_role_eligibility/eligibility = SSdcs.GetElement(/datum/element/ghost_role_eligibility)
+	var/list/candidates = eligibility.get_all_ghost_role_eligible()
 	return pollCandidates(Question, jobbanType, gametypeCheck, be_special_flag, poll_time, ignore_category, flashwindow, candidates)

 /proc/pollCandidates(Question, jobbanType, datum/game_mode/gametypeCheck, be_special_flag = 0, poll_time = 300, ignore_category = null, flashwindow = TRUE, list/group = null)
@@ -939,7 +939,7 @@ world
 				I.pixel_y++
 		add_overlay(I)//And finally add the overlay.

-/proc/getHologramIcon(icon/A, safety=1)//If safety is on, a new icon is not created.
+/proc/getHologramIcon(icon/A, safety = TRUE)//If safety is on, a new icon is not created.
 	var/icon/flat_icon = safety ? A : new(A)//Has to be a new icon to not constantly change the same icon.
 	flat_icon.ColorTone(rgb(125,180,225))//Let's make it bluish.
 	flat_icon.ChangeOpacity(0.5)//Make it half transparent.
@@ -947,6 +947,14 @@ world
 	flat_icon.AddAlphaMask(alpha_mask)//Finally, let's mix in a distortion effect.
 	return flat_icon

+/proc/getPAIHologramIcon(icon/A, safety = TRUE)
+	var/icon/flat_icon = safety? A : new(A)
+	flat_icon.SetIntensity(0.75, 1, 0.75)
+	flat_icon.ChangeOpacity(0.7)
+	var/icon/alpha_mask = new('icons/effects/effects.dmi', "scanlineslow")//Scanline effect.
+	flat_icon.AddAlphaMask(alpha_mask)//Finally, let's mix in a distortion effect.
+	return flat_icon
+
 //What the mob looks like as animated static
 //By vg's ComicIronic
 /proc/getStaticIcon(icon/A, safety = TRUE)
@@ -12,6 +12,3 @@
 #define is_reserved_level(z) SSmapping.level_trait(z, ZTRAIT_RESERVED)

 #define is_away_level(z) SSmapping.level_trait(z, ZTRAIT_AWAY)
-
-// If true, the singularity cannot strip away asteroid turf on this Z
-#define is_planet_level(z) SSmapping.level_trait(z, ZTRAIT_PLANET)
@@ -20,8 +20,6 @@
 		else
 			return "000"

-#define UNDIE_COLORABLE(U) (U?.has_color)
-
 /proc/random_underwear(gender)
 	if(!GLOB.underwear_list.len)
 		init_sprite_accessory_subtypes(/datum/sprite_accessory/underwear/bottom, GLOB.underwear_list, GLOB.underwear_m, GLOB.underwear_f)
@@ -19,6 +19,9 @@
 		var/list/mob_data = list()
 		if(isnewplayer(m))
 			continue
+		if (m.client && m.client.prefs && m.client.prefs.auto_ooc)
+			if (!(m.client.prefs.chat_toggles & CHAT_OOC))
+				m.client.prefs.chat_toggles ^= CHAT_OOC
 		if(m.mind)
 			if(m.stat != DEAD && !isbrain(m) && !iscameramob(m))
 				num_survivors++
@@ -758,16 +758,6 @@ GLOBAL_LIST_INIT(can_embed_types, typecacheof(list(
 	/obj/item/stack/rods,
 	/obj/item/pipe)))

-/proc/can_embed(obj/item/W)
-	if(W.get_sharpness())
-		return 1
-	if(is_pointed(W))
-		return 1
-
-	if(is_type_in_typecache(W, GLOB.can_embed_types))
-		return 1
-
-
 /*
 Checks if that loc and dir has an item on the wall
 */
@@ -115,5 +115,6 @@ GLOBAL_LIST_INIT(maintenance_loot, list(
 	/obj/item/clothing/shoes/kindleKicks = 1,
 	/obj/item/autosurgeon/penis = 1,
 	/obj/item/autosurgeon/testicles = 1,
+	/obj/item/storage/box/marshmallow = 2,
 	"" = 3
 	))
@@ -61,26 +61,6 @@ GLOBAL_LIST_EMPTY(latejoiners) //CIT CHANGE - All latejoining people, for traito
 		var/mob/M = i
 		M.update_config_movespeed()

-GLOBAL_LIST_INIT(noodle_taurs, list(
-		"Naga",
-		"Tentacle"
-		))
-
-GLOBAL_LIST_INIT(paw_taurs, list(
-		"Fox",
-		"Wolf",
-		"Otie",
-		"Drake",
-		"Lab",
-		"Shepherd",
-		"Husky",
-		"Eevee",
-		"Panther",
-		"Horse",
-		"Cow",
-		"Tiger"
-		))
-
 	//blood types
 GLOBAL_LIST_INIT(regular_bloods,list(
 		"O-",
@@ -28,6 +28,10 @@ GLOBAL_VAR(world_job_debug_log)
 GLOBAL_PROTECT(world_job_debug_log)
 GLOBAL_VAR(world_virus_log)
 GLOBAL_PROTECT(world_virus_log)
+GLOBAL_VAR(world_map_error_log)
+GLOBAL_PROTECT(world_map_error_log)
+GLOBAL_VAR(subsystem_log)
+GLOBAL_PROTECT(subsystem_log)

 GLOBAL_LIST_EMPTY(bombers)
 GLOBAL_PROTECT(bombers)
@@ -23,6 +23,8 @@ GLOBAL_VAR_INIT(bsa_unlock, FALSE)	//BSA unlocked by head ID swipes

 GLOBAL_LIST_EMPTY(player_details)	// ckey -> /datum/player_details

+GLOBAL_LIST_EMPTY(clientless_round_timeouts)	// ckey -> time that ckey can rejoin round
+
 // All religion stuff
 GLOBAL_VAR(religion)
 GLOBAL_VAR(deity)
@@ -98,17 +98,19 @@
 	take_damage(I.force, I.damtype, "melee", 1)

 /mob/living/attacked_by(obj/item/I, mob/living/user)
+	//CIT CHANGES START HERE - combatmode and resting checks
+	var/totitemdamage = I.force
+	if(iscarbon(user))
+		var/mob/living/carbon/tempcarb = user
+		if(!tempcarb.combatmode)
+			totitemdamage *= 0.5
+	if(user.resting)
+		totitemdamage *= 0.5
+	//CIT CHANGES END HERE
+	if(user != src && check_shields(I, totitemdamage, "the [I.name]", MELEE_ATTACK, I.armour_penetration))
+		return FALSE
 	send_item_attack_message(I, user)
 	if(I.force)
-	//CIT CHANGES START HERE - combatmode and resting checks
-		var/totitemdamage = I.force
-		if(iscarbon(user))
-			var/mob/living/carbon/tempcarb = user
-			if(!tempcarb.combatmode)
-				totitemdamage *= 0.5
-		if(user.resting)
-			totitemdamage *= 0.5
-	//CIT CHANGES END HERE
 		apply_damage(totitemdamage, I.damtype) //CIT CHANGE - replaces I.force with totitemdamage
 		if(I.damtype == BRUTE && !HAS_TRAIT(src, TRAIT_NOMARROW)) 
 			if(prob(33))
@@ -91,6 +91,8 @@
 		var/obj/item/clothing/gloves/G = gloves
 		if(istype(G) && G.Touch(A,0)) // for magic gloves
 			return
+	if (istype(glasses) && glasses.ranged_attack(src,A,mouseparams))
+		return

 	for(var/datum/mutation/human/HM in dna.mutations)
 		HM.on_ranged_attack(src, A, mouseparams)
@@ -14,6 +14,7 @@
 	var/list/modes			// allowed modes
 	var/list/gamemode_cache
 	var/list/votable_modes		// votable modes
+	var/list/storyteller_cache
 	var/list/mode_names
 	var/list/mode_reports
 	var/list/mode_false_report_weight
@@ -37,6 +38,7 @@
 		CRASH("/datum/controller/configuration/Load() called more than once!")
 	InitEntries()
 	LoadModes()
+	storyteller_cache = typecacheof(/datum/dynamic_storyteller, TRUE)
 	if(fexists("[directory]/config.txt") && LoadEntries("config.txt") <= 1)
 		var/list/legacy_configs = list("game_options.txt", "dbconfig.txt", "comms.txt")
 		for(var/I in legacy_configs)
@@ -227,13 +229,13 @@
 	for(var/T in gamemode_cache)
 		// I wish I didn't have to instance the game modes in order to look up
 		// their information, but it is the only way (at least that I know of).
+		// for future reference: just use initial() lol
 		var/datum/game_mode/M = new T()

 		if(M.config_tag)
 			if(!(M.config_tag in modes))		// ensure each mode is added only once
 				modes += M.config_tag
 				mode_names[M.config_tag] = M.name
-				probabilities[M.config_tag] = M.probability
 				mode_reports[M.config_tag] = M.generate_report()
 				if(probabilities[M.config_tag]>0)
 					mode_false_report_weight[M.config_tag] = M.false_report_weight
@@ -317,6 +319,14 @@
 			return new T
 	return new /datum/game_mode/extended()

+/datum/controller/configuration/proc/pick_storyteller(storyteller_name)
+	for(var/T in storyteller_cache)
+		var/datum/dynamic_storyteller/S = T
+		var/name = initial(S.name)
+		if(name && name == storyteller_name)
+			return T
+	return /datum/dynamic_storyteller/classic
+
 /datum/controller/configuration/proc/get_runnable_modes()
 	var/list/datum/game_mode/runnable_modes = new
 	var/list/probabilities = Get(/datum/config_entry/keyed_list/probability)
@@ -331,6 +341,9 @@
 		if(probabilities[M.config_tag]<=0)
 			qdel(M)
 			continue
+		if(M.config_tag in SSvote.stored_modetier_results && SSvote.stored_modetier_results[M.config_tag] < Get(/datum/config_entry/number/dropped_modes))
+			qdel(M)
+			continue
 		if(min_pop[M.config_tag])
 			M.required_players = min_pop[M.config_tag]
 		if(max_pop[M.config_tag])
@@ -0,0 +1,19 @@
+/datum/config_entry/number/fail2topic_rate_limit
+	config_entry_value = 10		//deciseconds
+
+/datum/config_entry/number/fail2topic_max_fails
+	config_entry_value = 5
+
+/datum/config_entry/string/fail2topic_rule_name
+	config_entry_value = "_dd_fail2topic"
+	protection = CONFIG_ENTRY_LOCKED		//affects physical server configuration, no touchies!!
+
+/datum/config_entry/flag/fail2topic_enabled
+	config_entry_value = TRUE
+
+/datum/config_entry/number/topic_max_size
+	config_entry_value = 8192
+
+/datum/config_entry/keyed_list/topic_rate_limit_whitelist
+	key_mode = KEY_MODE_TEXT
+	value_mode = VALUE_MODE_FLAG
@@ -378,17 +378,25 @@

 /datum/config_entry/keyed_list/box_random_engine
 	key_mode = KEY_MODE_TEXT
-	value_mode = VALUE_MODE_FLAG
+	value_mode = VALUE_MODE_NUM
 	lowercase = FALSE
-	splitter = "-"
+	splitter = ","

 /datum/config_entry/number/auto_transfer_delay
 	config_entry_value = 72000
 	min_val = 0

+/datum/config_entry/flag/pai_custom_holoforms
+
 /datum/config_entry/number/marauder_delay_non_reebe
 	config_entry_value = 1800
 	min_val = 0

 /datum/config_entry/flag/allow_clockwork_marauder_on_station
 	config_entry_value = TRUE
+
+/datum/config_entry/flag/modetier_voting
+	config_entry_value = TRUE
+
+/datum/config_entry/number/dropped_modes
+	config_entry_value = 3
@@ -54,7 +54,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
 	var/static/restart_clear = 0
 	var/static/restart_timeout = 0
 	var/static/restart_count = 0
-	
+
 	var/static/random_seed

 	//current tick limit, assigned before running a subsystem.
@@ -69,7 +69,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
 	if(!random_seed)
 		random_seed = (TEST_RUN_PARAMETER in world.params) ? 29051994 : rand(1, 1e9)
 		rand_seed(random_seed)
-	
+
 	var/list/_subsystems = list()
 	subsystems = _subsystems
 	if (Master != src)
@@ -155,6 +155,8 @@
 		if(SS_SLEEPING)
 			state = SS_PAUSING

+/datum/controller/subsystem/proc/subsystem_log(msg)
+	return log_subsystem(name, msg)

 //used to initialize the subsystem AFTER the map has loaded
 /datum/controller/subsystem/Initialize(start_timeofday)
@@ -162,7 +164,7 @@
 	var/time = (REALTIMEOFDAY - start_timeofday) / 10
 	var/msg = "Initialized [name] subsystem within [time] second[time == 1 ? "" : "s"]!"
 	to_chat(world, "<span class='boldannounce'>[msg]</span>")
-	log_world(msg)
+	log_subsystem("INIT", msg)
 	return time

 //hook for printing stats to the "MC" statuspanel for admins to see performance and related stats etc.
@@ -315,7 +315,7 @@ SUBSYSTEM_DEF(air)
 		var/starting_ats = active_turfs.len
 		sleep(world.tick_lag)
 		var/timer = world.timeofday
-		warning("There are [starting_ats] active turfs at roundstart, this is a mapping error caused by a difference of the air between the adjacent turfs. You can see its coordinates using \"Mapping -> Show roundstart AT list\" verb (debug verbs required)")
+		log_mapping("There are [starting_ats] active turfs at roundstart caused by a difference of the air between the adjacent turfs. You can see its coordinates using \"Mapping -> Show roundstart AT list\" verb (debug verbs required).")
 		for(var/turf/T in active_turfs)
 			GLOB.active_turfs_startlist += T

@@ -0,0 +1,113 @@
+SUBSYSTEM_DEF(fail2topic)
+	name = "Fail2Topic"
+	init_order = INIT_ORDER_FAIL2TOPIC
+	flags = SS_BACKGROUND
+	runlevels = ALL
+
+	var/list/rate_limiting = list()
+	var/list/fail_counts = list()
+	var/list/active_bans = list()
+
+	var/rate_limit
+	var/max_fails
+	var/rule_name
+	var/enabled = FALSE
+
+/datum/controller/subsystem/fail2topic/Initialize(timeofday)
+	rate_limit = CONFIG_GET(number/fail2topic_rate_limit)
+	max_fails = CONFIG_GET(number/fail2topic_max_fails)
+	rule_name = CONFIG_GET(string/fail2topic_rule_name)
+	enabled = CONFIG_GET(flag/fail2topic_enabled)
+
+	DropFirewallRule() // Clear the old bans if any still remain
+
+	if (world.system_type == UNIX && enabled)
+		enabled = FALSE
+		subsystem_log("DISABLED - UNIX systems are not supported.")
+	if(!enabled)
+		flags |= SS_NO_FIRE
+		can_fire = FALSE
+
+	return ..()
+
+/datum/controller/subsystem/fail2topic/fire()
+	while (rate_limiting.len)
+		var/ip = rate_limiting[1]
+		var/last_attempt = rate_limiting[ip]
+
+		if (world.time - last_attempt > rate_limit)
+			rate_limiting -= ip
+			fail_counts -= ip
+
+		if (MC_TICK_CHECK)
+			return
+
+/datum/controller/subsystem/fail2topic/Shutdown()
+	DropFirewallRule()
+
+/datum/controller/subsystem/fail2topic/proc/IsRateLimited(ip)
+	var/last_attempt = rate_limiting[ip]
+
+	var/static/datum/config_entry/keyed_list/topic_rate_limit_whitelist/cached_whitelist_entry
+	if(!istype(cached_whitelist_entry))
+		cached_whitelist_entry = CONFIG_GET(keyed_list/topic_rate_limit_whitelist)
+
+	if(istype(cached_whitelist_entry))
+		if(cached_whitelist_entry.config_entry_value[ip])
+			return FALSE
+
+	if (active_bans[ip])
+		return TRUE
+
+	rate_limiting[ip] = world.time
+
+	if (isnull(last_attempt))
+		return FALSE
+
+	if (world.time - last_attempt > rate_limit)
+		fail_counts -= ip
+		return FALSE
+	else
+		var/failures = fail_counts[ip]
+
+		if (isnull(failures))
+			fail_counts[ip] = 1
+			return TRUE
+		else if (failures > max_fails)
+			BanFromFirewall(ip)
+			return TRUE
+		else
+			fail_counts[ip] = failures + 1
+			return TRUE
+
+/datum/controller/subsystem/fail2topic/proc/BanFromFirewall(ip)
+	if (!enabled)
+		return
+
+	active_bans[ip] = world.time
+	fail_counts -= ip
+	rate_limiting -= ip
+
+	. = shell("netsh advfirewall firewall add rule name=\"[rule_name]\" dir=in interface=any action=block remoteip=[ip]")
+
+	if (.)
+		subsystem_log("Failed to ban [ip]. Exit code: [.].")
+	else if (isnull(.))
+		subsystem_log("Failed to invoke shell to ban [ip].")
+	else
+		subsystem_log("Banned [ip].")
+
+/datum/controller/subsystem/fail2topic/proc/DropFirewallRule()
+	if (!enabled)
+		return
+
+	active_bans = list()
+
+	. = shell("netsh advfirewall firewall delete rule name=\"[rule_name]\"")
+
+	if (.)
+		subsystem_log("Failed to drop firewall rule. Exit code: [.].")
+	else if (isnull(.))
+		subsystem_log("Failed to invoke shell for firewall rule drop.")
+	else
+		subsystem_log("Firewall rule dropped.")
@@ -658,7 +658,7 @@ SUBSYSTEM_DEF(job)
 		message_admins(msg)
 		CRASH(msg)

-/datum/controller/subsystem/job/proc/equip_loadout(mob/dead/new_player/N, mob/living/M, equipbackpackstuff)
+/datum/controller/subsystem/job/proc/equip_loadout(mob/dead/new_player/N, mob/living/M, equipbackpackstuff, bypass_prereqs = FALSE)
 	var/mob/the_mob = N
 	if(!the_mob)
 		the_mob = M // cause this doesn't get assigned if player is a latejoiner
@@ -671,7 +671,7 @@ SUBSYSTEM_DEF(job)
 			if(!G)
 				continue
 			var/permitted = TRUE
-			if(G.restricted_roles && G.restricted_roles.len && !(M.mind.assigned_role in G.restricted_roles))
+			if(!bypass_prereqs && G.restricted_roles && G.restricted_roles.len && !(M.mind.assigned_role in G.restricted_roles))
 				permitted = FALSE
 			if(G.donoritem && !G.donator_ckey_check(the_mob.client.ckey))
 				permitted = FALSE
@@ -13,13 +13,14 @@ SUBSYSTEM_DEF(persistence)
 	var/list/saved_messages = list()
 	var/list/saved_modes = list(1,2,3)
 	var/list/saved_dynamic_rules = list(list(),list(),list())
-	var/list/saved_threat_levels = list(1,1,1)
+	var/list/saved_storytellers = list("foo","bar","baz","foo again","bar again")
 	var/list/saved_maps
 	var/list/saved_trophies = list()
 	var/list/spawned_objects = list()
 	var/list/antag_rep = list()
 	var/list/antag_rep_change = list()
 	var/list/picture_logging_information = list()
+	var/list/saved_votes = list()
 	var/list/obj/structure/sign/picture_frame/photo_frames
 	var/list/obj/item/storage/photo_album/photo_albums

@@ -29,9 +30,12 @@ SUBSYSTEM_DEF(persistence)
 	LoadChiselMessages()
 	LoadTrophies()
 	LoadRecentModes()
-	LoadRecentThreats()
+	LoadRecentStorytellers()
+	LoadRecentRulesets()
 	LoadRecentMaps()
 	LoadPhotoPersistence()
+	for(var/client/C in GLOB.clients)
+		LoadSavedVote(C.ckey)
 	if(CONFIG_GET(flag/use_antag_rep))
 		LoadAntagReputation()
 	LoadRandomizedRecipes()
@@ -169,14 +173,23 @@ SUBSYSTEM_DEF(persistence)
 		return
 	saved_modes = json["data"]

-/datum/controller/subsystem/persistence/proc/LoadRecentThreats()
-	var/json_file = file("data/RecentThreatLevels.json")
+/datum/controller/subsystem/persistence/proc/LoadRecentRulesets()
+	var/json_file = file("data/RecentRulesets.json")
 	if(!fexists(json_file))
 		return
 	var/list/json = json_decode(file2text(json_file))
 	if(!json)
 		return
-	saved_threat_levels = json["data"]
+	saved_dynamic_rules = json["data"]
+
+/datum/controller/subsystem/persistence/proc/LoadRecentStorytellers()
+	var/json_file = file("data/RecentStorytellers.json")
+	if(!fexists(json_file))
+		return
+	var/list/json = json_decode(file2text(json_file))
+	if(!json)
+		return
+	saved_storytellers = json["data"]

 /datum/controller/subsystem/persistence/proc/LoadRecentMaps()
 	var/json_file = file("data/RecentMaps.json")
@@ -197,6 +210,15 @@ SUBSYSTEM_DEF(persistence)
 		return
 	antag_rep = json_decode(json)

+/datum/controller/subsystem/persistence/proc/LoadSavedVote(var/ckey)
+	var/json_file = file("data/player_saves/[copytext(ckey,1,2)]/[ckey]/SavedVotes.json")
+	if(!fexists(json_file))
+		return
+	var/list/json = json_decode(file2text(json_file))
+	if(!json)
+		return
+	saved_votes[ckey] = json["data"]
+
 /datum/controller/subsystem/persistence/proc/SetUpTrophies(list/trophy_items)
 	for(var/A in GLOB.trophy_cases)
 		var/obj/structure/displaycase/trophy/T = A
@@ -230,7 +252,7 @@ SUBSYSTEM_DEF(persistence)
 	CollectRoundtype()
 	if(istype(SSticker.mode, /datum/game_mode/dynamic))
 		var/datum/game_mode/dynamic/mode = SSticker.mode
-		CollectThreatLevel(mode)
+		CollectStoryteller(mode)
 		CollectRulesets(mode)
 	RecordMaps()
 	SavePhotoPersistence()						//THIS IS PERSISTENCE, NOT THE LOGGING PORTION.
@@ -388,13 +410,16 @@ SUBSYSTEM_DEF(persistence)
 	fdel(json_file)
 	WRITE_FILE(json_file, json_encode(file_data))

-/datum/controller/subsystem/persistence/proc/CollectThreatLevel(var/datum/game_mode/dynamic/mode)
-	saved_threat_levels[3] = saved_threat_levels[2]
-	saved_threat_levels[2] = saved_threat_levels [1]
-	saved_threat_levels[1] = mode.threat_level
-	var/json_file = file("data/RecentThreatLevels.json")
+/datum/controller/subsystem/persistence/proc/CollectStoryteller(var/datum/game_mode/dynamic/mode)
+	saved_storytellers.len = 5
+	saved_storytellers[5] = saved_storytellers[4]
+	saved_storytellers[4] = saved_storytellers[3]
+	saved_storytellers[3] = saved_storytellers[2]
+	saved_storytellers[2] = saved_storytellers[1]
+	saved_storytellers[1] = mode.storyteller.name
+	var/json_file = file("data/RecentStorytellers.json")
 	var/list/file_data = list()
-	file_data["data"] = saved_threat_levels
+	file_data["data"] = saved_storytellers
 	fdel(json_file)
 	WRITE_FILE(json_file, json_encode(file_data))

@@ -402,8 +427,9 @@ SUBSYSTEM_DEF(persistence)
 	saved_dynamic_rules[3] = saved_dynamic_rules[2]
 	saved_dynamic_rules[2] = saved_dynamic_rules[1]
 	saved_dynamic_rules[1] = list()
-	for(var/datum/dynamic_ruleset/ruleset in mode.executed_rules)
-		saved_dynamic_rules[1] += ruleset.config_tag
+	for(var/r in mode.executed_rules)
+		var/datum/dynamic_ruleset/rule = r
+		saved_dynamic_rules[1] += rule.config_tag
 	var/json_file = file("data/RecentRulesets.json")
 	var/list/file_data = list()
 	file_data["data"] = saved_dynamic_rules
@@ -473,3 +499,11 @@ SUBSYSTEM_DEF(persistence)

 	fdel(json_file)
 	WRITE_FILE(json_file, json_encode(file_data))
+
+/datum/controller/subsystem/persistence/proc/SaveSavedVotes()
+	for(var/ckey in saved_votes)
+		var/json_file = file("data/player_saves/[copytext(ckey,1,2)]/[ckey]/SavedVotes.json")
+		var/list/file_data = list()
+		file_data["data"] = saved_votes[ckey]
+		fdel(json_file)
+		WRITE_FILE(json_file, json_encode(file_data))
@@ -6,6 +6,7 @@ PROCESSING_SUBSYSTEM_DEF(nanites)
 	var/list/datum/nanite_cloud_backup/cloud_backups = list()
 	var/list/mob/living/nanite_monitored_mobs = list()
 	var/list/datum/nanite_program/relay/nanite_relays = list()
+	var/neural_network_count = 0

 /datum/controller/subsystem/processing/nanites/proc/check_hardware(datum/nanite_cloud_backup/backup)
 	if(QDELETED(backup.storage) || (backup.storage.stat & (NOPOWER|BROKEN)))
@@ -17,7 +17,7 @@ PROCESSING_SUBSYSTEM_DEF(quirks)
 /datum/controller/subsystem/processing/quirks/Initialize(timeofday)
 	if(!quirks.len)
 		SetupQuirks()
-		quirk_blacklist = list(list("Blind","Nearsighted"),list("Jolly","Depression","Apathetic"),list("Ageusia","Deviant Tastes"),list("Ananas Affinity","Ananas Aversion"))
+		quirk_blacklist = list(list("Blind","Nearsighted"),list("Jolly","Depression","Apathetic"),list("Ageusia","Deviant Tastes"),list("Ananas Affinity","Ananas Aversion"),list("Alcohol Tolerance","Alcohol Intolerance"),list("Alcohol Intolerance","Drunken Resilience"))
 	return ..()

 /datum/controller/subsystem/processing/quirks/proc/SetupQuirks()
@@ -46,8 +46,8 @@ PROCESSING_SUBSYSTEM_DEF(quirks)
 			badquirk = TRUE
 	if(badquirk)
 		cli.prefs.save_character()
-	if(!silent && LAZYLEN(cut))
-		to_chat(to_chat_target || user, "<span class='boldwarning'>All of your non-neutral character quirks have been cut due to these quirks conflicting with your job assignment: [english_list(cut)].</span>")
+	if (!silent && LAZYLEN(cut))
+		to_chat(to_chat_target || user, "<span class='boldwarning'>Some quirks have been cut from your character because of these quirks conflicting with your job assignment: [english_list(cut)].</span>")

 /datum/controller/subsystem/processing/quirks/proc/quirk_path_by_name(name)
 	return quirks[name]
@@ -66,6 +66,7 @@ PROCESSING_SUBSYSTEM_DEF(quirks)
 /datum/controller/subsystem/processing/quirks/proc/filter_quirks(list/our_quirks, datum/job/job)
 	var/list/cut = list()
 	var/list/banned_names = list()
+	var/pointscut = 0
 	for(var/i in job.blacklisted_quirks)
 		var/name = quirk_name_by_path(i)
 		if(name)
@@ -75,7 +76,17 @@ PROCESSING_SUBSYSTEM_DEF(quirks)
 		for(var/i in blacklisted)
 			our_quirks -= i
 			cut += i
-
+			pointscut += quirk_points_by_name(i)
+	if (pointscut != 0)
+		for (var/i in shuffle(our_quirks))
+			if (quirk_points_by_name(i) < pointscut || (pointscut < 0) ? quirk_points_by_name(i) <= 0 : quirk_points_by_name(i) >= 0)
+				continue
+			else
+				our_quirks -= i
+				cut += i
+				pointscut += quirk_points_by_name(i)
+			if (pointscut >= 0) //with how it works, it needs to be above zero, not below, as points for positive is positive, and negative is negative, we only want it to break if it's above zero, ie. we cut more positive than negative
+				break
 	/*	//Code to automatically reduce positive quirks until balance is even.
 	var/points_used = total_points(our_quirks)
 	if(points_used > 0)
@@ -91,10 +102,11 @@ PROCESSING_SUBSYSTEM_DEF(quirks)
 	*/

 	//Nah, let's null all non-neutrals out.
-	if(cut.len)
-		for(var/i in our_quirks)
-			if(quirk_points_by_name(i) != 0)
-				//cut += i		-- Commented out: Only show the ones that triggered the quirk purge.
-				our_quirks -= i
+	if (pointscut != 0)// only if the pointscutting didn't work.
+		if(cut.len)
+			for(var/i in our_quirks)
+				if(quirk_points_by_name(i) != 0)
+					//cut += i		-- Commented out: Only show the ones that triggered the quirk purge.
+					our_quirks -= i

 	return cut
@@ -37,7 +37,7 @@ SUBSYSTEM_DEF(shuttle)
 	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 CentCom, associated with their potencies
-	var/passive_supply_points_per_minute = 750
+	var/passive_supply_points_per_minute = 500

 	var/list/supply_packs = list()
 	var/list/shoppinglist = list()
@@ -221,6 +221,12 @@ SUBSYSTEM_DEF(ticker)
 	var/init_start = world.timeofday
 		//Create and announce mode
 	var/list/datum/game_mode/runnable_modes
+	if(SSvote.mode && (SSvote.mode == "roundtype" || SSvote.mode == "dynamic" || SSvote.mode == "mode tiers"))
+		SSvote.result()
+		SSpersistence.SaveSavedVotes()
+		for(var/client/C in SSvote.voting)
+			C << browse(null, "window=vote;can_close=0")
+		SSvote.reset()
 	if(GLOB.master_mode == "random" || GLOB.master_mode == "secret")
 		runnable_modes = config.get_runnable_modes()

@@ -401,6 +407,9 @@ SUBSYSTEM_DEF(ticker)
 			qdel(player)
 			living.notransform = TRUE
 			if(living.client)
+				if (living.client.prefs && living.client.prefs.auto_ooc)
+					if (living.client.prefs.chat_toggles & CHAT_OOC)
+						living.client.prefs.chat_toggles ^= CHAT_OOC
 				var/obj/screen/splash/S = new(living.client, TRUE)
 				S.Fade(TRUE)
 			livings += living
@@ -480,7 +489,11 @@ SUBSYSTEM_DEF(ticker)
 			SSticker.timeLeft = 900
 		SSticker.modevoted = TRUE
 		var/dynamic = CONFIG_GET(flag/dynamic_voting)
-		SSvote.initiate_vote(dynamic ? "dynamic" : "roundtype","server",TRUE)
+		if(dynamic)
+			SSvote.initiate_vote("dynamic","server",hideresults=TRUE,votesystem=SCORE_VOTING,forced=TRUE,vote_time = 20 MINUTES)
+		else
+			SSvote.initiate_vote("roundtype","server",hideresults=TRUE,votesystem=PLURALITY_VOTING,forced=TRUE, \
+			vote_time = (CONFIG_GET(flag/modetier_voting) ? 1 MINUTES : 20 MINUTES))

 /datum/controller/subsystem/ticker/Recover()
 	current_state = SSticker.current_state
@@ -1,3 +1,5 @@
+#define VOTE_COOLDOWN 10
+
 SUBSYSTEM_DEF(vote)
 	name = "Vote"
 	wait = 10
@@ -8,44 +10,55 @@ SUBSYSTEM_DEF(vote)

 	var/initiator = null
 	var/started_time = null
-	var/time_remaining = 0
+	var/end_time = 0
 	var/mode = null
+	var/vote_system = PLURALITY_VOTING
 	var/question = null
 	var/list/choices = list()
+	var/list/scores = list()
+	var/list/choice_descs = list() // optional descriptions
 	var/list/voted = list()
 	var/list/voting = list()
+	var/list/saved = list()
 	var/list/generated_actions = list()
+	var/next_pop = 0

 	var/obfuscated = FALSE//CIT CHANGE - adds obfuscated/admin-only votes

 	var/list/stored_gamemode_votes = list() //Basically the last voted gamemode is stored here for end-of-round use.

+	var/list/stored_modetier_results = list() // The aggregated tier list of the modes available in secret.
+
 /datum/controller/subsystem/vote/fire()	//called by master_controller
 	if(mode)
-		time_remaining = round((started_time + CONFIG_GET(number/vote_period) - world.time)/10)
-
-		if(time_remaining < 0)
+		if(end_time < world.time)
 			result()
+			SSpersistence.SaveSavedVotes()
 			for(var/client/C in voting)
 				C << browse(null, "window=vote;can_close=0")
-			reset()
-		else
+			if(end_time < world.time) // result() can change this
+				reset()
+		else if(next_pop < world.time)
 			var/datum/browser/client_popup
 			for(var/client/C in voting)
-				client_popup = new(C, "vote", "Voting Panel")
+				client_popup = new(C, "vote", "Voting Panel", nwidth=600,nheight=700)
 				client_popup.set_window_options("can_close=0")
 				client_popup.set_content(interface(C))
 				client_popup.open(0)
+			next_pop = world.time+VOTE_COOLDOWN
+


 /datum/controller/subsystem/vote/proc/reset()
 	initiator = null
-	time_remaining = 0
+	end_time = 0
 	mode = null
 	question = null
 	choices.Cut()
+	choice_descs.Cut()
 	voted.Cut()
 	voting.Cut()
+	scores.Cut()
 	obfuscated = FALSE //CIT CHANGE - obfuscated votes
 	remove_action_buttons()

@@ -84,17 +97,128 @@ SUBSYSTEM_DEF(vote)
 				. += option
 	return .

+/datum/controller/subsystem/vote/proc/calculate_condorcet_votes(var/blackbox_text)
+	// https://en.wikipedia.org/wiki/Schulze_method#Implementation
+	var/list/d[][] = new/list(choices.len,choices.len) // the basic vote matrix, how many times a beats b
+	for(var/ckey in voted)
+		var/list/this_vote = voted[ckey]
+		for(var/a in 1 to choices.len)
+			for(var/b in a+1 to choices.len)
+				var/a_rank = this_vote.Find(a)
+				var/b_rank = this_vote.Find(b)
+				a_rank = a_rank ? a_rank : choices.len+1
+				b_rank = b_rank ? b_rank : choices.len+1
+				if(a_rank<b_rank)
+					d[a][b]++
+				else if(b_rank<a_rank)
+					d[b][a]++
+				//if equal, do nothing
+	var/list/p[][] = new/list(choices.len,choices.len) //matrix of shortest path from a to b
+	for(var/i in 1 to choices.len)
+		for(var/j in 1 to choices.len)
+			if(i != j)
+				var/pref_number = d[i][j]
+				var/opposite_pref = d[j][i]
+				if(pref_number>opposite_pref)
+					p[i][j] = d[i][j]
+				else
+					p[i][j] = 0
+	for(var/i in 1 to choices.len)
+		for(var/j in 1 to choices.len)
+			if(i != j)
+				for(var/k in 1 to choices.len) // YEAH O(n^3) !!
+					if(i != k && j != k)
+						p[j][k] = max(p[j][k],min(p[j][i], p[i][k]))
+	//one last pass, now that we've done the math
+	for(var/i in 1 to choices.len)
+		for(var/j in 1 to choices.len)
+			if(i != j)
+				SSblackbox.record_feedback("nested tally","voting",p[i][j],list(blackbox_text,"Shortest Paths",choices[i],choices[j]))
+				if(p[i][j] >= p[j][i])
+					choices[choices[i]]++ // higher shortest path = better candidate, so we add to choices here
+					// choices[choices[i]] is the schulze ranking, here, rather than raw vote numbers
+
+/datum/controller/subsystem/vote/proc/calculate_majority_judgement_vote(var/blackbox_text)
+	// https://en.wikipedia.org/wiki/Majority_judgment
+	var/list/scores_by_choice = list()
+	for(var/choice in choices)
+		scores_by_choice[choice] = list()
+	for(var/ckey in voted)
+		var/list/this_vote = voted[ckey]
+		var/list/pretty_vote = list()
+		for(var/choice in this_vote)
+			sorted_insert(scores_by_choice[choice],this_vote[choice],/proc/cmp_numeric_asc)
+			// START BALLOT GATHERING
+			pretty_vote += choice
+			pretty_vote[choice] = GLOB.vote_score_options[this_vote[choice]]
+		SSblackbox.record_feedback("associative","voting_ballots",1,pretty_vote)
+		// END BALLOT GATHERING
+	for(var/score_name in scores_by_choice)
+		var/list/score = scores_by_choice[score_name]
+		for(var/indiv_score in score)
+			SSblackbox.record_feedback("nested tally","voting",1,list(blackbox_text,"Scores",score_name,GLOB.vote_score_options[indiv_score])) 
+		if(score.len == 0)
+			scores_by_choice -= score_name
+	while(scores_by_choice.len > 1)
+		var/highest_median = 0
+		for(var/score_name in scores_by_choice) // first get highest median
+			var/list/score = scores_by_choice[score_name]
+			if(!score.len)
+				scores_by_choice -= score_name
+				continue
+			var/median = score[max(1,round(score.len/2))]
+			if(median >= highest_median)
+				highest_median = median
+		for(var/score_name in scores_by_choice) // then, remove
+			var/list/score = scores_by_choice[score_name]
+			var/median = score[max(1,round(score.len/2))]
+			if(median < highest_median)
+				scores_by_choice -= score_name
+		for(var/score_name in scores_by_choice) // after removals
+			var/list/score = scores_by_choice[score_name]
+			if(score.len == 0)
+				choices[score_name] += 100 // we're in a tie situation--just go with the first one
+				return
+			var/median_pos = max(1,round(score.len/2))
+			score.Cut(median_pos,median_pos+1)
+			choices[score_name]++
+
+/datum/controller/subsystem/vote/proc/calculate_scores(var/blackbox_text)
+	var/list/scores_by_choice = list()
+	for(var/choice in choices)
+		scores_by_choice[choice] = list()
+	for(var/ckey in voted)
+		var/list/this_vote = voted[ckey]
+		for(var/choice in this_vote)
+			sorted_insert(scores_by_choice[choice],this_vote[choice],/proc/cmp_numeric_asc)
+	var/middle_score = round(GLOB.vote_score_options.len/2,1)
+	for(var/score_name in scores_by_choice)
+		var/list/score = scores_by_choice[score_name]
+		for(var/S in score)
+			scores[score_name] += S-middle_score
+		SSblackbox.record_feedback("nested tally","voting",scores[score_name],list(blackbox_text,"Total scores",score_name))
+
+
 /datum/controller/subsystem/vote/proc/announce_result()
-	var/list/winners = get_result()
+	var/vote_title_text
 	var/text
+	if(question)
+		text += "<b>[question]</b>"
+		vote_title_text = "[question]"
+	else
+		text += "<b>[capitalize(mode)] Vote</b>"
+		vote_title_text = "[capitalize(mode)] Vote"
+	if(vote_system == RANKED_CHOICE_VOTING)
+		calculate_condorcet_votes(vote_title_text)
+	if(vote_system == SCORE_VOTING)
+		calculate_majority_judgement_vote(vote_title_text)
+	var/list/winners = get_result()
 	var/was_roundtype_vote = mode == "roundtype" || mode == "dynamic"
 	if(winners.len > 0)
-		if(question)
-			text += "<b>[question]</b>"
-		else
-			text += "<b>[capitalize(mode)] Vote</b>"
 		if(was_roundtype_vote)
 			stored_gamemode_votes = list()
+		if(!obfuscated && vote_system == RANKED_CHOICE_VOTING)
+			text += "\nIt should be noted that this is not a raw tally of votes (impossible in ranked choice) but the score determined by the schulze method of voting, so the numbers will look weird!"
 		for(var/i=1,i<=choices.len,i++)
 			var/votes = choices[choices[i]]
 			if(!votes)
@@ -116,17 +240,27 @@ SUBSYSTEM_DEF(vote)
 	log_vote(text)
 	remove_action_buttons()
 	to_chat(world, "\n<font color='purple'>[text]</font>")
+	switch(vote_system)
+		if(APPROVAL_VOTING,PLURALITY_VOTING)
+			for(var/i=1,i<=choices.len,i++)
+				SSblackbox.record_feedback("nested tally","voting",choices[choices[i]],list(vote_title_text,choices[i]))
+		if(RANKED_CHOICE_VOTING)
+			for(var/i=1,i<=voted.len,i++)
+				var/list/myvote = voted[voted[i]]
+				for(var/j=1,j<=myvote.len,j++)
+					SSblackbox.record_feedback("nested tally","voting",1,list(vote_title_text,"[j]\th",choices[myvote[j]]))
 	if(obfuscated) //CIT CHANGE - adds obfuscated votes. this messages admins with the vote's true results
 		var/admintext = "Obfuscated results"
+		if(vote_system == RANKED_CHOICE_VOTING)
+			admintext += "\nIt should be noted that this is not a raw tally of votes (impossible in ranked choice) but the score determined by the schulze method of voting, so the numbers will look weird!"
+		else if(vote_system == SCORE_VOTING)
+			admintext += "\nIt should be noted that this is not a raw tally of votes but the number of runoffs done by majority judgement!"
 		for(var/i=1,i<=choices.len,i++)
 			var/votes = choices[choices[i]]
 			admintext += "\n<b>[choices[i]]:</b> [votes]"
 		message_admins(admintext)
 	return .

-#define PEACE "calm"
-#define CHAOS "chaotic"
-
 /datum/controller/subsystem/vote/proc/result()
 	. = announce_result()
 	var/restart = 0
@@ -139,6 +273,12 @@ SUBSYSTEM_DEF(vote)
 				SSticker.save_mode(.)
 				message_admins("The gamemode has been voted for, and has been changed to: [GLOB.master_mode]")
 				log_admin("Gamemode has been voted for and switched to: [GLOB.master_mode].")
+				if(CONFIG_GET(flag/modetier_voting))
+					reset()
+					started_time = 0
+					initiate_vote("mode tiers","server",hideresults=FALSE,votesystem=RANKED_CHOICE_VOTING,forced=TRUE, vote_time = 30 MINUTES)
+					to_chat(world,"<b>The vote will end right as the round starts.</b>")
+					return .
 			if("restart")
 				if(. == "Restart Round")
 					restart = 1
@@ -149,36 +289,20 @@ SUBSYSTEM_DEF(vote)
 						restart = 1
 					else
 						GLOB.master_mode = .
+			if("mode tiers")
+				stored_modetier_results = choices.Copy()
 			if("dynamic")
 				if(SSticker.current_state > GAME_STATE_PREGAME)//Don't change the mode if the round already started.
 					return message_admins("A vote has tried to change the gamemode, but the game has already started. Aborting.")
-				GLOB.master_mode = "dynamic"
-				if("extended" in choices)
-					if(. == "extended")
-						GLOB.dynamic_forced_extended = TRUE // we still do the rest of the stuff
-					choices[PEACE] += choices["extended"]
-				var/mean = 0
-				var/voters = 0
-				for(var/client/c in GLOB.clients)
-					var/vote = c.prefs.preferred_chaos
-					if(vote)
-						voters += 1
-						switch(vote)
-							if(CHAOS_NONE)
-								mean -= 0.1
-							if(CHAOS_LOW)
-								mean -= 0.05
-							if(CHAOS_HIGH)
-								mean += 0.05
-							if(CHAOS_MAX)
-								mean += 0.1
-				mean/=voters
-				if(voted.len != 0)
-					mean += (choices[PEACE]*-1+choices[CHAOS])/voted.len
-				GLOB.dynamic_curve_centre = mean*20
-				GLOB.dynamic_curve_width = CLAMP(2-abs(mean*5),0.5,4)
-				to_chat(world,"<span class='boldannounce'>Dynamic curve centre set to [GLOB.dynamic_curve_centre] and width set to [GLOB.dynamic_curve_width].</span>")
-				log_admin("Dynamic curve centre set to [GLOB.dynamic_curve_centre] and width set to [GLOB.dynamic_curve_width]")
+				if(. == "Secret")
+					GLOB.master_mode = "secret"
+					SSticker.save_mode(.)
+					message_admins("The gamemode has been voted for, and has been changed to: [GLOB.master_mode]")
+					log_admin("Gamemode has been voted for and switched to: [GLOB.master_mode].")
+				else
+					GLOB.master_mode = "dynamic"
+					var/datum/dynamic_storyteller/S = config.pick_storyteller(.)
+					GLOB.dynamic_storyteller_type = S
 			if("map")
 				var/datum/map_config/VM = config.maplist[.]
 				message_admins("The map has been voted for and will change to: [VM.map_name]")
@@ -196,27 +320,58 @@ SUBSYSTEM_DEF(vote)
 		else
 			to_chat(world, "<span style='boldannounce'>Notice:Restart vote will not restart the server automatically because there are active admins on.</span>")
 			message_admins("A restart vote has passed, but there are active admins on with +server, so it has been canceled. If you wish, you may restart the server.")
-
+	
 	return .

-/datum/controller/subsystem/vote/proc/submit_vote(vote)
+/datum/controller/subsystem/vote/proc/submit_vote(vote, score = 0)
 	if(mode)
 		if(CONFIG_GET(flag/no_dead_vote) && usr.stat == DEAD && !usr.client.holder)
 			return 0
-		if(!(usr.ckey in voted))
-			if(vote && 1<=vote && vote<=choices.len)
-				voted += usr.ckey
-				voted[usr.ckey] = vote
-				choices[choices[vote]]++	//check this
-				return vote
-		else if(vote && 1<=vote && vote<=choices.len)
-			choices[choices[voted[usr.ckey]]]--
-			voted[usr.ckey] = vote
-			choices[choices[vote]]++
-			return vote
+		if(vote && ISINRANGE(vote, 1, choices.len))
+			switch(vote_system)
+				if(PLURALITY_VOTING)
+					if(usr.ckey in voted)
+						choices[choices[voted[usr.ckey]]]--
+						voted[usr.ckey] = vote
+						choices[choices[vote]]++
+						return vote
+					else
+						voted += usr.ckey
+						voted[usr.ckey] = vote
+						choices[choices[vote]]++	//check this
+						return vote
+				if(APPROVAL_VOTING)
+					if(usr.ckey in voted)
+						if(vote in voted[usr.ckey])
+							voted[usr.ckey] -= vote
+							choices[choices[vote]]--
+						else
+							voted[usr.ckey] += vote
+							choices[choices[vote]]++
+					else
+						voted += usr.ckey
+						voted[usr.ckey] = list(vote)
+						choices[choices[vote]]++
+						return vote
+				if(RANKED_CHOICE_VOTING)
+					if(usr.ckey in voted)
+						if(vote in voted[usr.ckey])
+							voted[usr.ckey] -= vote
+					else
+						voted += usr.ckey
+						voted[usr.ckey] = list()
+					voted[usr.ckey] += vote
+					saved -= usr.ckey
+				if(SCORE_VOTING)
+					if(!(usr.ckey in voted))
+						voted += usr.ckey
+						voted[usr.ckey] = list()
+					voted[usr.ckey][choices[vote]] = score
+					saved -= usr.ckey
 	return 0

-/datum/controller/subsystem/vote/proc/initiate_vote(vote_type, initiator_key, hideresults)//CIT CHANGE - adds hideresults argument to votes to allow for obfuscated votes
+/datum/controller/subsystem/vote/proc/initiate_vote(vote_type, initiator_key, hideresults, votesystem = PLURALITY_VOTING, forced = FALSE,vote_time = -1)//CIT CHANGE - adds hideresults argument to votes to allow for obfuscated votes
+	vote_system = votesystem
 	if(!mode)
 		if(started_time)
 			var/next_allowed_time = (started_time + CONFIG_GET(number/vote_delay))
@@ -256,12 +411,25 @@ SUBSYSTEM_DEF(vote)
 					choices |= M
 			if("roundtype") //CIT CHANGE - adds the roundstart secret/extended vote
 				choices.Add("secret", "extended")
+			if("mode tiers")
+				var/list/modes_to_add = config.votable_modes
+				var/list/probabilities = CONFIG_GET(keyed_list/probability)
+				for(var/tag in modes_to_add)
+					if(probabilities[tag] <= 0)
+						modes_to_add -= tag
+				choices.Add(modes_to_add)
 			if("dynamic")
-				var/saved_threats = SSpersistence.saved_threat_levels
-				if((saved_threats[1]+saved_threats[2]+saved_threats[3])>150)
-					choices.Add("extended",PEACE,CHAOS)
-				else
-					choices.Add(PEACE,CHAOS)
+				for(var/T in config.storyteller_cache)
+					var/datum/dynamic_storyteller/S = T
+					var/recent_rounds = 0
+					for(var/i in 1 to SSpersistence.saved_storytellers.len)
+						if(SSpersistence.saved_storytellers[i] == initial(S.name))
+							recent_rounds++
+					if(recent_rounds < initial(S.weight))
+						choices.Add(initial(S.name))
+						choice_descs.Add(initial(S.desc))
+				choices.Add("Secret")
+				choice_descs.Add("Standard secret. Switches mode if it wins.")
 			if("custom")
 				question = stripped_input(usr,"What is the vote for?")
 				if(!question)
@@ -280,9 +448,11 @@ SUBSYSTEM_DEF(vote)
 		if(mode == "custom")
 			text += "\n[question]"
 		log_vote(text)
-		var/vp = CONFIG_GET(number/vote_period)
+		var/vp = vote_time
+		if(vp == -1)
+			vp = CONFIG_GET(number/vote_period)
 		to_chat(world, "\n<font color='purple'><b>[text]</b>\nType <b>vote</b> or click <a href='?src=[REF(src)]'>here</a> to place your votes.\nYou have [DisplayTimeText(vp)] to vote.</font>")
-		time_remaining = round(vp/10)
+		end_time = started_time+vp
 		for(var/c in GLOB.clients)
 			SEND_SOUND(c, sound('sound/misc/server-ready.ogg'))
 			var/client/C = c
@@ -292,6 +462,11 @@ SUBSYSTEM_DEF(vote)
 			C.player_details.player_actions += V
 			V.Grant(C.mob)
 			generated_actions += V
+			if(forced)
+				var/datum/browser/popup = new(C, "vote", "Voting Panel",nwidth=600,nheight=700)
+				popup.set_window_options("can_close=0")
+				popup.set_content(SSvote.interface(C))
+				popup.open(0)
 		return 1
 	return 0

@@ -311,14 +486,71 @@ SUBSYSTEM_DEF(vote)
 			. += "<h2>Vote: '[question]'</h2>"
 		else
 			. += "<h2>Vote: [capitalize(mode)]</h2>"
-		. += "Time Left: [time_remaining] s<hr><ul>"
-		for(var/i=1,i<=choices.len,i++)
-			var/votes = choices[choices[i]]
-			var/ivotedforthis = ((C.ckey in voted) && (voted[C.ckey] == i) ? TRUE : FALSE)
-			if(!votes)
-				votes = 0
-			. += "<li>[ivotedforthis ? "<b>" : ""]<a href='?src=[REF(src)];vote=[i]'>[choices[i]]</a> ([obfuscated ? (admin ? "??? ([votes])" : "???") : votes] votes)[ivotedforthis ? "</b>" : ""]</li>" // CIT CHANGE - adds obfuscated votes
-		. += "</ul><hr>"
+		switch(vote_system)
+			if(PLURALITY_VOTING)
+				. += "<h3>Vote one.</h3>"
+			if(APPROVAL_VOTING)
+				. += "<h3>Vote any number of choices.</h3>"
+			if(RANKED_CHOICE_VOTING)
+				. += "<h3>Vote by order of preference. Revoting will demote to the bottom. 1 is your favorite, and higher numbers are worse.</h3>"
+			if(SCORE_VOTING)
+				. += "<h3>Grade the candidates by how much you like them.</h3>"
+				. += "<h3>No-votes have no power--your opinion is only heard if you vote!</h3>"
+		. += "Time Left: [DisplayTimeText(end_time-world.time)]<hr><ul>"
+		switch(vote_system)
+			if(PLURALITY_VOTING, APPROVAL_VOTING)
+				for(var/i=1,i<=choices.len,i++)
+					var/votes = choices[choices[i]]
+					var/ivotedforthis = FALSE
+					switch(vote_system)
+						if(PLURALITY_VOTING)
+							ivotedforthis = ((C.ckey in voted) && (voted[C.ckey] == i))
+						if(APPROVAL_VOTING)
+							ivotedforthis = ((C.ckey in voted) && (i in voted[C.ckey]))
+					if(!votes)
+						votes = 0
+					. += "<li>[ivotedforthis ? "<b>" : ""]<a href='?src=[REF(src)];vote=[i]'>[choices[i]]</a> ([obfuscated ? (admin ? "??? ([votes])" : "???") : votes] votes)[ivotedforthis ? "</b>" : ""]</li>" // CIT CHANGE - adds obfuscated votes
+					if(choice_descs.len >= i)
+						. += "<li>[choice_descs[i]]</li>"
+				. += "</ul><hr>"
+			if(RANKED_CHOICE_VOTING)
+				var/list/myvote = voted[C.ckey]
+				for(var/i=1,i<=choices.len,i++)
+					var/vote = (myvote ? (myvote.Find(i)) : 0)
+					if(vote)
+						. += "<li><b><a href='?src=[REF(src)];vote=[i]'>[choices[i]]</a> ([vote])</b></li>"
+					else
+						. += "<li><a href='?src=[REF(src)];vote=[i]'>[choices[i]]</a></li>"
+					if(choice_descs.len >= i)
+						. += "<li>[choice_descs[i]]</li>"
+				. += "</ul><hr>"
+				if(!(C.ckey in saved))
+					. += "(<a href='?src=[REF(src)];vote=save'>Save vote</a>)"
+				else
+					. += "(Saved!)"
+				. += "(<a href='?src=[REF(src)];vote=load'>Load vote from save</a>)"
+				. += "(<a href='?src=[REF(src)];vote=reset'>Reset votes</a>)"
+			if(SCORE_VOTING)
+				var/list/myvote = voted[C.ckey]
+				for(var/i=1,i<=choices.len,i++)
+					. += "<li><b>[choices[i]]</b>"
+					for(var/r in 1 to GLOB.vote_score_options.len)
+						. += " <a href='?src=[REF(src)];vote=[i];score=[r]'>"
+						if((choices[i] in myvote) && myvote[choices[i]] == r)
+							. +="<b>([GLOB.vote_score_options[r]])</b>"
+						else
+							. +="[GLOB.vote_score_options[r]]"
+						. += "</a>"
+					. += "</li>"
+					if(choice_descs.len >= i)
+						. += "<li>[choice_descs[i]]</li>"
+				. += "</ul><hr>"
+				if(!(C.ckey in saved))
+					. += "(<a href='?src=[REF(src)];vote=save'>Save vote</a>)"
+				else
+					. += "(Saved!)"
+				. += "(<a href='?src=[REF(src)];vote=load'>Load vote from save</a>)"
+				. += "(<a href='?src=[REF(src)];vote=reset'>Reset votes</a>)"
 		if(admin)
 			. += "(<a href='?src=[REF(src)];vote=cancel'>Cancel Vote</a>) "
 	else
@@ -376,8 +608,31 @@ SUBSYSTEM_DEF(vote)
 		if("custom")
 			if(usr.client.holder)
 				initiate_vote("custom",usr.key)
+		if("reset")
+			if(usr.ckey in voted)
+				voted -= usr.ckey
+		if("save")
+			if(usr.ckey in voted)
+				if(!(usr.ckey in SSpersistence.saved_votes))
+					SSpersistence.saved_votes[usr.ckey] = list()
+				SSpersistence.saved_votes[usr.ckey][mode] = voted[usr.ckey]
+				saved += usr.ckey
+		if("load")
+			if(!(usr.ckey in SSpersistence.saved_votes))
+				SSpersistence.LoadSavedVote(usr.ckey)
+				if(!(usr.ckey in SSpersistence.saved_votes))
+					SSpersistence.saved_votes[usr.ckey] = list()
+					if(usr.ckey in voted)
+						SSpersistence.saved_votes[usr.ckey][mode] = voted[usr.ckey]
+					else
+						SSpersistence.saved_votes[usr.ckey][mode] = list()
+			voted[usr.ckey] = SSpersistence.saved_votes[usr.ckey][mode]
+			saved += usr.ckey
 		else
-			submit_vote(round(text2num(href_list["vote"])))
+			if(vote_system == SCORE_VOTING)
+				submit_vote(round(text2num(href_list["vote"])),round(text2num(href_list["score"])))
+			else
+				submit_vote(round(text2num(href_list["vote"])))
 	usr.vote()

 /datum/controller/subsystem/vote/proc/remove_action_buttons()
@@ -392,7 +647,7 @@ SUBSYSTEM_DEF(vote)
 	set category = "OOC"
 	set name = "Vote"

-	var/datum/browser/popup = new(src, "vote", "Voting Panel")
+	var/datum/browser/popup = new(src, "vote", "Voting Panel",nwidth=600,nheight=700)
 	popup.set_window_options("can_close=0")
 	popup.set_content(SSvote.interface(client))
 	popup.open(0)
@@ -419,6 +674,3 @@ SUBSYSTEM_DEF(vote)
 		var/datum/player_details/P = GLOB.player_details[owner.ckey]
 		if(P)
 			P.player_actions -= src
-
-#undef PEACE
-#undef CHAOS
@@ -141,6 +141,17 @@
 		current_button.add_overlay(mutable_appearance(icon_icon, button_icon_state))
 		current_button.button_icon_state = button_icon_state

+/datum/action/ghost
+	icon_icon = 'icons/mob/mob.dmi'
+	button_icon_state = "ghost"
+	name = "Ghostize"
+	desc = "Turn into a ghost and freely come back to your body."
+
+/datum/action/ghost/Trigger()
+	if(!..())
+		return 0
+	var/mob/M = target
+	M.ghostize(1)

 //Presets for item actions
 /datum/action/item_action
@@ -32,7 +32,7 @@

 	if(ishuman(M) && source.force && source.get_sharpness())
 		var/mob/living/carbon/human/H = M
-		if((H.health <= H.crit_threshold || (user.pulling == H && user.grab_state >= GRAB_NECK) || H.IsSleeping()) && user.zone_selected == BODY_ZONE_HEAD) // Only sleeping, neck grabbed, or crit, can be sliced.
+		if((H.health <= H.crit_threshold || (user.pulling == H && user.grab_state >= GRAB_NECK) || H.IsSleeping()) && user.zone_selected == BODY_ZONE_PRECISE_MOUTH) // Only sleeping, neck grabbed, or crit, can be sliced.
 			if(H.has_status_effect(/datum/status_effect/neck_slice))
 				user.show_message("<span class='warning'>[H]'s neck has already been already cut, you can't make the bleeding any worse!</span>", 1, \
 								"<span class='warning'>Their neck has already been already cut, you can't make the bleeding any worse!</span>")
@@ -120,4 +120,4 @@
 	if(eater.safety_mode || (eater.stat & (BROKEN|NOPOWER))) //I'm so sorry.
 		return
 	if(L.stat == DEAD && (L.butcher_results || L.guaranteed_butcher_results))
-		Butcher(parent, L)
+		Butcher(parent, L)
@@ -11,8 +11,9 @@
 	var/list/datum/nanite_program/programs = list()
 	var/max_programs = NANITE_PROGRAM_LIMIT

-	var/stealth = FALSE //if TRUE, does not appear on HUDs and health scans, and does not display the program list on nanite scans
-
+	var/stealth = FALSE //if TRUE, does not appear on HUDs and health scans
+	var/diagnostics = TRUE //if TRUE, displays program list when scanned by nanite scanners
+	
 /datum/component/nanites/Initialize(amount = 100, cloud = 0)
 	if(!isliving(parent) && !istype(parent, /datum/nanite_cloud_backup))
 		return COMPONENT_INCOMPATIBLE
@@ -252,8 +253,8 @@
 		to_chat(user, "<span class='info'>Cloud ID: [cloud_id ? cloud_id : "Disabled"]</span>")
 		to_chat(user, "<span class='info'>================</span>")
 		to_chat(user, "<span class='info'>Program List:</span>")
-		if(stealth)
-			to_chat(user, "<span class='alert'>%#$ENCRYPTED&^@</span>")
+		if(!diagnostics)
+			to_chat(user, "<span class='alert'>Diagnostics Disabled</span>")
 		else
 			for(var/X in programs)
 				var/datum/nanite_program/NP = X
@@ -66,7 +66,7 @@
 /datum/component/storage/concrete/_insert_physical_item(obj/item/I, override = FALSE)
 	. = TRUE
 	var/atom/real_location = real_location()
-	if(I.loc != real_location)
+	if(I.loc != real_location && real_location)
 		I.forceMove(real_location)
 	refresh_mob_views()

@@ -87,3 +87,12 @@
 /datum/component/storage/concrete/pockets/pocketprotector/real_location()
 	// if the component is reparented to a jumpsuit, the items still go in the protector
 	return original_parent
+
+/datum/component/storage/concrete/pockets/small/rushelmet
+	max_items = 1
+	quickdraw = TRUE
+
+/datum/component/storage/concrete/pockets/small/rushelmet/Initialize()
+	. = ..()
+	can_hold = typecacheof(list(/obj/item/reagent_containers/glass/bottle,
+								/obj/item/ammo_box/a762))
@@ -947,21 +947,25 @@

 			if(A.reagents)
 				var/chosen_id
-				var/list/reagent_options = sortList(GLOB.chemical_reagents_list)
-				switch(alert(usr, "Choose a method.", "Add Reagents", "Enter ID", "Choose ID"))
-					if("Enter ID")
+				switch(alert(usr, "Choose a method.", "Add Reagents", "Search", "Choose from a list", "I'm feeling lucky"))
+					if("Search")
 						var/valid_id
 						while(!valid_id)
-							chosen_id = stripped_input(usr, "Enter the ID of the reagent you want to add.")
-							if(!chosen_id) //Get me out of here!
+							chosen_id = input(usr, "Enter the ID of the reagent you want to add.", "Search reagents") as null|text
+							if(isnull(chosen_id)) //Get me out of here!
 								break
-							for(var/ID in reagent_options)
-								if(ID == chosen_id)
-									valid_id = 1
+							if(!ispath(text2path(chosen_id)))
+								chosen_id = pick_closest_path(chosen_id, make_types_fancy(subtypesof(/datum/reagent)))
+								if(ispath(chosen_id))
+									valid_id = TRUE
+							else
+								valid_id = TRUE
 							if(!valid_id)
 								to_chat(usr, "<span class='warning'>A reagent with that ID doesn't exist!</span>")
-					if("Choose ID")
-						chosen_id = input(usr, "Choose a reagent to add.", "Choose a reagent.") as null|anything in reagent_options
+					if("Choose from a list")
+						chosen_id = input(usr, "Choose a reagent to add.", "Choose a reagent.") as null|anything in subtypesof(/datum/reagent)
+					if("I'm feeling lucky")
+						chosen_id = pick(subtypesof(/datum/reagent))
 				if(chosen_id)
 					var/amount = input(usr, "Choose the amount to add.", "Choose the amount.", A.reagents.maximum_volume) as num
 					if(amount)
@@ -103,7 +103,7 @@
 	if(!(spread_flags & DISEASE_SPREAD_AIRBORNE) && !force_spread)
 		return

-	if(affected_mob.reagents.has_reagent("spaceacillin") || (affected_mob.satiety > 0 && prob(affected_mob.satiety/10)))
+	if(affected_mob.reagents.has_reagent(/datum/reagent/medicine/spaceacillin) || (affected_mob.satiety > 0 && prob(affected_mob.satiety/10)))
 		return

 	var/spread_range = 2
@@ -36,37 +36,41 @@
 	// The order goes from easy to cure to hard to cure. Keep in mind that sentient diseases pick two cures from tier 6 and up, ensure they wont react away in bodies.
 	var/static/list/advance_cures = 	list(
 									list(	// level 1
-										"copper", "silver", "iodine", "iron", "carbon"
+										/datum/reagent/copper, /datum/reagent/silver, /datum/reagent/iodine, /datum/reagent/iron, /datum/reagent/carbon
 									),
 									list(	// level 2
-										"potassium", "ethanol", "lithium", "silicon", "bromine"
+										/datum/reagent/potassium, /datum/reagent/consumable/ethanol, /datum/reagent/lithium,
+										/datum/reagent/silicon, /datum/reagent/bromine
 									),
 									list(	// level 3
-										"sodiumchloride", "sugar", "orangejuice", "tomatojuice", "milk"
+										/datum/reagent/consumable/sodiumchloride, /datum/reagent/consumable/sugar, /datum/reagent/consumable/orangejuice,
+										/datum/reagent/consumable/tomatojuice, /datum/reagent/consumable/milk
 									),
 									list(	//level 4
-										"spaceacillin", "salglu_solution", "epinephrine", "charcoal"
+										/datum/reagent/medicine/spaceacillin, /datum/reagent/medicine/salglu_solution,
+										/datum/reagent/medicine/epinephrine, /datum/reagent/medicine/charcoal
 									),
 									list(	//level 5
-										"oil", "synaptizine", "mannitol", "space_drugs", "cryptobiolin"
+										/datum/reagent/oil, /datum/reagent/medicine/synaptizine, /datum/reagent/medicine/mannitol,
+										/datum/reagent/drug/space_drugs, /datum/reagent/cryptobiolin
 									),
 									list(	// level 6
-										"phenol", "inacusiate", "oculine", "antihol"
+										/datum/reagent/phenol, /datum/reagent/medicine/inacusiate, /datum/reagent/medicine/oculine, /datum/reagent/medicine/antihol
 									),
 									list(	// level 7
-										"leporazine", "mindbreaker", "corazone"
+										/datum/reagent/medicine/leporazine, /datum/reagent/toxin/mindbreaker, /datum/reagent/medicine/corazone
 									),
 									list(	// level 8
-										"pax", "happiness", "ephedrine"
+										/datum/reagent/pax, /datum/reagent/drug/happiness, /datum/reagent/medicine/ephedrine
 									),
 									list(	// level 9
-										"lipolicide", "sal_acid"
+										/datum/reagent/toxin/lipolicide, /datum/reagent/medicine/sal_acid
 									),
 									list(	// level 10
-										"haloperidol", "aranesp", "diphenhydramine"
+										/datum/reagent/medicine/haloperidol, /datum/reagent/drug/aranesp, /datum/reagent/medicine/diphenhydramine
 									),
 									list(	//level 11
-										"modafinil", "anacea"
+										/datum/reagent/medicine/modafinil, /datum/reagent/toxin/anacea
 									)
 								)

@@ -138,7 +138,7 @@ Bonus
 	var/get_damage = rand(15,21) * power
 	M.adjustOxyLoss(get_damage)
 	if(paralysis)
-		M.reagents.add_reagent_list(list("pancuronium" = 3, "sodium_thiopental" = 3))
+		M.reagents.add_reagent_list(list(/datum/reagent/toxin/pancuronium = 3, /datum/reagent/toxin/sodium_thiopental = 3))
 	return 1

 /datum/symptom/asphyxiation/proc/Asphyxiate_death(mob/living/M, datum/disease/advance/A)
@@ -156,7 +156,7 @@ Bonus
 	M.adjust_fire_stacks(get_stacks)
 	M.adjustFireLoss(get_stacks/2)
 	if(chems)
-		M.reagents.add_reagent("clf3", 2 * power)
+		M.reagents.add_reagent(/datum/reagent/clf3, 2 * power)
 	return 1

 /datum/symptom/alkali/proc/Alkali_fire_stage_5(mob/living/M, datum/disease/advance/A)
@@ -164,5 +164,5 @@ Bonus
 	M.adjust_fire_stacks(get_stacks)
 	M.adjustFireLoss(get_stacks)
 	if(chems)
-		M.reagents.add_reagent_list(list("napalm" = 4 * power, "clf3" = 4 * power))
+		M.reagents.add_reagent_list(list(/datum/reagent/napalm = 4 * power, /datum/reagent/clf3 = 4 * power))
 	return 1
@@ -124,7 +124,7 @@ Bonus
 	var/get_damage = rand(6,10)
 	M.adjustBruteLoss(get_damage)
 	if(chems)
-		M.reagents.add_reagent_list(list("heparin" = 2, "lipolicide" = 2))
+		M.reagents.add_reagent_list(list(/datum/reagent/toxin/heparin = 2, /datum/reagent/toxin/lipolicide = 2))
 	if(zombie)
-		M.reagents.add_reagent("romerol", 1)
+		M.reagents.add_reagent(/datum/reagent/romerol, 1)
 	return 1
@@ -117,8 +117,9 @@
 		power = 2

 /datum/symptom/heal/chem/Heal(mob/living/M, datum/disease/advance/A, actual_power)
-	for(var/datum/reagent/R in M.reagents.reagent_list) //Not just toxins!
-		M.reagents.remove_reagent(R.id, actual_power)
+	for(var/E in M.reagents.reagent_list) //Not just toxins!
+		var/datum/reagent/R = E
+		M.reagents.remove_reagent(R.type, actual_power)
 		if(food_conversion)
 			M.nutrition += 0.3
 		if(prob(2))
@@ -329,11 +330,11 @@
 	if(M.fire_stacks < 0)
 		M.fire_stacks = min(M.fire_stacks + 1 * absorption_coeff, 0)
 		. += power
-	if(M.reagents.has_reagent("holywater"))
-		M.reagents.remove_reagent("holywater", 0.5 * absorption_coeff)
+	if(M.reagents.has_reagent(/datum/reagent/water/holywater))
+		M.reagents.remove_reagent(/datum/reagent/water/holywater, 0.5 * absorption_coeff)
 		. += power * 0.75
-	else if(M.reagents.has_reagent("water"))
-		M.reagents.remove_reagent("water", 0.5 * absorption_coeff)
+	else if(M.reagents.has_reagent(/datum/reagent/water))
+		M.reagents.remove_reagent(/datum/reagent/water, 0.5 * absorption_coeff)
 		. += power * 0.5

 /datum/symptom/heal/water/Heal(mob/living/carbon/M, datum/disease/advance/A, actual_power)
@@ -392,7 +393,7 @@
 		plasmamount = environment.gases[/datum/gas/plasma]
 		if(plasmamount && plasmamount > GLOB.meta_gas_visibility[/datum/gas/plasma]) //if there's enough plasma in the air to see
 			. += power * 0.5
-	if(M.reagents.has_reagent("plasma"))
+	if(M.reagents.has_reagent(/datum/reagent/toxin/plasma))
 		. +=  power * 0.75

 /datum/symptom/heal/plasma/Heal(mob/living/carbon/M, datum/disease/advance/A, actual_power)
@@ -44,10 +44,10 @@

 	if(A.stage >= 4)
 		M.drowsyness = max(0, M.drowsyness - 2)
-		if(M.reagents.has_reagent("mindbreaker"))
-			M.reagents.remove_reagent("mindbreaker", 5)
-		if(M.reagents.has_reagent("histamine"))
-			M.reagents.remove_reagent("histamine", 5)
+		if(M.reagents.has_reagent(/datum/reagent/toxin/mindbreaker))
+			M.reagents.remove_reagent(/datum/reagent/toxin/mindbreaker, 5)
+		if(M.reagents.has_reagent(/datum/reagent/toxin/histamine))
+			M.reagents.remove_reagent(/datum/reagent/toxin/histamine, 5)
 		M.hallucination = max(0, M.hallucination - 10)

 	if(A.stage >= 5)
@@ -5,7 +5,7 @@
 	spread_text = "On contact"
 	spread_flags = DISEASE_SPREAD_BLOOD | DISEASE_SPREAD_CONTACT_SKIN | DISEASE_SPREAD_CONTACT_FLUIDS
 	cure_text = "Ethanol"
-	cures = list("ethanol")
+	cures = list(/datum/reagent/consumable/ethanol)
 	agent = "Excess Lepidopticides"
 	viable_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/monkey)
 	desc = "If left untreated subject will regurgitate butterflies."
@@ -5,7 +5,7 @@
 	spread_text = "On contact"
 	spread_flags = DISEASE_SPREAD_BLOOD | DISEASE_SPREAD_CONTACT_SKIN | DISEASE_SPREAD_CONTACT_FLUIDS
 	cure_text = "Sugar"
-	cures = list("sugar")
+	cures = list(/datum/reagent/consumable/sugar)
 	agent = "Apidae Infection"
 	viable_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/monkey)
 	desc = "If left untreated subject will regurgitate bees."
@@ -4,7 +4,7 @@
 	spread_text = "On contact"
 	spread_flags = DISEASE_SPREAD_BLOOD | DISEASE_SPREAD_CONTACT_SKIN | DISEASE_SPREAD_CONTACT_FLUIDS
 	cure_text = "Mannitol"
-	cures = list("mannitol")
+	cures = list(/datum/reagent/medicine/mannitol)
 	agent = "Cryptococcus Cosmosis"
 	viable_mobtypes = list(/mob/living/carbon/human)
 	cure_chance = 15//higher chance to cure, since two reagents are required
@@ -2,7 +2,7 @@
 	name = "The Cold"
 	max_stages = 3
 	cure_text = "Rest & Spaceacillin"
-	cures = list("spaceacillin")
+	cures = list(/datum/reagent/medicine/spaceacillin)
 	agent = "XY-rhinovirus"
 	viable_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/monkey)
 	permeability_mod = 0.5
@@ -4,7 +4,7 @@
 	spread_text = "On contact"
 	spread_flags = DISEASE_SPREAD_BLOOD | DISEASE_SPREAD_CONTACT_SKIN | DISEASE_SPREAD_CONTACT_FLUIDS
 	cure_text = "Common Cold Anti-bodies & Spaceacillin"
-	cures = list("spaceacillin")
+	cures = list(/datum/reagent/medicine/spaceacillin)
 	agent = "ICE9-rhinovirus"
 	viable_mobtypes = list(/mob/living/carbon/human)
 	desc = "If left untreated the subject will slow, as if partly frozen."
@@ -4,7 +4,7 @@
 	spread_text = "On contact"
 	spread_flags = DISEASE_SPREAD_BLOOD | DISEASE_SPREAD_CONTACT_SKIN | DISEASE_SPREAD_CONTACT_FLUIDS
 	cure_text = "Mutadone"
-	cures = list("mutadone")
+	cures = list(/datum/reagent/medicine/mutadone)
 	disease_flags = CAN_CARRY|CAN_RESIST|CURABLE
 	agent = "S4E1 retrovirus"
 	viable_mobtypes = list(/mob/living/carbon/human)
@@ -4,7 +4,7 @@
 	spread_text = "On contact"
 	spread_flags = DISEASE_SPREAD_BLOOD | DISEASE_SPREAD_CONTACT_SKIN | DISEASE_SPREAD_CONTACT_FLUIDS
 	cure_text = "Synaptizine & Sulfur"
-	cures = list("synaptizine","sulfur")
+	cures = list(/datum/reagent/medicine/synaptizine,/datum/reagent/sulfur)
 	agent = "Gravitokinetic Bipotential SADS-"
 	viable_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/monkey)
 	desc = "If left untreated death will occur."
@@ -3,7 +3,7 @@
 	max_stages = 3
 	spread_text = "Airborne"
 	cure_text = "Spaceacillin"
-	cures = list("spaceacillin")
+	cures = list(/datum/reagent/medicine/spaceacillin)
 	cure_chance = 10
 	agent = "H13N1 flu virion"
 	viable_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/monkey)
@@ -3,7 +3,7 @@
 	max_stages = 3
 	spread_text = "Airborne"
 	cure_text = "Spaceacillin & Anti-bodies to the common flu"
-	cures = list("spaceacillin")
+	cures = list(/datum/reagent/medicine/spaceacillin)
 	cure_chance = 10
 	agent = "1nqu1s1t10n flu virion"
 	viable_mobtypes = list(/mob/living/carbon/human)
@@ -4,7 +4,7 @@
 	spread_text = "On contact"
 	spread_flags = DISEASE_SPREAD_BLOOD | DISEASE_SPREAD_CONTACT_SKIN | DISEASE_SPREAD_CONTACT_FLUIDS
 	cure_text = "Synaptizine & Sulfur"
-	cures = list("synaptizine","sulfur")
+	cures = list(/datum/reagent/medicine/synaptizine,/datum/reagent/sulfur)
 	cure_chance = 15//higher chance to cure, since two reagents are required
 	agent = "Gravitokinetic Bipotential SADS+"
 	viable_mobtypes = list(/mob/living/carbon/human)
@@ -58,7 +58,7 @@
 					H.visible_message("<span class='userdanger'>[H] clutches at [H.p_their()] chest as if [H.p_their()] heart is stopping!</span>")
 				H.adjustStaminaLoss(60)
 				H.set_heartattack(TRUE)
-				H.reagents.add_reagent("corazone", 3) // To give the victim a final chance to shock their heart before losing consciousness
+				H.reagents.add_reagent(/datum/reagent/medicine/corazone, 3) // To give the victim a final chance to shock their heart before losing consciousness
 				cure()

 	else
@@ -3,7 +3,7 @@
 	max_stages = 4
 	spread_text = "Airborne"
 	cure_text = "Iron"
-	cures = list("iron")
+	cures = list(/datum/reagent/iron)
 	agent = "Fukkos Miracos"
 	viable_mobtypes = list(/mob/living/carbon/human)
 	disease_flags = CAN_CARRY|CAN_RESIST|CURABLE
@@ -5,7 +5,7 @@
 	spread_flags = DISEASE_SPREAD_SPECIAL
 	disease_flags = CURABLE
 	cure_text = "Holy Water."
-	cures = list("holywater")
+	cures = list(/datum/reagent/water/holywater)
 	cure_chance = 20
 	agent = "Avian Vengence"
 	viable_mobtypes = list(/mob/living/carbon/human)
@@ -3,7 +3,7 @@
 	max_stages = 4
 	spread_text = "Airborne"
 	cure_text = "Banana products, especially banana bread."
-	cures = list("banana")
+	cures = list(/datum/reagent/consumable/banana)
 	cure_chance = 75
 	agent = "H0NI<42 Virus"
 	viable_mobtypes = list(/mob/living/carbon/human)
@@ -17,7 +17,7 @@
 	..()
 	agent = "Virus class [pick("A","B","C","D","E","F")][pick("A","B","C","D","E","F")]-[rand(50,300)]"
 	if(prob(40))
-		cures = list("mutadone")
+		cures = list(/datum/reagent/medicine/mutadone)
 	else
 		restcure = 1

@@ -4,7 +4,7 @@
 	spread_text = "On contact"
 	spread_flags = DISEASE_SPREAD_BLOOD | DISEASE_SPREAD_CONTACT_SKIN | DISEASE_SPREAD_CONTACT_FLUIDS
 	cure_text = "Chick Chicky Boom!"
-	cures = list("plasma")
+	cures = list(/datum/reagent/toxin/plasma)
 	agent = "Unknown"
 	viable_mobtypes = list(/mob/living/carbon/human)
 	permeability_mod = 1
@@ -93,7 +93,7 @@
 /datum/disease/transformation/jungle_fever
 	name = "Jungle Fever"
 	cure_text = "Death."
-	cures = list("adminordrazine")
+	cures = list(/datum/reagent/medicine/adminordrazine)
 	spread_text = "Monkey Bites"
 	spread_flags = DISEASE_SPREAD_SPECIAL
 	viable_mobtypes = list(/mob/living/carbon/monkey, /mob/living/carbon/human)
@@ -156,7 +156,7 @@

 	name = "Robotic Transformation"
 	cure_text = "An injection of copper."
-	cures = list("copper")
+	cures = list(/datum/reagent/copper)
 	cure_chance = 5
 	agent = "R2D2 Nanomachines"
 	desc = "This disease, actually acute nanomachine infection, converts the victim into a cyborg."
@@ -189,7 +189,7 @@

 	name = "Xenomorph Transformation"
 	cure_text = "Spaceacillin & Glycerol"
-	cures = list("spaceacillin", "glycerol")
+	cures = list(/datum/reagent/medicine/spaceacillin, /datum/reagent/glycerol)
 	cure_chance = 5
 	agent = "Rip-LEY Alien Microbes"
 	desc = "This disease changes the victim into a xenomorph."
@@ -218,7 +218,7 @@
 /datum/disease/transformation/slime
 	name = "Advanced Mutation Transformation"
 	cure_text = "frost oil"
-	cures = list("frostoil")
+	cures = list(/datum/reagent/consumable/frostoil)
 	cure_chance = 80
 	agent = "Advanced Mutation Toxin"
 	desc = "This highly concentrated extract converts anything into more of itself."
@@ -247,7 +247,7 @@
 /datum/disease/transformation/corgi
 	name = "The Barkening"
 	cure_text = "Death"
-	cures = list("adminordrazine")
+	cures = list(/datum/reagent/medicine/adminordrazine)
 	agent = "Fell Doge Majicks"
 	desc = "This disease transforms the victim into a corgi."
 	severity = DISEASE_SEVERITY_BIOHAZARD
@@ -272,7 +272,7 @@
 /datum/disease/transformation/morph
 	name = "Gluttony's Blessing"
 	cure_text = "nothing"
-	cures = list("adminordrazine")
+	cures = list(/datum/reagent/medicine/adminordrazine)
 	agent = "Gluttony's Blessing"
 	desc = "A 'gift' from somewhere terrible."
 	stage_prob = 20
@@ -289,7 +289,7 @@
 /datum/disease/transformation/gondola
 	name = "Gondola Transformation"
 	cure_text = "Condensed Capsaicin, ingested or injected." //getting pepper sprayed doesn't help
-	cures = list("condensedcapsaicin") //beats the hippie crap right out of your system
+	cures = list(/datum/reagent/consumable/condensedcapsaicin) //beats the hippie crap right out of your system
 	cure_chance = 80
 	stage_prob = 5
 	agent = "Tranquility"
@@ -310,17 +310,17 @@
 			if (prob(5))
 				affected_mob.emote("smile")
 			if (prob(20))
-				affected_mob.reagents.add_reagent_list(list("pax" = 5))
+				affected_mob.reagents.add_reagent(/datum/reagent/pax, 5)
 		if(3)
 			if (prob(5))
 				affected_mob.emote("smile")
 			if (prob(20))
-				affected_mob.reagents.add_reagent_list(list("pax" = 5))
+				affected_mob.reagents.add_reagent(/datum/reagent/pax, 5)
 		if(4)
 			if (prob(5))
 				affected_mob.emote("smile")
 			if (prob(20))
-				affected_mob.reagents.add_reagent_list(list("pax" = 5))
+				affected_mob.reagents.add_reagent(/datum/reagent/pax, 5)
 			if (prob(2))
 				to_chat(affected_mob, "<span class='danger'>You let go of what you were holding.</span>")
 				var/obj/item/I = affected_mob.get_active_held_item()
@@ -4,7 +4,7 @@
 	max_stages = 5
 	spread_text = "Airborne"
 	cure_text = "Spaceacillin & salbutamol"
-	cures = list("spaceacillin", "salbutamol")
+	cures = list(/datum/reagent/medicine/spaceacillin, /datum/reagent/medicine/salbutamol)
 	agent = "Fungal Tubercle bacillus Cosmosis"
 	viable_mobtypes = list(/mob/living/carbon/human)
 	cure_chance = 5//like hell are you getting out of hell
@@ -3,7 +3,7 @@
 	max_stages = 4
 	spread_text = "Airborne"
 	cure_text = "The Manly Dorf"
-	cures = list("manlydorf")
+	cures = list(/datum/reagent/consumable/ethanol/manly_dorf)
 	cure_chance = 100
 	agent = "Rincewindus Vulgaris"
 	viable_mobtypes = list(/mob/living/carbon/human)
@@ -11,7 +11,7 @@
 	if(type == /datum/element)
 		return ELEMENT_INCOMPATIBLE
 	if(element_flags & ELEMENT_DETACH)
-		RegisterSignal(target, COMSIG_PARENT_QDELETING, .proc/Detach)
+		RegisterSignal(target, COMSIG_PARENT_QDELETING, .proc/Detach, override = TRUE)

 /datum/element/proc/Detach(datum/source, force)
 	UnregisterSignal(source, COMSIG_PARENT_QDELETING)
@@ -36,4 +36,4 @@
  */
 /datum/proc/RemoveElement(eletype, ...)
 	var/datum/element/ele = SSdcs.GetElement(arglist(args))
-	ele.Detach(src)
+	ele.Detach(src)
@@ -0,0 +1,54 @@
+/datum/element/ghost_role_eligibility
+	element_flags = ELEMENT_DETACH
+	var/list/timeouts = list()
+	var/list/mob/eligible_mobs = list()
+
+/datum/element/ghost_role_eligibility/Attach(datum/target,penalize = FALSE)
+	. = ..()
+	if(!ismob(target))
+		return ELEMENT_INCOMPATIBLE
+	var/mob/M = target
+	if(!(M in eligible_mobs))
+		eligible_mobs += M
+	if(penalize) //penalizing them from making a ghost role / midround antag comeback right away.
+		var/penalty = CONFIG_GET(number/suicide_reenter_round_timer) MINUTES
+		var/roundstart_quit_limit = CONFIG_GET(number/roundstart_suicide_time_limit) MINUTES
+		if(world.time < roundstart_quit_limit) //add up the time difference to their antag rolling penalty if they quit before half a (ingame) hour even passed.
+			penalty += roundstart_quit_limit - world.time
+		if(penalty)
+			penalty += world.realtime
+			if(penalty - SSshuttle.realtimeofstart > SSshuttle.auto_call + SSshuttle.emergencyCallTime + SSshuttle.emergencyDockTime + SSshuttle.emergencyEscapeTime)
+				penalty = CANT_REENTER_ROUND
+			if(!(M.ckey in timeouts))
+				timeouts += M.ckey
+				timeouts[M.ckey] = 0
+			timeouts[M.ckey] = max(timeouts[M.ckey],penalty)
+
+/datum/element/ghost_role_eligibility/Detach(mob/M)
+	. = ..()
+	if(M in eligible_mobs)
+		eligible_mobs -= M
+
+/datum/element/ghost_role_eligibility/proc/get_all_ghost_role_eligible(silent = FALSE)
+	var/list/candidates = list()
+	for(var/m in eligible_mobs)
+		var/mob/M = m
+		if(M.can_reenter_round(TRUE))
+			candidates += M
+	return candidates
+
+/mob/proc/can_reenter_round(silent = FALSE)
+	var/datum/element/ghost_role_eligibility/eli = SSdcs.GetElement(/datum/element/ghost_role_eligibility)
+	return eli.can_reenter_round(src,silent)
+
+/datum/element/ghost_role_eligibility/proc/can_reenter_round(var/mob/M,silent = FALSE)
+	if(!(M in eligible_mobs))
+		return FALSE
+	if(!(M.ckey in timeouts))
+		return TRUE
+	var/timeout = timeouts[M.ckey]
+	if(timeout != CANT_REENTER_ROUND && timeout <= world.realtime)
+		return TRUE
+	if(!silent && M.client)
+		to_chat(M, "<span class='warning'>You are unable to reenter the round[timeout != CANT_REENTER_ROUND ? " yet. Your ghost role blacklist will expire in [DisplayTimeText(timeout - world.realtime)]" : ""].</span>")
+	return FALSE
@@ -0,0 +1,60 @@
+
+/datum/element/wuv //D'awwwww
+	element_flags = ELEMENT_BESPOKE
+	id_arg_index = 2
+	//the for the me emote proc call when petted.
+	var/pet_emote
+	//whether the emote is visible or audible
+	var/pet_type
+	//same as above, except when harmed. "You are going into orbit, you stupid mutt!"
+	var/punt_emote
+	//same as pet_type
+	var/punt_type
+	//mood typepath for the moodlet signal when petted.
+	var/pet_moodlet
+	//same as above but for harm
+	var/punt_moodlet
+
+/datum/element/wuv/Attach(datum/target, pet, pet_t, pet_mood, punt, punt_t, punt_mood)
+	. = ..()
+
+	if(!isliving(target))
+		return ELEMENT_INCOMPATIBLE
+
+	pet_emote = pet
+	pet_type = pet_t
+	punt_emote = punt
+	punt_type = punt_t
+	pet_moodlet = pet_mood
+	punt_moodlet = punt_mood
+
+	RegisterSignal(target, COMSIG_MOB_ATTACK_HAND, .proc/on_attack_hand)
+
+/datum/element/wuv/proc/on_attack_hand(datum/source, mob/user)
+	var/mob/living/L = source
+
+	if(L.stat == DEAD)
+		return
+	//we want to delay the effect to be displayed after the mob is petted, not before.
+	switch(user.a_intent)
+		if(INTENT_HARM, INTENT_DISARM)
+			addtimer(CALLBACK(src, .proc/kick_the_dog, source, user), 1)
+		if(INTENT_HELP)
+			addtimer(CALLBACK(src, .proc/pet_the_dog, source, user), 1)
+
+/datum/element/wuv/proc/pet_the_dog(mob/target, mob/user)
+	if(!QDELETED(target) || !QDELETED(user) || target.stat != CONSCIOUS)
+		return
+	new /obj/effect/temp_visual/heart(target.loc)
+	if(pet_emote)
+		target.emote("me", pet_type, pet_emote)
+	if(pet_moodlet && !CHECK_BITFIELD(target.flags_1, HOLOGRAM_1)) //prevents unlimited happiness petting park exploit.
+		SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, target, pet_moodlet, target)
+
+/datum/element/wuv/proc/kick_the_dog(mob/target, mob/user)
+	if(!QDELETED(target) || !QDELETED(user) || target.stat != CONSCIOUS)
+		return
+	if(punt_emote)
+		target.emote("me", punt_type, punt_emote)
+	if(punt_moodlet && !CHECK_BITFIELD(target.flags_1, HOLOGRAM_1))
+		SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, target, punt_moodlet, target)
@@ -136,9 +136,10 @@
 /datum/emote/sound
 	var/sound //Sound to play when emote is called
 	var/vary = FALSE	//used for the honk borg emote
+	var/volume = 50
 	mob_type_allowed_typecache = list(/mob/living/brain, /mob/living/silicon)

 /datum/emote/sound/run_emote(mob/user, params)
 	. = ..()
 	if(.)
-		playsound(user.loc, sound, 50, vary)
+		playsound(user.loc, sound, volume, vary)
@@ -150,7 +150,9 @@
 	if(!.)
 		return
 	ADD_TRAIT(H, TRAIT_NOGUNS, RISING_BASS_TRAIT)
+	ADD_TRAIT(H, TRAIT_AUTO_CATCH_ITEM, RISING_BASS_TRAIT)

 /datum/martial_art/the_rising_bass/on_remove(mob/living/carbon/human/H)
 	. = ..()
-	REMOVE_TRAIT(H, TRAIT_NOGUNS, RISING_BASS_TRAIT)
+	REMOVE_TRAIT(H, TRAIT_NOGUNS, RISING_BASS_TRAIT)
+	REMOVE_TRAIT(H, TRAIT_AUTO_CATCH_ITEM, RISING_BASS_TRAIT)
@@ -135,8 +135,12 @@
 		if(L.client && L.client.prefs)
 			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
+			if (L.client.prefs.auto_ooc)
+				if (L.client.prefs.chat_toggles & CHAT_OOC)
+					L.client.prefs.chat_toggles ^= CHAT_OOC

 	SEND_SIGNAL(src, COMSIG_MIND_TRANSFER, new_character, old_character)
+	SEND_SIGNAL(new_character, COMSIG_MOB_ON_NEW_MIND)

 /datum/mind/proc/store_memory(new_text)
 	if((length(memory) + length(new_text)) <= MAX_MESSAGE_LEN)
@@ -521,7 +525,7 @@
 		if(!objective)
 			to_chat(usr,"Invalid objective.")
 			return
-		//qdel(objective) Needs cleaning objective destroys
+		qdel(objective) //TODO: Needs cleaning objective destroys (whatever that means)
 		message_admins("[key_name_admin(usr)] removed an objective for [current]: [objective.explanation_text]")
 		log_admin("[key_name(usr)] removed an objective for [current]: [objective.explanation_text]")

@@ -744,6 +748,7 @@
 	else
 		mind = new /datum/mind(key)
 		SSticker.minds += mind
+		SEND_SIGNAL(src, COMSIG_MOB_ON_NEW_MIND)
 	if(!mind.name)
 		mind.name = real_name
 	mind.current = src
@@ -23,10 +23,13 @@
 	mood_change = 3
 	timeout = 3000

-/datum/mood_event/pet_corgi
-	description = "<span class='nicegreen'>Corgis are adorable! I can't stop petting them!</span>\n"
-	mood_change = 3
-	timeout = 3000
+/datum/mood_event/pet_animal
+	description = "<span class='nicegreen'>Animals are adorable! I can't stop petting them!</span>\n"
+	mood_change = 2
+	timeout = 5 MINUTES
+
+/datum/mood_event/pet_animal/add_effects(mob/animal)
+	description = "<span class='nicegreen'>\The [animal.name] is adorable! I can't stop petting [animal.p_them()]!</span>\n"

 /datum/mood_event/honk
 	description = "<span class='nicegreen'>Maybe clowns aren't so bad after all. Honk!</span>\n"
--- a/Show More
+++ b/Show More