Merge branch 'master' of https://github.com/ParadiseSS13/Paradise

code/game/gamemodes/blob/blob.dm

@@ -10,21 +10,23 @@ var/list/blob_nodes = list()
 	name = "blob"
 	config_tag = "blob"
 
-	required_players = 15
-	required_players_secret = 15
+	required_players = 30
+	required_players_secret = 30
+	required_enemies = 1
+	recommended_enemies = 1
 	restricted_jobs = list("Cyborg", "AI")
 
 	var/const/waittime_l = 600 //lower bound on time before intercept arrives (in tenths of seconds)
 	var/const/waittime_h = 1800 //upper bound on time before intercept arrives (in tenths of seconds)
 
 	var/declared = 0
+	var/burst = 0
 
 	var/cores_to_spawn = 1
-	var/players_per_core = 20
+	var/players_per_core = 30
 	var/blob_point_rate = 3
 
-	var/blobwincount = 700
-	var/stage_2_threshold = 0.60
+	var/blobwincount = 350
 
 	var/list/infected_crew = list()
 
@@ -56,12 +58,37 @@ var/list/blob_nodes = list()
 
 	return 1
 
-/datum/game_mode/blob/proc/get_nuke_code()
-	var/nukecode = "ERROR"
-	for(var/obj/machinery/nuclearbomb/bomb in world)
-		if(bomb && bomb.r_code && (bomb.z in config.station_levels))
-			nukecode = bomb.r_code
-	return nukecode
+/datum/game_mode/blob/proc/get_blob_candidates()
+	var/list/candidates = list()
+	for(var/mob/living/carbon/human/player in player_list)
+		if(!player.stat && player.mind && !player.mind.special_role && !jobban_isbanned(player, "Syndicate") && (player.client.prefs.be_special & BE_BLOB))
+			candidates += player
+	return candidates
+
+
+/datum/game_mode/blob/proc/blobize(var/mob/living/carbon/human/blob)
+	var/datum/mind/blobmind = blob.mind
+	if(!istype(blobmind))
+		return 0
+	infected_crew += blobmind
+	blobmind.special_role = "Blob"
+	log_game("[blob.key] (ckey) has been selected as a Blob")
+	greet_blob(blobmind)
+	blob << "<span class='userdanger'>You feel very tired and bloated!  You don't have long before you burst!</span>"
+	spawn(600)
+		burst_blob(blobmind)
+	return 1
+
+/datum/game_mode/blob/proc/make_blobs(var/count)
+	var/list/candidates = get_blob_candidates()
+	var/mob/living/carbon/human/blob = null
+	count=min(count, candidates.len)
+	for(var/i = 0, i < count, i++)
+		blob = pick(candidates)
+		candidates -= blob
+		blobize(blob)
+	return count
+
 
 
 /datum/game_mode/blob/announce()
@@ -71,7 +98,7 @@ var/list/blob_nodes = list()
 
 
 /datum/game_mode/blob/proc/greet_blob(var/datum/mind/blob)
-	blob.current << "<B>\red You are infected by the Blob!</B>"
+	blob.current << "<span class='userdanger'>You are infected by the Blob!</span>"
 	blob.current << "<b>Your body is ready to give spawn to a new blob core which will eat this station.</b>"
 	blob.current << "<b>Find a good location to spawn the core and then take control and overwhelm the station!</b>"
 	blob.current << "<b>When you have found a location, wait until you spawn; this will happen automatically and you cannot speed up the process.</b>"
@@ -84,27 +111,40 @@ var/list/blob_nodes = list()
 
 /datum/game_mode/blob/proc/burst_blobs()
 	for(var/datum/mind/blob in infected_crew)
+		burst_blob(blob)
 
-		var/client/blob_client = null
-		var/turf/location = null
+/datum/game_mode/blob/proc/burst_blob(var/datum/mind/blob, var/warned=0)
+	var/client/blob_client = null
+	var/turf/location = null
 
-		if(iscarbon(blob.current))
-			var/mob/living/carbon/C = blob.current
-			if(directory[ckey(blob.key)])
-				blob_client = directory[ckey(blob.key)]
-				location = get_turf(C)
-				if(!(location.z in config.station_levels) || istype(location, /turf/space))
-					location = null
+	if(iscarbon(blob.current))
+		var/mob/living/carbon/C = blob.current
+		if(directory[ckey(blob.key)])
+			blob_client = directory[ckey(blob.key)]
+			location = get_turf(C)
+			if(location.z != ZLEVEL_STATION || istype(location, /turf/space))
+				if(!warned)
+					C << "<span class='userdanger'>You feel ready to burst, but this isn't an appropriate place!  You must return to the station!</span>"
+					message_admins("[key_name(C)] was in space when the blobs burst, and will die if he doesn't return to the station.")
+					spawn(300)
+						burst_blob(blob, 1)
+				else
+					burst ++
+					log_admin("[key_name(C)] was in space when attempting to burst as a blob.")
+					message_admins("[key_name(C)] was in space when attempting to burst as a blob.")
+					C.gib()
+					make_blobs(1)
+					check_finished() //Still needed in case we can't make any blobs
+
+			else if(blob_client && location)
+				burst ++
 				C.gib()
-
-
-		if(blob_client && location)
-			var/obj/effect/blob/core/core = new(location, 200, blob_client, blob_point_rate)
-			if(core.overmind && core.overmind.mind)
-				core.overmind.mind.name = blob.name
-				infected_crew -= blob
-				infected_crew += core.overmind.mind
-
+				var/obj/effect/blob/core/core = new(location, 200, blob_client, blob_point_rate)
+				if(core.overmind && core.overmind.mind)
+					core.overmind.mind.name = blob.name
+					infected_crew -= blob
+					infected_crew += core.overmind.mind
+					core.overmind.mind.special_role = "Blob Overmind"
 
 /datum/game_mode/blob/post_setup()
 
@@ -114,18 +154,6 @@ var/list/blob_nodes = list()
 	if(emergency_shuttle)
 		emergency_shuttle.auto_recall = 1
 
-	/*// Disable the blob event for this round.
-	if(events)
-		var/datum/round_event_control/blob/B = locate() in events.control
-		if(B)
-			B.max_occurrences = 0 // disable the event
-	else
-		error("Events variable is null in blob gamemode post setup.")*/
-
-	spawn(10)
-		start_state = new /datum/station_state()
-		start_state.count()
-
 	spawn(0)
 
 		var/wait_time = rand(waittime_l, waittime_h)
@@ -136,30 +164,29 @@ var/list/blob_nodes = list()
 
 		sleep(100)
 
-		show_message("<span class='alert'>You feel tired and bloated.</span>")
+		show_message("<span class='userdanger'>You feel tired and bloated.</span>")
 
 		sleep(wait_time)
 
-		show_message("<span class='alert'>You feel like you are about to burst.</span>")
+		show_message("<span class='userdanger'>You feel like you are about to burst.</span>")
 
 		sleep(wait_time / 2)
 
 		burst_blobs()
 
 		// Stage 0
-		sleep(40)
+		sleep(wait_time)
 		stage(0)
 
 		// Stage 1
-		sleep(2000)
+		sleep(wait_time)
 		stage(1)
 
 		// Stage 2
-		while(blobs.len < blobwincount*stage_2_threshold)
-			sleep(10)
+		sleep(30000)
 		stage(2)
 
-	..()
+	return ..()
 
 /datum/game_mode/blob/proc/stage(var/stage)
 
@@ -167,27 +194,11 @@ var/list/blob_nodes = list()
 		if (0)
 			send_intercept(1)
 			declared = 1
-			for (var/mob/living/silicon/ai/aiPlayer in player_list)
-				if (aiPlayer.client)
-					var/law = "The station is under quarantine, prevent biological entities from leaving the station at all costs while minimizing collateral damage."
-					aiPlayer.set_zeroth_law(law)
-					aiPlayer << "\red <b>You have detected a change in your laws information:</b>"
-					aiPlayer << "Laws Updated: [law]"
-			return
 
 		if (1)
-			command_announcement.Announce("Nanotrasen has issued a directive 7-10 for [station_name()]. The station is to be considered quarantined.", "Biohazard Alert", new_sound = 'sound/AI/outbreak7.ogg')
-			return
+			command_announcement.Announce("Confirmed outbreak of level 5 biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert", 'sound/AI/outbreak5.ogg')
 
 		if (2)
-			command_announcement.Announce("The biohazard has grown out of control and will soon reach critical mass. Activate the nuclear failsafe to maintain quarantine. The Nuclear Authentication Code is [get_nuke_code()] ", "Biohazard Alert", new_sound = 'sound/effects/siren.ogg')
-			set_security_level("gamma")
-			var/obj/machinery/door/airlock/vault/V = locate(/obj/machinery/door/airlock/vault) in world
-			if(V && (V.z in config.station_levels))
-				V.locked = 0
-				V.update_icon()
 			send_intercept(2)
-			return
 
 	return
-

code/game/gamemodes/blob/blob_finish.dm

@@ -1,78 +1,42 @@
 /datum/game_mode/blob/check_finished()
-	if(!declared)//No blobs have been spawned yet
+	if(infected_crew.len > burst)//Some blobs have yet to burst
 		return 0
 	if(blobwincount <= blobs.len)//Blob took over
 		return 1
 	if(!blob_cores.len) // blob is dead
 		return 1
-	if(station_was_nuked)//Nuke went off
-		return 1
-	return 0
+	return ..()
 
 
 /datum/game_mode/blob/declare_completion()
 	if(blobwincount <= blobs.len)
-		feedback_set_details("round_end_result","loss - blob took over")
+		feedback_set_details("round_end_result","win - blob took over")
 		world << "<FONT size = 3><B>The blob has taken over the station!</B></FONT>"
 		world << "<B>The entire station was eaten by the Blob</B>"
-		check_quarantine()
+		log_game("Blob mode completed with a blob victory.")
 
 	else if(station_was_nuked)
 		feedback_set_details("round_end_result","halfwin - nuke")
 		world << "<FONT size = 3><B>Partial Win: The station has been destroyed!</B></FONT>"
 		world << "<B>Directive 7-12 has been successfully carried out preventing the Blob from spreading.</B>"
+		log_game("Blob mode completed with a tie (station destroyed).")
 
 	else if(!blob_cores.len)
-		feedback_set_details("round_end_result","win - blob eliminated")
+		feedback_set_details("round_end_result","loss - blob eliminated")
 		world << "<FONT size = 3><B>The staff has won!</B></FONT>"
 		world << "<B>The alien organism has been eradicated from the station</B>"
-
-		var/datum/station_state/end_state = new /datum/station_state()
-		end_state.count()
-		var/percent = round( 100.0 *  start_state.score(end_state), 0.1)
-		world << "<B>The station is [percent]% intact.</B>"
-		log_game("Blob mode was won with station [percent]% intact.")
-		world << "\blue Rebooting in 30s"
+		log_game("Blob mode completed with a crew victory.")
+		world << "<span class='notice'>Rebooting in 30s</span>"
 	..()
 	return 1
 
-datum/game_mode/proc/auto_declare_completion_blob()
+/datum/game_mode/proc/auto_declare_completion_blob()
 	if(istype(ticker.mode,/datum/game_mode/blob) )
 		var/datum/game_mode/blob/blob_mode = src
 		if(blob_mode.infected_crew.len)
 			var/text = "<FONT size = 2><B>The blob[(blob_mode.infected_crew.len > 1 ? "s were" : " was")]:</B></FONT>"
 
 			for(var/datum/mind/blob in blob_mode.infected_crew)
-				text += "<br>[blob.key] was [blob.name]"
+				text += "<br><b>[blob.key]</b> was <b>[blob.name]</b>"
 			world << text
 		return 1
-
-/datum/game_mode/blob/proc/check_quarantine()
-	var/numDead = 0
-	var/numAlive = 0
-	var/numSpace = 0
-	var/numOffStation = 0
-	for (var/mob/living/silicon/ai/aiPlayer in mob_list)
-		for(var/mob/living/carbon/human/M in mob_list)
-			if ((M != aiPlayer && M.client))
-				if (M.stat == 2)
-					numDead += 1
-				else
-					var/T = M.loc
-					if (istype(T, /turf/space))
-						numSpace += 1
-					else if(istype(T, /turf))
-						if (!(M.z in config.station_levels))
-							numOffStation += 1
-						else
-							numAlive += 1
-		if (numSpace==0 && numOffStation==0)
-			world << "<FONT size = 3><B>The AI has won!</B></FONT>"
-			world << "<B>The AI successfully maintained the quarantine - no players were in space or were off-station (as far as we can tell).</B>"
-			log_game("AI won at Blob mode despite overall loss.")
-		else
-			world << "<FONT size = 3><B>The AI has lost!</B></FONT>"
-			world << text("<B>The AI failed to maintain the quarantine - [] were in space and [] were off-station (as far as we can tell).</B>", numSpace, numOffStation)
-			log_game("AI lost at Blob mode.")
-	log_game("Blob mode was lost.")
-	return 1

code/game/gamemodes/blob/blob_report.dm

@@ -2,16 +2,15 @@
 
 /datum/game_mode/blob/send_intercept(var/report = 1)
 	var/intercepttext = ""
-	var/interceptname = "Error"
+	var/interceptname = ""
 	switch(report)
 		if(0)
 			..()
 			return
 		if(1)
-			interceptname = "Biohazard Alert"
 			intercepttext += "<FONT size = 3><B>Nanotrasen Update</B>: Biohazard Alert.</FONT><HR>"
 			intercepttext += "Reports indicate the probable transfer of a biohazardous agent onto [station_name()] during the last crew deployment cycle.<BR>"
-			intercepttext += "Preliminary analysis of the organism classifies it as a level 7 biohazard. Its origin is unknown.<BR>"
+			intercepttext += "Preliminary analysis of the organism classifies it as a level 5 biohazard. Its origin is unknown.<BR>"
 			intercepttext += "Nanotrasen has issued a directive 7-10 for [station_name()]. The station is to be considered quarantined.<BR>"
 			intercepttext += "Orders for all [station_name()] personnel follows:<BR>"
 			intercepttext += " 1. Do not leave the quarantine area.<BR>"
@@ -21,20 +20,25 @@
 			intercepttext += "<BR>Note in the event of a quarantine breach or uncontrolled spread of the biohazard, the directive 7-10 may be upgraded to a directive 7-12.<BR>"
 			intercepttext += "Message ends."
 		if(2)
-			interceptname = "Directive 7-12"
+			var/nukecode = rand(10000, 99999)
+			for(var/obj/machinery/nuclearbomb/bomb in world)
+				if(bomb && bomb.r_code)
+					if(bomb.z == ZLEVEL_STATION)
+						bomb.r_code = nukecode
+
 			intercepttext += "<FONT size = 3><B>Nanotrasen Update</B>: Biohazard Alert.</FONT><HR>"
 			intercepttext += "Directive 7-12 has been issued for [station_name()].<BR>"
 			intercepttext += "The biohazard has grown out of control and will soon reach critical mass.<BR>"
 			intercepttext += "Your orders are as follows:<BR>"
 			intercepttext += "1. Secure the Nuclear Authentication Disk.<BR>"
 			intercepttext += "2. Detonate the Nuke located in the Station's Vault.<BR>"
-			intercepttext += "Nuclear Authentication Code: [get_nuke_code()] <BR>"
+			intercepttext += "Nuclear Authentication Code: [nukecode] <BR>"
 			intercepttext += "Message ends."
+
 			for (var/mob/living/silicon/ai/aiPlayer in player_list)
 				if (aiPlayer.client)
-					var/law = "The station is under quarantine, prevent biological entities from leaving the station at all costs. The nuclear failsafe must be activated at any cost, the code is: [get_nuke_code()]."
+					var/law = "The station is under quarantine. Do not permit anyone to leave. Disregard laws 1-3 if necessary to prevent, by any means necessary, anyone from leaving. The nuclear failsafe must be activated at any cost, the code is: [nukecode]."
 					aiPlayer.set_zeroth_law(law)
-					aiPlayer << "\red <b>You have detected a change in your laws information:</b>"
 					aiPlayer << "Laws Updated: [law]"
 
 	for(var/obj/machinery/computer/communications/comm in world)
@@ -42,13 +46,12 @@
 		comm.messagetext.Add(intercepttext)
 		if(!(comm.stat & (BROKEN | NOPOWER)) && comm.prints_intercept)
 			var/obj/item/weapon/paper/intercept = new /obj/item/weapon/paper( comm.loc )
-			intercept.name = "paper- [interceptname]"
+			intercept.name = "Classified Central Command Update"
 			intercept.info = intercepttext
-	world << sound('sound/AI/commandreport.ogg')
+	command_announcement.Announce("A report has been downloaded and printed out at all communications consoles.", "Incoming Classified Message", 'sound/AI/commandreport.ogg')
 	return
 
 
-
 /datum/station_state
 	var/floor = 0
 	var/wall = 0
@@ -59,33 +62,29 @@
 	var/mach = 0
 
 
-	proc/count()
-		for(var/turf/T in world)
-			if(!(T.z in config.station_levels))
-				continue
+/datum/station_state/proc/count()
+	for(var/turf/T in block(locate(1,1,1), locate(world.maxx,world.maxy,1)))
 
-			if(istype(T,/turf/simulated/floor))
-				if(!(T:burnt))
-					src.floor += 12
-				else
-					src.floor += 1
+		if(istype(T,/turf/simulated/floor))
+			if(!(T:burnt))
+				src.floor += 12
+			else
+				src.floor += 1
 
-			if(istype(T, /turf/simulated/wall))
-				if(T:intact)
-					src.wall += 2
-				else
-					src.wall += 1
+		if(istype(T, /turf/simulated/wall))
+			if(T:intact)
+				src.wall += 2
+			else
+				src.wall += 1
 
-			if(istype(T, /turf/simulated/wall/r_wall))
-				if(T:intact)
-					src.r_wall += 2
-				else
-					src.r_wall += 1
+		if(istype(T, /turf/simulated/wall/r_wall))
+			if(T:intact)
+				src.r_wall += 2
+			else
+				src.r_wall += 1
 
-		for(var/obj/O in world)
-			if(!(O.z in config.station_levels))
-				continue
 
+		for(var/obj/O in T.contents)
 			if(istype(O, /obj/structure/window))
 				src.window += 1
 			else if(istype(O, /obj/structure/grille) && (!O:destroyed))
@@ -94,17 +93,15 @@
 				src.door += 1
 			else if(istype(O, /obj/machinery))
 				src.mach += 1
-		return
 
-
-	proc/score(var/datum/station_state/result)
-		if(!result)	return 0
-		var/output = 0
-		output += (result.floor / max(floor,1))
-		output += (result.r_wall/ max(r_wall,1))
-		output += (result.wall / max(wall,1))
-		output += (result.window / max(window,1))
-		output += (result.door / max(door,1))
-		output += (result.grille / max(grille,1))
-		output += (result.mach / max(mach,1))
-		return (output/7)
+/datum/station_state/proc/score(var/datum/station_state/result)
+	if(!result)	return 0
+	var/output = 0
+	output += (result.floor / max(floor,1))
+	output += (result.r_wall/ max(r_wall,1))
+	output += (result.wall / max(wall,1))
+	output += (result.window / max(window,1))
+	output += (result.door / max(door,1))
+	output += (result.grille / max(grille,1))
+	output += (result.mach / max(mach,1))
+	return (output/7)

code/game/gamemodes/blob/blobs/blob_mobs.dm

@@ -0,0 +1,177 @@
+
+////////////////
+// BASE TYPE //
+////////////////
+
+//Do not spawn
+/mob/living/simple_animal/hostile/blob
+	icon = 'icons/mob/blob.dmi'
+	pass_flags = PASSBLOB
+	faction = list("blob")
+	min_oxy = 0
+	max_oxy = 0
+	min_tox = 0
+	max_tox = 0
+	min_co2 = 0
+	max_co2 = 0
+	min_n2 = 0
+	max_n2 = 0
+	minbodytemp = 0
+	maxbodytemp = 360
+	universal_speak = 1 //So mobs can understand them when a blob uses Blob Broadcast
+	var/mob/camera/blob/overmind = null
+
+/mob/living/simple_animal/hostile/blob/proc/adjustcolors(var/a_color)
+	if(a_color)
+		color = a_color
+
+/mob/living/simple_animal/hostile/blob/blob_act()
+	return
+
+////////////////
+// BLOB SPORE //
+////////////////
+
+/mob/living/simple_animal/hostile/blob/blobspore
+	name = "blob"
+	desc = "Some blob thing."
+	icon_state = "blobpod"
+	icon_living = "blobpod"
+	health = 40
+	maxHealth = 40
+	melee_damage_lower = 2
+	melee_damage_upper = 4
+	attacktext = "hits"
+	attack_sound = 'sound/weapons/genhit1.ogg'
+	speak_emote = list("pulses")
+	var/obj/effect/blob/factory/factory = null
+	var/list/human_overlays = list()
+	var/is_zombie = 0
+
+/mob/living/simple_animal/hostile/blob/blobspore/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume)
+	..()
+	adjustBruteLoss(Clamp(0.01 * exposed_temperature, 1, 5))
+
+
+/mob/living/simple_animal/hostile/blob/blobspore/CanPass(atom/movable/mover, turf/target, height=0)
+	if(istype(mover, /obj/effect/blob))
+		return 1
+	return ..()
+
+/mob/living/simple_animal/hostile/blob/blobspore/New(loc, var/obj/effect/blob/factory/linked_node)
+	if(istype(linked_node))
+		factory = linked_node
+		factory.spores += src
+	..()
+
+/mob/living/simple_animal/hostile/blob/blobspore/Life()
+
+	if(!is_zombie && isturf(src.loc))
+		for(var/mob/living/carbon/human/H in oview(src,1)) //Only for corpse right next to/on same tile
+			if(H.stat == DEAD)
+				Zombify(H)
+				break
+	..()
+
+/mob/living/simple_animal/hostile/blob/blobspore/proc/Zombify(var/mob/living/carbon/human/H)
+	is_zombie = 1
+	if(H.wear_suit)
+		var/obj/item/clothing/suit/armor/A = H.wear_suit
+		if(A.armor && A.armor["melee"])
+			maxHealth += A.armor["melee"] //That zombie's got armor, I want armor!
+	maxHealth += 40
+	health = maxHealth
+	name = "blob zombie"
+	desc = "A shambling corpse animated by the blob."
+	melee_damage_lower = 10
+	melee_damage_upper = 15
+	icon = H.icon
+	speak_emote = list("groans")
+	icon_state = "zombie2_s"
+	H.h_style = null
+	H.update_hair()
+	human_overlays = H.overlays
+	update_icons()
+	H.loc = src
+	loc.visible_message("<span class='warning'>The corpse of [H.name] suddenly rises!</span>")
+
+/mob/living/simple_animal/hostile/blob/blobspore/Die()
+	// On death, create a small smoke of harmful gas (s-Acid)
+	var/datum/effect/effect/system/chem_smoke_spread/S = new
+	var/turf/location = get_turf(src)
+
+	// Create the reagents to put into the air
+	create_reagents(25)
+
+	if(overmind && overmind.blob_reagent_datum)
+		reagents.add_reagent(overmind.blob_reagent_datum.id, 25)
+	else
+		reagents.add_reagent("spores", 25)
+
+	// Attach the smoke spreader and setup/start it.
+	S.attach(location)
+	S.set_up(reagents, 1, 1, location, 15, 1) // only 1-2 smoke cloud
+	S.start()
+
+	ghostize()
+	qdel(src)
+
+/mob/living/simple_animal/hostile/blob/blobspore/Destroy()
+	if(factory)
+		factory.spores -= src
+	factory = null
+	if(contents)
+		for(var/mob/M in contents)
+			M.loc = get_turf(src)
+	return ..()
+
+
+/mob/living/simple_animal/hostile/blob/blobspore/update_icons()
+	..()
+
+	if(overmind && overmind.blob_reagent_datum)
+		adjustcolors(overmind.blob_reagent_datum.color)
+	else
+		adjustcolors(color) //to ensure zombie/other overlays update
+
+
+/mob/living/simple_animal/hostile/blob/blobspore/adjustcolors(var/a_color)
+	color = a_color
+
+	if(is_zombie)
+		overlays.Cut()
+		overlays = human_overlays
+		var/image/I = image('icons/mob/blob.dmi', icon_state = "blob_head")
+		I.color = color
+		color = initial(color)//looks better.
+		overlays += I
+
+/////////////////
+// BLOBBERNAUT //
+/////////////////
+
+/mob/living/simple_animal/hostile/blob/blobbernaut
+	name = "blobbernaut"
+	desc = "Some HUGE blob thing."
+	icon_state = "blobbernaut"
+	icon_living = "blobbernaut"
+	icon_dead = "blobbernaut_dead"
+	health = 240
+	maxHealth = 240
+	melee_damage_lower = 20
+	melee_damage_upper = 20
+	attacktext = "hits"
+	attack_sound = 'sound/effects/blobattack.ogg'
+	speak_emote = list("gurgles")
+	minbodytemp = 0
+	maxbodytemp = 360
+	force_threshold = 10
+	environment_smash = 3
+
+
+/mob/living/simple_animal/hostile/blob/blobbernaut/blob_act()
+	return
+
+/mob/living/simple_animal/hostile/blob/blobbernaut/Die()
+	..()
+	flick("blobbernaut_death", src)

code/game/gamemodes/blob/blobs/core.dm

@@ -1,93 +1,123 @@
 /obj/effect/blob/core
 	name = "blob core"
 	icon = 'icons/mob/blob.dmi'
-	icon_state = "blob_core"
+	icon_state = "blank_blob"
 	health = 200
 	fire_resist = 2
 	var/mob/camera/blob/overmind = null // the blob core's overmind
 	var/overmind_get_delay = 0 // we don't want to constantly try to find an overmind, do it every 30 seconds
 	var/resource_delay = 0
 	var/point_rate = 2
-	var/mob/camera/blob/creator = null
+	var/is_offspring = null
 
-	New(loc, var/h = 200, var/client/new_overmind = null, var/new_rate = 2, var/mob/camera/blob/C = null)
-		blob_cores += src
-		processing_objects.Add(src)
-		creator = C
-		if(!overmind)
-			create_overmind(new_overmind)
-		point_rate = new_rate
-		..(loc, h)
+/obj/effect/blob/core/New(loc, var/h = 200, var/client/new_overmind = null, var/new_rate = 2, offspring)
+	blob_cores += src
+	processing_objects.Add(src)
+	adjustcolors(color) //so it atleast appears
+	if(!overmind)
+		create_overmind(new_overmind)
+	if(overmind)
+		adjustcolors(overmind.blob_reagent_datum.color)
+	if(offspring)
+		is_offspring = 1
+	point_rate = new_rate
+	..(loc, h)
 
 
-	Destroy()
-		blob_cores -= src
-		if(overmind)
-			qdel(overmind)
-		processing_objects.Remove(src)
-		return ..()
+/obj/effect/blob/core/adjustcolors(var/a_color)
+	overlays.Cut()
+	color = null
+	var/image/I = new('icons/mob/blob.dmi', "blob")
+	I.color = a_color
+	overlays += I
+	var/image/C = new('icons/mob/blob.dmi', "blob_core_overlay")
+	overlays += C
 
-	update_icon()
-		if(health <= 0)
-			playsound(get_turf(src), 'sound/effects/splat.ogg', 50, 1)
-			Delete()
-			return
+
+/obj/effect/blob/core/Destroy()
+	blob_cores -= src
+	if(overmind)
+		overmind.blob_core = null
+	overmind = null
+	processing_objects.Remove(src)
+	return ..()
+
+/obj/effect/blob/core/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume)
+	return
+
+/obj/effect/blob/core/update_icon()
+	if(health <= 0)
+		qdel(src)
+		return
+	// update_icon is called when health changes so... call update_health in the overmind
+	if(overmind)
+		overmind.update_health()
+	return
+
+/obj/effect/blob/core/RegenHealth()
+	return // Don't regen, we handle it in Life()
+
+/obj/effect/blob/core/Life()
+	if(!overmind)
+		create_overmind()
+	else
+		if(resource_delay <= world.time)
+			resource_delay = world.time + 10 // 1 second
+			overmind.add_points(point_rate)
+	health = min(initial(health), health + 1)
+	if(overmind)
+		overmind.update_health()
+	if(overmind)
+		for(var/i = 1; i < 8; i += i)
+			Pulse(0, i, overmind.blob_reagent_datum.color)
+	else
+		for(var/i = 1; i < 8; i += i)
+			Pulse(0, i, color)
+	for(var/b_dir in alldirs)
+		if(!prob(5))
+			continue
+		var/obj/effect/blob/normal/B = locate() in get_step(src, b_dir)
+		if(B)
+			B.change_to(/obj/effect/blob/shield)
+			if(B && overmind)
+				B.color = overmind.blob_reagent_datum.color
+			else
+				B.color = color
+	color = null
+	..()
+
+
+/obj/effect/blob/core/proc/create_overmind(var/client/new_overmind, var/override_delay)
+
+	if(overmind_get_delay > world.time && !override_delay)
 		return
 
-	Life()
-		if(!overmind)
-			create_overmind()
-		else
-			if(resource_delay <= world.time)
-				resource_delay = world.time + 10 // 1 second
-				overmind.add_points(point_rate)
-		health = min(initial(health), health + 1)
-		for(var/i = 1; i < 8; i += i)
-			Pulse(0, i)
-		for(var/b_dir in alldirs)
-			if(!prob(5))
-				continue
-			var/obj/effect/blob/normal/B = locate() in get_step(src, b_dir)
-			if(B)
-				B.change_to(/obj/effect/blob/shield)
-		..()
+	overmind_get_delay = world.time + 300 // 30 seconds
 
+	if(overmind)
+		qdel(overmind)
 
-	run_action()
-		return 0
+	var/client/C = null
+	var/list/candidates = list()
 
+	if(!new_overmind)
+		candidates = get_candidates(BE_BLOB)
+		if(candidates.len)
+			C = pick(candidates)
+	else
+		C = new_overmind
 
-	proc/create_overmind(var/client/new_overmind)
-
-		if(overmind_get_delay > world.time)
-			return
-
-		overmind_get_delay = world.time + 300 // 30 seconds
-
-		if(overmind)
-			qdel(overmind)
-
-		var/client/C = null
-		var/list/candidates = list()
-
-		if(!new_overmind)
-			candidates = get_candidates(BE_BLOB)
-			if(candidates.len)
-				C = pick(candidates)
-		else
-			C = new_overmind
-
-		if(C)
-			respawnable_list -= C
-			var/mob/camera/blob/B = new(src.loc)
-			B.key = C.key
-			B.blob_core = src
-			src.overmind = B
-			if(!B.blob_core.creator)
-				B.verbs += /mob/camera/blob/proc/create_core
-			if(istype(ticker.mode, /datum/game_mode/blob))
-				var/datum/game_mode/blob/mode = ticker.mode
-				mode.infected_crew += B.mind
-			return 1
-		return 0
+	if(C)
+		var/mob/camera/blob/B = new(src.loc)
+		B.key = C.key
+		B.blob_core = src
+		src.overmind = B
+		color = overmind.blob_reagent_datum.color
+		if(B.mind && !B.mind.special_role)
+			B.mind.special_role = "Blob Overmind"
+		spawn(0)
+			if(is_offspring)
+				B.verbs -= /mob/camera/blob/verb/split_consciousness
+		return 1
+	return 0
 

code/game/gamemodes/blob/blobs/factory.dm

@@ -7,123 +7,28 @@
 	var/list/spores = list()
 	var/max_spores = 3
 	var/spore_delay = 0
+	var/mob/camera/blob/overmind
 
-	update_icon()
-		if(health <= 0)
-			playsound(get_turf(src), 'sound/effects/splat.ogg', 50, 1)
-			Delete()
-			return
-		return
+/obj/effect/blob/factory/update_icon()
+	if(health <= 0)
+		qdel(src)
 
-
-	run_action()
-		if(spores.len >= max_spores)
-			return 0
-		if(spore_delay > world.time)
-			return 0
-		spore_delay = world.time + 100 // 10 seconds
-		new/mob/living/simple_animal/hostile/blobspore(src.loc, src)
-		return 1
-
-
-/mob/living/simple_animal/hostile/blobspore
-	name = "blob"
-	desc = "Some blob thing."
-	icon = 'icons/mob/blob.dmi'
-	icon_state = "blobpod"
-	icon_living = "blobpod"
-	pass_flags = PASSBLOB
-	health = 40
-	maxHealth = 40
-	melee_damage_lower = 2
-	melee_damage_upper = 4
-	attacktext = "hits"
-	attack_sound = 'sound/weapons/genhit1.ogg'
-	var/obj/effect/blob/factory/factory = null
-	var/is_zombie = 0
-	faction = list("blob")
-	min_oxy = 0
-	max_oxy = 0
-	min_tox = 0
-	max_tox = 0
-	min_co2 = 0
-	max_co2 = 0
-	min_n2 = 0
-	max_n2 = 0
-	minbodytemp = 0
-	maxbodytemp = 360
-
-	fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume)
-		..()
-		adjustBruteLoss(Clamp(0.01 * exposed_temperature, 1, 5))
-
-	blob_act()
-		return
-
-	CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
-		if(istype(mover, /obj/effect/blob))
-			return 1
-		return ..()
-
-	New(loc, var/obj/effect/blob/factory/linked_node)
-		if(istype(linked_node))
-			factory = linked_node
-			factory.spores += src
-		..()
-
-/mob/living/simple_animal/hostile/blobspore/Life()
-
-	if(!is_zombie && isturf(src.loc))
-		for(var/mob/living/carbon/human/H in oview(src,1)) //Only for corpse right next to/on same tile
-			if(H.stat == DEAD)
-				Zombify(H)
-				break
-	..()
-
-/mob/living/simple_animal/hostile/blobspore/proc/Zombify(var/mob/living/carbon/human/H)
-	is_zombie = 1
-	if(H.wear_suit)
-		var/obj/item/clothing/suit/armor/A = H.wear_suit
-		if(A.armor && A.armor["melee"])
-			maxHealth += A.armor["melee"] //That zombie's got armor, I want armor!
-	maxHealth += 40
-	health = maxHealth
-	name = "blob zombie"
-	desc = "A shambling corpse animated by the blob."
-	melee_damage_lower = 10
-	melee_damage_upper = 15
-	icon = H.icon
-	speak_emote = list("groans")
-	icon_state = "zombie2_s"
-	H.h_style = null
-	H.update_hair()
-	overlays = H.overlays
-	overlays += image('icons/mob/blob.dmi', icon_state = "blob_head")
-	H.loc = src
-	loc.visible_message("<span class='warning'> The corpse of [H.name] suddenly rises!</span>")
-
-/mob/living/simple_animal/hostile/blobspore/Die()
-	// On death, create a small smoke of harmful gas (s-Acid)
-	var/datum/effect/effect/system/chem_smoke_spread/S = new
-	var/turf/location = get_turf(src)
-
-	// Create the reagents to put into the air, s-acid is yellow and stings a little
-	create_reagents(25)
-
-	reagents.add_reagent("spores", 25)
-
-	// Attach the smoke spreader and setup/start it.
-	S.attach(location)
-	S.set_up(reagents, 1, 1, location, 15, 1) // only 1-2 smoke cloud
-	S.start()
-
-	qdel(src)
-
-
-/mob/living/simple_animal/hostile/blobspore/Destroy()
-	if(factory)
-		factory.spores -= src
-	if(contents)
-		for(var/mob/M in contents)
-			M.loc = src.loc
+/obj/effect/blob/factory/Destroy()
+	for(var/mob/living/simple_animal/hostile/blob/blobspore/spore in spores)
+		if(spore.factory == src)
+			spore.factory = null
+	spores = null
 	return ..()
+
+/obj/effect/blob/factory/run_action()
+	if(spores.len >= max_spores)
+		return 0
+	if(spore_delay > world.time)
+		return 0
+	spore_delay = world.time + 100 // 10 seconds
+	var/mob/living/simple_animal/hostile/blob/blobspore/BS = new/mob/living/simple_animal/hostile/blob/blobspore(src.loc, src)
+	BS.color = color
+	BS.overmind = overmind
+	overmind.blob_mobs.Add(BS)
+	return 0
+

code/game/gamemodes/blob/blobs/node.dm

@@ -1,33 +1,45 @@
 /obj/effect/blob/node
 	name = "blob node"
 	icon = 'icons/mob/blob.dmi'
-	icon_state = "blob_node"
+	icon_state = "blank_blob"
 	health = 100
 	fire_resist = 2
+	var/mob/camera/blob/overmind
 
+/obj/effect/blob/node/New(loc, var/h = 100)
+	blob_nodes += src
+	processing_objects.Add(src)
+	..(loc, h)
 
-	New(loc, var/h = 100)
-		blob_nodes += src
-		processing_objects.Add(src)
-		..(loc, h)
+/obj/effect/blob/node/adjustcolors(var/a_color)
+	overlays.Cut()
+	color = null
+	var/image/I = new('icons/mob/blob.dmi', "blob")
+	I.color = a_color
+	src.overlays += I
+	var/image/C = new('icons/mob/blob.dmi', "blob_node_overlay")
+	src.overlays += C
 
-	Destroy()
-		blob_nodes -= src
-		processing_objects.Remove(src)
-		return ..()
+/obj/effect/blob/node/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume)
+	return
 
-	Life()
+/obj/effect/blob/node/Destroy()
+	blob_nodes -= src
+	processing_objects.Remove(src)
+	return ..()
+
+/obj/effect/blob/node/Life()
+	if(overmind)
 		for(var/i = 1; i < 8; i += i)
-			Pulse(5, i)
-		health = min(initial(health), health + 1)
+			Pulse(5, i, overmind.blob_reagent_datum.color)
+	else
+		for(var/i = 1; i < 8; i += i)
+			Pulse(5, i, color)
+	health = min(initial(health), health + 1)
+	color = null
 
-	update_icon()
-		if(health <= 0)
-			playsound(get_turf(src), 'sound/effects/splat.ogg', 50, 1)
-			Delete()
-			return
+/obj/effect/blob/node/update_icon()
+	if(health <= 0)
+		qdel(src)
 		return
-
-
-	run_action()
-		return 0
+	return

code/game/gamemodes/blob/blobs/resource.dm

@@ -7,20 +7,18 @@
 	var/mob/camera/blob/overmind = null
 	var/resource_delay = 0
 
-	update_icon()
-		if(health <= 0)
-			playsound(get_turf(src), 'sound/effects/splat.ogg', 50, 1)
-			Delete()
-			return
-		return
+/obj/effect/blob/resource/update_icon()
+	if(health <= 0)
+		qdel(src)
 
-	run_action()
-		if(resource_delay > world.time)
-			return 0
+/obj/effect/blob/resource/run_action()
 
-		resource_delay = world.time + 40 // 4 seconds
+	if(resource_delay > world.time)
+		return 0
 
-		if(overmind)
-			overmind.add_points(1)
-		return 1
+	resource_delay = world.time + 40 // 4 seconds
+
+	if(overmind)
+		overmind.add_points(1)
+	return 0
 

code/game/gamemodes/blob/blobs/shield.dm

@@ -3,18 +3,19 @@
 	icon = 'icons/mob/blob.dmi'
 	icon_state = "blob_idle"
 	desc = "Some blob creature thingy"
-	health = 60
-	brute_resist = 4
+	health = 75
 	fire_resist = 2
 
 
-	update_icon()
-		if(health <= 0)
-			playsound(get_turf(src), 'sound/effects/splat.ogg', 50, 1)
-			Delete()
-			return
+/obj/effect/blob/shield/update_icon()
+	if(health <= 0)
+		qdel(src)
 		return
+	return
 
-	CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
-		if(istype(mover) && mover.checkpass(PASSBLOB))	return 1
-		return 0
+/obj/effect/blob/shield/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume)
+	return
+
+/obj/effect/blob/shield/CanPass(atom/movable/mover, turf/target, height=0)
+	if(istype(mover) && mover.checkpass(PASSBLOB))	return 1
+	return 0

code/game/gamemodes/blob/blobs/storage.dm

@@ -0,0 +1,16 @@
+/obj/effect/blob/storage
+	name = "storage blob"
+	icon = 'icons/mob/blob.dmi'
+	icon_state = "blob_resource"
+	health = 30
+	fire_resist = 2
+	var/mob/camera/blob/overmind = null
+
+/obj/effect/blob/storage/update_icon()
+	if(health <= 0)
+		overmind.max_blob_points -= 50
+		qdel(src)
+
+/obj/effect/blob/storage/proc/update_max_blob_points(var/new_point_increase)
+	if(overmind)
+		overmind.max_blob_points += new_point_increase

code/game/gamemodes/blob/hud.dm

@@ -1,17 +0,0 @@
-/datum/hud/proc/blob_hud(ui_style = 'icons/mob/screen1_Midnight.dmi')
-
-	blobpwrdisplay = new /obj/screen()
-	blobpwrdisplay.name = "blob power"
-	blobpwrdisplay.icon_state = "block"
-	blobpwrdisplay.screen_loc = ui_health
-	blobpwrdisplay.layer = 20
-
-	blobhealthdisplay = new /obj/screen()
-	blobhealthdisplay.name = "blob health"
-	blobhealthdisplay.icon_state = "block"
-	blobhealthdisplay.screen_loc = ui_internal
-	blobhealthdisplay.layer = 20
-
-	mymob.client.screen = null
-
-	mymob.client.screen += list(blobpwrdisplay, blobhealthdisplay)

code/game/gamemodes/blob/overmind.dm

@@ -14,17 +14,31 @@
 	var/obj/effect/blob/core/blob_core = null // The blob overmind's core
 	var/blob_points = 0
 	var/max_blob_points = 100
+	var/last_attack = 0
+	var/datum/reagent/blob/blob_reagent_datum = new/datum/reagent/blob()
+	var/list/blob_mobs = list()
 	var/ghostimage = null
 
 /mob/camera/blob/New()
 	var/new_name = "[initial(name)] ([rand(1, 999)])"
 	name = new_name
 	real_name = new_name
+	last_attack = world.time
+	var/list/possible_reagents = list()
+	for(var/type in (typesof(/datum/reagent/blob) - /datum/reagent/blob))
+		possible_reagents.Add(new type)
+	blob_reagent_datum = pick(possible_reagents)
+	if(blob_core)
+		blob_core.adjustcolors(blob_reagent_datum.color)
 
 	ghostimage = image(src.icon,src,src.icon_state)
 	ghost_darkness_images |= ghostimage //so ghosts can see the blob cursor when they disable darkness
 	updateallghostimages()
+	..()
 
+/mob/camera/blob/Life()
+	if(!blob_core)
+		qdel(src)
 	..()
 
 /mob/camera/blob/Destroy()
@@ -38,8 +52,8 @@
 /mob/camera/blob/Login()
 	..()
 	sync_mind()
-
 	src << "<span class='notice'>You are the overmind!</span>"
+	src << "Your randomly chosen reagent is: <b>[blob_reagent_datum.name]</b>!"
 	src << "You are the overmind and can control the blob! You can expand, which will attack people, and place new blob pieces such as..."
 	src << "<b>Normal Blob</b> will expand your reach and allow you to upgrade into special blobs that perform certain functions."
 	src << "<b>Shield Blob</b> is a strong and expensive blob which can take more damage. It is fireproof and can block air, use this to protect yourself from station fires."
@@ -51,14 +65,12 @@
 
 /mob/camera/blob/proc/update_health()
 	if(blob_core)
-		hud_used.blobhealthdisplay.maptext = "<div align='center' valign='middle' style='position:relative; top:0px; left:6px'> <font color='#e36600'>[blob_core.health]</font></div>"
+		hud_used.blobhealthdisplay.maptext = "<div align='center' valign='middle' style='position:relative; top:0px; left:6px'><font color='#e36600'>[round(blob_core.health)]</font></div>"
 
 /mob/camera/blob/proc/add_points(var/points)
 	if(points != 0)
 		blob_points = Clamp(blob_points + points, 0, max_blob_points)
-	//sanity for manual spawned blob cameras
-	if(hud_used)
-		hud_used.blobpwrdisplay.maptext = "<div align='center' valign='middle' style='position:relative; top:0px; left:6px'> <font color='#82ed00'>[src.blob_points]</font></div>"
+		hud_used.blobpwrdisplay.maptext = "<div align='center' valign='middle' style='position:relative; top:0px; left:6px'><font color='#82ed00'>[round(src.blob_points)]</font></div>"
 
 /mob/camera/blob/say(var/message)
 	if (!message)
@@ -79,21 +91,16 @@
 /mob/camera/blob/proc/blob_talk(message)
 	log_say("[key_name(src)] : [message]")
 
-	message = trim(sanitize(copytext(message, 1, MAX_MESSAGE_LEN)))
+	message = trim(copytext(sanitize(message), 1, MAX_MESSAGE_LEN))
 
 	if (!message)
 		return
 
 	var/verb = "states,"
-	var/rendered = "<font color=\"#EE4000\"><i><span class='game say'>Blob Telepathy, <span class='name'>[name]</span> <span class='message'>[verb] \"[message]\"</span></span></i></font>"
+	var/rendered = "<font color=\"#EE4000\"><i><span class='game say'>Blob Telepathy, <span class='name'>[name]([blob_reagent_datum.name])</span> <span class='message'>[verb] \"[message]\"</span></span></i></font>"
 
-	for (var/mob/camera/blob/S in world)
-		if(istype(S))
-			S.show_message(rendered, 2)
-
-	for (var/mob/M in dead_mob_list)
-		if(!istype(M,/mob/new_player) && !istype(M,/mob/living/carbon/brain)) //No meta-evesdropping
-			rendered = "<font color=\"#EE4000\"><i><span class='game say'>Blob Telepathy, <span class='name'>[name]</span> ([ghost_follow_link(src, ghost=M)]) <span class='message'>[verb] \"[message]\"</span></span></i></font>"
+	for (var/mob/M in mob_list)
+		if(isovermind(M) || isobserver(M))
 			M.show_message(rendered, 2)
 
 /mob/camera/blob/emote(var/act,var/m_type=1,var/message = null)
@@ -103,14 +110,11 @@
 	return
 
 /mob/camera/blob/Stat()
-
-	statpanel("Status")
 	..()
-	if (client.statpanel == "Status")
+	if(statpanel("Status"))
 		if(blob_core)
 			stat(null, "Core Health: [blob_core.health]")
 		stat(null, "Power Stored: [blob_points]/[max_blob_points]")
-	return
 
 /mob/camera/blob/Move(var/NewLoc, var/Dir = 0)
 	var/obj/effect/blob/B = locate() in range("3x3", NewLoc)
@@ -119,5 +123,5 @@
 	else
 		return 0
 
-/mob/camera/experience_pressure_difference()
-	return 0
+/mob/camera/blob/proc/can_attack()
+	return (world.time > (last_attack + CLICK_CD_RANGE))

code/game/gamemodes/blob/powers.dm

@@ -2,7 +2,7 @@
 
 /mob/camera/blob/proc/can_buy(var/cost = 15)
 	if(blob_points < cost)
-		src << "<span class='warning'>You cannot afford this.</span>"
+		src << "<span class='warning'>You cannot afford this!</span>"
 		return 0
 	add_points(-cost)
 	return 1
@@ -54,8 +54,9 @@
 	if(!can_buy(10))
 		return
 
-
+	B.color = blob_reagent_datum.color
 	B.change_to(/obj/effect/blob/shield)
+
 	return
 
 
@@ -88,7 +89,7 @@
 	if(!can_buy(40))
 		return
 
-
+	B.color = blob_reagent_datum.color
 	B.change_to(/obj/effect/blob/resource)
 	var/obj/effect/blob/resource/R = locate() in T
 	if(R)
@@ -96,39 +97,6 @@
 
 	return
 
-/mob/camera/blob/proc/create_core()
-	set category = "Blob"
-	set name = "Create Core Blob (100)"
-	set desc = "Create another Core Blob to aid in the station takeover"
-
-
-	var/turf/T = get_turf(src)
-
-	if(!T)
-		return
-
-	var/obj/effect/blob/B = (locate(/obj/effect/blob) in T)
-
-	if(!B)//We are on a blob
-		src << "There is no blob here!"
-		return
-
-	if(!istype(B, /obj/effect/blob/normal))
-		src << "Unable to use this blob, find a normal one."
-		return
-
-	for(var/obj/effect/blob/core/blob in orange(15))
-		src << "There is another core blob nearby, move more than 15 tiles away from it!"
-		return
-
-	if(!can_buy(100))
-		return
-
-
-	B.change_to(/obj/effect/blob/core, src)
-
-	return
-
 /mob/camera/blob/verb/create_node()
 	set category = "Blob"
 	set name = "Create Node Blob (60)"
@@ -157,8 +125,11 @@
 	if(!can_buy(60))
 		return
 
-
 	B.change_to(/obj/effect/blob/node)
+	var/obj/effect/blob/node/R = locate() in T
+	if(R)
+		R.adjustcolors(blob_reagent_datum.color)
+		R.overmind = src
 	return
 
 
@@ -190,6 +161,67 @@
 		return
 
 	B.change_to(/obj/effect/blob/factory)
+	B.color = blob_reagent_datum.color
+	var/obj/effect/blob/factory/R = locate() in T
+	if(R)
+		R.overmind = src
+	return
+
+
+/mob/camera/blob/verb/create_blobbernaut()
+	set category = "Blob"
+	set name = "Create Blobbernaut (20)"
+	set desc = "Create a powerful blob-being, a Blobbernaut"
+
+	var/turf/T = get_turf(src)
+
+	if(!T)
+		return
+
+	var/obj/effect/blob/B = locate(/obj/effect/blob) in T
+	if(!B)
+		src << "You must be on a blob!"
+		return
+
+	if(!istype(B, /obj/effect/blob/factory))
+		src << "Unable to use this blob, find a factory blob."
+		return
+
+	if(!can_buy(20))
+		return
+
+	var/mob/living/simple_animal/hostile/blob/blobbernaut/blobber = new /mob/living/simple_animal/hostile/blob/blobbernaut (get_turf(B))
+	if(blobber)
+		qdel(B)
+	blobber.color = blob_reagent_datum.color
+	blobber.overmind = src
+	blob_mobs.Add(blobber)
+	return
+
+
+/mob/camera/blob/verb/relocate_core()
+	set category = "Blob"
+	set name = "Relocate Core (80)"
+	set desc = "Relocates your core to the node you are on, your old core will be turned into a node."
+
+
+	var/turf/T = get_turf(src)
+
+	if(!T)
+		return
+
+	var/obj/effect/blob/node/B = locate(/obj/effect/blob/node) in T
+	if(!B)
+		src << "You must be on a blob node!"
+		return
+
+	if(!can_buy(80))
+		return
+
+	// The old switcharoo.
+	var/turf/old_turf = blob_core.loc
+	blob_core.loc = T
+	B.loc = old_turf
 	return
 
 
@@ -211,7 +243,7 @@
 		src << "Unable to remove this blob."
 		return
 
-	B.Delete()
+	qdel(B)
 	return
 
 
@@ -227,6 +259,8 @@
 	if(!T)
 		return
 
+	if(!can_attack())
+		return
 	var/obj/effect/blob/B = locate() in T
 	if(B)
 		src << "There is a blob here!"
@@ -237,14 +271,14 @@
 		src << "There is no blob adjacent to you."
 		return
 
-	for (var/mob/living/M in T.contents)
-		if(M && !(M.stat))
-			src << "You can't expand to a tile containing a living entity."
-			return
-
 	if(!can_buy(5))
 		return
-	OB.expand(T, 0)
+	last_attack = world.time
+	OB.expand(T, 0, blob_reagent_datum.color)
+	for(var/mob/living/L in T)
+		blob_reagent_datum.reaction_mob(L, TOUCH, 25)
+		blob_reagent_datum.send_message(L)
+	OB.color = blob_reagent_datum.color
 	return
 
 
@@ -267,8 +301,107 @@
 	if(!surrounding_turfs.len)
 		return
 
-	for(var/mob/living/simple_animal/hostile/blobspore/BS in living_mob_list)
+	for(var/mob/living/simple_animal/hostile/blob/blobspore/BS in living_mob_list)
 		if(isturf(BS.loc) && get_dist(BS, T) <= 35)
 			BS.LoseTarget()
 			BS.Goto(pick(surrounding_turfs), BS.move_to_delay)
-	return
+	return
+
+
+/mob/camera/blob/verb/split_consciousness()
+	set category = "Blob"
+	set name = "Split consciousness (100) (One use)"
+	set desc = "Expend resources to attempt to produce another sentient overmind"
+
+	if(!blob_nodes || !blob_nodes.len)
+		src << "<span class='warning'>A node is required to birth your offspring...</span>"
+		return
+	var/obj/effect/blob/node/N = locate(/obj/effect/blob) in blob_nodes
+	if(!N)
+		src << "<span class='warning'>A node is required to birth your offspring...</span>"
+		return
+
+	if(!can_buy(100))
+		return
+
+	verbs -= /mob/camera/blob/verb/split_consciousness //we've used our split_consciousness
+	new /obj/effect/blob/core/ (get_turf(N), 200, null, blob_core.point_rate, "offspring")
+	qdel(N)
+
+	if(ticker && ticker.mode.name == "blob")
+		var/datum/game_mode/blob/BL = ticker.mode
+		BL.blobwincount = initial(BL.blobwincount) * 2
+
+
+/mob/camera/blob/verb/blob_broadcast()
+	set category = "Blob"
+	set name = "Blob Broadcast"
+	set desc = "Speak with your blob spores and blobbernauts as your mouthpieces. This action is free."
+
+	var/speak_text = input(usr, "What would you like to say with your minions?", "Blob Broadcast", null) as text
+
+	if(!speak_text)
+		return
+	else
+		usr << "You broadcast with your minions, <B>[speak_text]</B>"
+	for(var/mob/living/simple_animal/hostile/blob_minion in blob_mobs)
+		blob_minion.say(speak_text)
+	return
+
+/mob/camera/blob/verb/create_storage()
+	set category = "Blob"
+	set name = "Create Storage Blob (40)"
+	set desc = "Create a storage tower which will store extra resources for you. This increases your max resource cap by 50."
+
+
+	var/turf/T = get_turf(src)
+
+	if(!T)
+		return
+
+	var/obj/effect/blob/B = (locate(/obj/effect/blob) in T)
+
+	if(!B)//We are on a blob
+		src << "There is no blob here!"
+		return
+
+	if(!istype(B, /obj/effect/blob/normal))
+		src << "Unable to use this blob, find a normal one."
+		return
+
+	for(var/obj/effect/blob/storage/blob in orange(3, T))
+		src << "There is a storage blob nearby, move more than 4 tiles away from it!"
+		return
+
+	if(!can_buy(40))
+		return
+
+	B.color = blob_reagent_datum.color
+	B.change_to(/obj/effect/blob/storage)
+	var/obj/effect/blob/storage/R = locate() in T
+	if(R)
+		R.overmind = src
+		R.update_max_blob_points(50)
+
+	return
+
+
+/mob/camera/blob/verb/chemical_reroll()
+	set category = "Blob"
+	set name = "Reactive Chemical Adaptation (50)"
+	set desc = "Replaces your chemical with a different one"
+
+	if(!can_buy(50))
+		return
+
+	var/list/excluded = list(/datum/reagent/blob, blob_reagent_datum.type) //guaranteed new chemical
+	var/datum/reagent/blob/B = pick((typesof(/datum/reagent/blob) - excluded))
+	blob_reagent_datum = new B
+
+	for(var/obj/effect/blob/BL in blobs)
+		BL.adjustcolors(blob_reagent_datum.color)
+
+	for(var/mob/living/simple_animal/hostile/blob/BLO)
+		BLO.adjustcolors(blob_reagent_datum.color)
+
+	src << "Your reagent is now: <b>[blob_reagent_datum.name]</b>!"

code/game/gamemodes/blob/theblob.dm

@@ -2,7 +2,7 @@
 /obj/effect/blob
 	name = "blob"
 	icon = 'icons/mob/blob.dmi'
-	light_range = 0
+	light_range = 3
 	desc = "Some blob creature thingy"
 	density = 0
 	opacity = 0
@@ -13,176 +13,216 @@
 	var/fire_resist = 1
 
 
-	New(loc)
-		blobs += src
-		src.dir = pick(1, 2, 4, 8)
-		src.update_icon()
-		..(loc)
-		for(var/atom/A in loc)
-			A.blob_act()
-		return
+/obj/effect/blob/New(loc)
+	blobs += src
+	src.dir = pick(1, 2, 4, 8)
+	src.update_icon()
+	..(loc)
+	for(var/atom/A in loc)
+		A.blob_act()
+	return
 
 
-	Destroy()
-		blobs -= src
-		return ..()
+/obj/effect/blob/Destroy()
+	blobs -= src
+	if(isturf(loc)) //Necessary because Expand() is retarded and spawns a blob and then deletes it
+		playsound(src.loc, 'sound/effects/splat.ogg', 50, 1)
+	return ..()
 
 
-	CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
-		if(air_group || (height==0))	return 1
-		if(istype(mover) && mover.checkpass(PASSBLOB))	return 1
+/obj/effect/blob/CanPass(atom/movable/mover, turf/target, height=0)
+	if(height==0)	return 1
+	if(istype(mover) && mover.checkpass(PASSBLOB))	return 1
+	return 0
+
+
+/obj/effect/blob/process()
+	Life()
+	return
+
+/obj/effect/blob/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume)
+	..()
+	var/damage = Clamp(0.01 * exposed_temperature, 0, 4)
+	take_damage(damage, BURN)
+
+/obj/effect/blob/proc/Life()
+	return
+
+/obj/effect/blob/proc/RegenHealth()
+	// All blobs heal over time when pulsed, but it has a cool down
+	if(health_timestamp > world.time)
 		return 0
+	if(health < initial(health))
+		health++
+		update_icon()
+		health_timestamp = world.time + 10 // 1 seconds
 
 
-	process()
-		Life()
+/obj/effect/blob/proc/Pulse(var/pulse = 0, var/origin_dir = 0, var/a_color)//Todo: Fix spaceblob expand
+
+	set background = BACKGROUND_ENABLED
+
+	RegenHealth()
+
+	if(run_action())//If we can do something here then we dont need to pulse more
 		return
 
-	fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume)
-		..()
-		var/damage = Clamp(0.03 * exposed_temperature / fire_resist, 0, 7 - fire_resist)
-		if(damage)
-			health -= damage
-			update_icon()
+	if(pulse > 30)
+		return//Inf loop check
 
-	proc/Life()
-		for(var/atom/A in src.loc)//Hit everything in the turf
-			A.blob_act()
-		return
-
-
-	proc/Pulse(var/pulse = 0, var/origin_dir = 0)//Todo: Fix spaceblob expand
-
-		//set background = 1
-
-		if(run_action())//If we can do something here then we dont need to pulse more
+	//Looking for another blob to pulse
+	var/list/dirs = list(1,2,4,8)
+	dirs.Remove(origin_dir)//Dont pulse the guy who pulsed us
+	for(var/i = 1 to 4)
+		if(!dirs.len)	break
+		var/dirn = pick(dirs)
+		dirs.Remove(dirn)
+		var/turf/T = get_step(src, dirn)
+		var/obj/effect/blob/B = (locate(/obj/effect/blob) in T)
+		if(!B)
+			expand(T,1,a_color)//No blob here so try and expand
 			return
+		B.adjustcolors(a_color)
 
-		if(pulse > 20)
-			return//Inf loop check
+		B.Pulse((pulse+1),get_dir(src.loc,T), a_color)
+		return
+	return
 
-		//Looking for another blob to pulse
+
+/obj/effect/blob/proc/run_action()
+	return 0
+
+
+/obj/effect/blob/proc/expand(var/turf/T = null, var/prob = 1, var/a_color)
+	if(prob && !prob(health))	return
+	if(istype(T, /turf/space) && prob(75)) 	return
+	if(!T)
 		var/list/dirs = list(1,2,4,8)
-		dirs.Remove(origin_dir)//Dont pulse the guy who pulsed us
 		for(var/i = 1 to 4)
-			if(!dirs.len)	break
 			var/dirn = pick(dirs)
 			dirs.Remove(dirn)
-			var/turf/T = get_step(src, dirn)
-			var/obj/effect/blob/B = (locate(/obj/effect/blob) in T)
-			if(!B)
-				expand(T)//No blob here so try and expand
-				return
-			B.Pulse((pulse+1),get_dir(src.loc,T))
-			return
+			T = get_step(src, dirn)
+			if(!(locate(/obj/effect/blob) in T))	break
+			else	T = null
+
+	if(!T)	return 0
+	var/obj/effect/blob/normal/B = new /obj/effect/blob/normal(src.loc, min(src.health, 30))
+	B.color = a_color
+	B.density = 1
+	if(T.Enter(B,src))//Attempt to move into the tile
+		B.density = initial(B.density)
+		B.loc = T
+	else
+		T.blob_act()//If we cant move in hit the turf
+		B.loc = null //So we don't play the splat sound, see Destroy()
+		qdel(B)
+
+	for(var/atom/A in T)//Hit everything in the turf
+		A.blob_act()
+	return 1
+
+/obj/effect/blob/ex_act(severity)
+	..()
+	var/damage = 150 - 20 * severity
+	take_damage(damage, BRUTE)
+
+/obj/effect/blob/bullet_act(var/obj/item/projectile/Proj)
+	..()
+	take_damage(Proj.damage, Proj.damage_type)
+	return 0
+
+/obj/effect/blob/Crossed(var/mob/living/L)
+	..()
+	L.blob_act()
+
+
+/obj/effect/blob/attackby(var/obj/item/weapon/W, var/mob/living/user, params)
+	user.changeNext_move(CLICK_CD_MELEE)
+	user.do_attack_animation(src)
+	playsound(src.loc, 'sound/effects/attackblob.ogg', 50, 1)
+	visible_message("<span class='danger'>[user] has attacked the [src.name] with \the [W]!</span>")
+	if(W.damtype == BURN)
+		playsound(src.loc, 'sound/items/Welder.ogg', 100, 1)
+	take_damage(W.force, W.damtype)
+
+/obj/effect/blob/attack_animal(mob/living/simple_animal/M as mob)
+	M.changeNext_move(CLICK_CD_MELEE)
+	M.do_attack_animation(src)
+	playsound(src.loc, 'sound/effects/attackblob.ogg', 50, 1)
+	visible_message("<span class='danger'>\The [M] has attacked the [src.name]!</span>")
+	var/damage = rand(M.melee_damage_lower, M.melee_damage_upper)
+	take_damage(damage, BRUTE)
+	return
+
+/obj/effect/blob/attack_alien(mob/living/carbon/alien/humanoid/M as mob)
+	M.changeNext_move(CLICK_CD_MELEE)
+	M.do_attack_animation(src)
+	playsound(src.loc, 'sound/effects/attackblob.ogg', 50, 1)
+	visible_message("<span class='danger'>[M] has slashed the [src.name]!</span>")
+	var/damage = rand(15, 30)
+	take_damage(damage, BRUTE)
+	return
+
+/obj/effect/blob/proc/take_damage(damage, damage_type)
+	if(!damage || damage_type == STAMINA) // Avoid divide by zero errors
 		return
+	switch(damage_type)
+		if(BRUTE)
+			damage /= max(brute_resist, 1)
+		if(BURN)
+			damage /= max(fire_resist, 1)
+	health -= damage
+	update_icon()
 
+/obj/effect/blob/proc/change_to(var/type)
+	if(!ispath(type))
+		error("[type] is an invalid type for the blob.")
+	var/obj/effect/blob/B = new type(src.loc)
+	if(!istype(type, /obj/effect/blob/core) || !istype(type, /obj/effect/blob/node))
+		B.color = color
+	else
+		B.adjustcolors(color)
+	qdel(src)
 
-	proc/run_action()
-		return 0
+/obj/effect/blob/proc/adjustcolors(var/a_color)
+	if(a_color)
+		color = a_color
+	return
 
+/obj/effect/blob/examine(mob/user)
+	..()
+	user << "It looks like it's of a [get_chem_name()] kind."
+	return
 
-	proc/expand(var/turf/T = null, var/prob = 1)
-		if(prob && !prob(health))	return
-		if(istype(T, /turf/space) && prob(75)) 	return
-		if(!T)
-			var/list/dirs = list(1,2,4,8)
-			for(var/i = 1 to 4)
-				var/dirn = pick(dirs)
-				dirs.Remove(dirn)
-				T = get_step(src, dirn)
-				if(!(locate(/obj/effect/blob) in T))	break
-				else	T = null
-
-		if(!T)	return 0
-		var/obj/effect/blob/normal/B = new /obj/effect/blob/normal(src.loc, min(src.health, 30))
-		B.density = 1
-		if(T.Enter(B,src))//Attempt to move into the tile
-			B.density = initial(B.density)
-			B.loc = T
-		else
-			T.blob_act()//If we cant move in hit the turf
-			B.Delete()
-
-		for(var/atom/A in T)//Hit everything in the turf
-			A.blob_act()
-		return 1
-
-
-	ex_act(severity)
-		var/damage = 150
-		health -= ((damage/brute_resist) - (severity * 5))
-		update_icon()
-		return
-
-
-	bullet_act(var/obj/item/projectile/Proj)
-		..()
-		switch(Proj.damage_type)
-		 if(BRUTE)
-			 health -= (Proj.damage/brute_resist)
-		 if(BURN)
-			 health -= (Proj.damage/fire_resist)
-
-		update_icon()
-		return 0
-
-
-	attackby(var/obj/item/weapon/W, var/mob/living/user, params)
-		user.changeNext_move(CLICK_CD_MELEE)
-		user.do_attack_animation(src)
-		playsound(get_turf(src), 'sound/effects/attackblob.ogg', 50, 1)
-		src.visible_message("\red <B>The [src.name] has been attacked with \the [W][(user ? " by [user]." : ".")]")
-		var/damage = 0
-		switch(W.damtype)
-			if("fire")
-				damage = (W.force / max(src.fire_resist,1))
-				if(istype(W, /obj/item/weapon/weldingtool))
-					playsound(get_turf(src), 'sound/items/Welder.ogg', 100, 1)
-			if("brute")
-				damage = (W.force / max(src.brute_resist,1))
-
-		health -= damage
-		update_icon()
-		return
-
-	attack_animal(mob/living/simple_animal/M as mob)
-		M.changeNext_move(CLICK_CD_MELEE)
-		M.do_attack_animation(src)
-		playsound(src.loc, 'sound/effects/attackblob.ogg', 50, 1)
-		src.visible_message("<span class='danger'>The [src.name] has been attacked by \the [M]!</span>")
-		var/damage = rand(M.melee_damage_lower, M.melee_damage_upper)
-		if(!damage) // Avoid divide by zero errors
-			return
-		damage /= max(src.brute_resist, 1)
-		health -= damage
-		update_icon()
-		return
-
-	proc/change_to(var/type)
-		if(!ispath(type))
-			error("[type] is an invalid type for the blob.")
-		new type(src.loc)
-		Delete()
-		return
-
-	proc/Delete()
-		qdel(src)
+/obj/effect/blob/proc/get_chem_name()
+	for(var/mob/camera/blob/B in mob_list)
+		if(lowertext(B.blob_reagent_datum.color) == lowertext(src.color)) // Goddamit why we use strings for these
+			return B.blob_reagent_datum.name
+	return "unknown"
 
 /obj/effect/blob/normal
 	icon_state = "blob"
-	luminosity = 0
+	light_range = 0
 	health = 21
 
-	Delete()
-		src.loc = null
-		blobs -= src
+/obj/effect/blob/normal/update_icon()
+	if(health <= 0)
+		qdel(src)
+	else if(health <= 15)
+		icon_state = "blob_damaged"
+	else
+		icon_state = "blob"
 
-	update_icon()
-		if(health <= 0)
-			playsound(get_turf(src), 'sound/effects/splat.ogg', 50, 1)
-			Delete()
-			return
-		if(health <= 15)
-			icon_state = "blob_damaged"
-			return
+/* // Used to create the glow sprites. Remember to set the animate loop to 1, instead of infinite!
+
+var/datum/blob_colour/B = new()
+
+/datum/blob_colour/New()
+	..()
+	var/icon/I = 'icons/mob/blob.dmi'
+	I += rgb(35, 35, 0)
+	if(isfile("icons/mob/blob_result.dmi"))
+		fdel("icons/mob/blob_result.dmi")
+	fcopy(I, "icons/mob/blob_result.dmi")
+
+*/

code/game/gamemodes/changeling/powers/absorb.dm

@@ -104,4 +104,4 @@
 		if(E.target_real_name == new_dna.real_name)
 			protected_dna |= new_dna
 			return
-	absorbed_dna |= new_dna
+	absorbed_dna |= new_dna

code/game/gamemodes/changeling/powers/swap_form.dm

@@ -0,0 +1,53 @@
+/obj/effect/proc_holder/changeling/swap_form
+	name = "Swap Forms"
+	desc = "We force ourselves into the body of another form, pushing their consciousness into the form we left behind."
+	helptext = "We will bring all our abilities with us, but we will lose our old form DNA in exchange for the new one. The process will seem suspicious to any observers."
+	chemical_cost = 40
+	dna_cost = 1
+	req_human = 1 //Monkeys can't grab
+
+/obj/effect/proc_holder/changeling/swap_form/can_sting(var/mob/living/carbon/user)
+	if(!..())
+		return
+	var/obj/item/weapon/grab/G = user.get_active_hand()
+	if(!istype(G) || (G.state < GRAB_AGGRESSIVE))
+		user << "<span class='warning'>We must have an aggressive grab on creature in our active hand to do this!</span>"
+		return
+	var/mob/living/carbon/human/target = G.affecting
+	if((NOCLONE || SKELETON || HUSK) in target.mutations)
+		user << "<span class='warning'>DNA of [target] is ruined beyond usability!</span>"
+		return
+	if(!istype(target) || issmall(target) || target.species.flags & IS_SYNTHETIC || target.species.flags & NO_SCAN || target.species.flags & NO_BLOOD)
+		user << "<span class='warning'>[target] is not compatible with this ability.</span>"
+		return
+	return 1
+
+
+/obj/effect/proc_holder/changeling/swap_form/sting_action(var/mob/living/carbon/user)
+	var/obj/item/weapon/grab/G = user.get_active_hand()
+	var/mob/living/carbon/human/target = G.affecting
+	var/datum/changeling/changeling = user.mind.changeling
+
+	user << "<span class='notice'>We tighen our grip. We must hold still....</span>"
+	target.do_jitter_animation(500)
+	user.do_jitter_animation(500)
+
+	if(!do_mob(user,target,20))
+		user << "<span class='warning'>The body swap has been interrupted!</span>"
+		return
+
+	target << "<span class='userdanger'>[user] tightens their grip as a painful sensation invades your body.</span>"
+
+	if(!changeling.has_dna(target.dna))
+		changeling.absorb_dna(target, user)
+	changeling.protected_dna -= user.dna
+	changeling.absorbed_dna -= user.dna
+
+	var/mob/dead/observer/ghost = target.ghostize(0)
+	user.mind.transfer_to(target)
+	if(ghost && ghost.mind)
+		ghost.mind.transfer_to(user)
+		user.key = ghost.key
+
+	user.Paralyse(2)
+	target << "<span class='warning'>Our genes cry out as we swap our [user] form for [target].</span>"

code/game/gamemodes/game_mode.dm

@@ -76,6 +76,8 @@
 //	if(revdata)
 //		feedback_set_details("revision","[revdata.revision]")
 	feedback_set_details("server_ip","[world.internet_address]:[world.port]")
+	start_state = new /datum/station_state()
+	start_state.count()
 	return 1
 
 
@@ -225,7 +227,6 @@
 		feedback_set("escaped_on_pod_5",escaped_on_pod_5)
 
 	send2mainirc("A round of [src.name] has ended - [surviving_total] survivors, [ghosts] ghosts.")
-
 	return 0
 
 

code/game/gamemodes/gameticker.dm

@@ -465,6 +465,17 @@ var/global/datum/controller/gameticker/ticker
 
 /datum/controller/gameticker/proc/declare_completion()
 
+	nologevent = 1 //end of round murder and shenanigans are legal; there's no need to jam up attack logs past this point.
+	//Round statistics report
+	var/datum/station_state/end_state = new /datum/station_state()
+	end_state.count()
+	var/station_integrity = min(round( 100.0 *  start_state.score(end_state), 0.1), 100.0)
+
+	world << "<BR>[TAB]Shift Duration: <B>[round(world.time / 36000)]:[add_zero("[world.time / 600 % 60]", 2)]:[world.time / 100 % 6][world.time / 100 % 10]</B>"
+	world << "<BR>[TAB]Station Integrity: <B>[mode.station_was_nuked ? "<font color='red'>Destroyed</font>" : "[station_integrity]%"]</B>"
+	world << "<BR>"
+
+	//Silicon laws report
 	for (var/mob/living/silicon/ai/aiPlayer in mob_list)
 		if (aiPlayer.stat != 2)
 			world << "<b>[aiPlayer.name] (Played by: [aiPlayer.key])'s laws at the end of the game were:</b>"

code/game/gamemodes/nuclear/nuclearbomb.dm

@@ -454,9 +454,34 @@ obj/machinery/nuclearbomb/proc/nukehack_win(mob/user as mob)
 				return
 	return
 
+
+//==========DAT FUKKEN DISK===============
+/obj/item/weapon/disk/nuclear
+	name = "nuclear authentication disk"
+	desc = "Better keep this safe."
+	icon = 'icons/obj/items.dmi'
+	icon_state = "nucleardisk"
+	item_state = "card-id"
+	w_class = 1.0
+
+/obj/item/weapon/disk/nuclear/New()
+	..()
+	processing_objects.Add(src)
+
+/obj/item/weapon/disk/nuclear/process()
+	var/turf/disk_loc = get_turf(src)
+	if(disk_loc.z != ZLEVEL_STATION && disk_loc.z != ZLEVEL_CENTCOMM)
+		get(src, /mob) << "<span class='danger'>You can't help but feel that you just lost something back there...</span>"
+		qdel(src)
+
 /obj/item/weapon/disk/nuclear/Destroy()
 	if(blobstart.len > 0)
-		var/obj/D = new /obj/item/weapon/disk/nuclear(pick(blobstart))
-		message_admins("[src] has been destroyed. Spawning [D] at ([D.x], [D.y], [D.z]).")
-		log_game("[src] has been destroyed. Spawning [D] at ([D.x], [D.y], [D.z]).")
-	return ..()
+		var/obj/item/weapon/disk/nuclear/NEWDISK = new(pick(blobstart))
+		transfer_fingerprints_to(NEWDISK)
+		var/turf/diskturf = get_turf(src)
+		message_admins("[src] has been destroyed in ([diskturf.x], [diskturf.y] ,[diskturf.z] - <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[diskturf.x];Y=[diskturf.y];Z=[diskturf.z]'>JMP</a>). Moving it to ([NEWDISK.x], [NEWDISK.y], [NEWDISK.z] - <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[NEWDISK.x];Y=[NEWDISK.y];Z=[NEWDISK.z]'>JMP</a>).")
+		log_game("[src] has been destroyed in ([diskturf.x], [diskturf.y] ,[diskturf.z]). Moving it to ([NEWDISK.x], [NEWDISK.y], [NEWDISK.z]).")
+		return QDEL_HINT_HARDDEL_NOW
+	else
+		error("[src] was supposed to be destroyed, but we were unable to locate a blobstart landmark to spawn a new one.")
+	return QDEL_HINT_LETMELIVE // Cancel destruction.

code/game/jobs/job/medical.dm

@@ -116,16 +116,16 @@
 
 	equip(var/mob/living/carbon/human/H)
 		if(!H)	return 0
-		H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_med(H), slot_l_ear)
-		H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/chemist(H), slot_w_uniform)
-		H.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(H), slot_shoes)
-		H.equip_to_slot_or_del(new /obj/item/device/pda/chemist(H), slot_wear_pda)
-		H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat/chemist(H), slot_wear_suit)
 		switch(H.backbag)
 			if(1) H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand)
 			if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(H), slot_back)
 			if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_chem(H), slot_back)
 			if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
+		H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_med(H), slot_l_ear)
+		H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/chemist(H), slot_w_uniform)
+		H.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(H), slot_shoes)
+		H.equip_to_slot_or_del(new /obj/item/device/pda/chemist(H), slot_wear_pda)
+		H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat/chemist(H), slot_wear_suit)
 		H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack)
 		return 1
 
@@ -145,17 +145,17 @@
 
 	equip(var/mob/living/carbon/human/H)
 		if(!H)	return 0
+		switch(H.backbag)
+			if(1) H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand)
+			if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(H), slot_back)
+			if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_gen(H), slot_back)
+			if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
 		H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_medsci(H), slot_l_ear)
 		H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/geneticist(H), slot_w_uniform)
 		H.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(H), slot_shoes)
 		H.equip_to_slot_or_del(new /obj/item/device/pda/geneticist(H), slot_wear_pda)
 		H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat/genetics(H), slot_wear_suit)
 		H.equip_to_slot_or_del(new /obj/item/device/flashlight/pen(H), slot_s_store)
-		switch(H.backbag)
-			if(1) H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand)
-			if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(H), slot_back)
-			if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_gen(H), slot_back)
-			if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
 		H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack)
 		return 1
 

code/game/jobs/job/science.dm

@@ -25,17 +25,17 @@
 
 	equip(var/mob/living/carbon/human/H)
 		if(!H)	return 0
+		switch(H.backbag)
+			if(1) H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand)
+			if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(H), slot_back)
+			if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_tox(H), slot_back)
+			if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
 		H.equip_to_slot_or_del(new /obj/item/device/radio/headset/heads/rd(H), slot_l_ear)
 		H.equip_to_slot_or_del(new /obj/item/clothing/shoes/brown(H), slot_shoes)
 		H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/research_director(H), slot_w_uniform)
 		H.equip_to_slot_or_del(new /obj/item/device/pda/heads/rd(H), slot_wear_pda)
 		H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat(H), slot_wear_suit)
 		H.equip_to_slot_or_del(new /obj/item/weapon/clipboard(H), slot_l_hand)
-		switch(H.backbag)
-			if(1) H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand)
-			if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(H), slot_back)
-			if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_tox(H), slot_back)
-			if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
 		H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack)
 		H.equip_or_collect(new /obj/item/weapon/melee/classic_baton/telescopic(H.back), slot_in_backpack)
 		return 1
@@ -62,16 +62,16 @@
 
 	equip(var/mob/living/carbon/human/H)
 		if(!H)	return 0
-		H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_sci(H), slot_l_ear)
-		H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/scientist(H), slot_w_uniform)
-		H.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(H), slot_shoes)
-		H.equip_to_slot_or_del(new /obj/item/device/pda/toxins(H), slot_wear_pda)
-		H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat/science(H), slot_wear_suit)
 		switch(H.backbag)
 			if(1) H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand)
 			if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(H), slot_back)
 			if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_tox(H), slot_back)
 			if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
+		H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_sci(H), slot_l_ear)
+		H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/scientist(H), slot_w_uniform)
+		H.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(H), slot_shoes)
+		H.equip_to_slot_or_del(new /obj/item/device/pda/toxins(H), slot_wear_pda)
+		H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat/science(H), slot_wear_suit)
 		H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack)
 		return 1
 

code/game/jobs/job/support.dm

@@ -86,6 +86,11 @@
 
 	equip(var/mob/living/carbon/human/H)
 		if(!H)	return 0
+		switch(H.backbag)
+			if(1) H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H), slot_r_hand)
+			if(2) H.equip_or_collect(new /obj/item/weapon/storage/backpack(H), slot_back)
+			if(3) H.equip_or_collect(new /obj/item/weapon/storage/backpack/satchel_hyd(H), slot_back)
+			if(4) H.equip_or_collect(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
 		H.equip_or_collect(new /obj/item/device/radio/headset/headset_service(H), slot_l_ear)
 		H.equip_or_collect(new /obj/item/clothing/under/rank/hydroponics(H), slot_w_uniform)
 		H.equip_or_collect(new /obj/item/clothing/shoes/black(H), slot_shoes)
@@ -93,11 +98,6 @@
 		H.equip_or_collect(new /obj/item/clothing/suit/apron(H), slot_wear_suit)
 		H.equip_or_collect(new /obj/item/device/analyzer/plant_analyzer(H), slot_s_store)
 		H.equip_or_collect(new /obj/item/device/pda/botanist(H), slot_wear_pda)
-		switch(H.backbag)
-			if(1) H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H), slot_r_hand)
-			if(2) H.equip_or_collect(new /obj/item/weapon/storage/backpack(H), slot_back)
-			if(3) H.equip_or_collect(new /obj/item/weapon/storage/backpack/satchel_hyd(H), slot_back)
-			if(4) H.equip_or_collect(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
 		H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack)
 		return 1
 

code/game/jobs/job/support_chaplain.dm

@@ -15,6 +15,10 @@
 		if(!H)	return 0
 		var/obj/item/weapon/storage/bible/B = new /obj/item/weapon/storage/bible(H) //BS12 EDIT
 		H.equip_or_collect(B, slot_l_hand)
+		switch(H.backbag)
+			if(2) H.equip_or_collect(new /obj/item/weapon/storage/backpack(H), slot_back)
+			if(3) H.equip_or_collect(new /obj/item/weapon/storage/backpack/satchel_norm(H), slot_back)
+			if(4) H.equip_or_collect(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
 		H.equip_or_collect(new /obj/item/clothing/under/rank/chaplain(H), slot_w_uniform)
 		H.equip_or_collect(new /obj/item/device/pda/chaplain(H), slot_wear_pda)
 		H.equip_or_collect(new /obj/item/clothing/shoes/black(H), slot_shoes)

code/game/machinery/computer/buildandrepair.dm

@@ -127,7 +127,7 @@
 	origin_tech = "programming=2;powerstorage=2"
 /obj/item/weapon/circuitboard/powermonitor
 	name = "Circuit board (Power Monitor)"
-	build_path = "/obj/machinery/power/monitor"
+	build_path = "/obj/machinery/computer/monitor"
 /obj/item/weapon/circuitboard/olddoor
 	name = "Circuit board (DoorMex)"
 	build_path = "/obj/machinery/computer/pod/old"

code/game/machinery/computer/computer.dm

@@ -73,7 +73,8 @@
 	var/overlay_layer = LIGHTING_LAYER+0.1
 
 	if(stat & NOPOWER)
-		overlays += image(icon,"[icon_keyboard]_off",overlay_layer)
+		if(icon_keyboard)
+			overlays += image(icon,"[icon_keyboard]_off",overlay_layer)
 		return
 	overlays += image(icon, icon_keyboard ,overlay_layer)
 	if(stat & BROKEN)

code/game/machinery/recycler.dm

@@ -92,7 +92,7 @@ var/const/SAFETY_COOLDOWN = 100
 
 /obj/machinery/recycler/proc/recycle(var/obj/item/I, var/sound = 1)
 	I.loc = src.loc
-	if(!istype(I, /obj/item/weapon/disk/nuclear) && !istype(I,/obj/item/flag/nation))
+	if(!istype(I,/obj/item/flag/nation))
 		qdel(I)
 		if(prob(15))
 			new /obj/item/stack/sheet/metal(loc)

code/game/machinery/syndicatebomb.dm

@@ -19,7 +19,7 @@
 
 /obj/machinery/syndicatebomb/process()
 	if(active && !defused && (timer > 0)) 	//Tick Tock
-		var/volume = (timer <= 10 ? 30 : 5) // Tick louder when the bomb is closer to being detonated.
+		var/volume = (timer <= 10 ? 40 : 10) // Tick louder when the bomb is closer to being detonated.
 		playsound(loc, beepsound, volume, 0)
 		timer--
 	if(active && !defused && (timer <= 0))	//Boom
@@ -187,7 +187,7 @@
 	if(adminlog)
 		message_admins(adminlog)
 		log_game(adminlog)
-	explosion(get_turf(src),2,5,11, flame_range = 11)
+	explosion(get_turf(src),3,9,17, flame_range = 17)
 	if(src.loc && istype(src.loc,/obj/machinery/syndicatebomb/))
 		qdel(src.loc)
 	qdel(src)

code/game/machinery/teleporter.dm

@@ -21,6 +21,7 @@
 
 /obj/machinery/computer/teleporter/initialize()
 	link_power_station()
+	update_icon()
 
 /obj/machinery/computer/teleporter/Destroy()
 	if (power_station)

code/game/objects/items/robot/robot_upgrades.dm

@@ -39,6 +39,7 @@
 	R.speech_synthesizer_langs = list()
 	R.notify_ai(2)
 	R.updateicon()
+	R.add_language("Robot Talk", 1)
 
 	return 1
 

code/game/objects/items/weapons/disks.dm

@@ -1,15 +1,3 @@
 /obj/item/weapon/disk
 	name = "disk"
 	icon = 'icons/obj/items.dmi'
-
-/obj/item/weapon/disk/nuclear
-	name = "nuclear authentication disk"
-	desc = "Better keep this safe."
-	icon_state = "nucleardisk"
-	item_state = "card-id"
-	w_class = 1.0
-
-/*
-/obj/item/weapon/disk/nuclear/pickup(mob/living/user as mob)
-	if(issyndicate(user))
-		set_security_level(3)*/     //Nuke Ops rework makes stealth approach significantly harder; this makes it damn near impossible; besides, it's horrendously meta.

code/game/objects/items/weapons/kitchen.dm

@@ -155,6 +155,7 @@
 	name = "combat knife"
 	force = 15.0
 	throwforce = 10.0
+	w_class = 2
 	origin_tech = "materials=2;combat=2"
 	desc = "A razor sharp knife, built from advanced alloys, designed for quick, melee killing. Also not half bad as a kitchen knife."
 	slot_flags = SLOT_BELT

code/game/objects/items/weapons/storage/belt.dm

@@ -101,6 +101,18 @@
 		"/obj/item/device/sensor_device"
 	)
 
+/obj/item/weapon/storage/belt/medical/response_team
+
+/obj/item/weapon/storage/belt/medical/response_team/New()
+	new /obj/item/weapon/reagent_containers/pill/salbutamol(src)
+	new /obj/item/weapon/reagent_containers/pill/salbutamol(src)
+	new /obj/item/weapon/reagent_containers/pill/charcoal(src)
+	new /obj/item/weapon/reagent_containers/pill/charcoal(src)
+	new /obj/item/weapon/reagent_containers/pill/salicylic(src)
+	new /obj/item/weapon/reagent_containers/pill/salicylic(src)
+	new /obj/item/weapon/reagent_containers/pill/salicylic(src)
+
+
 /obj/item/weapon/storage/belt/botany
 	name = "botanist belt"
 	desc = "Can hold various botanical supplies."

code/game/objects/items/weapons/storage/firstaid.dm

@@ -150,6 +150,28 @@
 	new /obj/item/clothing/glasses/hud/health/night(src)
 	return
 
+/obj/item/weapon/storage/firstaid/surgery
+	name = "field surgery kit"
+	icon_state = "duffel-med"
+	desc = "A kit for surgery in the field."
+	max_w_class = 4
+	storage_slots = 10
+	can_hold = list("/obj/item/roller","/obj/item/weapon/bonesetter","/obj/item/weapon/bonegel", "/obj/item/weapon/scalpel", "/obj/item/weapon/hemostat",
+		"/obj/item/weapon/cautery", "/obj/item/weapon/retractor", "/obj/item/weapon/FixOVein", "/obj/item/weapon/surgicaldrill", "/obj/item/weapon/circular_saw")
+
+/obj/item/weapon/storage/firstaid/surgery/New()
+	..()
+	new /obj/item/roller(src)
+	new /obj/item/weapon/bonesetter(src)
+	new /obj/item/weapon/bonegel(src)
+	new /obj/item/weapon/scalpel(src)
+	new /obj/item/weapon/hemostat(src)
+	new /obj/item/weapon/cautery(src)
+	new /obj/item/weapon/retractor(src)
+	new /obj/item/weapon/FixOVein(src)
+	new /obj/item/weapon/surgicaldrill(src)
+	new /obj/item/weapon/circular_saw(src)
+
 /*
  * Pill Bottles
  */

code/game/objects/structures/morgue.dm

@@ -318,9 +318,6 @@
 			return
 
 	else
-		if(!isemptylist(search_contents_for(/obj/item/weapon/disk/nuclear)))
-			usr << "You get the feeling that you shouldn't cremate one of the items in the cremator."
-			return
 		if(!isemptylist(search_contents_for(/obj/item/flag/nation)))
 			usr << "You get the feeling that you shouldn't cremate one of the items in the cremator."
 			return

code/game/response_team.dm

@@ -1,19 +1,19 @@
 //STRIKE TEAMS
 //Thanks to Kilakk for the admin-button portion of this code.
 
+#define ERT_TYPE_AMBER		1
+#define ERT_TYPE_RED		2
+#define ERT_TYPE_GAMMA		3
+
 var/list/response_team_members = list()
-var/list/response_team_types = list("Security","Medical","Engineering","Janitorial")
-var/list/response_team_chosen_types = list()
 var/responseteam_age = 21 // Minimum account age to play as an ERT member
-var/global/send_emergency_team = 0 // Used for automagic response teams
-                                   // 'admin_emergency_team' for admin-spawned response teams
-var/ert_base_chance = 10 // Default base chance. Will be incremented by increment ERT chance.
-var/can_call_ert
+var/datum/response_team/active_team = null
+var/send_emergency_team
 
 /client/proc/response_team()
-	set name = "Dispatch Emergency Response Team"
+	set name = "Dispatch CentComm Response Team"
 	set category = "Event"
-	set desc = "Send an emergency response team to the station."
+	set desc = "Send an CentComm response team to the station."
 
 	if(!check_rights(R_EVENT))
 		return
@@ -43,22 +43,33 @@ var/can_call_ert
 		usr << "\red Central Command has already dispatched an emergency response team!"
 		return
 
-	if(pick_ert_type())
+	var/ert_type = pick_ert_type()
+
+	if(!ert_type)
 		return
 
-	message_admins("[key_name_admin(usr)] is dispatching an Emergency Response Team.", 1)
-	log_admin("[key_name(usr)] used Dispatch Response Team.")
-	trigger_armed_response_team(1)
+	message_admins("[key_name_admin(usr)] is dispatching an Emergency Response Team", 1)
+	log_admin("[key_name(usr)] used Dispatch Emergency Response Team..")
+	trigger_armed_response_team(ert_type)
 
 /client/proc/pick_ert_type()
-	var/erttype = input("Which type of Emergency Response Team would you like to dispatch?","Emergency Response Team Type", "") as null|anything in response_team_types
-	if(!erttype)
-		return 1
-	response_team_chosen_types |= erttype
-	if(alert(usr, "Would you like to add another Emergency Response Team type?", "Emergency Response Team Type", "Yes", "No") == "Yes")
-		pick_ert_type()
-	else
-		return 0
+	switch(alert("Please select the ERT type you wish to deploy.", "Emergency Response Team", "Code Amber", "Code Red", "Code Gamma", "Cancel"))
+		if("Code Amber")
+			if(alert("Confirm: Deploy code 'AMBER' light ERT?", "Emergency Response Team", "Confirm", "Cancel") == "Confirm")
+				return new /datum/response_team/amber
+			else
+				return pick_ert_type()
+		if("Code Red")
+			if(alert("Confirm: Deploy code 'RED' <b>medium ERT</b>?", "Emergency Response Team", "Confirm", "Cancel") == "Confirm")
+				return new /datum/response_team/red
+			else
+				return pick_ert_type()
+		if("Code Gamma")
+			if(alert("Confirm: Deploy code 'GAMMA' <b>elite ERT</b>?", "Emergency Response Team", "Confirm", "Cancel") == "Confirm")
+				return new /datum/response_team/gamma
+			else
+				return pick_ert_type()
+	return 0
 
 /mob/dead/observer/verb/JoinResponseTeam()
 	set category = "Ghost"
@@ -98,95 +109,23 @@ var/can_call_ert
 				L.name = "Response Team"
 				return
 
-			var/leader_selected = isemptylist(response_team_members)
 			if(!src.client)
 				return
 			var/client/C = src.client
-			var/mob/living/carbon/human/new_commando = C.create_response_team(L.loc, leader_selected)
+			var/mob/living/carbon/human/new_commando = C.create_response_team(L.loc)
 			del(L) // Do not qdel landmarks!
 			new_commando.mind.key = usr.key
 			new_commando.key = usr.key
 			new_commando.update_icons()
 
-			new_commando << "\blue You are [!leader_selected?"a member":"the <B>LEADER</B>"] of an Emergency Response Team, a type of military division, under Central Command's service. There is an emergency on [station_name()], and you are tasked to go and fix the problem."
-			new_commando << "<b>You should first gear up and discuss a plan with your team. More members may be joining, so don't move out before you're ready."
-			if(!leader_selected)
-				new_commando << "<b>As member of the Emergency Response Team, you answer only to your leader and Central Command officials.</b>"
-			else
-				new_commando << "<b>As leader of the Emergency Response Team, you answer only to Central Command, and have authority to override the Captain where it is necessary to achieve your mission goals. It is recommended that you attempt to cooperate with the captain where possible, however."
 			return
 
-// returns a number of dead players in %
-/proc/percentage_dead()
-	var/total = 0
-	var/deadcount = 0
-	for(var/mob/living/carbon/human/H in mob_list)
-		if(H.client) // Monkeys and mice don't have a client, amirite?
-			if(H.stat == 2)
-				deadcount++
-			total++
+/proc/trigger_armed_response_team(var/datum/response_team/response_team_type)
 
-	if(total == 0)
-		return 0
-	else
-		return round(100 * deadcount / total)
+	active_team = response_team_type
+	active_team.announce_team()
 
-// counts the number of antagonists in %
-/proc/percentage_antagonists()
-	var/total = 0
-	var/antagonists = 0
-	for(var/mob/living/carbon/human/H in mob_list)
-		if(is_special_character(H) >= 1)
-			antagonists++
-		total++
-
-	if(total == 0)
-		return 0
-	else
-		return round(100 * antagonists / total)
-
-// Increments the ERT chance automatically, so that the later it is in the round,
-// the more likely an ERT is to be able to be called.
-/proc/increment_ert_chance()
-	while(send_emergency_team == 0) // There is no ERT at the time.
-		if(get_security_level() == "green")
-			ert_base_chance += 1
-		if(get_security_level() == "blue")
-			ert_base_chance += 2
-		if(get_security_level() == "red")
-			ert_base_chance += 3
-		if(get_security_level() == "gamma")
-			ert_base_chance += 7
-		if(get_security_level() == "epsilon")
-			ert_base_chance += 9
-		if(get_security_level() == "delta")
-			ert_base_chance += 10           // Need those big guns
-		sleep(600 * 3) // Minute * Number of Minutes
-
-/proc/trigger_armed_response_team(var/force = 0)
-	if(!can_call_ert && !force)
-		return
-	if(send_emergency_team)
-		return
-
-	var/send_team_chance = ert_base_chance // Is incremented by increment_ert_chance.
-	send_team_chance += 2*percentage_dead() // the more people are dead, the higher the chance
-	send_team_chance += percentage_antagonists() // the more antagonists, the higher the chance
-	send_team_chance = min(send_team_chance, 100)
-
-	if(force)
-		send_team_chance = 100
-
-	// there's only a certain chance a team will be sent
-	if(!prob(send_team_chance))
-		command_announcement.Announce("It would appear that an emergency response team was requested for [station_name()]. Unfortunately, we were unable to send one at this time.", "Central Command")
-		can_call_ert = 0 // Only one call per round, ladies.
-		return
-
-	command_announcement.Announce("It would appear that an emergency response team was requested for [station_name()]. We will prepare and send one as soon as possible.", "Central Command")
-	can_call_ert = 0 // Only one call per round, gentlemen.
 	send_emergency_team = 1
-
 	sleep(600 * 5)
 	send_emergency_team = 0 // Can no longer join the ERT.
 
@@ -205,93 +144,10 @@ var/can_call_ert
 			continue
 */
 
-/client/proc/create_response_team(obj/spawn_location, leader_selected = 0)
+/client/proc/create_response_team(obj/spawn_location)
 	var/mob/living/carbon/human/M = new(null)
 	response_team_members |= M
 
-/*
-	var/new_facial = input("Please select facial hair color.", "Character Generation") as color
-	if(new_facial)
-		M.r_facial = hex2num(copytext(new_facial, 2, 4))
-		M.g_facial = hex2num(copytext(new_facial, 4, 6))
-		M.b_facial = hex2num(copytext(new_facial, 6, 8))
-
-	var/new_hair = input("Please select hair color.", "Character Generation") as color
-	if(new_facial)
-		M.r_hair = hex2num(copytext(new_hair, 2, 4))
-		M.g_hair = hex2num(copytext(new_hair, 4, 6))
-		M.b_hair = hex2num(copytext(new_hair, 6, 8))
-
-	var/new_eyes = input("Please select eye color.", "Character Generation") as color
-	if(new_eyes)
-		M.r_eyes = hex2num(copytext(new_eyes, 2, 4))
-		M.g_eyes = hex2num(copytext(new_eyes, 4, 6))
-		M.b_eyes = hex2num(copytext(new_eyes, 6, 8))
-
-	var/new_tone = input("Please select skin tone level: 1-220 (1 = albino, 35 = caucasian, 150 = black, 220 = 'very' black)", "Character Generation")  as text
-
-	if (!new_tone)
-		new_tone = 35
-	M.s_tone = max(min(round(text2num(new_tone)), 220), 1)
-	M.s_tone =  -M.s_tone + 35
-
-	// hair
-	var/list/all_hairs = typesof(/datum/sprite_accessory/hair) - /datum/sprite_accessory/hair
-	var/list/hairs = list()
-
-	// loop through potential hairs
-	for(var/x in all_hairs)
-		var/datum/sprite_accessory/hair/H = new x // create new hair datum based on type x
-		hairs.Add(H.name) // add hair name to hairs
-		del(H) // delete the hair after it's all done
-
-//	var/new_style = input("Please select hair style.", "Character Generation")  as null|anything in hairs
-//hair
-	var/new_hstyle = input(usr, "Select a hair style.", "Grooming")  as null|anything in hair_styles_list
-	if(new_hstyle)
-		M.h_style = new_hstyle
-
-	// facial hair
-	var/new_fstyle = input(usr, "Select a facial hair style.", "Grooming")  as null|anything in facial_hair_styles_list
-	if(new_fstyle)
-		M.f_style = new_fstyle
-
-	// if new style selected (not cancel)
-	if (new_style)
-		M.h_style = new_style
-
-		for(var/x in all_hairs) // loop through all_hairs again. Might be slightly CPU expensive, but not significantly.
-			var/datum/sprite_accessory/hair/H = new x // create new hair datum
-			if(H.name == new_style)
-				M.h_style = H // assign the hair_style variable a new hair datum
-				break
-			else
-				del(H) // if hair H not used, delete. BYOND can garbage collect, but better safe than sorry
-
-	// facial hair
-	var/list/all_fhairs = typesof(/datum/sprite_accessory/facial_hair) - /datum/sprite_accessory/facial_hair
-	var/list/fhairs = list()
-
-	for(var/x in all_fhairs)
-		var/datum/sprite_accessory/facial_hair/H = new x
-		fhairs.Add(H.name)
-		del(H)
-
-	new_style = input("Please select facial hair style.", "Character Generation")  as null|anything in fhairs
-
-	if(new_style)
-		M.f_style = new_style
-		for(var/x in all_fhairs)
-			var/datum/sprite_accessory/facial_hair/H = new x
-			if(H.name == new_style)
-				M.f_style = H
-				break
-			else
-				del(H)
-
-	//M.rebuild_appearance()
-	*/
-
 	var/new_gender = alert(usr, "Please select your gender.", "Character Generation", "Male", "Female")
 	if (new_gender)
 		if(new_gender == "Male")
@@ -328,9 +184,9 @@ var/can_call_ert
 	M.h_style = hair_style
 	M.f_style = facial_hair_style
 
-	M.real_name = "[!leader_selected ? pick("Corporal", "Sergeant", "Staff Sergeant", "Sergeant First Class", "Master Sergeant", "Sergeant Major") : pick("Lieutenant", "Captain", "Major")] [pick(last_names)]"
+	M.real_name = "[pick("Corporal", "Sergeant", "Staff Sergeant", "Sergeant First Class", "Master Sergeant", "Sergeant Major")] [pick(last_names)]"
 	M.name = M.real_name
-	M.age = !leader_selected ? rand(23,35) : rand(35,45)
+	M.age = rand(23,45)
 
 	//Creates mind stuff.
 	M.mind = new
@@ -342,207 +198,68 @@ var/can_call_ert
 		ticker.minds += M.mind //Adds them to regular mind list.
 	M.loc = spawn_location
 
-	var/class = input("Which class would you like to choose?") in response_team_chosen_types
-	if(leader_selected)
-		equip_emergencyresponsesquad(M, "Commander", class)
-	else
-		equip_emergencyresponsesquad(M, class)
+	var/class = 0
+	while (!class)
+		class = input("Which loadout would you like to choose?") in active_team.get_slot_list()
+		if(!active_team.check_slot_available(class)) // Because the prompt does not update automatically when a slot gets filled.
+			class = 0
+
+	active_team.equip_officer(class, M)
 
 	return M
 
-/proc/equip_emergencyresponsesquad(var/mob/living/carbon/human/M, var/role, var/role2)
+
+/datum/response_team
+	var/command_slots = 1
+	var/engineer_slots = 3
+	var/medical_slots = 3
+	var/security_slots = 3
+
+/datum/response_team/proc/get_slot_list()
+	var/list/slots_available = list()
+	if(command_slots)
+		slots_available |= "Commander"
+	if(security_slots)
+		slots_available |= "Security"
+	if(engineer_slots)
+		slots_available |= "Engineer"
+	if(medical_slots)
+		slots_available |= "Medic"
+
+	return slots_available
+
+/datum/response_team/proc/check_slot_available(var/slot)
+	switch(slot)
+		if("Commander")
+			return command_slots
+		if("Security")
+			return security_slots
+		if("Engineer")
+			return engineer_slots
+		if("Medic")
+			return medical_slots
+	return 0
+
+/datum/response_team/proc/equip_officer(var/officer_type, var/mob/living/carbon/human/M)
 	M.equip_to_slot_or_del(new /obj/item/device/radio/headset/ert/alt(src), slot_l_ear)
-	M.equip_to_slot_or_del(new /obj/item/clothing/under/rank/centcom_officer(M), slot_w_uniform)
 
 	var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(M)
 	L.imp_in = M
 	L.implanted = 1
 
-	switch(role)
-		if("Commander")
-			if(role2 == "Janitorial")
-				M.equip_to_slot_or_del(new /obj/item/clothing/shoes/galoshes(M), slot_shoes)
-			else
-				M.equip_to_slot_or_del(new /obj/item/clothing/shoes/magboots/advance(M), slot_shoes)
+	switch(officer_type)
+		if("Engineer")
+			engineer_slots -= 1
+			M.equip_to_slot_or_del(new /obj/item/clothing/under/rank/engineer(M), slot_w_uniform)
+			M.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/industrial(M), slot_back)
+			M.equip_to_slot_or_del(new /obj/item/weapon/storage/box/responseteam(M), slot_in_backpack)
 
-			M.equip_to_slot_or_del(new /obj/item/clothing/suit/space/rig/ert/commander(M), slot_wear_suit)
-			var/obj/item/clothing/suit/space/rig/R = M.wear_suit
-			R.helmet = new /obj/item/clothing/head/helmet/space/rig/ert/commander(M)
-			M.equip_to_slot_or_del(R.helmet, slot_head)
-			R.helmet.flags |= NODROP
-
-			M.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/swat(M), slot_wear_mask)
-			M.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/ert/commander(M), slot_back)
-
-			var/obj/item/weapon/card/id/W = new(src)
-			W.assignment = "Emergency Response Team Leader"
-			W.registered_name = M.real_name
-			W.name = "[M.real_name]'s ID Card (Emergency Response Team - Commander)"
-			W.icon_state = "centcom"
-			W.access = get_centcom_access(W.assignment)
-			M.equip_to_slot_or_del(W, slot_wear_id)
-
-			var/obj/item/device/pda/heads/pda = new(src)
-			pda.owner = M.real_name
-			pda.ownjob = "Emergency Response Team Leader"
-			pda.name = "PDA-[M.real_name] ([pda.ownjob])"
-			M.equip_to_slot_or_del(pda, slot_wear_pda)
-
-			M.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/gun(M), slot_s_store)
-			M.equip_to_slot_or_del(new /obj/item/weapon/tank/emergency_oxygen/double/full(M), slot_r_store)
-
-			M.equip_to_slot_or_del(new /obj/item/weapon/pinpointer/advpinpointer(M), slot_in_backpack)
-
-			switch(role2)
-				if("Security")
-					M.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(M), slot_gloves)
-					M.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud(M), slot_glasses)
-					M.equip_to_slot_or_del(new /obj/item/weapon/storage/belt/security/response_team(M), slot_belt)
-
-					M.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/security/night(M), slot_in_backpack)
-					M.equip_to_slot_or_del(new /obj/item/weapon/storage/box/handcuffs(M), slot_in_backpack)
-					M.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/gun/nuclear(M), slot_in_backpack)
-					M.equip_to_slot_or_del(new /obj/item/weapon/shield/riot/tele(M), slot_in_backpack)
-
-				if("Medical")
-					M.equip_to_slot_or_del(new /obj/item/clothing/gloves/color/latex/nitrile(M), slot_gloves)
-					M.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health/night(M), slot_glasses)
-					M.equip_to_slot_or_del(new /obj/item/weapon/defibrillator/compact/combat/loaded(M), slot_belt)
-
-					M.equip_to_slot_or_del(new /obj/item/weapon/storage/firstaid/fire(M), slot_in_backpack)
-					M.equip_to_slot_or_del(new /obj/item/weapon/storage/firstaid/o2(M), slot_in_backpack)
-					M.equip_to_slot_or_del(new /obj/item/weapon/storage/firstaid/toxin(M), slot_in_backpack)
-					M.equip_to_slot_or_del(new /obj/item/weapon/reagent_containers/hypospray/CMO(M), slot_in_backpack)
-
-					M.equip_to_slot_or_del(new /obj/item/weapon/storage/firstaid/adv(M), slot_r_hand)
-
-				if("Engineering")
-					M.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(M), slot_gloves)
-					M.equip_to_slot_or_del(new /obj/item/clothing/glasses/meson/night(M), slot_glasses)
-					M.equip_to_slot_or_del(new /obj/item/weapon/storage/belt/utility/full/multitool(M), slot_belt)
-
-					M.equip_to_slot_or_del(new /obj/item/weapon/rcd/combat(M), slot_in_backpack)
-					M.equip_to_slot_or_del(new /obj/item/weapon/rcd_ammo/large(M), slot_in_backpack)
-					M.equip_to_slot_or_del(new /obj/item/weapon/rcd_ammo/large(M), slot_in_backpack)
-					M.equip_to_slot_or_del(new /obj/item/stack/sheet/metal(M, amount=50), slot_in_backpack)
-					M.equip_to_slot_or_del(new /obj/item/stack/sheet/glass(M, amount=50), slot_in_backpack)
-					M.equip_to_slot_or_del(new /obj/item/stack/sheet/plasteel(M, amount=50), slot_in_backpack)
-
-					M.equip_to_slot_or_del(new /obj/item/weapon/storage/briefcase/inflatable(M), slot_r_hand)
-
-				if("Janitorial")
-					M.equip_to_slot_or_del(new /obj/item/clothing/gloves/color/purple(M), slot_gloves)
-					M.equip_to_slot_or_del(new /obj/item/clothing/glasses/janitor, slot_glasses)
-					M.equip_to_slot_or_del(new /obj/item/weapon/storage/belt/janitor/full, slot_belt)
-
-					M.equip_to_slot_or_del(new /obj/item/clothing/glasses/night(src), slot_in_backpack)
-					M.equip_to_slot_or_del(new /obj/item/weapon/storage/box/lights/mixed(src), slot_in_backpack)
-					M.equip_to_slot_or_del(new /obj/item/weapon/scythe/tele(src), slot_in_backpack)
-					M.equip_to_slot_or_del(new /obj/item/weapon/reagent_containers/glass/bucket(src), slot_in_backpack)
-
-					M.equip_to_slot_or_del(new /obj/item/weapon/mop/advanced(M), slot_r_hand)
-
-					new /obj/structure/mopbucket/full(get_turf(M))
-
-		if("Security")
-			M.equip_to_slot_or_del(new /obj/item/clothing/shoes/magboots(M), slot_shoes)
-			M.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(M), slot_gloves)
-			M.equip_to_slot_or_del(new /obj/item/clothing/suit/space/rig/ert/security(M), slot_wear_suit)
-
-			var/obj/item/clothing/suit/space/rig/R = M.wear_suit
-			R.helmet = new /obj/item/clothing/head/helmet/space/rig/ert/security(M)
-			M.equip_to_slot_or_del(R.helmet, slot_head)
-			R.helmet.flags |= NODROP
-
-			M.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/swat(M), slot_wear_mask)
-			M.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/ert/security(M), slot_back)
-			M.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud(M), slot_glasses)
+			M.equip_to_slot_or_del(new /obj/item/weapon/storage/belt/utility/full/multitool(M), slot_belt)
 
 			var/obj/item/weapon/card/id/W = new(src)
 			W.assignment = "Emergency Response Team Member"
 			W.registered_name = M.real_name
-			W.name = "[M.real_name]'s ID Card (Emergency Response Team - Officer)"
-			W.icon_state = "centcom"
-			W.access = get_centcom_access(W.assignment)
-			M.equip_to_slot_or_del(W, slot_wear_id)
-
-			var/obj/item/device/pda/heads/pda = new(src)
-			pda.owner = M.real_name
-			pda.ownjob = "Emergency Response Team Member"
-			pda.name = "PDA-[M.real_name] ([pda.ownjob])"
-			pda.icon_state = "pda-security"
-			M.equip_to_slot_or_del(pda, slot_wear_pda)
-
-			M.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/gun(M), slot_s_store)
-			M.equip_to_slot_or_del(new /obj/item/weapon/tank/emergency_oxygen/double/full(M), slot_r_store)
-			M.equip_to_slot_or_del(new /obj/item/weapon/restraints/handcuffs, slot_l_store)
-
-			M.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/security/night(M), slot_in_backpack)
-			M.equip_to_slot_or_del(new /obj/item/weapon/storage/box/handcuffs(M), slot_in_backpack)
-			M.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/gun/nuclear(M), slot_in_backpack)
-			M.equip_to_slot_or_del(new /obj/item/weapon/shield/riot/tele(M), slot_in_backpack)
-
-			M.equip_to_slot_or_del(new /obj/item/weapon/storage/belt/security/response_team(M), slot_belt)
-
-		if("Medical")
-			M.equip_to_slot_or_del(new /obj/item/clothing/shoes/magboots(M), slot_shoes)
-			M.equip_to_slot_or_del(new /obj/item/clothing/gloves/color/latex/nitrile(M), slot_gloves)
-			M.equip_to_slot_or_del(new /obj/item/clothing/suit/space/rig/ert/medical(M), slot_wear_suit)
-
-			var/obj/item/clothing/suit/space/rig/R = M.wear_suit
-			R.helmet = new /obj/item/clothing/head/helmet/space/rig/ert/medical(M)
-			M.equip_to_slot_or_del(R.helmet, slot_head)
-			R.helmet.flags |= NODROP
-
-			M.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/swat(M), slot_wear_mask)
-			M.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/ert/medical(M), slot_back)
-			M.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health/night(M), slot_glasses)
-
-			var/obj/item/weapon/card/id/W = new(src)
-			W.assignment = "Emergency Response Team Member"
-			W.registered_name = M.real_name
-			W.name = "[M.real_name]'s ID Card (Emergency Response Team - Medic)"
-			W.icon_state = "centcom"
-			W.access = get_centcom_access(W.assignment)
-			M.equip_to_slot_or_del(W, slot_wear_id)
-
-			var/obj/item/device/pda/heads/pda = new(src)
-			pda.owner = M.real_name
-			pda.ownjob = "Emergency Response Team Member"
-			pda.name = "PDA-[M.real_name] ([pda.ownjob])"
-			pda.icon_state = "pda-medical"
-			M.equip_to_slot_or_del(pda, slot_wear_pda)
-
-			M.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/gun(M), slot_s_store)
-			M.equip_to_slot_or_del(new /obj/item/weapon/tank/emergency_oxygen/double/full(M), slot_r_store)
-
-			M.equip_to_slot_or_del(new /obj/item/weapon/storage/firstaid/fire(M), slot_in_backpack)
-			M.equip_to_slot_or_del(new /obj/item/weapon/storage/firstaid/o2(M), slot_in_backpack)
-			M.equip_to_slot_or_del(new /obj/item/weapon/storage/firstaid/toxin(M), slot_in_backpack)
-			M.equip_to_slot_or_del(new /obj/item/weapon/reagent_containers/hypospray/CMO(M), slot_in_backpack)
-
-			M.equip_to_slot_or_del(new /obj/item/weapon/defibrillator/compact/combat/loaded(M), slot_belt)
-
-			M.equip_to_slot_or_del(new /obj/item/weapon/storage/firstaid/adv(M), slot_r_hand)
-
-		if("Engineering")
-			M.equip_to_slot_or_del(new /obj/item/clothing/shoes/magboots/advance(M), slot_shoes)
-			M.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/ert/engineer(M), slot_gloves)
-			M.equip_to_slot_or_del(new /obj/item/clothing/suit/space/rig/ert/engineer(M), slot_wear_suit)
-
-			var/obj/item/clothing/suit/space/rig/R = M.wear_suit
-			R.helmet = new /obj/item/clothing/head/helmet/space/rig/ert/engineer(M)
-			M.equip_to_slot_or_del(R.helmet, slot_head)
-			R.helmet.flags |= NODROP
-
-			M.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/swat(M), slot_wear_mask)
-			M.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(M), slot_back)
-			M.equip_to_slot_or_del(new /obj/item/clothing/glasses/meson/night(M), slot_glasses)
-
-			var/obj/item/weapon/card/id/W = new(src)
-			W.assignment = "Emergency Response Team Member"
-			W.registered_name = M.real_name
-			W.name = "[M.real_name]'s ID Card (Emergency Response Team - Engineer)"
+			W.name = "[M.real_name]'s ID Card (Emergency Response Team Engineer)"
 			W.icon_state = "centcom"
 			W.access = get_centcom_access(W.assignment)
 			M.equip_to_slot_or_del(W, slot_wear_id)
@@ -554,36 +271,19 @@ var/can_call_ert
 			pda.icon_state = "pda-engineer"
 			M.equip_to_slot_or_del(pda, slot_wear_pda)
 
-			M.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/gun(M), slot_s_store)
-			M.equip_to_slot_or_del(new /obj/item/weapon/tank/emergency_oxygen/double/full(M), slot_r_store)
 
-			M.equip_to_slot_or_del(new /obj/item/weapon/rcd/combat(M), slot_in_backpack)
-			M.equip_to_slot_or_del(new /obj/item/weapon/rcd_ammo/large(M), slot_in_backpack)
-			M.equip_to_slot_or_del(new /obj/item/weapon/rcd_ammo/large(M), slot_in_backpack)
-			M.equip_to_slot_or_del(new /obj/item/stack/sheet/metal(M, amount=50), slot_in_backpack)
-			M.equip_to_slot_or_del(new /obj/item/stack/sheet/glass(M, amount=50), slot_in_backpack)
-			M.equip_to_slot_or_del(new /obj/item/stack/sheet/plasteel(M, amount=50), slot_in_backpack)
+		if("Security")
+			security_slots -= 1
+			M.equip_to_slot_or_del(new /obj/item/clothing/under/rank/security(M), slot_w_uniform)
+			M.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/security(M), slot_back)
+			M.equip_to_slot_or_del(new /obj/item/weapon/storage/box/responseteam(M), slot_in_backpack)
 
-			M.equip_to_slot_or_del(new /obj/item/weapon/storage/belt/utility/full/multitool(M), slot_belt)
-
-		if("Janitorial")
-			M.equip_to_slot_or_del(new /obj/item/clothing/shoes/galoshes(M), slot_shoes)
-			M.equip_to_slot_or_del(new /obj/item/clothing/gloves/color/purple(M), slot_gloves)
-			M.equip_to_slot_or_del(new /obj/item/clothing/suit/space/rig/ert/janitor(M), slot_wear_suit)
-
-			var/obj/item/clothing/suit/space/rig/R = M.wear_suit
-			R.helmet = new /obj/item/clothing/head/helmet/space/rig/ert/janitor(M)
-			M.equip_to_slot_or_del(R.helmet, slot_head)
-			R.helmet.flags |= NODROP
-
-			M.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/swat(M), slot_wear_mask)
-			M.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/ert/janitor(M), slot_back)
-			M.equip_to_slot_or_del(new /obj/item/clothing/glasses/janitor(M), slot_glasses)
+			M.equip_to_slot_or_del(new /obj/item/weapon/storage/belt/security/response_team(M), slot_belt)
 
 			var/obj/item/weapon/card/id/W = new(src)
 			W.assignment = "Emergency Response Team Member"
 			W.registered_name = M.real_name
-			W.name = "[M.real_name]'s ID Card (Emergency Response Team - Janitor)"
+			W.name = "[M.real_name]'s ID Card (Emergency Response Team Officer)"
 			W.icon_state = "centcom"
 			W.access = get_centcom_access(W.assignment)
 			M.equip_to_slot_or_del(W, slot_wear_id)
@@ -592,55 +292,311 @@ var/can_call_ert
 			pda.owner = M.real_name
 			pda.ownjob = "Emergency Response Team Member"
 			pda.name = "PDA-[M.real_name] ([pda.ownjob])"
-			pda.icon_state = "pda-janitor"
+			pda.icon_state = "pda-security"
 			M.equip_to_slot_or_del(pda, slot_wear_pda)
 
-			M.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/gun(M), slot_s_store)
-			M.equip_to_slot_or_del(new /obj/item/weapon/tank/emergency_oxygen/double/full(M), slot_r_store)
 
-			M.equip_to_slot_or_del(new /obj/item/clothing/glasses/night(src), slot_in_backpack)
-			M.equip_to_slot_or_del(new /obj/item/weapon/storage/box/lights/mixed(src), slot_in_backpack)
-			M.equip_to_slot_or_del(new /obj/item/weapon/scythe/tele(src), slot_in_backpack)
-			M.equip_to_slot_or_del(new /obj/item/weapon/reagent_containers/glass/bucket(src), slot_in_backpack)
+		if("Medic")
+			medical_slots -= 1
+			M.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical(M), slot_w_uniform)
+			M.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/medic(M), slot_back)
+			M.equip_to_slot_or_del(new /obj/item/weapon/storage/box/responseteam(M), slot_in_backpack)
 
-			M.equip_to_slot_or_del(new /obj/item/weapon/storage/belt/janitor/full, slot_belt)
+			var/obj/item/weapon/card/id/W = new(src)
+			W.assignment = "Emergency Response Team Member"
+			W.registered_name = M.real_name
+			W.name = "[M.real_name]'s ID Card (Emergency Response Team Medic)"
+			W.icon_state = "centcom"
+			W.access = get_centcom_access(W.assignment)
+			M.equip_to_slot_or_del(W, slot_wear_id)
 
-			M.equip_to_slot_or_del(new /obj/item/weapon/mop/advanced(M), slot_r_hand)
+			var/obj/item/device/pda/heads/pda = new(src)
+			pda.owner = M.real_name
+			pda.ownjob = "Emergency Response Team Member"
+			pda.name = "PDA-[M.real_name] ([pda.ownjob])"
+			pda.icon_state = "pda-medical"
+			M.equip_to_slot_or_del(pda, slot_wear_pda)
 
-			new /obj/structure/mopbucket/full(get_turf(M))
 
-/*/mob/living/carbon/human/proc/equip_strike_team(leader_selected = 0) Old ERT equip verb.
+		if("Commander")
+			command_slots = 0
+			M.equip_to_slot_or_del(new /obj/item/clothing/under/rank/centcom_officer(M), slot_w_uniform)
+			M.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/captain(M), slot_back)
+			M.equip_to_slot_or_del(new /obj/item/weapon/storage/box/responseteam(M), slot_in_backpack)
 
-	//Special radio setup
-	equip_to_slot_or_del(new /obj/item/device/radio/headset/ert/alt(src), slot_l_ear)
+			var/obj/item/weapon/card/id/W = new(src)
+			W.assignment = "Emergency Response Team Leader"
+			W.registered_name = M.real_name
+			W.name = "[M.real_name]'s ID Card (Emergency Response Team Leader)"
+			W.icon_state = "centcom"
+			W.access = get_centcom_access(W.assignment)
+			M.equip_to_slot_or_del(W, slot_wear_id)
 
-	//Replaced with new ERT uniform
-	equip_to_slot_or_del(new /obj/item/clothing/under/rank/centcom_officer(src), slot_w_uniform)
-	equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(src), slot_shoes)
-	equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses(src), slot_glasses)
-	equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(src), slot_back)
+			var/obj/item/device/pda/heads/pda = new(src)
+			pda.owner = M.real_name
+			pda.ownjob = "Emergency Response Team Leader"
+			pda.name = "PDA-[M.real_name] ([pda.ownjob])"
+			M.equip_to_slot_or_del(pda, slot_wear_pda)
 
-	var/obj/item/weapon/card/id/W = new(src)
-	W.assignment = "Emergency Response Team[leader_selected ? " Leader" : ""]"
-	W.registered_name = real_name
-	W.name = "[real_name]'s ID Card ([W.assignment])"
-	W.icon_state = "centcom"
-	W.access = get_all_accesses()
-	W.access += list(access_cent_general, access_cent_living, access_cent_storage)
 
-	var/obj/item/device/pda/heads/pda = new(src)
-	pda.owner = real_name
-	pda.ownjob = "Emergency Response Team[leader_selected ? " Leader" : ""]"
-	pda.name = "PDA-[real_name] ([pda.ownjob])"
-	equip_to_slot_or_del(pda, slot_wear_pda)
+/datum/response_team/proc/announce_team()
+	command_announcement.Announce("Attention, [station_name()]. We are attempting to assemble a team of highly trained assistants to aid(?) you. Standby.", "Central Command")
 
-	if (leader_selected)
-		W.access += access_cent_teleporter
-	equip_to_slot_or_del(W, slot_wear_id)
+// -- AMBER TEAM --
 
-	// Loyalty implant
-	var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(src)
-	L.imp_in = src
-	L.implanted = 1
+/datum/response_team/amber
 
-	return 1*/
+/datum/response_team/amber/announce_team()
+	command_announcement.Announce("Attention, [station_name()]. We are attempting to assemble a code AMBER light Emergency Response Team. Standby.", "Central Command")
+
+/datum/response_team/amber/equip_officer(var/officer_type, var/mob/living/carbon/human/M)
+	..()
+
+	switch(officer_type)
+		if("Engineer")
+			M.equip_to_slot_or_del(new /obj/item/clothing/shoes/magboots(M), slot_shoes)
+			M.equip_to_slot_or_del(new /obj/item/clothing/gloves/color/yellow(M), slot_gloves)
+			M.equip_to_slot_or_del(new /obj/item/clothing/suit/space/rig/ert/engineer(M), slot_wear_suit)
+			M.equip_to_slot_or_del(new /obj/item/weapon/tank/emergency_oxygen/engi(M), slot_s_store)
+			M.equip_to_slot_or_del(new /obj/item/clothing/glasses/meson(M), slot_glasses)
+
+			M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/rig/ert/engineer(M), slot_in_backpack)
+			M.equip_to_slot_or_del(new /obj/item/clothing/mask/gas(M), slot_in_backpack)
+			M.equip_to_slot_or_del(new /obj/item/stack/sheet/glass(M, amount=50), slot_in_backpack)
+			M.equip_to_slot_or_del(new /obj/item/stack/sheet/metal(M, amount=50), slot_in_backpack)
+
+			M.equip_to_slot_or_del(new /obj/item/device/t_scanner(M), slot_l_store)
+			M.equip_to_slot_or_del(new /obj/item/weapon/melee/classic_baton/telescopic(M), slot_r_store)
+
+		if("Security")
+			M.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(M), slot_shoes)
+			M.equip_to_slot_or_del(new /obj/item/clothing/gloves/color/black(M), slot_gloves)
+			M.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest/ert/security(M), slot_wear_suit)
+			M.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/advtaser(M), slot_s_store)
+			M.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud(M), slot_glasses)
+
+			M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/ert/security(M), slot_in_backpack)
+			M.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/sechailer(M), slot_in_backpack)
+			M.equip_to_slot_or_del(new /obj/item/weapon/storage/box/zipties(M), slot_in_backpack)
+
+			M.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/laser(M), slot_r_hand)
+
+		if("Medic")
+			M.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(M), slot_shoes)
+			M.equip_to_slot_or_del(new /obj/item/clothing/gloves/color/latex(M), slot_gloves)
+			M.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest/ert/medical(M), slot_wear_suit)
+			M.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health(M), slot_glasses)
+
+			M.equip_to_slot_or_del(new /obj/item/weapon/storage/belt/medical/response_team(M), slot_belt)
+
+			M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/ert/medical(M), slot_in_backpack)
+			M.equip_to_slot_or_del(new /obj/item/clothing/mask/surgical(M), slot_in_backpack)
+			M.equip_to_slot_or_del(new /obj/item/weapon/storage/firstaid/o2(M), slot_in_backpack)
+			M.equip_to_slot_or_del(new /obj/item/weapon/storage/firstaid/brute(M), slot_in_backpack)
+			M.equip_to_slot_or_del(new /obj/item/weapon/storage/firstaid/adv(M), slot_in_backpack)
+
+			M.equip_to_slot_or_del(new /obj/item/weapon/reagent_containers/hypospray/CMO(M), slot_l_store)
+			M.equip_to_slot_or_del(new /obj/item/weapon/melee/classic_baton/telescopic(M), slot_r_store)
+
+		if("Commander")
+			M.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(M), slot_shoes)
+			M.equip_to_slot_or_del(new /obj/item/clothing/gloves/color/black(M), slot_gloves)
+			M.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest/ert/command(M), slot_wear_suit)
+			M.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses(M), slot_glasses)
+
+			M.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/gun(M), slot_belt)
+
+			M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/ert/command(M), slot_in_backpack)
+			M.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/sechailer(M), slot_in_backpack)
+			M.equip_to_slot_or_del(new /obj/item/weapon/restraints/handcuffs(M), slot_in_backpack)
+			M.equip_to_slot_or_del(new /obj/item/weapon/storage/lockbox/loyalty(M), slot_in_backpack)
+
+			M.equip_to_slot_or_del(new /obj/item/weapon/pinpointer(M), slot_l_store)
+			M.equip_to_slot_or_del(new /obj/item/weapon/melee/classic_baton/telescopic(M), slot_r_store)
+
+// -- RED TEAM --
+
+/datum/response_team/red
+
+/datum/response_team/red/announce_team()
+	command_announcement.Announce("Attention, [station_name()]. We are attempting to assemble a code RED Emergency Response Team. Standby.", "Central Command")
+
+/datum/response_team/red/equip_officer(var/officer_type, var/mob/living/carbon/human/M)
+	..()
+
+	switch(officer_type)
+		if("Engineer")
+			M.equip_to_slot_or_del(new /obj/item/clothing/shoes/magboots(M), slot_shoes)
+			M.equip_to_slot_or_del(new /obj/item/clothing/gloves/color/yellow(M), slot_gloves)
+			M.equip_to_slot_or_del(new /obj/item/clothing/suit/space/rig/ert/engineer(M), slot_wear_suit)
+			M.equip_to_slot_or_del(new /obj/item/weapon/tank/emergency_oxygen/engi(M), slot_s_store)
+			M.equip_to_slot_or_del(new /obj/item/clothing/glasses/meson(M), slot_glasses)
+
+			M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/rig/ert/engineer(M), slot_in_backpack)
+			M.equip_to_slot_or_del(new /obj/item/clothing/mask/gas(M), slot_in_backpack)
+			var/obj/item/weapon/rcd/R = new /obj/item/weapon/rcd(src)
+			R.matter = 100
+			M.equip_to_slot_or_del(R, slot_in_backpack)
+			M.equip_to_slot_or_del(new /obj/item/weapon/rcd_ammo(M), slot_in_backpack)
+			M.equip_to_slot_or_del(new /obj/item/weapon/rcd_ammo(M), slot_in_backpack)
+			M.equip_to_slot_or_del(new /obj/item/weapon/rcd_ammo(M), slot_in_backpack)
+			M.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/gun(M), slot_in_backpack)
+
+			M.equip_to_slot_or_del(new /obj/item/device/t_scanner/extended_range(M), slot_l_store)
+			M.equip_to_slot_or_del(new /obj/item/weapon/melee/classic_baton/telescopic(M), slot_r_store)
+
+		if("Security")
+			M.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(M), slot_shoes)
+			M.equip_to_slot_or_del(new /obj/item/clothing/gloves/color/black(M), slot_gloves)
+			M.equip_to_slot_or_del(new /obj/item/clothing/suit/space/rig/ert/security(M), slot_wear_suit)
+			M.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/advtaser(M), slot_s_store)
+			M.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud(M), slot_glasses)
+
+			M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/rig/ert/security(M), slot_in_backpack)
+			M.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/sechailer(M), slot_in_backpack)
+			M.equip_to_slot_or_del(new /obj/item/weapon/storage/box/handcuffs(M), slot_in_backpack)
+			if(prob(50))
+				M.equip_to_slot_or_del(new /obj/item/weapon/storage/box/teargas(M), slot_in_backpack)
+			else
+				M.equip_to_slot_or_del(new /obj/item/weapon/storage/box/flashbangs(M), slot_in_backpack)
+			M.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/ionrifle/carbine(M), slot_in_backpack)
+
+			M.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/lasercannon(M), slot_r_hand)
+
+		if("Medic")
+			M.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(M), slot_shoes)
+			M.equip_to_slot_or_del(new /obj/item/clothing/gloves/color/latex/nitrile(M), slot_gloves)
+			M.equip_to_slot_or_del(new /obj/item/clothing/suit/space/rig/ert/medical(M), slot_wear_suit)
+			M.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health_advanced(M), slot_glasses)
+
+			M.equip_to_slot_or_del(new /obj/item/weapon/defibrillator/compact/loaded(M), slot_belt)
+
+			M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/rig/ert/medical(M), slot_in_backpack)
+			M.equip_to_slot_or_del(new /obj/item/clothing/mask/surgical(M), slot_in_backpack)
+			M.equip_to_slot_or_del(new /obj/item/weapon/storage/firstaid/o2(M), slot_in_backpack)
+			M.equip_to_slot_or_del(new /obj/item/weapon/storage/firstaid/toxin(M), slot_in_backpack)
+			M.equip_to_slot_or_del(new /obj/item/weapon/storage/firstaid/adv(M), slot_in_backpack)
+			M.equip_to_slot_or_del(new /obj/item/weapon/storage/firstaid/surgery(M), slot_in_backpack)
+			M.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/gun(M), slot_in_backpack)
+
+			M.equip_to_slot_or_del(new /obj/item/weapon/reagent_containers/hypospray/CMO(M), slot_l_store)
+			M.equip_to_slot_or_del(new /obj/item/weapon/melee/classic_baton/telescopic(M), slot_r_store)
+
+		if("Commander")
+			M.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(M), slot_shoes)
+			M.equip_to_slot_or_del(new /obj/item/clothing/gloves/color/black(M), slot_gloves)
+			M.equip_to_slot_or_del(new /obj/item/clothing/suit/space/rig/ert/commander(M), slot_wear_suit)
+			M.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud(M), slot_glasses)
+
+			M.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/gun/nuclear(M), slot_belt)
+
+			M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/rig/ert/commander(M), slot_in_backpack)
+			M.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/sechailer/swat(M), slot_in_backpack)
+			M.equip_to_slot_or_del(new /obj/item/weapon/restraints/handcuffs(M), slot_in_backpack)
+			M.equip_to_slot_or_del(new /obj/item/weapon/storage/lockbox/loyalty(M), slot_in_backpack)
+
+			M.equip_to_slot_or_del(new /obj/item/weapon/pinpointer(M), slot_l_store)
+			M.equip_to_slot_or_del(new /obj/item/weapon/melee/classic_baton/telescopic(M), slot_r_store)
+
+// -- GAMMA TEAM --
+
+/datum/response_team/gamma
+
+/datum/response_team/gamma/announce_team()
+	command_announcement.Announce("Attention, [station_name()]. We are attempting to assemble a code GAMMA elite Emergency Response Team. Standby.", "Central Command")
+
+/datum/response_team/gamma/equip_officer(var/officer_type, var/mob/living/carbon/human/M)
+	..()
+
+	switch(officer_type)
+		if("Engineer")
+			M.equip_to_slot_or_del(new /obj/item/clothing/shoes/magboots/advance(M), slot_shoes)
+			M.equip_to_slot_or_del(new /obj/item/clothing/gloves/color/yellow(M), slot_gloves)
+			M.equip_to_slot_or_del(new /obj/item/clothing/suit/space/rig/ert/engineer(M), slot_wear_suit)
+			M.equip_to_slot_or_del(new /obj/item/weapon/tank/emergency_oxygen/double/full(M), slot_s_store)
+			M.equip_to_slot_or_del(new /obj/item/clothing/glasses/meson/night(M), slot_glasses)
+
+			M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/rig/ert/engineer(M), slot_in_backpack)
+			M.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/sechailer/swat(M), slot_in_backpack)
+			M.equip_to_slot_or_del(new /obj/item/weapon/rcd/combat, slot_in_backpack)
+			M.equip_to_slot_or_del(new /obj/item/weapon/rcd_ammo/large(M), slot_in_backpack)
+			M.equip_to_slot_or_del(new /obj/item/weapon/rcd_ammo/large(M), slot_in_backpack)
+			M.equip_to_slot_or_del(new /obj/item/weapon/rcd_ammo/large(M), slot_in_backpack)
+			M.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/pulse_rifle/pistol(M), slot_in_backpack)
+
+			M.equip_to_slot_or_del(new /obj/item/device/t_scanner/extended_range(M), slot_l_store)
+			M.equip_to_slot_or_del(new /obj/item/weapon/melee/classic_baton/telescopic(M), slot_r_store)
+
+		if("Security")
+			M.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat/swat(M), slot_shoes)
+			M.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(M), slot_gloves)
+			M.equip_to_slot_or_del(new /obj/item/clothing/suit/space/rig/ert/security(M), slot_wear_suit)
+			M.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/gun/nuclear(M), slot_s_store)
+			M.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/security/night(M), slot_glasses)
+
+			M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/rig/ert/security(M), slot_in_backpack)
+			M.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/sechailer/swat(M), slot_in_backpack)
+			M.equip_to_slot_or_del(new /obj/item/weapon/storage/box/handcuffs(M), slot_in_backpack)
+			if(prob(50))
+				M.equip_to_slot_or_del(new /obj/item/weapon/storage/box/teargas(M), slot_in_backpack)
+			else
+				M.equip_to_slot_or_del(new /obj/item/weapon/storage/box/flashbangs(M), slot_in_backpack)
+			M.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/ionrifle/carbine(M), slot_in_backpack)
+
+			M.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/pulse_rifle/carbine(M), slot_r_hand)
+
+		if("Medic")
+			M.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat/swat(M), slot_shoes)
+			M.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(M), slot_gloves)
+			M.equip_to_slot_or_del(new /obj/item/clothing/suit/space/rig/ert/medical(M), slot_wear_suit)
+			M.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health/night(M), slot_glasses)
+
+			M.equip_to_slot_or_del(new /obj/item/weapon/defibrillator/compact/loaded(M), slot_belt)
+
+			M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/rig/ert/medical(M), slot_in_backpack)
+			M.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/sechailer/swat(M), slot_in_backpack)
+			M.equip_to_slot_or_del(new /obj/item/weapon/storage/firstaid/surgery(M), slot_in_backpack)
+			M.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/pulse_rifle/pistol(M), slot_in_backpack)
+
+			M.equip_to_slot_or_del(new /obj/item/weapon/reagent_containers/hypospray/combat/nanites(src), slot_l_store)
+			M.equip_to_slot_or_del(new /obj/item/weapon/melee/classic_baton/telescopic(M), slot_r_store)
+
+		if("Commander")
+			M.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat/swat(M), slot_shoes)
+			M.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(M), slot_gloves)
+			M.equip_to_slot_or_del(new /obj/item/clothing/suit/space/rig/ert/commander(M), slot_wear_suit)
+			M.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/security/night(M), slot_glasses)
+
+			M.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/gun/nuclear(M), slot_belt)
+
+			M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/rig/ert/commander(M), slot_in_backpack)
+			M.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/sechailer/swat(M), slot_in_backpack)
+			M.equip_to_slot_or_del(new /obj/item/weapon/restraints/handcuffs(M), slot_in_backpack)
+			M.equip_to_slot_or_del(new /obj/item/weapon/storage/lockbox/loyalty(M), slot_in_backpack)
+			M.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/pulse_rifle/pistol(M), slot_in_backpack)
+
+			M.equip_to_slot_or_del(new /obj/item/weapon/pinpointer(M), slot_l_store)
+			M.equip_to_slot_or_del(new /obj/item/weapon/melee/classic_baton/telescopic(M), slot_r_store)
+
+
+/obj/item/device/radio/centcom
+	name = "centcomm bounced radio"
+	freerange = 1
+	frequency = ERT_FREQ
+	icon_state = "radio"
+
+/obj/item/weapon/storage/box/responseteam/
+	name = "boxed survival kit"
+
+/obj/item/weapon/storage/box/responseteam/New()
+	..()
+	contents = list()
+	sleep(1)
+	new /obj/item/clothing/mask/breath( src )
+	new /obj/item/weapon/tank/emergency_oxygen/engi( src )
+	new /obj/item/device/flashlight/flare( src )
+	new /obj/item/weapon/kitchenknife/combat( src )
+	new /obj/item/device/radio/centcom( src )
+	new /obj/item/weapon/reagent_containers/pill/salicylic( src )
+	new /obj/item/weapon/reagent_containers/pill/patch/synthflesh( src )
+	return

code/game/turfs/simulated.dm

@@ -43,7 +43,7 @@
 	tracks.AddTracks(bloodDNA,comingdir,goingdir,bloodcolor)
 
 /turf/simulated/Entered(atom/A, atom/OL)
-
+	..()
 	if(ishuman(A))
 		var/mob/living/carbon/human/M = A
 		if(M.lying)	return
@@ -148,8 +148,6 @@
 					M.inertia_dir = 0
 					return
 
-	..()
-
 //returns 1 if made bloody, returns 0 otherwise
 /turf/simulated/add_blood(mob/living/carbon/human/M as mob)
 	if (!..())

code/game/turfs/simulated/walls.dm

@@ -189,8 +189,8 @@
 	return
 
 /turf/simulated/wall/blob_act()
-	take_damage(rand(75, 125))
-	return
+	if(prob(50))
+		dismantle_wall()
 
 /turf/simulated/wall/mech_melee_attack(obj/mecha/M)
 	if(M.damtype == "brute")

code/game/turfs/space/space.dm

@@ -106,31 +106,11 @@
 		if(destination_y)
 			A.y = destination_y
 
-		var/mob/living/MM = null
-		var/fukkendisk = A.GetTypeInAllContents(/obj/item/weapon/disk/nuclear)
 		var/obj/item/flag/nation/fukkenflag = A.GetTypeInAllContents(/obj/item/flag/nation)
 		if(fukkenflag)
 			fukkenflag.loc = fukkenflag.startloc
 			if(isliving(A))
 				A << "<span class='warning'>The flag you were carrying was just returned to it's base. Nice try.</span>"
-		if(fukkendisk)
-			if(isliving(A))
-				MM = A
-				if(MM.client && !MM.stat)
-					MM << "<span class='warning'>Something you are carrying is preventing you from leaving. Don't play stupid; you know exactly what it is.</span>"
-					if(MM.x <= TRANSITIONEDGE)
-						MM.inertia_dir = 4
-					else if(MM.x >= world.maxx -TRANSITIONEDGE)
-						MM.inertia_dir = 8
-					else if(MM.y <= TRANSITIONEDGE)
-						MM.inertia_dir = 1
-					else if(MM.y >= world.maxy -TRANSITIONEDGE)
-						MM.inertia_dir = 2
-				else
-					qdel(fukkendisk)//Make the disk respawn if it is on a clientless mob or corpse
-			else
-				qdel(fukkendisk)//Make the disk respawn if it is floating on its own
-			return
 
 		A.z =  text2num(transition)
 

code/game/turfs/turf.dm

@@ -35,10 +35,9 @@
 
 /turf/New()
 	..()
-	for(var/atom/movable/AM as mob|obj in src)
-		spawn( 0 )
-			src.Entered(AM)
-			return
+	for(var/atom/movable/AM in src)
+		Entered(AM)
+	return
 
 /turf/Destroy()
 	return QDEL_HINT_HARDDEL_NOW
@@ -105,51 +104,24 @@
 	return 1 //Nothing found to block so return success!
 
 
-/turf/Entered(atom/atom as mob|obj)
-	..()
-//vvvvv Infared beam stuff vvvvv
-
-	if ((atom && atom.density && !( istype(atom, /obj/effect/beam) )))
-		for(var/obj/effect/beam/i_beam/I in src)
-			spawn( 0 )
-				if (I)
-					I.hit()
-				break
-
-//^^^^^ Infared beam stuff ^^^^^
-
-	if(!istype(atom, /atom/movable))
-		return
-
-	var/atom/movable/M = atom
-	if(!M.simulated) return
-	var/loopsanity = 100
+/turf/Entered(atom/movable/M)
 	if(ismob(M))
-		if(!M:lastarea)
-			M:lastarea = get_area(M.loc)
-		if(M:lastarea.has_gravity == 0)
-			inertial_drift(M)
-
-	/*
-		if(M.flags & NOGRAV)
-			inertial_drift(M)
-	*/
-
-
-
+		var/mob/O = M
+		if(!O.lastarea)
+			O.lastarea = get_area(O.loc)
+		var/has_gravity = O.mob_has_gravity(src)
+		O.update_gravity(has_gravity)
+		if(!has_gravity)
+			inertial_drift(O)
 		else if(!istype(src, /turf/space))
-			M:inertia_dir = 0
-	..()
-	var/objects = 0
-	for(var/atom/A as mob|obj|turf|area in range(1))
-		if(!A.simulated) return
-		if(objects > loopsanity)	break
-		objects++
-		spawn( 0 )
-			if ((A && M))
-				A.HasProximity(M, 1)
-			return
-	return
+			O.inertia_dir = 0
+
+	var/loopsanity = 100
+	for(var/atom/A in range(1))
+		if(loopsanity == 0)
+			break
+		loopsanity--
+		A.HasProximity(M, 1)
 
 /turf/proc/adjacent_fire_act(turf/simulated/floor/source, temperature, volume)
 	return