Merge pull request #12245 from Fox-McCloud/universal-damage

Universal Object Damage

code/datums/beam.dm

@@ -119,6 +119,12 @@
 	owner = null
 	return ..()
 
+/obj/effect/ebeam/singularity_pull()
+	return
+
+/obj/effect/ebeam/singularity_act()
+	return
+
 /obj/effect/ebeam/deadly/Crossed(atom/A, oldloc)
 	..()
 	A.ex_act(1)

code/datums/spell.dm

@@ -7,6 +7,12 @@
 	var/ranged_mousepointer
 	var/mob/living/ranged_ability_user
 
+/obj/effect/proc_holder/singularity_act()
+	return
+
+/obj/effect/proc_holder/singularity_pull()
+	return
+
 var/list/spells = typesof(/obj/effect/proc_holder/spell) //needed for the badmin verb for now
 
 /obj/effect/proc_holder/proc/InterceptClickOn(mob/living/user, params, atom/A)

code/datums/spells/ethereal_jaunt.dm

@@ -78,7 +78,7 @@
 	density = 0
 	anchored = 1
 	invisibility = 60
-	burn_state = LAVA_PROOF
+	resistance_flags = LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
 
 /obj/effect/dummy/spell_jaunt/Destroy()
 	// Eject contents if deleted somehow
@@ -99,5 +99,6 @@
 
 /obj/effect/dummy/spell_jaunt/ex_act(blah)
 	return
+
 /obj/effect/dummy/spell_jaunt/bullet_act(blah)
 	return

code/datums/wires/wires.dm

@@ -5,6 +5,12 @@
 
 #define MAX_FLAG 65535
 
+/proc/is_wire_tool(obj/item/I)
+	if(ismultitool(I))
+		return TRUE
+	if(iswirecutter(I))
+		return TRUE
+
 var/list/same_wires = list()
 // 12 colours, if you're adding more than 12 wires then add more colours here
 var/list/wireColours = list("red", "blue", "green", "black", "orange", "brown", "gold", "gray", "cyan", "navy", "purple", "pink")