Merge pull request #5025 from Incoming5643/summoneventfixerspecialer

Hopefully the final pass of initial tweaks and fixes for summon events

code/modules/admin/admin.dm

@@ -444,6 +444,7 @@ var/global/floorIsLava = 0
 			<A href='?src=\ref[src];secretsfun=traitor_all'>Everyone is the traitor</A><BR>
 			<A href='?src=\ref[src];secretsfun=guns'>Summon Guns</A><BR>
 			<A href='?src=\ref[src];secretsfun=magic'>Summon Magic</A><BR>
+			<A href='?src=\ref[src];secretsfun=events'>Summon Events (Toggle)</A><BR>
 			<A href='?src=\ref[src];secretsfun=onlyone'>There can only be one!</A><BR>
 			<A href='?src=\ref[src];secretsfun=retardify'>Make all players retarded</A><BR>
 			<A href='?src=\ref[src];secretsfun=eagles'>Egalitarian Station Mode</A><BR>

code/modules/admin/topic.dm

@@ -1853,6 +1853,22 @@
 				feedback_inc("admin_secrets_fun_used",1)
 				feedback_add_details("admin_secrets_fun_used","SM")
 				rightandwrong(1, usr)
+			if("events")
+				if(events && !events.wizardmode)
+					if(alert("Do you want to toggle summon events on?",,"Yes","No") == "Yes")
+						summonevents()
+						feedback_inc("admin_secrets_fun_used",1)
+						feedback_add_details("admin_secrets_fun_used","SE")
+
+				else if(events && events.wizardmode)
+					switch(alert("What would you like to do?",,"Intensify Summon Events","Turn Off Summon Events","Nothing"))
+						if("Intensify Summon Events")
+							summonevents()
+							feedback_inc("admin_secrets_fun_used",1)
+							feedback_add_details("admin_secrets_fun_used","SE")
+						if("Turn Off Summon Events")
+							events.toggleWizardmode()
+							events.resetFrequency()
 			if("dorf")
 				feedback_inc("admin_secrets_fun_used",1)
 				feedback_add_details("admin_secrets_fun_used","DF")

code/modules/events/event_manager.dm

@@ -124,9 +124,20 @@ var/datum/controller/event/events
 	holder.forceEvent()
 
 /datum/admins/proc/forceEvent()
-	var/dat = ""
+	var/dat 	= ""
+	var/normal 	= ""
+	var/magic 	= ""
+	var/holiday = ""
 	for(var/datum/round_event_control/E in events.control)
-		dat += "<BR><A href='?src=\ref[src];forceevent=\ref[E]'>[E]</A>"
+		dat = "<BR><A href='?src=\ref[src];forceevent=\ref[E]'>[E]</A>"
+		if(E.holidayID)
+			holiday	+= dat
+		else if(E.wizardevent)
+			magic 	+= dat
+		else
+			normal 	+= dat
+
+	dat = normal + "<BR>" + magic + "<BR>" + holiday
 
 	var/datum/browser/popup = new(usr, "forceevent", "Force Random Event", 300, 750)
 	popup.set_content(dat)
@@ -262,4 +273,10 @@ var/datum/controller/event/events
 	for(var/datum/round_event_control/E in control)
 		E.weight = initial(E.weight)
 		if((E.wizardevent && !wizardmode) || (!E.wizardevent && wizardmode))
-			E.weight = 0
+			E.weight = 0
+	message_admins("Summon Events has been [wizardmode ? "enabled, events will occur every [events.frequency_lower / 600] to [events.frequency_upper / 600] minutes" : "disabled"]!")
+	log_game("Summon Events was [wizardmode ? "enabled" : "disabled"]!")
+
+/datum/controller/event/proc/resetFrequency()
+	frequency_lower = initial(frequency_lower)
+	frequency_upper = initial(frequency_upper)

code/modules/events/wizard/aid.dm

@@ -34,6 +34,8 @@
 			for(var/obj/effect/proc_holder/spell/S in L.mind.spell_list)
 				S.name = initial(S.name)
 				S.spell_level++
+				if(S.spell_level >= 6 || S.charge_max <= 0) //Badmin checks, these should never be a problem in normal play
+					continue
 				S.charge_max = round(initial(S.charge_max) - S.spell_level * (initial(S.charge_max) - S.cooldown_min)/ S.level_max)
 				if(S.charge_max < S.charge_counter)
 					S.charge_counter = S.charge_max

code/modules/events/wizard/blobies.dm

@@ -3,7 +3,7 @@
 	weight = 3
 	typepath = /datum/round_event/wizard/blobies/
 	max_occurrences = 3
-	earliest_start = 0
+	earliest_start = 12000 // 20 minutes (gotta get some bodies made!)
 
 /datum/round_event/wizard/blobies/start()
 

code/modules/events/wizard/curseditems.dm

@@ -10,7 +10,7 @@
 //item you want to equip to the hand, and set its slots_flags = null. Only items equiped to hands need do this.
 
 /datum/round_event/wizard/cursed_items/start()
-	var/item_set = pick("wizardmimic", "swords", "bigfatdoobie", "boxing", "voicemodulators", "headphones")
+	var/item_set = pick("wizardmimic", "swords", "bigfatdoobie", "boxing", "voicemodulators")
 	var/list/wearslots	= list(slot_wear_suit, slot_shoes, slot_head, slot_wear_mask, slot_r_hand, slot_gloves, slot_ears)
 	var/list/loadout = list()
 	var/ruins_spaceworthiness
@@ -29,7 +29,6 @@
 			loadout[6] = /obj/item/clothing/gloves/boxing
 			ruins_spaceworthiness = 1
 		if("voicemodulators")	loadout[4] = /obj/item/clothing/mask/gas/voice
-		if("headphones") 		loadout[7] = /obj/item/clothing/ears/earmuffs
 
 	for(var/mob/living/carbon/human/H in living_mob_list)
 		if(ruins_spaceworthiness && (H.z != 1 || istype(H.loc, /turf/space)))	continue	//#savetheminers

code/modules/events/wizard/fakeexplosion.dm

@@ -1,6 +1,6 @@
 /datum/round_event_control/wizard/fake_explosion //Oh no the station is gone!
 	name = "Fake Explosion"
-	weight = 2
+	weight = 0 //Badmin exclusive now because once it's expected its not funny
 	typepath = /datum/round_event/wizard/fake_explosion/
 	max_occurrences = 1
 	earliest_start = 0

code/modules/events/wizard/greentext.dm

@@ -21,7 +21,7 @@
 
 /obj/item/weapon/greentext/
 	name = "greentext"
-	desc = "for some the pursuit of greentext is the greatest calling in life..."
+	desc = "No one knows what this massive tome does, but it feels <i><font color='green'>desirable</font></i> all the same..."
 	w_class = 4.0
 	icon = 'icons/obj/wizard.dmi'
 	icon_state = "greentext"

code/modules/events/wizard/race.dm

@@ -18,5 +18,6 @@
 		if(H.dna)
 			H.dna.species = new new_species
 			H.regenerate_icons()
+			H << "<span class='notice'>You feel somehow... different?</span>"
 		if(!all_the_same)
 			new_species = pick(all_species)

code/modules/events/wizard/shuffle.dm

@@ -24,7 +24,7 @@
 
 	for(var/mob/living/carbon/human/H in mobs)
 		if(!moblocs)	break //locs aren't always unique, so this may come into play
-		H.loc = moblocs[moblocs.len]
+		do_teleport(H, moblocs[moblocs.len])
 		moblocs.len -= 1
 
 	for(var/mob/living/carbon/human/H in living_mob_list)
@@ -46,7 +46,7 @@
 	var/list/mobs	 = list()
 
 	for(var/mob/living/carbon/human/H in living_mob_list)
-		mobnames += H.name
+		mobnames += H.real_name
 		mobs += H
 
 	if(!mobs) return
@@ -56,7 +56,7 @@
 
 	for(var/mob/living/carbon/human/H in mobs)
 		if(!mobnames)	break
-		H.name = mobnames[mobnames.len]
+		H.real_name = mobnames[mobnames.len]
 		mobnames.len -= 1
 
 	for(var/mob/living/carbon/human/H in living_mob_list)
@@ -85,10 +85,11 @@
 	shuffle(mobs)
 
 	var/obj/effect/proc_holder/spell/targeted/mind_transfer/swapper = new /obj/effect/proc_holder/spell/targeted/mind_transfer/
-	for(var/mob/living/carbon/human/H in mobs)
+	while(mobs.len > 1)
+		var/mob/living/carbon/human/H = pick(mobs)
+		mobs -= H
 		swapper.cast(list(H), mobs[mobs.len], 1)
-		mobs.len -= 1
-		if(mobs.len <= 1) break
+		mobs -= mobs[mobs.len]
 
 	for(var/mob/living/carbon/human/H in living_mob_list)
 		var/datum/effect/effect/system/harmless_smoke_spread/smoke = new /datum/effect/effect/system/harmless_smoke_spread()

code/modules/reagents/Chemistry-Reagents.dm

@@ -996,6 +996,8 @@ datum/reagent/adminordrazine/on_mob_life(var/mob/living/carbon/M as mob)
 	M.sleeping = 0
 	M.jitteriness = 0
 	for(var/datum/disease/D in M.viruses)
+		if(D.severity == D.non_threat)
+			continue
 		D.spread = "Remissive"
 		D.stage--
 		if(D.stage < 1)