Merge pull request #4109 from Citadel-Station-13/upstream-merge-33025

[MIRROR] Fixes Lord Singuloth hungering for more than he should

code/modules/admin/sound_emitter.dm

@@ -30,6 +30,9 @@
 /obj/effect/sound_emitter/singularity_act()
 	return
 
+/obj/effect/sound_emitter/singularity_pull()
+	return
+
 /obj/effect/sound_emitter/examine(mob/user)
 	..()
 	if(!isobserver(user))

code/modules/atmospherics/environmental/LINDA_fire.dm

@@ -179,6 +179,9 @@
 		var/mob/living/L = AM
 		L.fire_act(temperature, volume)
 
+/obj/effect/hotspot/singularity_pull()
+	return
+
 /obj/effect/dummy/fire
 	name = "fire"
 	desc = "OWWWWWW. IT BURNS. Tell a coder if you're seeing this."

code/modules/clothing/spacesuits/chronosuit.dm

@@ -252,6 +252,12 @@
 	var/obj/screen/chronos_target/target_ui = null
 	var/obj/item/clothing/suit/space/chronos/chronosuit
 
+/obj/effect/chronos_cam/singularity_act()
+	return
+
+/obj/effect/chronos_cam/singularity_pull()
+	return
+
 /obj/effect/chronos_cam/proc/create_target_ui()
 	if(holder && holder.client && chronosuit)
 		if(target_ui)

code/modules/events/immovable_rod.dm

@@ -68,6 +68,12 @@ In my current plan for it, 'solid' will be defined as anything with density == 1
 /obj/effect/immovablerod/ex_act(severity, target)
 	return 0
 
+/obj/effect/immovablerod/singularity_act()
+	return
+
+/obj/effect/immovablerod/singularity_pull()
+	return
+
 /obj/effect/immovablerod/Collide(atom/clong)
 	if(prob(10))
 		playsound(src, 'sound/effects/bang.ogg', 50, 1)

code/modules/flufftext/Hallucination.dm

@@ -98,6 +98,12 @@ GLOBAL_LIST_INIT(hallucinations_major, list(
 	var/image_layer = MOB_LAYER
 	var/active = TRUE //qdelery
 
+/obj/effect/hallucination/singularity_pull()
+	return
+
+/obj/effect/hallucination/singularity_act()
+	return
+
 /obj/effect/hallucination/simple/Initialize(mapload, var/mob/living/carbon/T)
 	. = ..()
 	target = T

code/modules/mining/fulton.dm

@@ -183,3 +183,9 @@ GLOBAL_LIST_EMPTY(total_extraction_beacons)
 			if(L.stat != DEAD)
 				return 1
 	return 0
+
+/obj/effect/extraction_holder/singularity_pull()
+	return
+
+/obj/effect/extraction_holder/singularity_pull()
+	return

code/modules/mining/lavaland/necropolis_chests.dm

@@ -366,7 +366,7 @@
 	return
 
 /obj/effect/immortality_talisman/singularity_pull()
-	return 0
+	return
 
 /obj/effect/immortality_talisman/Destroy(force)
 	if(!can_destroy && !force)

code/modules/mining/mine_items.dm

@@ -12,6 +12,12 @@
 	..()
 	set_light(set_luminosity, set_cap)
 
+/obj/effect/light_emitter/singularity_pull()
+	return
+
+/obj/effect/light_emitter/singularity_act()
+	return
+
 /**********************Miner Lockers**************************/
 
 /obj/structure/closet/wardrobe/miner

code/modules/mob/living/simple_animal/guardian/types/ranged.dm

@@ -117,3 +117,9 @@
 		var/list/guardians = spawner.summoner.hasparasites()
 		for(var/para in guardians)
 			to_chat(para, "<span class='danger'><B>[AM] has crossed surveillance snare, [name].</span></B>")
+
+/obj/effect/snare/singularity_act()
+	return
+
+/obj/effect/snare/singularity_pull()
+	return

code/modules/power/singularity/particle_accelerator/particle.dm

@@ -51,6 +51,9 @@
 /obj/effect/accelerated_particle/ex_act(severity, target)
 	qdel(src)
 
+/obj/effect/accelerated_particle/singularity_pull()
+	return
+
 /obj/effect/accelerated_particle/proc/toxmob(mob/living/M)
 	M.rad_act(energy*6)
 

code/modules/projectiles/guns/beam_rifle.dm

@@ -772,3 +772,9 @@
 	icon_icon = 'icons/mob/actions/actions_items.dmi'
 	button_icon_state = "zoom_mode"
 	background_icon_state = "bg_tech"
+
+/obj/effect/projectile_beam/singularity_pull()
+	return
+
+/obj/effect/projectile_beam/singularity_act()
+	return

code/modules/projectiles/projectile/energy.dm

@@ -86,6 +86,12 @@
 
 	qdel(src)
 
+/obj/effect/nettingportal/singularity_act()
+	return
+
+/obj/effect/nettingportal/singularity_pull()
+	return
+
 
 /obj/item/projectile/energy/trap
 	name = "energy snare"

code/modules/spells/spell.dm

@@ -38,6 +38,12 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell)) //needed for th
 		remove_ranged_ability()
 	return ..()
 
+/obj/effect/proc_holder/singularity_act()
+	return
+
+/obj/effect/proc_holder/singularity_pull()
+	return
+
 /obj/effect/proc_holder/proc/InterceptClickOn(mob/living/caller, params, atom/A)
 	if(caller.ranged_ability != src || ranged_ability_user != caller) //I'm not actually sure how these would trigger, but, uh, safety, I guess?
 		to_chat(caller, "<span class='warning'><b>[caller.ranged_ability.name]</b> has been disabled.</span>")

code/modules/spells/spell_types/spacetime_distortion.dm

@@ -73,6 +73,12 @@
 	var/sound
 	var/walks_left = 50 //prevents the game from hanging in extreme cases (such as minigun fire)
 
+/obj/effect/cross_action/singularity_act()
+	return
+
+/obj/effect/cross_action/singularity_pull()
+	return
+
 /obj/effect/cross_action/spacetime_dist/Initialize(mapload)
 	. = ..()
 	sound = "sound/guitar/[safepick(GLOB.guitar_notes)]"