Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into wizloadouts

code/datums/spells/lichdom.dm

@@ -92,7 +92,7 @@
 		if(!marked_item) //linking item to the spell
 			message = "<span class='warning'>"
 			for(var/obj/item in hand_items)
-				if(ABSTRACT in item.flags || NODROP in item.flags)
+				if((ABSTRACT in item.flags) || (NODROP in item.flags))
 					continue
 				marked_item = item
 				to_chat(M, "<span class='warning'>You begin to focus your very being into the [item.name]...</span>")

code/datums/spells/mime.dm

@@ -165,4 +165,4 @@
 /obj/item/spellbook/oneuse/mime/greaterwall
 	spell = /obj/effect/proc_holder/spell/targeted/forcewall/mime
 	spellname = "Invisible Greater Wall"
-	desc = "It contains illustrations of the great walls of human history."
+	desc = "It contains illustrations of the great walls of human history."

code/datums/spells/summonitem.dm

@@ -41,7 +41,7 @@
 				else
 					message = "<span class='notice'>You must hold the desired item in your hands to mark it for recall.</span>"
 
-		else if(marked_item && marked_item in hand_items) //unlinking item to the spell
+		else if(marked_item && (marked_item in hand_items)) //unlinking item to the spell
 			message = "<span class='notice'>You remove the mark on [marked_item] to use elsewhere.</span>"
 			name = "Instant Summons"
 			marked_item = 		null
@@ -75,7 +75,7 @@
 								B.transfer_identity(C)
 								C.death()
 								add_attack_logs(target, C, "Magically debrained INTENT: [uppertext(target.a_intent)]")*/
-						if(C.stomach_contents && item_to_retrieve in C.stomach_contents)
+						if(C.stomach_contents && (item_to_retrieve in C.stomach_contents))
 							C.stomach_contents -= item_to_retrieve
 						for(var/X in C.bodyparts)
 							var/obj/item/organ/external/part = X