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

code/modules/spells/spell_types/conjure.dm

@@ -80,11 +80,11 @@
 	school = "conjuration"
 	charge_max = 150
 	cooldown_min = 10
+	var/delete_old = TRUE
 
 /obj/effect/proc_holder/spell/targeted/conjure_item/cast(list/targets, mob/user = usr)
-	if (item && !QDELETED(item))
-		qdel(item)
-		item = null
+	if (delete_old && item && !QDELETED(item))
+		QDEL_NULL(item)
 	else
 		for(var/mob/living/carbon/C in targets)
 			if(C.dropItemToGround(C.get_active_held_item()))

code/modules/spells/spell_types/mime.dm

@@ -128,6 +128,49 @@
 		invocation_type ="none"
 	..()
 
+/obj/effect/proc_holder/spell/targeted/touch/mimerope
+	name = "Invisible Rope"
+	desc = "Form an invisible rope to tie people or trip people with."
+	school = "mime"
+	panel = "Mime"
+	invocation_type = "emote"
+	invocation_emote_self = "<span class='notice'>You start fabricate an invisible rope.</span>"
+	charge_max = 700
+	sound =  null
+	clothes_req = 0
+	range = -1
+	include_user = 1
+	action_icon_state = "mime"
+	action_background_icon_state = "bg_mime"
+	hand_path = /obj/item/melee/touch_attack/mimerope
+
+/obj/effect/proc_holder/spell/targeted/touch/mimerope/Click()
+	if(usr && usr.mind)
+		if(!usr.mind.miming)
+			to_chat(usr, "<span class='notice'>You must dedicate yourself to silence first.</span>")
+			return
+		if (usr.get_active_held_item())
+			to_chat(usr, "<span class='notice'>Your hands must be free to create the invisible rope.</span>")
+			return
+		invocation = "<B>[usr.real_name]</B> is twirling an invisible rope in [usr.p_their()] hands."
+	else
+		invocation_type ="none"
+
+/obj/effect/proc_holder/spell/targeted/touch/mimerope/cast(list/targets,mob/user = usr)
+
+	usr.put_in_hands()
+
+/obj/item/melee/touch_attack/mimerope
+	item_state = ""
+	icon_state = ""
+	name = "mime rope"
+	desc = "An invisible rope."
+
+/obj/item/restraints/handcuffs/cable/mime
+	name = "mime restraints"
+	desc = "An invisible rope."
+	item_state = ""
+	icon_state = ""
 
 /obj/item/book/granter/spell/mimery_blockade
 	spell = /obj/effect/proc_holder/spell/targeted/forcewall/mime

code/modules/spells/spell_types/touch_attacks.dm

@@ -1,6 +1,8 @@
 /obj/effect/proc_holder/spell/targeted/touch
 	var/hand_path = /obj/item/melee/touch_attack
 	var/obj/item/melee/touch_attack/attached_hand = null
+	var/drawmessage = "You channel the power of the spell to your hand."
+	var/dropmessage = "You draw the power out of your hand."
 	invocation_type = "none" //you scream on connecting, not summoning
 	include_user = 1
 	range = -1
@@ -21,7 +23,7 @@
 /obj/effect/proc_holder/spell/targeted/touch/cast(list/targets,mob/user = usr)
 	if(!QDELETED(attached_hand))
 		remove_hand(TRUE)
-		to_chat(user, "<span class='notice'>You draw the power out of your hand.</span>")
+		to_chat(user, "<span class='notice'>[dropmessage]</span>")
 		return
 
 	for(var/mob/living/carbon/C in targets)
@@ -43,7 +45,7 @@
 		remove_hand(TRUE)
 		to_chat(user, "<span class='warning'>Your hands are full!</span>")
 		return FALSE
-	to_chat(user, "<span class='notice'>You channel the power of the spell to your hand.</span>")
+	to_chat(user, "<span class='notice'>[drawmessage]</span>")
 	return TRUE