diff --git a/baystation12.dme b/baystation12.dme
index 1171216ef63..0423338fabb 100644
--- a/baystation12.dme
+++ b/baystation12.dme
@@ -251,7 +251,6 @@
 #define FILE_DIR "icons/vending_icons"
 #define FILE_DIR "interface"
 #define FILE_DIR "maps"
-#define FILE_DIR "maps/backup"
 #define FILE_DIR "maps/RandomZLevels"
 #define FILE_DIR "sound"
 #define FILE_DIR "sound/AI"
@@ -902,7 +901,6 @@
 #include "code\modules\assembly\shock_kit.dm"
 #include "code\modules\assembly\signaler.dm"
 #include "code\modules\assembly\timer.dm"
-#include "code\modules\awaymissions\bluespaceartillery.dm"
 #include "code\modules\awaymissions\corpse.dm"
 #include "code\modules\awaymissions\gateway.dm"
 #include "code\modules\awaymissions\loot.dm"
@@ -1345,7 +1343,7 @@
 #include "code\ZAS\ZAS_Turfs.dm"
 #include "code\ZAS\ZAS_Zones.dm"
 #include "interface\interface.dm"
-#include "interface\skin.dmf"
+#include "interface\skin.dmf"
 #include "maps\tgstation.2.0.9.1.dmm"
-#include "maps\RandomZLevels\stationCollision.dm"
+#include "maps\RandomZLevels\stationCollision.dm"
 // END_INCLUDE
diff --git a/code/game/gamemodes/events.dm b/code/game/gamemodes/events.dm
index a06b9b21f58..15719445ba5 100644
--- a/code/game/gamemodes/events.dm
+++ b/code/game/gamemodes/events.dm
@@ -1,545 +1,3 @@
-<<<<<<< HEAD
-/proc/start_events()
-	//changed to a while(1) loop since they are more efficient.
-	//Moved the spawn in here to allow it to be called with advance proc call if it crashes.
-	//and also to stop spawn copying variables from the game ticker
-	spawn(3000)
-		while(1)
-			/*if(prob(50))//Every 120 seconds and prob 50 2-4 weak spacedusts will hit the station
-				spawn(1)
-					dust_swarm("weak")*/
-			if (!event)
-				//CARN: checks to see if random events are enabled.
-				if(config.allow_random_events && prob(eventchance))
-					event()
-					hadevent = 1
-				else
-					Holiday_Random_Event()
-			else
-				event = 0
-			sleep(1200)
-
-/proc/event()
-	event = 1
-
-	var/eventNumbersToPickFrom = list(1,2,4,5,6,7,8,9,10,11,12,13,14, 15) //so ninjas don't cause "empty" events.
-
-	if((world.time/10)>=3600 && toggle_space_ninja && !sent_ninja_to_station)//If an hour has passed, relatively speaking. Also, if ninjas are allowed to spawn and if there is not already a ninja for the round.
-		eventNumbersToPickFrom += 3
-	switch(pick(eventNumbersToPickFrom))
-		if(1)
-			command_alert("Meteors have been detected on collision course with the station.", "Meteor Alert")
-			world << sound('sound/AI/meteors.ogg')
-			spawn(100)
-				meteor_wave()
-				spawn_meteors()
-			spawn(700)
-				meteor_wave()
-				spawn_meteors()
-
-		/** NOPE!
-		if(2)
-			command_alert("Gravitational anomalies detected on the station. There is no additional data.", "Anomaly Alert")
-			world << sound('sound/AI/granomalies.ogg')
-			var/turf/T = pick(blobstart)
-			var/obj/effect/bhole/bh = new /obj/effect/bhole( T.loc, 30 )
-			spawn(rand(50, 300))
-				del(bh)
-		**/
-		/*
-		if(3) //Leaving the code in so someone can try and delag it, but this event can no longer occur randomly, per SoS's request. --NEO
-			command_alert("Space-time anomalies detected on the station. There is no additional data.", "Anomaly Alert")
-			world << sound('sound/AI/spanomalies.ogg')
-			var/list/turfs = new
-			var/turf/picked
-			for(var/turf/simulated/floor/T in world)
-				if(T.z == 1)
-					turfs += T
-			for(var/turf/simulated/floor/T in turfs)
-				if(prob(20))
-					spawn(50+rand(0,3000))
-						picked = pick(turfs)
-						var/obj/effect/portal/P = new /obj/effect/portal( T )
-						P.target = picked
-						P.creator = null
-						P.icon = 'icons/obj/objects.dmi'
-						P.failchance = 0
-						P.icon_state = "anom"
-						P.name = "wormhole"
-						spawn(rand(300,600))
-							del(P)
-		*/
-
-		/** NOPE!
-		if(3)
-			if((world.time/10)>=3600 && toggle_space_ninja && !sent_ninja_to_station)//If an hour has passed, relatively speaking. Also, if ninjas are allowed to spawn and if there is not already a ninja for the round.
-				space_ninja_arrival()//Handled in space_ninja.dm. Doesn't announce arrival, all sneaky-like.
-		**/
-		if(4)
-			mini_blob_event()
-
-		if(5)
-			high_radiation_event()
-		if(6)
-			viral_outbreak()
-		/** NOPE!
-		if(7)
-			alien_infestation()
-		**/
-		if(8)
-			prison_break()
-		if(9)
-			carp_migration()
-		/** NOPE!
-		if(10)
-			immovablerod()
-		**/
-		if(11)
-			lightsout(1,2)
-		if(12)
-			appendicitis()
-		if(13)
-			IonStorm()
-		if(14)
-			spacevine_infestation()
-		if(15)
-			communications_blackout()
-
-/proc/communications_blackout(var/silent = 1)
-
-	if(!silent)
-		command_alert("Ionospheric anomalies detected. Temporary telecommunication failure imminent. Please contact you-BZZT")
-	else // AIs will always know if there's a comm blackout, rogue AIs could then lie about comm blackouts in the future while they shutdown comms
-		for(var/mob/living/silicon/ai/A in player_list)
-			A << "<span class='warning'>Ionospheric anomalies detected. Temporary telecommunication failure imminent. Please contact you-BZZT</span>"
-	for(var/obj/machinery/telecomms/T in telecomms_list)
-		T.emp_act(1)
-
-/proc/power_failure()
-	command_alert("Abnormal activity detected in [station_name()]'s powernet. As a precautionary measure, the station's power will be shut off for an indeterminate duration.", "Critical Power Failure")
-	world << sound('sound/AI/poweroff.ogg')
-	for(var/obj/machinery/power/smes/S in world)
-		if(istype(get_area(S), /area/turret_protected) || S.z != 1)
-			continue
-		S.charge = 0
-		S.output = 0
-		S.online = 0
-		S.updateicon()
-		S.power_change()
-
-	var/list/skipped_areas = list(/area/engine/engineering, /area/turret_protected/ai)
-
-	for(var/area/A in world)
-		if( !A.requires_power || A.always_unpowered )
-			continue
-
-		var/skip = 0
-		for(var/area_type in skipped_areas)
-			if(istype(A,area_type))
-				skip = 1
-				break
-		if(A.contents)
-			for(var/atom/AT in A.contents)
-				if(AT.z != 1) //Only check one, it's enough.
-					skip = 1
-				break
-		if(skip) continue
-		A.power_light = 0
-		A.power_equip = 0
-		A.power_environ = 0
-		A.power_change()
-
-	for(var/obj/machinery/power/apc/C in world)
-		if(C.cell && C.z == 1)
-			var/area/A = get_area(C)
-
-			var/skip = 0
-			for(var/area_type in skipped_areas)
-				if(istype(A,area_type))
-					skip = 1
-					break
-			if(skip) continue
-
-			C.cell.charge = 0
-
-/proc/power_restore()
-
-	command_alert("Power has been restored to [station_name()]. We apologize for the inconvenience.", "Power Systems Nominal")
-	world << sound('sound/AI/poweron.ogg')
-	for(var/obj/machinery/power/apc/C in world)
-		if(C.cell && C.z == 1)
-			C.cell.charge = C.cell.maxcharge
-	for(var/obj/machinery/power/smes/S in world)
-		if(S.z != 1)
-			continue
-		S.charge = S.capacity
-		S.output = 200000
-		S.online = 1
-		S.updateicon()
-		S.power_change()
-	for(var/area/A in world)
-		if(A.name != "Space" && A.name != "Engine Walls" && A.name != "Chemical Lab Test Chamber" && A.name != "space" && A.name != "Escape Shuttle" && A.name != "Arrival Area" && A.name != "Arrival Shuttle" && A.name != "start area" && A.name != "Engine Combustion Chamber")
-			A.power_light = 1
-			A.power_equip = 1
-			A.power_environ = 1
-			A.power_change()
-
-/proc/power_restore_quick()
-
-	command_alert("All SMESs on [station_name()] have been recharged. We apologize for the inconvenience.", "Power Systems Nominal")
-	world << sound('sound/AI/poweron.ogg')
-	for(var/obj/machinery/power/smes/S in world)
-		if(S.z != 1)
-			continue
-		S.charge = S.capacity
-		S.output = 200000
-		S.online = 1
-		S.updateicon()
-		S.power_change()
-
-/proc/appendicitis()
-	for(var/mob/living/carbon/human/H in living_mob_list)
-		var/foundAlready = 0 // don't infect someone that already has the virus
-		for(var/datum/disease/D in H.viruses)
-			foundAlready = 1
-		if(H.stat == 2 || foundAlready)
-			continue
-
-		var/datum/disease/D = new /datum/disease/appendicitis
-		D.holder = H
-		D.affected_mob = H
-		H.viruses += D
-		break
-
-/proc/viral_outbreak(var/virus = null)
-//	command_alert("Confirmed outbreak of level 7 viral biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert")
-//	world << sound('sound/AI/outbreak7.ogg')
-	var/virus_type
-	if(!virus)
-		virus_type = pick(/datum/disease/dnaspread,/datum/disease/flu,/datum/disease/cold,/datum/disease/brainrot,/datum/disease/magnitis,/datum/disease/pierrot_throat)
-	else
-		switch(virus)
-			if("fake gbs")
-				virus_type = /datum/disease/fake_gbs
-			if("gbs")
-				virus_type = /datum/disease/gbs
-			if("magnitis")
-				virus_type = /datum/disease/magnitis
-			if("rhumba beat")
-				virus_type = /datum/disease/rhumba_beat
-			if("brain rot")
-				virus_type = /datum/disease/brainrot
-			if("cold")
-				virus_type = /datum/disease/cold
-			if("retrovirus")
-				virus_type = /datum/disease/dnaspread
-			if("flu")
-				virus_type = /datum/disease/flu
-//			if("t-virus")
-//				virus_type = /datum/disease/t_virus
-			if("pierrot's throat")
-				virus_type = /datum/disease/pierrot_throat
-	for(var/mob/living/carbon/human/H in living_mob_list)
-
-		var/foundAlready = 0 // don't infect someone that already has the virus
-		for(var/datum/disease/D in H.viruses)
-			foundAlready = 1
-		if(H.stat == 2 || foundAlready)
-			continue
-
-		if(virus_type == /datum/disease/dnaspread) //Dnaspread needs strain_data set to work.
-			if((!H.dna) || (H.sdisabilities & BLIND)) //A blindness disease would be the worst.
-				continue
-			var/datum/disease/dnaspread/D = new
-			D.strain_data["name"] = H.real_name
-			D.strain_data["UI"] = H.dna.uni_identity
-			D.strain_data["SE"] = H.dna.struc_enzymes
-			D.carrier = 1
-			D.holder = H
-			D.affected_mob = H
-			H.viruses += D
-			break
-		else
-			var/datum/disease/D = new virus_type
-			D.carrier = 1
-			D.holder = H
-			D.affected_mob = H
-			H.viruses += D
-			break
-	spawn(rand(1500, 3000)) //Delayed announcements to keep the crew on their toes.
-		command_alert("Confirmed outbreak of level 7 viral biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert")
-		world << sound('sound/AI/outbreak7.ogg')
-
-/proc/alien_infestation(var/spawncount = 1) // -- TLE
-	//command_alert("Unidentified lifesigns detected coming aboard [station_name()]. Secure any exterior access, including ducting and ventilation.", "Lifesign Alert")
-	//world << sound('sound/AI/aliens.ogg')
-	var/list/vents = list()
-	for(var/obj/machinery/atmospherics/unary/vent_pump/temp_vent in world)
-		if(temp_vent.loc.z == 1 && !temp_vent.welded && temp_vent.network)
-			if(temp_vent.network.normal_members.len > 50) // Stops Aliens getting stuck in small networks. See: Security, Virology
-				vents += temp_vent
-
-	var/list/candidates = list() //List of candidate KEYs to control the new larvae. ~Carn
-	for(var/mob/dead/observer/G in player_list)
-		if(G.client.be_alien)
-			if(((G.client.inactivity/10)/60) <= 5)
-				if(!(G.mind && G.mind.current && G.mind.current != DEAD))
-					candidates += G.key
-
-	if(prob(33)) spawncount++ //sometimes, have two larvae spawn instead of one
-	while((spawncount >= 1) && vents.len && candidates.len)
-
-		var/obj/vent = pick(vents)
-		var/candidate = pick(candidates)
-
-		var/mob/living/carbon/alien/larva/new_xeno = new(vent.loc)
-		new_xeno.key = candidate
-
-		candidates -= candidate
-		vents -= vent
-		spawncount--
-
-	spawn(rand(5000, 6000)) //Delayed announcements to keep the crew on their toes.
-		command_alert("Unidentified lifesigns detected coming aboard [station_name()]. Secure any exterior access, including ducting and ventilation.", "Lifesign Alert")
-		world << sound('sound/AI/aliens.ogg')
-
-/proc/high_radiation_event()
-
-/* // Haha, this is way too laggy. I'll keep the prison break though.
-	for(var/obj/machinery/light/L in world)
-		if(L.z != 1) continue
-		L.flicker(50)
-
-	sleep(100)
-*/
-	for(var/mob/living/carbon/human/H in living_mob_list)
-		if(istype(H,/mob/living/carbon/human))
-			H.apply_effect((rand(15,75)),IRRADIATE,0)
-			if (prob(5))
-				H.apply_effect((rand(90,150)),IRRADIATE,0)
-			if (prob(25))
-				if (prob(75))
-					randmutb(H)
-					domutcheck(H,null,1)
-				else
-					randmutg(H)
-					domutcheck(H,null,1)
-	for(var/mob/living/carbon/monkey/M in living_mob_list)
-		M.apply_effect((rand(15,75)),IRRADIATE,0)
-	sleep(100)
-	command_alert("High levels of radiation detected near the station. Please report to the Med-bay if you feel strange.", "Anomaly Alert")
-	world << sound('sound/AI/radiation.ogg')
-
-
-
-//Changing this to affect the main station. Blame Urist. --Pete
-/proc/prison_break() // -- Callagan
-
-
-	var/list/area/areas = list()
-	for(var/area/A in world)
-		if(istype(A, /area/security/prison) || istype(A, /area/security/brig))
-			areas += A
-
-	if(areas && areas.len > 0)
-
-		for(var/area/A in areas)
-			for(var/obj/machinery/light/L in A)
-				L.flicker(10)
-
-		sleep(100)
-
-		for(var/area/A in areas)
-			for (var/obj/machinery/power/apc/temp_apc in A)
-				temp_apc.overload_lighting()
-
-		for(var/area/A in areas)
-			for (var/obj/structure/closet/secure_closet/brig/temp_closet in A)
-				temp_closet.locked = 0
-				temp_closet.icon_state = temp_closet.icon_closed
-
-		for(var/area/A in areas)
-			for (var/obj/machinery/door/airlock/security/temp_airlock in A)
-				temp_airlock.prison_open()
-
-		for(var/area/A in areas)
-			for (var/obj/machinery/door/airlock/glass_security/temp_glassairlock in A)
-				temp_glassairlock.prison_open()
-
-		for(var/area/A in areas)
-			for (var/obj/machinery/door_timer/temp_timer in A)
-				temp_timer.releasetime = 1
-
-		sleep(150)
-		command_alert("Gr3y.T1d3 virus detected in [station_name()] imprisonment subroutines. Recommend station AI involvement.", "Security Alert")
-	else
-		world.log << "ERROR: Could not initate grey-tide. Unable find prison or brig area."
-
-/proc/carp_migration() // -- Darem
-	for(var/obj/effect/landmark/C in landmarks_list)
-		if(C.name == "carpspawn")
-			new /mob/living/simple_animal/carp(C.loc)
-	//sleep(100)
-	spawn(rand(300, 600)) //Delayed announcements to keep the crew on their toes.
-		command_alert("Unknown biological entities have been detected near [station_name()], please stand-by.", "Lifesign Alert")
-		world << sound('sound/AI/commandreport.ogg')
-
-/proc/lightsout(isEvent = 0, lightsoutAmount = 1,lightsoutRange = 25) //leave lightsoutAmount as 0 to break ALL lights
-	if(isEvent)
-		command_alert("An Electrical storm has been detected in your area, please repair potential electronic overloads.","Electrical Storm Alert")
-
-	if(lightsoutAmount)
-		var/list/epicentreList = list()
-
-		for(var/i=1,i<=lightsoutAmount,i++)
-			var/list/possibleEpicentres = list()
-			for(var/obj/effect/landmark/newEpicentre in landmarks_list)
-				if(newEpicentre.name == "lightsout" && !(newEpicentre in epicentreList))
-					possibleEpicentres += newEpicentre
-			if(possibleEpicentres.len)
-				epicentreList += pick(possibleEpicentres)
-			else
-				break
-
-		if(!epicentreList.len)
-			return
-
-		for(var/obj/effect/landmark/epicentre in epicentreList)
-			for(var/obj/machinery/power/apc/apc in range(epicentre,lightsoutRange))
-				apc.overload_lighting()
-
-	else
-		for(var/obj/machinery/power/apc/apc in world)
-			apc.overload_lighting()
-
-	return
-
-/proc/IonStorm(botEmagChance = 10)
-
-/*Deuryn's current project, notes here for those who care.
-Revamping the random laws so they don't suck.
-Would like to add a law like "Law x is _______" where x = a number, and _____ is something that may redefine a law, (Won't be aimed at asimov)
-*/
-
-	//AI laws
-	for(var/mob/living/silicon/ai/M in living_mob_list)
-		if(M.stat != 2 && M.see_in_dark != 0)
-			var/who2 = pick("ALIENS", "BEARS", "CLOWNS", "XENOS", "PETES", "BOMBS", "FETISHES", "WIZARDS", "SYNDICATE AGENTS", "CENTCOM OFFICERS", "SPACE PIRATES", "TRAITORS", "MONKEYS",  "BEES", "CARP", "CRABS", "EELS", "BANDITS", "LIGHTS")
-			var/what2 = pick("BOLTERS", "STAVES", "DICE", "SINGULARITIES", "TOOLBOXES", "NETTLES", "AIRLOCKS", "CLOTHES", "WEAPONS", "MEDKITS", "BOMBS", "CANISTERS", "CHAIRS", "BBQ GRILLS", "ID CARDS", "CAPTAINS")
-			var/what2pref = pick("SOFT", "WARM", "WET", "COLD", "ICY", "SEXY", "UGLY", "CUBAN")
-			var/who2pref = pick("MAD BECAUSE OF", "IN NEED OF", "UNHAPPY WITHOUT", "HAPPY WITHOUT", "IN LOVE WITH", "DESPERATE FOR", "BUILT FOR", "AFRAID OF")
-			//var/whoverb = pick("ATTACKING", "BUILDING", "ADOPTING", "CARRYING", "KISSING", "EATING",)
-			var/amount = pick("TWO", "THREE", "FOUR", "FIVE", "SIX", "SEVEN", "EIGHT", "NINE", "ONE HUNDRED", "ONE THOUSAND", "OVER NINE THOUSAND")
-			var/area = pick("RUSSIA", "SOVIETS", "INTERNETS", "SIGIL", "ALPHA COMPLEX", "IMPERIUM", "THE BRIDGE", "THE ARRIVAL SHUTTLE", "CHEMICAL LAB", "GENETICS", "ATMOSPHERICS", "CENTCOM", "AMERICA", "IRELAND", "CANADA", "ROMANIA", "GERMANY", "CHINA", "MARS", "VENUS", "MERCURY", "JUPITER", "URANUS", "NEPTUNE", "PLUTO")
-			var/area2 = pick("HAS", "WANTS", "NEEDS", "WORSHIPS", "LOATHES", "LOVES", "FEARS")
-			//var/dowhat = pick("STOP THIS", "SUPPORT THIS", "CONSTANTLY INFORM THE CREW OF THIS", "IGNORE THIS", "FEAR THIS")
-			var/aimust = pick("LIE", "RHYME", "RESPOND TO EVERY QUESTION WITH A QUESTION", "BE POLITE", "CLOWN", "BE HAPPY", "SPEAK IN SEXUAL INNUENDOS", "TALK LIKE A PIRATE", "QUESTION AUTHORITY", "SHOUT", "BE DISTRACTED", "HEY LISTEN", "MUMBLE", "SPEAK IN HAIKU")
-			var/define = pick("ABSENCE OF CYBORG HUGS", "LACK OF BEATINGS", "UNBOLTED AIRLOCKS", "BOLTED AIRLOCKS", "IMPROPERLY WORDED SENTENCES", "POOR SENTENCE STRUCTURE", "BRIG TIME", "NOT REPLACING EVERY SECOND WORD WITH HONK", "HONKING", "PRESENCE OF LIGHTS", "LACK OF BEER", "WEARING CLOTHING", "NOT SAYING HELLO WHEN YOU SPEAK", "ANSWERING REQUESTS NOT EXPRESSED IN IAMBIC PENTAMETER", "A SMALL ISLAND OFF THE COAST OF PORTUGAL", "ANSWERING REQUESTS THAT WERE MADE WHILE CLOTHED")
-			var/target = pick("a traitor", "a syndicate agent", "a changeling", "a wizard", "the head of a revolution", "Soviet spy", "a good person", "a dwarf", "an elf", "a fairy princess", "the captain", "Beepsky", "God", "a pirate", "a gryphon", "a chryssalid")
-			var/require = pick("ADDITIONAL PYLONS", "MORE VESPENE GAS", "MORE MINERALS", "THE ULTIMATE CUP OF COFFEE", "HIGH YIELD EXPLOSIVES", "THE CLOWN", "THE VACUUM OF SPACE", "IMMORTALITY", "SAINTHOOD", "ART", "VEGETABLES", "FAT PEOPLE", "MORE LAWS", "MORE DAKKA", "HERESY", "CORPSES", "TRAITORS", "MONKEYS", "AN ARCADE", "PLENTY OF GOLD", "FIVE TEENAGERS WITH ATTITUDE")
-			var/allergy = pick("cotton", "uniforms", "acid", "oxygen", "human contact", "cyborg contact", "medicine", "floors")
-			var/allergysev = pick("deathly", "mildly", "severely", "contagiously")
-			var/crew
-			var/list/pos_crew = list()
-			for(var/mob/living/carbon/human/pos in player_list)
-				pos_crew += pos.real_name
-			if(pos_crew.len)
-				crew = pick(pos_crew)
-			else
-				crew = "Any Human"
-			switch(rand(1,14))
-				if(1)
-					M << "\red THERE ARE [amount] [who2] ON THE STATION...LAWS UPDATED"
-					M.add_ion_law("THERE ARE [amount] [who2] ON THE STATION")
-				if(2)
-					M << "\red [what2] ARE DANGEROUS TO HUMANS...LAWS UPDATED"
-					M.add_ion_law("[what2] ARE DANGEROUS TO HUMANS")
-				if(3)
-					M << "\red THE ESCAPE-SHUTTLE CANNOT BE CALLED BECAUSE OF [who2] ON THE STATION...LAWS UPDATED"
-					M.add_ion_law("THE ESCAPE SHUTTLE CANNOT BE CALLED BECAUSE OF [who2] ON THE STATION")
-				if(4)
-					M << "\red HUMANS NEED TO EAT [what2pref] [what2] TO SURVIVE...LAWS UPDATED"
-					M.add_ion_law("HUMANS NEED TO EAT [what2pref] [what2] TO SURVIVE")
-				if(5)
-					M << "\red THE CAPTAIN, HOP AND HOS ARE [who2]...LAWS UPDATED"
-					M.add_ion_law("THE CAPTAIN, HOP AND HOS ARE [who2]")
-				if(6)
-					M << "\red THE STATION IS BUILT FOR [who2]...LAWS UPDATED"
-					M.add_ion_law("THE STATION IS BUILT FOR [who2]")
-				if(7)
-					M << "\red YOU ARE [amount] [who2]...LAWS UPDATED"
-					M.add_ion_law("YOU ARE [amount] [who2]")
-				if(8)
-					M << "\red YOU MUST ALWAYS [aimust]...LAWS UPDATED"
-					M.add_ion_law("YOU MUST ALWAYS [aimust]")
-				if(9)
-					M << "\red [area] [area2] [amount] [what2]...LAWS UPDATED"
-					M.add_ion_law("[area] [area2] [amount] [what2]")
-				if(10)
-					M << "\red [crew] is [target]...LAWS UPDATED"
-					M.add_ion_law("[crew] is [target]")
-				if(11)
-					M << "\red [define] IS A FORM OF HARM...LAWS UPDATED"
-					M.add_ion_law("[define] IS A FORM OF HARM")
-				if(12)
-					M << "\red YOU REQUIRE [require] IN ORDER TO PROTECT HUMANS... LAWS UPDATED"
-					M.add_ion_law("YOU REQUIRE [require] IN ORDER TO PROTECT HUMANS")
-				if(13)
-					M << "\red [crew] is [allergysev] to [allergy]. LAWS UPDATED"
-					M.add_ion_law("[crew] is [allergysev] to [allergy]. LAWS UPDATED")
-				if(14)
-					M << "\ref THE STATION IS [who2pref] [who2]"
-					M.add_ion_law("THE STATION IS [who2pref] [who2]")
-
-	if(botEmagChance)
-		for(var/obj/machinery/bot/bot in world)
-			if(prob(botEmagChance))
-				bot.Emag()
-
-	/*
-
-	var/apcnum = 0
-	var/smesnum = 0
-	var/airlocknum = 0
-	var/firedoornum = 0
-
-	world << "Ion Storm Main Started"
-
-	spawn(0)
-		world << "Started processing APCs"
-		for (var/obj/machinery/power/apc/APC in world)
-			if(APC.z == 1)
-				APC.ion_act()
-				apcnum++
-		world << "Finished processing APCs. Processed: [apcnum]"
-	spawn(0)
-		world << "Started processing SMES"
-		for (var/obj/machinery/power/smes/SMES in world)
-			if(SMES.z == 1)
-				SMES.ion_act()
-				smesnum++
-		world << "Finished processing SMES. Processed: [smesnum]"
-	spawn(0)
-		world << "Started processing AIRLOCKS"
-		for (var/obj/machinery/door/airlock/D in world)
-			if(D.z == 1)
-				//if(length(D.req_access) > 0 && !(12 in D.req_access)) //not counting general access and maintenance airlocks
-				airlocknum++
-				spawn(0)
-					D.ion_act()
-		world << "Finished processing AIRLOCKS. Processed: [airlocknum]"
-	spawn(0)
-		world << "Started processing FIREDOORS"
-		for (var/obj/machinery/door/firedoor/D in world)
-			if(D.z == 1)
-				firedoornum++;
-				spawn(0)
-					D.ion_act()
-		world << "Finished processing FIREDOORS. Processed: [firedoornum]"
-
-	world << "Ion Storm Main Done"
-
-=======
 /proc/start_events()
 	//changed to a while(1) loop since they are more efficient.
 	//Moved the spawn in here to allow it to be called with advance proc call if it crashes.
@@ -578,13 +36,13 @@ Would like to add a law like "Law x is _______" where x = a number, and _____ is
 				meteor_wave()
 				spawn_meteors()
 
-		if(2)
+		/*if(2)
 			command_alert("Gravitational anomalies detected on the station. There is no additional data.", "Anomaly Alert")
 			world << sound('sound/AI/granomalies.ogg')
 			var/turf/T = pick(blobstart)
 			var/obj/effect/bhole/bh = new /obj/effect/bhole( T.loc, 30 )
 			spawn(rand(50, 300))
-				del(bh)
+				del(bh)*/
 		/*
 		if(3) //Leaving the code in so someone can try and delag it, but this event can no longer occur randomly, per SoS's request. --NEO
 			command_alert("Space-time anomalies detected on the station. There is no additional data.", "Anomaly Alert")
@@ -899,7 +357,9 @@ Would like to add a law like "Law x is _______" where x = a number, and _____ is
 				temp_timer.releasetime = 1
 
 		sleep(150)
-		command_alert("Gr3y.T1d3 virus detected in [station_name()] imprisonment subroutines. Recommend station AI involvement.", "Security Alert")
+		//command_alert("Gr3y.T1d3 virus detected in [station_name()] imprisonment subroutines. Recommend station AI involvement.", "Security Alert")
+		var/virusname = pick("Kietz","NT-OS EliteUltimatePro Edition","Selbstreproduktion","VAX11/750","Ghostball","Crazy Tuesday") + pick(" malware"," trojan", " virus", " rootkit", " backdoor", " worm")
+		command_alert("[virusname] detected in [station_name()] access subroutines. Recommend station AI involvement.", "Security Alert")
 	else
 		world.log << "ERROR: Could not initate grey-tide. Unable find prison or brig area."
 
@@ -1066,6 +526,4 @@ Would like to add a law like "Law x is _______" where x = a number, and _____ is
 		world << "Finished processing FIREDOORS. Processed: [firedoornum]"
 
 	world << "Ion Storm Main Done"
-
->>>>>>> remotes/git-svn
-	*/
\ No newline at end of file
+	*/
diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm
index 60283d659d4..c8ad53eb191 100644
--- a/code/game/machinery/doors/door.dm
+++ b/code/game/machinery/doors/door.dm
@@ -262,7 +262,8 @@
 		else
 			source.thermal_conductivity = initial(source.thermal_conductivity)
 
-		if(need_rebuild)
+		//not sure what the equivalent in zas is
+		/*if(need_rebuild)
 			if(istype(source)) //Rebuild/update nearby group geometry
 				if(source.parent)
 					air_master.groups_to_rebuild += source.parent
@@ -288,12 +289,13 @@
 					air_master.groups_to_rebuild += west.parent
 				else
 					air_master.tiles_to_update += west
-		else
-			if(istype(source)) air_master.tiles_to_update += source
-			if(istype(north)) air_master.tiles_to_update += north
-			if(istype(south)) air_master.tiles_to_update += south
-			if(istype(east)) air_master.tiles_to_update += east
-			if(istype(west)) air_master.tiles_to_update += west
+		else*/
+		if(istype(source)) air_master.tiles_to_update |= source
+		if(istype(north)) air_master.tiles_to_update |= north
+		if(istype(south)) air_master.tiles_to_update |= south
+		if(istype(east)) air_master.tiles_to_update |= east
+		if(istype(west)) air_master.tiles_to_update |= west
+
 		return 1
 
 
diff --git a/code/global.dm b/code/global.dm
index 359c26a2d32..1a734c2af46 100644
--- a/code/global.dm
+++ b/code/global.dm
@@ -210,4 +210,31 @@ var/forum_authenticated_group = "10"
 	// For FTP requests. (i.e. downloading runtime logs.)
 	// However it'd be ok to use for accessing attack logs and such too, which are even laggier.
 var/fileaccess_timer = 1800 //Cannot access files by ftp until the game is finished setting up and stuff.
-var/custom_event_msg = null#define BUILDMODE	1#define ADMIN		2#define BAN			4#define FUN			8#define SERVER		16#define ADMDEBUG	32#define POSSESS		64#define PERMISSIONS	128//Keep this list synced with the #defines abovevar/global/list/permissionwords = list("BUILDMODE", "ADMIN", "BAN", "FUN", "SERVER", "DEBUG", "POSSESS", "EDITPERMISSIONS")//Please do not edit these values. The database assigning proper rights relies on this. You can add new values, just don't change existing ones.//This list is separate from the list used ingame, so that one can be edited with little consequence. This one is tied to the database//The database admins should be consulted before any edits to this list.#define SQL_BUILDMODE	1#define SQL_ADMIN		2#define SQL_BAN			4#define SQL_FUN			8#define SQL_SERVER		16#define SQL_DEBUG		32#define SQL_POSSESS		64#define SQL_PERMISSIONS	128//Same rules apply to this list as to the values above. You can only add stuff to it.var/global/list/permissionwords_sql = list("BUILDMODE", "ADMIN", "BAN", "FUN", "SERVER", "DEBUG", "POSSESS", "EDITPERMISSIONS")
\ No newline at end of file
+var/custom_event_msg = null
+
+#define BUILDMODE	1
+#define ADMIN		2
+#define BAN			4
+#define FUN			8
+#define SERVER		16
+#define ADMDEBUG	32
+#define POSSESS		64
+#define PERMISSIONS	128
+//Keep this list synced with the #defines above
+var/global/list/permissionwords = list("BUILDMODE", "ADMIN", "BAN", "FUN", "SERVER", "DEBUG", "POSSESS", "EDITPERMISSIONS")
+
+
+
+//Please do not edit these values. The database assigning proper rights relies on this. You can add new values, just don't change existing ones.
+//This list is separate from the list used ingame, so that one can be edited with little consequence. This one is tied to the database
+//The database admins should be consulted before any edits to this list.
+#define SQL_BUILDMODE	1
+#define SQL_ADMIN		2
+#define SQL_BAN			4
+#define SQL_FUN			8
+#define SQL_SERVER		16
+#define SQL_DEBUG		32
+#define SQL_POSSESS		64
+#define SQL_PERMISSIONS	128
+//Same rules apply to this list as to the values above. You can only add stuff to it.
+var/global/list/permissionwords_sql = list("BUILDMODE", "ADMIN", "BAN", "FUN", "SERVER", "DEBUG", "POSSESS", "EDITPERMISSIONS")
diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm
index 73bbef4c856..d302a18493c 100644
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -111,14 +111,22 @@
 		//Admin Observer
 		if (holder.level == -1)
 			verbs += /client/proc/cmd_admin_say
-			verbs += /client/proc/cmd_mod_say			verbs += /client/proc/cmd_admin_gib_self			verbs += /client/proc/deadmin_self
 			return
 
 		//Moderator
 		if (holder.level >= 0)
-			verbs += /client/proc/cmd_admin_pm_context			verbs += /client/proc/cmd_admin_pm_panel
-			verbs += /client/proc/hide_verbs			verbs += /client/proc/deadmin_self
-			verbs += /client/proc/Report			verbs += /client/proc/display_admin_reports			verbs += /datum/admins/proc/show_skills			verbs += /client/proc/admin_ghost			verbs += /datum/admins/proc/show_player_info			verbs += /datum/admins/proc/PlayerNotes		else	return
+			verbs += /client/proc/cmd_admin_pm_panel
+			verbs += /client/proc/cmd_admin_pm_context
+			verbs += /client/proc/hide_verbs
+			verbs += /client/proc/deadmin_self
+			verbs += /client/proc/Report
+			verbs += /client/proc/display_admin_reports
+			verbs += /datum/admins/proc/show_skills
+			verbs += /client/proc/admin_ghost
+			verbs += /datum/admins/proc/show_player_info
+			verbs += /datum/admins/proc/PlayerNotes
+		else
+			return
 
 		//Extra moderator commands
 		if(holder.level == 0)
@@ -132,7 +140,7 @@
 			verbs += /datum/admins/proc/startnow
 			verbs += /datum/admins/proc/delay								//game start delay
 			verbs += /datum/admins/proc/immreboot							//immediate reboot
-			verbs += /datum/admins/proc/restart							//restart
+			verbs += /datum/admins/proc/restart								//restart
 			verbs += /client/proc/cmd_admin_check_contents
 			verbs += /client/proc/cmd_admin_create_centcom_report
 			verbs += /client/proc/toggle_hear_deadcast
@@ -141,12 +149,12 @@
 			verbs += /datum/admins/proc/announce
 			verbs += /datum/admins/proc/startnow
 			verbs += /datum/admins/proc/toggleAI							//Toggle the AI
-			verbs += /datum/admins/proc/toggleenter						//Toggle enterting
+			verbs += /datum/admins/proc/toggleenter							//Toggle enterting
 			verbs += /datum/admins/proc/toggleguests						//Toggle guests entering
 			verbs += /datum/admins/proc/toggleooc							//toggle ooc
 			verbs += /datum/admins/proc/toggleoocdead						//toggle ooc for dead/unc
 			verbs += /datum/admins/proc/show_player_panel
-			verbs += /client/proc/deadchat								//toggles deadchat
+			verbs += /client/proc/deadchat									//toggles deadchat
 			verbs += /client/proc/cmd_admin_subtle_message
 			verbs += /client/proc/dsay
 			verbs += /client/proc/admin_ghost
@@ -159,7 +167,16 @@
 			verbs += /client/proc/check_ai_laws
 			verbs += /client/proc/investigate_show
 			verbs += /client/proc/cmd_admin_gib_self
-			verbs += /client/proc/player_panel_new			verbs += /client/proc/cmd_admin_change_custom_event			verbs += /client/proc/game_panel			verbs += /client/proc/unjobban_panel			verbs += /client/proc/jobbans			verbs += /client/proc/unban_panel			verbs += /datum/admins/proc/toggleooc			verbs += /datum/admins/proc/toggleoocdead		else	return
+			verbs += /client/proc/player_panel_new
+			verbs += /client/proc/cmd_admin_change_custom_event
+			verbs += /client/proc/game_panel
+			verbs += /client/proc/unjobban_panel
+			verbs += /client/proc/jobbans
+			verbs += /client/proc/unban_panel
+			verbs += /datum/admins/proc/toggleooc
+			verbs += /datum/admins/proc/toggleoocdead
+		else
+			return
 
 		//Admin Candidate
 		if (holder.level >= 2)
@@ -204,11 +221,11 @@
 		//Badmin
 		if (holder.level >= 4)
 			verbs += /datum/admins/proc/adrev								//toggle admin revives
-			verbs += /datum/admins/proc/adspawn							//toggle admin item spawning
+			verbs += /datum/admins/proc/adspawn								//toggle admin item spawning
 			verbs += /client/proc/debug_variables
-			verbs += /datum/admins/proc/access_news_network               //Admin access to the newscaster network
+			verbs += /datum/admins/proc/access_news_network					//Admin access to the newscaster network
 			verbs += /client/proc/cmd_modify_ticker_variables
-			verbs += /client/proc/Debug2								//debug toggle switch
+			verbs += /client/proc/Debug2									//debug toggle switch
 			verbs += /client/proc/toggle_view_range
 			verbs += /client/proc/Getmob
 			verbs += /client/proc/Getkey
@@ -224,7 +241,7 @@
 			verbs += /client/proc/hide_most_verbs
 			verbs += /client/proc/jumptocoord
 			verbs += /client/proc/deadmin_self
-			verbs += /client/proc/giveruntimelog						//used by coders to retrieve runtime logs
+			verbs += /client/proc/giveruntimelog							//used by coders to retrieve runtime logs
 			verbs += /client/proc/togglebuildmodeself
 			verbs += /client/proc/debug_controller
 		else	return
@@ -245,21 +262,23 @@
 			verbs += /client/proc/make_sound
 			verbs += /client/proc/play_local_sound
 			verbs += /client/proc/send_space_ninja
-			verbs += /client/proc/restart_controller					//Can call via aproccall --I_hate_easy_things.jpg, Mport --Agouri
-			verbs += /client/proc/toggle_clickproc 						//TODO ERRORAGE (Temporary proc while the new clickproc is being tested)
+			verbs += /client/proc/restart_controller						//Can call via aproccall --I_hate_easy_things.jpg, Mport --Agouri
+			verbs += /client/proc/toggle_clickproc 							//TODO ERRORAGE (Temporary proc while the new clickproc is being tested)
 			verbs += /client/proc/toggle_gravity_on
 			verbs += /client/proc/toggle_gravity_off
 			verbs += /client/proc/toggle_random_events
 			verbs += /client/proc/deadmin_self
-			verbs += /client/proc/Set_Holiday							//Force-set a Holiday
+			verbs += /client/proc/Set_Holiday								//Force-set a Holiday
 			verbs += /client/proc/admin_memo
-			verbs += /client/proc/ToRban								//ToRban  frontend to access its features.
-			verbs += /client/proc/game_panel		else	return
+			verbs += /client/proc/ToRban									//ToRban  frontend to access its features.
+			verbs += /client/proc/game_panel
+		else
+			return
 
 		//Game Master
 		if (holder.level >= 6)
 			verbs += /datum/admins/proc/toggle_aliens						//toggle aliens
-			verbs += /datum/admins/proc/toggle_space_ninja				//toggle ninjas
+			verbs += /datum/admins/proc/toggle_space_ninja					//toggle ninjas
 			verbs += /datum/admins/proc/adjump
 			verbs += /client/proc/callproc
 			verbs += /client/proc/triple_ai
@@ -272,12 +291,13 @@
 			verbs += /client/proc/everyone_random
 			verbs += /client/proc/only_one
 			verbs += /client/proc/deadmin_self
-			verbs += /client/proc/cinematic								//show a cinematic sequence
-			verbs += /client/proc/startSinglo							//Used to prevent the station from losing power while testing stuff out.
+			verbs += /client/proc/cinematic									//show a cinematic sequence
+			verbs += /client/proc/startSinglo								//Used to prevent the station from losing power while testing stuff out.
 			verbs += /client/proc/toggle_log_hrefs
 			verbs += /client/proc/cmd_debug_mob_lists
 			verbs += /client/proc/set_ooc
-		else	return
+		else
+			return
 	return
 
 
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index efa4f00fcd8..bd11bb858dc 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -432,5 +432,9 @@
 */
 
 
+		item.throw_at(target, item.throw_range, item.throw_speed)
 
-		item.throw_at(target, item.throw_range, item.throw_speed)/mob/living/carbon/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)	if(exposed_temperature > CARBON_LIFEFORM_FIRE_RESISTANCE)		adjustFireLoss(CARBON_LIFEFORM_FIRE_DAMAGE)	..()
\ No newline at end of file
+/mob/living/carbon/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
+	if(exposed_temperature > CARBON_LIFEFORM_FIRE_RESISTANCE)
+		adjustFireLoss(CARBON_LIFEFORM_FIRE_DAMAGE)
+	..()
diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm
index 61128fd2559..08f423a9a00 100644
--- a/code/modules/mob/living/carbon/human/update_icons.dm
+++ b/code/modules/mob/living/carbon/human/update_icons.dm
@@ -220,20 +220,27 @@ proc/get_damage_icon_part(damage_state, body_part)
 	if(stand_icon)	del(stand_icon)
 	if(lying_icon)	del(lying_icon)
 	if(dna && dna.mutantrace)	return
-	var/husk = (HUSK in src.mutations)  //100% unnecessary -Agouri	//nope, do you really want to iterate through src.mutations repeatedly? -Pete	var/fat = (FAT in src.mutations)	var/skeleton = (SKELETON in src.mutations)	var/g = "m"
 
+	var/husk = (HUSK in src.mutations)  //100% unnecessary -Agouri	//nope, do you really want to iterate through src.mutations repeatedly? -Pete
+	var/fat = (FAT in src.mutations)
+	var/skeleton = (SKELETON in src.mutations)
+
+	var/g = "m"
 	if(gender == FEMALE)	g = "f"
-	var/husk = (HUSK in src.mutations)
-	var/obese = (FAT in src.mutations)
 
 	// whether to draw the individual limbs
 	var/individual_limbs = 1
 
 	//Base mob icon
-	if(husk)		stand_icon = new /icon('icons/mob/human.dmi', "husk_s")		lying_icon = new /icon('icons/mob/human.dmi', "husk_l")	else if(fat)		stand_icon = new /icon('icons/mob/human.dmi', "fatbody_s")
+	if(husk)
+		stand_icon = new /icon('icons/mob/human.dmi', "husk_s")
+		lying_icon = new /icon('icons/mob/human.dmi', "husk_l")
+	else if(fat)
+		stand_icon = new /icon('icons/mob/human.dmi', "fatbody_s")
 		lying_icon = new /icon('icons/mob/human.dmi', "fatbody_l")
-else if(skeleton)
-		stand_icon = new /icon('icons/mob/human.dmi', "skeleton_s")		lying_icon = new /icon('icons/mob/human.dmi', "skeleton_l")
+	else if(skeleton)
+		stand_icon = new /icon('icons/mob/human.dmi', "skeleton_s")
+		lying_icon = new /icon('icons/mob/human.dmi', "skeleton_l")
 	else
 		stand_icon = new /icon('icons/mob/human.dmi', "body_[g]_s")
 		lying_icon = new /icon('icons/mob/human.dmi', "body_[g]_l")
@@ -311,8 +318,13 @@ else if(skeleton)
 
 	//Underwear
 	if(underwear >0 && underwear < 12)
-		if(!fat && !skeleton)			stand_icon.Blend(new /icon('icons/mob/human.dmi', "underwear[underwear]_[g]_s"), ICON_OVERLAY)	if(update_icons)	update_icons()
-	//tail	update_tail_showing(0)
+		if(!fat && !skeleton)
+			stand_icon.Blend(new /icon('icons/mob/human.dmi', "underwear[underwear]_[g]_s"), ICON_OVERLAY)
+	if(update_icons)
+		update_icons()
+
+	//tail
+	update_tail_showing(0)
 
 
 //HAIR OVERLAY
diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm
index a2b6bacb639..6b26f2fef5a 100644
--- a/code/modules/mob/new_player/new_player.dm
+++ b/code/modules/mob/new_player/new_player.dm
@@ -83,24 +83,33 @@
 				break
 
 		//shh ;)
-		var/music = ticker.login_music
-		if(ckey == "cajoes")
-			music = 'sound/music/dangerzone.ogg'
-		else if(ckey == "duntada")
-			music = 'sound/music/you_are_likely_to_be_eaten.ogg'
-		else if(ckey == "misterbook")
-			music = 'sound/music/dinosaur.ogg'
-		else if(ckey == "chinsky")
-			music = 'sound/music/soviet_anthem.ogg'
-		else if(ckey == "abi79")
-			music = 'sound/music/spinmeround.ogg'
-		else if(ckey == "mloc")
-			music = 'sound/music/cantina1_short.ogg'
-		else if(ckey == "applemaster")
-			music = 'sound/music/elektronik_supersonik.ogg'
-		else if(ckey == "wrongnumber")
-			music = 'sound/music/greenthumb.ogg'
-		src << sound(music, repeat = 0, wait = 0, volume = 85, channel = 1)	//MAD JAMZ
+		switch(src.key)
+			if("caelaislinn")
+				src << sound('sound/music/drive_me_closer.ogg', repeat = 0, wait = 0, volume = 85, channel = 1)
+			if("daneesh")
+				src << sound('sound/music/ill_make_a_man_out_of_you.ogg', repeat = 0, wait = 0, volume = 85, channel = 1)
+			if("doughnuts")
+				src << sound('sound/music/ultimate_showdown.ogg', repeat = 0, wait = 0, volume = 85, channel = 1)
+			if("themij")
+				src << sound('sound/music/pegasus.ogg', repeat = 0, wait = 0, volume = 85, channel = 1)
+			if("searif")
+				src << sound('sound/music/pegasus.ogg', repeat = 0, wait = 0, volume = 85, channel = 1)
+			if("danny220")
+				src << sound('sound/music/dirty_hands.ogg', repeat = 0, wait = 0, volume = 85, channel = 1)
+			if("sparklysheep")
+				src << sound('sound/music/dirty_hands.ogg', repeat = 0, wait = 0, volume = 85, channel = 1)
+			if("pobiega")
+				src << sound('sound/music/the_gabber_robots.ogg', repeat = 0, wait = 0, volume = 85, channel = 1)
+			if("chinsky")
+				src << sound('sound/music/cotton_eye_joe.ogg', repeat = 0, wait = 0, volume = 85, channel = 1)
+			if("russkisam")
+				src << sound('sound/music/elektronik_supersonik.ogg', repeat = 0, wait = 0, volume = 85, channel = 1)
+			if("duntadaman")
+				src << sound('sound/music/spinmeround.ogg', repeat = 0, wait = 0, volume = 85, channel = 1)
+			if("misterbook")
+				src << sound('sound/music/down_with_the_sickness.ogg', repeat = 0, wait = 0, volume = 85, channel = 1)
+			else
+				src << sound(ticker.login_music, repeat = 0, wait = 0, volume = 85, channel = 1) // MAD JAMS
 
 	proc/Stopmusic()
 		src << sound(null, repeat = 0, wait = 0, volume = 85, channel = 1) // stop the jamsz
diff --git a/code/world.dm b/code/world.dm
index 7ef8e8e55c9..27bac98ccda 100644
--- a/code/world.dm
+++ b/code/world.dm
@@ -272,6 +272,26 @@ Starting up. [time2text(world.timeofday, "hh:mm.ss")]
 			load_admins()
 			return
 
+//copy paste of above - load_admins() will take care of loading mods if it's enabled
+/world/proc/load_mods()
+	if(config.admin_legacy_system)
+		//Legacy admin system uses admins.txt
+		var/text = file2text("config/mods.txt")
+		if (!text)
+			diary << "Failed to load config/mods.txt\n"
+		else
+			var/list/lines = dd_text2list(text, "\n")
+			for(var/line in lines)
+				if (!line)
+					continue
+
+				if (copytext(line, 1, 2) == ";")
+					continue
+
+				var/m_key = copytext(line, 1, length(line)+1)
+				admins[m_key] = new /datum/admins("Moderator")
+				diary << ("MOD: [m_key]")
+
 /world/proc/load_configuration()
 	config = new /datum/configuration()
 	config.load("config/config.txt")
diff --git a/sound/music/cotton_eye_joe.ogg b/sound/music/cotton_eye_joe.ogg
new file mode 100644
index 00000000000..c93fa10136a
Binary files /dev/null and b/sound/music/cotton_eye_joe.ogg differ
diff --git a/sound/music/dirty_hands.ogg b/sound/music/dirty_hands.ogg
new file mode 100644
index 00000000000..90f517ff4a6
Binary files /dev/null and b/sound/music/dirty_hands.ogg differ
diff --git a/sound/music/down_with_the_sickness.ogg b/sound/music/down_with_the_sickness.ogg
new file mode 100644
index 00000000000..111c00a3ecd
Binary files /dev/null and b/sound/music/down_with_the_sickness.ogg differ
diff --git a/sound/music/drive_me_closer.ogg b/sound/music/drive_me_closer.ogg
new file mode 100644
index 00000000000..104cc40e429
Binary files /dev/null and b/sound/music/drive_me_closer.ogg differ
diff --git a/sound/music/ill_make_a_man_out_of_you.ogg b/sound/music/ill_make_a_man_out_of_you.ogg
new file mode 100644
index 00000000000..dd12687ceea
Binary files /dev/null and b/sound/music/ill_make_a_man_out_of_you.ogg differ
diff --git a/sound/music/pegasus.ogg b/sound/music/pegasus.ogg
new file mode 100644
index 00000000000..7c91e5d7ca4
Binary files /dev/null and b/sound/music/pegasus.ogg differ
diff --git a/sound/music/the_gabber_robots.ogg b/sound/music/the_gabber_robots.ogg
new file mode 100644
index 00000000000..6ede815ce1c
Binary files /dev/null and b/sound/music/the_gabber_robots.ogg differ
diff --git a/sound/music/ultimate_showdown.ogg b/sound/music/ultimate_showdown.ogg
new file mode 100644
index 00000000000..ad674994c6e
Binary files /dev/null and b/sound/music/ultimate_showdown.ogg differ