Resolves further merge conflicts

code/modules/mob/living/carbon/alien/humanoid/update_icons.dm

@@ -45,7 +45,7 @@
 		icon_state = "alien[caste]_leap"
 		pixel_x = -32
 		pixel_y = -32
-	else if(icon == 'icons/mob/alienleap.dmi' && icon_state == "alien[caste]_leap" && pixel_x == -32 && pixel_y == -32)
+	else if(icon == 'icons/mob/alienleap.dmi' && pixel_x == -32 && pixel_y == -32)
 		icon = initial(icon)// ^ this looks odd, but in theory it will prevent the icon and pixel_xy from being reset unless it needs to be
 		pixel_x = initial(pixel_x)
 		pixel_y = initial(pixel_y)

code/modules/mob/living/carbon/human/appearance.dm

@@ -0,0 +1,185 @@
+/mob/living/carbon/human/proc/change_appearance(var/flags = APPEARANCE_ALL_HAIR, var/location = src, var/mob/user = src, var/check_species_whitelist = 1, var/list/species_whitelist = list(), var/list/species_blacklist = list(), var/datum/topic_state/state = default_state)
+	var/datum/nano_module/appearance_changer/AC = new(location, src, check_species_whitelist, species_whitelist, species_blacklist)
+	AC.flags = flags
+	AC.ui_interact(user, state = state)
+
+/mob/living/carbon/human/proc/change_species(var/new_species)
+	if(!new_species)
+		return
+
+	if(species == new_species)
+		return
+
+	if(!(new_species in all_species))
+		return
+
+	set_species(new_species)
+	reset_hair()
+	return 1
+
+/mob/living/carbon/human/proc/change_gender(var/gender)
+	if(src.gender == gender)
+		return
+
+	src.gender = gender
+	reset_hair()
+	update_body()
+	update_dna()
+	return 1
+
+/mob/living/carbon/human/proc/change_hair(var/hair_style)
+	if(!hair_style)
+		return
+
+	if(h_style == hair_style)
+		return
+
+	if(!(hair_style in hair_styles_list))
+		return
+
+	h_style = hair_style
+
+	update_hair()
+	return 1
+
+/mob/living/carbon/human/proc/change_facial_hair(var/facial_hair_style)
+	if(!facial_hair_style)
+		return
+
+	if(f_style == facial_hair_style)
+		return
+
+	if(!(facial_hair_style in facial_hair_styles_list))
+		return
+
+	f_style = facial_hair_style
+
+	update_hair()
+	return 1
+
+/mob/living/carbon/human/proc/reset_hair()
+	var/list/valid_hairstyles = generate_valid_hairstyles()
+	var/list/valid_facial_hairstyles = generate_valid_facial_hairstyles()
+
+	if(valid_hairstyles.len)
+		h_style = pick(valid_hairstyles)
+	else
+		//this shouldn't happen
+		h_style = "Bald"
+
+	if(valid_facial_hairstyles.len)
+		f_style = pick(valid_facial_hairstyles)
+	else
+		//this shouldn't happen
+		f_style = "Shaved"
+
+	update_hair()
+
+/mob/living/carbon/human/proc/change_eye_color(var/red, var/green, var/blue)
+	if(red == r_eyes && green == g_eyes && blue == b_eyes)
+		return
+
+	r_eyes = red
+	g_eyes = green
+	b_eyes = blue
+
+	update_eyes()
+	update_body()
+	return 1
+
+/mob/living/carbon/human/proc/change_hair_color(var/red, var/green, var/blue)
+	if(red == r_eyes && green == g_eyes && blue == b_eyes)
+		return
+
+	r_hair = red
+	g_hair = green
+	b_hair = blue
+
+	update_hair()
+	return 1
+
+/mob/living/carbon/human/proc/change_facial_hair_color(var/red, var/green, var/blue)
+	if(red == r_facial && green == g_facial && blue == b_facial)
+		return
+
+	r_facial = red
+	g_facial = green
+	b_facial = blue
+
+	update_hair()
+	return 1
+
+/mob/living/carbon/human/proc/change_skin_color(var/red, var/green, var/blue)
+	if(red == r_skin && green == g_skin && blue == b_skin || !(species.flags & HAS_SKIN_COLOR))
+		return
+
+	r_skin = red
+	g_skin = green
+	b_skin = blue
+
+	force_update_limbs()
+	update_body()
+	return 1
+
+/mob/living/carbon/human/proc/change_skin_tone(var/tone)
+	if(s_tone == tone || !(species.flags & HAS_SKIN_TONE))
+		return
+
+	s_tone = tone
+
+	force_update_limbs()
+	update_body()
+	return 1
+
+/mob/living/carbon/human/proc/update_dna()
+	check_dna()
+	dna.ready_dna(src)
+
+/mob/living/carbon/human/proc/generate_valid_species(var/check_whitelist = 1, var/list/whitelist = list(), var/list/blacklist = list())
+	var/list/valid_species = new()
+	for(var/current_species_name in all_species)
+		var/datum/species/current_species = all_species[current_species_name]
+
+		if(check_whitelist && config.usealienwhitelist && !check_rights(R_ADMIN, 0, src)) //If we're using the whitelist, make sure to check it!
+			if(whitelist.len && !(current_species_name in whitelist))
+				continue
+			if(blacklist.len && (current_species_name in blacklist))
+				continue
+			if((current_species.flags & IS_WHITELISTED) && !is_alien_whitelisted(src, current_species_name))
+				continue
+
+		valid_species += current_species_name
+
+	return valid_species
+
+/mob/living/carbon/human/proc/generate_valid_hairstyles()
+	var/list/valid_hairstyles = new()
+	for(var/hairstyle in hair_styles_list)
+		var/datum/sprite_accessory/S = hair_styles_list[hairstyle]
+
+		if(gender == MALE && S.gender == FEMALE)
+			continue
+		if(gender == FEMALE && S.gender == MALE)
+			continue
+		if(!(species.name in S.species_allowed))
+			continue
+		valid_hairstyles += hairstyle
+
+	return valid_hairstyles
+
+/mob/living/carbon/human/proc/generate_valid_facial_hairstyles()
+	var/list/valid_facial_hairstyles = new()
+	for(var/facialhairstyle in facial_hair_styles_list)
+		var/datum/sprite_accessory/S = facial_hair_styles_list[facialhairstyle]
+
+		if(gender == MALE && S.gender == FEMALE)
+			continue
+		if(gender == FEMALE && S.gender == MALE)
+			continue
+		if(!(species.name in S.species_allowed))
+			continue
+
+		valid_facial_hairstyles += facialhairstyle
+
+	return valid_facial_hairstyles
+	

code/modules/mob/living/carbon/human/human_attackhand.dm

@@ -65,11 +65,11 @@
 				return 1
 //			if(M.health < -75)	return 0
 
-			if((M.head && (M.head.flags & HEADCOVERSMOUTH)) || (M.wear_mask && (M.wear_mask.flags & MASKCOVERSMOUTH)))
-				M << "\blue <B>Remove your mask!</B>"
+			if((M.head && (M.head.flags & HEADCOVERSMOUTH)) || (M.wear_mask && (M.wear_mask.flags & MASKCOVERSMOUTH) && !M.wear_mask.mask_adjusted))
+				M << "<span class='boldnotice'>Remove your mask!</span>"
 				return 0
-			if((head && (head.flags & HEADCOVERSMOUTH)) || (wear_mask && (wear_mask.flags & MASKCOVERSMOUTH)))
-				M << "\blue <B>Remove his mask!</B>"
+			if((head && (head.flags & HEADCOVERSMOUTH)) || (wear_mask && (wear_mask.flags & MASKCOVERSMOUTH) && !wear_mask.mask_adjusted))
+				M << "<span class='boldnotice'>Remove his mask!</span>"
 				return 0
 
 			var/obj/effect/equip_e/human/O = new /obj/effect/equip_e/human()

code/modules/mob/living/silicon/ai/ai.dm

@@ -3,7 +3,6 @@
 
 var/list/ai_list = list()
 var/list/ai_verbs_default = list(
-	/mob/living/silicon/ai/proc/ai_alerts,
 	/mob/living/silicon/ai/proc/announcement,
 	/mob/living/silicon/ai/proc/ai_call_shuttle,
 	/mob/living/silicon/ai/proc/ai_camera_track,
@@ -24,8 +23,7 @@ var/list/ai_verbs_default = list(
 	/mob/living/silicon/ai/proc/toggle_acceleration,
 	/mob/living/silicon/ai/proc/toggle_camera_light,
 	/mob/living/silicon/ai/proc/botcall,
-	/mob/living/silicon/ai/proc/change_arrival_message,
-	/mob/living/silicon/ai/proc/nano_crew_monitor
+	/mob/living/silicon/ai/proc/change_arrival_message
 )
 
 //Not sure why this is necessary...
@@ -95,9 +93,11 @@ var/list/ai_verbs_default = list(
 
 /mob/living/silicon/ai/proc/add_ai_verbs()
 	src.verbs |= ai_verbs_default
-
+	src.verbs |= silicon_subsystems
+	
 /mob/living/silicon/ai/proc/remove_ai_verbs()
 	src.verbs -= ai_verbs_default
+	src.verbs -= silicon_subsystems
 
 /mob/living/silicon/ai/New(loc, var/datum/ai_laws/L, var/obj/item/device/mmi/B, var/safety = 0)
 	var/list/possibleNames = ai_names
@@ -181,8 +181,6 @@ var/list/ai_verbs_default = list(
 	hud_list[SPECIALROLE_HUD] = image('icons/mob/hud.dmi', src, "hudblank")
 	hud_list[NATIONS_HUD]	  = image('icons/mob/hud.dmi', src, "hudblank")
 
-	init_subsystems()
-
 	ai_list += src
 	..()
 	return
@@ -321,43 +319,6 @@ var/list/ai_verbs_default = list(
 				if (malf.apcs >= 3)
 					stat(null, "Time until station control secured: [max(malf.AI_win_timeleft/(malf.apcs/3), 0)] seconds")
 
-
-/mob/living/silicon/ai/proc/ai_alerts()
-	set name = "Show Alerts"
-	set category = "AI Commands"
-
-	var/dat = "<HEAD><TITLE>Current Station Alerts</TITLE><META HTTP-EQUIV='Refresh' CONTENT='10'></HEAD><BODY>\n"
-	dat += "<A HREF='?src=\ref[src];mach_close=aialerts'>Close</A><BR><BR>"
-	for (var/cat in alarms)
-		dat += text("<B>[]</B><BR>\n", cat)
-		var/list/L = alarms[cat]
-		if (L.len)
-			for (var/alarm in L)
-				var/list/alm = L[alarm]
-				var/area/A = alm[1]
-				var/C = alm[2]
-				var/list/sources = alm[3]
-				dat += "<NOBR>"
-				if (C && istype(C, /list))
-					var/dat2 = ""
-					for (var/obj/machinery/camera/I in C)
-						dat2 += text("[]<A HREF=?src=\ref[];switchcamera=\ref[]>[]</A>", (dat2=="") ? "" : " | ", src, I, I.c_tag)
-					dat += text("-- [] ([])", A.name, (dat2!="") ? dat2 : "No Camera")
-				else if (C && istype(C, /obj/machinery/camera))
-					var/obj/machinery/camera/Ctmp = C
-					dat += text("-- [] (<A HREF=?src=\ref[];switchcamera=\ref[]>[]</A>)", A.name, src, C, Ctmp.c_tag)
-				else
-					dat += text("-- [] (No Camera)", A.name)
-				if (sources.len > 1)
-					dat += text("- [] sources", sources.len)
-				dat += "</NOBR><BR>\n"
-		else
-			dat += "-- All Systems Nominal<BR>\n"
-		dat += "<BR>\n"
-
-	viewalerts = 1
-	src << browse(dat, "window=aialerts&can_close=0")
-
 // this verb lets the ai see the stations manifest
 /mob/living/silicon/ai/proc/ai_roster()
 	set name = "Show Crew Manifest"
@@ -495,7 +456,7 @@ var/list/ai_verbs_default = list(
 	if (href_list["switchcamera"])
 		switchCamera(locate(href_list["switchcamera"])) in cameranet.cameras
 	if (href_list["showalerts"])
-		ai_alerts()
+		subsystem_alarm_monitor()
 	if(href_list["show_paper"])
 		if(last_paper_seen)
 			src << browse(last_paper_seen, "window=show_paper")
@@ -721,60 +682,6 @@ var/list/ai_verbs_default = list(
 
 	return 1
 
-/mob/living/silicon/ai/triggerAlarm(var/class, area/A, var/O, var/alarmsource)
-	if (stat == 2)
-		return 1
-	var/list/L = alarms[class]
-	for (var/I in L)
-		if (I == A.name)
-			var/list/alarm = L[I]
-			var/list/sources = alarm[3]
-			if (!(alarmsource in sources))
-				sources += alarmsource
-			return 1
-	var/obj/machinery/camera/C = null
-	var/list/CL = null
-	if (O && istype(O, /list))
-		CL = O
-		if (CL.len == 1)
-			C = CL[1]
-	else if (O && istype(O, /obj/machinery/camera))
-		C = O
-	L[A.name] = list(A, (C) ? C : O, list(alarmsource))
-	if (O)
-		if (C && C.can_use())
-			queueAlarm("--- [class] alarm detected in [A.name]! (<A HREF=?src=\ref[src];switchcamera=\ref[C]>[C.c_tag]</A>)", class)
-		else if (CL && CL.len)
-			var/foo = 0
-			var/dat2 = ""
-			for (var/obj/machinery/camera/I in CL)
-				dat2 += text("[]<A HREF=?src=\ref[];switchcamera=\ref[]>[]</A>", (!foo) ? "" : " | ", src, I, I.c_tag)	//I'm not fixing this shit...
-				foo = 1
-			queueAlarm(text ("--- [] alarm detected in []! ([])", class, A.name, dat2), class)
-		else
-			queueAlarm(text("--- [] alarm detected in []! (No Camera)", class, A.name), class)
-	else
-		queueAlarm(text("--- [] alarm detected in []! (No Camera)", class, A.name), class)
-	if (viewalerts) ai_alerts()
-	return 1
-
-/mob/living/silicon/ai/cancelAlarm(var/class, area/A as area, obj/origin)
-	var/list/L = alarms[class]
-	var/cleared = 0
-	for (var/I in L)
-		if (I == A.name)
-			var/list/alarm = L[I]
-			var/list/srcs  = alarm[3]
-			if (origin in srcs)
-				srcs -= origin
-			if (srcs.len == 0)
-				cleared = 1
-				L -= I
-	if (cleared)
-		queueAlarm(text("--- [] alarm in [] has been cleared.", class, A.name), class, 0)
-		if (viewalerts) ai_alerts()
-	return !cleared
-
 //Replaces /mob/living/silicon/ai/verb/change_network() in ai.dm & camera.dm
 //Adds in /mob/living/silicon/ai/proc/ai_network_change() instead
 //Addition by Mord_Sith to define AI's network change ability

code/modules/mob/living/silicon/ai/life.dm

@@ -23,10 +23,6 @@
 			death()
 			return
 
-		if (src.machine)
-			if (!( src.machine.check_eye(src) ))
-				src.reset_view(null)
-
 		// Handle power damage (oxy)
 		if(src:aiRestorePowerRoutine != 0)
 			// Lost power
@@ -177,6 +173,7 @@
 							sleep(50)
 							theAPC = null
 
+	process_queued_alarms()						
 	regular_hud_updates()
 	switch(src.sensor_mode)
 		if (SEC_HUD)
@@ -192,4 +189,13 @@
 		if(fire_res_on_core)
 			health = 100 - getOxyLoss() - getToxLoss() - getBruteLoss()
 		else
-			health = 100 - getOxyLoss() - getToxLoss() - getFireLoss() - getBruteLoss()
+			health = 100 - getOxyLoss() - getToxLoss() - getFireLoss() - getBruteLoss()
+			
+/mob/living/silicon/ai/proc/lacks_power()
+	var/turf/T = get_turf(src)
+	var/area/A = get_area(src)
+	return ((!A.power_equip) && A.requires_power == 1 || istype(T, /turf/space)) && !istype(src.loc,/obj/item)
+	
+/mob/living/silicon/ai/rejuvenate()
+	..()
+	add_ai_verbs(src)

code/modules/mob/living/silicon/ai/nano.dm

@@ -1,11 +0,0 @@
-/mob/living/silicon/ai
-  var/obj/nano_module/crew_monitor/crew_monitor
-
-/mob/living/silicon/ai/proc/init_subsystems()
-	crew_monitor = new(src)
-
-/mob/living/silicon/ai/proc/nano_crew_monitor()
-	set category = "AI Commands"
-	set name = "Crew Monitor"
-
-	crew_monitor.ui_interact(usr)

code/modules/mob/living/silicon/pai/pai.dm

@@ -268,6 +268,18 @@
 	src.reset_view(C)
 	return 1
 
+/mob/living/silicon/pai/verb/reset_record_view()
+	set category = "pAI Commands"
+	set name = "Reset Records Software"
+
+	securityActive1 = null
+	securityActive2 = null
+	security_cannotfind = 0
+	medicalActive1 = null
+	medicalActive2 = null
+	medical_cannotfind = 0
+	nanomanager.update_uis(src)
+	usr << "<span class='notice'>You reset your record-viewing software.</span>"	
 
 /mob/living/silicon/pai/cancel_camera()
 	set category = "pAI Commands"

code/modules/mob/living/silicon/pai/software.dm

@@ -15,7 +15,7 @@ var/global/list/pai_software_by_key = list()
 var/global/list/default_pai_software = list()
 /hook/startup/proc/populate_pai_software_list()
 	var/r = 1 // I would use ., but it'd sacrifice runtime detection
-	for(var/type in typesof(/datum/pai_software) - /datum/pai_software)
+	for(var/type in subtypesof(/datum/pai_software))
 		var/datum/pai_software/P = new type()
 		if(pai_software_by_key[P.id])
 			var/datum/pai_software/O = pai_software_by_key[P.id]

code/modules/mob/living/silicon/pai/software_modules.dm

@@ -123,7 +123,7 @@
 	on_ui_interact(mob/living/silicon/pai/user, datum/nanoui/ui=null, force_open=1)
 
 		var/data[0]
-		data["manifest"] = data_core.get_manifest_json()
+		data["manifest"] = list("__json_cache" = ManifestJSON)
 
 		ui = nanomanager.try_update_ui(user, user, id, ui, data, force_open)
 		if(!ui)

code/modules/mob/living/silicon/robot/death.dm

@@ -51,6 +51,7 @@
 	update_canmove()
 	if(camera)
 		camera.status = 0
+	update_headlamp(1) //So borg lights are disabled when killed.
 
 	if(in_contents_of(/obj/machinery/recharge_station))//exit the recharge station
 		var/obj/machinery/recharge_station/RC = loc
@@ -60,8 +61,7 @@
 	sight |= SEE_TURFS|SEE_MOBS|SEE_OBJS
 	see_in_dark = 8
 	see_invisible = SEE_INVISIBLE_LEVEL_TWO
-	updateicon()
-	update_fire()
+	update_icons()
 	tod = worldtime2text() //weasellos time of death patch
 	if(mind)	mind.store_memory("Time of death: [tod]", 0)
 

code/modules/mob/living/silicon/robot/drone/drone.dm

@@ -66,7 +66,7 @@
 
 	//Some tidying-up.
 	flavor_text = "It's a tiny little repair drone. The casing is stamped with an NT logo and the subscript: 'Nanotrasen Recursive Repair Systems: Fixing Tomorrow's Problem, Today!'"
-	updateicon()
+	update_icons()
 
 /mob/living/silicon/robot/drone/init()
 	laws = new /datum/ai_laws/drone()
@@ -80,7 +80,7 @@
 	real_name = "maintenance drone ([rand(100,999)])"
 	name = real_name
 
-/mob/living/silicon/robot/drone/updateicon()
+/mob/living/silicon/robot/drone/update_icons()
 
 	overlays.Cut()
 	if(stat == 0)
@@ -318,3 +318,9 @@
 	else
 		src << "<span class='warning'>You are too small to pull that.</span>"
 		return
+
+/mob/living/silicon/robot/drone/add_robot_verbs()
+	src.verbs |= silicon_subsystems
+
+/mob/living/silicon/robot/drone/remove_robot_verbs()
+	src.verbs -= silicon_subsystems		

code/modules/mob/living/silicon/robot/inventory.dm

@@ -15,11 +15,7 @@
 	if(istype(O,/obj/item/borg/sight))
 		var/obj/item/borg/sight/S = O
 		sight_mode &= ~S.sight_mode
-	else if(istype(O, /obj/item/device/flashlight))
-		var/obj/item/device/flashlight/F = O
-		if(F.on)
-			F.on = 0
-			F.update_brightness(src)
+		
 	if(client)
 		client.screen -= O
 	contents -= O

code/modules/mob/living/silicon/robot/laws.dm

@@ -110,8 +110,8 @@
 		if(0)  laws = new /datum/ai_laws/asimov()
 		if(1)  laws = new /datum/ai_laws/custom()
 		if(2)
-			var/datum/ai_laws/lawtype = pick(typesof(/datum/ai_laws/default) - /datum/ai_laws/default)
-			laws = new lawtype()
+			var/datum/ai_laws/lawtype = pick(subtypesof(/datum/ai_laws/default))
+			laws = new lawtype()
 
 /mob/living/silicon/robot/proc/statelaws() // -- TLE
 //	set category = "AI Commands"
@@ -200,4 +200,4 @@
 
 	list += {"<br><br><A href='byond://?src=\ref[src];laws=1'>State Laws</A>"}
 
-	usr << browse(list, "window=laws")			
+	usr << browse(list, "window=laws")

code/modules/mob/living/silicon/robot/life.dm

@@ -19,6 +19,7 @@
 	if (src.stat != DEAD) //still using power
 		use_power()
 		process_locks()
+		process_queued_alarms()
 
 	update_canmove()
 
@@ -42,7 +43,8 @@
 	if (is_component_functioning("power cell") && cell)
 		if(src.cell.charge <= 0)
 			uneq_all()
-			src.stat = 1
+			update_headlamp(1)
+			src.stat = UNCONSCIOUS
 			has_power = 0
 			for(var/V in components)
 				var/datum/robot_component/C = components[V]
@@ -63,6 +65,9 @@
 			for(var/V in components)
 				var/datum/robot_component/C = components[V]
 				C.consume_power()
+				
+			var/amt = Clamp((lamp_intensity - 2) * 2,1,cell.charge) //Always try to use at least one charge per tick, but allow it to completely drain the cell.
+			cell.use(amt) //Usage table: 1/tick if off/lowest setting, 4 = 4/tick, 6 = 8/tick, 8 = 12/tick, 10 = 16/tick
 
 			if(!is_component_functioning("actuator"))
 				Paralyse(3)
@@ -71,7 +76,8 @@
 			has_power = 1
 	else
 		uneq_all()
-		src.stat = 1
+		src.stat = UNCONSCIOUS
+		update_headlamp(1)
 		Paralyse(3)
 
 /mob/living/silicon/robot/proc/handle_regular_status_updates()
@@ -324,7 +330,7 @@
 		src.module_state_2:screen_loc = ui_inv2
 	if(src.module_state_3)
 		src.module_state_3:screen_loc = ui_inv3
-	updateicon()
+	update_icons()
 
 /mob/living/silicon/robot/proc/process_locks()
 	if(weapon_lock)
@@ -358,8 +364,6 @@
 	overlays -= image("icon"='icons/mob/OnFire.dmi', "icon_state"="Standing")
 	if(on_fire)
 		overlays += image("icon"='icons/mob/OnFire.dmi', "icon_state"="Standing")
-	update_icons()
-	return
 
 /mob/living/silicon/robot/fire_act()
 	if(!on_fire) //Silicons don't gain stacks from hotspots, but hotspots can ignite them

code/modules/mob/living/silicon/robot/robot.dm

@@ -22,6 +22,7 @@ var/list/robot_verbs_default = list(
 	var/obj/screen/inv1 = null
 	var/obj/screen/inv2 = null
 	var/obj/screen/inv3 = null
+	var/obj/screen/lamp_button = null
 
 	var/shown_robot_modules = 0	//Used to determine whether they have the module menu shown or not
 	var/obj/screen/robot_modules_background
@@ -74,6 +75,12 @@ var/list/robot_verbs_default = list(
 	var/braintype = "Cyborg"
 	var/base_icon = ""
 	var/crisis = 0
+	
+	var/lamp_max = 10 //Maximum brightness of a borg lamp. Set as a var for easy adjusting.
+	var/lamp_intensity = 0 //Luminosity of the headlamp. 0 is off. Higher settings than the minimum require power.
+	var/lamp_recharging = 0 //Flag for if the lamp is on cooldown after being forcibly disabled.
+	
+	var/jetpackoverlay = 0
 
 	var/obj/item/borg/sight/hud/sec/sechud = null
 	var/obj/item/borg/sight/hud/med/healthhud = null
@@ -92,7 +99,8 @@ var/list/robot_verbs_default = list(
 	robot_modules_background.layer = 19	//Objects that appear on screen are on layer 20, UI should be just below it.
 	ident = rand(1, 999)
 	updatename("Default")
-	updateicon()
+	update_icons()
+	update_headlamp()
 
 	radio = new /obj/item/device/radio/borg(src)
 	common_radio = radio
@@ -292,6 +300,8 @@ var/list/robot_verbs_default = list(
 
 	//languages
 	module.add_languages(src)
+	//subsystems
+	module.add_subsystems(src)
 
 	//Custom_sprite check and entry
 	if (custom_sprite == 1)
@@ -364,12 +374,7 @@ var/list/robot_verbs_default = list(
 			custom_name = newname
 
 		updatename()
-		updateicon()
-
-/mob/living/silicon/robot/verb/cmd_robot_alerts()
-	set category = "Robot Commands"
-	set name = "Show Alerts"
-	robot_alerts()
+		update_icons()
 
 // this verb lets cyborgs see the stations manifest
 /mob/living/silicon/robot/verb/cmd_station_manifest()
@@ -377,30 +382,6 @@ var/list/robot_verbs_default = list(
 	set name = "Show Station Manifest"
 	show_station_manifest()
 
-
-/mob/living/silicon/robot/proc/robot_alerts()
-	var/dat = "<HEAD><TITLE>Current Station Alerts</TITLE><META HTTP-EQUIV='Refresh' CONTENT='10'></HEAD><BODY>\n"
-	dat += "<A HREF='?src=\ref[src];mach_close=robotalerts'>Close</A><BR><BR>"
-	for (var/cat in alarms)
-		dat += text("<B>[cat]</B><BR>\n")
-		var/list/L = alarms[cat]
-		if (L.len)
-			for (var/alarm in L)
-				var/list/alm = L[alarm]
-				var/area/A = alm[1]
-				var/list/sources = alm[3]
-				dat += "<NOBR>" // wat
-				dat += text("-- [A.name]")
-				if (sources.len > 1)
-					dat += text("- [sources.len] sources")
-				dat += "</NOBR><BR>\n"
-		else
-			dat += "-- All Systems Nominal<BR>\n"
-		dat += "<BR>\n"
-
-	viewalerts = 1
-	src << browse(dat, "window=robotalerts&can_close=0")
-
 /mob/living/silicon/robot/proc/self_diagnosis()
 	if(!is_component_functioning("diagnosis unit"))
 		return null
@@ -412,7 +393,6 @@ var/list/robot_verbs_default = list(
 
 	return dat
 
-
 /mob/living/silicon/robot/verb/self_diagnosis_verb()
 	set category = "Robot Commands"
 	set name = "Self Diagnosis"
@@ -456,9 +436,11 @@ var/list/robot_verbs_default = list(
 
 /mob/living/silicon/robot/proc/add_robot_verbs()
 	src.verbs |= robot_verbs_default
+	src.verbs |= silicon_subsystems
 
 /mob/living/silicon/robot/proc/remove_robot_verbs()
 	src.verbs -= robot_verbs_default
+	src.verbs -= silicon_subsystems
 
 /mob/living/silicon/robot/blob_act()
 	if (stat != 2)
@@ -582,50 +564,6 @@ var/list/robot_verbs_default = list(
 		return
 	return
 
-
-/mob/living/silicon/robot/triggerAlarm(var/class, area/A, var/O, var/alarmsource)
-	if (stat == 2)
-		return 1
-	var/list/L = alarms[class]
-	for (var/I in L)
-		if (I == A.name)
-			var/list/alarm = L[I]
-			var/list/sources = alarm[3]
-			if (!(alarmsource in sources))
-				sources += alarmsource
-			return 1
-	var/obj/machinery/camera/C = null
-	var/list/CL = null
-	if (O && istype(O, /list))
-		CL = O
-		if (CL.len == 1)
-			C = CL[1]
-	else if (O && istype(O, /obj/machinery/camera))
-		C = O
-	L[A.name] = list(A, (C) ? C : O, list(alarmsource))
-	queueAlarm(text("--- [class] alarm detected in [A.name]!"), class)
-//	if (viewalerts) robot_alerts()
-	return 1
-
-
-/mob/living/silicon/robot/cancelAlarm(var/class, area/A as area, obj/origin)
-	var/list/L = alarms[class]
-	var/cleared = 0
-	for (var/I in L)
-		if (I == A.name)
-			var/list/alarm = L[I]
-			var/list/srcs  = alarm[3]
-			if (origin in srcs)
-				srcs -= origin
-			if (srcs.len == 0)
-				cleared = 1
-				L -= I
-	if (cleared)
-		queueAlarm(text("--- [class] alarm in [A.name] has been cleared."), class, 0)
-//		if (viewalerts) robot_alerts()
-	return !cleared
-
-
 /mob/living/silicon/robot/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 	if (istype(W, /obj/item/weapon/restraints/handcuffs)) // fuck i don't even know why isrobot() in handcuff code isn't working so this will have to do
 		return
@@ -683,7 +621,7 @@ var/list/robot_verbs_default = list(
 			if(cell)
 				user << "You close the cover."
 				opened = 0
-				updateicon()
+				update_icons()
 			else if(wiresexposed && wires.IsAllCut())
 				//Cell is out, wires are exposed, remove MMI, produce damaged chassis, baleet original mob.
 				if(!mmi)
@@ -735,7 +673,7 @@ var/list/robot_verbs_default = list(
 			else
 				user << "You open the cover."
 				opened = 1
-				updateicon()
+				update_icons()
 
 	else if (istype(W, /obj/item/weapon/stock_parts/cell) && opened)	// trying to put a cell inside
 		var/datum/robot_component/C = components["power cell"]
@@ -765,14 +703,14 @@ var/list/robot_verbs_default = list(
 	else if(istype(W, /obj/item/weapon/screwdriver) && opened && !cell)	// haxing
 		wiresexposed = !wiresexposed
 		user << "The wires have been [wiresexposed ? "exposed" : "unexposed"]"
-		updateicon()
+		update_icons()
 
 	else if(istype(W, /obj/item/weapon/screwdriver) && opened && cell)	// radio
 		if(radio)
 			radio.attackby(W,user)//Push it to the radio to let it handle everything
 		else
 			user << "Unable to locate a radio."
-		updateicon()
+		update_icons()
 
 	else if(istype(W, /obj/item/device/encryptionkey/) && opened)
 		if(radio)//sanityyyyyy
@@ -789,7 +727,7 @@ var/list/robot_verbs_default = list(
 			if(allowed(usr))
 				locked = !locked
 				user << "You [ locked ? "lock" : "unlock"] [src]'s interface."
-				updateicon()
+				update_icons()
 			else
 				user << "\red Access denied."
 
@@ -864,14 +802,14 @@ var/list/robot_verbs_default = list(
 			laws.show_laws(src)
 			src << "\red \b ALERT: [M.real_name] is your new master. Obey your new laws and his commands."
 			if(src.module && istype(src.module, /obj/item/weapon/robot_module/miner))
-				for(var/obj/item/weapon/pickaxe/borgdrill/D in src.module.modules)
+				for(var/obj/item/weapon/pickaxe/drill/cyborg/D in src.module.modules)
 					qdel(D)
-				src.module.modules += new /obj/item/weapon/pickaxe/diamonddrill(src.module)
+				src.module.modules += new /obj/item/weapon/pickaxe/drill/cyborg/diamond(src.module)
 				src.module.rebuild()
 			if(src.module && istype(src.module, /obj/item/weapon/robot_module/medical))
 				for(var/obj/item/weapon/borg_defib/F in src.module.modules)
 					F.safety = 0
-			updateicon()
+			update_icons()
 		return
 
 /mob/living/silicon/robot/verb/unlock_own_cover()
@@ -882,7 +820,7 @@ var/list/robot_verbs_default = list(
 		switch(alert("You can not lock your cover again, are you sure?\n      (You can still ask for a human to lock it)", "Unlock Own Cover", "Yes", "No"))
 			if("Yes")
 				locked = 0
-				updateicon()
+				update_icons()
 				usr << "You unlock your cover."
 
 /mob/living/silicon/robot/attack_alien(mob/living/carbon/alien/humanoid/M as mob)
@@ -991,7 +929,7 @@ var/list/robot_verbs_default = list(
 			user.put_in_active_hand(cell)
 			user << "You remove \the [cell]."
 			cell = null
-			updateicon()
+			update_icons()
 
 	if(!opened && (!istype(user, /mob/living/silicon)))
 		if (user.a_intent == "help")
@@ -1023,12 +961,10 @@ var/list/robot_verbs_default = list(
 			return 1
 	return 0
 
-/mob/living/silicon/robot/proc/updateicon()
+/mob/living/silicon/robot/update_icons()
 
 	overlays.Cut()
-	if(stat == 0)
-		overlays += "eyes"
-		overlays.Cut()
+	if(stat != DEAD && !(paralysis || stunned || weakened)) //Not dead, not stunned.
 		overlays += "eyes-[icon_state]"
 	else
 		overlays -= "eyes"
@@ -1059,16 +995,16 @@ var/list/robot_verbs_default = list(
 			icon_state = "[base_icon]-roll"
 		else
 			icon_state = base_icon
-		return
-
-/mob/living/silicon/robot/proc/updatefire()
-	return
+			
+	if(jetpackoverlay)
+		overlays += "minerjetpack-[icon_state]"
+	update_fire()
 
 //Call when target overlay should be added/removed
 /mob/living/silicon/robot/update_targeted()
 	if(!targeted_by && target_locked)
 		qdel(target_locked)
-	updateicon()
+	update_icons()
 	if (targeted_by && target_locked)
 		overlays += target_locked
 
@@ -1118,32 +1054,32 @@ var/list/robot_verbs_default = list(
 
 
 /mob/living/silicon/robot/Topic(href, href_list)
-	..()
+	if(..())
+		return 1
 
 	if(usr != src)
-		return
+		return 1
 
 	if (href_list["mach_close"])
 		var/t1 = text("window=[href_list["mach_close"]]")
 		unset_machine()
 		src << browse(null, t1)
-		return
-
-
+		return 1
 
 	if (href_list["showalerts"])
-		robot_alerts()
-		return
+		subsystem_alarm_monitor()
+		return 1
 
 	if (href_list["mod"])
 		var/obj/item/O = locate(href_list["mod"])
 		if (istype(O) && (O.loc == src))
 			O.attack_self(src)
+		return 1
 
 	if (href_list["act"])
 		var/obj/item/O = locate(href_list["act"])
 		if (!istype(O) || !(O.loc == src || O.loc == src.module))
-			return
+			return 1
 
 		activate_module(O)
 		installed_modules()
@@ -1165,6 +1101,7 @@ var/list/robot_verbs_default = list(
 		else
 			src << "Module isn't activated"
 		installed_modules()
+		return 1
 
 	if (href_list["lawc"]) // Toggling whether or not a law gets stated by the State Laws verb --NeoFite
 		var/L = text2num(href_list["lawc"])
@@ -1173,6 +1110,7 @@ var/list/robot_verbs_default = list(
 			if ("No") lawcheck[L+1] = "Yes"
 //		src << text ("Switching Law [L]'s report status to []", lawcheck[L+1])
 		checklaws()
+		return 1
 
 	if (href_list["lawi"]) // Toggling whether or not a law gets stated by the State Laws verb --NeoFite
 		var/L = text2num(href_list["lawi"])
@@ -1181,14 +1119,42 @@ var/list/robot_verbs_default = list(
 			if ("No") ioncheck[L] = "Yes"
 //		src << text ("Switching Law [L]'s report status to []", lawcheck[L+1])
 		checklaws()
+		return 1
 
 	if (href_list["laws"]) // With how my law selection code works, I changed statelaws from a verb to a proc, and call it through my law selection panel. --NeoFite
 		statelaws()
-	return
+		return 1
+	return 1
 
 /mob/living/silicon/robot/proc/radio_menu()
 	radio.interact(src)//Just use the radio's Topic() instead of bullshit special-snowflake code
 
+/mob/living/silicon/robot/proc/control_headlamp()
+	if(stat || lamp_recharging)
+		src << "<span class='danger'>This function is currently offline.</span>"
+		return
+
+//Some sort of magical "modulo" thing which somehow increments lamp power by 2, until it hits the max and resets to 0.
+	lamp_intensity = (lamp_intensity+2) % (lamp_max+2)
+	src << "[lamp_intensity ? "Headlamp power set to Level [lamp_intensity/2]" : "Headlamp disabled."]"
+	update_headlamp()
+
+/mob/living/silicon/robot/proc/update_headlamp(var/turn_off = 0, var/cooldown = 100)
+	set_light(0)
+
+	if(lamp_intensity && (turn_off || stat))
+		src << "<span class='danger'>Your headlamp has been deactivated.</span>"
+		lamp_intensity = 0
+		lamp_recharging = 1
+		spawn(cooldown) //10 seconds by default, if the source of the deactivation does not keep stat that long.
+			lamp_recharging = 0
+	else
+		set_light(light_range + lamp_intensity)
+
+	if(lamp_button)
+		lamp_button.icon_state = "lamp[lamp_intensity]"
+
+	update_icons()	
 
 /mob/living/silicon/robot/Move(a, b, flag)
 
@@ -1309,13 +1275,13 @@ var/list/robot_verbs_default = list(
 		lockcharge = null
 		return
 
-	overlays -= "eyes"
-	updateicon()
+	update_icons()
 
 	if (triesleft >= 1)
 		var/choice = input("Look at your icon - is this what you want?") in list("Yes","No")
 		if(choice=="No")
 			choose_icon(triesleft, module_sprites)
+			return
 		else
 			triesleft = 0
 			return

code/modules/mob/living/silicon/robot/robot_modules.dm

@@ -9,32 +9,29 @@
 	var/list/modules = list()
 	var/obj/item/emag = null
 	var/obj/item/borg/upgrade/jetpack = null
+	var/list/subsystems = list()
+	
 	var/list/stacktypes
 	var/channels = list()
 
 
-	emp_act(severity)
-		if(modules)
-			for(var/obj/O in modules)
-				O.emp_act(severity)
-		if(emag)
-			emag.emp_act(severity)
-		..()
-		return
+/obj/item/weapon/robot_module/emp_act(severity)
+	if(modules)
+		for(var/obj/O in modules)
+			O.emp_act(severity)
+	if(emag)
+		emag.emp_act(severity)
+	..()
+	return
 
 
-	New()
-		src.modules += new /obj/item/device/flashlight(src)
-		src.modules += new /obj/item/device/flash/cyborg(src)
-		src.emag = new /obj/item/toy/sword(src)
-		src.emag.name = "Placeholder Emag Item"
-//		src.jetpack = new /obj/item/toy/sword(src)
-//		src.jetpack.name = "Placeholder Upgrade Item"
-		return
-
+/obj/item/weapon/robot_module/New()
+	src.modules += new /obj/item/device/flashlight(src)
+	src.modules += new /obj/item/device/flash/cyborg(src)
+	src.emag = new /obj/item/toy/sword(src)
+	src.emag.name = "Placeholder Emag Item"
 
 /obj/item/weapon/robot_module/proc/respawn_consumable(var/mob/living/silicon/robot/R)
-
 	if(!stacktypes || !stacktypes.len) return
 
 	var/stack_respawned = 0
@@ -77,13 +74,18 @@
 	R.add_language("Chittin", 0)
 	R.add_language("Bubblish", 0)
 	R.add_language("Clownish",0)
+	
+/obj/item/weapon/robot_module/proc/add_subsystems(var/mob/living/silicon/robot/R)
+	R.verbs |= subsystems
+
+/obj/item/weapon/robot_module/proc/remove_subsystems(var/mob/living/silicon/robot/R)
+	R.verbs -= subsystems
 
 /obj/item/weapon/robot_module/standard
 	name = "standard robot module"
 
 
 	New()
-		src.modules += new /obj/item/device/flashlight(src)
 		src.modules += new /obj/item/device/flash/cyborg(src)
 		src.modules += new /obj/item/weapon/melee/baton/loaded(src)
 		src.modules += new /obj/item/weapon/extinguisher(src)
@@ -95,15 +97,15 @@
 
 /obj/item/weapon/robot_module/medical
 	name = "medical robot module"
+	subsystems = list(/mob/living/silicon/proc/subsystem_crew_monitor)
 	stacktypes = list(
 		/obj/item/stack/medical/advanced/bruise_pack = 5,
 		/obj/item/stack/medical/advanced/ointment = 5,
 		/obj/item/stack/medical/splint = 5,
 		/obj/item/stack/nanopaste = 5
 		)
-
+	
 	New()
-		src.modules += new /obj/item/device/flashlight(src)
 		src.modules += new /obj/item/device/flash/cyborg(src)
 		src.modules += new /obj/item/device/healthanalyzer/advanced(src)
 		src.modules += new /obj/item/device/reagent_scanner/adv(src)
@@ -142,6 +144,7 @@
 
 /obj/item/weapon/robot_module/engineering
 	name = "engineering robot module"
+	subsystems = list(/mob/living/silicon/proc/subsystem_power_monitor)
 
 	stacktypes = list(
 		/obj/item/stack/sheet/metal = 50,
@@ -153,7 +156,6 @@
 		)
 
 	New()
-		src.modules += new /obj/item/device/flashlight(src)
 		src.modules += new /obj/item/device/flash/cyborg(src)
 		src.modules += new /obj/item/borg/sight/meson(src)
 		src.modules += new /obj/item/weapon/rcd/borg(src)
@@ -200,10 +202,10 @@
 
 /obj/item/weapon/robot_module/security
 	name = "security robot module"
+	subsystems = list(/mob/living/silicon/proc/subsystem_crew_monitor)
 
 
 	New()
-		src.modules += new /obj/item/device/flashlight/seclite(src)
 		src.modules += new /obj/item/device/flash/cyborg(src)
 		src.modules += new /obj/item/weapon/restraints/handcuffs/cable/zipties/cyborg(src)
 		src.modules += new /obj/item/weapon/melee/baton/loaded/robot(src)
@@ -219,7 +221,6 @@
 
 
 	New()
-		src.modules += new /obj/item/device/flashlight(src)
 		src.modules += new /obj/item/device/flash/cyborg(src)
 		src.modules += new /obj/item/weapon/soap/nanotrasen(src)
 		src.modules += new /obj/item/weapon/storage/bag/trash/cyborg(src)
@@ -239,7 +240,6 @@
 
 
 	New()
-		src.modules += new /obj/item/device/flashlight(src)
 		src.modules += new /obj/item/device/flash/cyborg(src)
 		src.modules += new /obj/item/weapon/reagent_containers/food/drinks/cans/beer(src)
 		src.modules += new /obj/item/weapon/reagent_containers/food/condiment/enzyme(src)
@@ -309,14 +309,15 @@
 
 
 	New()
-		src.modules += new /obj/item/device/flashlight/lantern(src)
 		src.modules += new /obj/item/device/flash/cyborg(src)
 		src.modules += new /obj/item/borg/sight/meson(src)
 		src.modules += new /obj/item/weapon/wrench(src)
 		src.modules += new /obj/item/weapon/screwdriver(src)
-		src.modules += new /obj/item/weapon/storage/bag/ore(src)
-		src.modules += new /obj/item/weapon/pickaxe/borgdrill(src)
+		src.modules += new /obj/item/device/t_scanner/adv_mining_scanner/cyborg(src)
+		src.modules += new /obj/item/weapon/storage/bag/ore/cyborg(src)
+		src.modules += new /obj/item/weapon/pickaxe/drill/cyborg(src)
 		src.modules += new /obj/item/weapon/storage/bag/sheetsnatcher/borg(src)
+		src.modules += new /obj/item/weapon/gun/energy/kinetic_accelerator/cyborg(src)
 		src.emag = new /obj/item/borg/stun(src)
 		return
 
@@ -325,7 +326,6 @@
 
 /obj/item/weapon/robot_module/deathsquad/New()
 	src.modules += new /obj/item/device/flash/cyborg(src)
-	src.modules += new /obj/item/device/flashlight(src)
 	src.modules += new /obj/item/borg/sight/thermal(src)
 	src.modules += new /obj/item/weapon/melee/energy/sword/cyborg(src)
 	src.modules += new /obj/item/weapon/gun/energy/pulse_rifle/cyborg(src)
@@ -339,7 +339,6 @@
 
 /obj/item/weapon/robot_module/syndicate/New()
 	src.modules += new /obj/item/device/flash/cyborg(src)
-	src.modules += new /obj/item/device/flashlight(src)
 	src.modules += new /obj/item/weapon/melee/energy/sword/cyborg(src)
 	src.modules += new /obj/item/weapon/gun/energy/printer(src)
 	src.modules += new /obj/item/weapon/gun/projectile/revolver/grenadelauncher/multi/cyborg(src)
@@ -354,11 +353,10 @@
 	name = "combat robot module"
 
 	New()
-		src.modules += new /obj/item/device/flashlight(src)
 		src.modules += new /obj/item/device/flash/cyborg(src)
 		src.modules += new /obj/item/borg/sight/thermal(src)
 		src.modules += new /obj/item/weapon/gun/energy/laser/cyborg(src)
-		src.modules += new /obj/item/weapon/pickaxe/plasmacutter(src)
+		src.modules += new /obj/item/weapon/gun/energy/plasmacutter(src)
 		src.modules += new /obj/item/borg/combat/shield(src)
 		src.modules += new /obj/item/borg/combat/mobility(src)
 		src.modules += new /obj/item/weapon/wrench(src) //Is a combat android really going to be stopped by a chair?
@@ -413,8 +411,7 @@
 		src.modules += new /obj/item/weapon/reagent_containers/spray/cleaner/drone(src)
 		src.modules += new /obj/item/weapon/soap(src)
 
-		src.emag = new /obj/item/weapon/pickaxe/plasmacutter(src)
-		src.emag.name = "Plasma Cutter"
+		src.emag = new /obj/item/weapon/pickaxe/drill/cyborg/diamond(src)
 
 		for(var/T in stacktypes)
 			var/obj/item/stack/sheet/W = new T(src)

code/modules/mob/living/silicon/silicon.dm

@@ -17,91 +17,29 @@
 	var/speak_exclamation = "declares"
 	var/speak_query = "queries"
 	var/pose //Yes, now AIs can pose too.
+	
 	var/sensor_mode = 0 //Determines the current HUD.
+	
+	var/next_alarm_notice
+	var/list/datum/alarm/queued_alarms = new()
+	
 	#define SEC_HUD 1 //Security HUD mode
 	#define MED_HUD 2 //Medical HUD mode
 	var/local_transmit //If set, can only speak to others of the same type within a short range.
 	var/obj/item/device/radio/common_radio
-
-/mob/living/silicon/proc/cancelAlarm()
-	return
-
-/mob/living/silicon/proc/triggerAlarm()
-	return
+	
+/mob/living/silicon/New()
+	..()
+	init_subsystems()
+	
+/mob/living/silicon/Destroy()
+	for(var/datum/alarm_handler/AH in alarm_manager.all_handlers)
+		AH.unregister(src)
+	return ..()
 
 /mob/living/silicon/proc/show_laws()
 	return
 
-/mob/living/silicon/proc/queueAlarm(var/message, var/type, var/incoming = 1)
-	var/in_cooldown = (alarms_to_show.len > 0 || alarms_to_clear.len > 0)
-	if(incoming)
-		alarms_to_show += message
-		alarm_types_show[type] += 1
-	else
-		alarms_to_clear += message
-		alarm_types_clear[type] += 1
-
-	if(!in_cooldown)
-		spawn(10 * 10) // 10 seconds
-
-			if(alarms_to_show.len < 5)
-				for(var/msg in alarms_to_show)
-					src << msg
-			else if(alarms_to_show.len)
-
-				var/msg = "--- "
-
-				if(alarm_types_show["Motion"])
-					msg += "MOTION: [alarm_types_show["Motion"]] alarms detected. - "
-
-				if(alarm_types_show["Fire"])
-					msg += "FIRE: [alarm_types_show["Fire"]] alarms detected. - "
-
-				if(alarm_types_show["Atmosphere"])
-					msg += "ATMOSPHERE: [alarm_types_show["Atmosphere"]] alarms detected. - "
-
-				if(alarm_types_show["Power"])
-					msg += "POWER: [alarm_types_show["Power"]] alarms detected. - "
-
-				if(alarm_types_show["Camera"])
-					msg += "CAMERA: [alarm_types_show["Power"]] alarms detected. - "
-
-				msg += "<A href=?src=\ref[src];showalerts=1'>\[Show Alerts\]</a>"
-				src << msg
-
-			if(alarms_to_clear.len < 3)
-				for(var/msg in alarms_to_clear)
-					src << msg
-
-			else if(alarms_to_clear.len)
-				var/msg = "--- "
-
-				if(alarm_types_clear["Motion"])
-					msg += "MOTION: [alarm_types_clear["Motion"]] alarms cleared. - "
-
-				if(alarm_types_clear["Fire"])
-					msg += "FIRE: [alarm_types_clear["Fire"]] alarms cleared. - "
-
-				if(alarm_types_clear["Atmosphere"])
-					msg += "ATMOSPHERE: [alarm_types_clear["Atmosphere"]] alarms cleared. - "
-
-				if(alarm_types_clear["Power"])
-					msg += "POWER: [alarm_types_clear["Power"]] alarms cleared. - "
-
-				if(alarm_types_show["Camera"])
-					msg += "CAMERA: [alarm_types_show["Power"]] alarms detected. - "
-
-				msg += "<A href=?src=\ref[src];showalerts=1'>\[Show Alerts\]</a>"
-				src << msg
-
-
-			alarms_to_show = list()
-			alarms_to_clear = list()
-			for(var/i = 1; i < alarm_types_show.len; i++)
-				alarm_types_show[i] = 0
-			for(var/i = 1; i < alarm_types_clear.len; i++)
-				alarm_types_clear[i] = 0
-
 /mob/living/silicon/drop_item()
 	return
 
@@ -323,4 +261,62 @@
 			src << "Sensor augmentations disabled."
 
 /mob/living/silicon/IsAdvancedToolUser()
-	return 1
+	return 1
+
+/mob/living/silicon/proc/receive_alarm(var/datum/alarm_handler/alarm_handler, var/datum/alarm/alarm, was_raised)
+	if(!next_alarm_notice)
+		next_alarm_notice = world.time + SecondsToTicks(10)
+
+	var/list/alarms = queued_alarms[alarm_handler]
+	if(was_raised)
+		// Raised alarms are always set
+		alarms[alarm] = 1
+	else
+		// Alarms that were raised but then cleared before the next notice are instead removed
+		if(alarm in alarms)
+			alarms -= alarm
+		// And alarms that have only been cleared thus far are set as such
+		else
+			alarms[alarm] = -1
+
+/mob/living/silicon/proc/process_queued_alarms()
+	if(next_alarm_notice && (world.time > next_alarm_notice))
+		next_alarm_notice = 0
+
+		var/alarm_raised = 0
+		for(var/datum/alarm_handler/AH in queued_alarms)
+			var/list/alarms = queued_alarms[AH]
+			var/reported = 0
+			for(var/datum/alarm/A in alarms)
+				if(alarms[A] == 1)
+					if(!reported)
+						reported = 1
+						src << "<span class='warning'>--- [AH.category] Detected ---</span>"
+					raised_alarm(A)
+
+		for(var/datum/alarm_handler/AH in queued_alarms)
+			var/list/alarms = queued_alarms[AH]
+			var/reported = 0
+			for(var/datum/alarm/A in alarms)
+				if(alarms[A] == -1)
+					if(!reported)
+						reported = 1
+						src << "<span class='notice'>--- [AH.category] Cleared ---</span>"
+					src << "\The [A.alarm_name()]."
+					
+		if(alarm_raised)
+			src << "<A HREF=?src=\ref[src];showalerts=1>\[Show Alerts\]</A>"
+
+		for(var/datum/alarm_handler/AH in queued_alarms)
+			var/list/alarms = queued_alarms[AH]
+			alarms.Cut()
+
+/mob/living/silicon/proc/raised_alarm(var/datum/alarm/A)
+	src << "[A.alarm_name()]!"
+
+/mob/living/silicon/ai/raised_alarm(var/datum/alarm/A)
+	var/cameratext = ""
+	for(var/obj/machinery/camera/C in A.cameras())
+		cameratext += "[(cameratext == "")? "" : "|"]<A HREF=?src=\ref[src];switchcamera=\ref[C]>[C.c_tag]</A>"
+	src << "[A.alarm_name()]! ([(cameratext)? cameratext : "No Camera"])"
+	

code/modules/mob/living/silicon/subsystems.dm

@@ -0,0 +1,79 @@
+/mob/living/silicon
+	var/register_alarms = 1
+	var/datum/nano_module/alarm_monitor/all/alarm_monitor
+	var/datum/nano_module/atmos_control/atmos_control
+	var/datum/nano_module/crew_monitor/crew_monitor
+	var/datum/nano_module/power_monitor/silicon/power_monitor
+
+/mob/living/silicon
+	var/list/silicon_subsystems = list(
+		/mob/living/silicon/proc/subsystem_alarm_monitor
+	)
+
+/mob/living/silicon/ai
+	silicon_subsystems = list(
+		/mob/living/silicon/proc/subsystem_alarm_monitor,
+		/mob/living/silicon/proc/subsystem_atmos_control,
+		/mob/living/silicon/proc/subsystem_crew_monitor,
+		/mob/living/silicon/proc/subsystem_power_monitor
+	)
+	
+/mob/living/silicon/robot/drone
+	silicon_subsystems = list(
+		/mob/living/silicon/proc/subsystem_alarm_monitor,
+		/mob/living/silicon/proc/subsystem_power_monitor
+	)
+
+/mob/living/silicon/robot/syndicate
+	register_alarms = 0
+
+/mob/living/silicon/proc/init_subsystems()
+	alarm_monitor 	= new(src)
+	atmos_control 	= new(src)
+	crew_monitor 	= new(src)
+	power_monitor	= new(src)
+
+	if(!register_alarms)
+		return
+
+	var/list/register_to = list(atmosphere_alarm, camera_alarm, fire_alarm, motion_alarm, power_alarm)
+	for(var/datum/alarm_handler/AH in register_to)
+		AH.register(src, /mob/living/silicon/proc/receive_alarm)
+		queued_alarms[AH] = list()	// Makes sure alarms remain listed in consistent order
+
+/********************
+*	Alarm Monitor	*
+********************/
+/mob/living/silicon/proc/subsystem_alarm_monitor()
+	set name = "Alarm Monitor"
+	set category = "Subsystems"
+
+	alarm_monitor.ui_interact(usr, state = self_state)
+	
+/********************
+*	Atmos Control	*
+********************/
+/mob/living/silicon/proc/subsystem_atmos_control()
+	set category = "Subsystems"
+	set name = "Atmospherics Control"
+
+	atmos_control.ui_interact(usr, state = self_state)
+
+/********************
+*	Crew Monitor	*
+********************/
+/mob/living/silicon/proc/subsystem_crew_monitor()
+	set category = "Subsystems"
+	set name = "Crew Monitor"
+
+	crew_monitor.ui_interact(usr, state = self_state)
+	
+/********************
+*	Power Monitor	*
+********************/
+/mob/living/silicon/proc/subsystem_power_monitor()
+	set category = "Subsystems"
+	set name = "Power Monitor"
+
+	power_monitor.ui_interact(usr, state = self_state)
+

code/modules/mob/living/simple_animal/borer.dm

@@ -243,7 +243,7 @@
 
 /mob/living/simple_animal/borer/verb/secrete_chemicals()
 	set category = "Alien"
-	set name = "Secrete Chemicals (50)"
+	set name = "Secrete Chemicals (30)"
 	set desc = "Push some chemicals into your host's bloodstream."
 
 	if(!host)
@@ -257,17 +257,17 @@
 		src << "\blue You are feeling far too docile to do that."
 		return
 
-	if(chemicals < 50)
+	if(chemicals < 30)
 		src << "You don't have enough chemicals!"
 
 	var/chem = input("Select a chemical to secrete.", "Chemicals") as null|anything in list("mannitol","styptic_powder","methamphetamine","sal_acid")
 
-	if(!chem || chemicals < 50 || !host || controlling || !src || stat) //Sanity check.
+	if(!chem || chemicals < 30 || !host || controlling || !src || stat) //Sanity check.
 		return
 
 	src << "\red <B>You squirt a measure of [chem] from your reservoirs into [host]'s bloodstream.</B>"
-	host.reagents.add_reagent(chem, 15)
-	chemicals -= 50
+	host.reagents.add_reagent(chem, 9)
+	chemicals -= 30
 
 /mob/living/simple_animal/borer/verb/release_host()
 	set category = "Alien"

code/modules/mob/living/simple_animal/friendly/butterfly.dm

@@ -8,7 +8,7 @@
 	emote_see = list("flutters")
 	response_help = "shoos"
 	response_disarm = "brushes aside"
-	response_harm = "aquashes"
+	response_harm = "squashes"
 	speak_chance = 0
 	maxHealth = 2
 	health = 2
@@ -20,4 +20,4 @@
 
 /mob/living/simple_animal/butterfly/New()
 	..()
-	color = rgb(rand(0, 255), rand(0, 255), rand(0, 255))
+	color = rgb(rand(0, 255), rand(0, 255), rand(0, 255))

code/modules/mob/living/simple_animal/hostile/mining_mobs.dm

@@ -80,7 +80,6 @@
 	aggro_vision_range = 9
 	idle_vision_range = 2
 	turns_per_move = 5
-	var/droppeddiamond = 0 // Safety check to prevent diamond duplication bug
 
 /obj/item/projectile/temp/basilisk
 	name = "freezing blast"
@@ -113,12 +112,11 @@
 			adjustBruteLoss(110)
 
 /mob/living/simple_animal/hostile/asteroid/basilisk/Die()
-	if(!droppeddiamond)
+	if(stat != DEAD)
 		var/counter
 		for(counter=0, counter<2, counter++)
 			var/obj/item/weapon/ore/diamond/D = new /obj/item/weapon/ore/diamond(src.loc)
 			D.layer = 4.1
-		droppeddiamond = 1
 	..()
 
 /mob/living/simple_animal/hostile/asteroid/goldgrub
@@ -264,8 +262,8 @@
 	OpenFire()
 
 /mob/living/simple_animal/hostile/asteroid/hivelord/Die()
-	new /obj/item/asteroid/hivelord_core(src.loc)
-	mouse_opacity = 1
+	if(stat != DEAD)
+		new /obj/item/asteroid/hivelord_core(src.loc)
 	..()
 
 /obj/item/asteroid/hivelord_core
@@ -354,7 +352,7 @@
 	speed = 3
 	maxHealth = 300
 	health = 300
-	harm_intent_damage = 0
+	harm_intent_damage = 1 //Only the manliest of men can kill a Goliath with only their fists.
 	melee_damage_lower = 25
 	melee_damage_upper = 25
 	attacktext = "pulverizes"
@@ -382,6 +380,9 @@
 
 /mob/living/simple_animal/hostile/asteroid/goliath/Die()
 	anchored = 0
+	if(stat != DEAD)
+		var/obj/item/asteroid/goliath_hide/G = new /obj/item/asteroid/goliath_hide(src.loc)
+		G.layer = 4.1
 	..()
 
 /mob/living/simple_animal/hostile/asteroid/goliath/OpenFire()
@@ -416,7 +417,7 @@
 	var/turftype = get_turf(src)
 	if(istype(turftype, /turf/simulated/mineral))
 		var/turf/simulated/mineral/M = turftype
-		M.GetDrilled()
+		M.gets_drilled()
 	spawn(20)
 		Trip()
 
@@ -441,18 +442,14 @@
 		M.Stun(5)
 		M.adjustBruteLoss(rand(10,15))
 		latched = 1
-		visible_message("<span class='danger'>The [src.name] grabs hold of [M.name]!</span>")
+		if(src && M)
+			visible_message("<span class='danger'>The [src.name] grabs hold of [M.name]!</span>")
 	if(!latched)
 		qdel(src)
 	else
 		spawn(50)
 			qdel(src)
 
-/mob/living/simple_animal/hostile/asteroid/goliath/Die()
-	var/obj/item/asteroid/goliath_hide/G = new /obj/item/asteroid/goliath_hide(src.loc)
-	G.layer = 4.1
-	..()
-
 /obj/item/asteroid/goliath_hide
 	name = "goliath hide plates"
 	desc = "Pieces of a goliath's rocky hide, these might be able to make your suit a bit more durable to attack from the local fauna."
@@ -464,7 +461,7 @@
 
 /obj/item/asteroid/goliath_hide/afterattack(atom/target, mob/user, proximity_flag)
 	if(proximity_flag)
-		if(istype(target, /obj/item/clothing/suit/space/rig/mining) || istype(target, /obj/item/clothing/head/helmet/space/rig/mining))
+		if(istype(target, /obj/item/clothing/suit/space/rig/mining) || istype(target, /obj/item/clothing/head/helmet/space/rig/mining) || istype(target, /obj/item/clothing/suit/space/eva/plasmaman/miner) || istype(target, /obj/item/clothing/head/helmet/space/eva/plasmaman/miner))
 			var/obj/item/clothing/C = target
 			var/current_armor = C.armor
 			if(current_armor.["melee"] < 80)

code/modules/mob/living/simple_animal/revenant/revenant.dm

@@ -43,7 +43,7 @@
 			strikes--
 			src << "<span class='boldannounce'>Your essence has dropped below critical levels. You barely manage to save yourself - [strikes ? "you can't keep this up!" : "next time, it's death."]</span>"
 		else if(strikes <= 0)
-			death()
+			Die()
 	maxHealth = essence * 2
 	if(!revealed)
 		health = maxHealth //Heals to full when not revealed
@@ -123,10 +123,10 @@
 		return 1
 	return 0
 
-/mob/living/simple_animal/revenant/death()
+/mob/living/simple_animal/revenant/Die()
 	if(strikes)
 		return 0 //Impossible to die with strikes still active
-	..(1)
+	..()
 	src << "<span class='userdanger'><b>NO! No... it's too late, you can feel yourself fading...</b></span>"
 	notransform = 1
 	revealed = 1

code/modules/mob/mob_helpers.dm

@@ -498,4 +498,19 @@ var/list/intents = list("help","disarm","grab","harm")
 		if(O.client)
 			O << "<span class='ghostalert'>[message]<span>"
 			if(ghost_sound)
-				O << sound(ghost_sound)
+				O << sound(ghost_sound)
+				
+/mob/proc/switch_to_camera(var/obj/machinery/camera/C)
+	if (!C.can_use() || stat || (get_dist(C, src) > 1 || machine != src || blinded || !canmove))
+		return 0
+	check_eye(src)
+	return 1
+
+/mob/living/silicon/ai/switch_to_camera(var/obj/machinery/camera/C)
+	if(!C.can_use() || !is_in_chassis())
+		return 0
+
+	eyeobj.setLoc(get_turf(C))
+	client.eye = eyeobj
+	return 1
+