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

code/modules/admin/admin.dm

@@ -686,6 +686,20 @@
 			log_admin("[key_name(usr)] set the pre-game delay to [DisplayTimeText(newtime)].")
 		SSblackbox.record_feedback("tally", "admin_verb", 1, "Delay Game Start") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
+/datum/admins/proc/toggledynamicvote()
+	set category = "Server"
+	set desc="Switches between secret/extended and dynamic voting"
+	set name="Toggle Dynamic Vote"
+	var/prev_dynamic_voting = CONFIG_GET(flag/dynamic_voting)
+	CONFIG_SET(flag/dynamic_voting,!prev_dynamic_voting)
+	if (!prev_dynamic_voting)
+		to_chat(world, "<B>Vote is now between extended and dynamic chaos.</B>")
+	else
+		to_chat(world, "<B>Vote is now between extended and secret.</B>")
+	log_admin("[key_name(usr)] [prev_dynamic_voting ? "disabled" : "enabled"] dynamic voting.")
+	message_admins("<span class='adminnotice'>[key_name_admin(usr)] toggled dynamic voting.</span>")
+	SSblackbox.record_feedback("nested tally", "admin_toggle", 1, list("Toggle Dynamic Voting", "[prev_dynamic_voting ? "Disabled" : "Enabled"]")) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+
 /datum/admins/proc/unprison(mob/M in GLOB.mob_list)
 	set category = "Admin"
 	set name = "Unprison"

code/modules/admin/admin_verbs.dm

@@ -121,6 +121,7 @@ GLOBAL_LIST_INIT(admin_verbs_server, world.AVerbsServer())
 	/client/proc/everyone_random,
 	/datum/admins/proc/toggleAI,
 	/datum/admins/proc/toggleMulticam,
+	/datum/admins/proc/toggledynamicvote,
 	/client/proc/cmd_admin_delete,		/*delete an instance/object/mob/etc*/
 	/client/proc/cmd_debug_del_all,
 	/client/proc/toggle_random_events,

code/modules/admin/topic.dm

@@ -1449,9 +1449,7 @@
 		if(GLOB.master_mode != "dynamic")
 			return alert(usr, "The game mode has to be dynamic mode!", null, null, null, null)
 
-		var/new_centre = input(usr,"Change the centre of the dynamic mode threat curve. A negative value will give a more peaceful round ; a positive value, a round with higher threat. Any number between -5 and +5 is allowed.", "Change curve centre", null) as num
-		if (new_centre < -5 || new_centre > 5)
-			return alert(usr, "Only values between -5 and +5 are allowed.", null, null, null, null)
+		var/new_centre = input(usr,"Change the centre of the dynamic mode threat curve. A negative value will give a more peaceful round ; a positive value, a round with higher threat. Any number is allowed. This is adjusted by dynamic voting.", "Change curve centre", null) as num
 
 		log_admin("[key_name(usr)] changed the distribution curve center to [new_centre].")
 		message_admins("[key_name(usr)] changed the distribution curve center to [new_centre]", 1)

code/modules/antagonists/abductor/machinery/camera.dm

@@ -17,9 +17,9 @@
 
 /obj/machinery/computer/camera_advanced/abductor/CreateEye()
 	..()
-	eyeobj.visible_icon = 1
-	eyeobj.icon = 'icons/obj/abductor.dmi'
-	eyeobj.icon_state = "camera_target"
+	eyeobj.visible_icon = TRUE
+	eyeobj.icon = 'icons/mob/cameramob.dmi'
+	eyeobj.icon_state = "generic_camera"
 
 /obj/machinery/computer/camera_advanced/abductor/GrantActions(mob/living/carbon/user)
 	..()

code/modules/antagonists/blob/blob/overmind.dm

@@ -9,7 +9,7 @@ GLOBAL_LIST_EMPTY(blob_nodes)
 	name = "Blob Overmind"
 	real_name = "Blob Overmind"
 	desc = "The overmind. It controls the blob."
-	icon = 'icons/mob/blob.dmi'
+	icon = 'icons/mob/cameramob.dmi'
 	icon_state = "marker"
 	mouse_opacity = MOUSE_OPACITY_ICON
 	move_on_shuttle = 1

code/modules/antagonists/disease/disease_event.dm

@@ -3,6 +3,7 @@
 	name = "Spawn Sentient Disease"
 	typepath = /datum/round_event/ghost_role/sentient_disease
 	weight = 7
+	gamemode_blacklist = list("dynamic")
 	max_occurrences = 1
 	min_players = 5
 

code/modules/antagonists/disease/disease_mob.dm

@@ -9,7 +9,7 @@ the new instance inside the host to be updated to the template's stats.
 	name = "Sentient Disease"
 	real_name = "Sentient Disease"
 	desc = ""
-	icon = 'icons/mob/blob.dmi'
+	icon = 'icons/mob/cameramob.dmi'
 	icon_state = "marker"
 	mouse_opacity = MOUSE_OPACITY_ICON
 	move_on_shuttle = FALSE

code/modules/antagonists/nukeop/equipment/nuclear_challenge.dm

@@ -74,6 +74,11 @@ GLOBAL_VAR_INIT(war_declared, FALSE)
 	new uplink_type(get_turf(user), user.key, CHALLENGE_TELECRYSTALS - tc_malus + CEILING(PLAYER_SCALING * actual_players, 1))
 
 	CONFIG_SET(number/shuttle_refuel_delay, max(CONFIG_GET(number/shuttle_refuel_delay), CHALLENGE_SHUTTLE_DELAY))
+	if(istype(SSticker.mode, /datum/game_mode/dynamic))
+		var/datum/game_mode/dynamic/mode = SSticker.mode
+		var/threat_spent = CONFIG_GET(number/dynamic_warops_cost)
+		mode.spend_threat(threat_spent)
+		mode.log_threat("Nuke ops spent [threat_spent] on war ops.")
 	SSblackbox.record_feedback("amount", "nuclear_challenge_mode", 1)
 
 	qdel(src)
@@ -94,6 +99,14 @@ GLOBAL_VAR_INIT(war_declared, FALSE)
 		if(board.moved)
 			to_chat(user, "The shuttle has already been moved! You have forfeit the right to declare war.")
 			return FALSE
+	if(istype(SSticker.mode, /datum/game_mode/dynamic))
+		var/datum/game_mode/dynamic/mode = SSticker.mode
+		if(mode.threat_level < CONFIG_GET(number/dynamic_warops_requirement))
+			to_chat(user, "Due to the dynamic space in which the station resides, you are too deep into Nanotrasen territory to reasonably go loud.")
+			return FALSE
+		else if(mode.threat < CONFIG_GET(number/dynamic_warops_cost))
+			to_chat(user, "Due to recent threats on the station, Nanotrasen is looking too closely for a war declaration to be wise.")
+			return FALSE
 	return TRUE
 
 /obj/item/nuclear_challenge/clownops

code/modules/antagonists/revenant/revenant_spawn_event.dm

@@ -4,6 +4,7 @@
 	name = "Spawn Revenant" // Did you mean 'griefghost'?
 	typepath = /datum/round_event/ghost_role/revenant
 	weight = 7
+	gamemode_blacklist = list("dynamic")
 	max_occurrences = 1
 	min_players = 5
 

code/modules/antagonists/revolution/revolution.dm

@@ -207,9 +207,20 @@
 		owner.current.visible_message("<span class='deconversion_message'>The frame beeps contentedly, purging the hostile memory engram from the MMI before initalizing it.</span>", null, null, null, owner.current)
 		to_chat(owner, "<span class='userdanger'>The frame's firmware detects and deletes your neural reprogramming! You remember nothing of your time spent reprogrammed, you can't even remember the names or identities of anyone involved...</span>")
 
+/datum/antagonist/rev/head/farewell()
+	if((ishuman(owner.current) || ismonkey(owner.current)))
+		if(owner.current.stat != DEAD)
+			owner.current.visible_message("<span class='deconversion_message'>[owner.current] looks like [owner.current.p_theyve()] just remembered [owner.current.p_their()] real allegiance!</span>", null, null, null, owner.current)
+			to_chat(owner, "<span class ='deconversion_message bold'>You have given up your cause of overthrowing the command staff. You are no longer a Head Revolutionary.</span>")
+		else
+			to_chat(owner, "<span class ='deconversion_message bold'>The sweet release of death. You are no longer a Head Revolutionary.</span>")
+	else if(issilicon(owner.current))
+		owner.current.visible_message("<span class='deconversion_message'>The frame beeps contentedly, suppressing the disloyal personality traits from the MMI before initalizing it.</span>", null, null, null, owner.current)
+		to_chat(owner, "<span class='userdanger'>The frame's firmware detects and suppresses your unwanted personality traits! You feel more content with the leadership around these parts.</span>")
+
 //blunt trauma deconversions call this through species.dm spec_attacked_by()
 /datum/antagonist/rev/proc/remove_revolutionary(borged, deconverter)
-	log_attack("[key_name(owner.current)] has been deconverted from the revolution by [key_name(deconverter)]!")
+	log_attack("[key_name(owner.current)] has been deconverted from the revolution by [ismob(deconverter) ? key_name(deconverter) : deconverter]!")
 	if(borged)
 		message_admins("[ADMIN_LOOKUPFLW(owner.current)] has been borged while being a [name]")
 	owner.special_role = null
@@ -219,9 +230,8 @@
 	owner.remove_antag_datum(type)
 
 /datum/antagonist/rev/head/remove_revolutionary(borged,deconverter)
-	if(!borged)
-		return
-	. = ..()
+	if(borged || deconverter == "gamemode")
+		. = ..()
 
 /datum/antagonist/rev/head/equip_rev()
 	var/mob/living/carbon/human/H = owner.current
@@ -253,6 +263,8 @@
 /datum/team/revolution
 	name = "Revolution"
 	var/max_headrevs = 3
+	var/list/ex_headrevs = list() // Dynamic removes revs on loss, used to keep a list for the roundend report.
+	var/list/ex_revs = list()
 
 /datum/team/revolution/proc/update_objectives(initial = FALSE)
 	var/untracked_heads = SSjob.get_all_heads()
@@ -296,9 +308,12 @@
 
 	addtimer(CALLBACK(src,.proc/update_heads),HEAD_UPDATE_PERIOD,TIMER_UNIQUE)
 
+/datum/team/revolution/proc/save_members()
+	ex_headrevs = get_antag_minds(/datum/antagonist/rev/head, TRUE)
+	ex_revs = get_antag_minds(/datum/antagonist/rev, TRUE)
 
 /datum/team/revolution/roundend_report()
-	if(!members.len)
+	if(!members.len && !ex_headrevs.len)
 		return
 
 	var/list/result = list()
@@ -318,8 +333,17 @@
 
 
 	var/list/targets = list()
-	var/list/datum/mind/headrevs = get_antag_minds(/datum/antagonist/rev/head)
-	var/list/datum/mind/revs = get_antag_minds(/datum/antagonist/rev,TRUE)
+	var/list/datum/mind/headrevs
+	var/list/datum/mind/revs
+	if(ex_headrevs.len)
+		headrevs = ex_headrevs
+	else
+		headrevs = get_antag_minds(/datum/antagonist/rev/head, TRUE)
+
+	if(ex_revs.len)
+		revs = ex_revs
+	else
+		revs = get_antag_minds(/datum/antagonist/rev, TRUE)
 	if(headrevs.len)
 		var/list/headrev_part = list()
 		headrev_part += "<span class='header'>The head revolutionaries were:</span>"

code/modules/antagonists/slaughter/slaughterevent.dm

@@ -3,6 +3,7 @@
 	typepath = /datum/round_event/ghost_role/slaughter
 	weight = 1 //Very rare
 	max_occurrences = 1
+	gamemode_blacklist = list("dynamic")
 	earliest_start = 1 HOURS
 	min_players = 20
 

code/modules/antagonists/traitor/datum_traitor.dm

@@ -70,7 +70,17 @@
 
 /datum/antagonist/traitor/proc/forge_human_objectives()
 	var/is_hijacker = FALSE
-	if (GLOB.joined_player_list.len >= 30) // Less murderboning on lowpop thanks
+	var/datum/game_mode/dynamic/mode
+	var/is_dynamic = FALSE
+	if(istype(SSticker.mode,/datum/game_mode/dynamic))
+		mode = SSticker.mode
+		is_dynamic = TRUE
+		if(GLOB.joined_player_list.len>=GLOB.dynamic_high_pop_limit)
+			is_hijacker = (prob(10) && mode.threat_level > CONFIG_GET(number/dynamic_hijack_high_population_requirement))
+		else
+			var/indice_pop = min(10,round(GLOB.joined_player_list.len/mode.pop_per_requirement)+1)
+			is_hijacker = (prob(10) && (mode.threat_level >= CONFIG_GET(number_list/dynamic_hijack_requirements)[indice_pop]))
+	else if (GLOB.joined_player_list.len >= 30) // Less murderboning on lowpop thanks
 		is_hijacker = prob(10)
 	var/martyr_chance = prob(20)
 	var/objective_count = is_hijacker 			//Hijacking counts towards number of objectives
@@ -91,6 +101,10 @@
 			var/datum/objective/hijack/hijack_objective = new
 			hijack_objective.owner = owner
 			add_objective(hijack_objective)
+			if(is_dynamic)
+				var/threat_spent = CONFIG_GET(number/dynamic_hijack_cost)
+				mode.spend_threat(threat_spent)
+				mode.log_threat("[owner.name] spent [threat_spent] on hijack.")
 			return
 
 
@@ -104,6 +118,10 @@
 		var/datum/objective/martyr/martyr_objective = new
 		martyr_objective.owner = owner
 		add_objective(martyr_objective)
+		if(is_dynamic)
+			var/threat_spent = CONFIG_GET(number/dynamic_hijack_cost)
+			mode.spend_threat(threat_spent)
+			mode.log_threat("[owner.name] spent [threat_spent] on glorious death.")
 		return
 
 	else
@@ -139,7 +157,18 @@
 
 /datum/antagonist/traitor/proc/forge_single_human_objective() //Returns how many objectives are added
 	.=1
-	if(prob(50))
+	var/assassin_prob = 50
+	var/is_dynamic = FALSE
+	var/datum/game_mode/dynamic/mode
+	if(istype(SSticker.mode,/datum/game_mode/dynamic))
+		mode = SSticker.mode
+		is_dynamic = TRUE
+		assassin_prob = mode.threat_level*(2/3)
+	if(prob(assassin_prob))
+		if(is_dynamic)
+			var/threat_spent = CONFIG_GET(number/dynamic_assassinate_cost)
+			mode.spend_threat(threat_spent)
+			mode.log_threat("[owner.name] spent [threat_spent] on an assassination target.")
 		var/list/active_ais = active_ais()
 		if(active_ais.len && prob(100/GLOB.joined_player_list.len))
 			var/datum/objective/destroy/destroy_objective = new

code/modules/antagonists/wizard/equipment/spellbook.dm

@@ -286,6 +286,20 @@
 	desc = "An artefact that spits bolts of coruscating energy which cause the target's very form to reshape itself."
 	item_path = /obj/item/gun/magic/staff/change
 
+/datum/spellbook_entry/item/staffchange/IsAvailible()
+	if(istype(SSticker.mode,/datum/game_mode/dynamic))
+		var/datum/game_mode/dynamic/mode = SSticker.mode
+		if(mode.threat < CONFIG_GET(number/dynamic_staff_of_change_requirement))
+			return 0
+
+/datum/spellbook_entry/item/staffchange/Buy(mob/living/carbon/human/user,obj/item/spellbook/book)
+	if(istype(SSticker.mode,/datum/game_mode/dynamic))
+		var/datum/game_mode/dynamic/mode = SSticker.mode
+		var/threat_spent = CONFIG_GET(number/dynamic_staff_of_change_cost)
+		mode.spend_threat(threat_spent)
+		mode.log_threat("Wizard spent [threat_spent] on staff of change.")
+	return ..()
+
 /datum/spellbook_entry/item/staffanimation
 	name = "Staff of Animation"
 	desc = "An arcane staff capable of shooting bolts of eldritch energy which cause inanimate objects to come to life. This magic doesn't affect machines."
@@ -370,6 +384,20 @@
 	item_path = /obj/item/antag_spawner/contract
 	category = "Assistance"
 
+/datum/spellbook_entry/item/contract/IsAvailible()
+	if(istype(SSticker.mode,/datum/game_mode/dynamic))
+		var/datum/game_mode/dynamic/mode = SSticker.mode
+		if(mode.threat < CONFIG_GET(number/dynamic_apprentice_cost))
+			return 0
+
+/datum/spellbook_entry/item/contract/Buy(mob/living/carbon/human/user,obj/item/spellbook/book)
+	if(istype(SSticker.mode,/datum/game_mode/dynamic))
+		var/datum/game_mode/dynamic/mode = SSticker.mode
+		var/threat_spent = CONFIG_GET(number/dynamic_apprentice_cost)
+		mode.spend_threat(threat_spent)
+		mode.log_threat("Wizard spent [threat_spent] on apprentice contract.")
+	return ..()
+
 /datum/spellbook_entry/item/guardian
 	name = "Guardian Deck"
 	desc = "A deck of guardian tarot cards, capable of binding a personal guardian to your body. There are multiple types of guardian available, but all of them will transfer some amount of damage to you. \
@@ -389,6 +417,20 @@
 	limit = 3
 	category = "Assistance"
 
+/datum/spellbook_entry/item/bloodbottle/IsAvailible()
+	if(istype(SSticker.mode,/datum/game_mode/dynamic))
+		var/datum/game_mode/dynamic/mode = SSticker.mode
+		if(mode.threat < CONFIG_GET(keyed_list/dynamic_cost)["slaughter_demon"])
+			return 0
+
+/datum/spellbook_entry/item/bloodbottle/Buy(mob/living/carbon/human/user,obj/item/spellbook/book)
+	if(istype(SSticker.mode,/datum/game_mode/dynamic))
+		var/datum/game_mode/dynamic/mode = SSticker.mode
+		var/threat_spent = CONFIG_GET(keyed_list/dynamic_cost)["slaughter_demon"]
+		mode.spend_threat(threat_spent)
+		mode.log_threat("Wizard spent [threat_spent] on slaughter demon.")
+	return ..()
+
 /datum/spellbook_entry/item/hugbottle
 	name = "Bottle of Tickles"
 	desc = "A bottle of magically infused fun, the smell of which will \
@@ -403,6 +445,20 @@
 	limit = 3
 	category = "Assistance"
 
+/datum/spellbook_entry/item/hugbottle/IsAvailible()
+	if(istype(SSticker.mode,/datum/game_mode/dynamic))
+		var/datum/game_mode/dynamic/mode = SSticker.mode
+		if(mode.threat < round(CONFIG_GET(keyed_list/dynamic_cost)["slaughter_demon"]/3))
+			return 0
+
+/datum/spellbook_entry/item/hugbottle/Buy(mob/living/carbon/human/user,obj/item/spellbook/book)
+	if(istype(SSticker.mode,/datum/game_mode/dynamic))
+		var/datum/game_mode/dynamic/mode = SSticker.mode
+		var/threat_spent = CONFIG_GET(keyed_list/dynamic_cost)["slaughter_demon"]/3
+		mode.spend_threat(threat_spent)
+		mode.log_threat("Wizard spent [threat_spent] on laughter demon.")
+	return ..()
+
 /datum/spellbook_entry/item/mjolnir
 	name = "Mjolnir"
 	desc = "A mighty hammer on loan from Thor, God of Thunder. It crackles with barely contained power."
@@ -482,6 +538,10 @@
 /datum/spellbook_entry/summon/guns/IsAvailible()
 	if(!SSticker.mode) // In case spellbook is placed on map
 		return 0
+	if(istype(SSticker.mode,/datum/game_mode/dynamic))
+		var/datum/game_mode/dynamic/mode = SSticker.mode
+		if(mode.threat < CONFIG_GET(number/dynamic_summon_guns_requirement))
+			return 0
 	return !CONFIG_GET(flag/no_summon_guns)
 
 /datum/spellbook_entry/summon/guns/Buy(mob/living/carbon/human/user,obj/item/spellbook/book)
@@ -490,6 +550,11 @@
 	active = 1
 	playsound(get_turf(user), 'sound/magic/castsummon.ogg', 50, 1)
 	to_chat(user, "<span class='notice'>You have cast summon guns!</span>")
+	if(istype(SSticker.mode,/datum/game_mode/dynamic))
+		var/datum/game_mode/dynamic/mode = SSticker.mode
+		var/threat_spent = CONFIG_GET(number/dynamic_summon_guns_cost)
+		mode.spend_threat(threat_spent)
+		mode.log_threat("Wizard spent [threat_spent] on summon guns.")
 	return 1
 
 /datum/spellbook_entry/summon/magic
@@ -499,6 +564,10 @@
 /datum/spellbook_entry/summon/magic/IsAvailible()
 	if(!SSticker.mode) // In case spellbook is placed on map
 		return 0
+	if(istype(SSticker.mode,/datum/game_mode/dynamic))
+		var/datum/game_mode/dynamic/mode = SSticker.mode
+		if(mode.threat < CONFIG_GET(number/dynamic_summon_magic_requirement))
+			return 0
 	return !CONFIG_GET(flag/no_summon_magic)
 
 /datum/spellbook_entry/summon/magic/Buy(mob/living/carbon/human/user,obj/item/spellbook/book)
@@ -507,6 +576,11 @@
 	active = 1
 	playsound(get_turf(user), 'sound/magic/castsummon.ogg', 50, 1)
 	to_chat(user, "<span class='notice'>You have cast summon magic!</span>")
+	if(istype(SSticker.mode,/datum/game_mode/dynamic))
+		var/datum/game_mode/dynamic/mode = SSticker.mode
+		var/threat_spent = CONFIG_GET(number/dynamic_summon_magic_cost)
+		mode.spend_threat(threat_spent)
+		mode.log_threat("Wizard spent [threat_spent] on summon magic.")
 	return 1
 
 /datum/spellbook_entry/summon/events
@@ -517,6 +591,10 @@
 /datum/spellbook_entry/summon/events/IsAvailible()
 	if(!SSticker.mode) // In case spellbook is placed on map
 		return 0
+	if(istype(SSticker.mode,/datum/game_mode/dynamic) && times == 0)
+		var/datum/game_mode/dynamic/mode = SSticker.mode
+		if(mode.threat < CONFIG_GET(number/dynamic_summon_events_requirement))
+			return 0
 	return !CONFIG_GET(flag/no_summon_events)
 
 /datum/spellbook_entry/summon/events/Buy(mob/living/carbon/human/user,obj/item/spellbook/book)
@@ -525,6 +603,11 @@
 	times++
 	playsound(get_turf(user), 'sound/magic/castsummon.ogg', 50, 1)
 	to_chat(user, "<span class='notice'>You have cast summon events.</span>")
+	if(istype(SSticker.mode,/datum/game_mode/dynamic) && times == 0)
+		var/datum/game_mode/dynamic/mode = SSticker.mode
+		var/threat_spent = CONFIG_GET(number/dynamic_summon_events_cost)
+		mode.spend_threat(threat_spent)
+		mode.log_threat("Wizard spent [threat_spent] on summon events.")
 	return 1
 
 /datum/spellbook_entry/summon/events/GetInfo()

code/modules/cargo/bounty_console.dm

@@ -1,5 +1,7 @@
 #define PRINTER_TIMEOUT 10
 
+
+
 /obj/machinery/computer/bounty
 	name = "Nanotrasen bounty console"
 	desc = "Used to check and claim bounties offered by Nanotrasen"
@@ -24,9 +26,9 @@
 	for(var/datum/bounty/B in GLOB.bounties_list)
 		if(B.claimed)
 			continue
-		info += "<h3>[B.name]</h3>"
-		info += "<ul><li>Reward: [B.reward_string()]</li>"
-		info += "<li>Completed: [B.completion_string()]</li></ul>"
+		info += {"<h3>[B.name]</h3>
+			<ul><li>Reward: [B.reward_string()]</li>
+			<li>Completed: [B.completion_string()]</li></ul>"}
 
 /obj/machinery/computer/bounty/ui_interact(mob/user)
 	. = ..()
@@ -34,39 +36,36 @@
 	if(!GLOB.bounties_list.len)
 		setup_bounties()
 
-	var/dat = ""
-	dat += "<a href='?src=[REF(src)];refresh=1'>Refresh</a>"
-	dat += "<a href='?src=[REF(src)];refresh=1;choice=Print'>Print Paper</a>"
-	dat += "<p>Credits: <b>[SSshuttle.points]</b></p>"
-	dat += {"<table style="text-align:center;" border="1" cellspacing="0" width="100%">"}
-	dat += "<tr><th>Name</th><th>Description</th><th>Reward</th><th>Completion</th><th>Status</th></tr>"
+	var/list/dat = list({"<a href='?src=[REF(src)];refresh=1'>Refresh</a>
+	<a href='?src=[REF(src)];refresh=1;choice=Print'>Print Paper</a>
+	<p>Credits: <b>[SSshuttle.points]</b></p>
+	<table style="text-align:center;" border="1" cellspacing="0" width="100%">
+	<tr><th>Name</th><th>Description</th><th>Reward</th><th>Completion</th><th>Status</th></tr>"})
 	for(var/datum/bounty/B in GLOB.bounties_list)
-		var/background
-		if(B.can_claim())
-			background = "'background-color:#4F7529;'"
-		else if(B.claimed)
-			background = "'background-color:#294675;'"
+		if(B.claimed)
+			dat += "<tr style='background-color:#294675;'>"
+		else if(B.can_claim())
+			dat += "<tr style='background-color:#4F7529;'>"
 		else
-			background = "'background-color:#990000;'"
-		dat += "<tr style=[background]>"
+			dat += "<tr style='background-color:#990000;'>"
 		if(B.high_priority)
-			dat += text("<td><b>[]</b></td>", B.name)
-			dat += text("<td><b>High Priority:</b> []</td>", B.description)
-			dat += text("<td><b>[]</b></td>", B.reward_string())
+			dat += {"<td><b>[B.name]</b></td>
+			<td><b>High Priority:</b> [B.description]</td>
+			<td><b>[B.reward_string()]</b></td>"}
 		else
-			dat += text("<td>[]</td>", B.name)
-			dat += text("<td>[]</td>", B.description)
-			dat += text("<td>[]</td>", B.reward_string())
-		dat += text("<td>[]</td>", B.completion_string())
-		if(B.can_claim())
-			dat += text("<td><A href='?src=[REF(src)];refresh=1;choice=Claim;d_rec=[REF(B)]'>Claim</a></td>")
-		else if(B.claimed)
-			dat += text("<td>Claimed</td>")
+			dat += {"<td>[B.name]</td>
+			<td>[B.description]</td>
+			<td>[B.reward_string()]</td>"}
+		dat += "<td>[B.completion_string()]</td>"
+		if(B.claimed)
+			dat += "<td>Claimed</td>"
+		else if(B.can_claim())
+			dat += "<td><A href='?src=[REF(src)];refresh=1;choice=Claim;d_rec=[REF(B)]'>Claim</a></td>"
 		else
-			dat += text("<td>Unclaimed</td>")
+			dat += "<td>Unclaimed</td>"
 		dat += "</tr>"
 	dat += "</table>"
-
+	dat = dat.Join()
 	var/datum/browser/popup = new(user, "bounties", "Nanotrasen Bounties", 700, 600)
 	popup.set_content(dat)
 	popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state))
@@ -91,4 +90,3 @@
 		playsound(src, "terminal_type", 25, 0)
 
 	updateUsrDialog()
-

code/modules/cargo/console.dm

@@ -167,7 +167,7 @@
 			if(ishuman(usr))
 				var/mob/living/carbon/human/H = usr
 				name = H.get_authentification_name()
-				rank = H.get_assignment()
+				rank = H.get_assignment(hand_first = TRUE)
 			else if(issilicon(usr))
 				name = usr.real_name
 				rank = "Silicon"

code/modules/cargo/expressconsole.dm

@@ -156,7 +156,7 @@
 			if(ishuman(usr))
 				var/mob/living/carbon/human/H = usr
 				name = H.get_authentification_name()
-				rank = H.get_assignment()
+				rank = H.get_assignment(hand_first = TRUE)
 			else if(issilicon(usr))
 				name = usr.real_name
 				rank = "Silicon"

code/modules/client/preferences.dm

@@ -58,6 +58,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 	var/inquisitive_ghost = 1
 	var/allow_midround_antag = 1
 	var/preferred_map = null
+	var/preferred_chaos = null
 	var/pda_style = MONO
 	var/pda_color = "#808000"
 	var/pda_skin = PDA_SKIN_ALT
@@ -834,6 +835,12 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 			dat += "<b>Screen Shake:</b> <a href='?_src_=prefs;preference=screenshake'>[(screenshake==100) ? "Full" : ((screenshake==0) ? "None" : "[screenshake]")]</a><br>"
 			if (user && user.client && !user.client.prefs.screenshake==0)
 				dat += "<b>Damage Screen Shake:</b> <a href='?_src_=prefs;preference=damagescreenshake'>[(damagescreenshake==1) ? "On" : ((damagescreenshake==0) ? "Off" : "Only when down")]</a><br>"
+			var/p_chaos
+			if (!preferred_chaos)
+				p_chaos = "No preference"
+			else
+				p_chaos = preferred_chaos
+			dat += "<b>Preferred Chaos Amount:</b> <a href='?_src_=prefs;preference=preferred_chaos;task=input'>[p_chaos]</a><br>"
 			dat += "<br>"
 			dat += "</td>"
 			dat += "</tr></table>"
@@ -1996,6 +2003,9 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 					if (pickedmap)
 						preferred_map = maplist[pickedmap]
 
+				if ("preferred_chaos")
+					var/pickedchaos = input(user, "Choose your preferred level of chaos. This will help with dynamic threat level ratings.", "Character Preference") as null|anything in list(CHAOS_NONE,CHAOS_LOW,CHAOS_MED,CHAOS_HIGH,CHAOS_MAX)
+					preferred_chaos = pickedchaos
 				if ("clientfps")
 					var/desiredfps = input(user, "Choose your desired fps. (0 = synced with server tick rate (currently:[world.fps]))", "Character Preference", clientfps)  as null|num
 					if (!isnull(desiredfps))

code/modules/client/preferences_savefile.dm

@@ -183,6 +183,8 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	S["autostand"]			>> autostand
 	S["cit_toggles"]		>> cit_toggles
 	S["lewdchem"]			>> lewdchem
+	S["preferred_chaos"]	>> preferred_chaos
+
 
 	//try to fix any outdated data if necessary
 	if(needs_update >= 0)
@@ -278,6 +280,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	WRITE_FILE(S["autostand"], autostand)
 	WRITE_FILE(S["cit_toggles"], cit_toggles)
 	WRITE_FILE(S["lewdchem"], lewdchem)
+	WRITE_FILE(S["preferred_chaos"], preferred_chaos)
 
 	return 1
 

code/modules/events/abductor.dm

@@ -4,7 +4,7 @@
 	weight = 10
 	max_occurrences = 1
 	min_players = 20
-	gamemode_blacklist = list("nuclear","wizard","revolution")
+	gamemode_blacklist = list("nuclear","wizard","revolution","dynamic")
 
 /datum/round_event/ghost_role/abductor
 	minimum_required = 2

code/modules/events/alien_infestation.dm

@@ -2,7 +2,7 @@
 	name = "Alien Infestation"
 	typepath = /datum/round_event/ghost_role/alien_infestation
 	weight = 5
-
+	gamemode_blacklist = list("dynamic")
 	min_players = 10
 	max_occurrences = 1
 

code/modules/events/anomaly_bluespace.dm

@@ -3,6 +3,7 @@
 	typepath = /datum/round_event/anomaly/anomaly_bluespace
 	max_occurrences = 1
 	weight = 5
+	gamemode_blacklist = list("dynamic")
 
 /datum/round_event/anomaly/anomaly_bluespace
 	startWhen = 3

code/modules/events/anomaly_flux.dm

@@ -5,6 +5,7 @@
 	min_players = 10
 	max_occurrences = 5
 	weight = 20
+	gamemode_blacklist = list("dynamic")
 
 /datum/round_event/anomaly/anomaly_flux
 	startWhen = 10

code/modules/events/anomaly_grav.dm

@@ -3,6 +3,8 @@
 	typepath = /datum/round_event/anomaly/anomaly_grav
 	max_occurrences = 5
 	weight = 20
+	gamemode_blacklist = list("dynamic")
+
 
 /datum/round_event/anomaly/anomaly_grav
 	startWhen = 3

code/modules/events/anomaly_pyro.dm

@@ -3,6 +3,7 @@
 	typepath = /datum/round_event/anomaly/anomaly_pyro
 	max_occurrences = 5
 	weight = 20
+	gamemode_blacklist = list("dynamic")
 
 /datum/round_event/anomaly/anomaly_pyro
 	startWhen = 3

code/modules/events/anomaly_vortex.dm

@@ -5,6 +5,7 @@
 	min_players = 20
 	max_occurrences = 2
 	weight = 5
+	gamemode_blacklist = list("dynamic")
 
 /datum/round_event/anomaly/anomaly_vortex
 	startWhen = 10

code/modules/events/blob.dm

@@ -7,7 +7,7 @@
 	earliest_start = 40 MINUTES
 	min_players = 35
 
-	gamemode_blacklist = list("blob") //Just in case a blob survives that long
+	gamemode_blacklist = list("blob","dynamic") //Just in case a blob survives that long
 
 /datum/round_event/ghost_role/blob
 	announceWhen	= -1

code/modules/events/brand_intelligence.dm

@@ -5,6 +5,7 @@
 
 	min_players = 15
 	max_occurrences = 1
+	gamemode_blacklist = list("dynamic")
 
 /datum/round_event/brand_intelligence
 	announceWhen	= 21

code/modules/events/carp_migration.dm

@@ -5,6 +5,7 @@
 	min_players = 2
 	earliest_start = 10 MINUTES
 	max_occurrences = 6
+	gamemode_blacklist = list("dynamic")
 
 /datum/round_event/carp_migration
 	announceWhen	= 3

code/modules/events/communications_blackout.dm

@@ -2,6 +2,7 @@
 	name = "Communications Blackout"
 	typepath = /datum/round_event/communications_blackout
 	weight = 30
+	gamemode_blacklist = list("dynamic")
 
 /datum/round_event/communications_blackout
 	announceWhen	= 1

code/modules/events/dust.dm

@@ -5,6 +5,7 @@
 	max_occurrences = 1000
 	earliest_start = 0 MINUTES
 	alertadmins = 0
+	gamemode_blacklist = list("dynamic")
 
 /datum/round_event/space_dust
 	startWhen		= 1

code/modules/events/electrical_storm.dm

@@ -5,6 +5,7 @@
 	min_players = 5
 	weight = 40
 	alertadmins = 0
+	gamemode_blacklist = list("dynamic")
 
 /datum/round_event/electrical_storm
 	var/lightsoutAmount	= 1

code/modules/events/heart_attack.dm

@@ -4,6 +4,7 @@
 	weight = 20
 	max_occurrences = 2
 	min_players = 40 // To avoid shafting lowpop
+	gamemode_blacklist = list("dynamic")
 
 /datum/round_event/heart_attack/start()
 	var/list/heart_attack_contestants = list()

code/modules/events/ion_storm.dm

@@ -3,6 +3,7 @@
 /datum/round_event_control/ion_storm
 	name = "Ion Storm"
 	typepath = /datum/round_event/ion_storm
+	gamemode_blacklist = list("dynamic")
 	weight = 15
 	min_players = 2
 

code/modules/events/nightmare.dm

@@ -2,6 +2,7 @@
 	name = "Spawn Nightmare"
 	typepath = /datum/round_event/ghost_role/nightmare
 	max_occurrences = 1
+	gamemode_blacklist = list("dynamic")
 	min_players = 20
 
 /datum/round_event/ghost_role/nightmare

code/modules/events/pirates.dm

@@ -5,7 +5,7 @@
 	max_occurrences = 1
 	min_players = 10
 	earliest_start = 30 MINUTES
-	gamemode_blacklist = list("nuclear")
+	gamemode_blacklist = list("nuclear","dynamic")
 
 /datum/round_event_control/pirates/preRunEvent()
 	if (!SSmapping.empty_space)

code/modules/events/radiation_storm.dm

@@ -2,6 +2,7 @@
 	name = "Radiation Storm"
 	typepath = /datum/round_event/radiation_storm
 	max_occurrences = 1
+	gamemode_blacklist = list("dynamic")
 
 /datum/round_event/radiation_storm
 

code/modules/events/spider_infestation.dm

@@ -2,6 +2,7 @@
 	name = "Spider Infestation"
 	typepath = /datum/round_event/spider_infestation
 	weight = 5
+	gamemode_blacklist = list("dynamic")
 	max_occurrences = 1
 	min_players = 15
 

code/modules/events/vent_clog.dm

@@ -3,6 +3,7 @@
 	typepath = /datum/round_event/vent_clog
 	weight = 10
 	max_occurrences = 3
+	gamemode_blacklist = list("dynamic")
 	min_players = 25
 
 /datum/round_event/vent_clog

code/modules/jobs/access.dm

@@ -35,6 +35,12 @@
 /obj/item/proc/GetID()
 	return null
 
+/obj/item/proc/RemoveID()
+	return null
+
+/obj/item/proc/InsertID()
+	return FALSE
+
 /obj/proc/text2access(access_text)
 	. = list()
 	if(!access_text)

code/modules/keybindings/bindings_human.dm

@@ -1,7 +1,4 @@
 /mob/living/carbon/human/key_down(_key, client/user)
-	if("Shift")
-		sprint_hotkey(TRUE)
-		return
 	if(client.keys_held["Shift"])
 		switch(_key)
 			if("E") // Put held thing in belt or take out most recent thing from belt
@@ -59,6 +56,10 @@
 					return
 				stored.attack_hand(src) // take out thing from backpack
 				return
+	switch(_key)
+		if("Shift")
+			sprint_hotkey(TRUE)
+			return
 	return ..()
 
 /mob/living/carbon/human/key_up(_key, client/user)

code/modules/mining/equipment/kinetic_crusher.dm

@@ -63,8 +63,7 @@
 
 /obj/item/twohanded/kinetic_crusher/attack(mob/living/target, mob/living/carbon/user)
 	if(!wielded)
-		to_chat(user, "<span class='warning'>[src] is too heavy to use with one hand. You fumble and drop everything.")
-		user.drop_all_held_items()
+		to_chat(user, "<span class='warning'>[src] is too heavy to use with one hand.")
 		return
 	var/datum/status_effect/crusher_damage/C = target.has_status_effect(STATUS_EFFECT_CRUSHERDAMAGETRACKING)
 	var/target_health = target.health

code/modules/mob/living/carbon/human/death.dm

@@ -54,11 +54,16 @@
 /mob/living/carbon/human/proc/makeSkeleton()
 	ADD_TRAIT(src, TRAIT_DISFIGURED, TRAIT_GENERIC)
 	set_species(/datum/species/skeleton)
-	return 1
+	return TRUE
 
 
 /mob/living/carbon/proc/Drain()
 	become_husk(CHANGELING_DRAIN)
 	ADD_TRAIT(src, TRAIT_NOCLONE, CHANGELING_DRAIN)
 	blood_volume = 0
-	return 1
+	return TRUE
+
+/mob/living/carbon/proc/makeUncloneable()
+	ADD_TRAIT(src, TRAIT_NOCLONE, MADE_UNCLONEABLE)
+	blood_volume = 0
+	return TRUE

code/modules/mob/living/carbon/human/human.dm

@@ -574,7 +574,7 @@
 		return threatcount
 
 	//Check for ID
-	var/obj/item/card/id/idcard = get_idcard()
+	var/obj/item/card/id/idcard = get_idcard(FALSE)
 	if( (judgement_criteria & JUDGE_IDCHECK) && !idcard && name=="Unknown")
 		threatcount += 4
 

code/modules/mob/living/carbon/human/human_helpers.dm

@@ -11,8 +11,8 @@
 
 //gets assignment from ID or ID inside PDA or PDA itself
 //Useful when player do something with computers
-/mob/living/carbon/human/proc/get_assignment(if_no_id = "No id", if_no_job = "No job")
-	var/obj/item/card/id/id = get_idcard()
+/mob/living/carbon/human/proc/get_assignment(if_no_id = "No id", if_no_job = "No job", hand_first = TRUE)
+	var/obj/item/card/id/id = get_idcard(hand_first)
 	if(id)
 		. = id.assignment
 	else
@@ -27,7 +27,7 @@
 //gets name from ID or ID inside PDA or PDA itself
 //Useful when player do something with computers
 /mob/living/carbon/human/proc/get_authentification_name(if_no_id = "Unknown")
-	var/obj/item/card/id/id = get_idcard()
+	var/obj/item/card/id/id = get_idcard(FALSE)
 	if(id)
 		return id.registered_name
 	var/obj/item/pda/pda = wear_id
@@ -86,10 +86,15 @@
 	return
 
 //gets ID card object from special clothes slot or null.
-/mob/living/carbon/human/get_idcard()
-	if(wear_id)
-		return wear_id.GetID()
-
+/mob/living/carbon/human/get_idcard(hand_first = TRUE)
+	. = ..()
+	if(. && hand_first)
+		return
+	//Check inventory slots
+	var/obj/item/card/id/id_card = wear_id?.GetID()
+	if(!id_card)
+		id_card = belt?.GetID()
+	return id_card || .
 
 /mob/living/carbon/human/IsAdvancedToolUser()
 	if(HAS_TRAIT(src, TRAIT_MONKEYLIKE))
@@ -100,7 +105,6 @@
 	return dna.species.handle_chemicals(R,src)
 	// if it returns 0, it will run the usual on_mob_life for that reagent. otherwise, it will stop after running handle_chemicals for the species.
 
-
 /mob/living/carbon/human/can_track(mob/living/user)
 	if(wear_id && istype(wear_id.GetID(), /obj/item/card/id/syndicate))
 		return 0

code/modules/mob/living/silicon/ai/ai.dm

@@ -882,6 +882,7 @@
 /mob/living/silicon/ai/revive(full_heal = 0, admin_revive = 0)
 	. = ..()
 	if(.) //successfully ressuscitated from death
+		set_eyeobj_visible(TRUE)
 		set_core_display_icon(display_icon_override)
 
 /mob/living/silicon/ai/proc/malfhacked(obj/machinery/power/apc/apc)

code/modules/mob/living/silicon/ai/death.dm

@@ -18,6 +18,7 @@
 	update_canmove()
 	if(eyeobj)
 		eyeobj.setLoc(get_turf(src))
+		set_eyeobj_visible(FALSE)
 
 	GLOB.shuttle_caller_list -= src
 	SSshuttle.autoEvac()

code/modules/mob/living/silicon/ai/freelook/eye.dm

@@ -6,6 +6,8 @@
 /mob/camera/aiEye
 	name = "Inactive AI Eye"
 
+	icon_state = "ai_camera"
+	icon = 'icons/mob/cameramob.dmi'
 	invisibility = INVISIBILITY_MAXIMUM
 	hud_possible = list(ANTAG_HUD, AI_DETECT_HUD = HUD_LIST_LIST)
 	var/list/visibleCameraChunks = list()
@@ -158,11 +160,11 @@
 	cameraFollow = null
 	unset_machine()
 
-	if(!eyeobj || !eyeobj.loc || QDELETED(eyeobj))
+	if(isturf(loc) && (QDELETED(eyeobj) || !eyeobj.loc))
 		to_chat(src, "ERROR: Eyeobj not found. Creating new eye...")
 		create_eye()
 
-	eyeobj.setLoc(loc)
+	eyeobj?.setLoc(loc)
 
 /mob/living/silicon/ai/proc/create_eye()
 	if(eyeobj)
@@ -172,6 +174,13 @@
 	eyeobj.ai = src
 	eyeobj.setLoc(loc)
 	eyeobj.name = "[name] (AI Eye)"
+	set_eyeobj_visible(TRUE)
+
+/mob/living/silicon/ai/proc/set_eyeobj_visible(state = TRUE)
+	if(!eyeobj)
+		return
+	eyeobj.mouse_opacity = state ? MOUSE_OPACITY_ICON : initial(eyeobj.mouse_opacity)
+	eyeobj.invisibility = state ? INVISIBILITY_OBSERVER : initial(eyeobj.invisibility)
 
 /mob/living/silicon/ai/verb/toggle_acceleration()
 	set category = "AI Commands"

code/modules/mob/living/silicon/ai/life.dm

@@ -19,7 +19,7 @@
 			// messenging the client
 			malfhacked(malfhack)
 
-		if(!eyeobj || QDELETED(eyeobj) || !eyeobj.loc)
+		if(isturf(loc) && (QDELETED(eyeobj) || !eyeobj.loc))
 			view_core()
 
 		if(machine)

code/modules/mob/living/silicon/ai/login.dm

@@ -6,6 +6,7 @@
 			O.mode = 1
 			O.emotion = "Neutral"
 			O.update()
+	set_eyeobj_visible(TRUE)
 	if(multicam_on)
 		end_multicam()
 	view_core()

code/modules/mob/living/silicon/ai/logout.dm

@@ -4,4 +4,5 @@
 		var/obj/machinery/status_display/ai/O = each
 		O.mode = 0
 		O.update()
+	set_eyeobj_visible(FALSE)
 	view_core()

code/modules/mob/living/silicon/ai/multicam.dm

@@ -120,6 +120,9 @@ GLOBAL_DATUM(ai_camera_room_landmark, /obj/effect/landmark/ai_multicam_room)
 
 /mob/camera/aiEye/pic_in_pic
 	name = "Secondary AI Eye"
+	invisibility = INVISIBILITY_OBSERVER
+	mouse_opacity = MOUSE_OPACITY_ICON
+	icon_state = "ai_pip_camera"
 	var/obj/screen/movable/pic_in_pic/ai/screen
 	var/list/cameras_telegraphed = list()
 	var/telegraph_cameras = TRUE

code/modules/mob/living/simple_animal/simple_animal.dm

@@ -462,8 +462,8 @@
 			return
 	sync_lighting_plane_alpha()
 
-/mob/living/simple_animal/get_idcard()
-	return access_card
+/mob/living/simple_animal/get_idcard(hand_first = TRUE)
+	return ..() || access_card
 
 /mob/living/simple_animal/OpenCraftingMenu()
 	if(dextrous)

code/modules/mob/mob.dm

@@ -933,10 +933,6 @@ GLOBAL_VAR_INIT(exploit_warn_spam_prevention, 0)
 /mob/proc/can_hold_items()
 	return FALSE
 
-/mob/proc/get_idcard()
-	return
-
-
 /mob/vv_get_dropdown()
 	. = ..()
 	. += "---"

code/modules/mob/mob_helpers.dm

@@ -518,3 +518,17 @@ It's fairly easy to fix if dealing with single letters but not so much with comp
 		else if(HAS_TRAIT_FROM(src, TRAIT_DISSECTED,"Thorough Dissection"))
 			dissectionmsg = " via Thorough Dissection"
 		. += "<span class='notice'>This body has been dissected and analyzed[dissectionmsg].</span><br>"
+
+//gets ID card object from special clothes slot or null.
+/mob/proc/get_idcard(hand_first = TRUE)
+	var/obj/item/held_item = get_active_held_item()
+	. = held_item?.GetID()
+	if(!.) //If so, then check the inactive hand
+		held_item = get_inactive_held_item()
+		. = held_item?.GetID()
+
+/mob/proc/get_id_in_hand()
+	var/obj/item/held_item = get_active_held_item()
+	if(!held_item)
+		return
+	return held_item.GetID()

code/modules/modular_computers/computers/item/computer.dm

@@ -157,6 +157,21 @@
 		return card_slot.GetID()
 	return ..()
 
+/obj/item/modular_computer/RemoveID()
+	var/obj/item/computer_hardware/card_slot/card_slot = all_components[MC_CARD]
+	if(!card_slot)
+		return
+	return card_slot.RemoveID()
+
+/obj/item/modular_computer/InsertID(obj/item/inserting_item)
+	var/obj/item/computer_hardware/card_slot/card_slot = all_components[MC_CARD]
+	if(!card_slot)
+		return FALSE
+	var/obj/item/card/inserting_id = inserting_item.RemoveID()
+	if(!inserting_id)
+		return FALSE
+	return card_slot.try_insert(inserting_id)
+
 /obj/item/modular_computer/MouseDrop(obj/over_object, src_location, over_location)
 	var/mob/M = usr
 	if((!istype(over_object, /obj/screen)) && usr.canUseTopic(src))

code/modules/modular_computers/file_system/program.dm

@@ -97,14 +97,8 @@
 			card_slot = computer.all_components[MC_CARD]
 			D = card_slot.GetID()
 		var/mob/living/carbon/human/h = user
-		var/obj/item/card/id/I = h.get_idcard()
-		var/obj/item/card/id/C = h.get_active_held_item()
-		if(C)
-			C = C.GetID()
-		if(!(C && istype(C)))
-			C = null
-
-		if(!I && !C && !D)
+		var/obj/item/card/id/I = h.get_idcard(TRUE)
+		if(!I && !D)
 			if(loud)
 				to_chat(user, "<span class='danger'>\The [computer] flashes an \"RFID Error - Unable to scan ID\" warning.</span>")
 			return 0
@@ -112,9 +106,6 @@
 		if(I)
 			if(access_to_check in I.GetAccess())
 				return 1
-		else if(C)
-			if(access_to_check in C.GetAccess())
-				return 1
 		else if(D)
 			if(access_to_check in D.GetAccess())
 				return 1

code/modules/modular_computers/file_system/programs/card.dm

@@ -117,7 +117,7 @@
 	else
 		if(ishuman(user))
 			var/mob/living/carbon/human/h = user
-			user_id_card = h.get_idcard()
+			user_id_card = h.get_idcard(TRUE)
 
 	switch(action)
 		if("PRG_switchm")

code/modules/modular_computers/hardware/card_slot.dm

@@ -29,6 +29,17 @@
 		return stored_card2
 	return ..()
 
+/obj/item/computer_hardware/card_slot/RemoveID()
+	if(stored_card)
+		. = stored_card
+		if(!try_eject(1))
+			return null
+		return
+	if(stored_card2)
+		. = stored_card2
+		if(!try_eject(2))
+			return null
+
 /obj/item/computer_hardware/card_slot/on_install(obj/item/modular_computer/M, mob/living/user = null)
 	M.add_verb(device_type)
 

code/modules/ninja/ninja_event.dm

@@ -14,6 +14,7 @@ Contents:
 	typepath = /datum/round_event/ghost_role/ninja
 	max_occurrences = 1
 	earliest_start = 40 MINUTES
+	gamemode_blacklist = list("dynamic")
 	min_players = 15
 
 /datum/round_event/ghost_role/ninja

code/modules/research/xenobiology/xenobio_camera.dm

@@ -1,8 +1,8 @@
 //Xenobio control console
 /mob/camera/aiEye/remote/xenobio
-	visible_icon = 1
-	icon = 'icons/obj/abductor.dmi'
-	icon_state = "camera_target"
+	visible_icon = TRUE
+	icon = 'icons/mob/cameramob.dmi'
+	icon_state = "generic_camera"
 	var/allowed_area = null
 
 /mob/camera/aiEye/remote/xenobio/Initialize()
@@ -63,9 +63,9 @@
 /obj/machinery/computer/camera_advanced/xenobio/CreateEye()
 	eyeobj = new /mob/camera/aiEye/remote/xenobio(get_turf(src))
 	eyeobj.origin = src
-	eyeobj.visible_icon = 1
-	eyeobj.icon = 'icons/obj/abductor.dmi'
-	eyeobj.icon_state = "camera_target"
+	eyeobj.visible_icon = TRUE
+	eyeobj.icon = 'icons/mob/cameramob.dmi'
+	eyeobj.icon_state = "generic_camera"
 
 /obj/machinery/computer/camera_advanced/xenobio/GrantActions(mob/living/user)
 	..()

code/modules/shuttle/emergency.dm

@@ -57,7 +57,7 @@
 	var/mob/user = usr
 	. = FALSE
 
-	var/obj/item/card/id/ID = user.get_idcard()
+	var/obj/item/card/id/ID = user.get_idcard(TRUE)
 
 	if(!ID)
 		to_chat(user, "<span class='warning'>You don't have an ID.</span>")
@@ -93,7 +93,7 @@
 			minor_announce("Early launch authorization revoked, [remaining] authorizations needed")
 
 /obj/machinery/computer/emergency_shuttle/proc/authorize(mob/user, source)
-	var/obj/item/card/id/ID = user.get_idcard()
+	var/obj/item/card/id/ID = user.get_idcard(TRUE)
 
 	if(ID in authorized)
 		return FALSE

code/modules/shuttle/special.dm

@@ -199,7 +199,7 @@
 		if(H.mind && H.mind.assigned_role == "Bartender")
 			return TRUE
 
-	var/obj/item/card/id/ID = user.get_idcard()
+	var/obj/item/card/id/ID = user.get_idcard(FALSE)
 	if(ID && (ACCESS_CENT_BAR in ID.access))
 		return TRUE