Merge remote-tracking branch 'citadel/master' into shield_refactor

code/game/objects/items/devices/powersink.dm

@@ -1,5 +1,7 @@
 // Powersink - used to drain station power
 
+GLOBAL_LIST_EMPTY(power_sinks)
+
 /obj/item/powersink
 	desc = "A nulling power sink which drains energy from electrical systems."
 	name = "power sink"
@@ -26,6 +28,14 @@
 
 	var/obj/structure/cable/attached		// the attached cable
 
+/obj/item/powersink/Initialize()
+	. = ..()
+	GLOB.power_sinks += src
+
+/obj/item/powersink/Destroy()
+	GLOB.power_sinks -= src
+	. = ..()
+
 /obj/item/powersink/update_icon_state()
 	icon_state = "powersink[mode == OPERATING]"
 

code/game/objects/items/holy_weapons.dm

@@ -463,6 +463,16 @@
 	hitsound = 'sound/weapons/rapierhit.ogg'
 	var/possessed = FALSE
 
+/obj/item/nullrod/scythe/talking/process()
+	for(var/mob/living/simple_animal/shade/S in contents)
+		if(S.mind)
+			return
+		else
+			qdel(S)
+	possessed = FALSE
+	visible_message("<span class='warning'>The blade makes a short sigh. The spirit within seems to have passed on...</span>")
+	return PROCESS_KILL
+
 /obj/item/nullrod/scythe/talking/relaymove(mob/user)
 	return //stops buckled message spam for the ghost.
 
@@ -484,6 +494,8 @@
 		S.ckey = C.ckey
 		S.status_flags |= GODMODE
 		S.language_holder = user.language_holder.copy(S)
+		S.AddElement(/datum/element/ghost_role_eligibility)
+		START_PROCESSING(SSprocessing,src)
 		var/input = stripped_input(S,"What are you named?", ,"", MAX_NAME_LEN)
 
 		if(src && input)

code/game/objects/items/stunbaton.dm

@@ -282,7 +282,6 @@
 	throwforce = 5
 	stamforce = 25
 	hitcost = 1000
-	knockdown = FALSE
 	throw_hit_chance = 10
 	slot_flags = ITEM_SLOT_BACK
 	var/obj/item/assembly/igniter/sparkler