Merge branch 'master' into upstream-merge-33498

code/game/gamemodes/blob/overmind.dm

@@ -215,12 +215,12 @@ GLOBAL_LIST_EMPTY(blob_nodes)
 	if(placed)
 		var/obj/structure/blob/B = locate() in range("3x3", NewLoc)
 		if(B)
-			loc = NewLoc
+			forceMove(NewLoc)
 		else
 			return 0
 	else
 		var/area/A = get_area(NewLoc)
 		if(isspaceturf(NewLoc) || istype(A, /area/shuttle)) //if unplaced, can't go on shuttles or space tiles
 			return 0
-		loc = NewLoc
+		forceMove(NewLoc)
 		return 1

code/game/gamemodes/blob/powers.dm

@@ -42,7 +42,7 @@
 			return 0
 	else if(placement_override == 1)
 		var/turf/T = pick(GLOB.blobstart)
-		loc = T //got overrided? you're somewhere random, motherfucker
+		forceMove(T) //got overrided? you're somewhere random, motherfucker
 	if(placed && blob_core)
 		blob_core.forceMove(loc)
 	else
@@ -74,7 +74,7 @@
 		var/node_name = input(src, "Choose a node to jump to.", "Node Jump") in nodes
 		var/obj/structure/blob/node/chosen_node = nodes[node_name]
 		if(chosen_node)
-			loc = chosen_node.loc
+			forceMove(chosen_node.loc)
 
 /mob/camera/blob/proc/createSpecial(price, blobType, nearEquals, needsNode, turf/T)
 	if(!T)

code/game/gamemodes/clock_cult/clock_helpers/power_helpers.dm

@@ -10,12 +10,15 @@
 	for(var/obj/effect/clockwork/sigil/transmission/T in GLOB.all_clockwork_objects)
 		T.update_icon()
 	var/power_overwhelming = GLOB.clockwork_power
+	var/unlock_message
 	if(power_overwhelming >= SCRIPT_UNLOCK_THRESHOLD && !GLOB.script_scripture_unlocked)
 		GLOB.script_scripture_unlocked = TRUE
-		hierophant_message("<span class='large_brass bold'>The Ark swells as a key power threshold is reached. Script scriptures are now available.</span>")
+		unlock_message = "<span class='large_brass bold'>The Ark swells as a key power threshold is reached. Script scriptures are now available.</span>"
 	if(power_overwhelming >= APPLICATION_UNLOCK_THRESHOLD && !GLOB.application_scripture_unlocked)
 		GLOB.application_scripture_unlocked = TRUE
-		hierophant_message("<span class='large_brass bold'>The Ark surges as a key power threshold is reached. Application scriptures are now available.</span>")
+		unlock_message = "<span class='large_brass bold'>The Ark surges as a key power threshold is reached. Application scriptures are now available.</span>"
+	if(GLOB.servants_active)
+		hierophant_message(unlock_message)
 	return TRUE
 
 /proc/can_access_clockwork_power(atom/movable/access_point, amount) //Returns true if the access point has access to clockwork power (and optionally, a number of watts for it)

code/game/gamemodes/clock_cult/clock_helpers/scripture_checks.dm

@@ -11,6 +11,8 @@
 
 //reports to servants when scripture is locked or unlocked
 /proc/scripture_unlock_alert(list/previous_states)
+	if(!GLOB.servants_active)
+		return
 	. = scripture_unlock_check()
 	for(var/i in .)
 		if(.[i] != previous_states[i])

code/game/gamemodes/clock_cult/clock_mobs/clockwork_marauder.dm

@@ -1,13 +1,13 @@
 #define MARAUDER_SLOWDOWN_PERCENTAGE 0.40 //Below this percentage of health, marauders will become slower
-#define MARAUDER_SHIELD_REGEN_TIME 100 //In deciseconds, how long it takes for shields to regenerate after breaking
+#define MARAUDER_SHIELD_REGEN_TIME 200 //In deciseconds, how long it takes for shields to regenerate after breaking
 
 //Clockwork marauder: A well-rounded frontline construct. Only one can exist for every two human servants.
 /mob/living/simple_animal/hostile/clockwork/marauder
 	name = "clockwork marauder"
 	desc = "The stalwart apparition of a soldier, blazing with crimson flames. It's armed with a gladius and shield."
 	icon_state = "clockwork_marauder"
-	health = 150
-	maxHealth = 150
+	health = 120
+	maxHealth = 120
 	force_threshold = 8
 	speed = 0
 	obj_damage = 40
@@ -39,10 +39,11 @@
 		speed = initial(speed) + 1 //Yes, this slows them down
 	else
 		speed = initial(speed)
-	if(shield_health != max_shield_health && world.time >= shield_health_regen)
-		to_chat(src, "<span class='neovgre'>Your shield has recovered. <b>[max_shield_health]</b> blocks remaining!</span>")
+	if(shield_health < max_shield_health && world.time >= shield_health_regen)
+		shield_health_regen = world.time + MARAUDER_SHIELD_REGEN_TIME
+		to_chat(src, "<span class='neovgre'>Your shield has recovered, <b>[shield_health]</b> blocks remaining!</span>")
 		playsound_local(src, "shatter", 75, TRUE, frequency = -1)
-		shield_health = max_shield_health
+		shield_health++
 
 /mob/living/simple_animal/hostile/clockwork/marauder/update_values()
 	if(GLOB.ratvar_awakens) //Massive attack damage bonuses and health increase, because Ratvar

code/game/gamemodes/miniantags/abduction/abduction_gear.dm

@@ -2,6 +2,8 @@
 #define VEST_COMBAT 2
 #define GIZMO_SCAN 1
 #define GIZMO_MARK 2
+#define MIND_DEVICE_MESSAGE 1
+#define MIND_DEVICE_CONTROL 2
 
 //AGENT VEST
 /obj/item/clothing/suit/armor/abductor/vest
@@ -278,6 +280,84 @@
 			if(!istype(I, /obj/item/device/radio/headset))
 				r.broadcasting = 0 //goddamned headset hacks
 
+/obj/item/device/abductor/mind_device
+	name = "mental interface device"
+	desc = "A dual-mode tool for directly communicating with sentient brains. It can be used to send a direct message to a target, \
+			or to send a command to a test subject with a charged gland."
+	icon_state = "mind_device_message"
+	item_state = "silencer"
+	lefthand_file = 'icons/mob/inhands/antag/abductor_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/antag/abductor_righthand.dmi'
+	var/mode = MIND_DEVICE_MESSAGE
+
+/obj/item/device/abductor/mind_device/attack_self(mob/user)
+	if(!ScientistCheck(user))
+		return
+
+	if(mode == MIND_DEVICE_MESSAGE)
+		mode = MIND_DEVICE_CONTROL
+		icon_state = "mind_device_control"
+	else
+		mode = MIND_DEVICE_MESSAGE
+		icon_state = "mind_device_message"
+	to_chat(user, "<span class='notice'>You switch the device to [mode==MIND_DEVICE_MESSAGE? "TRANSMISSION": "COMMAND"] MODE</span>")
+
+/obj/item/device/abductor/mind_device/afterattack(atom/target, mob/living/user, flag, params)
+	if(!ScientistCheck(user))
+		return
+
+	switch(mode)
+		if(MIND_DEVICE_CONTROL)
+			mind_control(target, user)
+		if(MIND_DEVICE_MESSAGE)
+			mind_message(target, user)
+
+/obj/item/device/abductor/mind_device/proc/mind_control(atom/target, mob/living/user)
+	if(iscarbon(target))
+		var/mob/living/carbon/C = target
+		var/obj/item/organ/heart/gland/G = C.getorganslot("heart")
+		if(!istype(G))
+			to_chat(user, "<span class='warning'>Your target does not have an experimental gland!</span>")
+			return
+		if(!G.mind_control_uses)
+			to_chat(user, "<span class='warning'>Your target's gland is spent!</span>")
+			return
+		if(G.active_mind_control)
+			to_chat(user, "<span class='warning'>Your target is already under a mind-controlling influence!</span>")
+			return
+
+		var/command = stripped_input(user, "Enter the command for your target to follow.\
+											Uses Left: [G.mind_control_uses], Duration: [G.mind_control_duration / 10] seconds","Enter command")
+
+		if(!command)
+			return
+
+		if(QDELETED(user) || user.get_active_held_item() != src || loc != user)
+			return
+
+		if(QDELETED(G))
+			return
+
+		G.mind_control(command, user)
+		to_chat(user, "<span class='notice'>You send the command to your target.</span>")
+
+/obj/item/device/abductor/mind_device/proc/mind_message(atom/target, mob/living/user)
+	if(isliving(target))
+		var/mob/living/L = target
+		if(L.stat == DEAD)
+			to_chat(user, "<span class='warning'>Your target is dead!</span>")
+			return
+		var/message = stripped_input(user, "Write a message to send to your target's brain.","Enter message")
+		if(!message)
+			return
+		if(QDELETED(L) || L.stat == DEAD)
+			return
+
+		to_chat(L, "<span class='italics'>You hear a voice in your head saying: </span><span class='abductor'>[message]</span>")
+		to_chat(user, "<span class='notice'>You send the message to your target.</span>")
+		log_talk(user,"[key_name(user)] sent an abductor mind message to [L]/[L.ckey]: '[message]'", LOGSAY)
+
+
 /obj/item/device/firing_pin/abductor
 	name = "alien firing pin"
 	icon_state = "firing_pin_ayy"

code/game/gamemodes/miniantags/abduction/gland.dm

@@ -12,28 +12,68 @@
 	var/human_only = 0
 	var/active = 0
 
+	var/mind_control_uses = 1
+	var/mind_control_duration = 1800
+	var/active_mind_control = FALSE
+
 /obj/item/organ/heart/gland/proc/ownerCheck()
 	if(ishuman(owner))
-		return 1
+		return TRUE
 	if(!human_only && iscarbon(owner))
-		return 1
-	return 0
+		return TRUE
+	return FALSE
 
 /obj/item/organ/heart/gland/proc/Start()
 	active = 1
 	next_activation = world.time + rand(cooldown_low,cooldown_high)
 
+/obj/item/organ/heart/gland/proc/update_gland_hud()
+	if(!owner)
+		return
+	var/image/holder = owner.hud_list[GLAND_HUD]
+	var/icon/I = icon(owner.icon, owner.icon_state, owner.dir)
+	holder.pixel_y = I.Height() - world.icon_size
+	if(active_mind_control)
+		holder.icon_state = "hudgland_active"
+	else if(mind_control_uses)
+		holder.icon_state = "hudgland_ready"
+	else
+		holder.icon_state = "hudgland_spent"
 
-/obj/item/organ/heart/gland/Remove(var/mob/living/carbon/M, special = 0)
+/obj/item/organ/heart/gland/proc/mind_control(command, mob/living/user)
+	if(!ownerCheck() || !mind_control_uses || active_mind_control)
+		return
+	mind_control_uses--
+	to_chat(owner, "<span class='userdanger'>You suddenly feel an irresistible compulsion to follow an order...</span>")
+	to_chat(owner, "<span class='mind_control'>[command]</span>")
+	active_mind_control = TRUE
+	log_admin("[key_name(user)] sent an abductor mind control message to [key_name(owner)]: [command]")
+	update_gland_hud()
+
+	addtimer(CALLBACK(src, .proc/clear_mind_control), mind_control_duration)
+
+/obj/item/organ/heart/gland/proc/clear_mind_control()
+	if(!ownerCheck() || !active_mind_control)
+		return
+	to_chat(owner, "<span class='userdanger'>You feel the compulsion fade, and you completely forget about your previous orders.</span>")
+	active_mind_control = FALSE
+
+/obj/item/organ/heart/gland/Remove(mob/living/carbon/M, special = 0)
 	active = 0
 	if(initial(uses) == 1)
 		uses = initial(uses)
+	var/datum/atom_hud/abductor/hud = GLOB.huds[DATA_HUD_ABDUCTOR]
+	hud.remove_from_hud(owner)
+	clear_mind_control()
 	..()
 
-/obj/item/organ/heart/gland/Insert(var/mob/living/carbon/M, special = 0)
+/obj/item/organ/heart/gland/Insert(mob/living/carbon/M, special = 0)
 	..()
 	if(special != 2 && uses) // Special 2 means abductor surgery
 		Start()
+	var/datum/atom_hud/abductor/hud = GLOB.huds[DATA_HUD_ABDUCTOR]
+	hud.add_to_hud(owner)
+	update_gland_hud()
 
 /obj/item/organ/heart/gland/on_life()
 	if(!beating)
@@ -59,6 +99,8 @@
 	cooldown_high = 400
 	uses = -1
 	icon_state = "health"
+	mind_control_uses = 3
+	mind_control_duration = 3000
 
 /obj/item/organ/heart/gland/heals/activate()
 	to_chat(owner, "<span class='notice'>You feel curiously revitalized.</span>")
@@ -71,6 +113,8 @@
 	cooldown_high = 1200
 	uses = -1
 	icon_state = "slime"
+	mind_control_uses = 1
+	mind_control_duration = 2400
 
 /obj/item/organ/heart/gland/slime/activate()
 	to_chat(owner, "<span class='warning'>You feel nauseous!</span>")
@@ -86,6 +130,8 @@
 	cooldown_high = 300
 	uses = -1
 	icon_state = "mindshock"
+	mind_control_uses = 1
+	mind_control_duration = 6000
 
 /obj/item/organ/heart/gland/mindshock/activate()
 	to_chat(owner, "<span class='notice'>You get a headache.</span>")
@@ -103,6 +149,8 @@
 	uses = -1
 	human_only = 1
 	icon_state = "species"
+	mind_control_uses = 5
+	mind_control_duration = 300
 
 /obj/item/organ/heart/gland/pop/activate()
 	to_chat(owner, "<span class='notice'>You feel unlike yourself.</span>")
@@ -114,6 +162,8 @@
 	cooldown_high = 2400
 	uses = 1
 	icon_state = "vent"
+	mind_control_uses = 4
+	mind_control_duration = 1800
 
 /obj/item/organ/heart/gland/ventcrawling/activate()
 	to_chat(owner, "<span class='notice'>You feel very stretchy.</span>")
@@ -125,6 +175,8 @@
 	cooldown_high = 2400
 	uses = 1
 	icon_state = "viral"
+	mind_control_uses = 1
+	mind_control_duration = 1800
 
 /obj/item/organ/heart/gland/viral/activate()
 	to_chat(owner, "<span class='warning'>You feel sick.</span>")
@@ -141,6 +193,8 @@
 	cooldown_high = 1600
 	uses = 10
 	icon_state = "emp"
+	mind_control_uses = 1
+	mind_control_duration = 1800
 
 /obj/item/organ/heart/gland/emp/activate()
 	to_chat(owner, "<span class='warning'>You feel a spike of pain in your head.</span>")
@@ -151,6 +205,8 @@
 	cooldown_high = 900
 	uses = 10
 	icon_state = "spider"
+	mind_control_uses = 2
+	mind_control_duration = 2400
 
 /obj/item/organ/heart/gland/spiderman/activate()
 	to_chat(owner, "<span class='warning'>You feel something crawling in your skin.</span>")
@@ -164,6 +220,8 @@
 	icon_state = "egg"
 	lefthand_file = 'icons/mob/inhands/misc/food_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/misc/food_righthand.dmi'
+	mind_control_uses = 2
+	mind_control_duration = 1800
 
 /obj/item/organ/heart/gland/egg/activate()
 	to_chat(owner, "<span class='boldannounce'>You lay an egg!</span>")
@@ -175,6 +233,8 @@
 	cooldown_low = 200
 	cooldown_high = 400
 	uses = -1
+	mind_control_uses = 1
+	mind_control_duration = 450
 
 /obj/item/organ/heart/gland/bloody/activate()
 	owner.blood_volume -= 20
@@ -192,6 +252,8 @@
 	cooldown_high = 600
 	human_only = 1
 	uses = 1
+	mind_control_uses = 1
+	mind_control_duration = 600
 
 /obj/item/organ/heart/gland/bodysnatch/activate()
 	to_chat(owner, "<span class='warning'>You feel something moving around inside you...</span>")
@@ -233,6 +295,8 @@
 	cooldown_low = 1200
 	cooldown_high = 1800
 	uses = -1
+	mind_control_uses = 1
+	mind_control_duration = 800
 
 /obj/item/organ/heart/gland/plasma/activate()
 	to_chat(owner, "<span class='warning'>You feel bloated.</span>")

code/game/gamemodes/miniantags/abduction/machinery/console.dm

@@ -48,6 +48,7 @@
 		dat += "<a href='?src=[REF(src)];dispense=vest'>Agent Vest</A><br>"
 		dat += "<a href='?src=[REF(src)];dispense=silencer'>Radio Silencer</A><br>"
 		dat += "<a href='?src=[REF(src)];dispense=tool'>Science Tool</A><br>"
+		dat += "<a href='?src=[REF(src)];dispense=mind_device'>Mental Interface Device</A><br>"
 	else
 		dat += "<span class='bad'>NO EXPERIMENT MACHINE DETECTED</span> <br>"
 
@@ -109,6 +110,8 @@
 				Dispense(/obj/item/device/abductor/gizmo)
 			if("vest")
 				Dispense(/obj/item/clothing/suit/armor/abductor/vest)
+			if("mind_device")
+				Dispense(/obj/item/device/abductor/mind_device,cost=2)
 	updateUsrDialog()
 
 /obj/machinery/abductor/console/proc/TeleporterRetrieve()

code/game/gamemodes/miniantags/revenant/revenant.dm

@@ -374,7 +374,7 @@
 		return
 	var/key_of_revenant
 	message_admins("Revenant ectoplasm was left undestroyed for 1 minute and is reforming into a new revenant.")
-	loc = get_turf(src) //In case it's in a backpack or someone's hand
+	forceMove(drop_location()) //In case it's in a backpack or someone's hand
 	revenant.forceMove(loc)
 	if(client_to_revive)
 		for(var/mob/M in GLOB.dead_mob_list)

code/game/gamemodes/wizard/artefact.dm

@@ -213,7 +213,7 @@
 	righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
 	var/mob/living/carbon/human/target = null
 	var/list/mob/living/carbon/human/possible = list()
-	var/obj/item/link = null
+	var/obj/item/linked_item = null
 	var/cooldown_time = 30 //3s
 	var/cooldown = 0
 	max_integrity = 10
@@ -237,10 +237,10 @@
 		cooldown = world.time +cooldown_time
 		return
 
-	if(!link)
+	if(!linked_item)
 		if(I.loc == user && istype(I) && I.w_class <= WEIGHT_CLASS_SMALL)
 			if (user.transferItemToLoc(I,src))
-				link = I
+				linked_item = I
 				to_chat(user, "You attach [I] to the doll.")
 				update_targets()
 
@@ -255,11 +255,11 @@
 		return
 
 	if(user.zone_selected == "chest")
-		if(link)
+		if(linked_item)
 			target = null
-			link.loc = get_turf(src)
-			to_chat(user, "<span class='notice'>You remove the [link] from the doll.</span>")
-			link = null
+			linked_item.forceMove(drop_location())
+			to_chat(user, "<span class='notice'>You remove the [linked_item] from the doll.</span>")
+			linked_item = null
 			update_targets()
 			return
 
@@ -291,10 +291,10 @@
 
 /obj/item/voodoo/proc/update_targets()
 	possible = list()
-	if(!link)
+	if(!linked_item)
 		return
 	for(var/mob/living/carbon/human/H in GLOB.alive_mob_list)
-		if(md5(H.dna.uni_identity) in link.fingerprints)
+		if(md5(H.dna.uni_identity) in linked_item.fingerprints)
 			possible |= H
 
 /obj/item/voodoo/proc/GiveHint(mob/victim,force=0)