Merge branch 'master' into upstream-merge-26760

code/datums/antagonists/antag_datum.dm

@@ -8,13 +8,26 @@
 	var/can_coexist_with_others = TRUE			//Whether or not the person will be able to have more than one datum
 	var/list/typecache_datum_blacklist = list()	//List of datums this type can't coexist with
 
-
 /datum/antagonist/New(datum/mind/new_owner)
-	. = ..()
 	typecache_datum_blacklist = typecacheof(typecache_datum_blacklist)
 	if(new_owner)
 		owner = new_owner
 
+/datum/antagonist/Destroy()
+	if(owner)
+		LAZYREMOVE(owner.antag_datums, src)
+	owner = null
+	return ..()
+
+/datum/antagonist/proc/can_be_owned(datum/mind/new_owner)
+	. = TRUE
+	if(owner.has_antag_datum(type))
+		return FALSE
+	for(var/i in owner.antag_datums)
+		var/datum/antagonist/A = i
+		if(is_type_in_typecache(src, A.typecache_datum_blacklist))
+			return FALSE
+
 /datum/antagonist/proc/on_body_transfer(mob/living/old_body, mob/living/new_body)
 	remove_innate_effects(old_body)
 	apply_innate_effects(new_body)
@@ -37,7 +50,7 @@
 /datum/antagonist/proc/on_removal()
 	remove_innate_effects()
 	if(owner)
-		owner.antag_datums -= src
+		LAZYREMOVE(owner.antag_datums, src)
 		if(!silent && owner.current)
 			farewell()
 	qdel(src)
@@ -46,4 +59,4 @@
 	return
 
 /datum/antagonist/proc/farewell()
-	return
+	return

code/datums/antagonists/datum_clockcult.dm

@@ -9,23 +9,49 @@
 	qdel(hierophant_network)
 	return ..()
 
+/datum/antagonist/clockcult/can_be_owned(datum/mind/new_owner)
+	. = ..()
+	if(.)
+		if(iscyborg(new_owner.current))
+			var/mob/living/silicon/robot/R = new_owner.current
+			if(R.deployed)
+				var/mob/living/silicon/ai/AI = R.mainframe
+				R.undeploy()
+				to_chat(AI, "<span class='userdanger'>Anomaly Detected. Returned to core!</span>") //The AI needs to be in its core to properly be converted
+		. = is_eligible_servant(new_owner.current)
+		if(!silent && new_owner.current)
+			if(issilicon(new_owner.current))
+				to_chat(new_owner.current, "<span class='heavy_brass'>You are unable to compute this truth. Your vision glows a brilliant yellow, and all at once it comes to you. Ratvar, the \
+				Clockwork Justiciar, lies in exile, derelict and forgotten in an unseen realm.</span>")
+			else
+				to_chat(new_owner.current, "<span class='heavy_brass'>[iscarbon(new_owner.current) ? "Your mind is racing! Your body feels incredibly light! ":""]Your world glows a brilliant \
+				yellow! All at once it comes to you. Ratvar, the Clockwork Justiciar, lies in exile, derelict and forgotten in an unseen realm.</span>")
+			if(!.)
+				new_owner.current.visible_message("<span class='boldwarning'>[new_owner.current] seems to resist an unseen force!</span>")
+				to_chat(new_owner.current, "<span class='userdanger'>And yet, you somehow push it all away.</span>")
+
+/datum/antagonist/clockcult/greet()
+	if(!owner.current || silent)
+		return
+	owner.current.visible_message("<span class='heavy_brass'>[owner.current]'s eyes glow a blazing yellow!</span>")
+	to_chat(owner.current, "<span class='heavy_brass'>Assist your new companions in their righteous efforts. Your goal is theirs, and theirs yours. You serve the Clockwork \
+	Justiciar above all else. Perform his every whim without hesitation.</span>")
+
 /datum/antagonist/clockcult/on_gain()
-	if(!owner)
-		return
 	var/mob/living/current = owner.current
-	if(!istype(current))
-		return
+	SSticker.mode.servants_of_ratvar += owner
+	SSticker.mode.update_servant_icons_added(owner)
 	if(jobban_isbanned(current, ROLE_SERVANT_OF_RATVAR))
-		addtimer(CALLBACK(SSticker.mode, /datum/game_mode.proc/replace_jobbaned_player, owner, ROLE_SERVANT_OF_RATVAR, ROLE_SERVANT_OF_RATVAR), 0)
+		addtimer(CALLBACK(SSticker.mode, /datum/game_mode.proc/replace_jobbaned_player, current, ROLE_SERVANT_OF_RATVAR, ROLE_SERVANT_OF_RATVAR), 0)
+	owner.special_role = "Servant of Ratvar"
 	owner.current.log_message("<font color=#BE8700>Has been converted to the cult of Ratvar!</font>", INDIVIDUAL_ATTACK_LOG)
 	if(issilicon(current))
-		var/mob/living/silicon/S = owner
-		if(iscyborg(S) && !silent)
-			to_chat(S, "<span class='boldwarning'>You have been desynced from your master AI.</span>")
-			to_chat(S, "<span class='boldwarning'>In addition, your onboard camera is no longer active and you have gained additional equipment, including a limited clockwork slab.</span>")
-		if(isAI(S))
-			to_chat(S, "<span class='boldwarning'>You are able to use your cameras to listen in on conversations.</span>")
-		to_chat(S, "<span class='heavy_brass'>You can communicate with other servants by using the Hierophant Network action button in the upper left.</span>")
+		if(iscyborg(current) && !silent)
+			to_chat(current, "<span class='boldwarning'>You have been desynced from your master AI.</span>")
+			to_chat(current, "<span class='boldwarning'>In addition, your onboard camera is no longer active and you have gained additional equipment, including a limited clockwork slab.</span>")
+		if(isAI(current))
+			to_chat(current, "<span class='boldwarning'>You are able to use your cameras to listen in on conversations.</span>")
+		to_chat(current, "<span class='heavy_brass'>You can communicate with other servants by using the Hierophant Network action button in the upper left.</span>")
 	else if(isbrain(current) || isclockmob(current))
 		to_chat(current, "<span class='nezbere'>You can communicate with other servants by using the Hierophant Network action button in the upper left.</span>")
 	..()
@@ -39,7 +65,6 @@
 	if(istype(mob_override))
 		current = mob_override
 	GLOB.all_clockwork_mobs += current
-	SSticker.mode.update_servant_icons_added(owner)
 	current.faction |= "ratvar"
 	current.grant_language(/datum/language/ratvar)
 	current.update_action_buttons_icon() //because a few clockcult things are action buttons and we may be wearing/holding them for whatever reason, we need to update buttons
@@ -47,11 +72,17 @@
 		var/mob/living/silicon/S = current
 		if(iscyborg(S))
 			var/mob/living/silicon/robot/R = S
-			R.UnlinkSelf()
+			if(!R.shell)
+				R.UnlinkSelf()
 			R.module.rebuild_modules()
 		else if(isAI(S))
 			var/mob/living/silicon/ai/A = S
+			A.can_be_carded = FALSE
 			A.requires_power = POWER_REQ_CLOCKCULT
+			var/list/AI_frame = list(mutable_appearance('icons/mob/clockwork_mobs.dmi', "aiframe")) //make the AI's cool frame
+			for(var/d in GLOB.cardinal)
+				AI_frame += image('icons/mob/clockwork_mobs.dmi', A, "eye[rand(1, 10)]", dir = d) //the eyes are randomly fast or slow
+			A.add_overlay(AI_frame)
 			if(!A.lacks_power())
 				A.ai_restore_power()
 			if(A.eyeobj)
@@ -84,8 +115,6 @@
 	current.throw_alert("clockinfo", /obj/screen/alert/clockwork/infodump)
 	if(!GLOB.clockwork_gateway_activated)
 		current.throw_alert("scripturereq", /obj/screen/alert/clockwork/scripture_reqs)
-	update_slab_info()
-
 
 /datum/antagonist/clockcult/remove_innate_effects(mob/living/mob_override)
 	var/mob/living/current = owner.current
@@ -102,7 +131,9 @@
 		var/mob/living/silicon/S = current
 		if(isAI(S))
 			var/mob/living/silicon/ai/A = S
+			A.can_be_carded = initial(A.can_be_carded)
 			A.requires_power = initial(A.requires_power)
+			A.cut_overlays()
 		S.make_laws()
 		S.update_icons()
 		S.show_laws()
@@ -113,13 +144,16 @@
 		R.module.rebuild_modules()
 	if(temp_owner)
 		temp_owner.update_action_buttons_icon() //because a few clockcult things are action buttons and we may be wearing/holding them, we need to update buttons
-	update_slab_info()
 
 /datum/antagonist/clockcult/on_removal()
-	. = ..()
+	SSticker.mode.servants_of_ratvar -= owner
+	SSticker.mode.update_servant_icons_removed(owner)
 	if(!silent)
 		owner.current.visible_message("<span class='big'>[owner] seems to have remembered their true allegiance!</span>", \
 		"<span class='userdanger'>A cold, cold darkness flows through your mind, extinguishing the Justiciar's light and all of your memories as his servant.</span>")
 	owner.current.log_message("<font color=#BE8700>Has renounced the cult of Ratvar!</font>", INDIVIDUAL_ATTACK_LOG)
+	owner.wipe_memory()
+	owner.special_role = null
 	if(iscyborg(owner.current))
-		to_chat(owner.current, "<span class='warning'>Despite your freedom from Ratvar's influence, you are still irreparably damaged and no longer possess certain functions such as AI linking.</span>")
+		to_chat(owner.current, "<span class='warning'>Despite your freedom from Ratvar's influence, you are still irreparably damaged and no longer possess certain functions such as AI linking.</span>")
+	. = ..()

code/datums/antagonists/datum_cult.dm

@@ -5,29 +5,46 @@
 	qdel(communion)
 	return ..()
 
+/datum/antagonist/cult/can_be_owned(datum/mind/new_owner)
+	. = ..()
+	if(.)
+		. = is_convertable_to_cult(new_owner.current)
+
 /datum/antagonist/cult/on_gain()
 	. = ..()
-	if(!owner)
-		return
+	SSticker.mode.cult += owner
+	SSticker.mode.update_cult_icons_added(owner)
+	if(istype(SSticker.mode, /datum/game_mode/cult))
+		var/datum/game_mode/cult/C = SSticker.mode
+		C.memorize_cult_objectives(owner)
 	if(jobban_isbanned(owner.current, ROLE_CULTIST))
-		addtimer(CALLBACK(SSticker.mode, /datum/game_mode.proc/replace_jobbaned_player, owner, ROLE_CULTIST, ROLE_CULTIST), 0)
+		addtimer(CALLBACK(SSticker.mode, /datum/game_mode.proc/replace_jobbaned_player, owner.current, ROLE_CULTIST, ROLE_CULTIST), 0)
 	owner.current.log_message("<font color=#960000>Has been converted to the cult of Nar'Sie!</font>", INDIVIDUAL_ATTACK_LOG)
 
-/datum/antagonist/cult/apply_innate_effects()
+/datum/antagonist/cult/apply_innate_effects(mob/living/mob_override)
 	. = ..()
-	owner.current.faction |= "cult"
-	owner.current.verbs += /mob/living/proc/cult_help
-	communion.Grant(owner)
+	var/mob/living/current = owner.current
+	if(mob_override)
+		current = mob_override
+	current.faction |= "cult"
+	current.verbs += /mob/living/proc/cult_help
+	communion.Grant(current)
 
-/datum/antagonist/cult/remove_innate_effects()
+/datum/antagonist/cult/remove_innate_effects(mob/living/mob_override)
 	. = ..()
-	owner.current.faction -= "cult"
-	owner.current.verbs -= /mob/living/proc/cult_help
-
+	var/mob/living/current = owner.current
+	if(mob_override)
+		current = mob_override
+	current.faction -= "cult"
+	current.verbs -= /mob/living/proc/cult_help
+	communion.Remove(current)
 
 /datum/antagonist/cult/on_removal()
-	. = ..()
+	owner.wipe_memory()
+	SSticker.mode.cult -= owner
+	SSticker.mode.update_cult_icons_removed(owner)
 	to_chat(owner, "<span class='userdanger'>An unfamiliar white light flashes through your mind, cleansing the taint of the Dark One and all your memories as its servant.</span>")
 	owner.current.log_message("<font color=#960000>Has renounced the cult of Nar'Sie!</font>", INDIVIDUAL_ATTACK_LOG)
 	if(!silent)
-		owner.current.visible_message("<span class='big'>[owner] looks like [owner.current.p_they()] just reverted to their old faith!</span>")
+		owner.current.visible_message("<span class='big'>[owner] looks like [owner.current.p_they()] just reverted to their old faith!</span>")
+	. = ..()

code/datums/datumvars.dm

@@ -27,7 +27,7 @@
 	. += "---"
 	.["Call Proc"] = "?_src_=vars;proc_call=\ref[src]"
 	.["Mark Object"] = "?_src_=vars;mark_object=\ref[src]"
-	.["Delete"] = "?_src_=vars;delete=\ref[src]"
+	.["Delete"] = "?_src_=vars;delete=\ref[src]"
 
 
 /datum/proc/on_reagent_change()
@@ -94,7 +94,6 @@
 					CLONE:<font size='1'><a href='?_src_=vars;mobToDamage=[refid];adjustDamage=clone'>[M.getCloneLoss()]</a>
 					BRAIN:<font size='1'><a href='?_src_=vars;mobToDamage=[refid];adjustDamage=brain'>[M.getBrainLoss()]</a>
 					STAMINA:<font size='1'><a href='?_src_=vars;mobToDamage=[refid];adjustDamage=stamina'>[M.getStaminaLoss()]</a>
-					AROUSAL:<font size='1'><a href='?_src_=vars;mobToDamage=[refid];adjustDamage=arousal'>[M.getArousalLoss()]</a>
 				</font>
 			"}
 		else
@@ -447,7 +446,7 @@
 		var/list/L = value
 		var/list/items = list()
 
-		if (L.len > 0 && !(name == "underlays" || name == "overlays" || L.len > (IS_NORMAL_LIST(L) ? 50 : 150)))
+		if (L.len > 0 && !(name == "underlays" || name == "overlays" || L.len > (IS_NORMAL_LIST(L) ? 50 : 150)))
 			for (var/i in 1 to L.len)
 				var/key = L[i]
 				var/val
@@ -527,16 +526,16 @@
 		if(T)
 			callproc_datum(T)
 
-	else if(href_list["delete"])
-		if(!check_rights(R_DEBUG, 0))
-			return
-
-		var/datum/D = locate(href_list["delete"])
-		if(!D)
-			to_chat(usr, "Unable to locate item!")
-		admin_delete(D)
-		href_list["datumrefresh"] = href_list["delete"]
-
+	else if(href_list["delete"])
+		if(!check_rights(R_DEBUG, 0))
+			return
+
+		var/datum/D = locate(href_list["delete"])
+		if(!D)
+			to_chat(usr, "Unable to locate item!")
+		admin_delete(D)
+		href_list["datumrefresh"] = href_list["delete"]
+
 	else if(href_list["regenerateicons"])
 		if(!check_rights(0))
 			return
@@ -1166,8 +1165,6 @@
 					L.adjustCloneLoss(amount)
 				if("stamina")
 					L.adjustStaminaLoss(amount)
-				if("arousal")
-					L.adjustArousalLoss(amount)
 				else
 					to_chat(usr, "You caused an error. DEBUG: Text:[Text] Mob:[L]")
 					return
@@ -1178,3 +1175,4 @@
 				message_admins(msg)
 				admin_ticket_log(L, msg)
 				href_list["datumrefresh"] = href_list["mobToDamage"]
+

code/datums/helper_datums/getrev.dm

@@ -25,7 +25,7 @@
 		for(var/line in testmerge)
 			if(line)
 				log_world("Test merge active of PR #[line]")
-				feedback_add_details("testmerged_prs","[line]")
+				SSblackbox.add_details("testmerged_prs","[line]")
 		log_world("Based off master commit [parentcommit]")
 	else
 		log_world(parentcommit)
@@ -75,10 +75,12 @@
 
 	if(GLOB.revdata.parentcommit)
 		to_chat(src, "<b>Server revision compiled on:</b> [GLOB.revdata.date]")
+		var/prefix = ""
 		if(GLOB.revdata.testmerge.len)
 			to_chat(src, GLOB.revdata.GetTestMergeInfo())
-			to_chat(src, "Based off master commit:")
-		to_chat(src, "<a href='[config.githuburl]/commit/[GLOB.revdata.parentcommit]'>[GLOB.revdata.parentcommit]</a>")
+			prefix = "Based off master commit: "
+		var/pc = GLOB.revdata.parentcommit
+		to_chat(src, "[prefix]<a href='[config.githuburl]/commit/[pc]'>[copytext(pc, 1, min(length(pc), 7))]</a>")
 	else
 		to_chat(src, "Revision unknown")
 	to_chat(src, "<b>Current Infomational Settings:</b>")
@@ -89,7 +91,7 @@
 	to_chat(src, "Enforce Continuous Rounds: [config.continuous.len] of [config.modes.len] roundtypes")
 	to_chat(src, "Allow Midround Antagonists: [config.midround_antag.len] of [config.modes.len] roundtypes")
 	if(config.show_game_type_odds)
-		if(SSticker.current_state == GAME_STATE_PLAYING)
+		if(SSticker.IsRoundInProgress())
 			var/prob_sum = 0
 			var/current_odds_differ = FALSE
 			var/list/probs = list()

code/datums/holocall.dm

@@ -0,0 +1,159 @@
+#define HOLOPAD_MAX_DIAL_TIME 200
+
+/mob/camera/aiEye/remote/holo/setLoc()
+	. = ..()
+	var/obj/machinery/holopad/H = origin
+	H.move_hologram(eye_user, loc)
+
+//this datum manages it's own references
+
+/datum/holocall
+	var/mob/living/user	//the one that called
+	var/obj/machinery/holopad/calling_holopad	//the one that sent the call
+	var/obj/machinery/holopad/connected_holopad	//the one that answered the call (may be null)
+	var/list/dialed_holopads	//all things called, will be cleared out to just connected_holopad once answered
+
+	var/mob/camera/aiEye/remote/holo/eye	//user's eye, once connected
+	var/obj/effect/overlay/holo_pad_hologram/hologram	//user's hologram, once connected
+
+	var/call_start_time
+
+//creates a holocall made by `caller` from `calling_pad` to `callees`
+/datum/holocall/New(mob/living/caller, obj/machinery/holopad/calling_pad, list/callees)
+	call_start_time = world.time
+	user = caller
+	calling_pad.outgoing_call = src
+	calling_holopad = calling_pad
+	dialed_holopads = list()
+
+	for(var/I in callees)
+		var/obj/machinery/holopad/H = I
+		if(!QDELETED(H) && H.is_operational())
+			dialed_holopads += H
+			LAZYADD(H.holo_calls, src)
+
+	if(!dialed_holopads.len)
+		calling_pad.say("Connection failure.")
+		qdel(src)
+		return
+	
+	testing("Holocall started")
+
+//cleans up ALL references :)
+/datum/holocall/Destroy()
+	QDEL_NULL(eye)
+
+	user.reset_perspective()
+	
+	user = null
+	hologram.HC = null
+	hologram = null
+	calling_holopad.outgoing_call = null
+
+	for(var/I in dialed_holopads)
+		var/obj/machinery/holopad/H = I
+		LAZYREMOVE(H.holo_calls, src)
+	dialed_holopads.Cut()
+
+	if(calling_holopad)
+		calling_holopad.SetLightsAndPower()
+		calling_holopad = null
+	if(connected_holopad)
+		connected_holopad.SetLightsAndPower()
+		connected_holopad = null
+	
+	testing("Holocall destroyed")
+
+	return ..()
+
+//Gracefully disconnects a holopad `H` from a call. Pads not in the call are ignored. Notifies participants of the disconnection
+/datum/holocall/proc/Disconnect(obj/machinery/holopad/H)
+	testing("Holocall disconnect")
+	if(H == connected_holopad)
+		calling_holopad.say("[usr] disconnected.")
+	else if(H == calling_holopad && connected_holopad)
+		connected_holopad.say("[usr] disconnected.")
+
+	ConnectionFailure(H, TRUE)
+
+//Forcefully disconnects a holopad `H` from a call. Pads not in the call are ignored.
+/datum/holocall/proc/ConnectionFailure(obj/machinery/holopad/H, graceful = FALSE)
+	testing("Holocall connection failure: graceful [graceful]")
+	if(H == connected_holopad || H == calling_holopad)
+		if(!graceful)
+			calling_holopad.say("Connection failure.")
+		qdel(src)
+		return
+
+	LAZYREMOVE(H.holo_calls, src)
+	dialed_holopads -= H
+	if(!dialed_holopads.len)
+		if(graceful)
+			calling_holopad.say("Call rejected.")
+		testing("No recipients, terminating")
+		qdel(src)
+
+//Answers a call made to a holopad `H` which cannot be the calling holopad. Pads not in the call are ignored
+/datum/holocall/proc/Answer(obj/machinery/holopad/H)
+	testing("Holocall answer")
+	if(H == calling_holopad)
+		CRASH("How cute, a holopad tried to answer itself.")
+
+	if(!(H in dialed_holopads))
+		return
+
+	if(connected_holopad)
+		CRASH("Multi-connection holocall")
+
+	for(var/I in dialed_holopads)
+		if(I == H)
+			continue
+		Disconnect(I)
+	
+	for(var/I in H.holo_calls)
+		var/datum/holocall/HC = I
+		if(HC != src)
+			HC.Disconnect(H)
+
+	connected_holopad = H
+
+	if(!Check())
+		return
+
+	hologram = H.activate_holo(user)
+	hologram.HC = src
+
+	//eyeobj code is horrid, this is the best copypasta I could make
+	eye = new
+	eye.origin = H
+	eye.eye_initialized = TRUE
+	eye.eye_user = user
+	eye.name = "Camera Eye ([user.name])"
+	user.remote_control = eye
+	user.reset_perspective(eye)
+	eye.setLoc(H.loc)
+
+//Checks the validity of a holocall and qdels itself if it's not. Returns TRUE if valid, FALSE otherwise
+/datum/holocall/proc/Check()
+	for(var/I in dialed_holopads)
+		var/obj/machinery/holopad/H = I
+		if(!H.is_operational())
+			ConnectionFailure(H)
+	
+	if(QDELETED(src))
+		return FALSE
+
+	. = !QDELETED(user) && !user.incapacitated() && !QDELETED(calling_holopad) && calling_holopad.is_operational() && user.loc == calling_holopad.loc
+
+	if(.)
+		if(connected_holopad)
+			. = !QDELETED(connected_holopad) && connected_holopad.is_operational()
+		else
+			. = world.time < (call_start_time + HOLOPAD_MAX_DIAL_TIME)
+			if(!.)
+				calling_holopad.say("No answer recieved.")
+				calling_holopad.temp = ""
+
+	if(!.)
+		testing("Holocall Check fail")
+		qdel(src)

code/datums/mind.dm

@@ -44,9 +44,7 @@
 	var/datum/job/assigned_job
 
 	var/list/datum/objective/objectives = list()
-	var/list/datum/objective/special_verbs = list()
 
-	var/list/cult_words = list()
 	var/list/spell_list = list() // Wizard mode & "Give Spell" badmin button.
 
 	var/datum/faction/faction 			//associated faction
@@ -54,7 +52,7 @@
 	var/linglink
 
 	var/miming = 0 // Mime's vow of silence
-	var/list/antag_datums = list()
+	var/list/antag_datums
 	var/antag_hud_icon_state = null //this mind's ANTAG_HUD should have this icon_state
 	var/datum/atom_hud/antag/antag_hud = null //this mind's antag HUD
 	var/datum/gang/gang_datum //Which gang this mind belongs to, if any
@@ -71,6 +69,10 @@
 
 /datum/mind/Destroy()
 	SSticker.minds -= src
+	if(islist(antag_datums))
+		for(var/i in antag_datums)
+			qdel(i)
+		antag_datums = null
 	return ..()
 
 /datum/mind/proc/transfer_to(mob/new_character, var/force_key_move = 0)
@@ -110,15 +112,16 @@
 	memory = null
 
 // Datum antag mind procs
-/datum/mind/proc/add_antag_datum(datum_type, on_gain = TRUE)
+/datum/mind/proc/add_antag_datum(datum_type)
 	if(!datum_type)
 		return
-	if(!can_hold_antag_datum(datum_type))
-		return
 	var/datum/antagonist/A = new datum_type(src)
-	antag_datums += A
-	if(on_gain)
-		A.on_gain()
+	if(!A.can_be_owned(src))
+		qdel(A)
+		return
+	LAZYADD(antag_datums, A)
+	A.on_gain()
+	return A
 
 /datum/mind/proc/remove_antag_datum(datum_type)
 	if(!datum_type)
@@ -126,6 +129,7 @@
 	var/datum/antagonist/A = has_antag_datum(datum_type)
 	if(A)
 		A.on_removal()
+		return TRUE
 
 /datum/mind/proc/remove_all_antag_datums() //For the Lazy amongst us.
 	for(var/a in antag_datums)
@@ -143,18 +147,6 @@
 		else if(A.type == datum_type)
 			return A
 
-/datum/mind/proc/can_hold_antag_datum(datum_type)
-	if(!datum_type)
-		return
-	. = TRUE
-	if(has_antag_datum(datum_type))
-		return FALSE
-	for(var/i in antag_datums)
-		var/datum/antagonist/A = i
-		if(is_type_in_typecache(A, A.typecache_datum_blacklist))
-			return FALSE
-
-
 /*
 	Removes antag type's references from a mind.
 	objectives, uplinks, powers etc are all handled.
@@ -301,7 +293,7 @@
 		to_chat(recipient, "<i>[output]</i>")
 
 /datum/mind/proc/edit_memory()
-	if(!SSticker || !SSticker.mode)
+	if(!SSticker.HasRoundStarted())
 		alert("Not before round-start!", "Alert")
 		return
 

code/datums/ruins/lavaland.dm

@@ -42,6 +42,7 @@
 	However, all the inhabitants seem to do is grow drugs and guns."
 	suffix = "lavaland_surface_seed_vault.dmm"
 	cost = 10
+	allow_duplicates = FALSE
 
 /datum/map_template/ruin/lavaland/ash_walker
 	name = "Ash Walker Nest"

code/datums/shuttles.dm

@@ -72,7 +72,7 @@
 
 /datum/map_template/shuttle/emergency/meteor
 	suffix = "meteor"
-	name = "An Asteroid With Engines Strapped To It"
+	name = "Asteroid With Engines Strapped To It"
 	description = "A hollowed out asteroid with engines strapped to it. Due to its size and difficulty in steering it, this shuttle may damage the docking area."
 	admin_notes = "This shuttle will likely crush escape, killing anyone there."
 	credit_cost = -5000

code/datums/status_effects/buffs.dm

@@ -13,6 +13,7 @@
 /datum/status_effect/shadow_mend/on_apply()
 	owner.visible_message("<span class='notice'>Violet light wraps around [owner]'s body!</span>", "<span class='notice'>Violet light wraps around your body!</span>")
 	playsound(owner, 'sound/magic/Teleport_app.ogg', 50, 1)
+	return ..()
 
 /datum/status_effect/shadow_mend/tick()
 	owner.adjustBruteLoss(-15)
@@ -72,9 +73,12 @@
 	add_logs(owner, null, "gained Vanguard stun immunity")
 	owner.add_stun_absorption("vanguard", 200, 1, "'s yellow aura momentarily intensifies!", "Your ward absorbs the stun!", " radiating with a soft yellow light!")
 	owner.visible_message("<span class='warning'>[owner] begins to faintly glow!</span>", "<span class='brass'>You will absorb all stuns for the next twenty seconds.</span>")
+	owner.SetStunned(0, FALSE)
+	owner.SetWeakened(0)
 	progbar = new(owner, duration, owner)
 	progbar.bar.color = list("#FAE48C", "#FAE48C", "#FAE48C", rgb(0,0,0))
 	progbar.update(duration - world.time)
+	return ..()
 
 /datum/status_effect/vanguard_shield/tick()
 	progbar.update(duration - world.time)
@@ -127,6 +131,7 @@
 	animate(owner, color = oldcolor, time = 150, easing = EASE_IN)
 	addtimer(CALLBACK(owner, /atom/proc/update_atom_colour), 150)
 	playsound(owner, 'sound/magic/Ethereal_Enter.ogg', 50, 1)
+	return ..()
 
 /datum/status_effect/inathneqs_endowment/on_remove()
 	add_logs(owner, null, "lost Inath-neq's invulnerability")
@@ -178,6 +183,7 @@
 /datum/status_effect/his_grace/on_apply()
 	add_logs(owner, null, "gained His Grace's stun immunity")
 	owner.add_stun_absorption("hisgrace", INFINITY, 3, null, "His Grace protects you from the stun!")
+	return ..()
 
 /datum/status_effect/his_grace/tick()
 	bloodlust = 0
@@ -211,6 +217,7 @@
 
 /datum/status_effect/wish_granters_gift/on_apply()
 	to_chat(owner, "<span class='notice'>Death is not your end! The Wish Granter's energy suffuses you, and you begin to rise...</span>")
+	return ..()
 
 /datum/status_effect/wish_granters_gift/on_remove()
 	owner.revive(full_heal = 1, admin_revive = 1)

code/datums/status_effects/debuffs.dm

@@ -29,3 +29,50 @@
 	owner.adjustBruteLoss(0.1)
 	owner.adjustFireLoss(0.1)
 	owner.adjustToxLoss(0.2, TRUE, TRUE)
+
+/datum/status_effect/belligerent
+	id = "belligerent"
+	duration = 70
+	tick_interval = 0 //tick as fast as possible
+	status_type = STATUS_EFFECT_REPLACE
+	alert_type = /obj/screen/alert/status_effect/belligerent
+	var/leg_damage_on_toggle = 2 //damage on initial application and when the owner tries to toggle to run
+	var/cultist_damage_on_toggle = 10 //damage on initial application and when the owner tries to toggle to run, but to cultists
+
+/obj/screen/alert/status_effect/belligerent
+	name = "Belligerent"
+	desc = "<b><font color=#880020>Kneel, her-eti'c.</font></b>"
+	icon_state = "belligerent"
+	alerttooltipstyle = "clockcult"
+
+/datum/status_effect/belligerent/on_apply()
+	return do_movement_toggle(TRUE)
+
+/datum/status_effect/belligerent/tick()
+	if(!do_movement_toggle())
+		qdel(src)
+
+/datum/status_effect/belligerent/proc/do_movement_toggle(force_damage)
+	var/number_legs = owner.get_num_legs()
+	if(iscarbon(owner) && !is_servant_of_ratvar(owner) && !owner.null_rod_check() && number_legs)
+		if(force_damage || owner.m_intent != MOVE_INTENT_WALK)
+			if(GLOB.ratvar_awakens)
+				owner.Weaken(1)
+			if(iscultist(owner))
+				owner.apply_damage(cultist_damage_on_toggle * 0.5, BURN, "l_leg")
+				owner.apply_damage(cultist_damage_on_toggle * 0.5, BURN, "r_leg")
+			else
+				owner.apply_damage(leg_damage_on_toggle * 0.5, BURN, "l_leg")
+				owner.apply_damage(leg_damage_on_toggle * 0.5, BURN, "r_leg")
+		if(owner.m_intent != MOVE_INTENT_WALK)
+			if(!iscultist(owner))
+				to_chat(owner, "<span class='warning'>Your leg[number_legs > 1 ? "s shiver":" shivers"] with pain!</span>")
+			else //Cultists take extra burn damage
+				to_chat(owner, "<span class='warning'>Your leg[number_legs > 1 ? "s burn":" burns"] with pain!</span>")
+			owner.toggle_move_intent()
+		return TRUE
+	return FALSE
+
+/datum/status_effect/belligerent/on_remove()
+	if(owner.m_intent == MOVE_INTENT_WALK)
+		owner.toggle_move_intent()

code/datums/status_effects/gas.dm

@@ -16,6 +16,7 @@
 	cube = icon('icons/effects/freeze.dmi', "ice_cube")
 	owner.add_overlay(cube)
 	owner.update_canmove()
+	return ..()
 
 /datum/status_effect/freon/tick()
 	owner.update_canmove()

code/datums/status_effects/status_effect.dm

@@ -10,6 +10,7 @@
 	var/status_type = STATUS_EFFECT_UNIQUE //How many of the effect can be on one mob, and what happens when you try to add another
 	var/on_remove_on_mob_delete = FALSE //if we call on_remove() when the mob is deleted
 	var/alert_type = /obj/screen/alert/status_effect //the alert thrown by the status effect, contains name and description
+	var/obj/screen/alert/status_effect/linked_alert = null //the alert itself, if it exists
 
 /datum/status_effect/New(mob/living/new_owner)
 	if(new_owner)
@@ -30,16 +31,16 @@
 /datum/status_effect/proc/start_ticking()
 	if(!src)
 		return
-	if(!owner)
+	if(!owner || !on_apply())
 		qdel(src)
 		return
-	on_apply()
 	if(duration != -1)
 		duration = world.time + initial(duration)
 	tick_interval = world.time + initial(tick_interval)
 	if(alert_type)
 		var/obj/screen/alert/status_effect/A = owner.throw_alert(id, alert_type)
 		A.attached_effect = src //so the alert can reference us, if it needs to
+		linked_alert = A //so we can reference the alert, if we need to
 	START_PROCESSING(SSfastprocess, src)
 
 /datum/status_effect/process()
@@ -53,6 +54,8 @@
 		qdel(src)
 
 /datum/status_effect/proc/on_apply() //Called whenever the buff is applied.
+	return TRUE
+
 /datum/status_effect/proc/tick() //Called every tick.
 /datum/status_effect/proc/on_remove() //Called whenever the buff expires or is removed; do note that at the point this is called, it is out of the owner's status_effects but owner is not yet null
 /datum/status_effect/proc/be_replaced() //Called instead of on_remove when a status effect is replaced by itself or when a status effect with on_remove_on_mob_delete = FALSE has its mob deleted