Merge branch 'master' of github.com:Baystation12/Baystation12

code/modules/admin/admin.dm

@@ -1406,7 +1406,7 @@
 					message_admins("[key_name_admin(usr)] has spawned blob", 1)
 				if("aliens")
 					if(aliens_allowed)
-						alien_infestation()
+						Force_Event(/datum/event/alieninfestation)
 						message_admins("[key_name_admin(usr)] has spawned aliens", 1)
 				if("spaceninja")
 					if(toggle_space_ninja)
@@ -1416,31 +1416,35 @@
 					var/choice = input("You sure you want to spawn carp?") in list("Badmin", "Cancel")
 					if(choice == "Badmin")
 						message_admins("[key_name_admin(usr)] has spawned carp.", 1)
-						carp_migration()
+						Force_Event(/datum/event/spacecarp)
 				if("radiation")
 					message_admins("[key_name_admin(usr)] has has irradiated the station", 1)
-					high_radiation_event()
+					Force_Event(/datum/event/radiation)
 				if("immovable")
 					message_admins("[key_name_admin(usr)] has sent an immovable rod to the station", 1)
 					immovablerod()
 				if("prison_break")
 					message_admins("[key_name_admin(usr)] has allowed a prison break", 1)
-					prison_break()
+					Force_Event(/datum/event/prisonbreak)
+				if("electric")
+					message_admins("[key_name_admin(usr)] has triggered an electrical storm", 1)
+					Force_Event(/datum/event/electricalstorm)
 				if("lightsout")
 					message_admins("[key_name_admin(usr)] has broke a lot of lights", 1)
 					lightsout(1,2)
 				if("blackout")
 					message_admins("[key_name_admin(usr)] broke all lights", 1)
+					SpawnEvent()
 					lightsout(0,0)
 				if("virus")
 					var/answer = alert("Do you want this to be a random disease or do you have something in mind?",,"Virus2","Random","Choose")
 					if(answer=="Random")
-						viral_outbreak()
+						Force_Event(/datum/event/viralinfection)
 						message_admins("[key_name_admin(usr)] has triggered a virus outbreak", 1)
 					else if(answer == "Choose")
 						var/list/viruses = list("fake gbs","gbs","magnitis","wizarditis",/*"beesease",*/"brain rot","cold","retrovirus","flu","pierrot's throat","rhumba beat")
 						var/V = input("Choose the virus to spread", "BIOHAZARD") in viruses
-						viral_outbreak(V)
+						Force_Event(/datum/event/viralinfection,V)
 						message_admins("[key_name_admin(usr)] has triggered a virus outbreak of [V]", 1)
 					else
 						var/lesser = (alert("Do you want to infect the mob with a major or minor disease?",,"Major","Minor") == "Minor")
@@ -1495,7 +1499,7 @@
 						return
 				if("ionstorm")
 					if (src.rank in list("Badmin","Game Admin", "Game Master"))
-						IonStorm()
+						Force_Event(/datum/event/ionstorm)
 						message_admins("[key_name_admin(usr)] triggered an ion storm")
 						var/show_log = alert(usr, "Show ion message?", "Message", "Yes", "No")
 						if(show_log == "Yes")
@@ -2123,7 +2127,8 @@
 <A href='?src=\ref[src];secretsfun=moveferry'>Move Ferry</A><BR>
 <A href='?src=\ref[src];secretsfun=movealienship'>Move Alien Dinghy</A><BR>
 <A href='?src=\ref[src];secretsfun=moveminingshuttle'>Move Mining Shuttle</A><BR>
-<A href='?src=\ref[src];secretsfun=blackout'>Break all lights</A><BR><BR>"}
+<A href='?src=\ref[src];secretsfun=blackout'>Break all lights</A><BR>
+<A href='?src=\ref[src];secretsfun=electric'>Trigger Electrical Storm</A><BR><BR>"}
 //<A href='?src=\ref[src];secretsfun=shockwave'>Station Shockwave</A><BR>
 
 	if(lvl >= 5)

code/modules/admin/admin_verbs.dm

@@ -176,6 +176,7 @@
 			verbs += /client/proc/admin_invis
 			verbs += /client/proc/cmd_admin_godmode
 			verbs += /client/proc/delbook
+			verbs += /client/proc/Force_Event_admin
 
 		if (holder.level >= 4)//Badmin********************************************************************
 			verbs += /obj/admins/proc/adrev					//toggle admin revives
@@ -416,6 +417,7 @@
 	verbs -= /client/proc/callprocobj
 	verbs -= /client/proc/cmd_admin_godmode
 	verbs -= /client/proc/delbook
+	verbs -= /client/proc/Force_Event_admin
 
 	return
 

code/modules/admin/verbs/randomverbs.dm

@@ -152,7 +152,7 @@
 		command_alert("Ion storm detected near the station. Please check all AI-controlled equipment for errors.", "Anomaly Alert")
 		world << sound('ionstorm.ogg')
 
-	IonStorm(0)
+	//IonStorm(0)
 
  /*
  Stealth spawns xenos

code/modules/mob/mob_helpers.dm

@@ -144,7 +144,7 @@ proc/isorgan(A)
 	else
 		if (pr >= 100)
 			return n
-	var/te = n
+	var/te = html_decode(n)
 	var/t = ""
 	n = length(n)
 	var/p = null
@@ -155,7 +155,7 @@ proc/isorgan(A)
 		else
 			t = text("[]*", t)
 		p++
-	return t
+	return html_encode(t)
 
 /*proc/NewStutter(phrase,stunned)
 	phrase = html_decode(phrase)

code/modules/power/apc.dm

@@ -57,6 +57,8 @@
 	var/has_electronics = 0 // 0 - none, 1 - plugged in, 2 - secured by screwdriver
 	var/overload = 1 //used for the Blackout malf module
 	var/mob/living/silicon/ai/occupant = null
+	var/crit = 0
+	var/eventoff = 0
 
 /proc/RandomAPCWires()
 	//to make this not randomize the wires, just set index to 1 and increment it in the flag for loop (after doing everything else).
@@ -614,7 +616,7 @@
 	return "[area.name] : [equipment]/[lighting]/[environ] ([lastused_equip+lastused_light+lastused_environ]) : [cell? cell.percent() : "N/C"] ([charging])"
 
 /obj/machinery/power/apc/proc/update()
-	if(operating && !shorted)
+	if(operating && !shorted && !eventoff)
 		area.power_light = (lighting > 1)
 		area.power_equip = (equipment > 1)
 		area.power_environ = (environ > 1)