Distortions update (#1539)

* Distortions update

* Update city_events.dm

code/controllers/subsystem/city_events.dm

@@ -10,6 +10,7 @@ SUBSYSTEM_DEF(cityevents)
 	var/daystatus = TRUE	//True to darken lights, false to lighten them
 	var/globalillumination = 1
 	var/list/total_events = list()
+	var/list/distortions_available = list()
 	var/helpful_events = list("chickens", "money", "tresmetal", "hppens", "sppens")
 	var/harmful_events = list("drones", "beaks", "shrimp")
 	var/ordeal_events = list("sweepers", "scouts", "bots")
@@ -58,6 +59,13 @@ SUBSYSTEM_DEF(cityevents)
 	total_events += pick(neutral_events)
 	total_events += pick("money")			//Always get money
 
+	//Set available distortion
+	var/list/processing = subtypesof(/mob/living/simple_animal/hostile/distortion)
+	for(var/mob/living/simple_animal/hostile/distortion/A in processing)
+		if(A.can_spawn == 0)
+			return
+		distortions_available += A
+
 //Events
 /datum/controller/subsystem/cityevents/proc/Event()
 	addtimer(CALLBACK(src, .proc/Event), 5 MINUTES)
@@ -132,7 +140,7 @@ SUBSYSTEM_DEF(cityevents)
 	var/T = pick(distortion)
 	new /obj/effect/bloodpool(get_turf(T))
 	sleep(10)
-	var/spawning = pick(subtypesof(/mob/living/simple_animal/hostile/distortion))
+	var/spawning = pick(distortions_available)
 	new spawning (get_turf(T))
 	addtimer(CALLBACK(src, .proc/Distort), 20 MINUTES)
 

code/modules/mob/living/simple_animal/distortion/_distortion.dm

@@ -22,6 +22,8 @@
 	blood_volume = BLOOD_VOLUME_NORMAL // THERE WILL BE BLOOD. SHED.
 	simple_mob_flags = SILENCE_RANGED_MESSAGE
 	can_patrol = TRUE
+	/// Can this thing spawn?
+	var/can_spawn = 1
 	/// Copy-pasted from megafauna.dm: This allows player controlled mobs to use abilities
 	var/chosen_attack = 1
 	/// Attack actions, sets chosen_attack to the number in the action

code/modules/mob/living/simple_animal/distortion/plague/lantern.dm

@@ -34,7 +34,6 @@
 	light_power = 7
 
 
-//Proc that can be used for additional effects on unmanifest
 /mob/living/simple_animal/hostile/distortion/lantern/PostUnmanifest(mob/living/carbon/human/egoist)
 	playsound(src, 'sound/effects/blobattack.ogg', 150, FALSE, 4)
 	for(var/turf/TF in orange(2, get_turf(src))) //spawns blood effects
@@ -44,16 +43,6 @@
 		B.bloodiness = 100
 	return
 
-//Unmanifesting is not linked to any proc by default, if you want it to happen during gameplay, it must be called manually.
-/mob/living/simple_animal/hostile/distortion/lantern/attacked_by(obj/item/I, mob/living/user)
-	. = ..()
-	if(istype(I, /obj/item/food/grown/carrot))
-		qdel(I)
-		say("That's all I ever wanted!")
-		can_act = FALSE
-		addtimer(CALLBACK(src,.proc/Unmanifest),3 SECONDS)
-
-
 /mob/living/simple_animal/hostile/distortion/lantern/AttackingTarget()
 	..()
 	if(prob(70))

code/modules/mob/living/simple_animal/distortion/star/shrimp.dm

@@ -40,6 +40,7 @@
 	egoist_attributes = 100
 	loot = list(/obj/item/gun/ego_gun/shrimp/minigun)
 	unmanifest_effect = /obj/effect/temp_visual/water_waves
+	can_spawn = 0
 
 	var/unmanifesting
 

lobotomy-corp13.dme

@@ -2862,6 +2862,7 @@
 #include "code\modules\mob\living\simple_animal\distortion\myth\another_day_work.dm"
 #include "code\modules\mob\living\simple_animal\distortion\nightmare\_nightmare.dm"
 #include "code\modules\mob\living\simple_animal\distortion\plague\bunnyman.dm"
+#include "code\modules\mob\living\simple_animal\distortion\plague\lantern.dm"
 #include "code\modules\mob\living\simple_animal\distortion\star\shrimp.dm"
 #include "code\modules\mob\living\simple_animal\friendly\butterfly.dm"
 #include "code\modules\mob\living\simple_animal\friendly\cat.dm"