Merge remote-tracking branch 'upstream/master' into minor-fixes

2019-10-10 02:57:56 -04:00
parent 0b9b237e34 47c18fd052
commit 4e703f852a
1386 changed files with 20676 additions and 10881 deletions
@@ -1,4 +1,4 @@
-FROM tgstation/byond:512.1467 as base
+FROM tgstation/byond:512.1488 as base

 FROM base as build_base

@@ -20,7 +20,7 @@ Based and maintained from /tg/station.<BR>
 **Forums:** http://citadel-station.net/forum/ <BR>
 **Ban Appeals:** http://citadel-station.net/forum/forumdisplay.php?fid=8 <BR>
 **Code:** https://github.com/Citadel-Station-13/Citadel-Station-13 <BR>
-**Discord:**  [Here](https://discord.gg/3gJ9pnM). <BR>
+**Discord:**  [Here](https://discord.gg/E6SQuhz). <BR>

 ## DOWNLOADING

@@ -508,7 +508,9 @@
 /obj/structure/stone_tile/cracked{
 	dir = 4
 	},
-/obj/item/construction/rcd/loaded,
+/obj/item/construction/rcd/loaded/upgraded{
+	
+	},
 /turf/open/indestructible/boss,
 /area/ruin/unpowered/ash_walkers)
 "bn" = (
@@ -2017,7 +2017,7 @@
 /turf/open/floor/plasteel/dark,
 /area/crew_quarters/heads/hos)
 "aeu" = (
-/obj/machinery/computer/prisoner,
+/obj/machinery/computer/prisoner/management,
 /turf/open/floor/plasteel/dark,
 /area/crew_quarters/heads/hos)
 "aev" = (
@@ -8416,7 +8416,7 @@
 /turf/open/floor/plating,
 /area/security/warden)
 "apI" = (
-/obj/machinery/computer/prisoner{
+/obj/machinery/computer/prisoner/management{
 	dir = 4
 	},
 /obj/structure/cable/yellow{
@@ -10514,7 +10514,7 @@
 /turf/open/floor/plating,
 /area/maintenance/port/fore)
 "atK" = (
-/obj/machinery/computer/gulag_teleporter_computer{
+/obj/machinery/computer/prisoner/gulag_teleporter_computer{
 	dir = 1
 	},
 /turf/open/floor/plasteel/dark,
@@ -20376,6 +20376,7 @@
 /obj/machinery/keycard_auth{
 	pixel_y = 23
 	},
+/obj/item/clipboard,
 /turf/open/floor/plasteel,
 /area/quartermaster/qm)
 "aNS" = (
@@ -21064,6 +21065,7 @@
 	departmentType = 2;
 	pixel_x = 32
 	},
+/obj/item/stamp/qm,
 /turf/open/floor/plasteel,
 /area/quartermaster/qm)
 "aPl" = (
@@ -21619,12 +21621,12 @@
 /turf/open/floor/plasteel,
 /area/quartermaster/qm)
 "aQt" = (
-/obj/structure/table,
-/obj/item/clipboard,
-/obj/item/stamp/qm,
 /obj/machinery/status_display/supply{
 	pixel_x = 32
 	},
+/obj/machinery/computer/card/minor/qm{
+	dir = 8
+	},
 /turf/open/floor/plasteel,
 /area/quartermaster/qm)
 "aQu" = (
@@ -30781,7 +30783,7 @@
 /obj/structure/cable/yellow{
 	icon_state = "2-4"
 	},
-/obj/machinery/computer/prisoner,
+/obj/machinery/computer/prisoner/management,
 /obj/effect/turf_decal/tile/red{
 	dir = 1
 	},
@@ -57384,6 +57386,7 @@
 /obj/effect/turf_decal/tile/blue{
 	dir = 8
 	},
+/obj/effect/mapping_helpers/airlock/unres,
 /turf/open/floor/plasteel/white,
 /area/medical/medbay/central)
 "cha" = (
@@ -57404,6 +57407,7 @@
 /obj/effect/turf_decal/tile/blue{
 	dir = 8
 	},
+/obj/effect/mapping_helpers/airlock/unres,
 /turf/open/floor/plasteel/white,
 /area/medical/medbay/central)
 "chb" = (
@@ -66401,6 +66405,9 @@
 /obj/effect/turf_decal/tile/blue{
 	dir = 8
 	},
+/obj/effect/mapping_helpers/airlock/unres{
+	dir = 4
+	},
 /turf/open/floor/plasteel/white,
 /area/medical/genetics/cloning)
 "cxZ" = (
@@ -27287,6 +27287,9 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/obj/effect/mapping_helpers/airlock/unres{
+	dir = 1
+	},
 /turf/open/floor/plasteel,
 /area/medical/medbay/zone3)
 "aWM" = (
@@ -28598,6 +28601,9 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/obj/effect/mapping_helpers/airlock/unres{
+	dir = 8
+	},
 /turf/open/floor/plasteel,
 /area/medical/medbay/zone3)
 "aYU" = (
@@ -29134,6 +29140,9 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/obj/effect/mapping_helpers/airlock/unres{
+	dir = 8
+	},
 /turf/open/floor/plasteel,
 /area/medical/medbay/zone3)
 "aZQ" = (
@@ -4897,7 +4897,7 @@
 /turf/open/floor/plasteel/showroomfloor,
 /area/security/warden)
 "amT" = (
-/obj/machinery/computer/prisoner,
+/obj/machinery/computer/prisoner/management,
 /obj/machinery/airalarm{
 	pixel_y = 22
 	},
@@ -6072,7 +6072,7 @@
 /turf/open/floor/plating,
 /area/security/brig)
 "apF" = (
-/obj/machinery/computer/gulag_teleporter_computer{
+/obj/machinery/computer/prisoner/gulag_teleporter_computer{
 	dir = 1
 	},
 /turf/open/floor/plasteel/dark,
@@ -7048,7 +7048,7 @@
 /turf/open/floor/plasteel/dark,
 /area/bridge)
 "arR" = (
-/obj/machinery/computer/prisoner,
+/obj/machinery/computer/prisoner/management,
 /obj/effect/turf_decal/tile/red{
 	dir = 1
 	},
@@ -24477,16 +24477,11 @@
 /turf/open/floor/plasteel/dark,
 /area/science/robotics/mechbay)
 "bfB" = (
-/obj/structure/table,
 /obj/machinery/requests_console{
 	department = "Cargo Bay";
 	departmentType = 2;
 	pixel_x = -30
 	},
-/obj/item/paper_bin{
-	layer = 2.9
-	},
-/obj/item/pen,
 /obj/effect/turf_decal/tile/brown{
 	dir = 1
 	},
@@ -24494,6 +24489,9 @@
 /obj/effect/turf_decal/tile/brown{
 	dir = 8
 	},
+/obj/machinery/computer/card/minor/qm{
+	dir = 4
+	},
 /turf/open/floor/plasteel,
 /area/quartermaster/qm)
 "bfC" = (
@@ -27566,6 +27564,7 @@
 	},
 /obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/effect/mapping_helpers/airlock/unres,
 /turf/open/floor/plasteel/freezer,
 /area/storage/emergency/port)
 "bnx" = (
@@ -29314,6 +29313,9 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/effect/mapping_helpers/airlock/unres{
+	dir = 8
+	},
 /turf/open/floor/plasteel/white,
 /area/medical/genetics)
 "brb" = (
@@ -30153,6 +30155,7 @@
 /obj/effect/turf_decal/tile/blue{
 	dir = 8
 	},
+/obj/effect/mapping_helpers/airlock/unres,
 /turf/open/floor/plasteel/white,
 /area/medical/medbay/central)
 "bsI" = (
@@ -30164,6 +30167,7 @@
 	name = "Medbay"
 	},
 /obj/effect/turf_decal/tile/blue,
+/obj/effect/mapping_helpers/airlock/unres,
 /turf/open/floor/plasteel/white,
 /area/medical/medbay/central)
 "bsJ" = (
@@ -47466,8 +47470,8 @@
 /area/hydroponics/garden/monastery)
 "cgL" = (
 /obj/structure/closet/cabinet,
-/obj/item/clothing/suit/holidaypriest,
-/obj/item/clothing/suit/nun,
+/obj/item/clothing/suit/chaplain/holidaypriest,
+/obj/item/clothing/suit/chaplain/nun,
 /obj/item/clothing/head/nun_hood,
 /obj/machinery/button/door{
 	id = "Cell1";
@@ -47834,8 +47838,8 @@
 /area/space/nearstation)
 "cio" = (
 /obj/structure/closet/cabinet,
-/obj/item/clothing/suit/holidaypriest,
-/obj/item/clothing/suit/nun,
+/obj/item/clothing/suit/chaplain/holidaypriest,
+/obj/item/clothing/suit/chaplain/nun,
 /obj/item/clothing/head/nun_hood,
 /obj/machinery/button/door{
 	id = "Cell2";
@@ -50476,8 +50480,8 @@
 /obj/structure/closet,
 /obj/item/storage/backpack/cultpack,
 /obj/item/clothing/head/nun_hood,
-/obj/item/clothing/suit/nun,
-/obj/item/clothing/suit/holidaypriest,
+/obj/item/clothing/suit/chaplain/nun,
+/obj/item/clothing/suit/chaplain/holidaypriest,
 /obj/effect/turf_decal/tile/neutral{
 	dir = 1
 	},
@@ -62094,6 +62098,7 @@
 	name = "Port Emergency Storage";
 	req_access_txt = "0"
 	},
+/obj/effect/mapping_helpers/airlock/unres,
 /turf/open/floor/plasteel/freezer,
 /area/storage/emergency/port)
 "xSX" = (
@@ -523,7 +523,7 @@
 /turf/open/floor/plasteel,
 /area/science)
 "bC" = (
-/obj/machinery/computer/gulag_teleporter_computer{
+/obj/machinery/computer/prisoner/gulag_teleporter_computer{
 	dir = 4
 	},
 /turf/open/floor/plasteel,
@@ -1264,9 +1264,9 @@
 /area/holodeck/rec_center/chapelcourt)
 "dw" = (
 /obj/structure/table/wood/fancy,
-/obj/item/clothing/suit/nun,
+/obj/item/clothing/suit/chaplain/nun,
 /obj/item/clothing/head/nun_hood,
-/obj/item/clothing/suit/holidaypriest,
+/obj/item/clothing/suit/chaplain/holidaypriest,
 /turf/open/floor/holofloor{
 	dir = 8;
 	icon_state = "dark"
@@ -3864,7 +3864,7 @@
 /turf/open/floor/plasteel,
 /area/centcom/control)
 "jS" = (
-/obj/machinery/computer/prisoner,
+/obj/machinery/computer/prisoner/management,
 /obj/effect/turf_decal/stripes/line,
 /turf/open/floor/plasteel,
 /area/centcom/control)
@@ -5857,7 +5857,7 @@
 /turf/open/floor/plasteel,
 /area/centcom/control)
 "nY" = (
-/obj/machinery/computer/prisoner{
+/obj/machinery/computer/prisoner/management{
 	dir = 1
 	},
 /obj/effect/turf_decal/stripes/line{
@@ -10495,7 +10495,7 @@
 /turf/open/floor/plasteel/dark,
 /area/centcom/control)
 "yv" = (
-/obj/machinery/computer/prisoner{
+/obj/machinery/computer/prisoner/management{
 	dir = 1
 	},
 /obj/machinery/light,
@@ -98,7 +98,15 @@
 #define DRINKSBLOOD		15
 #define NOEYES			16
 #define MARKINGS		17
+#define MUTCOLORS2		18
+#define MUTCOLORS3		19
+#define NOAROUSAL		20	//Stops all arousal effects
+#define NOGENITALS		21	//Cannot create, use, or otherwise have genitals
+#define MATRIXED		22	//if icon is color matrix'd
+#define SKINTONE		23	//uses skin tones
+#define HORNCOLOR		24

+//organ slots
 #define ORGAN_SLOT_BRAIN "brain"
 #define ORGAN_SLOT_APPENDIX "appendix"
 #define ORGAN_SLOT_RIGHT_ARM_AUG "r_arm_device"
@@ -122,3 +130,8 @@
 #define ORGAN_SLOT_BRAIN_ANTISTUN "brain_antistun"
 #define ORGAN_SLOT_TAIL "tail"
 #define ORGAN_SLOT_PENIS "penis"
+
+////organ defines
+#define STANDARD_ORGAN_THRESHOLD 	100
+#define STANDARD_ORGAN_HEALING 		0.001
+#define STANDARD_ORGAN_DECAY		0.00222		//designed to fail organs when left to decay for ~15 minutes
@@ -81,3 +81,10 @@

 #define SPAM_TRIGGER_WARNING	5	//Number of identical messages required before the spam-prevention will warn you to stfu
 #define SPAM_TRIGGER_AUTOMUTE	10	//Number of identical messages required before the spam-prevention will automute you
+
+///Max length of a keypress command before it's considered to be a forged packet/bogus command
+#define MAX_KEYPRESS_COMMANDLENGTH 16
+///Max amount of keypress messages per second over two seconds before client is autokicked
+#define MAX_KEYPRESS_AUTOKICK 100
+///Length of held key rolling buffer
+#define HELD_KEY_BUFFER_LENGTH 15
@@ -23,8 +23,9 @@
 #define AI_DETECT_HUD	"19"
 #define NANITE_HUD "20"
 #define DIAG_NANITE_FULL_HUD "21"
+#define RAD_HUD			"22"	//radation alerts for medical huds
 //for antag huds. these are used at the /mob level
-#define ANTAG_HUD		"22"
+#define ANTAG_HUD		"23"

 //by default everything in the hud_list of an atom is an image
 //a value in hud_list with one of these will change that behavior
@@ -89,17 +89,6 @@
 //Damage stuffs
 #define AROUSAL "arousal"

-//DNA stuffs. Remember to change this if upstream adds more snowflake options
-
-
-//Species stuffs. Remember to change this if upstream updates species flags
-#define MUTCOLORS2		35
-#define MUTCOLORS3		36
-#define NOAROUSAL		37 //Stops all arousal effects
-#define NOGENITALS		38 //Cannot create, use, or otherwise have genitals
-#define MATRIXED		39	//if icon is color matrix'd
-#define SKINTONE		40	//uses skin tones
-
 //Citadel istypes
 #define isgenital(A) (istype(A, /obj/item/organ/genital))

@@ -4,15 +4,15 @@
 #define COLOR_INPUT_ENABLED "#D3B5B5"

 #define COLOR_DARKMODE_INFO_BUTTONS_BG "#40628A"
-#define COLOR_DARKMODE_ISSUE_BUTTON_BG "#ce4242"
-#define COLOR_DARKMODE_BACKGROUND "#202020"
-#define COLOR_DARKMODE_DARKBACKGROUND "#171717"
-#define COLOR_DARKMODE_TEXT "#f0f0f0"
+#define COLOR_DARKMODE_ISSUE_BUTTON_BG "#A92C2C"
+#define COLOR_DARKMODE_BACKGROUND "#272727"
+#define COLOR_DARKMODE_DARKBACKGROUND "#242424"
+#define COLOR_DARKMODE_TEXT "#E0E0E0"

-#define COLOR_WHITEMODE_INFO_BUTTONS_BG "#90b3dd"
-#define COLOR_WHITEMODE_ISSUE_BUTTON_BG "#ef7f7f"
-#define COLOR_WHITEMODE_BACKGROUND "#ffffff"
-#define COLOR_WHITEMODE_DARKBACKGROUND "#eeeeee"
+#define COLOR_WHITEMODE_INFO_BUTTONS_BG "#90B3DD"
+#define COLOR_WHITEMODE_ISSUE_BUTTON_BG "#EF7F7F"
+#define COLOR_WHITEMODE_BACKGROUND "#F0F0F0"
+#define COLOR_WHITEMODE_DARKBACKGROUND "#E6E6E6"
 #define COLOR_WHITEMODE_TEXT "#000000"

 #define COLOR_FLOORTILE_GRAY   "#8D8B8B"
@@ -109,3 +109,5 @@
 #define RCD_AIRLOCK 2
 #define RCD_DECONSTRUCT 3
 #define RCD_WINDOWGRILLE 4
+#define RCD_MACHINE 8
+#define RCD_COMPUTER 16
@@ -10,6 +10,8 @@
 #define CHECK_BITFIELD(variable, flag) (variable & (flag))
 #define TOGGLE_BITFIELD(variable, flag) (variable ^= (flag))

+#define CHECK_MULTIPLE_BITFIELDS(flagvar, flags) (((flagvar) & (flags)) == (flags))
+
 GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768))

 // for /datum/var/datum_flags
@@ -50,13 +50,13 @@
 #define isgolem(A) (is_species(A, /datum/species/golem))
 #define islizard(A) (is_species(A, /datum/species/lizard))
 #define isplasmaman(A) (is_species(A, /datum/species/plasmaman))
-#define ispodperson(A) (is_species(A, /datum/species/podperson))
+#define ispodperson(A) (is_species(A, /datum/species/pod))
 #define isflyperson(A) (is_species(A, /datum/species/fly))
 #define isjellyperson(A) (is_species(A, /datum/species/jelly))
 #define isslimeperson(A) (is_species(A, /datum/species/jelly/slime))
 #define isluminescent(A) (is_species(A, /datum/species/jelly/luminescent))
 #define iszombie(A) (is_species(A, /datum/species/zombie))
-#define ismoth(A) (is_species(A, /datum/species/moth))
+#define ismoth(A) (is_species(A, /datum/species/insect))
 #define ishumanbasic(A) (is_species(A, /datum/species/human))
 #define iscatperson(A) (ishumanbasic(A) && istype(A.dna.species, /datum/species/human/felinid) )

@@ -48,3 +48,41 @@
 #define JOB_UNAVAILABLE_PLAYTIME 3
 #define JOB_UNAVAILABLE_ACCOUNTAGE 4
 #define JOB_UNAVAILABLE_SLOTFULL 5
+
+#define DEFAULT_RELIGION "Christianity"
+#define DEFAULT_DEITY "Space Jesus"
+
+#define JOB_DISPLAY_ORDER_DEFAULT 0
+
+#define JOB_DISPLAY_ORDER_ASSISTANT 1
+#define JOB_DISPLAY_ORDER_CAPTAIN 2
+#define JOB_DISPLAY_ORDER_HEAD_OF_PERSONNEL 3
+#define JOB_DISPLAY_ORDER_BARTENDER 4
+#define JOB_DISPLAY_ORDER_COOK 5
+#define JOB_DISPLAY_ORDER_BOTANIST 6
+#define JOB_DISPLAY_ORDER_JANITOR 7
+#define JOB_DISPLAY_ORDER_CLOWN 8
+#define JOB_DISPLAY_ORDER_MIME 9
+#define JOB_DISPLAY_ORDER_CURATOR 10
+#define JOB_DISPLAY_ORDER_LAWYER 11
+#define JOB_DISPLAY_ORDER_CHAPLAIN 12
+#define JOB_DISPLAY_ORDER_QUARTERMASTER 13
+#define JOB_DISPLAY_ORDER_CARGO_TECHNICIAN 14
+#define JOB_DISPLAY_ORDER_SHAFT_MINER 15
+#define JOB_DISPLAY_ORDER_CHIEF_ENGINEER 16
+#define JOB_DISPLAY_ORDER_STATION_ENGINEER 17
+#define JOB_DISPLAY_ORDER_ATMOSPHERIC_TECHNICIAN 18
+#define JOB_DISPLAY_ORDER_CHIEF_MEDICAL_OFFICER 19
+#define JOB_DISPLAY_ORDER_MEDICAL_DOCTOR 20
+#define JOB_DISPLAY_ORDER_CHEMIST 21
+#define JOB_DISPLAY_ORDER_GENETICIST 22
+#define JOB_DISPLAY_ORDER_VIROLOGIST 23
+#define JOB_DISPLAY_ORDER_RESEARCH_DIRECTOR 24
+#define JOB_DISPLAY_ORDER_SCIENTIST 25
+#define JOB_DISPLAY_ORDER_ROBOTICIST 26
+#define JOB_DISPLAY_ORDER_HEAD_OF_SECURITY 27
+#define JOB_DISPLAY_ORDER_WARDEN 28
+#define JOB_DISPLAY_ORDER_DETECTIVE 29
+#define JOB_DISPLAY_ORDER_SECURITY_OFFICER 30
+#define JOB_DISPLAY_ORDER_AI 31
+#define JOB_DISPLAY_ORDER_CYBORG 32
@@ -35,6 +35,7 @@
 #define LOG_GAME		(1 << 12)
 #define LOG_ADMIN_PRIVATE (1 << 13)
 #define LOG_ASAY		(1 << 14)
+#define LOG_VIRUS			(1 << 15)

 //Individual logging panel pages
 #define INDIVIDUAL_ATTACK_LOG		(LOG_ATTACK)
@@ -201,4 +201,10 @@

 	return list(region_x1 & region_x2, region_y1 & region_y2)

+#define EXP_DISTRIBUTION(desired_mean) ( -(1/(1/desired_mean)) * log(rand(1, 1000) * 0.001) )
+
+#define LORENTZ_DISTRIBUTION(x, s) ( s*TAN(TODEGREES(PI*(rand()-0.5))) + x )
+#define LORENTZ_CUMULATIVE_DISTRIBUTION(x, y, s) ( (1/PI)*TORADIANS(arctan((x-y)/s)) + 1/2 )
+
+#define RULE_OF_THREE(a, b, x) ((a*x)/b)
 // )
@@ -314,7 +314,7 @@ GLOBAL_LIST_INIT(pda_reskins, list(PDA_SKIN_CLASSIC = 'icons/obj/pda.dmi', PDA_S
 #define MAP_MAXZ 6

 // Defib stats
-#define DEFIB_TIME_LIMIT 120
+#define DEFIB_TIME_LIMIT 960
 #define DEFIB_TIME_LOSS 60

 // Diagonal movement
@@ -472,6 +472,9 @@ GLOBAL_LIST_INIT(pda_reskins, list(PDA_SKIN_CLASSIC = 'icons/obj/pda.dmi', PDA_S

 #define EGG_LAYING_MESSAGES list("lays an egg.","squats down and croons.","begins making a huge racket.","begins clucking raucously.")

+// list of all null rod weapons
+#define HOLY_WEAPONS /obj/item/nullrod, /obj/item/twohanded/dualsaber/hypereutactic/chaplain, /obj/item/gun/energy/laser/redtag/hitscan/chaplain, /obj/item/multitool/chaplain, /obj/item/melee/baseball_bat/chaplain
+
 // Used by PDA and cartridge code to reduce repetitiveness of spritesheets
 #define PDAIMG(what) {"<span class="pda16x16 [#what]"></span>"}

@@ -116,6 +116,8 @@
 #define BIOWARE_GENERIC "generic"
 #define BIOWARE_NERVES "nerves"
 #define BIOWARE_CIRCULATION "circulation"
+#define BIOWARE_LIGAMENTS "ligaments"
+#define BIOWARE_DISSECTION "dissected"

 //Health hud screws for carbon mobs
 #define SCREWYHUD_NONE 0
@@ -203,8 +205,6 @@

 #define MAX_CHICKENS 50

-#define UNHEALING_EAR_DAMAGE 100
-

 #define INCORPOREAL_MOVE_BASIC 1
 #define INCORPOREAL_MOVE_SHADOW 2 // leaves a trail of shadows
@@ -256,6 +256,9 @@

 #define MAX_QUIRKS 6 //The maximum amount of quirks one character can have at roundstart

+#define MAX_REVIVE_FIRE_DAMAGE 180
+#define MAX_REVIVE_BRUTE_DAMAGE 180
+
 // AI Toggles
 #define AI_CAMERA_LUMINOSITY	5
 #define AI_VOX // Comment out if you don't want VOX to be enabled and have players download the voice sounds.
@@ -264,3 +267,6 @@
 #define BODYPART_LIFE_UPDATE_HEALTH (1<<0)

 #define HUMAN_FIRE_STACK_ICON_NUM	3
+
+#define PULL_PRONE_SLOWDOWN 0.6
+#define HUMAN_CARRY_SLOWDOWN 0
@@ -31,3 +31,6 @@
 #define MOVESPEED_ID_PAI_SPACEWALK_SPEEDMOD				"PAI_SPACEWALK_MODIFIER"

 #define MOVESPEED_ID_SANITY								"MOOD_SANITY"
+
+#define MOVESPEED_ID_PRONE_DRAGGING                     "PRONE_DRAG"
+#define MOVESPEED_ID_HUMAN_CARRYING                     "HUMAN_CARRY"
@@ -10,6 +10,7 @@
 #define UNIQUE_RENAME			(1<<6) // can you customize the description/name of the thing?
 #define USES_TGUI				(1<<7)	//put on things that use tgui on ui_interact instead of custom/old UI.
 #define FROZEN					(1<<8)
+#define SHOVABLE_ONTO			(1<<9) //called on turf.shove_act() to consider whether an object should have a niche effect (defined in their own shove_act()) when someone is pushed onto it, or do a sanity CanPass() check.

 // If you add new ones, be sure to add them to /obj/Initialize as well for complete mapping support

@@ -38,3 +39,12 @@
 #define THICKMATERIAL				(1<<5)	//prevents syringes, parapens and hypos if the external suit or helmet (if targeting head) has this flag. Example: space suits, biosuit, bombsuits, thick suits that cover your body.
 #define VOICEBOX_TOGGLABLE (1<<6) // The voicebox in this clothing can be toggled.
 #define VOICEBOX_DISABLED (1<<7) // The voicebox is currently turned off.
+
+// Flags for the organ_flags var on /obj/item/organ
+
+#define ORGAN_SYNTHETIC			(1<<0)	//Synthetic organs, or cybernetic organs. Reacts to EMPs and don't deteriorate or heal
+#define ORGAN_FROZEN			(1<<1)	//Frozen organs, don't deteriorate
+#define ORGAN_FAILING			(1<<2)	//Failing organs perform damaging effects until replaced or fixed
+#define ORGAN_EXTERNAL			(1<<3)	//Was this organ implanted/inserted/etc, if true will not be removed during species change.
+#define ORGAN_VITAL				(1<<4)	//Currently only the brain
+#define ORGAN_NO_SPOIL			(1<<5)	//Currently only the brain
@@ -69,4 +69,9 @@
 //Flags in the players table in the db
 #define DB_FLAG_EXEMPT 1

-#define DEFAULT_CYBORG_NAME "Default Cyborg Name"
+#define DEFAULT_CYBORG_NAME "Default Cyborg Name"
+
+//Job preferences levels
+#define JP_LOW 1
+#define JP_MEDIUM 2
+#define JP_HIGH 3
@@ -34,3 +34,17 @@
 #define DEL_REAGENT		1	// reagent deleted (fully cleared)
 #define ADD_REAGENT		2	// reagent added
 #define REM_REAGENT		3	// reagent removed (may still exist)
+
+//reagent bitflags, used for altering how they works
+#define REAGENT_DEAD_PROCESS		(1<<0)	//calls on_mob_dead() if present in a dead body
+#define REAGENT_DONOTSPLIT			(1<<1)	//Do not split the chem at all during processing
+#define REAGENT_ONLYINVERSE			(1<<2)	//Only invert chem, no splitting
+#define REAGENT_ONMOBMERGE			(1<<3)	//Call on_mob_life proc when reagents are merging.
+#define REAGENT_INVISIBLE			(1<<4)	//Doesn't appear on handheld health analyzers.
+#define REAGENT_FORCEONNEW			(1<<5)  //Forces a on_new() call without a data overhead
+#define REAGENT_SNEAKYNAME          (1<<6)  //When inverted, the inverted chem uses the name of the original chem
+#define REAGENT_SPLITRETAINVOL      (1<<7)  //Retains initial volume of chem when splitting
+
+//Chemical reaction flags, for determining reaction specialties
+#define REACTION_CLEAR_IMPURE       (1<<0)  //Convert into impure/pure on reaction completion
+#define REACTION_CLEAR_INVERSE      (1<<1)  //Convert into inverse on reaction completion when purity is low enough
@@ -8,6 +8,9 @@
 #define UNCONSCIOUS	2
 #define DEAD		3

+//Maximum healthiness an individual can have
+#define MAX_SATIETY 600
+
 // bitflags for machine stat variable
 #define BROKEN	(1<<0)
 #define NOPOWER	(1<<1)
@@ -95,6 +95,8 @@
 #define TRAIT_NOHUNGER			"no_hunger"
 #define TRAIT_EASYDISMEMBER		"easy_dismember"
 #define TRAIT_LIMBATTACHMENT 	"limb_attach"
+#define TRAIT_NOLIMBDISABLE		"no_limb_disable"
+#define TRAIT_EASYLIMBDISABLE	"easy_limb_disable"
 #define TRAIT_TOXINLOVER		"toxinlover"
 #define TRAIT_NOBREATH			"no_breath"
 #define TRAIT_ANTIMAGIC			"anti_magic"
@@ -118,6 +120,7 @@
 #define TRAIT_LAW_ENFORCEMENT_METABOLISM "law-enforcement-metabolism"
 #define	TRAIT_STRONG_GRABBER	"strong_grabber"
 #define	TRAIT_CALCIUM_HEALER	"calcium_healer"
+#define TRAIT_CAPTAIN_METABOLISM "captain-metabolism"

 //non-mob traits
 #define TRAIT_PARALYSIS			"paralysis" //Used for limb-based paralysis, where replacing the limb will fix it
@@ -162,6 +165,7 @@
 #define OBESITY "obesity"
 #define MAGIC_TRAIT "magic"
 #define TRAUMA_TRAIT "trauma"
+#define DISEASE_TRAIT "disease"
 #define SPECIES_TRAIT "species"
 #define ORGAN_TRAIT "organ"
 #define JOB_TRAIT "job"
@@ -203,4 +207,4 @@
 #define FLIGHTSUIT_TRAIT "flightsuit"
 #define LOCKED_HELMET_TRAIT "locked-helmet"
 #define NINJA_SUIT_TRAIT "ninja-suit"
-#define ANTI_DROP_IMPLANT_TRAIT "anti-drop-implant"
+#define ANTI_DROP_IMPLANT_TRAIT "anti-drop-implant"
@@ -94,6 +94,12 @@ GLOBAL_LIST_INIT(dildo_colors, list(//mostly neon colors
 		"Purple"	= "#e300ff"//purple
 		))

+GLOBAL_LIST_INIT(meat_types, list(
+	"Mammalian" = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/mammal,
+	"Aquatic" = /obj/item/reagent_containers/food/snacks/carpmeat/aquatic,
+	"Avian" = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/avian,
+	"Inesct" = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/insect))
+
 //Crew objective and miscreants stuff
 GLOBAL_VAR_INIT(miscreants_allowed, FALSE)

@@ -58,6 +58,10 @@
 	if (CONFIG_GET(flag/log_game))
 		WRITE_LOG(GLOB.world_game_log, "GAME: [text]")

+/proc/log_virus(text)
+	if (CONFIG_GET(flag/log_virus))
+		WRITE_LOG(GLOB.world_virus_log, "VIRUS: [text]")
+
 /proc/log_access(text)
 	if (CONFIG_GET(flag/log_access))
 		WRITE_LOG(GLOB.world_game_log, "ACCESS: [text]")
@@ -81,3 +81,6 @@ GLOBAL_VAR_INIT(cmp_field, "name")

 /proc/cmp_advdisease_resistance_asc(datum/disease/advance/A, datum/disease/advance/B)
 	return A.totalResistance() - B.totalResistance()
+
+/proc/cmp_job_display_asc(datum/job/A, datum/job/B)
+	return A.display_order - B.display_order
@@ -3,7 +3,7 @@
 	for(var/file in args)
 		src << browse_rsc(file)

-/client/proc/browse_files(root="data/logs/", max_iterations=10, list/valid_extensions=list("txt","log","htm", "html"))
+/client/proc/browse_files(root="data/logs/", max_iterations=10, list/valid_extensions=list("txt","log","htm", "html", "md"))
 	var/path = root

 	for(var/i=0, i<max_iterations, i++)
@@ -159,6 +159,44 @@
 		processing_list.Cut(1, 2)
 		processing_list += A.contents

+/** recursive_organ_check
+  * inputs: O (object to start with)
+  * outputs:
+  * description: A pseudo-recursive loop based off of the recursive mob check, this check looks for any organs held
+  *				 within 'O', toggling their frozen flag. This check excludes items held within other safe organ
+  *				 storage units, so that only the lowest level of container dictates whether we do or don't decompose
+  */
+/proc/recursive_organ_check(atom/O)
+
+	var/list/processing_list = list(O)
+	var/list/processed_list = list()
+	var/index = 1
+	var/obj/item/organ/found_organ
+
+	while(index <= length(processing_list))
+
+		var/atom/A = processing_list[index]
+
+		if(istype(A, /obj/item/organ))
+			found_organ = A
+			found_organ.organ_flags ^= ORGAN_FROZEN
+
+		else if(istype(A, /mob/living/carbon))
+			var/mob/living/carbon/Q = A
+			for(var/organ in Q.internal_organs)
+				found_organ = organ
+				found_organ.organ_flags ^= ORGAN_FROZEN
+
+		for(var/atom/B in A)	//objects held within other objects are added to the processing list, unless that object is something that can hold organs safely
+			if(!processed_list[B] && !istype(B, /obj/structure/closet/crate/freezer) && !istype(B, /obj/structure/closet/secure_closet/freezer))
+				processing_list+= B
+
+		index++
+		processed_list[A] = A
+
+	return
+
+
 // Better recursive loop, technically sort of not actually recursive cause that shit is retarded, enjoy.
 //No need for a recursive limit either
 /proc/recursive_mob_check(atom/O,client_check=1,sight_check=1,include_radio=1)
@@ -30,7 +30,8 @@
 	init_sprite_accessory_subtypes(/datum/sprite_accessory/legs, GLOB.legs_list)
 	init_sprite_accessory_subtypes(/datum/sprite_accessory/wings, GLOB.r_wings_list,roundstart = TRUE)
 	init_sprite_accessory_subtypes(/datum/sprite_accessory/caps, GLOB.caps_list)
-	init_sprite_accessory_subtypes(/datum/sprite_accessory/moth_wings, GLOB.moth_wings_list)
+	init_sprite_accessory_subtypes(/datum/sprite_accessory/insect_wings, GLOB.insect_wings_list)
+	init_sprite_accessory_subtypes(/datum/sprite_accessory/insect_fluff, GLOB.insect_fluffs_list)

 //CIT CHANGES START HERE, ADDS SNOWFLAKE BODYPARTS AND MORE
 	//mammal bodyparts (fucking furries)
@@ -44,6 +45,9 @@
 	init_sprite_accessory_subtypes(/datum/sprite_accessory/xeno_head, GLOB.xeno_head_list)
 	init_sprite_accessory_subtypes(/datum/sprite_accessory/xeno_tail, GLOB.xeno_tail_list)
 	init_sprite_accessory_subtypes(/datum/sprite_accessory/xeno_dorsal, GLOB.xeno_dorsal_list)
+	//ipcs
+	init_sprite_accessory_subtypes(/datum/sprite_accessory/screen, GLOB.ipc_screens_list, roundstart = TRUE)
+	init_sprite_accessory_subtypes(/datum/sprite_accessory/antenna, GLOB.ipc_antennas_list, roundstart = TRUE)
 	//genitals
 	init_sprite_accessory_subtypes(/datum/sprite_accessory/penis, GLOB.cock_shapes_list)
 	for(var/K in GLOB.cock_shapes_list)
@@ -53,7 +57,11 @@
 	init_sprite_accessory_subtypes(/datum/sprite_accessory/vagina, GLOB.vagina_shapes_list)
 	init_sprite_accessory_subtypes(/datum/sprite_accessory/breasts, GLOB.breasts_shapes_list)
 	GLOB.breasts_size_list = list ("a", "b", "c", "d", "e") //We need the list to choose from initialized, but it's no longer a sprite_accessory thing.
-	GLOB.gentlemans_organ_names = list("phallus", "willy", "dick", "prick", "member", "tool", "gentleman's organ", "cock", "wang", "knob", "dong", "joystick", "pecker", "johnson", "weenie", "tadger", "schlong", "thirsty ferret", "baloney pony", "schlanger")
+	GLOB.gentlemans_organ_names = list("phallus", "willy", "dick", "prick", "member", "tool", "gentleman's organ",
+	"cock", "wang", "knob", "dong", "joystick", "pecker", "johnson", "weenie", "tadger", "schlong", "thirsty ferret",
+	"baloney pony", "schlanger", "Mutton dagger", "old blind bob","Hanging Johnny", "fishing rod", "Tally whacker", "polly rocket",
+	"One eyed trouser trout", "Ding dong", "ankle spanker", "Pork sword", "engine cranker", "Harry hot dog", "Davy Crockett",
+	"Kidney cracker", "Heat seeking moisture missile", "Giggle stick", "love whistle", "Tube steak", "Uncle Dick", "Purple helmet warrior")
 	for(var/K in GLOB.breasts_shapes_list)
 		var/datum/sprite_accessory/breasts/value = GLOB.breasts_shapes_list[K]
 		GLOB.breasts_shapes_icons[K] = value.icon_state
@@ -62,6 +70,7 @@
 	for(var/K in GLOB.balls_shapes_list)
 		var/datum/sprite_accessory/testicles/value = GLOB.balls_shapes_list[K]
 		GLOB.balls_shapes_icons[K] = value.icon_state
+
 //END OF CIT CHANGES

 	//Species
@@ -59,7 +59,7 @@
 	if(!GLOB.horns_list.len)
 		init_sprite_accessory_subtypes(/datum/sprite_accessory/horns, GLOB.horns_list)
 	if(!GLOB.ears_list.len)
-		init_sprite_accessory_subtypes(/datum/sprite_accessory/ears, GLOB.horns_list)
+		init_sprite_accessory_subtypes(/datum/sprite_accessory/ears, GLOB.ears_list)
 	if(!GLOB.frills_list.len)
 		init_sprite_accessory_subtypes(/datum/sprite_accessory/frills, GLOB.frills_list)
 	if(!GLOB.spines_list.len)
@@ -70,8 +70,10 @@
 		init_sprite_accessory_subtypes(/datum/sprite_accessory/body_markings, GLOB.body_markings_list)
 	if(!GLOB.wings_list.len)
 		init_sprite_accessory_subtypes(/datum/sprite_accessory/wings, GLOB.wings_list)
-	if(!GLOB.moth_wings_list.len)
-		init_sprite_accessory_subtypes(/datum/sprite_accessory/moth_wings, GLOB.moth_wings_list)
+	if(!GLOB.insect_wings_list.len)
+		init_sprite_accessory_subtypes(/datum/sprite_accessory/insect_wings, GLOB.insect_wings_list)
+	if(!GLOB.insect_fluffs_list.len)
+		init_sprite_accessory_subtypes(/datum/sprite_accessory/insect_fluff, GLOB.insect_fluffs_list)

 	//CIT CHANGES - genitals and such
 	if(!GLOB.cock_shapes_list.len)
@@ -130,22 +132,23 @@

 	//CIT CHANGE - changes this entire return to support cit's snowflake parts
 	return(list(
-		"mcolor" = color1,
-		"mcolor2" = color2,
-		"mcolor3" = color3,
-		"tail_lizard" = pick(GLOB.tails_list_lizard),
-		"tail_human" = "None",
-		"wings" = "None",
-		"snout" = pick(GLOB.snouts_list),
-		"horns" = pick(GLOB.horns_list),
-		"ears" = "None",
-		"frills" = pick(GLOB.frills_list),
-		"spines" = pick(GLOB.spines_list),
-		"body_markings" = pick(GLOB.body_markings_list),
-		"legs" = pick("Normal Legs","Digitigrade Legs"),
-		"caps" = pick(GLOB.caps_list),
-		"moth_wings" = pick(GLOB.moth_wings_list),
-		"taur" = "None",
+		"mcolor"			= color1,
+		"mcolor2"			= color2,
+		"mcolor3"			= color3,
+		"tail_lizard"		= pick(GLOB.tails_list_lizard),
+		"tail_human"		= "None",
+		"wings"				= "None",
+		"snout"				= pick(GLOB.snouts_list),
+		"horns"				= pick(GLOB.horns_list),
+		"ears"				= "None",
+		"frills"			= pick(GLOB.frills_list),
+		"spines"			= pick(GLOB.spines_list),
+		"body_markings"		= pick(GLOB.body_markings_list),
+		"legs"				= pick("Plantigrade","Digitigrade"),
+		"caps"				= pick(GLOB.caps_list),
+		"insect_wings"		= pick(GLOB.insect_wings_list),
+		"insect_fluff"		= "None",
+		"taur"				= "None",
 		"mam_body_markings" = pick(snowflake_markings_list),
 		"mam_ears" 			= pick(snowflake_ears_list),
 		"mam_snouts"		= pick(snowflake_mam_snouts_list),
@@ -201,9 +204,11 @@
 		"womb_cum_mult"		= CUM_RATE_MULT,
 		"womb_efficiency"	= CUM_EFFICIENCY,
 		"womb_fluid" 		= "femcum",
-		"ipc_screen" = "Sunburst",
-		"ipc_antenna" = "None",
-		"flavor_text"		= ""))
+		"ipc_screen"		= "Sunburst",
+		"ipc_antenna"		= "None",
+		"flavor_text"		= "",
+		"meat_type"			= "Mammalian"
+		))

 /proc/random_hair_style(gender)
 	switch(gender)
@@ -308,6 +308,13 @@
 			//ignore this comment, it fixes the broken sytax parsing caused by the " above
 			else
 				parts += "[GLOB.TAB]<i>Nobody died this shift!</i>"
+	if(istype(SSticker.mode, /datum/game_mode/dynamic))
+		var/datum/game_mode/dynamic/mode = SSticker.mode
+		parts += "[GLOB.TAB]Threat level: [mode.threat_level]"
+		parts += "[GLOB.TAB]Threat left: [mode.threat]"
+		parts += "[GLOB.TAB]Executed rules:"
+		for(var/datum/dynamic_ruleset/rule in mode.executed_rules)
+			parts += "[GLOB.TAB][GLOB.TAB][rule.ruletype] - <b>[rule.name]</b>: -[rule.cost] threat"
 	return parts.Join("<br>")

 /client/proc/roundend_report_file()
@@ -791,3 +791,6 @@ GLOBAL_LIST_INIT(binary, list("0","1"))
 			rearranged += cword
 	message = "[prefix][jointext(rearranged," ")]"
 	. = message
+
+#define is_alpha(X) ((text2ascii(X) <= 122) && (text2ascii(X) >= 97))
+#define is_digit(X) ((length(X) == 1) && (length(text2num(X)) == 1))
@@ -73,3 +73,11 @@ GLOBAL_VAR_INIT(rollovercheck_last_timeofday, 0)

 /proc/daysSince(realtimev)
 	return round((world.realtime - realtimev) / (24 HOURS))
+
+/proc/worldtime2text()
+	return gameTimestamp("hh:mm:ss", world.time)
+
+/proc/gameTimestamp(format = "hh:mm:ss", wtime=null)
+	if(!wtime)
+		wtime = world.time
+	return time2text(wtime - GLOB.timezoneOffset, format)
@@ -32,6 +32,7 @@ GLOBAL_LIST_INIT(bitfields, list(
 		"UNIQUE_RENAME" = UNIQUE_RENAME,
 		"USES_TGUI" = USES_TGUI,
 		"FROZEN" = FROZEN,
+		"SHOVABLE_ONTO" = SHOVABLE_ONTO
 		),
 	"datum_flags" = list(
 		"DF_USE_TAG" = DF_USE_TAG,
@@ -171,10 +172,32 @@ GLOBAL_LIST_INIT(bitfields, list(
 	"rad_flags" = list(
 		"RAD_PROTECT_CONTENTS" = RAD_PROTECT_CONTENTS,
 		"RAD_NO_CONTAMINATE" = RAD_NO_CONTAMINATE,
-	),
+		),
 	"disease_flags" = list(
 		"CURABLE" = CURABLE,
 		"CAN_CARRY"	= CAN_CARRY,
 		"CAN_RESIST" = CAN_RESIST
-	),
-	))
+		),
+	"chemical_flags" = list(
+		"REAGENT_DEAD_PROCESS" = REAGENT_DEAD_PROCESS,
+		"REAGENT_DONOTSPLIT" = REAGENT_DONOTSPLIT,
+		"REAGENT_ONLYINVERSE" = REAGENT_ONLYINVERSE,
+		"REAGENT_ONMOBMERGE" = REAGENT_ONMOBMERGE,
+		"REAGENT_INVISIBLE" = REAGENT_INVISIBLE,
+		"REAGENT_FORCEONNEW" = REAGENT_FORCEONNEW,
+		"REAGENT_SNEAKYNAME" = REAGENT_SNEAKYNAME,
+		"REAGENT_SPLITRETAINVOL" = REAGENT_SPLITRETAINVOL
+		),
+	"clear_conversion" = list(
+		"REACTION_CLEAR_IMPURE"  = REACTION_CLEAR_IMPURE,
+		"REACTION_CLEAR_INVERSE" = REACTION_CLEAR_INVERSE
+	    ),
+	"organ_flags" = list(
+		"ORGAN_SYNTHETIC" = ORGAN_SYNTHETIC,
+		"ORGAN_FROZEN" = ORGAN_FROZEN,
+		"ORGAN_FAILING" = ORGAN_FAILING,
+		"ORGAN_EXTERNAL" = ORGAN_EXTERNAL,
+		"ORGAN_VITAL" = ORGAN_VITAL,
+		"ORGAN_NO_SPOIL" = ORGAN_NO_SPOIL
+		),
+		))
@@ -34,7 +34,8 @@ GLOBAL_LIST_EMPTY(ears_list)
 GLOBAL_LIST_EMPTY(wings_list)
 GLOBAL_LIST_EMPTY(wings_open_list)
 GLOBAL_LIST_EMPTY(r_wings_list)
-GLOBAL_LIST_EMPTY(moth_wings_list)
+GLOBAL_LIST_EMPTY(insect_wings_list)
+GLOBAL_LIST_EMPTY(insect_fluffs_list)
 GLOBAL_LIST_EMPTY(caps_list)

 GLOBAL_LIST_INIT(ghost_forms_with_directions_list, list("ghost")) //stores the ghost forms that support directional sprites
@@ -26,6 +26,8 @@ GLOBAL_VAR(query_debug_log)
 GLOBAL_PROTECT(query_debug_log)
 GLOBAL_VAR(world_job_debug_log)
 GLOBAL_PROTECT(world_job_debug_log)
+GLOBAL_VAR(world_virus_log)
+GLOBAL_PROTECT(world_virus_log)

 GLOBAL_LIST_EMPTY(bombers)
 GLOBAL_PROTECT(bombers)
@@ -67,7 +67,7 @@
 /mob/proc/ClickOn( atom/A, params )
 	if(world.time <= next_click)
 		return
-	next_click = world.time + 1
+	next_click = world.time + world.tick_lag

 	if(check_click_intercept(params,A))
 		return
@@ -55,6 +55,17 @@

 	var/obj/item/W = get_active_held_item()

+	if(!W && A.Adjacent(src) && (isobj(A) || ismob(A)))
+		var/atom/movable/C = A
+		if(C.can_buckle && C.has_buckled_mobs())
+			if(C.buckled_mobs.len > 1)
+				var/unbuckled = input(src, "Who do you wish to unbuckle?","Unbuckle Who?") as null|mob in C.buckled_mobs
+				if(C.user_unbuckle_mob(unbuckled,src))
+					return
+			else
+				if(C.user_unbuckle_mob(C.buckled_mobs[1],src))
+					return
+
 	if(!W && get_dist(src,A) <= interaction_range)
 		A.attack_robot(src)
 		return
@@ -39,6 +39,8 @@

 /datum/config_entry/flag/log_game	// log game events

+/datum/config_entry/flag/log_virus	// log virology data
+
 /datum/config_entry/flag/log_vote	// log voting

 /datum/config_entry/flag/log_whisper	// log client whisper
@@ -6,7 +6,17 @@ SUBSYSTEM_DEF(assets)
 	var/list/preload = list()

 /datum/controller/subsystem/assets/Initialize(timeofday)
-	for(var/type in typesof(/datum/asset))
+
+	var/list/priority_assets = list(
+		/datum/asset/simple/oui_theme_nano,
+		/datum/asset/simple/goonchat
+		)
+
+	for(var/type in priority_assets)
+		var/datum/asset/A = new type()
+		A.register()
+	
+	for(var/type in typesof(/datum/asset) - (priority_assets | list(/datum/asset, /datum/asset/simple)))
 		var/datum/asset/A = type
 		if (type != initial(A._abstract))
 			get_asset_datum(type)
@@ -294,7 +294,7 @@ Versioning
 	var/lakey = L.lastattackerckey
 	var/sqlbrute = L.getBruteLoss()
 	var/sqlfire = L.getFireLoss()
-	var/sqlbrain = L.getBrainLoss()
+	var/sqlbrain = L.getOrganLoss(ORGAN_SLOT_BRAIN)
 	var/sqloxy = L.getOxyLoss()
 	var/sqltox = L.getToxLoss()
 	var/sqlclone = L.getCloneLoss()
@@ -308,7 +308,7 @@ Versioning

 	if(!SSdbcore.Connect())
 		return
-	
+
 	sqlname = sanitizeSQL(sqlname)
 	sqlkey = sanitizeSQL(sqlkey)
 	sqljob = sanitizeSQL(sqljob)
@@ -110,13 +110,16 @@ SUBSYSTEM_DEF(job)
 		if(job.required_playtime_remaining(player.client))
 			JobDebug("FOC player not enough xp, Player: [player]")
 			continue
+		if(!player.client.prefs.pref_species.qualifies_for_rank(job.title, player.client.prefs.features))
+			JobDebug("FOC non-human failed, Player: [player]")
+			continue
 		if(flag && (!(flag in player.client.prefs.be_special)))
 			JobDebug("FOC flag failed, Player: [player], Flag: [flag], ")
 			continue
 		if(player.mind && job.title in player.mind.restricted_roles)
 			JobDebug("FOC incompatible with antagonist role, Player: [player]")
 			continue
-		if(player.client.prefs.GetJobDepartment(job, level) & job.flag)
+		if(player.client.prefs.job_preferences["[job.title]"] == level)
 			JobDebug("FOC pass, Player: [player], Level:[level]")
 			candidates += player
 	return candidates
@@ -145,6 +148,10 @@ SUBSYSTEM_DEF(job)
 			JobDebug("GRJ player not old enough, Player: [player]")
 			continue

+		if(!player.client.prefs.pref_species.qualifies_for_rank(job.title, player.client.prefs.features))
+			JobDebug("GRJ non-human failed, Player: [player]")
+			continue
+
 		if(job.required_playtime_remaining(player.client))
 			JobDebug("GRJ player not enough xp, Player: [player]")
 			continue
@@ -182,7 +189,7 @@ SUBSYSTEM_DEF(job)
 			if((job.current_positions >= job.total_positions) && job.total_positions != -1)
 				continue
 			var/list/candidates = FindOccupationCandidates(job, level)
-			if(!candidates.len)
+			if(!candidates?.len)
 				continue
 			var/mob/dead/new_player/candidate = pick(candidates)
 			if(AssignRole(candidate, command_position))
@@ -200,7 +207,7 @@ SUBSYSTEM_DEF(job)
 		if((job.current_positions >= job.total_positions) && job.total_positions != -1)
 			continue
 		var/list/candidates = FindOccupationCandidates(job, level)
-		if(!candidates.len)
+		if(!candidates?.len)
 			continue
 		var/mob/dead/new_player/candidate = pick(candidates)
 		AssignRole(candidate, command_position)
@@ -228,7 +235,7 @@ SUBSYSTEM_DEF(job)
 *  fills var "assigned_role" for all ready players.
 *  This proc must not have any side effect besides of modifying "assigned_role".
 **/
-/datum/controller/subsystem/job/proc/DivideOccupations()
+/datum/controller/subsystem/job/proc/DivideOccupations(list/required_jobs)
 	//Setup new player list and get the jobs list
 	JobDebug("Running DO")

@@ -241,14 +248,14 @@ SUBSYSTEM_DEF(job)

 	//Get the players who are ready
 	for(var/mob/dead/new_player/player in GLOB.player_list)
-		if(player.ready == PLAYER_READY_TO_PLAY && player.mind && !player.mind.assigned_role)
+		if(player.ready == PLAYER_READY_TO_PLAY && player.check_preferences() && player.mind && !player.mind.assigned_role)
 			unassigned += player

 	initial_players_to_assign = unassigned.len

-	JobDebug("DO, Len: [unassigned.len]")
+	JobDebug("DO, Len: [unassigned?.len]")
 	if(unassigned.len == 0)
-		return 0
+		return validate_required_jobs(required_jobs)

 	//Scale number of open security officer slots to population
 	setup_officer_positions()
@@ -269,8 +276,8 @@ SUBSYSTEM_DEF(job)
 	//People who wants to be the overflow role, sure, go on.
 	JobDebug("DO, Running Overflow Check 1")
 	var/datum/job/overflow = GetJob(SSjob.overflow_role)
-	var/list/overflow_candidates = FindOccupationCandidates(overflow, 3)
-	JobDebug("AC1, Candidates: [overflow_candidates.len]")
+	var/list/overflow_candidates = FindOccupationCandidates(overflow, JP_LOW)
+	JobDebug("AC1, Candidates: [overflow_candidates?.len]")
 	for(var/mob/dead/new_player/player in overflow_candidates)
 		JobDebug("AC1 pass, Player: [player]")
 		AssignRole(player, SSjob.overflow_role)
@@ -297,7 +304,8 @@ SUBSYSTEM_DEF(job)

 	// Loop through all levels from high to low
 	var/list/shuffledoccupations = shuffle(occupations)
-	for(var/level = 1 to 3)
+	var/list/levels = list(JP_HIGH,JP_MEDIUM,JP_LOW)
+	for(var/level in levels)
 		//Check the head jobs first each level
 		CheckHeadPositions(level)

@@ -326,13 +334,17 @@ SUBSYSTEM_DEF(job)
 				if(job.required_playtime_remaining(player.client))
 					JobDebug("DO player not enough xp, Player: [player], Job:[job.title]")
 					continue
+			
+				if(!player.client.prefs.pref_species.qualifies_for_rank(job.title, player.client.prefs.features))
+					JobDebug("DO non-human failed, Player: [player], Job:[job.title]")
+					continue

 				if(player.mind && job.title in player.mind.restricted_roles)
 					JobDebug("DO incompatible with antagonist role, Player: [player], Job:[job.title]")
 					continue

 				// If the player wants that job on this level, then try give it to him.
-				if(player.client.prefs.GetJobDepartment(job, level) & job.flag)
+				if(player.client.prefs.job_preferences["[job.title]"] == level)
 					// If the job isn't filled
 					if((job.current_positions < job.spawn_positions) || job.spawn_positions == -1)
 						JobDebug("DO pass, Player: [player], Level:[level], Job:[job.title]")
@@ -351,9 +363,28 @@ SUBSYSTEM_DEF(job)
 	//Mop up people who can't leave.
 	for(var/mob/dead/new_player/player in unassigned) //Players that wanted to back out but couldn't because they're antags (can you feel the edge case?)
 		if(!GiveRandomJob(player))
-			AssignRole(player, SSjob.overflow_role) //If everything is already filled, make them an assistant
+			if(!AssignRole(player, SSjob.overflow_role)) //If everything is already filled, make them an assistant
+				return FALSE //Living on the edge, the forced antagonist couldn't be assigned to overflow role (bans, client age) - just reroll

-	return 1
+	return validate_required_jobs(required_jobs)
+
+/datum/controller/subsystem/job/proc/validate_required_jobs(list/required_jobs)
+	if(!required_jobs.len)
+		return TRUE
+	for(var/required_group in required_jobs)
+		var/group_ok = TRUE
+		for(var/rank in required_group)
+			var/datum/job/J = GetJob(rank)
+			if(!J)
+				SSticker.mode.setup_error = "Invalid job [rank] in gamemode required jobs."
+				return FALSE
+			if(J.current_positions < required_group[rank])
+				group_ok = FALSE
+				break
+		if(group_ok)
+			return TRUE
+	SSticker.mode.setup_error = "Required jobs not present."
+	return FALSE

 //We couldn't find a job from prefs for this guy.
 /datum/controller/subsystem/job/proc/HandleUnassigned(mob/dead/new_player/player)
@@ -406,7 +437,7 @@ SUBSYSTEM_DEF(job)
 		if(length(GLOB.jobspawn_overrides[rank]))
 			S = pick(GLOB.jobspawn_overrides[rank])
 		if(S)
-			SendToAtom(H, S, buckle = FALSE)
+			S.JoinPlayerHere(H, FALSE)
 		if(!S) //if there isn't a spawnpoint send them to latejoin, if there's no latejoin go yell at your mapper
 			log_world("Couldn't find a round start spawn point for [rank]")
 			SendToLateJoin(H)
@@ -418,7 +449,7 @@ SUBSYSTEM_DEF(job)
 	if(job)
 		if(!job.dresscodecompliant)// CIT CHANGE - dress code compliance
 			equip_loadout(N, H) // CIT CHANGE - allows players to spawn with loadout items
-		var/new_mob = job.equip(H, null, null, joined_late)
+		var/new_mob = job.equip(H, null, null, joined_late , null, M.client)
 		if(ismob(new_mob))
 			H = new_mob
 			if(!joined_late)
@@ -428,12 +459,18 @@ SUBSYSTEM_DEF(job)

 		SSpersistence.antag_rep_change[M.client.ckey] += job.GetAntagRep()

+/*		if(M.client.holder)
+			if(CONFIG_GET(flag/auto_deadmin_players) || (M.client.prefs?.toggles & DEADMIN_ALWAYS))
+				M.client.holder.auto_deadmin()
+			else
+				handle_auto_deadmin_roles(M.client, rank) */
+
 	to_chat(M, "<b>You are the [rank].</b>")
 	if(job)
 		to_chat(M, "<b>As the [rank] you answer directly to [job.supervisors]. Special circumstances may change this.</b>")
-		to_chat(M, "<b>To speak on your departments radio, use the :h button. To see others, look closely at your headset.</b>")
+		job.radio_help_message(M)
 		if(job.req_admin_notify)
-			to_chat(M, "<b>You are playing a job that is important for Game Progression. If you have to disconnect, please notify the admins via adminhelp.</b>")
+			to_chat(M, "<b>You are playing a job that is important for Game Progression. If you have to disconnect immediately, please notify the admins via adminhelp. Otherwise put your locker gear back into the locker and cryo out.</b>")
 		if(job.custom_spawn_text)
 			to_chat(M, "<b>[job.custom_spawn_text]</b>")
 		if(CONFIG_GET(number/minimal_access_threshold))
@@ -446,12 +483,24 @@ SUBSYSTEM_DEF(job)
 		equip_loadout(N, H, TRUE)//CIT CHANGE - makes players spawn with in-backpack loadout items properly. A little hacky but it works

 	return H
-
+/*
+/datum/controller/subsystem/job/proc/handle_auto_deadmin_roles(client/C, rank)
+	if(!C?.holder)
+		return TRUE
+	var/datum/job/job = GetJob(rank)
+	if(!job)
+		return
+	if((job.auto_deadmin_role_flags & DEADMIN_POSITION_HEAD) && (CONFIG_GET(flag/auto_deadmin_heads) || (C.prefs?.toggles & DEADMIN_POSITION_HEAD)))
+		return C.holder.auto_deadmin()
+	else if((job.auto_deadmin_role_flags & DEADMIN_POSITION_SECURITY) && (CONFIG_GET(flag/auto_deadmin_security) || (C.prefs?.toggles & DEADMIN_POSITION_SECURITY)))
+		return C.holder.auto_deadmin()
+	else if((job.auto_deadmin_role_flags & DEADMIN_POSITION_SILICON) && (CONFIG_GET(flag/auto_deadmin_silicons) || (C.prefs?.toggles & DEADMIN_POSITION_SILICON))) //in the event there's ever psuedo-silicon roles added, ie synths.
+		return C.holder.auto_deadmin()*/

 /datum/controller/subsystem/job/proc/setup_officer_positions()
 	var/datum/job/J = SSjob.GetJob("Security Officer")
 	if(!J)
-		throw EXCEPTION("setup_officer_positions(): Security officer job is missing")
+		CRASH("setup_officer_positions(): Security officer job is missing")

 	var/ssc = CONFIG_GET(number/security_scaling_coeff)
 	if(ssc > 0)
@@ -502,13 +551,15 @@ SUBSYSTEM_DEF(job)
 			if(job.required_playtime_remaining(player.client))
 				young++
 				continue
-			if(player.client.prefs.GetJobDepartment(job, 1) & job.flag)
-				high++
-			else if(player.client.prefs.GetJobDepartment(job, 2) & job.flag)
-				medium++
-			else if(player.client.prefs.GetJobDepartment(job, 3) & job.flag)
-				low++
-			else never++ //not selected
+			switch(player.client.prefs.job_preferences["[job.title]"])
+				if(JP_HIGH)
+					high++
+				if(JP_MEDIUM)
+					medium++
+				if(JP_LOW)
+					low++
+				else
+					never++
 		SSblackbox.record_feedback("nested tally", "job_preferences", high, list("[job.title]", "high"))
 		SSblackbox.record_feedback("nested tally", "job_preferences", medium, list("[job.title]", "medium"))
 		SSblackbox.record_feedback("nested tally", "job_preferences", low, list("[job.title]", "low"))
@@ -551,51 +602,61 @@ SUBSYSTEM_DEF(job)
 	newjob.spawn_positions = J.spawn_positions
 	newjob.current_positions = J.current_positions

-/datum/controller/subsystem/job/proc/SendToAtom(mob/M, atom/A, buckle)
-	if(buckle && isliving(M) && istype(A, /obj/structure/chair))
-		var/obj/structure/chair/C = A
-		if(C.buckle_mob(M, FALSE, FALSE))
-			return
-	M.forceMove(get_turf(A))
+/atom/proc/JoinPlayerHere(mob/M, buckle)
+	// By default, just place the mob on the same turf as the marker or whatever.
+	M.forceMove(get_turf(src))
+
+/obj/structure/chair/JoinPlayerHere(mob/M, buckle)
+	// Placing a mob in a chair will attempt to buckle it, or else fall back to default.
+	if (buckle && isliving(M) && buckle_mob(M, FALSE, FALSE))
+		return
+	..()

 /datum/controller/subsystem/job/proc/SendToLateJoin(mob/M, buckle = TRUE)
+	var/atom/destination
 	if(M.mind && M.mind.assigned_role && length(GLOB.jobspawn_overrides[M.mind.assigned_role])) //We're doing something special today.
-		SendToAtom(M,pick(GLOB.jobspawn_overrides[M.mind.assigned_role]),FALSE)
+		destination = pick(GLOB.jobspawn_overrides[M.mind.assigned_role])
+		destination.JoinPlayerHere(M, FALSE)
 		return

 	if(latejoin_trackers.len)
-		SendToAtom(M, pick(latejoin_trackers), buckle)
-	else
-		//bad mojo
-		var/area/shuttle/arrival/A = GLOB.areas_by_type[/area/shuttle/arrival]
-		if(A)
-			//first check if we can find a chair
-			var/obj/structure/chair/C = locate() in A
-			if(C)
-				SendToAtom(M, C, buckle)
-				return
-			else	//last hurrah
-				var/list/avail = list()
-				for(var/turf/T in A)
-					if(!is_blocked_turf(T, TRUE))
-						avail += T
-				if(avail.len)
-					SendToAtom(M, pick(avail), FALSE)
-					return
+		destination = pick(latejoin_trackers)
+		destination.JoinPlayerHere(M, buckle)
+		return

-		//pick an open spot on arrivals and dump em
-		var/list/arrivals_turfs = shuffle(get_area_turfs(/area/shuttle/arrival))
-		if(arrivals_turfs.len)
-			for(var/turf/T in arrivals_turfs)
-				if(!is_blocked_turf(T, TRUE))
-					SendToAtom(M, T, FALSE)
-					return
-			//last chance, pick ANY spot on arrivals and dump em
-			SendToAtom(M, arrivals_turfs[1], FALSE)
-		else
-			var/msg = "Unable to send mob [M] to late join!"
-			message_admins(msg)
-			CRASH(msg)
+	//bad mojo
+	var/area/shuttle/arrival/A = GLOB.areas_by_type[/area/shuttle/arrival]
+	if(A)
+		//first check if we can find a chair
+		var/obj/structure/chair/C = locate() in A
+		if(C)
+			C.JoinPlayerHere(M, buckle)
+			return
+
+		//last hurrah
+		var/list/avail = list()
+		for(var/turf/T in A)
+			if(!is_blocked_turf(T, TRUE))
+				avail += T
+		if(avail.len)
+			destination = pick(avail)
+			destination.JoinPlayerHere(M, FALSE)
+			return
+
+	//pick an open spot on arrivals and dump em
+	var/list/arrivals_turfs = shuffle(get_area_turfs(/area/shuttle/arrival))
+	if(arrivals_turfs.len)
+		for(var/turf/T in arrivals_turfs)
+			if(!is_blocked_turf(T, TRUE))
+				T.JoinPlayerHere(M, FALSE)
+				return
+		//last chance, pick ANY spot on arrivals and dump em
+		destination = arrivals_turfs[1]
+		destination.JoinPlayerHere(M, FALSE)
+	else
+		var/msg = "Unable to send mob [M] to late join!"
+		message_admins(msg)
+		CRASH(msg)


 ///////////////////////////////////
@@ -637,4 +698,4 @@ SUBSYSTEM_DEF(job)
 			. |= player.mind

 /datum/controller/subsystem/job/proc/JobDebug(message)
-	log_job_debug(message)
+	log_job_debug(message)
@@ -255,7 +255,7 @@ SUBSYSTEM_DEF(ticker)
 	var/can_continue = 0
 	can_continue = src.mode.pre_setup()		//Choose antagonists
 	CHECK_TICK
-	SSjob.DivideOccupations() 				//Distribute jobs
+	can_continue = can_continue && SSjob.DivideOccupations(mode.required_jobs) 				//Distribute jobs
 	CHECK_TICK

 	if(!GLOB.Debug2)
@@ -26,5 +26,5 @@
 	if(!HAS_TRAIT(wearer, TRAIT_DEAF))
 		var/obj/item/organ/ears/ears = wearer.getorganslot(ORGAN_SLOT_EARS)
 		if (ears)
-			ears.deaf = max(ears.deaf - 1, (ears.ear_damage < UNHEALING_EAR_DAMAGE ? 0 : 1)) // Do not clear deafness while above the unhealing ear damage threshold
-			ears.ear_damage = max(ears.ear_damage - 0.1, 0)
+			ears.deaf = max(ears.deaf - 1, (ears.damage < ears.maxHealth ? 0 : 1)) // Do not clear deafness if our ears are too damaged
+			ears.damage = max(ears.damage - 0.1, 0)
@@ -1,108 +1,108 @@
-/datum/component/footstep
-	var/steps = 0
-	var/volume
-	var/e_range
-
-/datum/component/footstep/Initialize(volume_ = 0.5, e_range_ = -1)
-	if(!isliving(parent))
-		return COMPONENT_INCOMPATIBLE
-	volume = volume_
-	e_range = e_range_
-	RegisterSignal(parent, list(COMSIG_MOVABLE_MOVED), .proc/play_footstep)
-
-/datum/component/footstep/proc/play_footstep()
-	var/turf/open/T = get_turf(parent)
-	if(!istype(T))
-		return
-
-	var/mob/living/LM = parent
-	var/v = volume
-	var/e = e_range
-	if(!T.footstep || LM.buckled || LM.lying || !LM.canmove || LM.resting || LM.buckled || LM.throwing || LM.movement_type & (VENTCRAWLING | FLYING))
-		if (LM.lying && !LM.buckled && !(!T.footstep || LM.movement_type & (VENTCRAWLING | FLYING))) //play crawling sound if we're lying
-			playsound(T, 'sound/effects/footstep/crawl1.ogg', 15 * v)
-		return
-
-	if(HAS_TRAIT(LM, TRAIT_SILENT_STEP))
-		return
-
-	if(iscarbon(LM))
-		var/mob/living/carbon/C = LM
-		if(!C.get_bodypart(BODY_ZONE_L_LEG) && !C.get_bodypart(BODY_ZONE_R_LEG))
-			return
-		if(ishuman(C) && C.m_intent == MOVE_INTENT_WALK)
-			v /= 2
-			e -= 5
-	steps++
-
-	if(steps >= 3)
-		steps = 0
-
-	else
-		return
-
-	if(prob(80) && !LM.has_gravity(T)) // don't need to step as often when you hop around
-		return
-
-	//begin playsound shenanigans//
-
-	//for barefooted non-clawed mobs like monkeys
-	if(isbarefoot(LM))
-		playsound(T, pick(GLOB.barefootstep[T.barefootstep][1]),
-			GLOB.barefootstep[T.barefootstep][2] * v,
-			TRUE,
-			GLOB.barefootstep[T.barefootstep][3] + e)
-		return
-
-	//for xenomorphs, dogs, and other clawed mobs
-	if(isclawfoot(LM))
-		if(isalienadult(LM)) //xenos are stealthy and get quieter footsteps
-			v /= 3
-			e -= 5
-
-		playsound(T, pick(GLOB.clawfootstep[T.clawfootstep][1]),
-				GLOB.clawfootstep[T.clawfootstep][2] * v,
-				TRUE,
-				GLOB.clawfootstep[T.clawfootstep][3] + e)
-		return
-
-	//for megafauna and other large and imtimidating mobs such as the bloodminer
-	if(isheavyfoot(LM))
-		playsound(T, pick(GLOB.heavyfootstep[T.heavyfootstep][1]),
-				GLOB.heavyfootstep[T.heavyfootstep][2] * v,
-				TRUE,
-				GLOB.heavyfootstep[T.heavyfootstep][3] + e)
-		return
-
-	//for slimes
-	if(isslime(LM))
-		playsound(T, 'sound/effects/footstep/slime1.ogg', 15 * v)
-		return
-
-	//for (simple) humanoid mobs (clowns, russians, pirates, etc.)
-	if(isshoefoot(LM))
-		if(!ishuman(LM))
-			playsound(T, pick(GLOB.footstep[T.footstep][1]),
-				GLOB.footstep[T.footstep][2] * v,
-				TRUE,
-				GLOB.footstep[T.footstep][3] + e)
-			return
-		if(ishuman(LM)) //for proper humans, they're special
-			var/mob/living/carbon/human/H = LM
-			var/feetCover = (H.wear_suit && (H.wear_suit.body_parts_covered & FEET)) || (H.w_uniform && (H.w_uniform.body_parts_covered & FEET))
-
-			if (H.dna.features["taur"] == "Naga" || H.dna.features["taur"] == "Tentacle") //are we a naga or tentacle taur creature
-				playsound(T, 'sound/effects/footstep/crawl1.ogg', 15 * v)
-				return
-
-			if(H.shoes || feetCover) //are we wearing shoes
-				playsound(T, pick(GLOB.footstep[T.footstep][1]),
-					GLOB.footstep[T.footstep][2] * v,
-					TRUE,
-					GLOB.footstep[T.footstep][3] + e)
-
-			if((!H.shoes && !feetCover)) //are we NOT wearing shoes
-				playsound(T, pick(GLOB.barefootstep[T.barefootstep][1]),
-					GLOB.barefootstep[T.barefootstep][2] * v,
-					TRUE,
+/datum/component/footstep
+	var/steps = 0
+	var/volume
+	var/e_range
+
+/datum/component/footstep/Initialize(volume_ = 0.5, e_range_ = -1)
+	if(!isliving(parent))
+		return COMPONENT_INCOMPATIBLE
+	volume = volume_
+	e_range = e_range_
+	RegisterSignal(parent, list(COMSIG_MOVABLE_MOVED), .proc/play_footstep)
+
+/datum/component/footstep/proc/play_footstep()
+	var/turf/open/T = get_turf(parent)
+	if(!istype(T))
+		return
+
+	var/mob/living/LM = parent
+	var/v = volume
+	var/e = e_range
+	if(!T.footstep || LM.buckled || LM.lying || !LM.canmove || LM.resting || LM.buckled || LM.throwing || LM.movement_type & (VENTCRAWLING | FLYING))
+		if (LM.lying && !LM.buckled && !(!T.footstep || LM.movement_type & (VENTCRAWLING | FLYING))) //play crawling sound if we're lying
+			playsound(T, 'sound/effects/footstep/crawl1.ogg', 15 * v)
+		return
+
+	if(HAS_TRAIT(LM, TRAIT_SILENT_STEP))
+		return
+
+	if(iscarbon(LM))
+		var/mob/living/carbon/C = LM
+		if(!C.get_bodypart(BODY_ZONE_L_LEG) && !C.get_bodypart(BODY_ZONE_R_LEG))
+			return
+		if(ishuman(C) && C.m_intent == MOVE_INTENT_WALK)
+			v /= 2
+			e -= 5
+	steps++
+
+	if(steps >= 3)
+		steps = 0
+
+	else
+		return
+
+	if(prob(80) && !LM.has_gravity(T)) // don't need to step as often when you hop around
+		return
+
+	//begin playsound shenanigans//
+
+	//for barefooted non-clawed mobs like monkeys
+	if(isbarefoot(LM))
+		playsound(T, pick(GLOB.barefootstep[T.barefootstep][1]),
+			GLOB.barefootstep[T.barefootstep][2] * v,
+			TRUE,
+			GLOB.barefootstep[T.barefootstep][3] + e)
+		return
+
+	//for xenomorphs, dogs, and other clawed mobs
+	if(isclawfoot(LM))
+		if(isalienadult(LM)) //xenos are stealthy and get quieter footsteps
+			v /= 3
+			e -= 5
+
+		playsound(T, pick(GLOB.clawfootstep[T.clawfootstep][1]),
+				GLOB.clawfootstep[T.clawfootstep][2] * v,
+				TRUE,
+				GLOB.clawfootstep[T.clawfootstep][3] + e)
+		return
+
+	//for megafauna and other large and imtimidating mobs such as the bloodminer
+	if(isheavyfoot(LM))
+		playsound(T, pick(GLOB.heavyfootstep[T.heavyfootstep][1]),
+				GLOB.heavyfootstep[T.heavyfootstep][2] * v,
+				TRUE,
+				GLOB.heavyfootstep[T.heavyfootstep][3] + e)
+		return
+
+	//for slimes
+	if(isslime(LM))
+		playsound(T, 'sound/effects/footstep/slime1.ogg', 15 * v)
+		return
+
+	//for (simple) humanoid mobs (clowns, russians, pirates, etc.)
+	if(isshoefoot(LM))
+		if(!ishuman(LM))
+			playsound(T, pick(GLOB.footstep[T.footstep][1]),
+				GLOB.footstep[T.footstep][2] * v,
+				TRUE,
+				GLOB.footstep[T.footstep][3] + e)
+			return
+		if(ishuman(LM)) //for proper humans, they're special
+			var/mob/living/carbon/human/H = LM
+			var/feetCover = (H.wear_suit && (H.wear_suit.body_parts_covered & FEET)) || (H.w_uniform && (H.w_uniform.body_parts_covered & FEET))
+
+			if (H.dna.features["taur"] == "Naga" || H.dna.features["taur"] == "Tentacle") //are we a naga or tentacle taur creature
+				playsound(T, 'sound/effects/footstep/crawl1.ogg', 15 * v)
+				return
+
+			if(H.shoes || feetCover) //are we wearing shoes
+				playsound(T, pick(GLOB.footstep[T.footstep][1]),
+					GLOB.footstep[T.footstep][2] * v,
+					TRUE,
+					GLOB.footstep[T.footstep][3] + e)
+
+			if((!H.shoes && !feetCover)) //are we NOT wearing shoes
+				playsound(T, pick(GLOB.barefootstep[T.barefootstep][1]),
+					GLOB.barefootstep[T.barefootstep][2] * v,
+					TRUE,
 					GLOB.barefootstep[T.barefootstep][3] + e)
@@ -195,21 +195,47 @@
 	. = ..()
 	RegisterSignal(parent, COMSIG_HUMAN_MELEE_UNARMED_ATTACK, .proc/on_host_unarmed_melee)

+/datum/component/riding/human/vehicle_mob_unbuckle(datum/source, mob/living/M, force = FALSE)
+	var/mob/living/carbon/human/H = parent
+	H.remove_movespeed_modifier(MOVESPEED_ID_HUMAN_CARRYING)
+	. = ..()
+
+/datum/component/riding/human/vehicle_mob_buckle(datum/source, mob/living/M, force = FALSE)
+	. = ..()
+	var/mob/living/carbon/human/H = parent
+	H.add_movespeed_modifier(MOVESPEED_ID_HUMAN_CARRYING, multiplicative_slowdown = HUMAN_CARRY_SLOWDOWN)
+
 /datum/component/riding/human/proc/on_host_unarmed_melee(atom/target)
-	var/mob/living/carbon/human/AM = parent
-	if(AM.a_intent == INTENT_DISARM && (target in AM.buckled_mobs))
+	var/mob/living/carbon/human/H = parent
+	if(H.a_intent == INTENT_DISARM && (target in H.buckled_mobs))
 		force_dismount(target)

 /datum/component/riding/human/handle_vehicle_layer()
 	var/atom/movable/AM = parent
 	if(AM.buckled_mobs && AM.buckled_mobs.len)
-		if(AM.dir == SOUTH)
-			AM.layer = ABOVE_MOB_LAYER
+		for(var/mob/M in AM.buckled_mobs) //ensure proper layering of piggyback and carry, sometimes weird offsets get applied
+			M.layer = MOB_LAYER
+		if(!AM.buckle_lying)
+			if(AM.dir == SOUTH)
+				AM.layer = ABOVE_MOB_LAYER
+			else
+				AM.layer = OBJ_LAYER
 		else
-			AM.layer = OBJ_LAYER
+			if(AM.dir == NORTH)
+				AM.layer = OBJ_LAYER
+			else
+				AM.layer = ABOVE_MOB_LAYER
 	else
 		AM.layer = MOB_LAYER

+/datum/component/riding/human/get_offsets(pass_index)
+	var/mob/living/carbon/human/H = parent
+	if(H.buckle_lying)
+		return list(TEXT_NORTH = list(0, 6), TEXT_SOUTH = list(0, 6), TEXT_EAST = list(0, 6), TEXT_WEST = list(0, 6))
+	else
+		return list(TEXT_NORTH = list(0, 6), TEXT_SOUTH = list(0, 6), TEXT_EAST = list(-6, 4), TEXT_WEST = list( 6, 4))
+	
+
 /datum/component/riding/human/force_dismount(mob/living/user)
 	var/atom/movable/AM = parent
 	AM.unbuckle_mob(user)
@@ -273,12 +299,15 @@
 	M.throw_at(target, 14, 5, AM)
 	M.Knockdown(60)

-/datum/component/riding/proc/equip_buckle_inhands(mob/living/carbon/human/user, amount_required = 1)
+/datum/component/riding/proc/equip_buckle_inhands(mob/living/carbon/human/user, amount_required = 1, riding_target_override = null)
 	var/atom/movable/AM = parent
 	var/amount_equipped = 0
 	for(var/amount_needed = amount_required, amount_needed > 0, amount_needed--)
 		var/obj/item/riding_offhand/inhand = new /obj/item/riding_offhand(user)
-		inhand.rider = user
+		if(!riding_target_override)
+			inhand.rider = user
+		else
+			inhand.rider = riding_target_override
 		inhand.parent = AM
 		if(user.put_in_hands(inhand, TRUE))
 			amount_equipped++
@@ -318,7 +347,7 @@
 	. = ..()

 /obj/item/riding_offhand/equipped()
-	if(loc != rider)
+	if(loc != rider && loc != parent)
 		selfdeleting = TRUE
 		qdel(src)
 	. = ..()
@@ -52,7 +52,7 @@
 	. = ..()
 	cant_hold = typecacheof(list(/obj/item/screwdriver/power))
 	can_hold = typecacheof(list(
-		/obj/item/kitchen/knife, /obj/item/switchblade, /obj/item/pen,
+		/obj/item/kitchen/knife, /obj/item/switchblade, /obj/item/pen, /obj/item/melee/cultblade/dagger,
 		/obj/item/scalpel, /obj/item/reagent_containers/syringe, /obj/item/dnainjector,
 		/obj/item/reagent_containers/hypospray/medipen, /obj/item/reagent_containers/dropper,
 		/obj/item/implanter, /obj/item/screwdriver, /obj/item/weldingtool/mini,
@@ -63,7 +63,7 @@
 	. = ..()
 	cant_hold = typecacheof(list(/obj/item/screwdriver/power))
 	can_hold = typecacheof(list(
-		/obj/item/kitchen/knife, /obj/item/switchblade, /obj/item/pen,
+		/obj/item/kitchen/knife, /obj/item/switchblade, /obj/item/pen, /obj/item/melee/cultblade/dagger,
 		/obj/item/scalpel, /obj/item/reagent_containers/syringe, /obj/item/dnainjector,
 		/obj/item/reagent_containers/hypospray/medipen, /obj/item/reagent_containers/dropper,
 		/obj/item/implanter, /obj/item/screwdriver, /obj/item/weldingtool/mini,
@@ -234,7 +234,7 @@

 /datum/component/storage/proc/quick_empty(mob/M)
 	var/atom/A = parent
-	if((!ishuman(M) && (A.loc != M)) || (M.stat != CONSCIOUS) || M.restrained() || !M.canmove)
+	if(!M.canUseStorage() || !A.Adjacent(M) || M.incapacitated())
 		return
 	if(check_locked(null, M, TRUE))
 		return FALSE
@@ -94,10 +94,23 @@
 					TOXIN:<font size='1'><a href='?_src_=vars;[HrefToken()];mobToDamage=[refid];adjustDamage=toxin' id='toxin'>[M.getToxLoss()]</a>
 					OXY:<font size='1'><a href='?_src_=vars;[HrefToken()];mobToDamage=[refid];adjustDamage=oxygen' id='oxygen'>[M.getOxyLoss()]</a>
 					CLONE:<font size='1'><a href='?_src_=vars;[HrefToken()];mobToDamage=[refid];adjustDamage=clone' id='clone'>[M.getCloneLoss()]</a>
-					BRAIN:<font size='1'><a href='?_src_=vars;[HrefToken()];mobToDamage=[refid];adjustDamage=brain' id='brain'>[M.getBrainLoss()]</a>
+					BRAIN:<font size='1'><a href='?_src_=vars;[HrefToken()];mobToDamage=[refid];adjustDamage=brain' id='brain'>[M.getOrganLoss(ORGAN_SLOT_BRAIN)]</a>
 					STAMINA:<font size='1'><a href='?_src_=vars;[HrefToken()];mobToDamage=[refid];adjustDamage=stamina' id='stamina'>[M.getStaminaLoss()]</a>
 					AROUSAL:<font size='1'><a href='?_src_=vars;[HrefToken()];mobToDamage=[refid];adjustDamage=arousal' id='arousal'>[M.getArousalLoss()]</a>
-				</font>
+					"}
+			if(GLOB.Debug2)
+				atomsnowflake += {"
+					HEART:<font size='1'><a href='?_src_=vars;[HrefToken()];mobToDamage=[refid];adjustDamage=heart' id='heart'>[M.getOrganLoss(ORGAN_SLOT_HEART)]</a>
+					LIVER:<font size='1'><a href='?_src_=vars;[HrefToken()];mobToDamage=[refid];adjustDamage=liver' id='liver'>[M.getOrganLoss(ORGAN_SLOT_LIVER)]</a>
+					LUNGS:<font size='1'><a href='?_src_=vars;[HrefToken()];mobToDamage=[refid];adjustDamage=lungs' id='lungs'>[M.getOrganLoss(ORGAN_SLOT_LUNGS)]</a>
+					EYES:<font size='1'><a href='?_src_=vars;[HrefToken()];mobToDamage=[refid];adjustDamage=eye_sight' id='eye_sight'>[M.getOrganLoss(ORGAN_SLOT_EYES)]</a>
+					EARS:<font size='1'><a href='?_src_=vars;[HrefToken()];mobToDamage=[refid];adjustDamage=ears' id='ears'>[M.getOrganLoss(ORGAN_SLOT_EARS)]</a>
+					STOMACH:<font size='1'><a href='?_src_=vars;[HrefToken()];mobToDamage=[refid];adjustDamage=stomach' id='stomach'>[M.getOrganLoss(ORGAN_SLOT_STOMACH)]</a>
+					TONGUE:<font size='1'><a href='?_src_=vars;[HrefToken()];mobToDamage=[refid];adjustDamage=tongue' id='tongue'>[M.getOrganLoss(ORGAN_SLOT_TONGUE)]</a>
+					APPENDIX:<font size='1'><a href='?_src_=vars;[HrefToken()];mobToDamage=[refid];adjustDamage=appendix' id='appendix'>[M.getOrganLoss(ORGAN_SLOT_APPENDIX)]</a>
+					"}
+			atomsnowflake += {"
+			</font>
 			"}
 		else
 			atomsnowflake += "<a href='?_src_=vars;[HrefToken()];datumedit=[refid];varnameedit=name'><b id='name'>[D]</b></a>"
@@ -1334,8 +1347,8 @@
 					L.adjustOxyLoss(amount)
 					newamt = L.getOxyLoss()
 				if("brain")
-					L.adjustBrainLoss(amount)
-					newamt = L.getBrainLoss()
+					L.adjustOrganLoss(ORGAN_SLOT_BRAIN, amount)
+					newamt = L.getOrganLoss(ORGAN_SLOT_BRAIN)
 				if("clone")
 					L.adjustCloneLoss(amount)
 					newamt = L.getCloneLoss()
@@ -1345,6 +1358,30 @@
 				if("arousal")
 					L.adjustArousalLoss(amount)
 					newamt = L.getArousalLoss()
+				if("heart")
+					L.adjustOrganLoss(ORGAN_SLOT_HEART, amount)
+					newamt = L.getOrganLoss(ORGAN_SLOT_HEART)
+				if("liver")
+					L.adjustOrganLoss(ORGAN_SLOT_LIVER, amount)
+					newamt = L.getOrganLoss(ORGAN_SLOT_LIVER)
+				if("lungs")
+					L.adjustOrganLoss(ORGAN_SLOT_LUNGS, amount)
+					newamt = L.getOrganLoss(ORGAN_SLOT_LUNGS)
+				if("eye_sight")
+					L.adjustOrganLoss(ORGAN_SLOT_EYES, amount)
+					newamt = L.getOrganLoss(ORGAN_SLOT_EYES)
+				if("ears")
+					L.adjustOrganLoss(ORGAN_SLOT_EARS, amount)
+					newamt = L.getOrganLoss(ORGAN_SLOT_EARS)
+				if("stomach")
+					L.adjustOrganLoss(ORGAN_SLOT_STOMACH, amount)
+					newamt = L.getOrganLoss(ORGAN_SLOT_STOMACH)
+				if("tongue")
+					L.adjustOrganLoss(ORGAN_SLOT_TONGUE, amount)
+					newamt = L.getOrganLoss(ORGAN_SLOT_TONGUE)
+				if("appendix")
+					L.adjustOrganLoss(ORGAN_SLOT_APPENDIX, amount)
+					newamt = L.getOrganLoss(ORGAN_SLOT_APPENDIX)
 				else
 					to_chat(usr, "You caused an error. DEBUG: Text:[Text] Mob:[L]")
 					return
@@ -1360,4 +1397,4 @@
 				return
 			var/mob/living/carbon/human/H = locate(href_list["copyoutfit"]) in GLOB.carbon_list
 			if(istype(H))
-				H.copy_outfit()
+				H.copy_outfit()
@@ -144,3 +144,9 @@
 		if(!((locate(thing) in bodyparts) || (locate(thing) in internal_organs)))
 			return FALSE
 	return ..()
+
+/mob/living/proc/CanSpreadAirborneDisease()
+	return !is_mouth_covered()
+
+/mob/living/carbon/CanSpreadAirborneDisease()
+	return !((head && (head.flags_cover & HEADCOVERSMOUTH) && (head.armor.getRating("bio") >= 25)) || (wear_mask && (wear_mask.flags_cover & MASKCOVERSMOUTH) && (wear_mask.armor.getRating("bio") >= 25)))
@@ -55,6 +55,13 @@
 	D.after_add()
 	infectee.med_hud_set_status()

+	var/turf/source_turf = get_turf(infectee)
+	log_virus("[key_name(infectee)] was infected by virus: [src.admin_details()] at [loc_name(source_turf)]")
+
+//Return a string for admin logging uses, should describe the disease in detail
+/datum/disease/proc/admin_details()
+	return "[src.name] : [src.type]"
+
 /datum/disease/proc/stage_act()
 	var/cure = has_cure()

@@ -65,15 +72,17 @@

 	if(!cure)
 		if(prob(stage_prob))
-			stage = min(stage + 1,max_stages)
+			update_stage(min(stage + 1,max_stages))
 	else
 		if(prob(cure_chance))
-			stage = max(stage - 1, 1)
+			update_stage(max(stage - 1, 1))

 	if(disease_flags & CURABLE)
 		if(cure && prob(cure_chance))
 			cure()

+/datum/disease/proc/update_stage(new_stage)
+	stage = new_stage

 /datum/disease/proc/has_cure()
 	if(!(disease_flags & CURABLE))
@@ -31,9 +31,9 @@
 	var/id = ""
 	var/processing = FALSE
 	var/mutable = TRUE //set to FALSE to prevent most in-game methods of altering the disease via virology
-	var/oldres
+	var/oldres	//To prevent setting new cures unless resistance changes.

-	// The order goes from easy to cure to hard to cure.
+	// 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"
@@ -110,15 +110,22 @@
 		return

 	if(symptoms && symptoms.len)
-
 		if(!processing)
 			processing = TRUE
 			for(var/datum/symptom/S in symptoms)
-				S.Start(src)
+				if(S.Start(src)) //this will return FALSE if the symptom is neutered
+					S.next_activation = world.time + rand(S.symptom_delay_min * 10, S.symptom_delay_max * 10)
+				S.on_stage_change(src)

 		for(var/datum/symptom/S in symptoms)
 			S.Activate(src)

+// Tell symptoms stage changed
+/datum/disease/advance/update_stage(new_stage)
+	..()
+	for(var/datum/symptom/S in symptoms)
+		S.on_stage_change(src)
+
 // Compares type then ID.
 /datum/disease/advance/IsSame(datum/disease/advance/D)

@@ -138,9 +145,18 @@
 	A.properties = properties.Copy()
 	A.id = id
 	A.mutable = mutable
+	A.oldres = oldres
 	//this is a new disease starting over at stage 1, so processing is not copied
 	return A

+//Describe this disease to an admin in detail (for logging)
+/datum/disease/advance/admin_details()
+	var/list/name_symptoms = list()
+	for(var/datum/symptom/S in symptoms)
+		name_symptoms += S.name
+	return "[name] sym:[english_list(name_symptoms)] r:[totalResistance()] s:[totalStealth()] ss:[totalStageSpeed()] t:[totalTransmittable()]"
+
+
 /*

 	NEW PROCS
@@ -191,6 +207,10 @@
 /datum/disease/advance/proc/Refresh(new_name = FALSE)
 	GenerateProperties()
 	AssignProperties()
+	if(processing && symptoms && symptoms.len)
+		for(var/datum/symptom/S in symptoms)
+			S.Start(src)
+			S.on_stage_change(src)
 	id = null

 	var/the_id = GetDiseaseID()
@@ -342,28 +362,28 @@
 	return id


-// Add a symptom, if it is over the limit (with a small chance to be able to go over)
-// we take a random symptom away and add the new one.
+// Add a symptom, if it is over the limit we take a random symptom away and add the new one.
 /datum/disease/advance/proc/AddSymptom(datum/symptom/S)

 	if(HasSymptom(S))
 		return

-	if(symptoms.len < (VIRUS_SYMPTOM_LIMIT - 1) + rand(-1, 1))
-		symptoms += S
-	else
+	if(!(symptoms.len < (VIRUS_SYMPTOM_LIMIT - 1) + rand(-1, 1)))
 		RemoveSymptom(pick(symptoms))
-		symptoms += S
+	symptoms += S
+	S.OnAdd(src)

 // Simply removes the symptom.
 /datum/disease/advance/proc/RemoveSymptom(datum/symptom/S)
 	symptoms -= S
+	S.OnRemove(src)

 // Neuter a symptom, so it will only affect stats
 /datum/disease/advance/proc/NeuterSymptom(datum/symptom/S)
 	if(!S.neutered)
 		S.neutered = TRUE
 		S.name += " (neutered)"
+		S.OnRemove(src)

 /*

@@ -417,7 +437,7 @@

 	var/i = VIRUS_SYMPTOM_LIMIT

-	var/datum/disease/advance/D = new(0, null)
+	var/datum/disease/advance/D = new()
 	D.symptoms = list()

 	var/list/symptoms = list()
@@ -445,9 +465,6 @@
 		D.AssignName(new_name)
 		D.Refresh()

-		for(var/datum/disease/advance/AD in SSdisease.active_diseases)
-			AD.Refresh()
-
 		for(var/mob/living/carbon/human/H in shuffle(GLOB.alive_mob_list))
 			if(!is_station_level(H.z))
 				continue
@@ -458,8 +475,8 @@
 		var/list/name_symptoms = list()
 		for(var/datum/symptom/S in D.symptoms)
 			name_symptoms += S.name
-		message_admins("[key_name_admin(user)] has triggered a custom virus outbreak of [D.name]! It has these symptoms: [english_list(name_symptoms)]")
-
+		message_admins("[key_name_admin(user)] has triggered a custom virus outbreak of [D.admin_details()]")
+		log_virus("[key_name(user)] has triggered a custom virus outbreak of [D.admin_details()]!")

 /datum/disease/advance/proc/totalStageSpeed()
 	return properties["stage_rate"]
@@ -144,5 +144,5 @@ Bonus
 /datum/symptom/asphyxiation/proc/Asphyxiate_death(mob/living/M, datum/disease/advance/A)
 	var/get_damage = rand(25,35) * power
 	M.adjustOxyLoss(get_damage)
-	M.adjustBrainLoss(get_damage/2)
+	M.adjustOrganLoss(ORGAN_SLOT_BRAIN, get_damage/2)
 	return 1
@@ -55,7 +55,7 @@ Bonus
 			to_chat(M, "<span class='userdanger'>You can't think straight!</span>")
 			M.confused = min(100 * power, M.confused + 8)
 			if(brain_damage)
-				M.adjustBrainLoss(3 * power, 80)
+				M.adjustOrganLoss(ORGAN_SLOT_BRAIN, 3 * power, 80)
 				M.updatehealth()

 	return
@@ -70,6 +70,6 @@ BONUS
 				addtimer(CALLBACK(M, /mob/.proc/emote, "cough"), 6)
 				addtimer(CALLBACK(M, /mob/.proc/emote, "cough"), 12)
 				addtimer(CALLBACK(M, /mob/.proc/emote, "cough"), 18)
-			if(infective)
+			if(infective && M.CanSpreadAirborneDisease())
 				A.spread(1)

@@ -50,9 +50,9 @@ Bonus
 		if(5)
 			if(power > 2)
 				var/obj/item/organ/ears/ears = M.getorganslot(ORGAN_SLOT_EARS)
-				if(istype(ears) && ears.ear_damage < UNHEALING_EAR_DAMAGE)
+				if(istype(ears) && ears.damage < ears.maxHealth)
 					to_chat(M, "<span class='userdanger'>Your ears pop painfully and start bleeding!</span>")
-					ears.ear_damage = max(ears.ear_damage, UNHEALING_EAR_DAMAGE)
+					ears.damage = max(ears.damage, ears.maxHealth)
 					M.emote("scream")
 			else
 				to_chat(M, "<span class='userdanger'>Your ears pop and begin ringing loudly!</span>")
@@ -219,8 +219,10 @@
 	level = 8
 	passive_message = "<span class='notice'>The pain from your wounds makes you feel oddly sleepy...</span>"
 	var/deathgasp = FALSE
+	var/stabilize = FALSE
 	var/active_coma = FALSE //to prevent multiple coma procs
 	threshold_desc = "<b>Stealth 2:</b> Host appears to die when falling into a coma.<br>\
+					<b>Resistance 4:</b> The virus also stabilizes the host while they are in critical condition.<br>\
 					  <b>Stage Speed 7:</b> Increases healing speed."

 /datum/symptom/heal/coma/Start(datum/disease/advance/A)
@@ -228,9 +230,25 @@
 		return
 	if(A.properties["stage_rate"] >= 7)
 		power = 1.5
+	if(A.properties["resistance"] >= 4)
+		stabilize = TRUE
 	if(A.properties["stealth"] >= 2)
 		deathgasp = TRUE

+/datum/symptom/heal/coma/on_stage_change(datum/disease/advance/A)  //mostly copy+pasted from the code for self-respiration's TRAIT_NOBREATH stuff
+	if(!..())
+		return FALSE
+	if(A.stage >= 4 && stabilize)
+		ADD_TRAIT(A.affected_mob, TRAIT_NOCRITDAMAGE, DISEASE_TRAIT)
+	else
+		REMOVE_TRAIT(A.affected_mob, TRAIT_NOCRITDAMAGE, DISEASE_TRAIT)
+	return TRUE
+
+/datum/symptom/heal/coma/End(datum/disease/advance/A)
+	if(!..())
+		return
+	REMOVE_TRAIT(A.affected_mob, TRAIT_NOCRITDAMAGE, DISEASE_TRAIT)
+
 /datum/symptom/heal/coma/CanHeal(datum/disease/advance/A)
 	var/mob/living/M = A.affected_mob
 	if(HAS_TRAIT(M, TRAIT_DEATHCOMA))
@@ -50,3 +50,19 @@ Bonus
 			if(prob(base_message_chance))
 				to_chat(M, "<span class='notice'>[pick("Your lungs feel great.", "You realize you haven't been breathing.", "You don't feel the need to breathe.")]</span>")
 	return
+
+/datum/symptom/oxygen/on_stage_change(datum/disease/advance/A)
+	if(!..())
+		return FALSE
+	var/mob/living/carbon/M = A.affected_mob
+	if(A.stage >= 4)
+		ADD_TRAIT(M, TRAIT_NOBREATH, DISEASE_TRAIT)
+	else
+		REMOVE_TRAIT(M, TRAIT_NOBREATH, DISEASE_TRAIT)
+	return TRUE
+
+/datum/symptom/oxygen/End(datum/disease/advance/A)
+	if(!..())
+		return
+	if(A.stage >= 4)
+		REMOVE_TRAIT(A.affected_mob, TRAIT_NOBREATH, DISEASE_TRAIT)
@@ -51,7 +51,7 @@
 		M.hallucination = max(0, M.hallucination - 10)

 	if(A.stage >= 5)
-		M.adjustBrainLoss(-3)
+		M.adjustOrganLoss(ORGAN_SLOT_BRAIN, -3)
 		if(trauma_heal_mild && iscarbon(M))
 			var/mob/living/carbon/C = M
 			if(prob(10))
@@ -100,8 +100,8 @@
 				else if(M.eye_blind || M.eye_blurry)
 					M.set_blindness(0)
 					M.set_blurriness(0)
-				else if(eyes.eye_damage > 0)
-					M.adjust_eye_damage(-1)
+				else if(eyes.damage > 0)
+					eyes.applyOrganDamage(-1)
 		else
 			if(prob(base_message_chance))
-				to_chat(M, "<span class='notice'>[pick("Your eyes feel great.","You feel like your eyes can focus more clearly.", "You don't feel the need to blink.","Your ears feel great.","Your healing feels more acute.")]</span>")
+				to_chat(M, "<span class='notice'>[pick("Your eyes feel great.","You feel like your eyes can focus more clearly.", "You don't feel the need to blink.","Your ears feel great.","Your healing feels more acute.")]</span>")
@@ -48,4 +48,5 @@ Bonus
 				M.emote("sniff")
 		else
 			M.emote("sneeze")
-			A.spread(4 + power)
+			if(M.CanSpreadAirborneDisease()) //don't spread germs if they covered their mouth
+				A.spread(4 + power)
@@ -8,12 +8,14 @@
 	level = 5
 	severity = 0

-/datum/symptom/undead_adaptation/Start(datum/disease/advance/A)
-	if(!..())
-		return
+/datum/symptom/undead_adaptation/OnAdd(datum/disease/advance/A)
 	A.process_dead = TRUE
 	A.infectable_biotypes |= MOB_UNDEAD

+/datum/symptom/undead_adaptation/OnRemove(datum/disease/advance/A)
+	A.process_dead = FALSE
+	A.infectable_biotypes -= MOB_UNDEAD
+
 /datum/symptom/inorganic_adaptation
 	name = "Inorganic Biology"
 	desc = "The virus can survive and replicate even in an inorganic environment, increasing its resistance and infection rate."
@@ -24,7 +26,8 @@
 	level = 5
 	severity = 0

-/datum/symptom/inorganic_adaptation/Start(datum/disease/advance/A)
-	if(!..())
-		return
-	A.infectable_biotypes |= MOB_INORGANIC
+/datum/symptom/inorganic_adaptation/OnAdd(datum/disease/advance/A)
+	A.infectable_biotypes |= MOB_INORGANIC
+
+/datum/symptom/inorganic_adaptation/OnRemove(datum/disease/advance/A)
+	A.infectable_biotypes -= MOB_INORGANIC
@@ -38,11 +38,10 @@
 			return
 	CRASH("We couldn't assign an ID!")

-// Called when processing of the advance disease, which holds this symptom, starts.
+// Called when processing of the advance disease that holds this symptom infects a host and upon each Refresh() of that advance disease.
 /datum/symptom/proc/Start(datum/disease/advance/A)
 	if(neutered)
 		return FALSE
-	next_activation = world.time + rand(symptom_delay_min * 10, symptom_delay_max * 10) //so it doesn't instantly activate on infection
 	return TRUE

 // Called when the advance disease is going to be deleted or when the advance disease stops processing.
@@ -60,6 +59,11 @@
 		next_activation = world.time + rand(symptom_delay_min * 10, symptom_delay_max * 10)
 		return TRUE

+/datum/symptom/proc/on_stage_change(datum/disease/advance/A)
+	if(neutered)
+		return FALSE
+	return TRUE
+
 /datum/symptom/proc/Copy()
 	var/datum/symptom/new_symp = new type
 	new_symp.name = name
@@ -69,3 +73,9 @@

 /datum/symptom/proc/generate_threshold_desc()
 	return
+
+/datum/symptom/proc/OnAdd(datum/disease/advance/A)		//Overload when a symptom needs to be active before processing, like changing biotypes.
+	return
+
+/datum/symptom/proc/OnRemove(datum/disease/advance/A)	//But dont forget to remove them too.
+	return
@@ -45,7 +45,7 @@ Bonus
 		return
 	var/mob/living/carbon/M = A.affected_mob
 	var/obj/item/organ/eyes/eyes = M.getorganslot(ORGAN_SLOT_EYES)
-	if(istype(eyes))
+	if(eyes)
 		switch(A.stage)
 			if(1, 2)
 				if(prob(base_message_chance) && !suppress_warning)
@@ -53,20 +53,20 @@ Bonus
 			if(3, 4)
 				to_chat(M, "<span class='warning'><b>Your eyes burn!</b></span>")
 				M.blur_eyes(10)
-				M.adjust_eye_damage(1)
+				eyes.applyOrganDamage(1)
 			else
 				M.blur_eyes(20)
-				M.adjust_eye_damage(5)
-				if(eyes.eye_damage >= 10)
+				eyes.applyOrganDamage(5)
+				if(eyes.damage >= 10)
 					M.become_nearsighted(EYE_DAMAGE)
-				if(prob(eyes.eye_damage - 10 + 1))
+				if(prob(eyes.damage - 10 + 1))
 					if(!remove_eyes)
 						if(!HAS_TRAIT(M, TRAIT_BLIND))
 							to_chat(M, "<span class='userdanger'>You go blind!</span>")
-						M.become_blind(EYE_DAMAGE)
+							eyes.applyOrganDamage(eyes.maxHealth)
 					else
 						M.visible_message("<span class='warning'>[M]'s eyes fall off their sockets!</span>", "<span class='userdanger'>Your eyes fall off their sockets!</span>")
 						eyes.Remove(M)
 						eyes.forceMove(get_turf(M))
 				else
-					to_chat(M, "<span class='userdanger'>Your eyes burn horrifically!</span>")
+					to_chat(M, "<span class='userdanger'>Your eyes burn horrifically!</span>")
@@ -27,8 +27,10 @@
 				A.update_icon()
 			if(prob(3))
 				to_chat(affected_mob, "<span class='warning'>You feel a stabbing pain in your abdomen!</span>")
+				affected_mob.adjustOrganLoss(ORGAN_SLOT_APPENDIX, 5)
 				affected_mob.Stun(rand(40,60))
 				affected_mob.adjustToxLoss(1)
 		if(3)
 			if(prob(1))
 				affected_mob.vomit(95)
+				affected_mob.adjustOrganLoss(ORGAN_SLOT_APPENDIX, 15)
@@ -24,7 +24,7 @@
 			if(prob(2))
 				to_chat(affected_mob, "<span class='danger'>You don't feel like yourself.</span>")
 			if(prob(5))
-				affected_mob.adjustBrainLoss(1, 170)
+				affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, 1, 170)
 				affected_mob.updatehealth()
 		if(3)
 			if(prob(2))
@@ -32,7 +32,7 @@
 			if(prob(2))
 				affected_mob.emote("drool")
 			if(prob(10))
-				affected_mob.adjustBrainLoss(2, 170)
+				affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, 2, 170)
 				affected_mob.updatehealth()
 				if(prob(2))
 					to_chat(affected_mob, "<span class='danger'>Your try to remember something important...but can't.</span>")
@@ -43,7 +43,7 @@
 			if(prob(2))
 				affected_mob.emote("drool")
 			if(prob(15))
-				affected_mob.adjustBrainLoss(3, 170)
+				affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, 3, 170)
 				affected_mob.updatehealth()
 				if(prob(2))
 					to_chat(affected_mob, "<span class='danger'>Strange buzzing fills your head, removing all thoughts.</span>")
@@ -61,7 +61,7 @@
 	teamsize = 1
 	opendoors = FALSE
 	enforce_human = FALSE
-	roles = /datum/antagonist/greybois
+	roles = list(/datum/antagonist/greybois)
 	leader_role = /datum/antagonist/greybois/greygod
 	rename_team = "Emergency Assistants"
 	polldesc = "an Emergency Assistant"
@@ -18,7 +18,7 @@
 	var/map_file = "BoxStation.dmm"

 	var/traits = null
-	var/space_ruin_levels = 1 //Citadel edit - reduces the default space ruin z-level count to 1
+	var/space_ruin_levels = 2
 	var/space_empty_levels = 1

 	var/minetype = "lavaland"
@@ -79,7 +79,7 @@
 					  		"<span class='userdanger'>[A] kicks your head, knocking you out!</span>")
 		playsound(get_turf(A), 'sound/weapons/genhit1.ogg', 50, 1, -1)
 		D.SetSleeping(300)
-		D.adjustBrainLoss(15, 150)
+		D.adjustOrganLoss(ORGAN_SLOT_BRAIN, 15, 150)
 	return TRUE

 /datum/martial_art/cqc/proc/Pressure(mob/living/carbon/human/A, mob/living/carbon/human/D)
@@ -46,7 +46,7 @@
 			D.apply_damage(rand(5,10), BRUTE, BODY_ZONE_HEAD)
 			A.apply_damage(rand(5,10), BRUTE, BODY_ZONE_HEAD)
 			if(!istype(D.head,/obj/item/clothing/head/helmet/) && !istype(D.head,/obj/item/clothing/head/hardhat))
-				D.adjustBrainLoss(5)
+				D.adjustOrganLoss(ORGAN_SLOT_BRAIN, 5)
 			A.Stun(rand(10,45))
 			D.Knockdown(rand(5,30))//CIT CHANGE - makes stuns from martial arts always use Knockdown instead of Stun for the sake of consistency
 		if(5,6)
@@ -224,7 +224,7 @@
 				H.visible_message("<span class='warning'>[user] delivers a heavy hit to [H]'s head, knocking [H.p_them()] out cold!</span>", \
 									   "<span class='userdanger'>[user] knocks you unconscious!</span>")
 				H.SetSleeping(600)
-				H.adjustBrainLoss(15, 150)
+				H.adjustOrganLoss(ORGAN_SLOT_BRAIN, 15, 150)
 	else
 		return ..()

@@ -21,6 +21,7 @@
 	var/l_hand = null
 	var/internals_slot = null //ID of slot containing a gas tank
 	var/list/backpack_contents = null // In the list(path=count,otherpath=count) format
+	var/box // Internals box. Will be inserted at the start of backpack_contents
 	var/list/implants = null
 	var/accessory = null

@@ -83,6 +84,13 @@
 			H.equip_to_slot_or_del(new l_pocket(H),SLOT_L_STORE)
 		if(r_pocket)
 			H.equip_to_slot_or_del(new r_pocket(H),SLOT_R_STORE)
+
+		if(box)
+			if(!backpack_contents)
+				backpack_contents = list()
+			backpack_contents.Insert(1, box)
+			backpack_contents[box] = 1
+
 		if(backpack_contents)
 			for(var/path in backpack_contents)
 				var/number = backpack_contents[path]
@@ -521,7 +521,7 @@
 			itemUser.adjustToxLoss(-1.5, forced = TRUE) //Because Slime People are people too
 			itemUser.adjustOxyLoss(-1.5)
 			itemUser.adjustStaminaLoss(-1.5)
-			itemUser.adjustBrainLoss(-1.5)
+			itemUser.adjustOrganLoss(ORGAN_SLOT_BRAIN, -1.5)
 			itemUser.adjustCloneLoss(-0.5) //Becasue apparently clone damage is the bastion of all health
 		//Heal all those around you, unbiased
 		for(var/mob/living/L in view(7, owner))
@@ -533,7 +533,7 @@
 				L.adjustToxLoss(-3.5, forced = TRUE) //Because Slime People are people too
 				L.adjustOxyLoss(-3.5)
 				L.adjustStaminaLoss(-3.5)
-				L.adjustBrainLoss(-3.5)
+				L.adjustOrganLoss(ORGAN_SLOT_BRAIN, -3.5)
 				L.adjustCloneLoss(-1) //Becasue apparently clone damage is the bastion of all health
 			else if(issilicon(L))
 				L.adjustBruteLoss(-3.5)
@@ -119,7 +119,7 @@
 	medical_record_text = "Patient has a tumor in their brain that is slowly driving them to brain death."

 /datum/quirk/brainproblems/on_process()
-	quirk_holder.adjustBrainLoss(0.2)
+	quirk_holder.adjustOrganLoss(ORGAN_SLOT_BRAIN, 0.2)

 /datum/quirk/nearsighted //t. errorage
 	name = "Nearsighted"
@@ -345,10 +345,12 @@
 	gain_text = "<span class='danger'>You find yourself unable to speak!</span>"
 	lose_text = "<span class='notice'>You feel a growing strength in your vocal chords.</span>"
 	medical_record_text = "Functionally mute, patient is unable to use their voice in any capacity."
+	var/datum/brain_trauma/severe/mute/mute

 /datum/quirk/mute/add()
 	var/mob/living/carbon/human/H = quirk_holder
-	H.gain_trauma(TRAIT_MUTE, TRAUMA_RESILIENCE_SURGERY)
+	mute = new
+	H.gain_trauma(mute, TRAUMA_RESILIENCE_SURGERY)

 /datum/quirk/mute/on_process()
 	if(quirk_holder.mind && LAZYLEN(quirk_holder.mind.antag_datums))
@@ -235,6 +235,11 @@
 	SEND_SIGNAL(src, COMSIG_ATOM_BULLET_ACT, P, def_zone)
 	. = P.on_hit(src, 0, def_zone)

+//used on altdisarm() for special interactions between the shoved victim (target) and the src, with user being the one shoving the target on it.
+// IMPORTANT: if you wish to add a new own shove_act() to a certain object, remember to add SHOVABLE_ONTO to its obj_flags bitfied var first.
+/atom/proc/shove_act(mob/living/target, mob/living/user)
+	return FALSE
+
 /atom/proc/in_contents_of(container)//can take class or object instance as argument
 	if(ispath(container))
 		if(istype(src.loc, container))
@@ -18,7 +18,7 @@
 /datum/atom_hud/data

 /datum/atom_hud/data/human/medical
-	hud_icons = list(STATUS_HUD, HEALTH_HUD, NANITE_HUD)
+	hud_icons = list(STATUS_HUD, HEALTH_HUD, NANITE_HUD, RAD_HUD)

 /datum/atom_hud/data/human/medical/basic

@@ -162,6 +162,7 @@
 	holder.icon_state = "hud[RoundHealth(src)]"
 	var/icon/I = icon(icon, icon_state, dir)
 	holder.pixel_y = I.Height() - world.icon_size
+	med_hud_set_radstatus()

 //for carbon suit sensors
 /mob/living/carbon/med_hud_set_health()
@@ -211,6 +212,22 @@
 				holder.icon_state = "hudhealthy"


+/mob/living/proc/med_hud_set_radstatus()
+	var/image/radholder = hud_list[RAD_HUD]
+	var/icon/I = icon(icon, icon_state, dir)
+	radholder.pixel_y = I.Height() - world.icon_size
+	var/mob/living/M = src
+	var/rads = M.radiation
+	switch(rads)
+		if(-INFINITY to RAD_MOB_SAFE)
+			radholder.icon_state = "hudradsafe"
+		if((RAD_MOB_SAFE+1) to RAD_MOB_MUTATE)
+			radholder.icon_state = "hudraddanger"
+		if((RAD_MOB_MUTATE+1) to RAD_MOB_VOMIT)
+			radholder.icon_state = "hudradlethal"
+		if((RAD_MOB_VOMIT+1) to INFINITY)
+			radholder.icon_state = "hudradnuke"
+
 /***********************************************
 Security HUDs! Basic mode shows only the job.
 ************************************************/
@@ -6,7 +6,7 @@
 	name = "traitor+brothers"
 	config_tag = "traitorbro"
 	restricted_jobs = list("AI", "Cyborg")
-	protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Quartermaster", "Chief Engineer", "Research Director")
+	protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster")

 	announce_span = "danger"
 	announce_text = "There are Syndicate agents and Blood Brothers on the station!\n\
@@ -135,7 +135,7 @@ Credit where due:
 	required_enemies = 3
 	recommended_enemies = 5
 	enemy_minimum_age = 7
-	protected_jobs = list("AI", "Cyborg", "Security Officer", "Warden", "Detective", "Head of Security", "Captain") //Silicons can eventually be converted
+	protected_jobs = list("AI", "Cyborg", "Security Officer", "Warden", "Detective", "Head of Security", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster") //Silicons can eventually be converted
 	restricted_jobs = list("Chaplain", "Captain")
 	announce_span = "brass"
 	announce_text = "Servants of Ratvar are trying to summon the Justiciar!\n\
@@ -35,8 +35,8 @@
 	config_tag = "cult"
 	antag_flag = ROLE_CULTIST
 	false_report_weight = 10
-	restricted_jobs = list("Chaplain","AI", "Cyborg", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel")
-	protected_jobs = list()
+	restricted_jobs = list("AI", "Cyborg")
+	protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster")
 	required_players = 30
 	required_enemies = 3
 	recommended_enemies = 5
@@ -0,0 +1,748 @@
+#define CURRENT_LIVING_PLAYERS	1
+#define CURRENT_LIVING_ANTAGS	2
+#define CURRENT_DEAD_PLAYERS	3
+#define CURRENT_OBSERVERS	    4
+
+#define ONLY_RULESET       1
+#define HIGHLANDER_RULESET 2
+#define TRAITOR_RULESET    4
+#define MINOR_RULESET      8
+
+#define RULESET_STOP_PROCESSING 1
+
+// -- Injection delays
+GLOBAL_VAR_INIT(dynamic_latejoin_delay_min, (5 MINUTES))
+GLOBAL_VAR_INIT(dynamic_latejoin_delay_max, (25 MINUTES))
+
+GLOBAL_VAR_INIT(dynamic_midround_delay_min, (15 MINUTES))
+GLOBAL_VAR_INIT(dynamic_midround_delay_max, (35 MINUTES))
+
+// Are HIGHLANDER_RULESETs allowed to stack?
+GLOBAL_VAR_INIT(dynamic_no_stacking, TRUE)
+// A number between -5 and +5. 
+// A negative value will give a more peaceful round and
+// a positive value will give a round with higher threat.
+GLOBAL_VAR_INIT(dynamic_curve_centre, 0)
+// A number between 0.5 and 4.
+// Higher value will favour extreme rounds and
+// lower value rounds closer to the average.
+GLOBAL_VAR_INIT(dynamic_curve_width, 1.8)
+// If enabled only picks a single starting rule and executes only autotraitor midround ruleset. 
+GLOBAL_VAR_INIT(dynamic_classic_secret, FALSE)
+// How many roundstart players required for high population override to take effect.
+GLOBAL_VAR_INIT(dynamic_high_pop_limit, 55)
+// If enabled does not accept or execute any rulesets.
+GLOBAL_VAR_INIT(dynamic_forced_extended, FALSE)
+// How high threat is required for HIGHLANDER_RULESETs stacking.
+// This is independent of dynamic_no_stacking.
+GLOBAL_VAR_INIT(dynamic_stacking_limit, 90)
+// List of forced roundstart rulesets.
+GLOBAL_LIST_EMPTY(dynamic_forced_roundstart_ruleset)
+// Forced threat level, setting this to zero or higher forces the roundstart threat to the value. 
+GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1)
+
+/datum/game_mode/dynamic
+	name = "dynamic mode"
+	config_tag = "dynamic"
+
+	announce_span = "danger"
+	announce_text = "Dynamic mode!" // This needs to be changed maybe
+
+	reroll_friendly = FALSE;
+	
+	// Threat logging vars
+	/// The "threat cap", threat shouldn't normally go above this and is used in ruleset calculations
+	var/threat_level = 0 
+	/// Set at the beginning of the round. Spent by the mode to "purchase" rules.
+	var/threat = 0 
+	/// Running information about the threat. Can store text or datum entries.
+	var/list/threat_log = list() 
+	/// List of roundstart rules used for selecting the rules.
+	var/list/roundstart_rules = list()
+	/// List of latejoin rules used for selecting the rules.
+	var/list/latejoin_rules = list()
+	/// List of midround rules used for selecting the rules.
+	var/list/midround_rules = list()
+	/** # Pop range per requirement.
+	  * If the value is five the range is:
+	  * 0-4, 5-9, 10-14, 15-19, 20-24, 25-29, 30-34, 35-39, 40-54, 45+
+	  * If it is six the range is:
+	  * 0-5, 6-11, 12-17, 18-23, 24-29, 30-35, 36-41, 42-47, 48-53, 54+
+	  * If it is seven the range is:
+	  * 0-6, 7-13, 14-20, 21-27, 28-34, 35-41, 42-48, 49-55, 56-62, 63+
+	  */
+	var/pop_per_requirement = 6
+	/// The requirement used for checking if a second rule should be selected.
+	var/list/second_rule_req = list(100, 100, 80, 70, 60, 50, 30, 20, 10, 0)
+	/// The requirement used for checking if a third rule should be selected.
+	var/list/third_rule_req = list(100, 100, 100, 90, 80, 70, 60, 50, 40, 30)
+	/// Threat requirement for a second ruleset when high pop override is in effect. 
+	var/high_pop_second_rule_req = 40
+	/// Threat requirement for a third ruleset when high pop override is in effect. 
+	var/high_pop_third_rule_req = 60
+	/// Number of players who were ready on roundstart.
+	var/roundstart_pop_ready = 0
+	/// List of candidates used on roundstart rulesets.
+	var/list/candidates = list()
+	/// Rules that are processed, rule_process is called on the rules in this list.
+	var/list/current_rules = list()
+	/// List of executed rulesets.
+	var/list/executed_rules = list()
+	/// Associative list of current players, in order: living players, living antagonists, dead players and observers.
+	var/list/list/current_players = list(CURRENT_LIVING_PLAYERS, CURRENT_LIVING_ANTAGS, CURRENT_DEAD_PLAYERS, CURRENT_OBSERVERS)
+	/// When world.time is over this number the mode tries to inject a latejoin ruleset.
+	var/latejoin_injection_cooldown = 0
+	/// When world.time is over this number the mode tries to inject a midround ruleset.
+	var/midround_injection_cooldown = 0
+	/// When TRUE GetInjectionChance returns 100.
+	var/forced_injection = FALSE
+	/// Forced ruleset to be executed for the next latejoin.
+	var/datum/dynamic_ruleset/latejoin/forced_latejoin_rule = null
+	/// When current_players was updated last time.
+	var/pop_last_updated = 0
+	/// How many percent of the rounds are more peaceful.
+	var/peaceful_percentage = 50
+	/// If a highlander executed.
+	var/highlander_executed = FALSE
+	/// If a only ruleset has been executed.
+	var/only_ruleset_executed = FALSE
+
+/datum/game_mode/dynamic/admin_panel()
+	var/list/dat = list("<html><head><title>Game Mode Panel</title></head><body><h1><B>Game Mode Panel</B></h1>")
+	dat += "Dynamic Mode <a href='?_src_=vars;[HrefToken()];Vars=[REF(src)]'>\[VV\]</A><BR>"
+	dat += "Threat Level: <b>[threat_level]</b><br/>"
+
+	dat += "Threat to Spend: <b>[threat]</b> <a href='?src=\ref[src];[HrefToken()];adjustthreat=1'>\[Adjust\]</A> <a href='?src=\ref[src];[HrefToken()];threatlog=1'>\[View Log\]</a><br/>"
+	dat += "<br/>"
+	dat += "Parameters: centre = [GLOB.dynamic_curve_centre] ; width = [GLOB.dynamic_curve_width].<br/>"
+	dat += "<i>On average, <b>[peaceful_percentage]</b>% of the rounds are more peaceful.</i><br/>"
+	dat += "Forced extended: <a href='?src=\ref[src];[HrefToken()];forced_extended=1'><b>[GLOB.dynamic_forced_extended ? "On" : "Off"]</b></a><br/>"
+	dat += "Classic secret (only autotraitor): <a href='?src=\ref[src];[HrefToken()];classic_secret=1'><b>[GLOB.dynamic_classic_secret ? "On" : "Off"]</b></a><br/>"
+	dat += "No stacking (only one round-ender): <a href='?src=\ref[src];[HrefToken()];no_stacking=1'><b>[GLOB.dynamic_no_stacking ? "On" : "Off"]</b></a><br/>"
+	dat += "Stacking limit: [GLOB.dynamic_stacking_limit] <a href='?src=\ref[src];[HrefToken()];stacking_limit=1'>\[Adjust\]</A>"
+	dat += "<br/>"
+	dat += "Executed rulesets: "
+	if (executed_rules.len > 0)
+		dat += "<br/>"
+		for (var/datum/dynamic_ruleset/DR in executed_rules)
+			dat += "[DR.ruletype] - <b>[DR.name]</b><br>"
+	else
+		dat += "none.<br>"
+	dat += "<br>Injection Timers: (<b>[get_injection_chance(TRUE)]%</b> chance)<BR>"
+	dat += "Latejoin: [(latejoin_injection_cooldown-world.time)>60*10 ? "[round((latejoin_injection_cooldown-world.time)/60/10,0.1)] minutes" : "[(latejoin_injection_cooldown-world.time)] seconds"] <a href='?src=\ref[src];[HrefToken()];injectlate=1'>\[Now!\]</a><BR>"
+	dat += "Midround: [(midround_injection_cooldown-world.time)>60*10 ? "[round((midround_injection_cooldown-world.time)/60/10,0.1)] minutes" : "[(midround_injection_cooldown-world.time)] seconds"] <a href='?src=\ref[src];[HrefToken()];injectmid=1'>\[Now!\]</a><BR>"
+	usr << browse(dat.Join(), "window=gamemode_panel;size=500x500")
+
+/datum/game_mode/dynamic/Topic(href, href_list)
+	if (..()) // Sanity, maybe ?
+		return
+	if(!check_rights(R_ADMIN))
+		message_admins("[usr.key] has attempted to override the game mode panel!")
+		log_admin("[key_name(usr)] tried to use the game mode panel without authorization.")
+		return
+	if (href_list["forced_extended"])
+		GLOB.dynamic_forced_extended = !GLOB.dynamic_forced_extended
+	else if (href_list["no_stacking"])
+		GLOB.dynamic_no_stacking = !GLOB.dynamic_no_stacking
+	else if (href_list["classic_secret"])
+		GLOB.dynamic_classic_secret = !GLOB.dynamic_classic_secret
+	else if (href_list["adjustthreat"])
+		var/threatadd = input("Specify how much threat to add (negative to subtract). This can inflate the threat level.", "Adjust Threat", 0) as null|num
+		if(!threatadd)
+			return
+		if(threatadd > 0)
+			create_threat(threatadd)
+		else
+			spend_threat(-threatadd)
+	else if (href_list["injectlate"])
+		latejoin_injection_cooldown = 0
+		forced_injection = TRUE
+		message_admins("[key_name(usr)] forced a latejoin injection.", 1)
+	else if (href_list["injectmid"])
+		midround_injection_cooldown = 0
+		forced_injection = TRUE
+		message_admins("[key_name(usr)] forced a midround injection.", 1)
+	else if (href_list["threatlog"])
+		show_threatlog(usr)
+	else if (href_list["stacking_limit"])
+		GLOB.dynamic_stacking_limit = input(usr,"Change the threat limit at which round-endings rulesets will start to stack.", "Change stacking limit", null) as num
+	
+	admin_panel() // Refreshes the window
+
+// Checks if there are HIGHLANDER_RULESETs and calls the rule's round_result() proc
+/datum/game_mode/dynamic/set_round_result()
+	for(var/datum/dynamic_ruleset/rule in executed_rules)
+		if(rule.flags & HIGHLANDER_RULESET)
+			if(rule.check_finished()) // Only the rule that actually finished the round sets round result.
+				return rule.round_result()
+	// If it got to this part, just pick one highlander if it exists
+	for(var/datum/dynamic_ruleset/rule in executed_rules)
+		if(rule.flags & HIGHLANDER_RULESET)
+			return rule.round_result()
+	return ..()
+
+/datum/game_mode/dynamic/send_intercept()
+	. = "<b><i>Central Command Status Summary</i></b><hr>"
+	switch(round(threat_level))
+		if(0 to 19)
+			update_playercounts()
+			if(!current_players[CURRENT_LIVING_ANTAGS].len)
+				. += "<b>Peaceful Waypoint</b></center><BR>"
+				. += "Your station orbits deep within controlled, core-sector systems and serves as a waypoint for routine traffic through Nanotrasen's trade empire. Due to the combination of high security, interstellar traffic, and low strategic value, it makes any direct threat of violence unlikely. Your primary enemies will be incompetence and bored crewmen: try to organize team-building events to keep staffers interested and productive."
+			else
+				. += "<b>Core Territory</b></center><BR>"
+				. += "Your station orbits within reliably mundane, secure space. Although Nanotrasen has a firm grip on security in your region, the valuable resources and strategic position aboard your station make it a potential target for infiltrations. Monitor crew for non-loyal behavior, but expect a relatively tame shift free of large-scale destruction. We expect great things from your station."
+		if(20 to 39)
+			. += "<b>Anomalous Exogeology</b></center><BR>"
+			. += "Although your station lies within what is generally considered Nanotrasen-controlled space, the course of its orbit has caused it to cross unusually close to exogeological features with anomalous readings. Although these features offer opportunities for our research department, it is known that these little understood readings are often correlated with increased activity from competing interstellar organizations and individuals, among them the Wizard Federation and Cult of the Geometer of Blood - all known competitors for Anomaly Type B sites. Exercise elevated caution."
+		if(40 to 65)
+			. += "<b>Contested System</b></center><BR>"
+			. += "Your station's orbit passes along the edge of Nanotrasen's sphere of influence. While subversive elements remain the most likely threat against your station, hostile organizations are bolder here, where our grip is weaker. Exercise increased caution against elite Syndicate strike forces, or Executives forbid, some kind of ill-conceived unionizing attempt."
+		if(66 to 79)
+			. += "<b>Uncharted Space</b></center><BR>"
+			. += "Congratulations and thank you for participating in the NT 'Frontier' space program! Your station is actively orbiting a high value system far from the nearest support stations. Little is known about your region of space, and the opportunity to encounter the unknown invites greater glory. You are encouraged to elevate security as necessary to protect Nanotrasen assets."
+		if(80 to 99)
+			. += "<b>Black Orbit</b></center><BR>"
+			. += "As part of a mandatory security protocol, we are required to inform you that as a result of your orbital pattern directly behind an astrological body (oriented from our nearest observatory), your station will be under decreased monitoring and support. It is anticipated that your extreme location and decreased surveillance could pose security risks. Avoid unnecessary risks and attempt to keep your station in one piece."
+		if(100)
+			. += "<b>Impending Doom</b></center><BR>"
+			. += "Your station is somehow in the middle of hostile territory, in clear view of any enemy of the corporation. Your likelihood to survive is low, and station destruction is expected and almost inevitable. Secure any sensitive material and neutralize any enemy you will come across. It is important that you at least try to maintain the station.<BR>"
+			. += "Good luck."
+
+	if(station_goals.len)
+		. += "<hr><b>Special Orders for [station_name()]:</b>"
+		for(var/datum/station_goal/G in station_goals)
+			G.on_report()
+			. += G.get_report()
+
+	print_command_report(., "Central Command Status Summary", announce=FALSE)
+	priority_announce("A summary has been copied and printed to all communications consoles.", "Security level elevated.", 'sound/ai/intercept.ogg')
+	if(GLOB.security_level < SEC_LEVEL_BLUE)
+		set_security_level(SEC_LEVEL_BLUE)
+
+// Yes, this is copy pasted from game_mode
+/datum/game_mode/dynamic/check_finished(force_ending)
+	if(!SSticker.setup_done || !gamemode_ready)
+		return FALSE
+	if(replacementmode && round_converted == 2)
+		return replacementmode.check_finished()
+	if(SSshuttle.emergency && (SSshuttle.emergency.mode == SHUTTLE_ENDGAME))
+		return TRUE
+	if(station_was_nuked)
+		return TRUE
+	if(force_ending)
+		return TRUE
+	for(var/datum/dynamic_ruleset/rule in executed_rules)
+		if(rule.flags & HIGHLANDER_RULESET)
+			return rule.check_finished()
+
+/datum/game_mode/dynamic/proc/show_threatlog(mob/admin)
+	if(!SSticker.HasRoundStarted())
+		alert("The round hasn't started yet!")
+		return
+
+	if(!check_rights(R_ADMIN))
+		return
+
+	var/list/out = list("<TITLE>Threat Log</TITLE><B><font size='3'>Threat Log</font></B><br><B>Starting Threat:</B> [threat_level]<BR>")
+
+	for(var/entry in threat_log)
+		if(istext(entry))
+			out += "[entry]<BR>"
+
+	out += "<B>Remaining threat/threat_level:</B> [threat]/[threat_level]"
+
+	usr << browse(out.Join(), "window=threatlog;size=700x500")
+
+/// Generates the threat level using lorentz distribution and assigns peaceful_percentage.
+/datum/game_mode/dynamic/proc/generate_threat()
+	var/relative_threat = LORENTZ_DISTRIBUTION(GLOB.dynamic_curve_centre, GLOB.dynamic_curve_width)
+	threat_level = round(lorentz_to_threat(relative_threat), 0.1)
+
+	peaceful_percentage = round(LORENTZ_CUMULATIVE_DISTRIBUTION(relative_threat, GLOB.dynamic_curve_centre, GLOB.dynamic_curve_width), 0.01)*100
+
+	threat = threat_level
+
+/datum/game_mode/dynamic/can_start()
+	/* Disabled for now, had some changes that need to be tested and this might interfere with that.
+	if(GLOB.dynamic_curve_centre == 0)
+		// 10 is when the centre starts to decrease
+		// 6 is just 1 + 5 (from the maximum value and the one decreased)
+		// 1 just makes the curve look better, I don't know.
+		// Limited between 1 and 5 then inverted and rounded
+		// With this you get a centre curve that stays at -5 until 10 then first rapidly decreases but slows down at the end
+		GLOB.dynamic_curve_centre = round(-CLAMP((10*6/GLOB.player_list.len)-1, 0, 5), 0.5)
+	*/
+	message_admins("Dynamic mode parameters for the round:")
+	message_admins("Centre is [GLOB.dynamic_curve_centre], Width is [GLOB.dynamic_curve_width], Forced extended is [GLOB.dynamic_forced_extended ? "Enabled" : "Disabled"], No stacking is [GLOB.dynamic_no_stacking ? "Enabled" : "Disabled"].")
+	message_admins("Stacking limit is [GLOB.dynamic_stacking_limit], Classic secret is [GLOB.dynamic_classic_secret ? "Enabled" : "Disabled"], High population limit is [GLOB.dynamic_high_pop_limit].")
+	log_game("DYNAMIC: Dynamic mode parameters for the round:")
+	log_game("DYNAMIC: Centre is [GLOB.dynamic_curve_centre], Width is [GLOB.dynamic_curve_width], Forced extended is [GLOB.dynamic_forced_extended ? "Enabled" : "Disabled"], No stacking is [GLOB.dynamic_no_stacking ? "Enabled" : "Disabled"].")
+	log_game("DYNAMIC: Stacking limit is [GLOB.dynamic_stacking_limit], Classic secret is [GLOB.dynamic_classic_secret ? "Enabled" : "Disabled"], High population limit is [GLOB.dynamic_high_pop_limit].")
+	if(GLOB.dynamic_forced_threat_level >= 0)
+		threat_level = round(GLOB.dynamic_forced_threat_level, 0.1)
+		threat = threat_level
+	else
+		generate_threat()
+
+	var/latejoin_injection_cooldown_middle = 0.5*(GLOB.dynamic_latejoin_delay_max + GLOB.dynamic_latejoin_delay_min)
+	latejoin_injection_cooldown = round(CLAMP(EXP_DISTRIBUTION(latejoin_injection_cooldown_middle), GLOB.dynamic_latejoin_delay_min, GLOB.dynamic_latejoin_delay_max)) + world.time
+
+	var/midround_injection_cooldown_middle = 0.5*(GLOB.dynamic_midround_delay_max + GLOB.dynamic_midround_delay_min)
+	midround_injection_cooldown = round(CLAMP(EXP_DISTRIBUTION(midround_injection_cooldown_middle), GLOB.dynamic_midround_delay_min, GLOB.dynamic_midround_delay_max)) + world.time
+	log_game("DYNAMIC: Dynamic Mode initialized with a Threat Level of... [threat_level]!")
+	return TRUE
+
+/datum/game_mode/dynamic/pre_setup()
+	for (var/rule in subtypesof(/datum/dynamic_ruleset))
+		var/datum/dynamic_ruleset/ruleset = new rule()
+		// Simple check if the ruleset should be added to the lists.
+		if(ruleset.name == "")
+			continue
+		switch(ruleset.ruletype)
+			if("Roundstart")
+				roundstart_rules += ruleset
+			if ("Latejoin")
+				latejoin_rules += ruleset
+			if ("Midround")
+				if (ruleset.weight)
+					midround_rules += ruleset
+	for(var/mob/dead/new_player/player in GLOB.player_list)
+		if(player.ready == PLAYER_READY_TO_PLAY && player.mind)
+			roundstart_pop_ready++
+			candidates.Add(player)
+	log_game("DYNAMIC: Listing [roundstart_rules.len] round start rulesets, and [candidates.len] players ready.")
+	if (candidates.len <= 0)
+		return TRUE
+	if (roundstart_rules.len <= 0)
+		return TRUE
+	
+	if(GLOB.dynamic_forced_roundstart_ruleset.len > 0)
+		rigged_roundstart()
+	else 
+		roundstart()
+
+	var/starting_rulesets = ""
+	for (var/datum/dynamic_ruleset/roundstart/DR in executed_rules)
+		starting_rulesets += "[DR.name], "
+	candidates.Cut()
+	return TRUE
+
+/datum/game_mode/dynamic/post_setup(report)
+	update_playercounts()
+
+	for(var/datum/dynamic_ruleset/roundstart/rule in executed_rules)
+		rule.candidates.Cut() // The rule should not use candidates at this point as they all are null.
+		if(!rule.execute())
+			stack_trace("The starting rule \"[rule.name]\" failed to execute.")
+	..()
+
+/// A simple roundstart proc used when dynamic_forced_roundstart_ruleset has rules in it.
+/datum/game_mode/dynamic/proc/rigged_roundstart()
+	message_admins("[GLOB.dynamic_forced_roundstart_ruleset.len] rulesets being forced. Will now attempt to draft players for them.")
+	log_game("DYNAMIC: [GLOB.dynamic_forced_roundstart_ruleset.len] rulesets being forced. Will now attempt to draft players for them.")
+	for (var/datum/dynamic_ruleset/roundstart/rule in GLOB.dynamic_forced_roundstart_ruleset)
+		message_admins("Drafting players for forced ruleset [rule.name].")
+		log_game("DYNAMIC: Drafting players for forced ruleset [rule.name].")
+		rule.mode = src
+		rule.candidates = candidates.Copy()
+		rule.trim_candidates()
+		if (rule.ready(TRUE))
+			picking_roundstart_rule(list(rule), forced = TRUE)
+
+/datum/game_mode/dynamic/proc/roundstart()
+	if (GLOB.dynamic_forced_extended)
+		log_game("DYNAMIC: Starting a round of forced extended.")
+		return TRUE
+	var/list/drafted_rules = list()
+	for (var/datum/dynamic_ruleset/roundstart/rule in roundstart_rules)
+		if (rule.acceptable(roundstart_pop_ready, threat_level) && threat >= rule.cost)	// If we got the population and threat required
+			rule.candidates = candidates.Copy()
+			rule.trim_candidates()
+			if (rule.ready() && rule.candidates.len > 0)
+				drafted_rules[rule] = rule.weight
+
+	var/indice_pop = min(10,round(roundstart_pop_ready/pop_per_requirement)+1)
+	var/extra_rulesets_amount = 0
+	if (GLOB.dynamic_classic_secret)
+		extra_rulesets_amount = 0
+	else
+		if (roundstart_pop_ready > GLOB.dynamic_high_pop_limit)
+			message_admins("High Population Override is in effect! Threat Level will have more impact on which roles will appear, and player population less.")
+			log_game("DYNAMIC: High Population Override is in effect! Threat Level will have more impact on which roles will appear, and player population less.")
+			if (threat_level > high_pop_second_rule_req)
+				extra_rulesets_amount++
+				if (threat_level > high_pop_third_rule_req)
+					extra_rulesets_amount++
+		else
+			if (threat_level >= second_rule_req[indice_pop])
+				extra_rulesets_amount++
+				if (threat_level >= third_rule_req[indice_pop])
+					extra_rulesets_amount++
+
+	if (drafted_rules.len > 0 && picking_roundstart_rule(drafted_rules))
+		if (extra_rulesets_amount > 0) // We've got enough population and threat for a second rulestart rule
+			for (var/datum/dynamic_ruleset/roundstart/rule in drafted_rules)
+				if (rule.cost > threat)
+					drafted_rules -= rule
+			if (drafted_rules.len > 0 && picking_roundstart_rule(drafted_rules))
+				if (extra_rulesets_amount > 1) // We've got enough population and threat for a third rulestart rule
+					for (var/datum/dynamic_ruleset/roundstart/rule in drafted_rules)
+						if (rule.cost > threat)
+							drafted_rules -= rule
+					picking_roundstart_rule(drafted_rules)
+	else
+		return FALSE
+	return TRUE
+
+/// Picks a random roundstart rule from the list given as an argument and executes it.
+/datum/game_mode/dynamic/proc/picking_roundstart_rule(list/drafted_rules = list(), forced = FALSE)
+	var/datum/dynamic_ruleset/roundstart/starting_rule = pickweight(drafted_rules)
+	if(!starting_rule)
+		return FALSE
+
+	if(!forced)
+		if(only_ruleset_executed)
+			return FALSE
+		// Check if a blocking ruleset has been executed.
+		else if(check_blocking(starting_rule.blocking_rules, executed_rules))
+			drafted_rules -= starting_rule
+			if(drafted_rules.len <= 0)
+				return FALSE
+			starting_rule = pickweight(drafted_rules)
+		// Check if the ruleset is highlander and if a highlander ruleset has been executed
+		else if(starting_rule.flags & HIGHLANDER_RULESET)
+			if(threat < GLOB.dynamic_stacking_limit && GLOB.dynamic_no_stacking)
+				if(highlander_executed)
+					drafted_rules -= starting_rule
+					if(drafted_rules.len <= 0)
+						return FALSE
+					starting_rule = pickweight(drafted_rules)
+
+	log_game("DYNAMIC: Picking a [istype(starting_rule, /datum/dynamic_ruleset/roundstart/delayed/) ? " delayed " : ""] ruleset [starting_rule.name]")
+
+	roundstart_rules -= starting_rule
+	drafted_rules -= starting_rule
+
+	if (istype(starting_rule, /datum/dynamic_ruleset/roundstart/delayed/))
+		var/datum/dynamic_ruleset/roundstart/delayed/rule = starting_rule
+		addtimer(CALLBACK(src, .proc/execute_delayed, rule), rule.delay)
+
+	starting_rule.trim_candidates()
+	if (starting_rule.pre_execute())
+		spend_threat(starting_rule.cost)
+		threat_log += "[worldtime2text()]: Roundstart [starting_rule.name] spent [starting_rule.cost]"
+		if(starting_rule.flags & HIGHLANDER_RULESET)
+			highlander_executed = TRUE
+		else if(starting_rule.flags & ONLY_RULESET)
+			only_ruleset_executed = TRUE
+		executed_rules += starting_rule
+		if (starting_rule.persistent)
+			current_rules += starting_rule
+		for(var/mob/M in starting_rule.assigned)
+			for (var/datum/dynamic_ruleset/roundstart/rule in roundstart_rules)
+				if (!rule.ready())
+					drafted_rules -= rule // And removing rules that are no longer elligible
+		return TRUE
+	else
+		stack_trace("The starting rule \"[starting_rule.name]\" failed to pre_execute.")
+	return FALSE
+
+/// Executes delayed roundstart rules and has a hack in it.
+/datum/game_mode/dynamic/proc/execute_delayed(datum/dynamic_ruleset/roundstart/delayed/rule)
+	update_playercounts()
+	rule.candidates = current_players[CURRENT_LIVING_PLAYERS].Copy()
+	rule.trim_candidates()
+	if(rule.execute())
+		executed_rules += rule
+		if (rule.persistent)
+			current_rules += rule
+		return TRUE
+	else
+		stack_trace("The delayed roundstart rule \"[rule.name]\" failed to execute.")
+		return FALSE
+
+/// Picks a random midround OR latejoin rule from the list given as an argument and executes it.
+/// Also this could be named better.
+/datum/game_mode/dynamic/proc/picking_midround_latejoin_rule(list/drafted_rules = list(), forced = FALSE)
+	var/datum/dynamic_ruleset/rule = pickweight(drafted_rules)
+	if(!rule)
+		return FALSE
+	
+	if(!forced)
+		if(only_ruleset_executed)
+			return FALSE
+		// Check if a blocking ruleset has been executed.
+		else if(check_blocking(rule.blocking_rules, executed_rules))
+			drafted_rules -= rule
+			if(drafted_rules.len <= 0)
+				return FALSE
+			rule = pickweight(drafted_rules)
+		// Check if the ruleset is highlander and if a highlander ruleset has been executed
+		else if(rule.flags & HIGHLANDER_RULESET)
+			if(threat < GLOB.dynamic_stacking_limit && GLOB.dynamic_no_stacking)
+				if(highlander_executed)
+					drafted_rules -= rule
+					if(drafted_rules.len <= 0)
+						return FALSE
+					rule = pickweight(drafted_rules)
+	
+	if(!rule.repeatable)
+		if(rule.ruletype == "Latejoin")
+			latejoin_rules = remove_from_list(latejoin_rules, rule.type)
+		else if(rule.type == "Midround")
+			midround_rules = remove_from_list(midround_rules, rule.type)
+	
+	if (rule.execute())
+		log_game("DYNAMIC: Injected a [rule.ruletype == "latejoin" ? "latejoin" : "midround"] ruleset [rule.name].")
+		spend_threat(rule.cost)
+		threat_log += "[worldtime2text()]: [rule.ruletype] [rule.name] spent [rule.cost]"
+		if(rule.flags & HIGHLANDER_RULESET)
+			highlander_executed = TRUE
+		else if(rule.flags & ONLY_RULESET)
+			only_ruleset_executed = TRUE
+		if(rule.ruletype == "Latejoin")
+			var/mob/M = pick(rule.candidates)
+			message_admins("[key_name(M)] joined the station, and was selected by the [rule.name] ruleset.")
+			log_game("DYNAMIC: [key_name(M)] joined the station, and was selected by the [rule.name] ruleset.")
+		executed_rules += rule
+		rule.candidates.Cut()
+		if (rule.persistent)
+			current_rules += rule
+		return TRUE
+	else
+		stack_trace("The [rule.ruletype] rule \"[rule.name]\" failed to execute.")
+	return FALSE
+
+/// An experimental proc to allow admins to call rules on the fly or have rules call other rules.
+/datum/game_mode/dynamic/proc/picking_specific_rule(ruletype, forced = FALSE)
+	var/datum/dynamic_ruleset/midround/new_rule
+	if(ispath(ruletype))
+		new_rule = new ruletype() // You should only use it to call midround rules though.
+	else if(istype(ruletype, /datum/dynamic_ruleset))
+		new_rule = ruletype
+	else
+		return FALSE
+	
+	if(!new_rule)
+		return FALSE
+	
+	if(!forced)
+		if(only_ruleset_executed)
+			return FALSE
+		// Check if a blocking ruleset has been executed.
+		else if(check_blocking(new_rule.blocking_rules, executed_rules))
+			return FALSE
+		// Check if the ruleset is highlander and if a highlander ruleset has been executed
+		else if(new_rule.flags & HIGHLANDER_RULESET)
+			if(threat < GLOB.dynamic_stacking_limit && GLOB.dynamic_no_stacking)
+				if(highlander_executed)
+					return FALSE
+	
+	update_playercounts()
+	if ((forced || (new_rule.acceptable(current_players[CURRENT_LIVING_PLAYERS].len, threat_level) && new_rule.cost <= threat)))
+		new_rule.candidates = current_players.Copy()
+		new_rule.trim_candidates()
+		if (new_rule.ready(forced))
+			spend_threat(new_rule.cost)
+			threat_log += "[worldtime2text()]: Forced rule [new_rule.name] spent [new_rule.cost]"
+			if (new_rule.execute()) // This should never fail since ready() returned 1
+				if(new_rule.flags & HIGHLANDER_RULESET)
+					highlander_executed = TRUE
+				else if(new_rule.flags & ONLY_RULESET)
+					only_ruleset_executed = TRUE
+				log_game("DYNAMIC: Making a call to a specific ruleset...[new_rule.name]!")
+				executed_rules += new_rule
+				if (new_rule.persistent)
+					current_rules += new_rule
+				return TRUE
+		else if (forced)
+			log_game("DYNAMIC: The ruleset [new_rule.name] couldn't be executed due to lack of elligible players.")
+	return FALSE
+
+/datum/game_mode/dynamic/process()
+	if (pop_last_updated < world.time - (60 SECONDS))
+		pop_last_updated = world.time
+		update_playercounts()
+
+	for (var/datum/dynamic_ruleset/rule in current_rules)
+		if(rule.rule_process() == RULESET_STOP_PROCESSING) // If rule_process() returns 1 (RULESET_STOP_PROCESSING), stop processing.
+			current_rules -= rule
+
+	if (midround_injection_cooldown < world.time)
+		if (GLOB.dynamic_forced_extended)
+			return
+		
+		// Somehow it manages to trigger midround multiple times so this was moved here.
+		// There is no way this should be able to trigger an injection twice now.
+		var/midround_injection_cooldown_middle = 0.5*(GLOB.dynamic_midround_delay_max + GLOB.dynamic_midround_delay_min)
+		midround_injection_cooldown = (round(CLAMP(EXP_DISTRIBUTION(midround_injection_cooldown_middle), GLOB.dynamic_midround_delay_min, GLOB.dynamic_midround_delay_max)) + world.time)
+		
+		// Time to inject some threat into the round
+		if(EMERGENCY_ESCAPED_OR_ENDGAMED) // Unless the shuttle is gone
+			return
+
+		log_game("DYNAMIC: Checking state of the round.")
+			
+		update_playercounts()
+
+		if (prob(get_injection_chance()))
+			var/list/drafted_rules = list()
+			for (var/datum/dynamic_ruleset/midround/rule in midround_rules)
+				if (rule.acceptable(current_players[CURRENT_LIVING_PLAYERS].len, threat_level) && threat >= rule.cost)
+					// Classic secret : only autotraitor/minor roles
+					if (GLOB.dynamic_classic_secret && !((rule.flags & TRAITOR_RULESET) || (rule.flags & MINOR_RULESET)))
+						continue
+					rule.candidates = list()
+					rule.candidates = current_players.Copy()
+					rule.trim_candidates()
+					if (rule.ready() && rule.candidates.len > 0)
+						drafted_rules[rule] = rule.get_weight()
+			if (drafted_rules.len > 0)
+				picking_midround_latejoin_rule(drafted_rules)
+	
+/// Updates current_players.
+/datum/game_mode/dynamic/proc/update_playercounts()
+	current_players[CURRENT_LIVING_PLAYERS] = list()
+	current_players[CURRENT_LIVING_ANTAGS] = list()
+	current_players[CURRENT_DEAD_PLAYERS] = list()
+	current_players[CURRENT_OBSERVERS] = list()
+	for (var/mob/M in GLOB.player_list)
+		if (istype(M, /mob/dead/new_player))
+			continue
+		if (M.stat != DEAD)
+			current_players[CURRENT_LIVING_PLAYERS].Add(M)
+			if (M.mind && (M.mind.special_role || M.mind.antag_datums?.len > 0))
+				current_players[CURRENT_LIVING_ANTAGS].Add(M)
+		else
+			if (istype(M,/mob/dead/observer))
+				var/mob/dead/observer/O = M
+				if (O.started_as_observer) // Observers
+					current_players[CURRENT_OBSERVERS].Add(M)
+					continue
+			current_players[CURRENT_DEAD_PLAYERS].Add(M) // Players who actually died (and admins who ghosted, would be nice to avoid counting them somehow)
+
+/// Gets the chance for latejoin and midround injection, the dry_run argument is only used for forced injection.
+/datum/game_mode/dynamic/proc/get_injection_chance(dry_run = FALSE)
+	if(forced_injection)
+		forced_injection = !dry_run
+		return 100
+	var/chance = 0
+	// If the high pop override is in effect, we reduce the impact of population on the antag injection chance
+	var/high_pop_factor = (current_players[CURRENT_LIVING_PLAYERS].len >= GLOB.dynamic_high_pop_limit)
+	var/max_pop_per_antag = max(5,15 - round(threat_level/10) - round(current_players[CURRENT_LIVING_PLAYERS].len/(high_pop_factor ? 10 : 5)))
+	if (!current_players[CURRENT_LIVING_ANTAGS].len)
+		chance += 50 // No antags at all? let's boost those odds!
+	else
+		var/current_pop_per_antag = current_players[CURRENT_LIVING_PLAYERS].len / current_players[CURRENT_LIVING_ANTAGS].len
+		if (current_pop_per_antag > max_pop_per_antag)
+			chance += min(50, 25+10*(current_pop_per_antag-max_pop_per_antag))
+		else
+			chance += 25-10*(max_pop_per_antag-current_pop_per_antag)
+	if (current_players[CURRENT_DEAD_PLAYERS].len > current_players[CURRENT_LIVING_PLAYERS].len)
+		chance -= 30 // More than half the crew died? ew, let's calm down on antags
+	if (threat > 70)
+		chance += 15
+	if (threat < 30)
+		chance -= 15
+	return round(max(0,chance))
+
+/// Removes type from the list
+/datum/game_mode/dynamic/proc/remove_from_list(list/type_list, type)
+	for(var/I in type_list)
+		if(istype(I, type))
+			type_list -= I
+	return type_list
+
+/// Checks if a type in blocking_list is in rule_list.
+/datum/game_mode/dynamic/proc/check_blocking(list/blocking_list, list/rule_list)
+	if(blocking_list.len > 0)
+		for(var/blocking in blocking_list)
+			for(var/datum/executed in rule_list)
+				if(blocking == executed.type)
+					return TRUE
+	return FALSE
+
+/// Checks if client age is age or older.
+/datum/game_mode/dynamic/proc/check_age(client/C, age)
+	enemy_minimum_age = age
+	if(get_remaining_days(C) == 0)
+		enemy_minimum_age = initial(enemy_minimum_age)
+		return TRUE // Available in 0 days = available right now = player is old enough to play.
+	enemy_minimum_age = initial(enemy_minimum_age)
+	return FALSE
+
+/datum/game_mode/dynamic/make_antag_chance(mob/living/carbon/human/newPlayer)
+	if (GLOB.dynamic_forced_extended)
+		return
+	if(EMERGENCY_ESCAPED_OR_ENDGAMED) // No more rules after the shuttle has left
+		return
+
+	update_playercounts()
+
+	if (forced_latejoin_rule)
+		forced_latejoin_rule.candidates = list(newPlayer)
+		forced_latejoin_rule.trim_candidates()
+		log_game("DYNAMIC: Forcing ruleset [forced_latejoin_rule]")
+		if (forced_latejoin_rule.ready(TRUE))
+			picking_midround_latejoin_rule(list(forced_latejoin_rule), forced = TRUE)
+		forced_latejoin_rule = null
+
+	else if (latejoin_injection_cooldown < world.time && prob(get_injection_chance()))
+		var/list/drafted_rules = list()
+		for (var/datum/dynamic_ruleset/latejoin/rule in latejoin_rules)
+			if (rule.acceptable(current_players[CURRENT_LIVING_PLAYERS].len, threat_level) && threat >= rule.cost)
+				// Classic secret : only autotraitor/minor roles
+				if (GLOB.dynamic_classic_secret && !((rule.flags & TRAITOR_RULESET) || (rule.flags & MINOR_RULESET)))
+					continue
+				// No stacking : only one round-enter, unless > stacking_limit threat.
+				if (threat < GLOB.dynamic_stacking_limit && GLOB.dynamic_no_stacking)
+					if(rule.flags & HIGHLANDER_RULESET && highlander_executed)
+						continue
+					
+				rule.candidates = list(newPlayer)
+				rule.trim_candidates()
+				if (rule.ready())
+					drafted_rules[rule] = rule.get_weight()
+
+		if (drafted_rules.len > 0 && picking_midround_latejoin_rule(drafted_rules))
+			var/latejoin_injection_cooldown_middle = 0.5*(GLOB.dynamic_latejoin_delay_max + GLOB.dynamic_latejoin_delay_min)
+			latejoin_injection_cooldown = round(CLAMP(EXP_DISTRIBUTION(latejoin_injection_cooldown_middle), GLOB.dynamic_latejoin_delay_min, GLOB.dynamic_latejoin_delay_max)) + world.time
+
+/// Refund threat, but no more than threat_level.
+/datum/game_mode/dynamic/proc/refund_threat(regain)
+	threat = min(threat_level,threat+regain)
+
+/// Generate threat and increase the threat_level if it goes beyond, capped at 100
+/datum/game_mode/dynamic/proc/create_threat(gain)
+	threat = min(100, threat+gain)
+	if(threat > threat_level)
+		threat_level = threat
+
+/// Expend threat, can't fall under 0.
+/datum/game_mode/dynamic/proc/spend_threat(cost)
+	threat = max(threat-cost,0)
+
+/// Turns the value generated by lorentz distribution to threat value between 0 and 100.
+/datum/game_mode/dynamic/proc/lorentz_to_threat(x)
+	switch (x)
+		if (-INFINITY to -20)
+			return rand(0, 10)
+		if (-20 to -10)
+			return RULE_OF_THREE(-40, -20, x) + 50
+		if (-10 to -5)
+			return RULE_OF_THREE(-30, -10, x) + 50
+		if (-5 to -2.5)
+			return RULE_OF_THREE(-20, -5, x) + 50
+		if (-2.5 to -0)
+			return RULE_OF_THREE(-10, -2.5, x) + 50
+		if (0 to 2.5)
+			return RULE_OF_THREE(10, 2.5, x) + 50
+		if (2.5 to 5)
+			return RULE_OF_THREE(20, 5, x) + 50
+		if (5 to 10)
+			return RULE_OF_THREE(30, 10, x) + 50
+		if (10 to 20)
+			return RULE_OF_THREE(40, 20, x) + 50
+		if (20 to INFINITY)
+			return rand(90, 100)
@@ -0,0 +1,211 @@
+/datum/dynamic_ruleset
+	/// For admin logging and round end screen.
+	var/name = ""
+	/// For admin logging and round end screen, do not change this unless making a new rule type.
+	var/ruletype = "" 
+	/// If set to TRUE, the rule won't be discarded after being executed, and dynamic will call rule_process() every time it ticks.
+	var/persistent = FALSE 
+	/// If set to TRUE, dynamic mode will be able to draft this ruleset again later on. (doesn't apply for roundstart rules)
+	var/repeatable = FALSE 
+	/// If set higher than 0 decreases weight by itself causing the ruleset to appear less often the more it is repeated.
+	var/repeatable_weight_decrease = 2 
+	/// List of players that are being drafted for this rule
+	var/list/mob/candidates = list() 
+	/// List of players that were selected for this rule
+	var/list/datum/mind/assigned = list() 
+	/// Preferences flag such as ROLE_WIZARD that need to be turned on for players to be antag
+	var/antag_flag = null 
+	/// The antagonist datum that is assigned to the mobs mind on ruleset execution.
+	var/datum/antagonist/antag_datum = null
+	/// The required minimum account age for this ruleset.
+	var/minimum_required_age = 7
+	/// If set, and config flag protect_roles_from_antagonist is false, then the rule will not pick players from these roles.
+	var/list/protected_roles = list()
+	/// If set, rule will deny candidates from those roles always.
+	var/list/restricted_roles = list() 
+	/// If set, rule will only accept candidates from those roles, IMPORTANT: DOES NOT WORK ON ROUNDSTART RULESETS.
+	var/list/exclusive_roles = list() 
+	/// If set, there needs to be a certain amount of players doing those roles (among the players who won't be drafted) for the rule to be drafted IMPORTANT: DOES NOT WORK ON ROUNDSTART RULESETS.
+	var/list/enemy_roles = list() 
+	/// If enemy_roles was set, this is the amount of enemy job workers needed per threat_level range (0-10,10-20,etc) IMPORTANT: DOES NOT WORK ON ROUNDSTART RULESETS.
+	var/required_enemies = list(1,1,0,0,0,0,0,0,0,0) 
+	/// The rule needs this many candidates (post-trimming) to be executed (example: Cult needs 4 players at round start)
+	var/required_candidates = 0 
+	/// 1 -> 9, probability for this rule to be picked against other rules
+	var/weight = 5 
+	/// Threat cost for this rule, this is decreased from the mode's threat when the rule is executed.
+	var/cost = 0 
+	/// A flag that determines how the ruleset is handled
+	/// HIGHLANDER_RULESET are rulesets can end the round.
+	/// TRAITOR_RULESET and MINOR_RULESET can't end the round and have no difference right now.
+	var/flags = 0
+	/// Pop range per requirement. If zero defaults to mode's pop_per_requirement.
+	var/pop_per_requirement = 0
+	/// Requirements are the threat level requirements per pop range.
+	/// With the default values, The rule will never get drafted below 10 threat level (aka: "peaceful extended"), and it requires a higher threat level at lower pops.
+	var/list/requirements = list(40,30,20,10,10,10,10,10,10,10)
+	/// An alternative, static requirement used instead when pop is over mode's high_pop_limit. 
+	var/high_population_requirement = 10
+	/// Reference to the mode, use this instead of SSticker.mode.
+	var/datum/game_mode/dynamic/mode = null
+	/// If a role is to be considered another for the purpose of banning.
+	var/antag_flag_override = null 
+	/// If a ruleset type which is in this list has been executed, then the ruleset will not be executed.
+	var/list/blocking_rules = list()
+	/// The minimum amount of players required for the rule to be considered. 
+	var/minimum_players = 0
+	/// The maximum amount of players required for the rule to be considered.
+	/// Anything below zero or exactly zero is ignored. 
+	var/maximum_players = 0
+
+
+/datum/dynamic_ruleset/New()
+	..()
+	if(CONFIG_GET(flag/protect_roles_from_antagonist))
+		restricted_roles += protected_roles
+	if(CONFIG_GET(flag/protect_assistant_from_antagonist))
+		restricted_roles += "Assistant"
+
+	if (istype(SSticker.mode, /datum/game_mode/dynamic))
+		mode = SSticker.mode
+	else if (GLOB.master_mode != "dynamic") // This is here to make roundstart forced ruleset function.
+		qdel(src)
+
+/datum/dynamic_ruleset/roundstart // One or more of those drafted at roundstart
+	ruletype = "Roundstart"
+
+/datum/dynamic_ruleset/roundstart/delayed/ // Executed with a 30 seconds delay
+	var/delay = 30 SECONDS
+	var/required_type = /mob/living/carbon/human // No ghosts, new players or silicons allowed.
+
+// Can be drafted when a player joins the server
+/datum/dynamic_ruleset/latejoin
+	ruletype = "Latejoin"
+
+/// By default, a rule is acceptable if it satisfies the threat level/population requirements.
+/// If your rule has extra checks, such as counting security officers, do that in ready() instead
+/datum/dynamic_ruleset/proc/acceptable(population = 0, threat_level = 0)
+	if(minimum_players > population)
+		return FALSE
+	if(maximum_players > 0 && population > maximum_players)
+		return FALSE
+	if (population >= GLOB.dynamic_high_pop_limit)
+		return (threat_level >= high_population_requirement)
+	else
+		pop_per_requirement = pop_per_requirement > 0 ? pop_per_requirement : mode.pop_per_requirement
+		var/indice_pop = min(10,round(population/pop_per_requirement)+1)
+		return (threat_level >= requirements[indice_pop])
+
+/// This is called if persistent variable is true everytime SSTicker ticks.
+/datum/dynamic_ruleset/proc/rule_process()
+	return
+
+/// Called on game mode pre_setup, used for non-delayed roundstart rulesets only.
+/// Do everything you need to do before job is assigned here.
+/// IMPORTANT: ASSIGN special_role HERE
+/datum/dynamic_ruleset/proc/pre_execute()
+	return TRUE
+
+/// Called on post_setup on roundstart and when the rule executes on midround and latejoin.
+/// Give your candidates or assignees equipment and antag datum here.
+/datum/dynamic_ruleset/proc/execute()
+	for(var/datum/mind/M in assigned)
+		M.add_antag_datum(antag_datum)
+	return TRUE
+
+/// Called after delay set in ruleset.
+/// Give your candidates or assignees equipment and antag datum here.
+/datum/dynamic_ruleset/roundstart/delayed/execute()
+	if (SSticker && SSticker.current_state < GAME_STATE_PLAYING)
+		CRASH("The delayed ruleset [name] executed before the round started.")
+
+/// Here you can perform any additional checks you want. (such as checking the map etc)
+/// Remember that on roundstart no one knows what their job is at this point.
+/// IMPORTANT: If ready() returns TRUE, that means pre_execute() or execute() should never fail!
+/datum/dynamic_ruleset/proc/ready(forced = 0)	
+	if (required_candidates > candidates.len)		
+		return FALSE
+	return TRUE
+
+/// Gets weight of the ruleset
+/// Note that this decreases weight if repeatable is TRUE and repeatable_weight_decrease is higher than 0
+/// Note: If you don't want repeatable rulesets to decrease their weight use the weight variable directly
+/datum/dynamic_ruleset/proc/get_weight()
+	if(repeatable && weight > 1 && repeatable_weight_decrease > 0)
+		for(var/datum/dynamic_ruleset/DR in mode.executed_rules)
+			if(istype(DR, type))
+				weight = max(weight-repeatable_weight_decrease,1)
+	return weight
+
+/// Here you can remove candidates that do not meet your requirements.
+/// This means if their job is not correct or they have disconnected you can remove them from candidates here.
+/// Usually this does not need to be changed unless you need some specific requirements from your candidates.
+/datum/dynamic_ruleset/proc/trim_candidates()
+	return
+
+/// Counts how many players are ready at roundstart.
+/// Used only by non-delayed roundstart rulesets. 
+/datum/dynamic_ruleset/proc/num_players()
+	. = 0
+	for(var/mob/dead/new_player/P in GLOB.player_list)
+		if(P.client && P.ready == PLAYER_READY_TO_PLAY)
+			. ++
+
+/// Set mode result and news report here.
+/// Only called if ruleset is flagged as HIGHLANDER_RULESET
+/datum/dynamic_ruleset/proc/round_result()
+
+/// Checks if round is finished, return true to end the round.
+/// Only called if ruleset is flagged as HIGHLANDER_RULESET
+/datum/dynamic_ruleset/proc/check_finished()
+	return FALSE
+
+//////////////////////////////////////////////
+//                                          //
+//           ROUNDSTART RULESETS            //
+//                                          //
+//////////////////////////////////////////////
+
+/// Checks if candidates are connected and if they are banned or don't want to be the antagonist.
+/datum/dynamic_ruleset/roundstart/trim_candidates()
+	for(var/mob/dead/new_player/P in candidates)
+		if (!P.client || !P.mind) // Are they connected?
+			candidates.Remove(P)
+			continue
+		if(!mode.check_age(P.client, minimum_required_age))
+			candidates.Remove(P)
+			continue
+		if(P.mind.special_role) // We really don't want to give antag to an antag.
+			candidates.Remove(P)
+			continue
+		if (!(antag_flag in P.client.prefs.be_special) || jobban_isbanned(P.ckey, list(antag_flag, ROLE_SYNDICATE)) || (antag_flag_override && jobban_isbanned(P.ckey, list(antag_flag_override, ROLE_SYNDICATE))))//are they willing and not antag-banned?
+			candidates.Remove(P)
+			continue
+
+/// Checks if candidates are required mob type, connected, banned and if the job is exclusive to the role. 
+/datum/dynamic_ruleset/roundstart/delayed/trim_candidates()
+	. = ..()
+	for (var/mob/P in candidates)
+		if (!istype(P, required_type))
+			candidates.Remove(P) // Can be a new_player, etc.
+			continue
+		if(!mode.check_age(P.client, minimum_required_age))
+			candidates.Remove(P)
+			continue
+		if (!P.client || !P.mind || !P.mind.assigned_role) // Are they connected?
+			candidates.Remove(P)
+			continue
+		if(P.mind.special_role || P.mind.antag_datums?.len > 0) // Are they an antag already?
+			candidates.Remove(P)
+			continue
+		if (!(antag_flag in P.client.prefs.be_special) || jobban_isbanned(P.ckey, list(antag_flag, ROLE_SYNDICATE)) || (antag_flag_override && jobban_isbanned(P.ckey, list(antag_flag_override, ROLE_SYNDICATE))))//are they willing and not antag-banned?
+			candidates.Remove(P)
+			continue
+		if ((exclusive_roles.len > 0) && !(P.mind.assigned_role in exclusive_roles)) // Is the rule exclusive to their job?
+			candidates.Remove(P)
+			continue
+
+/// Do your checks if the ruleset is ready to be executed here.
+/// Should ignore certain checks if forced is TRUE
+/datum/dynamic_ruleset/roundstart/ready(forced = FALSE)
+	return ..()
@@ -0,0 +1,110 @@
+//////////////////////////////////////////////
+//                                          //
+//            LATEJOIN RULESETS             //
+//                                          //
+//////////////////////////////////////////////
+
+/datum/dynamic_ruleset/latejoin/trim_candidates()
+	for(var/mob/P in candidates)
+		if (!P.client || !P.mind || !P.mind.assigned_role) // Are they connected?
+			candidates.Remove(P)
+			continue
+		if(!mode.check_age(P.client, minimum_required_age))
+			candidates.Remove(P)
+			continue
+		if (!(antag_flag in P.client.prefs.be_special) || jobban_isbanned(P.ckey, list(antag_flag, ROLE_SYNDICATE)) || (antag_flag_override && jobban_isbanned(P.ckey, list(antag_flag_override))))//are they willing and not antag-banned?
+			candidates.Remove(P)
+			continue
+		if (P.mind.assigned_role in restricted_roles) // Does their job allow for it?
+			candidates.Remove(P)
+			continue
+		if ((exclusive_roles.len > 0) && !(P.mind.assigned_role in exclusive_roles)) // Is the rule exclusive to their job?
+			candidates.Remove(P)
+			continue
+
+/datum/dynamic_ruleset/latejoin/ready(forced = 0)
+	if (!forced)
+		var/job_check = 0
+		if (enemy_roles.len > 0)
+			for (var/mob/M in mode.current_players[CURRENT_LIVING_PLAYERS])
+				if (M.stat == DEAD)
+					continue // Dead players cannot count as opponents
+				if (M.mind && M.mind.assigned_role && (M.mind.assigned_role in enemy_roles) && (!(M in candidates) || (M.mind.assigned_role in restricted_roles)))
+					job_check++ // Checking for "enemies" (such as sec officers). To be counters, they must either not be candidates to that rule, or have a job that restricts them from it
+
+		var/threat = round(mode.threat_level/10)
+		if (job_check < required_enemies[threat])
+			return FALSE
+	return ..()
+
+/datum/dynamic_ruleset/latejoin/execute()
+	var/mob/M = pick(candidates)
+	assigned += M.mind
+	M.mind.special_role = antag_flag
+	M.mind.add_antag_datum(antag_datum)
+	return TRUE
+
+//////////////////////////////////////////////
+//                                          //
+//           SYNDICATE TRAITORS             //
+//                                          //
+//////////////////////////////////////////////
+
+/datum/dynamic_ruleset/latejoin/infiltrator
+	name = "Syndicate Infiltrator"
+	antag_datum = /datum/antagonist/traitor
+	antag_flag = ROLE_TRAITOR
+	restricted_roles = list("AI", "Cyborg")
+	protected_roles = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster")
+	required_candidates = 1
+	weight = 7
+	cost = 5
+	requirements = list(40,30,20,10,10,10,10,10,10,10)
+	high_population_requirement = 10
+	repeatable = TRUE
+	flags = TRAITOR_RULESET
+
+//////////////////////////////////////////////
+//                                          //
+//       REVOLUTIONARY PROVOCATEUR          //
+//                                          //
+//////////////////////////////////////////////
+
+/datum/dynamic_ruleset/latejoin/provocateur
+	name = "Provocateur"
+	antag_datum = /datum/antagonist/rev/head
+	antag_flag = ROLE_REV_HEAD
+	antag_flag_override = ROLE_REV
+	restricted_roles = list("AI", "Cyborg", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster")
+	enemy_roles = list("AI", "Cyborg", "Security Officer","Detective","Head of Security", "Captain", "Warden")
+	required_enemies = list(2,2,1,1,1,1,1,0,0,0)
+	required_candidates = 1
+	weight = 2
+	cost = 20
+	requirements = list(101,101,70,40,30,20,20,20,20,20)
+	high_population_requirement = 50
+	flags = HIGHLANDER_RULESET
+	var/required_heads = 3
+
+/datum/dynamic_ruleset/latejoin/provocateur/ready(forced=FALSE)
+	if (forced)
+		required_heads = 1
+	if(!..())
+		return FALSE
+	var/head_check = 0
+	for(var/mob/player in mode.current_players[CURRENT_LIVING_PLAYERS])
+		if (player.mind.assigned_role in GLOB.command_positions)
+			head_check++
+	return (head_check >= required_heads)
+
+/datum/dynamic_ruleset/latejoin/provocateur/execute()
+	var/mob/M = pick(candidates)
+	assigned += M.mind
+	M.mind.special_role = antag_flag
+	var/datum/antagonist/rev/head/new_head = new()
+	new_head.give_flash = TRUE
+	new_head.give_hud = TRUE
+	new_head.remove_clumsy = TRUE
+	new_head = M.mind.add_antag_datum(new_head)
+	new_head.rev_team.max_headrevs = 1 // Only one revhead if it is latejoin.
+	return TRUE
@@ -0,0 +1,460 @@
+//////////////////////////////////////////////
+//                                          //
+//            MIDROUND RULESETS             //
+//                                          //
+//////////////////////////////////////////////
+
+/datum/dynamic_ruleset/midround // Can be drafted once in a while during a round
+	ruletype = "Midround"
+	/// If the ruleset should be restricted from ghost roles.
+	var/restrict_ghost_roles = TRUE
+	/// What type the ruleset is restricted to. 
+	var/required_type = /mob/living/carbon/human
+	var/list/living_players = list()
+	var/list/living_antags = list()
+	var/list/dead_players = list()
+	var/list/list_observers = list()
+
+/datum/dynamic_ruleset/midround/from_ghosts
+	weight = 0
+	/// Whether the ruleset should call generate_ruleset_body or not.
+	var/makeBody = TRUE
+
+/datum/dynamic_ruleset/midround/trim_candidates()
+	// Unlike the previous two types, these rulesets are not meant for /mob/dead/new_player
+	// And since I want those rulesets to be as flexible as possible, I'm not gonna put much here,
+	//
+	// All you need to know is that here, the candidates list contains 4 lists itself, indexed with the following defines:
+	// Candidates = list(CURRENT_LIVING_PLAYERS, CURRENT_LIVING_ANTAGS, CURRENT_DEAD_PLAYERS, CURRENT_OBSERVERS)
+	// So for example you can get the list of all current dead players with var/list/dead_players = candidates[CURRENT_DEAD_PLAYERS]
+	// Make sure to properly typecheck the mobs in those lists, as the dead_players list could contain ghosts, or dead players still in their bodies.
+	// We're still gonna trim the obvious (mobs without clients, jobbanned players, etc)
+    living_players = trim_list(mode.current_players[CURRENT_LIVING_PLAYERS])
+    living_antags = trim_list(mode.current_players[CURRENT_LIVING_ANTAGS])
+    dead_players = trim_list(mode.current_players[CURRENT_DEAD_PLAYERS])
+    list_observers = trim_list(mode.current_players[CURRENT_OBSERVERS])
+
+/datum/dynamic_ruleset/midround/proc/trim_list(list/L = list())
+	var/list/trimmed_list = L.Copy()
+	var/antag_name = initial(antag_flag)
+	for(var/mob/M in trimmed_list)
+		if (!istype(M, required_type))
+			trimmed_list.Remove(M)
+			continue
+		if (!M.client) // Are they connected?
+			trimmed_list.Remove(M)
+			continue
+		if(!mode.check_age(M.client, minimum_required_age))
+			trimmed_list.Remove(M)
+			continue
+		if (!(antag_name in M.client.prefs.be_special) || jobban_isbanned(M.ckey, list(antag_name, ROLE_SYNDICATE)))//are they willing and not antag-banned?
+			trimmed_list.Remove(M)
+			continue
+		if (M.mind)
+			if (restrict_ghost_roles && M.mind.assigned_role in GLOB.exp_specialmap[EXP_TYPE_SPECIAL]) // Are they playing a ghost role?
+				trimmed_list.Remove(M)
+				continue
+			if (M.mind.assigned_role in restricted_roles || HAS_TRAIT(M, TRAIT_MINDSHIELD)) // Does their job allow it or are they mindshielded?
+				trimmed_list.Remove(M)
+				continue
+			if ((exclusive_roles.len > 0) && !(M.mind.assigned_role in exclusive_roles)) // Is the rule exclusive to their job?
+				trimmed_list.Remove(M)
+				continue
+	return trimmed_list
+
+// You can then for example prompt dead players in execute() to join as strike teams or whatever
+// Or autotator someone
+
+// IMPORTANT, since /datum/dynamic_ruleset/midround may accept candidates from both living, dead, and even antag players, you need to manually check whether there are enough candidates
+// (see /datum/dynamic_ruleset/midround/autotraitor/ready(var/forced = FALSE) for example)
+/datum/dynamic_ruleset/midround/ready(forced = FALSE)
+	if (!forced)
+		var/job_check = 0
+		if (enemy_roles.len > 0)
+			for (var/mob/M in living_players)
+				if (M.stat == DEAD)
+					continue // Dead players cannot count as opponents
+				if (M.mind && M.mind.assigned_role && (M.mind.assigned_role in enemy_roles) && (!(M in candidates) || (M.mind.assigned_role in restricted_roles)))
+					job_check++ // Checking for "enemies" (such as sec officers). To be counters, they must either not be candidates to that rule, or have a job that restricts them from it
+
+		var/threat = round(mode.threat_level/10)
+		if (job_check < required_enemies[threat])
+			return FALSE
+	return TRUE
+
+/datum/dynamic_ruleset/midround/from_ghosts/execute()
+	var/list/possible_candidates = list()
+	possible_candidates.Add(dead_players)
+	possible_candidates.Add(list_observers)
+	send_applications(possible_candidates)
+	if(assigned.len > 0)
+		return TRUE
+	else
+		return FALSE
+
+/// This sends a poll to ghosts if they want to be a ghost spawn from a ruleset.
+/datum/dynamic_ruleset/midround/from_ghosts/proc/send_applications(list/possible_volunteers = list())
+	if (possible_volunteers.len <= 0) // This shouldn't happen, as ready() should return FALSE if there is not a single valid candidate
+		message_admins("Possible volunteers was 0. This shouldn't appear, because of ready(), unless you forced it!")
+		return
+	message_admins("Polling [possible_volunteers.len] players to apply for the [name] ruleset.")
+	log_game("DYNAMIC: Polling [possible_volunteers.len] players to apply for the [name] ruleset.")
+
+	candidates = pollGhostCandidates("The mode is looking for volunteers to become [antag_flag] for [name]", antag_flag, SSticker.mode, antag_flag, poll_time = 300)
+	
+	if(!candidates || candidates.len <= 0)
+		message_admins("The ruleset [name] received no applications.")
+		log_game("DYNAMIC: The ruleset [name] received no applications.")
+		mode.refund_threat(cost)
+		mode.threat_log += "[worldtime2text()]: Rule [name] refunded [cost] (no applications)"
+		mode.executed_rules -= src
+		return
+
+	message_admins("[candidates.len] players volunteered for the ruleset [name].")
+	log_game("DYNAMIC: [candidates.len] players volunteered for [name].")
+	review_applications()
+
+/// Here is where you can check if your ghost applicants are valid for the ruleset.
+/// Called by send_applications().
+/datum/dynamic_ruleset/midround/from_ghosts/proc/review_applications()
+	for (var/i = 1, i <= required_candidates, i++)
+		if(candidates.len <= 0)
+			if(i == 1)
+				// We have found no candidates so far and we are out of applicants.
+				mode.refund_threat(cost)
+				mode.threat_log += "[worldtime2text()]: Rule [name] refunded [cost] (all applications invalid)"
+				mode.executed_rules -= src
+			break
+		var/mob/applicant = pick(candidates)
+		candidates -= applicant
+		if(!isobserver(applicant))
+			if(applicant.stat == DEAD) // Not an observer? If they're dead, make them one.
+				applicant = applicant.ghostize(FALSE)
+			else // Not dead? Disregard them, pick a new applicant
+				i--
+				continue
+
+		if(!applicant)
+			i--
+			continue
+
+		var/mob/new_character = applicant
+
+		if (makeBody)
+			new_character = generate_ruleset_body(applicant)
+
+		finish_setup(new_character, i)
+		assigned += applicant
+		notify_ghosts("[new_character] has been picked for the ruleset [name]!", source = new_character, action = NOTIFY_ORBIT, header="Something Interesting!")
+
+/datum/dynamic_ruleset/midround/from_ghosts/proc/generate_ruleset_body(mob/applicant)
+	var/mob/living/carbon/human/new_character = makeBody(applicant)
+	new_character.dna.remove_all_mutations()
+	return new_character
+
+/datum/dynamic_ruleset/midround/from_ghosts/proc/finish_setup(mob/new_character, index)
+	var/datum/antagonist/new_role = new antag_datum()
+	setup_role(new_role)
+	new_character.mind.add_antag_datum(new_role)
+	new_character.mind.special_role = antag_flag
+
+/datum/dynamic_ruleset/midround/from_ghosts/proc/setup_role(datum/antagonist/new_role)
+	return
+
+//////////////////////////////////////////////
+//                                          //
+//           SYNDICATE TRAITORS             //
+//                                          //
+//////////////////////////////////////////////
+
+/datum/dynamic_ruleset/midround/autotraitor
+	name = "Syndicate Sleeper Agent"
+	antag_datum = /datum/antagonist/traitor
+	antag_flag = ROLE_TRAITOR
+	restricted_roles = list("AI", "Cyborg", "Positronic Brain")
+	protected_roles = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster")
+	required_candidates = 1
+	weight = 7
+	cost = 10
+	requirements = list(50,40,30,20,10,10,10,10,10,10)
+	repeatable = TRUE
+	high_population_requirement = 10
+	flags = TRAITOR_RULESET
+
+/datum/dynamic_ruleset/midround/autotraitor/acceptable(population = 0, threat = 0)
+	var/player_count = mode.current_players[CURRENT_LIVING_PLAYERS].len
+	var/antag_count = mode.current_players[CURRENT_LIVING_ANTAGS].len
+	var/max_traitors = round(player_count / 10) + 1
+	if ((antag_count < max_traitors) && prob(mode.threat_level))//adding traitors if the antag population is getting low
+		return ..()
+	else
+		return FALSE
+
+/datum/dynamic_ruleset/midround/autotraitor/trim_candidates()
+	..()
+	for(var/mob/living/player in living_players)
+		if(issilicon(player)) // Your assigned role doesn't change when you are turned into a silicon.
+			living_players -= player 
+			continue
+		if(is_centcom_level(player.z))
+			living_players -= player // We don't autotator people in CentCom
+			continue
+		if(player.mind && (player.mind.special_role || player.mind.antag_datums?.len > 0))
+			living_players -= player // We don't autotator people with roles already
+
+/datum/dynamic_ruleset/midround/autotraitor/ready(forced = FALSE)
+	if (required_candidates > living_players.len)
+		return FALSE
+	return ..()
+
+/datum/dynamic_ruleset/midround/autotraitor/execute()
+	var/mob/M = pick(living_players)
+	assigned += M
+	living_players -= M
+	var/datum/antagonist/traitor/newTraitor = new
+	M.mind.add_antag_datum(newTraitor)
+	return TRUE
+
+
+//////////////////////////////////////////////
+//                                          //
+//         Malfunctioning AI                //
+//                              		    //
+//////////////////////////////////////////////
+
+/datum/dynamic_ruleset/midround/malf
+	name = "Malfunctioning AI"
+	antag_datum = /datum/antagonist/traitor
+	antag_flag = ROLE_MALF
+	enemy_roles = list("Security Officer", "Warden","Detective","Head of Security", "Captain", "Scientist", "Chemist", "Research Director", "Chief Engineer")
+	exclusive_roles = list("AI")
+	required_enemies = list(4,4,4,4,4,4,2,2,2,0)
+	required_candidates = 1
+	weight = 3
+	cost = 35
+	requirements = list(101,101,80,70,60,60,50,50,40,40)
+	high_population_requirement = 35
+	required_type = /mob/living/silicon/ai
+	var/ion_announce = 33
+	var/removeDontImproveChance = 10
+
+/datum/dynamic_ruleset/midround/malf/trim_candidates()
+	..()
+	candidates = candidates[CURRENT_LIVING_PLAYERS]
+	for(var/mob/living/player in candidates)
+		if(!isAI(player))
+			candidates -= player
+			continue
+		if(is_centcom_level(player.z))
+			candidates -= player
+			continue
+		if(player.mind && (player.mind.special_role || player.mind.antag_datums?.len > 0))
+			candidates -= player
+
+/datum/dynamic_ruleset/midround/malf/execute()
+	if(!candidates || !candidates.len)
+		return FALSE
+	var/mob/living/silicon/ai/M = pick(candidates)
+	candidates -= M
+	assigned += M.mind
+	var/datum/antagonist/traitor/AI = new
+	M.mind.special_role = antag_flag
+	M.mind.add_antag_datum(AI)
+	if(prob(ion_announce))
+		priority_announce("Ion storm detected near the station. Please check all AI-controlled equipment for errors.", "Anomaly Alert", 'sound/ai/ionstorm.ogg')
+		if(prob(removeDontImproveChance))
+			M.replace_random_law(generate_ion_law(), list(LAW_INHERENT, LAW_SUPPLIED, LAW_ION))
+		else
+			M.add_ion_law(generate_ion_law())
+	return TRUE
+
+//////////////////////////////////////////////
+//                                          //
+//              WIZARD (GHOST)              //
+//                                          //
+//////////////////////////////////////////////
+
+/datum/dynamic_ruleset/midround/from_ghosts/wizard
+	name = "Wizard"
+	antag_datum = /datum/antagonist/wizard
+	antag_flag = ROLE_WIZARD
+	enemy_roles = list("Security Officer","Detective","Head of Security", "Captain")
+	required_enemies = list(2,2,1,1,1,1,1,0,0,0)
+	required_candidates = 1
+	weight = 1
+	cost = 20
+	requirements = list(90,90,70,40,30,20,10,10,10,10)
+	high_population_requirement = 50
+	repeatable = TRUE
+
+/datum/dynamic_ruleset/midround/from_ghosts/wizard/ready(forced = FALSE)
+	if (required_candidates > (dead_players.len + list_observers.len))
+		return FALSE
+	if(GLOB.wizardstart.len == 0)
+		log_admin("Cannot accept Wizard ruleset. Couldn't find any wizard spawn points.")
+		message_admins("Cannot accept Wizard ruleset. Couldn't find any wizard spawn points.")
+		return FALSE
+	return ..()
+
+/datum/dynamic_ruleset/midround/from_ghosts/wizard/finish_setup(mob/new_character, index)
+	..()
+	new_character.forceMove(pick(GLOB.wizardstart))
+
+//////////////////////////////////////////////
+//                                          //
+//          NUCLEAR OPERATIVES (MIDROUND)   //
+//                                          //
+//////////////////////////////////////////////
+
+/datum/dynamic_ruleset/midround/from_ghosts/nuclear
+	name = "Nuclear Assault"
+	antag_flag = ROLE_OPERATIVE
+	antag_datum = /datum/antagonist/nukeop
+	enemy_roles = list("AI", "Cyborg", "Security Officer", "Warden","Detective","Head of Security", "Captain")
+	required_enemies = list(3,3,3,3,3,2,1,1,0,0)
+	required_candidates = 5
+	weight = 5
+	cost = 35
+	requirements = list(90,90,90,80,60,40,30,20,10,10)
+	high_population_requirement = 10
+	var/operative_cap = list(2,2,3,3,4,5,5,5,5,5)
+	var/datum/team/nuclear/nuke_team
+	flags = HIGHLANDER_RULESET
+
+/datum/dynamic_ruleset/midround/from_ghosts/nuclear/acceptable(population=0, threat=0)
+	if (locate(/datum/dynamic_ruleset/roundstart/nuclear) in mode.executed_rules)
+		return FALSE // Unavailable if nuke ops were already sent at roundstart
+	var/indice_pop = min(10,round(living_players.len/5)+1)
+	required_candidates = operative_cap[indice_pop]
+	return ..()
+
+/datum/dynamic_ruleset/midround/from_ghosts/nuclear/ready(forced = FALSE)
+	if (required_candidates > (dead_players.len + list_observers.len))
+		return FALSE
+	return ..()
+
+/datum/dynamic_ruleset/midround/from_ghosts/nuclear/finish_setup(mob/new_character, index)
+	new_character.mind.special_role = "Nuclear Operative"
+	new_character.mind.assigned_role = "Nuclear Operative"
+	if (index == 1) // Our first guy is the leader
+		var/datum/antagonist/nukeop/leader/new_role = new
+		nuke_team = new_role.nuke_team
+		new_character.mind.add_antag_datum(new_role)
+	else
+		return ..()
+
+//////////////////////////////////////////////
+//                                          //
+//              BLOB (GHOST)                //
+//                                          //
+//////////////////////////////////////////////
+
+/datum/dynamic_ruleset/midround/from_ghosts/blob
+	name = "Blob"
+	antag_datum = /datum/antagonist/blob
+	antag_flag = ROLE_BLOB
+	enemy_roles = list("Security Officer", "Detective", "Head of Security", "Captain")
+	required_enemies = list(2,2,1,1,1,1,1,0,0,0)
+	required_candidates = 1
+	weight = 4
+	cost = 10
+	requirements = list(101,101,101,80,60,50,30,20,10,10)
+	high_population_requirement = 50
+	repeatable = TRUE
+
+/datum/dynamic_ruleset/midround/from_ghosts/blob/generate_ruleset_body(mob/applicant)
+	var/body = applicant.become_overmind()
+	return body
+
+//////////////////////////////////////////////
+//                                          //
+//           XENOMORPH (GHOST)              //
+//                                          //
+//////////////////////////////////////////////
+
+/datum/dynamic_ruleset/midround/from_ghosts/xenomorph
+	name = "Alien Infestation"
+	antag_datum = /datum/antagonist/xeno
+	antag_flag = ROLE_ALIEN
+	enemy_roles = list("Security Officer", "Detective", "Head of Security", "Captain")
+	required_enemies = list(2,2,1,1,1,1,1,0,0,0)
+	required_candidates = 1
+	weight = 3
+	cost = 10
+	requirements = list(101,101,101,70,50,40,20,15,10,10)
+	high_population_requirement = 50
+	repeatable = TRUE
+	var/list/vents = list()
+
+/datum/dynamic_ruleset/midround/from_ghosts/xenomorph/execute()
+	// 50% chance of being incremented by one
+	required_candidates += prob(50)
+	for(var/obj/machinery/atmospherics/components/unary/vent_pump/temp_vent in GLOB.machines)
+		if(QDELETED(temp_vent))
+			continue
+		if(is_station_level(temp_vent.loc.z) && !temp_vent.welded)
+			var/datum/pipeline/temp_vent_parent = temp_vent.parents[1]
+			if(!temp_vent_parent)
+				continue // No parent vent
+			// Stops Aliens getting stuck in small networks.
+			// See: Security, Virology
+			if(temp_vent_parent.other_atmosmch.len > 20)
+				vents += temp_vent
+	if(!vents.len)
+		return FALSE
+	. = ..()
+
+/datum/dynamic_ruleset/midround/from_ghosts/xenomorph/generate_ruleset_body(mob/applicant)
+	var/obj/vent = pick_n_take(vents)
+	var/mob/living/carbon/alien/larva/new_xeno = new(vent.loc)
+	new_xeno.key = applicant.key
+	message_admins("[ADMIN_LOOKUPFLW(new_xeno)] has been made into an alien by the midround ruleset.")
+	log_game("DYNAMIC: [key_name(new_xeno)] was spawned as an alien by the midround ruleset.")
+	return new_xeno
+
+//////////////////////////////////////////////
+//                                          //
+//           NIGHTMARE (GHOST)              //
+//                                          //
+//////////////////////////////////////////////
+
+/datum/dynamic_ruleset/midround/from_ghosts/nightmare
+	name = "Nightmare"
+	antag_datum = /datum/antagonist/nightmare
+	antag_flag = "Nightmare"
+	antag_flag_override = ROLE_ALIEN
+	enemy_roles = list("Security Officer", "Detective", "Head of Security", "Captain")
+	required_enemies = list(2,2,1,1,1,1,1,0,0,0)
+	required_candidates = 1
+	weight = 3
+	cost = 10
+	requirements = list(101,101,101,70,50,40,20,15,10,10)
+	high_population_requirement = 50
+	repeatable = TRUE
+	var/list/spawn_locs = list()
+
+/datum/dynamic_ruleset/midround/from_ghosts/nightmare/execute()
+	for(var/X in GLOB.xeno_spawn)
+		var/turf/T = X
+		var/light_amount = T.get_lumcount()
+		if(light_amount < SHADOW_SPECIES_LIGHT_THRESHOLD)
+			spawn_locs += T
+	if(!spawn_locs.len)
+		return FALSE
+	. = ..()
+
+/datum/dynamic_ruleset/midround/from_ghosts/nightmare/generate_ruleset_body(mob/applicant)
+	var/datum/mind/player_mind = new /datum/mind(applicant.key)
+	player_mind.active = TRUE
+
+	var/mob/living/carbon/human/S = new (pick(spawn_locs))
+	player_mind.transfer_to(S)
+	player_mind.assigned_role = "Nightmare"
+	player_mind.special_role = "Nightmare"
+	player_mind.add_antag_datum(/datum/antagonist/nightmare)
+	S.set_species(/datum/species/shadow/nightmare)
+
+	playsound(S, 'sound/magic/ethereal_exit.ogg', 50, 1, -1)
+	message_admins("[ADMIN_LOOKUPFLW(S)] has been made into a Nightmare by the midround ruleset.")
+	log_game("DYNAMIC: [key_name(S)] was spawned as a Nightmare by the midround ruleset.")
+	return S
@@ -0,0 +1,732 @@
+
+//////////////////////////////////////////////
+//                                          //
+//           SYNDICATE TRAITORS             //
+//                                          //
+//////////////////////////////////////////////
+
+/datum/dynamic_ruleset/roundstart/traitor
+	name = "Traitors"
+	persistent = TRUE
+	antag_flag = ROLE_TRAITOR
+	antag_datum = /datum/antagonist/traitor/
+	minimum_required_age = 0
+	protected_roles = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster", "Cyborg")
+	restricted_roles = list("Cyborg")
+	required_candidates = 1
+	weight = 5
+	cost = 10
+	requirements = list(10,10,10,10,10,10,10,10,10,10)
+	high_population_requirement = 10
+	var/autotraitor_cooldown = 450 // 15 minutes (ticks once per 2 sec)
+
+/datum/dynamic_ruleset/roundstart/traitor/pre_execute()
+	var/traitor_scaling_coeff = 10 - max(0,round(mode.threat_level/10)-5) // Above 50 threat level, coeff goes down by 1 for every 10 levels
+	var/num_traitors = min(round(mode.candidates.len / traitor_scaling_coeff) + 1, candidates.len)
+	for (var/i = 1 to num_traitors)
+		var/mob/M = pick(candidates)
+		candidates -= M
+		assigned += M.mind
+		M.mind.special_role = ROLE_TRAITOR
+		M.mind.restricted_roles = restricted_roles
+	return TRUE
+
+/datum/dynamic_ruleset/roundstart/traitor/rule_process()
+	if (autotraitor_cooldown > 0)
+		autotraitor_cooldown--
+	else
+		autotraitor_cooldown = 450 // 15 minutes
+		message_admins("Checking if we can turn someone into a traitor.")
+		log_game("DYNAMIC: Checking if we can turn someone into a traitor.")
+		mode.picking_specific_rule(/datum/dynamic_ruleset/midround/autotraitor)
+
+//////////////////////////////////////////
+//                                      //
+//           BLOOD BROTHERS             //
+//                                      //
+//////////////////////////////////////////
+
+/datum/dynamic_ruleset/roundstart/traitorbro
+	name = "Blood Brothers"
+	antag_flag = ROLE_BROTHER
+	antag_datum = /datum/antagonist/brother/
+	restricted_roles = list("AI", "Cyborg")
+	protected_roles = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster")
+	required_candidates = 2
+	weight = 4
+	cost = 10
+	requirements = list(40,30,30,20,20,15,15,15,10,10)
+	high_population_requirement = 15
+	var/list/datum/team/brother_team/pre_brother_teams = list()
+	var/const/team_amount = 2 // Hard limit on brother teams if scaling is turned off
+	var/const/min_team_size = 2
+
+/datum/dynamic_ruleset/roundstart/traitorbro/pre_execute()
+	var/num_teams = team_amount
+	var/bsc = CONFIG_GET(number/brother_scaling_coeff)
+	if(bsc)
+		num_teams = max(1, round(num_players() / bsc))
+
+	for(var/j = 1 to num_teams)
+		if(candidates.len < min_team_size || candidates.len < required_candidates)
+			break
+		var/datum/team/brother_team/team = new
+		var/team_size = prob(10) ? min(3, candidates.len) : 2
+		for(var/k = 1 to team_size)
+			var/mob/bro = pick(candidates)
+			candidates -= bro
+			assigned += bro.mind
+			team.add_member(bro.mind)
+			bro.mind.special_role = "brother"
+			bro.mind.restricted_roles = restricted_roles
+		pre_brother_teams += team
+	return TRUE
+
+/datum/dynamic_ruleset/roundstart/traitorbro/execute()
+	for(var/datum/team/brother_team/team in pre_brother_teams)
+		team.pick_meeting_area()
+		team.forge_brother_objectives()
+		for(var/datum/mind/M in team.members)
+			M.add_antag_datum(/datum/antagonist/brother, team)
+		team.update_name()
+	mode.brother_teams += pre_brother_teams
+	return TRUE
+
+//////////////////////////////////////////////
+//                                          //
+//               CHANGELINGS                //
+//                                          //
+//////////////////////////////////////////////
+
+/datum/dynamic_ruleset/roundstart/changeling
+	name = "Changelings"
+	antag_flag = ROLE_CHANGELING
+	antag_datum = /datum/antagonist/changeling
+	restricted_roles = list("AI", "Cyborg")
+	protected_roles = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster")
+	required_candidates = 1
+	weight = 3
+	cost = 30
+	requirements = list(80,70,60,50,40,20,20,10,10,10)
+	high_population_requirement = 10
+	var/team_mode_probability = 30
+
+/datum/dynamic_ruleset/roundstart/changeling/pre_execute()
+	var/num_changelings = min(round(mode.candidates.len / 10) + 1, candidates.len)
+	for (var/i = 1 to num_changelings)
+		var/mob/M = pick(candidates)
+		candidates -= M
+		assigned += M.mind
+		M.mind.restricted_roles = restricted_roles
+		M.mind.special_role = ROLE_CHANGELING
+	return TRUE
+
+/datum/dynamic_ruleset/roundstart/changeling/execute()
+	var/team_mode = FALSE
+	if(prob(team_mode_probability)) 
+		team_mode = TRUE
+		var/list/team_objectives = subtypesof(/datum/objective/changeling_team_objective)
+		var/list/possible_team_objectives = list()
+		for(var/T in team_objectives)
+			var/datum/objective/changeling_team_objective/CTO = T
+			if(assigned.len >= initial(CTO.min_lings))
+				possible_team_objectives += T
+
+		if(possible_team_objectives.len && prob(20*assigned.len))
+			GLOB.changeling_team_objective_type = pick(possible_team_objectives)
+	for(var/datum/mind/changeling in assigned)
+		var/datum/antagonist/changeling/new_antag = new antag_datum()
+		new_antag.team_mode = team_mode
+		changeling.add_antag_datum(new_antag)
+	return TRUE
+
+//////////////////////////////////////////////
+//                                          //
+//               WIZARDS                    //
+//                                          //
+//////////////////////////////////////////////
+
+// Dynamic is a wonderful thing that adds wizards to every round and then adds even more wizards during the round.
+/datum/dynamic_ruleset/roundstart/wizard
+	name = "Wizard"
+	antag_flag = ROLE_WIZARD
+	antag_datum = /datum/antagonist/wizard
+	minimum_required_age = 14
+	restricted_roles = list("Head of Security", "Captain") // Just to be sure that a wizard getting picked won't ever imply a Captain or HoS not getting drafted
+	required_candidates = 1
+	weight = 1
+	cost = 30
+	requirements = list(90,90,70,40,30,20,10,10,10,10)
+	high_population_requirement = 10
+	var/list/roundstart_wizards = list()
+
+/datum/dynamic_ruleset/roundstart/wizard/acceptable(population=0, threat=0)
+	if(GLOB.wizardstart.len == 0)
+		log_admin("Cannot accept Wizard ruleset. Couldn't find any wizard spawn points.")
+		message_admins("Cannot accept Wizard ruleset. Couldn't find any wizard spawn points.")
+		return FALSE
+	return ..()
+
+/datum/dynamic_ruleset/roundstart/wizard/pre_execute()
+	if(GLOB.wizardstart.len == 0)
+		return FALSE
+	
+	var/mob/M = pick(candidates)
+	if (M)
+		candidates -= M
+		assigned += M.mind
+		M.mind.assigned_role = ROLE_WIZARD
+		M.mind.special_role = ROLE_WIZARD
+	
+	return TRUE
+
+/datum/dynamic_ruleset/roundstart/wizard/execute()
+	for(var/datum/mind/M in assigned)
+		M.current.forceMove(pick(GLOB.wizardstart))
+		M.add_antag_datum(new antag_datum())
+	return TRUE
+	
+//////////////////////////////////////////////
+//                                          //
+//                BLOOD CULT                //
+//                                          //
+//////////////////////////////////////////////
+
+/datum/dynamic_ruleset/roundstart/bloodcult
+	name = "Blood Cult"
+	antag_flag = ROLE_CULTIST
+	antag_datum = /datum/antagonist/cult
+	minimum_required_age = 14
+	restricted_roles = list("AI", "Cyborg")
+	protected_roles = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster")
+	required_candidates = 2
+	weight = 3
+	cost = 30
+	requirements = list(100,90,80,60,40,30,10,10,10,10)
+	high_population_requirement = 10
+	pop_per_requirement = 5
+	flags = HIGHLANDER_RULESET
+	var/cultist_cap = list(2,2,2,3,3,4,4,4,4,4)
+	var/datum/team/cult/main_cult
+
+/datum/dynamic_ruleset/roundstart/bloodcult/ready(forced = FALSE)
+	var/indice_pop = min(10,round(mode.roundstart_pop_ready/pop_per_requirement)+1)
+	required_candidates = cultist_cap[indice_pop]
+	. = ..()
+
+/datum/dynamic_ruleset/roundstart/bloodcult/pre_execute()
+	var/indice_pop = min(10,round(mode.roundstart_pop_ready/pop_per_requirement)+1)
+	var/cultists = cultist_cap[indice_pop]
+	for(var/cultists_number = 1 to cultists)
+		if(candidates.len <= 0)
+			break
+		var/mob/M = pick(candidates)
+		candidates -= M
+		assigned += M.mind
+		M.mind.special_role = ROLE_CULTIST
+		M.mind.restricted_roles = restricted_roles
+	return TRUE
+
+/datum/dynamic_ruleset/roundstart/bloodcult/execute()
+	main_cult = new
+	for(var/datum/mind/M in assigned)
+		var/datum/antagonist/cult/new_cultist = new antag_datum()
+		new_cultist.cult_team = main_cult
+		new_cultist.give_equipment = TRUE
+		M.add_antag_datum(new_cultist)	
+	main_cult.setup_objectives()
+	return TRUE
+
+/datum/dynamic_ruleset/roundstart/bloodcult/round_result()
+	..()
+	if(main_cult.check_cult_victory())
+		SSticker.mode_result = "win - cult win"
+		SSticker.news_report = CULT_SUMMON
+	else
+		SSticker.mode_result = "loss - staff stopped the cult"
+		SSticker.news_report = CULT_FAILURE
+
+//////////////////////////////////////////////
+//                                          //
+//          NUCLEAR OPERATIVES              //
+//                                          //
+//////////////////////////////////////////////
+
+/datum/dynamic_ruleset/roundstart/nuclear
+	name = "Nuclear Emergency"
+	antag_flag = ROLE_OPERATIVE
+	antag_datum = /datum/antagonist/nukeop
+	var/datum/antagonist/antag_leader_datum = /datum/antagonist/nukeop/leader
+	minimum_required_age = 14
+	restricted_roles = list("Head of Security", "Captain") // Just to be sure that a nukie getting picked won't ever imply a Captain or HoS not getting drafted
+	required_candidates = 5
+	weight = 3
+	cost = 40
+	requirements = list(90,90,90,80,60,40,30,20,10,10)
+	high_population_requirement = 10
+	pop_per_requirement = 5
+	flags = HIGHLANDER_RULESET
+	var/operative_cap = list(2,2,2,3,3,3,4,4,5,5)
+	var/datum/team/nuclear/nuke_team
+
+/datum/dynamic_ruleset/roundstart/nuclear/ready(forced = FALSE)
+	var/indice_pop = min(10,round(mode.roundstart_pop_ready/pop_per_requirement)+1)
+	required_candidates = operative_cap[indice_pop]
+	. = ..()
+
+/datum/dynamic_ruleset/roundstart/nuclear/pre_execute()
+	// If ready() did its job, candidates should have 5 or more members in it
+
+	var/indice_pop = min(10,round(mode.roundstart_pop_ready/5)+1)
+	var/operatives = operative_cap[indice_pop]
+	for(var/operatives_number = 1 to operatives)
+		if(candidates.len <= 0)
+			break
+		var/mob/M = pick(candidates)
+		candidates -= M
+		assigned += M.mind
+		M.mind.assigned_role = "Nuclear Operative"
+		M.mind.special_role = "Nuclear Operative"
+	return TRUE
+
+/datum/dynamic_ruleset/roundstart/nuclear/execute()
+	var/leader = TRUE
+	for(var/datum/mind/M in assigned)
+		if (leader)
+			leader = FALSE
+			var/datum/antagonist/nukeop/leader/new_op = M.add_antag_datum(antag_leader_datum)
+			nuke_team = new_op.nuke_team
+		else
+			var/datum/antagonist/nukeop/new_op = new antag_datum()
+			M.add_antag_datum(new_op)
+	return TRUE
+
+/datum/dynamic_ruleset/roundstart/nuclear/round_result()
+	var result = nuke_team.get_result()
+	switch(result)
+		if(NUKE_RESULT_FLUKE)
+			SSticker.mode_result = "loss - syndicate nuked - disk secured"
+			SSticker.news_report = NUKE_SYNDICATE_BASE
+		if(NUKE_RESULT_NUKE_WIN)
+			SSticker.mode_result = "win - syndicate nuke"
+			SSticker.news_report = STATION_NUKED
+		if(NUKE_RESULT_NOSURVIVORS)
+			SSticker.mode_result = "halfwin - syndicate nuke - did not evacuate in time"
+			SSticker.news_report = STATION_NUKED
+		if(NUKE_RESULT_WRONG_STATION)
+			SSticker.mode_result = "halfwin - blew wrong station"
+			SSticker.news_report = NUKE_MISS
+		if(NUKE_RESULT_WRONG_STATION_DEAD)
+			SSticker.mode_result = "halfwin - blew wrong station - did not evacuate in time"
+			SSticker.news_report = NUKE_MISS
+		if(NUKE_RESULT_CREW_WIN_SYNDIES_DEAD)
+			SSticker.mode_result = "loss - evacuation - disk secured - syndi team dead"
+			SSticker.news_report = OPERATIVES_KILLED
+		if(NUKE_RESULT_CREW_WIN)
+			SSticker.mode_result = "loss - evacuation - disk secured"
+			SSticker.news_report = OPERATIVES_KILLED
+		if(NUKE_RESULT_DISK_LOST)
+			SSticker.mode_result = "halfwin - evacuation - disk not secured"
+			SSticker.news_report = OPERATIVE_SKIRMISH
+		if(NUKE_RESULT_DISK_STOLEN)
+			SSticker.mode_result = "halfwin - detonation averted"
+			SSticker.news_report = OPERATIVE_SKIRMISH
+		else
+			SSticker.mode_result = "halfwin - interrupted"
+			SSticker.news_report = OPERATIVE_SKIRMISH
+
+//////////////////////////////////////////////
+//                                          //
+//               REVS		                //
+//                                          //
+//////////////////////////////////////////////
+
+/datum/dynamic_ruleset/roundstart/delayed/revs
+	name = "Revolution"
+	persistent = TRUE
+	antag_flag = ROLE_REV_HEAD
+	antag_flag_override = ROLE_REV
+	antag_datum = /datum/antagonist/rev/head
+	minimum_required_age = 14
+	restricted_roles = list("AI", "Cyborg", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster")
+	required_candidates = 3
+	weight = 2
+	cost = 35
+	requirements = list(101,101,70,40,30,20,10,10,10,10)
+	high_population_requirement = 10
+	delay = 5 MINUTES
+	flags = HIGHLANDER_RULESET
+	// I give up, just there should be enough heads with 35 players...
+	minimum_players = 35
+	var/datum/team/revolution/revolution
+	var/finished = 0
+
+/datum/dynamic_ruleset/roundstart/delayed/revs/execute()
+	var/max_canditates = 4
+	revolution = new()
+	for(var/i = 1 to max_canditates)
+		if(candidates.len <= 0)
+			break
+		var/mob/M = pick(candidates)
+		candidates -= M
+		assigned += M.mind
+		M.mind.restricted_roles = restricted_roles
+		M.mind.special_role = antag_flag
+		var/datum/antagonist/rev/head/new_head = new antag_datum()
+		new_head.give_flash = TRUE
+		new_head.give_hud = TRUE
+		new_head.remove_clumsy = TRUE
+		M.mind.add_antag_datum(new_head,revolution)
+
+	revolution.update_objectives()
+	revolution.update_heads()
+	SSshuttle.registerHostileEnvironment(src)
+
+	return TRUE
+	
+/datum/dynamic_ruleset/roundstart/delayed/revs/rule_process()
+	if(check_rev_victory())
+		finished = 1
+	else if(check_heads_victory())
+		finished = 2
+	return
+
+/datum/dynamic_ruleset/roundstart/delayed/revs/check_finished()
+	if(CONFIG_GET(keyed_list/continuous)["revolution"])
+		if(finished)
+			SSshuttle.clearHostileEnvironment(src)
+		return ..()
+	if(finished != 0)
+		return TRUE
+	else
+		return ..()
+
+/datum/dynamic_ruleset/roundstart/delayed/revs/proc/check_rev_victory()
+	for(var/datum/objective/mutiny/objective in revolution.objectives)
+		if(!(objective.check_completion()))
+			return FALSE
+	return TRUE
+
+/datum/dynamic_ruleset/roundstart/delayed/revs/proc/check_heads_victory()
+	for(var/datum/mind/rev_mind in revolution.head_revolutionaries())
+		var/turf/T = get_turf(rev_mind.current)
+		if(!considered_afk(rev_mind) && considered_alive(rev_mind) && is_station_level(T.z))
+			if(ishuman(rev_mind.current) || ismonkey(rev_mind.current))
+				return FALSE
+	return TRUE
+
+/datum/dynamic_ruleset/roundstart/delayed/revs/round_result()
+	if(finished == 1)
+		SSticker.mode_result = "win - heads killed"
+		SSticker.news_report = REVS_WIN
+	else if(finished == 2)
+		SSticker.mode_result = "loss - rev heads killed"
+		SSticker.news_report = REVS_LOSE
+
+// Admin only rulesets. The threat requirement is 101 so it is not possible to roll them.
+
+//////////////////////////////////////////////
+//                                          //
+//               EXTENDED                   //
+//                                          //
+//////////////////////////////////////////////
+
+/datum/dynamic_ruleset/roundstart/extended
+	name = "Extended"
+	antag_flag = null
+	antag_datum = null
+	restricted_roles = list()
+	required_candidates = 0
+	weight = 3
+	cost = 0
+	requirements = list(101,101,101,101,101,101,101,101,101,101)
+	high_population_requirement = 101
+
+/datum/dynamic_ruleset/roundstart/extended/pre_execute()
+	message_admins("Starting a round of extended.")
+	log_game("Starting a round of extended.")
+	mode.spend_threat(mode.threat)
+	return TRUE
+
+//////////////////////////////////////////////
+//                                          //
+//               CLOCKCULT                  //
+//                                          //
+//////////////////////////////////////////////
+
+/datum/dynamic_ruleset/roundstart/clockcult
+	name = "Clockcult"
+	antag_flag = ROLE_SERVANT_OF_RATVAR
+	antag_datum = /datum/antagonist/clockcult
+	restricted_roles = list("AI", "Cyborg", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster")
+	required_candidates = 4
+	weight = 3
+	cost = 0
+	requirements = list(101,101,101,101,101,101,101,101,101,101)
+	high_population_requirement = 101
+	flags = HIGHLANDER_RULESET
+	var/ark_time
+
+/datum/dynamic_ruleset/roundstart/clockcult/pre_execute()
+	var/list/errorList = list()
+	var/list/reebes = SSmapping.LoadGroup(errorList, "Reebe", "map_files/generic", "City_of_Cogs.dmm", default_traits = ZTRAITS_REEBE, silent = TRUE)
+	if(errorList.len)
+		message_admins("Reebe failed to load!")
+		log_game("Reebe failed to load!")
+		return FALSE
+	for(var/datum/parsed_map/PM in reebes)
+		PM.initTemplateBounds()
+
+	var/starter_servants = 4
+	var/number_players = num_players()
+	if(number_players > 30)
+		number_players -= 30
+		starter_servants += round(number_players / 10)
+	starter_servants = min(starter_servants, 8)
+	for (var/i in 1 to starter_servants)
+		var/mob/servant = pick(candidates)
+		candidates -= servant
+		assigned += servant.mind
+		servant.mind.assigned_role = ROLE_SERVANT_OF_RATVAR
+		servant.mind.special_role = ROLE_SERVANT_OF_RATVAR
+	ark_time = 30 + round((number_players / 5))
+	ark_time = min(ark_time, 35)
+	return TRUE
+
+/datum/dynamic_ruleset/roundstart/clockcult/execute()
+	var/list/spread_out_spawns = GLOB.servant_spawns.Copy()
+	for(var/datum/mind/servant in assigned)
+		var/mob/S = servant.current
+		if(!spread_out_spawns.len)
+			spread_out_spawns = GLOB.servant_spawns.Copy()
+		log_game("[key_name(servant)] was made an initial servant of Ratvar")
+		var/turf/T = pick_n_take(spread_out_spawns)
+		S.forceMove(T)
+		greet_servant(S)
+		equip_servant(S)
+		add_servant_of_ratvar(S, TRUE)
+	var/obj/structure/destructible/clockwork/massive/celestial_gateway/G = GLOB.ark_of_the_clockwork_justiciar //that's a mouthful
+	G.final_countdown(ark_time)
+	return TRUE
+
+/datum/dynamic_ruleset/roundstart/clockcult/proc/greet_servant(mob/M) //Description of their role
+	if(!M)
+		return 0
+	to_chat(M, "<span class='bold large_brass'>You are a servant of Ratvar, the Clockwork Justiciar!</span>")
+	to_chat(M, "<span class='brass'>You have approximately <b>[ark_time]</b> minutes until the Ark activates.</span>")
+	to_chat(M, "<span class='brass'>Unlock <b>Script</b> scripture by converting a new servant.</span>")
+	to_chat(M, "<span class='brass'><b>Application</b> scripture will be unlocked halfway until the Ark's activation.</span>")
+	M.playsound_local(get_turf(M), 'sound/ambience/antag/clockcultalr.ogg', 100, FALSE, pressure_affected = FALSE)
+	return 1
+
+/datum/dynamic_ruleset/roundstart/clockcult/proc/equip_servant(mob/living/M) //Grants a clockwork slab to the mob, with one of each component
+	if(!M || !ishuman(M))
+		return FALSE
+	var/mob/living/carbon/human/L = M
+	L.equipOutfit(/datum/outfit/servant_of_ratvar)
+	var/obj/item/clockwork/slab/S = new
+	var/slot = "At your feet"
+	var/list/slots = list("In your left pocket" = SLOT_L_STORE, "In your right pocket" = SLOT_R_STORE, "In your backpack" = SLOT_IN_BACKPACK, "On your belt" = SLOT_BELT)
+	if(ishuman(L))
+		var/mob/living/carbon/human/H = L
+		slot = H.equip_in_one_of_slots(S, slots)
+		if(slot == "In your backpack")
+			slot = "In your [H.back.name]"
+	if(slot == "At your feet")
+		if(!S.forceMove(get_turf(L)))
+			qdel(S)
+	if(S && !QDELETED(S))
+		to_chat(L, "<span class='bold large_brass'>There is a paper in your backpack! It'll tell you if anything's changed, as well as what to expect.</span>")
+		to_chat(L, "<span class='alloy'>[slot] is a <b>clockwork slab</b>, a multipurpose tool used to construct machines and invoke ancient words of power. If this is your first time \
+		as a servant, you can find a concise tutorial in the Recollection category of its interface.</span>")
+		to_chat(L, "<span class='alloy italics'>If you want more information, you can read <a href=\"https://tgstation13.org/wiki/Clockwork_Cult\">the wiki page</a> to learn more.</span>")
+		return TRUE
+	return FALSE
+
+/datum/dynamic_ruleset/roundstart/clockcult/round_result()
+	if(GLOB.clockwork_gateway_activated)
+		SSticker.news_report = CLOCK_SUMMON
+		SSticker.mode_result = "win - servants completed their objective (summon ratvar)"
+	else
+		SSticker.news_report = CULT_FAILURE
+		SSticker.mode_result = "loss - servants failed their objective (summon ratvar)"
+
+//////////////////////////////////////////////
+//                                          //
+//               CLOWN OPS                  //
+//                                          //
+//////////////////////////////////////////////
+
+/datum/dynamic_ruleset/roundstart/nuclear/clown_ops
+	name = "Clown Ops"
+	antag_datum = /datum/antagonist/nukeop/clownop
+	antag_leader_datum = /datum/antagonist/nukeop/leader/clownop
+	requirements = list(101,101,101,101,101,101,101,101,101,101)
+	high_population_requirement = 101
+
+/datum/dynamic_ruleset/roundstart/nuclear/clown_ops/pre_execute()
+	. = ..()
+	if(.)
+		for(var/obj/machinery/nuclearbomb/syndicate/S in GLOB.nuke_list)
+			var/turf/T = get_turf(S)
+			if(T)
+				qdel(S)
+				new /obj/machinery/nuclearbomb/syndicate/bananium(T)
+		for(var/datum/mind/V in assigned)
+			V.assigned_role = "Clown Operative"
+			V.special_role = "Clown Operative"
+
+//////////////////////////////////////////////
+//                                          //
+//               DEVIL                      //
+//                                          //
+//////////////////////////////////////////////
+
+/datum/dynamic_ruleset/roundstart/devil
+	name = "Devil"
+	antag_flag = ROLE_DEVIL
+	antag_datum = /datum/antagonist/devil
+	restricted_roles = list("Lawyer", "Curator", "Chaplain", "Head of Security", "Captain", "AI")
+	required_candidates = 1
+	weight = 3
+	cost = 0
+	requirements = list(101,101,101,101,101,101,101,101,101,101)
+	high_population_requirement = 101
+	var/devil_limit = 4 // Hard limit on devils if scaling is turned off
+
+/datum/dynamic_ruleset/roundstart/devil/pre_execute()	
+	var/tsc = CONFIG_GET(number/traitor_scaling_coeff)
+	var/num_devils = 1
+
+	if(tsc)
+		num_devils = max(required_candidates, min(round(num_players() / (tsc * 3)) + 2, round(num_players() / (tsc * 1.5))))
+	else
+		num_devils = max(required_candidates, min(num_players(), devil_limit))
+
+	for(var/j = 0, j < num_devils, j++)
+		if (!candidates.len)
+			break
+		var/mob/devil = pick(candidates)
+		assigned += devil
+		candidates -= devil
+		devil.mind.special_role = ROLE_DEVIL
+		devil.mind.restricted_roles = restricted_roles
+
+		log_game("[key_name(devil)] has been selected as a devil")
+	return TRUE
+
+/datum/dynamic_ruleset/roundstart/devil/execute()
+	for(var/datum/mind/devil in assigned)
+		add_devil(devil.current, ascendable = TRUE)
+		add_devil_objectives(devil,2)
+	return TRUE
+
+/datum/dynamic_ruleset/roundstart/devil/proc/add_devil_objectives(datum/mind/devil_mind, quantity)
+	var/list/validtypes = list(/datum/objective/devil/soulquantity, /datum/objective/devil/soulquality, /datum/objective/devil/sintouch, /datum/objective/devil/buy_target)
+	var/datum/antagonist/devil/D = devil_mind.has_antag_datum(/datum/antagonist/devil)
+	for(var/i = 1 to quantity)
+		var/type = pick(validtypes)
+		var/datum/objective/devil/objective = new type(null)
+		objective.owner = devil_mind
+		D.objectives += objective
+		if(!istype(objective, /datum/objective/devil/buy_target))
+			validtypes -= type
+		else
+			objective.find_target()
+
+//////////////////////////////////////////////
+//                                          //
+//               MONKEY                     //
+//                                          //
+//////////////////////////////////////////////
+
+/datum/dynamic_ruleset/roundstart/monkey
+	name = "Monkey"
+	antag_flag = ROLE_MONKEY
+	antag_datum = /datum/antagonist/monkey/leader
+	restricted_roles = list("Cyborg", "AI")
+	required_candidates = 1
+	weight = 3
+	cost = 0
+	requirements = list(101,101,101,101,101,101,101,101,101,101)
+	high_population_requirement = 101
+	var/players_per_carrier = 30
+	var/monkeys_to_win = 1
+	var/escaped_monkeys = 0
+	var/datum/team/monkey/monkey_team
+
+/datum/dynamic_ruleset/roundstart/monkey/pre_execute()
+	var/carriers_to_make = max(round(num_players()/players_per_carrier, 1), 1)
+
+	for(var/j = 0, j < carriers_to_make, j++)
+		if (!candidates.len)
+			break
+		var/mob/carrier = pick(candidates)
+		candidates -= carrier
+		assigned += carrier.mind
+		carrier.mind.special_role = "Monkey Leader"
+		carrier.mind.restricted_roles = restricted_roles
+		log_game("[key_name(carrier)] has been selected as a Jungle Fever carrier")
+	return TRUE
+
+/datum/dynamic_ruleset/roundstart/monkey/execute()
+	for(var/datum/mind/carrier in assigned)
+		var/datum/antagonist/monkey/M = add_monkey_leader(carrier)
+		if(M)
+			monkey_team = M.monkey_team
+	return TRUE
+
+/datum/dynamic_ruleset/roundstart/monkey/proc/check_monkey_victory()
+	if(SSshuttle.emergency.mode != SHUTTLE_ENDGAME)
+		return FALSE
+	var/datum/disease/D = new /datum/disease/transformation/jungle_fever()
+	for(var/mob/living/carbon/monkey/M in GLOB.alive_mob_list)
+		if (M.HasDisease(D))
+			if(M.onCentCom() || M.onSyndieBase())
+				escaped_monkeys++
+	if(escaped_monkeys >= monkeys_to_win)
+		return TRUE
+	else
+		return FALSE
+
+// This does not get called. Look into making it work.
+/datum/dynamic_ruleset/roundstart/monkey/round_result()
+	if(check_monkey_victory())
+		SSticker.mode_result = "win - monkey win"
+	else
+		SSticker.mode_result = "loss - staff stopped the monkeys"
+
+//////////////////////////////////////////////
+//                                          //
+//               METEOR                     //
+//                                          //
+//////////////////////////////////////////////
+
+/datum/dynamic_ruleset/roundstart/meteor
+	name = "Meteor"
+	persistent = TRUE
+	required_candidates = 0
+	weight = 3
+	cost = 0
+	requirements = list(101,101,101,101,101,101,101,101,101,101)
+	high_population_requirement = 101
+	var/meteordelay = 2000
+	var/nometeors = 0
+	var/rampupdelta = 5
+
+/datum/dynamic_ruleset/roundstart/meteor/rule_process()
+	if(nometeors || meteordelay > world.time - SSticker.round_start_time)
+		return
+
+	var/list/wavetype = GLOB.meteors_normal
+	var/meteorminutes = (world.time - SSticker.round_start_time - meteordelay) / 10 / 60
+
+	if (prob(meteorminutes))
+		wavetype = GLOB.meteors_threatening
+
+	if (prob(meteorminutes/2))
+		wavetype = GLOB.meteors_catastrophic
+
+	var/ramp_up_final = CLAMP(round(meteorminutes/rampupdelta), 1, 10)
+
+	spawn_meteors(ramp_up_final, wavetype)
@@ -0,0 +1,57 @@
+# DYNAMIC
+
+## ROUNDSTART
+
+Dynamic rolls threat based on a special sauce formula:
+"dynamic_curve_width \* tan((3.1416 \* (rand() - 0.5) \* 57.2957795)) + dynamic_curve_centre"
+
+Latejoin and midround injection cooldowns are set using exponential distribution between
+5 minutes and 25 for latejoin
+15 minutes and 35 for midround
+this value is then added to world.time and assigned to the injection cooldown variables.
+
+rigged_roundstart() is called instead if there are forced rules (an admin set the mode)
+
+can_start() -> pre_setup() -> roundstart() OR rigged_roundstart() -> picking_roundstart_rule(drafted_rules) -> post_setup()
+
+## PROCESS
+
+Calls rule_process on every rule which is in the current_rules list.
+Every sixty seconds, update_playercounts()
+Midround injection time is checked against world.time to see if an injection should happen.
+If midround injection time is lower than world.time, it updates playercounts again, then tries to inject and generates a new cooldown regardless of whether a rule is picked.
+
+## LATEJOIN
+
+make_antag_chance(newPlayer) -> [For each latespawn rule...]
+-> acceptable(living players, threat_level) -> trim_candidates() -> ready(forced=FALSE)
+**If true, add to drafted rules
+**NOTE that acceptable uses threat_level not threat!
+**NOTE Latejoin timer is ONLY reset if at least one rule was drafted.
+**NOTE the new_player.dm AttemptLateSpawn() calls OnPostSetup for all roles (unless assigned role is MODE)
+[After collecting all draftble rules...]
+-> picking_latejoin_ruleset(drafted_rules) -> spend threat -> ruleset.execute()
+## MIDROUND
+process() -> [For each midround rule...]
+-> acceptable(living players, threat_level) -> trim_candidates() -> ready(forced=FALSE)
+[After collecting all draftble rules...]
+-> picking_midround_ruleset(drafted_rules) -> spend threat -> ruleset.execute()
+## FORCED
+For latejoin, it simply sets forced_latejoin_rule
+make_antag_chance(newPlayer) -> trim_candidates() -> ready(forced=TRUE) **NOTE no acceptable() call
+For midround, calls the below proc with forced = TRUE
+picking_specific_rule(ruletype,forced) -> forced OR acceptable(living_players, threat_level) -> trim_candidates() -> ready(forced) -> spend threat -> execute()
+**NOTE specific rule can be called by RS traitor->MR autotraitor w/ forced=FALSE
+**NOTE that due to short circuiting acceptable() need not be called if forced.
+## RULESET
+acceptable(population,threat) just checks if enough threat_level for population indice.
+**NOTE that we currently only send threat_level as the second arg, not threat.
+ready(forced) checks if enough candidates and calls the map's map_ruleset(dynamic_ruleset) at the parent level
+trim_candidates() varies significantly according to the ruleset type
+Roundstart: All candidates are new_player mobs. Check them for standard stuff: connected, desire role, not banned, etc.
+**NOTE Roundstart deals with both candidates (trimmed list of valid players) and mode.candidates (everyone readied up). Don't confuse them!
+Latejoin: Only one candidate, the latejoiner. Standard checks.
+Midround: Instead of building a single list candidates, candidates contains four lists: living, dead, observing, and living antags. Standard checks in trim_list(list).
+Midround - Rulesets have additional types
+/from_ghosts: execute() -> send_applications() -> review_applications() -> finish_setup(mob/newcharacter, index) -> setup_role(role)
+**NOTE: execute() here adds dead players and observers to candidates list
@@ -24,6 +24,7 @@
 	var/list/datum/mind/antag_candidates = list()	// List of possible starting antags goes here
 	var/list/restricted_jobs = list()	// Jobs it doesn't make sense to be.  I.E chaplain or AI cultist
 	var/list/protected_jobs = list()	// Jobs that can't be traitors because
+	var/list/required_jobs = list()		// alternative required job groups eg list(list(cap=1),list(hos=1,sec=2)) translates to one captain OR one hos and two secmans
 	var/required_players = 0
 	var/maximum_players = -1 // -1 is no maximum, positive numbers limit the selection of a mode on overstaffed stations
 	var/required_enemies = 0
@@ -355,7 +356,7 @@

 	// Ultimate randomizing code right here
 	for(var/mob/dead/new_player/player in GLOB.player_list)
-		if(player.client && player.ready == PLAYER_READY_TO_PLAY)
+		if(player.client && player.ready == PLAYER_READY_TO_PLAY && player.check_preferences())
 			players += player

 	// Shuffling, the players list is now ping-independent!!!
@@ -558,3 +559,7 @@
 		SSticker.news_report = STATION_EVACUATED
 		if(SSshuttle.emergency.is_hijacked())
 			SSticker.news_report = SHUTTLE_HIJACK
+
+/// Mode specific admin panel.
+/datum/game_mode/proc/admin_panel()
+	return
@@ -3,7 +3,8 @@
 	name = "overthrow"
 	config_tag = "overthrow"
 	antag_flag = ROLE_OVERTHROW
-	restricted_jobs = list("Security Officer", "Warden", "Detective", "AI", "Cyborg","Captain", "Head of Personnel", "Head of Security", "Chief Engineer", "Research Director", "Chief Medical Officer")
+	restricted_jobs = list("AI", "Cyborg")
+	protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster")
 	required_players = 20 // the core idea is of a swift, bloodless coup, so it shouldn't be as chaotic as revs.
 	required_enemies = 2 // minimum two teams, otherwise it's just nerfed revs.
 	recommended_enemies = 4
@@ -12,7 +12,8 @@
 	config_tag = "revolution"
 	antag_flag = ROLE_REV
 	false_report_weight = 10
-	restricted_jobs = list("Security Officer", "Warden", "Detective", "AI", "Cyborg","Captain", "Head of Personnel", "Head of Security", "Chief Engineer", "Research Director", "Chief Medical Officer")
+	restricted_jobs = list("AI", "Cyborg")
+	protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster")
 	required_players = 30
 	required_enemies = 2
 	recommended_enemies = 3
@@ -96,4 +96,4 @@

 /datum/game_mode/traitor/generate_report()
 	return "Although more specific threats are commonplace, you should always remain vigilant for Syndicate agents aboard your station. Syndicate communications have implied that many \
-		Nanotrasen employees are Syndicate agents with hidden memories that may be activated at a moment's notice, so it's possible that these agents might not even know their positions."
+		Nanotrasen employees are Syndicate agents with hidden memories that may be activated at a moment's notice, so it's possible that these agents might not even know their positions."
@@ -88,17 +88,50 @@
 		return
 	close_machine(target)

-/obj/machinery/sleeper/attackby(obj/item/I, mob/user, params)
-	if(!state_open && !occupant)
-		if(default_deconstruction_screwdriver(user, "[initial(icon_state)]-o", initial(icon_state), I))
-			return
+/obj/machinery/sleeper/screwdriver_act(mob/living/user, obj/item/I)
+	. = TRUE
+	if(..())
+		return
+	if(occupant)
+		to_chat(user, "<span class='warning'>[src] is currently occupied!</span>")
+		return
+	if(state_open)
+		to_chat(user, "<span class='warning'>[src] must be closed to [panel_open ? "close" : "open"] its maintenance hatch!</span>")
+		return
+	if(default_deconstruction_screwdriver(user, "[initial(icon_state)]-o", initial(icon_state), I))
+		return
+	return FALSE
+
+/obj/machinery/sleeper/wrench_act(mob/living/user, obj/item/I)
+	. = ..()
 	if(default_change_direction_wrench(user, I))
-		return
+		return TRUE
+
+/obj/machinery/sleeper/crowbar_act(mob/living/user, obj/item/I)
+	. = ..()
 	if(default_pry_open(I))
-		return
+		return TRUE
 	if(default_deconstruction_crowbar(I))
+		return TRUE
+
+/obj/machinery/sleeper/default_pry_open(obj/item/I) //wew
+	. = !(state_open || panel_open || (flags_1 & NODECONSTRUCT_1)) && I.tool_behaviour == TOOL_CROWBAR
+	if(.)
+		I.play_tool_sound(src, 50)
+		visible_message("<span class='notice'>[usr] pries open [src].</span>", "<span class='notice'>You pry open [src].</span>")
+		open_machine()
+
+/obj/machinery/sleeper/AltClick(mob/user)
+	if(!user.canUseTopic(src, !issilicon(user)))
 		return
-	return ..()
+	if(state_open)
+		close_machine()
+	else
+		open_machine()
+
+/obj/machinery/sleeper/examine(mob/user)
+	..()
+	to_chat(user, "<span class='notice'>Alt-click [src] to [state_open ? "close" : "open"] it.</span>")

 /obj/machinery/sleeper/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
 									datum/tgui/master_ui = null, datum/ui_state/state = GLOB.notcontained_state)
@@ -146,7 +179,7 @@
 		data["occupant"]["toxLoss"] = mob_occupant.getToxLoss()
 		data["occupant"]["fireLoss"] = mob_occupant.getFireLoss()
 		data["occupant"]["cloneLoss"] = mob_occupant.getCloneLoss()
-		data["occupant"]["brainLoss"] = mob_occupant.getBrainLoss()
+		data["occupant"]["brainLoss"] = mob_occupant.getOrganLoss(ORGAN_SLOT_BRAIN)
 		data["occupant"]["reagents"] = list()
 		if(mob_occupant.reagents && mob_occupant.reagents.reagent_list.len)
 			for(var/datum/reagent/R in mob_occupant.reagents.reagent_list)
@@ -190,7 +223,7 @@
 			if(inject_chem(chem, usr))
 				. = TRUE
 				if(scrambled_chems && prob(5))
-					to_chat(usr, "<span class='warning'>Chem System Re-route detected, results may not be as expected!</span>")
+					to_chat(usr, "<span class='warning'>Chemical system re-route detected, results may not be as expected!</span>")

 /obj/machinery/sleeper/emag_act(mob/user)
 	. = ..()
@@ -113,6 +113,11 @@ Class Procs:
 	var/atom/movable/occupant = null
 	var/speed_process = FALSE // Process as fast as possible?
 	var/obj/item/circuitboard/circuit // Circuit to be created and inserted when the machinery is created
+	var/obj/item/card/id/inserted_scan_id
+	var/obj/item/card/id/inserted_modify_id
+	var/list/region_access = null // For the identification console (card.dm)
+	var/list/head_subordinates = null // For the identification console (card.dm)
+	var/authenticated = 0 // For the identification console (card.dm)

 	var/interaction_flags_machine = INTERACT_MACHINE_WIRES_IF_OPEN | INTERACT_MACHINE_ALLOW_SILICON | INTERACT_MACHINE_OPEN_SILICON | INTERACT_MACHINE_SET_MACHINE

@@ -131,7 +136,7 @@ Class Procs:
 	else
 		START_PROCESSING(SSfastprocess, src)
 	power_change()
-	AddComponent(/datum/component/redirect, list(COMSIG_ENTER_AREA = CALLBACK(src, .proc/power_change)))
+	RegisterSignal(src, COMSIG_ENTER_AREA, .proc/power_change)

 	if (occupant_typecache)
 		occupant_typecache = typecacheof(occupant_typecache)
@@ -143,6 +148,10 @@ Class Procs:
 	else
 		STOP_PROCESSING(SSfastprocess, src)
 	dropContents()
+	if(length(component_parts))
+		for(var/atom/A in component_parts)
+			qdel(A)
+		component_parts.Cut()
 	return ..()

 /obj/machinery/proc/locate_machinery()
@@ -179,12 +188,15 @@ Class Procs:
 			L.update_canmove()
 	occupant = null

+/obj/machinery/proc/can_be_occupant(atom/movable/am)
+	return occupant_typecache ? is_type_in_typecache(am, occupant_typecache) : isliving(am)
+
 /obj/machinery/proc/close_machine(atom/movable/target = null)
 	state_open = FALSE
 	density = TRUE
 	if(!target)
 		for(var/am in loc)
-			if (!(occupant_typecache ? is_type_in_typecache(am, occupant_typecache) : isliving(am)))
+			if (!(can_be_occupant(am)))
 				continue
 			var/atom/movable/AM = am
 			if(AM.has_buckled_mobs())
@@ -311,6 +323,7 @@ Class Procs:
 			spawn_frame(disassembled)
 			for(var/obj/item/I in component_parts)
 				I.forceMove(loc)
+			component_parts.Cut()
 	qdel(src)

 /obj/machinery/proc/spawn_frame(disassembled)
@@ -348,8 +361,8 @@ Class Procs:
 			panel_open = FALSE
 			icon_state = icon_state_closed
 			to_chat(user, "<span class='notice'>You close the maintenance hatch of [src].</span>")
-		return 1
-	return 0
+		return TRUE
+	return FALSE

 /obj/machinery/proc/default_change_direction_wrench(mob/user, obj/item/I)
 	if(panel_open && I.tool_behaviour == TOOL_WRENCH)
@@ -401,7 +414,7 @@ Class Procs:
 			var/obj/item/circuitboard/machine/CB = locate(/obj/item/circuitboard/machine) in component_parts
 			var/P
 			if(W.works_from_distance)
-				display_parts(user)
+				to_chat(user, display_parts(user))
 			for(var/obj/item/A in component_parts)
 				for(var/D in CB.req_components)
 					if(ispath(A.type, D))
@@ -429,34 +442,38 @@ Class Procs:
 							break
 			RefreshParts()
 		else
-			display_parts(user)
+			to_chat(user, display_parts(user))
 		if(shouldplaysound)
 			W.play_rped_sound()
 		return TRUE
 	return FALSE

 /obj/machinery/proc/display_parts(mob/user)
-	to_chat(user, "<span class='notice'>It contains the following parts:</span>")
+	. = list()
+	. += "<span class='notice'>It contains the following parts:</span>"
 	for(var/obj/item/C in component_parts)
-		to_chat(user, "<span class='notice'>[icon2html(C, user)] \A [C].</span>")
+		. += "<span class='notice'>[icon2html(C, user)] \A [C].</span>"
+	. = jointext(., "")

 /obj/machinery/examine(mob/user)
-	..()
+	. = ..()
 	if(stat & BROKEN)
-		to_chat(user, "<span class='notice'>It looks broken and non-functional.</span>")
+		. += "<span class='notice'>It looks broken and non-functional.</span>"
 	if(!(resistance_flags & INDESTRUCTIBLE))
 		if(resistance_flags & ON_FIRE)
-			to_chat(user, "<span class='warning'>It's on fire!</span>")
+			. += "<span class='warning'>It's on fire!</span>"
 		var/healthpercent = (obj_integrity/max_integrity) * 100
 		switch(healthpercent)
 			if(50 to 99)
-				to_chat(user,  "It looks slightly damaged.")
+				. += "It looks slightly damaged."
 			if(25 to 50)
-				to_chat(user,  "It appears heavily damaged.")
+				. += "It appears heavily damaged."
 			if(0 to 25)
-				to_chat(user,  "<span class='warning'>It's falling apart!</span>")
+				. += "<span class='warning'>It's falling apart!</span>"
 	if(user.research_scanner && component_parts)
-		display_parts(user)
+		. += display_parts(user, TRUE)
+	if(inserted_scan_id || inserted_modify_id)
+		. += "<span class='notice'>Alt-click to eject the ID card.</span>"

 //called on machinery construction (i.e from frame to machinery) but not on initialization
 /obj/machinery/proc/on_construction()
@@ -490,3 +507,73 @@ Class Procs:
 	. = . % 9
 	AM.pixel_x = -8 + ((.%3)*8)
 	AM.pixel_y = -8 + (round( . / 3)*8)
+
+/obj/machinery/proc/id_insert_scan(mob/user, obj/item/card/id/I)
+	I = user.get_active_held_item()
+	if(istype(I))
+		if(inserted_scan_id)
+			to_chat(user, "<span class='warning'>There's already an ID card in the console!</span>")
+			return
+		if(!user.transferItemToLoc(I, src))
+			return
+		inserted_scan_id = I
+		user.visible_message("<span class='notice'>[user] inserts an ID card into the console.</span>", \
+							"<span class='notice'>You insert the ID card into the console.</span>")
+		playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, FALSE)
+		updateUsrDialog()
+
+/obj/machinery/proc/id_eject_scan(mob/user)
+	if(!inserted_scan_id)
+		to_chat(user, "<span class='warning'>There's no ID card in the console!</span>")
+		return
+	if(inserted_scan_id)
+		inserted_scan_id.forceMove(drop_location())
+		if(!issilicon(user) && Adjacent(user))
+			user.put_in_hands(inserted_scan_id)
+		inserted_scan_id = null
+		user.visible_message("<span class='notice'>[user] gets an ID card from the console.</span>", \
+							"<span class='notice'>You get the ID card from the console.</span>")
+		playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, FALSE)
+		updateUsrDialog()
+
+/obj/machinery/proc/id_eject_modify(mob/user)
+	if(inserted_modify_id)
+		GLOB.data_core.manifest_modify(inserted_modify_id.registered_name, inserted_modify_id.assignment)
+		inserted_modify_id.update_label()
+		inserted_modify_id.forceMove(drop_location())
+		if(!issilicon(user) && Adjacent(user))
+			user.put_in_hands(inserted_modify_id)
+		user.visible_message("<span class='notice'>[user] gets an ID card from the console.</span>", \
+							"<span class='notice'>You get the ID card from the console.</span>")
+		playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, FALSE)
+		inserted_modify_id = null
+		region_access = null
+		head_subordinates = null
+		updateUsrDialog()
+
+/obj/machinery/proc/id_insert_modify(mob/user)
+	var/obj/item/card/id/I = user.get_active_held_item()
+	if(istype(I))
+		if(inserted_modify_id)
+			to_chat(user, "<span class='warning'>There's already an ID card in the console!</span>")
+			return
+		if(!user.transferItemToLoc(I, src))
+			return
+		inserted_modify_id = I
+		user.visible_message("<span class='notice'>[user] inserts an ID card into the console.</span>", \
+							"<span class='notice'>You insert the ID card into the console.</span>")
+		playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, FALSE)
+		updateUsrDialog()
+
+/obj/machinery/AltClick(mob/user)
+	. = ..()
+	if(!user.canUseTopic(src, !issilicon(user)) || !is_operational())
+		return
+	if(inserted_modify_id)
+		id_eject_modify(user)
+		authenticated = FALSE
+		return
+	if(inserted_scan_id)
+		id_eject_scan(user)
+		authenticated = FALSE
+		return
@@ -241,13 +241,14 @@
 				var/obj/item/I = pick_n_take(unattached_flesh)
 				if(isorgan(I))
 					var/obj/item/organ/O = I
+					O.organ_flags &= ~ORGAN_FROZEN
 					O.Insert(mob_occupant)
 				else if(isbodypart(I))
 					var/obj/item/bodypart/BP = I
 					BP.attach_limb(mob_occupant)

 			//Premature clones may have brain damage.
-			mob_occupant.adjustBrainLoss(-((speed_coeff / 2) * dmg_mult))
+			mob_occupant.adjustOrganLoss(ORGAN_SLOT_BRAIN, -((speed_coeff / 2) * dmg_mult))

 			use_power(7500) //This might need tweaking.

@@ -261,6 +262,7 @@
 			for(var/i in unattached_flesh)
 				if(isorgan(i))
 					var/obj/item/organ/O = i
+					O.organ_flags &= ~ORGAN_FROZEN
 					O.Insert(mob_occupant)
 				else if(isbodypart(i))
 					var/obj/item/bodypart/BP = i
@@ -346,6 +348,9 @@
 	if(mess) //Clean that mess and dump those gibs!
 		for(var/obj/fl in unattached_flesh)
 			fl.forceMove(T)
+			if(istype(fl, /obj/item/organ))
+				var/obj/item/organ/O = fl
+				O.organ_flags &= ~ORGAN_FROZEN
 		unattached_flesh.Cut()
 		mess = FALSE
 		new /obj/effect/gibspawner/generic(get_turf(src))
@@ -442,7 +447,7 @@
 		unattached_flesh.Cut()

 	H.setCloneLoss(CLONE_INITIAL_DAMAGE)     //Yeah, clones start with very low health, not with random, because why would they start with random health
-	H.setBrainLoss(CLONE_INITIAL_DAMAGE)
+	//H.setOrganLoss(ORGAN_SLOT_BRAIN, CLONE_INITIAL_DAMAGE)
 	// In addition to being cellularly damaged and having barely any

 	// brain function, they also have no limbs or internal organs.
@@ -458,8 +463,9 @@

 	for(var/o in H.internal_organs)
 		var/obj/item/organ/organ = o
-		if(!istype(organ) || organ.vital)
+		if(!istype(organ) || (organ.organ_flags & ORGAN_VITAL))
 			continue
+		organ.organ_flags |= ORGAN_FROZEN
 		organ.Remove(H, special=TRUE)
 		organ.forceMove(src)
 		unattached_flesh += organ
@@ -11,7 +11,6 @@
 	var/list/result_filters //For sorting the results
 	var/checking_logs = 0
 	var/list/logs
-	var/authenticated = 0
 	var/auth_id = "\[NULL\]"

 /obj/machinery/computer/apc_control/Initialize()
@@ -13,11 +13,8 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
 	circuit = /obj/item/circuitboard/computer/card
 	var/obj/item/card/id/scan = null
 	var/obj/item/card/id/modify = null
-	var/authenticated = 0
 	var/mode = 0
 	var/printing = null
-	var/list/region_access = null
-	var/list/head_subordinates = null
 	var/target_dept = 0 //Which department this computer has access to. 0=all departments

 	//Cooldown for closing positions in seconds
@@ -377,7 +374,6 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
 					else
 						if((ACCESS_HOP in scan.access) && ((target_dept==1) || !target_dept))
 							region_access |= 1
-							region_access |= 6
 							get_subordinates("Head of Personnel")
 						if((ACCESS_HOS in scan.access) && ((target_dept==2) || !target_dept))
 							region_access |= 2
@@ -391,6 +387,9 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
 						if((ACCESS_CE in scan.access) && ((target_dept==5) || !target_dept))
 							region_access |= 5
 							get_subordinates("Chief Engineer")
+						if((ACCESS_QM in scan.access) && ((target_dept==6) || !target_dept))
+							region_access |= 6
+							get_subordinates("Quartermaster")
 						if(region_access)
 							authenticated = 1
 			else if ((!( authenticated ) && issilicon(usr)) && (!modify))
@@ -610,7 +609,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
 		typed_circuit.target_dept = target_dept
 	else
 		target_dept = typed_circuit.target_dept
-	var/list/dept_list = list("general","security","medical","science","engineering")
+	var/list/dept_list = list("civilian","security","medical","science","engineering","cargo")
 	name = "[dept_list[target_dept]] department console"

 /obj/machinery/computer/card/minor/hos
@@ -634,3 +633,9 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
 	icon_screen = "idce"

 	light_color = LIGHT_COLOR_YELLOW
+
+/obj/machinery/computer/card/minor/qm
+	target_dept = 6
+	icon_screen = "idqm"
+
+	light_color = LIGHT_COLOR_ORANGE
@@ -64,9 +64,6 @@
 	if(!(scanner && LAZYLEN(pods) && autoprocess))
 		return

-	if(scanner.occupant && scanner.scan_level > 2)
-		scan_occupant(scanner.occupant)
-
 	for(var/datum/data/record/R in records)
 		var/obj/machinery/clonepod/pod = GetAvailableEfficientPod(R.fields["mind"])

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