resolve conflicts

code/modules/mob/dead/observer/observer.dm

@@ -23,7 +23,6 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_OBSERVER)
 							//If you died in the game and are a ghsot - this will remain as null.
 							//Note that this is not a reliable way to determine if admins started as observers, since they change mobs a lot.
 	universal_speak = TRUE
-	var/atom/movable/following = null
 	var/image/ghostimage = null //this mobs ghost image, for deleting and stuff
 	var/ghostvision = TRUE //is the ghost able to see things humans can't?
 	var/seedarkness = TRUE
@@ -230,7 +229,6 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 
 /mob/dead/observer/Move(NewLoc, direct)
 	update_parallax_contents()
-	following = null
 	setDir(direct)
 	ghostimage.setDir(dir)
 
@@ -412,7 +410,6 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 
 	forceMove(pick(L))
 	update_parallax_contents()
-	following = null
 
 /mob/dead/observer/verb/follow()
 	set category = "Ghost"
@@ -424,7 +421,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 	A.on_close(CALLBACK(src, .proc/ManualFollow))
 
 // This is the ghost's follow verb with an argument
-/mob/dead/observer/proc/ManualFollow(var/atom/movable/target)
+/mob/dead/observer/proc/ManualFollow(atom/movable/target)
 	if(!target || !isobserver(usr))
 		return
 
@@ -432,7 +429,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 		return
 
 	if(target != src)
-		if(following && following == target)
+		if(orbiting && orbiting == target)
 			return
 
 		var/icon/I = icon(target.icon,target.icon_state,target.dir)
@@ -458,7 +455,6 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 			else //Circular
 				rot_seg = 36 //360/10 bby, smooth enough aproximation of a circle
 
-		following = target
 		to_chat(src, "<span class='notice'>Now following [target]</span>")
 		orbit(target,orbitsize, FALSE, 20, rot_seg)
 
@@ -485,7 +481,6 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 	if(T && isturf(T))	//Make sure the turf exists, then move the source to that destination.
 		A.forceMove(T)
 		M.update_parallax_contents()
-		following = null
 		return
 	to_chat(A, "This mob is not located in the game world.")
 
@@ -642,7 +637,6 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 					if(!client)
 						return
 					forceMove(T)
-				following = null
 
 	if(href_list["reenter"])
 		reenter_corpse()

code/modules/mob/language.dm

@@ -33,7 +33,7 @@
 
 	for(var/i = 0;i<name_count;i++)
 		new_name = ""
-		for(var/x = rand(Floor(syllable_count/2),syllable_count);x>0;x--)
+		for(var/x = rand(FLOOR(syllable_count/2, 1),syllable_count);x>0;x--)
 			new_name += pick(syllables)
 		full_name += " [capitalize(lowertext(new_name))]"
 

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

@@ -2,6 +2,7 @@
 	name = "alien"
 	voice_name = "alien"
 	speak_emote = list("hisses")
+	bubble_icon = "alien"
 	icon = 'icons/mob/alien.dmi'
 	gender = NEUTER
 	dna = null
@@ -226,7 +227,7 @@ Des: Removes all infected images from the alien.
 
 /mob/living/carbon/alien/handle_footstep(turf/T)
 	if(..())
-		if(T.footstep_sounds["xeno"])
+		if(T.footstep_sounds && T.footstep_sounds["xeno"])
 			var/S = pick(T.footstep_sounds["xeno"])
 			if(S)
 				if(m_intent == MOVE_INTENT_RUN)

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

@@ -6,6 +6,7 @@
 	icon_state = "alienq_s"
 	status_flags = CANPARALYSE
 	mob_size = MOB_SIZE_LARGE
+	bubble_icon = "alienroyal"
 	large = 1
 	ventcrawler = 0
 

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

@@ -139,10 +139,18 @@
 													//WHO THE FUCK THOUGHT THAT WAS A GOOD FUCKING IDEA!?!?
 
 		if("howl", "howls")
-			var/M = handle_emote_param(param) //Check to see if the param is valid (mob with the param name is in view).
-			message = "<B>[src]</B> howls[M ? " at [M]" : ""]!"
-			playsound(loc, 'sound/goonstation/voice/howl.ogg', 100, 1, 10, frequency = get_age_pitch())
-			m_type = 2
+			var/M = handle_emote_param(param)
+			if(miming)
+				message = "<B>[src]</B> acts out a howl[M ? " at [M]" : ""]!"
+				m_type = 1
+			else
+				if(!muzzled)
+					message = "<B>[src]</B> howls[M ? " at [M]" : ""]!"
+					playsound(loc, 'sound/goonstation/voice/howl.ogg', 100, 1, 10, frequency = get_age_pitch())
+					m_type = 2
+				else
+					message = "<B>[src]</B> makes a very loud noise[M ? " at [M]" : ""]."
+					m_type = 2
 
 		if("growl", "growls")
 			var/M = handle_emote_param(param)

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

@@ -30,7 +30,7 @@
 			if(dna.species && amount > 0)
 				if(use_brain_mod)
 					amount = amount * dna.species.brain_mod
-			sponge.damage = Clamp(sponge.damage + amount, 0, 120)
+			sponge.damage = clamp(sponge.damage + amount, 0, 120)
 			if(sponge.damage >= 120)
 				visible_message("<span class='alert'><B>[src]</B> goes limp, [p_their()] facial expression utterly blank.</span>")
 				death()
@@ -48,7 +48,7 @@
 			if(dna.species && amount > 0)
 				if(use_brain_mod)
 					amount = amount * dna.species.brain_mod
-			sponge.damage = Clamp(amount, 0, 120)
+			sponge.damage = clamp(amount, 0, 120)
 			if(sponge.damage >= 120)
 				visible_message("<span class='alert'><B>[src]</B> goes limp, [p_their()] facial expression utterly blank.</span>")
 				death()

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

@@ -134,7 +134,7 @@ emp_act
 		if(bp && istype(bp ,/obj/item/clothing))
 			var/obj/item/clothing/C = bp
 			if(C.body_parts_covered & def_zone.body_part)
-				protection += C.armor[type]
+				protection += C.armor.getRating(type)
 
 	return protection
 
@@ -185,19 +185,19 @@ emp_act
 	var/block_chance_modifier = round(damage / -3)
 
 	if(l_hand && !istype(l_hand, /obj/item/clothing))
-		var/final_block_chance = l_hand.block_chance - (Clamp((armour_penetration-l_hand.armour_penetration)/2,0,100)) + block_chance_modifier //So armour piercing blades can still be parried by other blades, for example
+		var/final_block_chance = l_hand.block_chance - (clamp((armour_penetration-l_hand.armour_penetration)/2,0,100)) + block_chance_modifier //So armour piercing blades can still be parried by other blades, for example
 		if(l_hand.hit_reaction(src, AM, attack_text, final_block_chance, damage, attack_type))
 			return 1
 	if(r_hand && !istype(r_hand, /obj/item/clothing))
-		var/final_block_chance = r_hand.block_chance - (Clamp((armour_penetration-r_hand.armour_penetration)/2,0,100)) + block_chance_modifier //Need to reset the var so it doesn't carry over modifications between attempts
+		var/final_block_chance = r_hand.block_chance - (clamp((armour_penetration-r_hand.armour_penetration)/2,0,100)) + block_chance_modifier //Need to reset the var so it doesn't carry over modifications between attempts
 		if(r_hand.hit_reaction(src, AM, attack_text, final_block_chance, damage, attack_type))
 			return 1
 	if(wear_suit)
-		var/final_block_chance = wear_suit.block_chance - (Clamp((armour_penetration-wear_suit.armour_penetration)/2,0,100)) + block_chance_modifier
+		var/final_block_chance = wear_suit.block_chance - (clamp((armour_penetration-wear_suit.armour_penetration)/2,0,100)) + block_chance_modifier
 		if(wear_suit.hit_reaction(src, AM, attack_text, final_block_chance, damage, attack_type))
 			return 1
 	if(w_uniform)
-		var/final_block_chance = w_uniform.block_chance - (Clamp((armour_penetration-w_uniform.armour_penetration)/2,0,100)) + block_chance_modifier
+		var/final_block_chance = w_uniform.block_chance - (clamp((armour_penetration-w_uniform.armour_penetration)/2,0,100)) + block_chance_modifier
 		if(w_uniform.hit_reaction(src, AM, attack_text, final_block_chance, damage, attack_type))
 			return 1
 	return 0

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

@@ -81,7 +81,7 @@
 
 /mob/living/carbon/human/handle_footstep(turf/T)
 	if(..())
-		if(T.footstep_sounds["human"])
+		if(T.footstep_sounds && T.footstep_sounds["human"])
 			var/S = pick(T.footstep_sounds["human"])
 			if(S)
 				if(m_intent == MOVE_INTENT_RUN)

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

@@ -197,7 +197,7 @@
 
 	if(!(RADIMMUNE in dna.species.species_traits))
 		if(radiation)
-			radiation = Clamp(radiation, 0, 200)
+			radiation = clamp(radiation, 0, 200)
 
 			var/autopsy_damage = 0
 			switch(radiation)

code/modules/mob/living/carbon/life.dm

@@ -162,7 +162,7 @@
 	//TOXINS/PLASMA
 	if(Toxins_partialpressure > safe_tox_max)
 		var/ratio = (breath.toxins/safe_tox_max) * 10
-		adjustToxLoss(Clamp(ratio, MIN_TOXIC_GAS_DAMAGE, MAX_TOXIC_GAS_DAMAGE))
+		adjustToxLoss(clamp(ratio, MIN_TOXIC_GAS_DAMAGE, MAX_TOXIC_GAS_DAMAGE))
 		throw_alert("too_much_tox", /obj/screen/alert/too_much_tox)
 	else
 		clear_alert("too_much_tox")
@@ -243,7 +243,7 @@
 				adjustToxLoss(3)
 				updatehealth("handle mutations and radiation(75-100)")
 
-		radiation = Clamp(radiation, 0, 100)
+		radiation = clamp(radiation, 0, 100)
 
 
 /mob/living/carbon/handle_chemicals_in_body()

code/modules/mob/living/living_defense.dm

@@ -79,9 +79,9 @@
 
 /obj/item/proc/get_volume_by_throwforce_and_or_w_class()
 	if(throwforce && w_class)
-		return Clamp((throwforce + w_class) * 5, 30, 100)// Add the item's throwforce to its weight class and multiply by 5, then clamp the value between 30 and 100
+		return clamp((throwforce + w_class) * 5, 30, 100)// Add the item's throwforce to its weight class and multiply by 5, then clamp the value between 30 and 100
 	else if(w_class)
-		return Clamp(w_class * 8, 20, 100) // Multiply the item's weight class by 8, then clamp the value between 20 and 100
+		return clamp(w_class * 8, 20, 100) // Multiply the item's weight class by 8, then clamp the value between 20 and 100
 	else
 		return 0
 
@@ -175,7 +175,7 @@
 	return
 
 /mob/living/proc/adjust_fire_stacks(add_fire_stacks) //Adjusting the amount of fire_stacks we have on person
-	fire_stacks = Clamp(fire_stacks + add_fire_stacks, -20, 20)
+	fire_stacks = clamp(fire_stacks + add_fire_stacks, -20, 20)
 	if(on_fire && fire_stacks <= 0)
 		ExtinguishMob()
 
@@ -260,8 +260,6 @@
 	add_attack_logs(user, src, "Grabbed passively", ATKLOG_ALL)
 
 	var/obj/item/grab/G = new /obj/item/grab(user, src)
-	if(buckled)
-		to_chat(user, "<span class='notice'>You cannot grab [src]; [p_they()] [p_are()] buckled in!</span>")
 	if(!G)	//the grab will delete itself in New if src is anchored
 		return 0
 	user.put_in_active_hand(G)

code/modules/mob/living/say.dm

@@ -269,12 +269,12 @@ proc/get_radio_key_from_channel(var/channel)
 		M.hear_say(message_pieces, verb, italics, src, speech_sound, sound_vol, sound_frequency)
 		if(M.client)
 			speech_bubble_recipients.Add(M.client)
-	spawn(0)
-		if(loc && !isturf(loc))
-			var/atom/A = loc //Non-turf, let it handle the speech bubble
-			A.speech_bubble("hR[speech_bubble_test]", A, speech_bubble_recipients)
-		else //Turf, leave speech bubbles to the mob
-			speech_bubble("h[speech_bubble_test]", src, speech_bubble_recipients)
+
+	if(loc && !isturf(loc))
+		var/atom/A = loc //Non-turf, let it handle the speech bubble
+		A.speech_bubble("[A.bubble_icon][speech_bubble_test]", A, speech_bubble_recipients)
+	else //Turf, leave speech bubbles to the mob
+		speech_bubble("[bubble_icon][speech_bubble_test]", src, speech_bubble_recipients)
 
 	for(var/obj/O in listening_obj)
 		spawn(0)
@@ -462,10 +462,7 @@ proc/get_radio_key_from_channel(var/channel)
 			if(M.client)
 				speech_bubble_recipients.Add(M.client)
 
-	spawn(0)
-		var/image/I = image('icons/mob/talk.dmi', src, "h[speech_bubble_test]", MOB_LAYER + 1)
-		I.appearance_flags = APPEARANCE_UI_IGNORE_ALPHA
-		flick_overlay(I, speech_bubble_recipients, 30)
+	speech_bubble("[bubble_icon][speech_bubble_test]", src, speech_bubble_recipients)
 
 	if(watching.len)
 		var/rendered = "<span class='game say'><span class='name'>[name]</span> [not_heard].</span>"
@@ -474,7 +471,7 @@ proc/get_radio_key_from_channel(var/channel)
 
 	return 1
 
-/mob/living/speech_bubble(var/bubble_state = "",var/bubble_loc = src, var/list/bubble_recipients = list())
-	var/image/I = image('icons/mob/talk.dmi', bubble_loc, bubble_state, MOB_LAYER + 1)
+/mob/living/speech_bubble(bubble_state = "", bubble_loc = src, list/bubble_recipients = list())
+	var/image/I = image('icons/mob/talk.dmi', bubble_loc, bubble_state, FLY_LAYER)
 	I.appearance_flags = APPEARANCE_UI_IGNORE_ALPHA
-	flick_overlay(I, bubble_recipients, 30)
+	INVOKE_ASYNC(GLOBAL_PROC, /.proc/flick_overlay, I, bubble_recipients, 30)

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

@@ -6,6 +6,7 @@
 	icon_state = "repairbot"
 	maxHealth = 35
 	health = 35
+	bubble_icon = "machine"
 	universal_speak = 0
 	universal_understand = 1
 	gender = NEUTER

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

@@ -64,7 +64,7 @@
 	..()
 	can_hold = typecacheof(can_hold)
 
-/obj/item/gripper/verb/drop_item()
+/obj/item/gripper/verb/drop_item_gripped()
 	set name = "Drop Gripped Item"
 	set desc = "Release an item from your magnetic gripper."
 	set category = "Drone"

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

@@ -36,7 +36,7 @@
 	if(is_component_functioning("power cell") && cell.charge)
 		if(cell.charge <= 100)
 			uneq_all()
-		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.
+		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
 	else
 		uneq_all()

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

@@ -9,6 +9,7 @@ GLOBAL_LIST_INIT(robot_verbs_default, list(
 	icon_state = "robot"
 	maxHealth = 100
 	health = 100
+	bubble_icon = "robot"
 	universal_understand = 1
 	deathgasp_on_death = TRUE
 
@@ -16,8 +17,7 @@ GLOBAL_LIST_INIT(robot_verbs_default, list(
 	var/custom_name = ""
 	var/custom_sprite = 0 //Due to all the sprites involved, a var for our custom borgs may be best
 
-//Hud stuff
-
+	//Hud stuff
 	var/obj/screen/inv1 = null
 	var/obj/screen/inv2 = null
 	var/obj/screen/inv3 = null
@@ -27,7 +27,7 @@ GLOBAL_LIST_INIT(robot_verbs_default, list(
 	var/shown_robot_modules = 0	//Used to determine whether they have the module menu shown or not
 	var/obj/screen/robot_modules_background
 
-//3 Modules can be activated at any one time.
+	//3 Modules can be activated at any one time.
 	var/obj/item/robot_module/module = null
 	var/module_active = null
 	var/module_state_1 = null
@@ -57,6 +57,9 @@ GLOBAL_LIST_INIT(robot_verbs_default, list(
 	var/is_emaggable = TRUE
 	var/eye_protection = 0
 	var/ear_protection = 0
+	var/damage_protection = 0
+	var/emp_protection = FALSE
+	var/xeno_disarm_chance = 85
 
 	var/list/force_modules = list()
 	var/allow_rename = TRUE
@@ -86,7 +89,6 @@ GLOBAL_LIST_INIT(robot_verbs_default, list(
 	var/tracking_entities = 0 //The number of known entities currently accessing the internal camera
 	var/braintype = "Cyborg"
 	var/base_icon = ""
-	var/crisis = 0
 	var/modules_break = TRUE
 
 	var/lamp_max = 10 //Maximum brightness of a borg lamp. Set as a var for easy adjusting.
@@ -97,6 +99,7 @@ GLOBAL_LIST_INIT(robot_verbs_default, list(
 
 	hud_possible = list(SPECIALROLE_HUD, DIAG_STAT_HUD, DIAG_HUD, DIAG_BATT_HUD)
 
+	var/default_cell_type = /obj/item/stock_parts/cell/high
 	var/magpulse = 0
 	var/ionpulse = 0 // Jetpack-like effect.
 	var/ionpulse_on = 0 // Jetpack-like effect.
@@ -132,7 +135,7 @@ GLOBAL_LIST_INIT(robot_verbs_default, list(
 
 	init()
 
-	if(!scrambledcodes && !camera)
+	if(!camera && (!scrambledcodes || designation == "ERT"))
 		camera = new /obj/machinery/camera(src)
 		camera.c_tag = real_name
 		camera.network = list("SS13","Robots")
@@ -144,7 +147,7 @@ GLOBAL_LIST_INIT(robot_verbs_default, list(
 		mmi.icon_state = "boris"
 
 	if(!cell) // Make sure a new cell gets created *before* executing initialize_components(). The cell component needs an existing cell for it to get set up properly
-		cell = new /obj/item/stock_parts/cell/high(src)
+		cell = new default_cell_type(src)
 
 	initialize_components()
 	//if(!unfinished)
@@ -288,12 +291,9 @@ GLOBAL_LIST_INIT(robot_verbs_default, list(
 /mob/living/silicon/robot/proc/pick_module()
 	if(module)
 		return
-	var/list/modules = list("Standard", "Engineering", "Medical", "Miner", "Janitor", "Service", "Security")
+	var/list/modules = list("Generalist", "Engineering", "Medical", "Miner", "Janitor", "Service", "Security")
 	if(islist(force_modules) && force_modules.len)
 		modules = force_modules.Copy()
-	if(GLOB.security_level == (SEC_LEVEL_GAMMA || SEC_LEVEL_EPSILON) || crisis)
-		to_chat(src, "<span class='warning'>Crisis mode active. The combat module is now available.</span>")
-		modules += "Combat"
 	if(mmi != null && mmi.alien)
 		modules = list("Hunter")
 	modtype = input("Please, select a module!", "Robot", null, null) as null|anything in modules
@@ -306,9 +306,9 @@ GLOBAL_LIST_INIT(robot_verbs_default, list(
 		return
 
 	switch(modtype)
-		if("Standard")
+		if("Generalist")
 			module = new /obj/item/robot_module/standard(src)
-			module.channels = list("Service" = 1)
+			module.channels = list("Engineering" = 1, "Medical" = 1, "Security" = 1, "Service" = 1)
 			module_sprites["Basic"] = "robot_old"
 			module_sprites["Android"] = "droid"
 			module_sprites["Default"] = "Standard"
@@ -337,6 +337,7 @@ GLOBAL_LIST_INIT(robot_verbs_default, list(
 			module_sprites["Standard"] = "Standard-Mine"
 			module_sprites["Noble-DIG"] = "Noble-DIG"
 			module_sprites["Cricket"] = "Cricket-MINE"
+			module_sprites["Lavaland"] = "lavaland"
 
 		if("Medical")
 			module = new /obj/item/robot_module/medical(src)
@@ -353,6 +354,17 @@ GLOBAL_LIST_INIT(robot_verbs_default, list(
 			status_flags &= ~CANPUSH
 
 		if("Security")
+			if(!weapons_unlock)
+				var/count_secborgs = 0
+				for(var/mob/living/silicon/robot/R in GLOB.alive_mob_list)
+					if(R && R.stat != DEAD && R.module && istype(R.module, /obj/item/robot_module/security))
+						count_secborgs++
+				var/max_secborgs = 2
+				if(GLOB.security_level == SEC_LEVEL_GREEN)
+					max_secborgs = 1
+				if(count_secborgs >= max_secborgs)
+					to_chat(src, "<span class='warning'>There are too many Security cyborgs active. Please choose another module.</span>")
+					return
 			module = new /obj/item/robot_module/security(src)
 			module.channels = list("Security" = 1)
 			module_sprites["Basic"] = "secborg"
@@ -387,10 +399,16 @@ GLOBAL_LIST_INIT(robot_verbs_default, list(
 			module_sprites["Noble-CLN"] = "Noble-CLN"
 			module_sprites["Cricket"] = "Cricket-JANI"
 
-		if("Combat")
-			module = new /obj/item/robot_module/combat(src)
+		if("Destroyer") // Rolling Borg
+			module = new /obj/item/robot_module/destroyer(src)
 			module.channels = list("Security" = 1)
 			icon_state =  "droidcombat"
+			status_flags &= ~CANPUSH
+
+		if("Combat") // Gamma ERT
+			module = new /obj/item/robot_module/combat(src)
+			icon_state = "ertgamma"
+			status_flags &= ~CANPUSH
 
 		if("Hunter")
 			module = new /obj/item/robot_module/alien/hunter(src)
@@ -442,6 +460,8 @@ GLOBAL_LIST_INIT(robot_verbs_default, list(
 	ionpulse = FALSE
 	magpulse = FALSE
 	add_language("Robot Talk", 1)
+	if("lava" in weather_immunities) // Remove the lava-immunity effect given by a printable upgrade
+		weather_immunities -= "lava"
 
 	status_flags |= CANPUSH
 
@@ -916,7 +936,6 @@ GLOBAL_LIST_INIT(robot_verbs_default, list(
 	return 0
 
 /mob/living/silicon/robot/update_icons()
-
 	overlays.Cut()
 	if(stat != DEAD && !(paralysis || stunned || IsWeakened() || low_power_mode)) //Not dead, not stunned.
 		if(custom_panel in custom_eye_names)
@@ -925,36 +944,24 @@ GLOBAL_LIST_INIT(robot_verbs_default, list(
 			overlays += "eyes-[icon_state]"
 	else
 		overlays -= "eyes"
-
 	if(opened)
 		var/panelprefix = "ov"
 		if(custom_sprite) //Custom borgs also have custom panels, heh
 			panelprefix = "[ckey]"
-
 		if(custom_panel in custom_panel_names) //For default borgs with different panels
 			panelprefix = custom_panel
-
 		if(wiresexposed)
 			overlays += "[panelprefix]-openpanel +w"
 		else if(cell)
 			overlays += "[panelprefix]-openpanel +c"
 		else
 			overlays += "[panelprefix]-openpanel -c"
-
-	var/combat = list("Combat")
-	if(modtype in combat)
-		if(base_icon == "")
-			base_icon = icon_state
-		if(module_active && istype(module_active,/obj/item/borg/combat/mobility))
-			icon_state = "[base_icon]-roll"
-		else
-			icon_state = base_icon
-		if(module)
-			for(var/obj/item/borg/combat/shield/S in module.modules)
-				if(activated(S))
-					overlays += "[base_icon]-shield"
+	borg_icons()
 	update_fire()
 
+/mob/living/silicon/robot/proc/borg_icons() // Exists so that robot/destroyer can override it
+	return
+
 /mob/living/silicon/robot/proc/installed_modules()
 	if(weapon_lock)
 		to_chat(src, "<span class='warning'>Weapon lock active, unable to use modules! Count:[weaponlock_time]</span>")
@@ -1309,6 +1316,16 @@ GLOBAL_LIST_INIT(robot_verbs_default, list(
 	..()
 	update_module_icon()
 
+/mob/living/silicon/robot/emp_act(severity)
+	if(emp_protection)
+		return
+	..()
+	switch(severity)
+		if(1)
+			disable_component("comms", 160)
+		if(2)
+			disable_component("comms", 60)
+
 /mob/living/silicon/robot/deathsquad
 	base_icon = "nano_bloodhound"
 	icon_state = "nano_bloodhound"
@@ -1321,44 +1338,29 @@ GLOBAL_LIST_INIT(robot_verbs_default, list(
 	pdahide = 1
 	eye_protection = 2 // Immunity to flashes and the visual part of flashbangs
 	ear_protection = 1 // Immunity to the audio part of flashbangs
+	damage_protection = 10 // Reduce all incoming damage by this number
+	xeno_disarm_chance = 20
 	allow_rename = FALSE
 	modtype = "Commando"
 	faction = list("nanotrasen")
 	is_emaggable = FALSE
-
-/mob/living/silicon/robot/deathsquad/New(loc)
-	..()
-	cell = new /obj/item/stock_parts/cell/hyper(src)
+	default_cell_type = /obj/item/stock_parts/cell/bluespace
 
 /mob/living/silicon/robot/deathsquad/init()
 	laws = new /datum/ai_laws/deathsquad
 	module = new /obj/item/robot_module/deathsquad(src)
-
 	aiCamera = new/obj/item/camera/siliconcam/robot_camera(src)
 	radio = new /obj/item/radio/borg/deathsquad(src)
 	radio.recalculateChannels()
-
 	playsound(loc, 'sound/mecha/nominalsyndi.ogg', 75, 0)
 
-/mob/living/silicon/robot/combat
-	base_icon = "droidcombat"
-	icon_state = "droidcombat"
-	modtype = "Combat"
-	designation = "Combat"
+/mob/living/silicon/robot/deathsquad/bullet_act(var/obj/item/projectile/P)
+	if(istype(P) && P.is_reflectable && P.starting)
+		visible_message("<span class='danger'>The [P.name] gets reflected by [src]!</span>", "<span class='userdanger'>The [P.name] gets reflected by [src]!</span>")
+		P.reflect_back(src)
+		return -1
+	return ..(P)
 
-/mob/living/silicon/robot/combat/init()
-	..()
-	module = new /obj/item/robot_module/combat(src)
-	module.channels = list("Security" = 1)
-	//languages
-	module.add_languages(src)
-	//subsystems
-	module.add_subsystems_and_actions(src)
-
-	status_flags &= ~CANPUSH
-
-	radio.config(module.channels)
-	notify_ai(2)
 
 /mob/living/silicon/robot/ert
 	designation = "ERT"
@@ -1366,11 +1368,12 @@ GLOBAL_LIST_INIT(robot_verbs_default, list(
 	scrambledcodes = 1
 	req_one_access = list(ACCESS_CENT_SPECOPS)
 	ionpulse = 1
-
 	force_modules = list("Engineering", "Medical", "Security")
 	static_radio_channels = 1
 	allow_rename = FALSE
 	weapons_unlock = TRUE
+	default_cell_type = /obj/item/stock_parts/cell/super
+	var/eprefix = "Amber"
 
 
 /mob/living/silicon/robot/ert/init()
@@ -1379,11 +1382,10 @@ GLOBAL_LIST_INIT(robot_verbs_default, list(
 	radio.recalculateChannels()
 	aiCamera = new/obj/item/camera/siliconcam/robot_camera(src)
 
-/mob/living/silicon/robot/ert/New(loc, cyborg_unlock)
+/mob/living/silicon/robot/ert/New(loc)
 	..(loc)
-	cell = new /obj/item/stock_parts/cell/hyper(src)
 	var/rnum = rand(1,1000)
-	var/borgname = "ERT [rnum]"
+	var/borgname = "[eprefix] ERT [rnum]"
 	name = borgname
 	custom_name = borgname
 	real_name = name
@@ -1392,22 +1394,63 @@ GLOBAL_LIST_INIT(robot_verbs_default, list(
 	mind.original = src
 	mind.assigned_role = SPECIAL_ROLE_ERT
 	mind.special_role = SPECIAL_ROLE_ERT
-	if(cyborg_unlock)
-		crisis = 1
 	if(!(mind in SSticker.minds))
 		SSticker.minds += mind
 	SSticker.mode.ert += mind
 
-/mob/living/silicon/robot/ert/gamma
-	crisis = 1
 
-/mob/living/silicon/robot/emp_act(severity)
+/mob/living/silicon/robot/ert/red
+	eprefix = "Red"
+	default_cell_type = /obj/item/stock_parts/cell/hyper
+
+/mob/living/silicon/robot/ert/gamma
+	default_cell_type = /obj/item/stock_parts/cell/bluespace
+	force_modules = list("Combat", "Engineering", "Medical")
+	damage_protection = 5 // Reduce all incoming damage by this number
+	eprefix = "Gamma"
+	magpulse = 1
+	xeno_disarm_chance = 40
+
+
+/mob/living/silicon/robot/destroyer
+	// admin-only borg, the seraph / special ops officer of borgs
+	base_icon = "droidcombat"
+	icon_state = "droidcombat"
+	modtype = "Destroyer"
+	designation = "Destroyer"
+	lawupdate = 0
+	scrambledcodes = 1
+	req_one_access = list(ACCESS_CENT_SPECOPS)
+	ionpulse = 1
+	magpulse = 1
+	pdahide = 1
+	eye_protection = 2 // Immunity to flashes and the visual part of flashbangs
+	ear_protection = 1 // Immunity to the audio part of flashbangs
+	emp_protection = TRUE // Immunity to EMP, due to heavy shielding
+	damage_protection = 20 // Reduce all incoming damage by this number. Very high in the case of /destroyer borgs, since it is an admin-only borg.
+	xeno_disarm_chance = 10
+	default_cell_type = /obj/item/stock_parts/cell/bluespace
+
+/mob/living/silicon/robot/destroyer/init()
 	..()
-	switch(severity)
-		if(1)
-			disable_component("comms", 160)
-		if(2)
-			disable_component("comms", 60)
+	module = new /obj/item/robot_module/destroyer(src)
+	module.add_languages(src)
+	module.add_subsystems_and_actions(src)
+	status_flags &= ~CANPUSH
+	if(radio)
+		qdel(radio)
+	radio = new /obj/item/radio/borg/ert/specops(src)
+	radio.recalculateChannels()
+
+/mob/living/silicon/robot/destroyer/borg_icons()
+	if(base_icon == "")
+		base_icon = icon_state
+	if(module_active && istype(module_active,/obj/item/borg/destroyer/mobility))
+		icon_state = "[base_icon]-roll"
+	else
+		icon_state = base_icon
+		overlays += "[base_icon]-shield"
+
 
 /mob/living/silicon/robot/extinguish_light()
 	update_headlamp(1, 150)

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

@@ -76,29 +76,6 @@
 	if(!LAZYLEN(components))
 		return
 
-	 //Combat shielding absorbs a percentage of damage directly into the cell.
-	var/obj/item/borg/combat/shield/shield
-	if(module_state_1 && istype(module_state_1, /obj/item/borg/combat/shield))
-		shield = module_state_1
-	else if(module_state_2 && istype(module_state_2, /obj/item/borg/combat/shield))
-		shield = module_state_2
-	else if(module_state_3 && istype(module_state_3, /obj/item/borg/combat/shield))
-		shield = module_state_3
-	if(shield)
-		//Shields absorb a certain percentage of damage based on their power setting.
-		var/absorb_brute = brute * shield.shield_level
-		var/absorb_burn = burn * shield.shield_level
-		var/cost = (absorb_brute+absorb_burn) * 100
-
-		cell.charge -= cost
-		if(cell.charge <= 0)
-			cell.charge = 0
-			to_chat(src, "<span class='warning'>Your shield has overloaded!</span>")
-		else
-			brute -= absorb_brute
-			burn -= absorb_burn
-			to_chat(src, "<span class='warning'>Your shield absorbs some of the impact!</span>")
-
 	var/datum/robot_component/armour/A = get_armour()
 	if(A)
 		A.take_damage(brute, burn, sharp, updating_health)
@@ -127,32 +104,15 @@
 		updatehealth("heal overall damage")
 
 /mob/living/silicon/robot/take_overall_damage(brute = 0, burn = 0, updating_health = TRUE, used_weapon = null, sharp = 0)
-	if(status_flags & GODMODE)	return	//godmode
+	if(status_flags & GODMODE)
+		return
+
+	if(damage_protection)
+		brute = clamp(brute - damage_protection, 0, brute)
+		burn = clamp(burn - damage_protection, 0, burn)
+
 	var/list/datum/robot_component/parts = get_damageable_components()
 
-	 //Combat shielding absorbs a percentage of damage directly into the cell.
-	var/obj/item/borg/combat/shield/shield
-	if(module_state_1 && istype(module_state_1, /obj/item/borg/combat/shield))
-		shield = module_state_1
-	else if(module_state_2 && istype(module_state_2, /obj/item/borg/combat/shield))
-		shield = module_state_2
-	else if(module_state_3 && istype(module_state_3, /obj/item/borg/combat/shield))
-		shield = module_state_3
-	if(shield)
-		//Shields absorb a certain percentage of damage based on their power setting.
-		var/absorb_brute = brute * shield.shield_level
-		var/absorb_burn = burn * shield.shield_level
-		var/cost = (absorb_brute+absorb_burn) * 100
-
-		cell.charge -= cost
-		if(cell.charge <= 0)
-			cell.charge = 0
-			to_chat(src, "<span class='warning'>Your shield has overloaded!</span>")
-		else
-			brute -= absorb_brute
-			burn -= absorb_burn
-			to_chat(src, "<span class='warning'>Your shield absorbs some of the impact!</span>")
-
 	var/datum/robot_component/armour/A = get_armour()
 	if(A)
 		A.take_damage(brute, burn, sharp)

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

@@ -2,7 +2,7 @@
 	if(M.a_intent == INTENT_DISARM)
 		if(!lying)
 			M.do_attack_animation(src, ATTACK_EFFECT_DISARM)
-			if(prob(85))
+			if(prob(xeno_disarm_chance))
 				Stun(7)
 				step(src, get_dir(M,src))
 				spawn(5)

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

@@ -73,24 +73,7 @@
 /obj/item/borg
 	var/powerneeded // Percentage of power remaining required to run item
 
-/obj/item/borg/combat/shield
-	name = "personal shielding"
-	desc = "A powerful experimental module that turns aside or absorbs incoming attacks at the cost of charge."
-	icon = 'icons/obj/decals.dmi'
-	icon_state = "shock"
-	powerneeded = 25
-	var/shield_level = 0.5 //Percentage of damage absorbed by the shield.
-
-/obj/item/borg/combat/shield/verb/set_shield_level()
-	set name = "Set shield level"
-	set category = "Object"
-	set src in range(0)
-
-	var/N = input("How much damage should the shield absorb?") in list("5","10","25","50","75","100")
-	if(N)
-		shield_level = text2num(N)/100
-
-/obj/item/borg/combat/mobility
+/obj/item/borg/destroyer/mobility
 	name = "mobility module"
 	desc = "By retracting limbs and tucking in its head, a combat android can roll at high speeds."
 	icon = 'icons/obj/decals.dmi'

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

@@ -118,20 +118,48 @@
 	return
 
 /obj/item/robot_module/standard
-	name = "standard robot module"
+	// if station is fine, assist with constructing station goal room, cleaning, and repairing cables chewed by rats
+	// if medical crisis, assist by providing basic healthcare, retrieving corpses, and monitoring crew lifesigns
+	// if eng crisis, assist by helping repair hull breaches
+	// if sec crisis, assist by opening doors for sec and providing a backup stunbaton on patrols
+	name = "generalist robot module"
 	module_type = "Standard"
+	subsystems = list(/mob/living/silicon/proc/subsystem_power_monitor, /mob/living/silicon/proc/subsystem_crew_monitor)
+	stacktypes = list(
+		/obj/item/stack/sheet/metal/cyborg = 50,
+		/obj/item/stack/cable_coil/cyborg = 50,
+		/obj/item/stack/rods/cyborg = 60,
+		/obj/item/stack/tile/plasteel = 20
+		)
 
 /obj/item/robot_module/standard/New()
 	..()
-	modules += new /obj/item/melee/baton/loaded(src)
-	modules += new /obj/item/extinguisher(src)
-	modules += new /obj/item/wrench/cyborg(src)
+	// sec
+	modules += new /obj/item/restraints/handcuffs/cable/zipties(src)
+	// janitorial
+	modules += new /obj/item/soap/nanotrasen(src)
+	modules += new /obj/item/lightreplacer/cyborg(src)
+	// eng
 	modules += new /obj/item/crowbar/cyborg(src)
+	modules += new /obj/item/wrench/cyborg(src)
+	modules += new /obj/item/extinguisher(src) // for firefighting, and propulsion in space
+	modules += new /obj/item/weldingtool/largetank/cyborg(src)
+	// mining
+	modules += new /obj/item/pickaxe(src)
+	modules += new /obj/item/t_scanner/adv_mining_scanner(src)
+	modules += new /obj/item/storage/bag/ore/cyborg(src)
+	// med
 	modules += new /obj/item/healthanalyzer(src)
+	modules += new /obj/item/reagent_containers/borghypo/basic(src)
+	modules += new /obj/item/roller_holder(src) // for taking the injured to medbay without worsening their injuries or leaving a blood trail the whole way
 	emag = new /obj/item/melee/energy/sword/cyborg(src)
-
+	for(var/G in stacktypes)
+		var/obj/item/stack/sheet/M = new G(src)
+		M.amount = stacktypes[G]
+		modules += M
 	fix_modules()
 
+
 /obj/item/robot_module/medical
 	name = "medical robot module"
 	module_type = "Medical"
@@ -259,6 +287,7 @@
 	modules += new /obj/item/mop/advanced/cyborg(src)
 	modules += new /obj/item/lightreplacer/cyborg(src)
 	modules += new /obj/item/holosign_creator(src)
+	modules += new /obj/item/extinguisher/mini(src)
 	emag = new /obj/item/reagent_containers/spray(src)
 
 	emag.reagents.add_reagent("lube", 250)
@@ -483,25 +512,44 @@
 
 	fix_modules()
 
-/obj/item/robot_module/combat
-	name = "combat robot module"
+/obj/item/robot_module/destroyer
+	name = "destroyer robot module"
 	module_type = "Malf"
 	module_actions = list(
 		/datum/action/innate/robot_sight/thermal,
 	)
 
+/obj/item/robot_module/destroyer/New()
+	..()
+
+	modules += new /obj/item/gun/energy/immolator/multi/cyborg(src) // See comments on /robot_module/combat below
+	modules += new /obj/item/melee/baton/loaded(src) // secondary weapon, for things immune to burn, immune to ranged weapons, or for arresting low-grade threats
+	modules += new /obj/item/restraints/handcuffs/cable/zipties/cyborg(src)
+	modules += new /obj/item/pickaxe/drill/jackhammer(src) // for breaking walls to execute flanking moves
+	modules += new /obj/item/borg/destroyer/mobility(src)
+	emag = null
+	fix_modules()
+
+
+/obj/item/robot_module/combat
+	name = "combat robot module"
+	module_type = "Malf"
+	module_actions = list()
+
 /obj/item/robot_module/combat/New()
 	..()
+	modules += new /obj/item/gun/energy/immolator/multi/cyborg(src) // primary weapon, strong at close range (ie: against blob/terror/xeno), but consumes a lot of energy per shot.
+	// Borg gets 40 shots of this weapon. Gamma Sec ERT gets 10.
+	// So, borg has way more burst damage, but also takes way longer to recharge / get back in the fight once depleted. Has to find a borg recharger and sit in it for ages.
+	// Organic gamma sec ERT carries alternate weapons, including a box of flashbangs, and can load up on a huge number of guns from science. Borg cannot do either.
+	// Overall, gamma borg has higher skill floor but lower skill ceiling.
+	modules += new /obj/item/melee/baton/loaded(src) // secondary weapon, for things immune to burn, immune to ranged weapons, or for arresting low-grade threats
 	modules += new /obj/item/restraints/handcuffs/cable/zipties/cyborg(src)
-	modules += new /obj/item/gun/energy/gun/cyborg(src)
-	modules += new /obj/item/pickaxe/drill/jackhammer(src)
-	modules += new /obj/item/borg/combat/shield(src)
-	modules += new /obj/item/borg/combat/mobility(src)
-	modules += new /obj/item/wrench/cyborg(src)
-	emag = new /obj/item/gun/energy/lasercannon/cyborg(src)
-
+	modules += new /obj/item/pickaxe/drill/jackhammer(src) // for breaking walls to execute flanking moves
+	emag = null
 	fix_modules()
 
+
 /obj/item/robot_module/alien/hunter
 	name = "alien hunter module"
 	module_type = "Standard"

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

@@ -9,7 +9,7 @@
 /mob/living/silicon/robot/movement_delay()
 	. = ..()
 	. += speed
-	if(module_active && istype(module_active,/obj/item/borg/combat/mobility))
+	if(module_active && istype(module_active,/obj/item/borg/destroyer/mobility))
 		. -= 3
 	. += config.robot_delay
 

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

@@ -5,6 +5,7 @@
 	scrambledcodes = 1
 	pdahide = 1
 	faction = list("syndicate")
+	bubble_icon = "syndibot"
 	designation = "Syndicate Assault"
 	modtype = "Syndicate"
 	req_access = list(ACCESS_SYNDICATE)

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

@@ -2,7 +2,9 @@
 	gender = NEUTER
 	robot_talk_understand = 1
 	voice_name = "synthesized voice"
+	bubble_icon = "machine"
 	has_unlimited_silicon_privilege = 1
+	weather_immunities = list("ash")
 	var/syndicate = 0
 	var/const/MAIN_CHANNEL = "Main Frequency"
 	var/lawchannel = MAIN_CHANNEL // Default channel on which to state laws
@@ -283,7 +285,7 @@
 
 /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)
+		next_alarm_notice = world.time + 10 SECONDS
 
 	var/list/alarms = queued_alarms[alarm_handler]
 	if(was_raised)

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

@@ -18,7 +18,7 @@
 
 	speak_emote = list("states")
 	friendly = "boops"
-
+	bubble_icon = "machine"
 	faction = list("neutral", "silicon")
 
 	var/obj/machinery/bot_core/bot_core = null

code/modules/mob/living/simple_animal/bot/mulebot.dm

@@ -323,13 +323,13 @@
 /mob/living/simple_animal/bot/mulebot/proc/buzz(type)
 	switch(type)
 		if(SIGH)
-			audible_message("[src] makes a sighing buzz.", "<span class='emote'>You hear an electronic buzzing sound.</span>")
+			audible_message("[src] makes a sighing buzz.")
 			playsound(loc, 'sound/machines/buzz-sigh.ogg', 50, 0)
 		if(ANNOYED)
-			audible_message("[src] makes an annoyed buzzing sound.", "<span class='emote'>You hear an electronic buzzing sound.</span>")
+			audible_message("[src] makes an annoyed buzzing sound.")
 			playsound(loc, 'sound/machines/buzz-two.ogg', 50, 0)
 		if(DELIGHT)
-			audible_message("[src] makes a delighted ping!", "<span class='emote'>You hear a ping.</span>")
+			audible_message("[src] makes a delighted ping!")
 			playsound(loc, 'sound/machines/ping.ogg', 50, 0)
 
 
@@ -601,7 +601,7 @@
 /mob/living/simple_animal/bot/mulebot/proc/at_target()
 	if(!reached_target)
 		radio_channel = "Supply" //Supply channel
-		audible_message("[src] makes a chiming sound!", "<span class='emote'>You hear a chime.</span>")
+		audible_message("[src] makes a chiming sound!")
 		playsound(loc, 'sound/machines/chime.ogg', 50, 0)
 		reached_target = 1
 

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

@@ -3,7 +3,7 @@
 	if(status_flags & GODMODE)
 		return FALSE
 	var/oldbruteloss = bruteloss
-	bruteloss = Clamp(bruteloss + amount, 0, maxHealth)
+	bruteloss = clamp(bruteloss + amount, 0, maxHealth)
 	if(oldbruteloss == bruteloss)
 		updating_health = FALSE
 		. = STATUS_UPDATE_NONE

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

@@ -153,16 +153,16 @@
 	if(def_zone)
 		if(def_zone == "head")
 			if(inventory_head)
-				armorval = inventory_head.armor[type]
+				armorval = inventory_head.armor.getRating(type)
 		else
 			if(inventory_back)
-				armorval = inventory_back.armor[type]
+				armorval = inventory_back.armor.getRating(type)
 		return armorval
 	else
 		if(inventory_head)
-			armorval += inventory_head.armor[type]
+			armorval += inventory_head.armor.getRating(type)
 		if(inventory_back)
-			armorval += inventory_back.armor[type]
+			armorval += inventory_back.armor.getRating(type)
 	return armorval * 0.5
 
 /mob/living/simple_animal/pet/dog/corgi/attackby(obj/item/O, mob/user, params)

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

@@ -20,6 +20,7 @@
 	melee_damage_upper = 25
 	attacktext = "slashes"
 	speak_emote = list("hisses")
+	bubble_icon = "alien"
 	a_intent = INTENT_HARM
 	attack_sound = 'sound/weapons/bladeslice.ogg'
 	atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
@@ -127,6 +128,7 @@
 	icon_state = "queen_s"
 	icon_living = "queen_s"
 	icon_dead = "queen_dead"
+	bubble_icon = "alienroyal"
 	move_to_delay = 4
 	maxHealth = 400
 	health = 400
@@ -153,7 +155,7 @@
 	icon_dead = "maid_dead"
 
 /mob/living/simple_animal/hostile/alien/maid/AttackingTarget()
-	if(ismovableatom(target))
+	if(ismovable(target))
 		if(istype(target, /obj/effect/decal/cleanable))
 			visible_message("<span class='notice'>\The [src] cleans up \the [target].</span>")
 			qdel(target)

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

@@ -62,8 +62,8 @@
 	is_zombie = TRUE
 	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!
+		if(A.armor && A.armor.getRating("melee"))
+			maxHealth += A.armor.getRating("melee") //That zombie's got armor, I want armor!
 	maxHealth += 200
 	health = maxHealth
 	name = "zombie"

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

@@ -25,6 +25,7 @@
 	gold_core_spawnable = HOSTILE_SPAWN
 	loot = list(/obj/effect/decal/cleanable/blood/gibs/robot)
 	deathmessage = "blows apart!"
+	bubble_icon = "machine"
 	del_on_death = 1
 
 /mob/living/simple_animal/hostile/hivebot/range

code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm

@@ -116,8 +116,8 @@ Difficulty: Hard
 	if(charging)
 		return
 
-	anger_modifier = Clamp(((maxHealth - health)/60),0,20)
-	enrage_time = initial(enrage_time) * Clamp(anger_modifier / 20, 0.5, 1)
+	anger_modifier = clamp(((maxHealth - health)/60),0,20)
+	enrage_time = initial(enrage_time) * clamp(anger_modifier / 20, 0.5, 1)
 	ranged_cooldown = world.time + 50
 
 	if(client)

code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm

@@ -83,7 +83,7 @@ Difficulty: Very Hard
 	chosen_attack_num = 4
 
 /mob/living/simple_animal/hostile/megafauna/colossus/OpenFire()
-	anger_modifier = Clamp(((maxHealth - health)/50),0,20)
+	anger_modifier = clamp(((maxHealth - health)/50),0,20)
 	ranged_cooldown = world.time + 120
 
 	if(client)

code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm

@@ -103,7 +103,7 @@ Difficulty: Medium
 	if(swooping)
 		return
 
-	anger_modifier = Clamp(((maxHealth - health)/50),0,20)
+	anger_modifier = clamp(((maxHealth - health)/50),0,20)
 	ranged_cooldown = world.time + ranged_cooldown_time
 
 	if(client)
@@ -254,7 +254,7 @@ Difficulty: Medium
 /mob/living/simple_animal/hostile/megafauna/dragon/proc/line_target(var/offset, var/range, var/atom/at = target)
 	if(!at)
 		return
-	var/angle = Atan2(at.x - src.x, at.y - src.y) + offset
+	var/angle = ATAN2(at.x - src.x, at.y - src.y) + offset
 	var/turf/T = get_turf(src)
 	for(var/i in 1 to range)
 		var/turf/check = locate(src.x + cos(angle) * i, src.y + sin(angle) * i, src.z)
@@ -344,10 +344,10 @@ Difficulty: Medium
 
 	//ensure swoop direction continuity.
 	if(negative)
-		if(IsInRange(x, initial_x + 1, initial_x + DRAKE_SWOOP_DIRECTION_CHANGE_RANGE))
+		if(ISINRANGE(x, initial_x + 1, initial_x + DRAKE_SWOOP_DIRECTION_CHANGE_RANGE))
 			negative = FALSE
 	else
-		if(IsInRange(x, initial_x - DRAKE_SWOOP_DIRECTION_CHANGE_RANGE, initial_x - 1))
+		if(ISINRANGE(x, initial_x - DRAKE_SWOOP_DIRECTION_CHANGE_RANGE, initial_x - 1))
 			negative = TRUE
 	new /obj/effect/temp_visual/dragon_flight/end(loc, negative)
 	new /obj/effect/temp_visual/dragon_swoop(loc)

code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm

@@ -482,7 +482,7 @@ Difficulty: Hard
 
 /mob/living/simple_animal/hostile/megafauna/hierophant/proc/calculate_rage() //how angry we are overall
 	did_reset = FALSE //oh hey we're doing SOMETHING, clearly we might need to heal if we recall
-	anger_modifier = Clamp(((maxHealth - health) / 42),0,50)
+	anger_modifier = clamp(((maxHealth - health) / 42),0,50)
 	burst_range = initial(burst_range) + round(anger_modifier * 0.08)
 	beam_range = initial(beam_range) + round(anger_modifier * 0.12)
 

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

@@ -363,6 +363,7 @@
 	minbodytemp = 0
 	mob_size = MOB_SIZE_TINY
 	flying = 1
+	bubble_icon = "syndibot"
 	gold_core_spawnable = HOSTILE_SPAWN
 	del_on_death = 1
 	deathmessage = "is smashed into pieces!"

code/modules/mob/living/simple_animal/hostile/terror_spiders/queen.dm

@@ -168,7 +168,7 @@
 							neststep = 4
 						else
 							spider_lastspawn = world.time
-							var/spiders_left_to_spawn = Clamp( (spider_max_per_nest - CountSpiders()), 1, 10)
+							var/spiders_left_to_spawn = clamp( (spider_max_per_nest - CountSpiders()), 1, 10)
 							DoLayTerrorEggs(pick(spider_types_standard), spiders_left_to_spawn)
 			if(4)
 				// Nest should be full. Otherwise, start replenishing nest (stage 5).

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

@@ -144,7 +144,7 @@
 
 /mob/living/simple_animal/updatehealth(reason = "none given")
 	..(reason)
-	health = Clamp(health, 0, maxHealth)
+	health = clamp(health, 0, maxHealth)
 	med_hud_set_health()
 
 /mob/living/simple_animal/StartResting(updating = 1)

code/modules/mob/living/simple_animal/slime/powers.dm

@@ -190,7 +190,7 @@
 					step_away(M,src)
 				M.Friends = Friends.Copy()
 				babies += M
-				M.mutation_chance = Clamp(mutation_chance+(rand(5,-5)),0,100)
+				M.mutation_chance = clamp(mutation_chance+(rand(5,-5)),0,100)
 				feedback_add_details("slime_babies_born", "slimebirth_[replacetext(M.colour," ","_")]")
 
 			var/mob/living/simple_animal/slime/new_slime = pick(babies)

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

@@ -17,6 +17,7 @@
 	response_harm   = "stomps on"
 	emote_see = list("jiggles", "bounces in place")
 	speak_emote = list("blorbles")
+	bubble_icon = "slime"
 
 	atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
 

code/modules/mob/mob.dm

@@ -127,14 +127,12 @@
 // self_message (optional) is what the src mob hears.
 // deaf_message (optional) is what deaf people will see.
 // hearing_distance (optional) is the range, how many tiles away the message can be heard.
-/mob/audible_message(var/message, var/deaf_message, var/hearing_distance, var/self_message)
+/mob/audible_message(message, deaf_message, hearing_distance)
 	var/range = 7
 	if(hearing_distance)
 		range = hearing_distance
 	var/msg = message
 	for(var/mob/M in get_mobs_in_view(range, src))
-		if(self_message && M == src)
-			msg = self_message
 		M.show_message(msg, 2, deaf_message, 1)
 
 	// based on say code
@@ -156,12 +154,12 @@
 // message is the message output to anyone who can hear.
 // deaf_message (optional) is what deaf people will see.
 // hearing_distance (optional) is the range, how many tiles away the message can be heard.
-/atom/proc/audible_message(var/message, var/deaf_message, var/hearing_distance)
+/atom/proc/audible_message(message, deaf_message, hearing_distance)
 	var/range = 7
 	if(hearing_distance)
 		range = hearing_distance
 	for(var/mob/M in get_mobs_in_view(range, src))
-		M.show_message( message, 2, deaf_message, 1)
+		M.show_message(message, 2, deaf_message, 1)
 
 /mob/proc/findname(msg)
 	for(var/mob/M in GLOB.mob_list)

code/modules/mob/mob_grab.dm

@@ -53,12 +53,11 @@
 	hud.master = src
 
 	//check if assailant is grabbed by victim as well
-	if(assailant.grabbed_by)
-		for(var/obj/item/grab/G in assailant.grabbed_by)
-			if(G.assailant == affecting && G.affecting == assailant)
-				G.dancing = 1
-				G.adjust_position()
-				dancing = 1
+	for(var/obj/item/grab/G in assailant.grabbed_by)
+		if(G.assailant == affecting && G.affecting == assailant)
+			G.dancing = 1
+			G.adjust_position()
+			dancing = 1
 
 	clean_grabbed_by(assailant, affecting)
 	adjust_position()
@@ -276,7 +275,7 @@
 		assailant.visible_message("<span class='warning'>[assailant] has reinforced [assailant.p_their()] grip on [affecting] (now neck)!</span>")
 		state = GRAB_NECK
 		icon_state = "grabbed+1"
-		assailant.setDir(get_dir(assailant, affecting))
+
 		add_attack_logs(assailant, affecting, "Neck grabbed", ATKLOG_ALL)
 		if(!iscarbon(assailant))
 			affecting.LAssailant = null
@@ -296,7 +295,7 @@
 		assailant.next_move = world.time + 10
 		if(!affecting.get_organ_slot("breathing_tube"))
 			affecting.AdjustLoseBreath(1)
-		affecting.setDir(WEST)
+
 	adjust_position()
 
 //This is used to make sure the victim hasn't managed to yackety sax away before using the grab.
@@ -433,9 +432,10 @@
 
 /obj/item/grab/Destroy()
 	if(affecting)
-		affecting.pixel_x = 0
-		affecting.pixel_y = 0 //used to be an animate, not quick enough for del'ing
-		affecting.layer = initial(affecting.layer)
+		if(!affecting.buckled)
+			affecting.pixel_x = 0
+			affecting.pixel_y = 0 //used to be an animate, not quick enough for del'ing
+			affecting.layer = initial(affecting.layer)
 		affecting.grabbed_by -= src
 		affecting = null
 	if(assailant)

code/modules/mob/mob_movement.dm

@@ -26,25 +26,6 @@
 	else
 		to_chat(usr, "<span class='danger'>This mob type cannot throw items.</span>")
 
-
-/client/verb/drop_item()
-	set hidden = 1
-	if(!isrobot(mob))
-		mob.drop_item_v()
-	return
-
-
-/* /client/Center()
-	/* No 3D movement in 2D spessman game. dir 16 is Z Up
-	if(isobj(mob.loc))
-		var/obj/O = mob.loc
-		if(mob.canmove)
-			return O.relaymove(mob, 16)
-	*/
-	return
- */
-
-
 /client/proc/Move_object(direct)
 	if(mob && mob.control_object)
 		if(mob.control_object.density)
@@ -186,7 +167,7 @@
 		if(newdir)
 			direct = newdir
 			n = get_step(mob, direct)
-	
+
 	. = mob.SelfMove(n, direct, delay)
 	mob.setDir(direct)
 

code/modules/mob/say.dm

@@ -114,7 +114,7 @@
 
 	return get_turf(src)
 
-/mob/proc/say_test(var/text)
+/proc/say_test(text)
 	var/ending = copytext(text, length(text))
 	if(ending == "?")
 		return "1"

code/modules/mob/status_procs.dm

@@ -207,4 +207,4 @@
 
 /mob/proc/adjust_bodytemperature(amount, min_temp = 0, max_temp = INFINITY)
 	if(bodytemperature >= min_temp && bodytemperature <= max_temp)
-		bodytemperature = Clamp(bodytemperature + amount, min_temp, max_temp)
+		bodytemperature = clamp(bodytemperature + amount, min_temp, max_temp)

code/modules/mob/typing_indicator.dm

@@ -5,31 +5,32 @@ mob/var/typing
 mob/var/last_typed
 mob/var/last_typed_time
 
-GLOBAL_DATUM(typing_indicator, /image)
+GLOBAL_LIST_EMPTY(typing_indicator)
 
-/mob/proc/set_typing_indicator(var/state)
+/mob/proc/set_typing_indicator(state)
 
-	if(!GLOB.typing_indicator)
-		GLOB.typing_indicator = image('icons/mob/talk.dmi', null, "typing", MOB_LAYER + 1)
-		GLOB.typing_indicator.appearance_flags = APPEARANCE_UI_IGNORE_ALPHA
+	if(!GLOB.typing_indicator[bubble_icon])
+		GLOB.typing_indicator[bubble_icon] = image('icons/mob/talk.dmi', null, "[bubble_icon]typing", FLY_LAYER)
+		var/image/I = GLOB.typing_indicator[bubble_icon]
+		I.appearance_flags = APPEARANCE_UI_IGNORE_ALPHA
 
 	if(ishuman(src))
 		var/mob/living/carbon/human/H = src
 		if((MUTE in H.mutations) || H.silent)
-			overlays -= GLOB.typing_indicator
+			overlays -= GLOB.typing_indicator[bubble_icon]
 			return
 
 	if(client)
 		if((client.prefs.toggles & SHOW_TYPING) || stat != CONSCIOUS || is_muzzled())
-			overlays -= GLOB.typing_indicator
+			overlays -= GLOB.typing_indicator[bubble_icon]
 		else
 			if(state)
 				if(!typing)
-					overlays += GLOB.typing_indicator
+					overlays += GLOB.typing_indicator[bubble_icon]
 					typing = 1
 			else
 				if(typing)
-					overlays -= GLOB.typing_indicator
+					overlays -= GLOB.typing_indicator[bubble_icon]
 					typing = 0
 			return state