Second fix part 1

code/modules/awaymissions/zlevel.dm

@@ -9,8 +9,8 @@ var/global/list/potentialRandomZlevels = generateMapList(filename = "config/away
 		smoothTurfs = turfs
 
 	log_debug("Setting up atmos")
-	if(air_master)
-		air_master.setup_allturfs(turfs)
+	if(SSair)
+		SSair.setup_allturfs(turfs)
 	log_debug("\tTook [stop_watch(subtimer)]s")
 
 	subtimer = start_watch()

code/modules/client/client procs.dm

@@ -478,6 +478,8 @@
 	if(!tooltips)
 		tooltips = new /datum/tooltip(src)
 
+	Master.UpdateTickRate()
+
 //////////////
 //DISCONNECT//
 //////////////
@@ -487,6 +489,7 @@
 		admins -= src
 	directory -= ckey
 	clients -= src
+	Master.UpdateTickRate()
 	return ..()
 
 

code/modules/customitems/item_defines.dm

@@ -719,15 +719,25 @@
 /obj/item/clothing/suit/jacket/miljacket/patch/attack_self(mob/user)
 	var/list/options = list()
 	options["purple"] = "shazjacket_purple"
+	options["purple light"] = "shazjacket_purple_light"
 	options["yellow"] = "shazjacket_yellow"
 	options["blue"] = "shazjacket_blue"
+	options["cyan"] = "shazjacket_cyan"
+	options["command blue"] = "shazjacket_command"
 	options["brown"] = "shazjacket_brown"
 	options["orange"] = "shazjacket_orange"
+	options["engi orange"] = "shazjacket_engi"
 	options["grey"] = "shazjacket_grey"
 	options["black"] ="shazjacket_black"
 	options["red"] ="shazjacket_red"
+	options["red light"] ="shazjacket_red_light"
+	options["pink"] ="shazjacket_pink"
+	options["magenta"] ="shazjacket_magenta"
 	options["navy"] ="shazjacket_navy"
 	options["white"] ="shazjacket_white"
+	options["green"] ="shazjacket_green"
+	options["lime"] ="shazjacket_lime"
+	options["army green"] ="shazjacket_army"
 
 	var/choice = input(user, "What color do you wish your jacket to be?", "Change color") as null|anything in options
 

code/modules/events/spacevine.dm

@@ -481,37 +481,39 @@
 			eater.say("Nom")
 		wither()
 
-/obj/structure/spacevine/attackby(obj/item/weapon/W, mob/user, params)
-	if (!W || !user || !W.type)
-		return
-	user.changeNext_move(CLICK_CD_MELEE)
-	var/damage_to_do = W.force
-
-	if(istype(W, /obj/item/weapon/scythe))
-		var/obj/item/weapon/scythe/S = W
+/obj/structure/spacevine/attacked_by(obj/item/I, mob/living/user)
+	var/damage_dealt = I.force
+	if(istype(I, /obj/item/weapon/scythe))
+		var/obj/item/weapon/scythe/S = I
 		if(S.extend)	//so folded telescythes won't get damage boosts / insta-clears (they instead will instead be treated like non-scythes)
-			damage_to_do *= 4
+			damage_dealt *= 4
 			for(var/obj/structure/spacevine/B in range(1,src))
-				if(B.health > damage_to_do)	//this only is going to occur for woodening mutation vines (increased health) or if we nerf scythe damage/multiplier
-					B.health -= damage_to_do
+				if(B.health > damage_dealt)	//this only is going to occur for woodening mutation vines (increased health) or if we nerf scythe damage/multiplier
+					B.take_damage(damage_dealt, I.damtype, "melee", 1)
 				else
 					B.wither()
 			return
-
-	if(is_sharp(W))
-		damage_to_do *= 4
-
-	if(W && W.damtype == "fire")
-		damage_to_do *= 4
+	if(is_sharp(I))
+		damage_dealt *= 4
+	if(I.damtype == BURN)
+		damage_dealt *= 4
 
 	for(var/datum/spacevine_mutation/SM in mutations)
-		damage_to_do = SM.on_hit(src, user, W, damage_to_do) //on_hit now takes override damage as arg and returns new value for other mutations to permutate further
+		damage_dealt = SM.on_hit(src, user, I, damage_dealt) //on_hit now takes override damage as arg and returns new value for other mutations to permutate further
+	take_damage(damage_dealt, I.damtype, "melee", 1)
 
-	health -= damage_to_do
-	if(health < 1)
-		wither()
+/obj/structure/spacevine/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0)
+	switch(damage_type)
+		if(BRUTE)
+			if(damage_amount)
+				playsound(src, 'sound/weapons/slash.ogg', 50, 1)
+			else
+				playsound(src, 'sound/weapons/tap.ogg', 50, 1)
+		if(BURN)
+			playsound(src, 'sound/items/welder.ogg', 100, 1)
 
-	..()
+/obj/structure/spacevine/obj_destruction()
+	wither()
 
 /obj/structure/spacevine/Crossed(mob/crosser)
 	if(isliving(crosser))

code/modules/fish/fishtank.dm

@@ -595,7 +595,7 @@
 		playsound(loc, 'sound/effects/Glasshit.ogg', 75, 1)
 	check_health()
 
-/obj/machinery/fishtank/proc/attack_generic(mob/living/user as mob, damage = 0)	//used by attack_alien, attack_animal, and attack_slime
+/obj/machinery/fishtank/attack_generic(mob/living/user, damage = 0)	//used by attack_alien, attack_animal, and attack_slime
 	user.changeNext_move(CLICK_CD_MELEE)
 	user.do_attack_animation(src)
 	cur_health -= damage

code/modules/hydroponics/hydroitemdefines.dm

@@ -119,6 +119,7 @@
 	hitsound = 'sound/weapons/bladeslice.ogg'
 	sharp = 1
 	var/extend = 1
+	var/swiping = FALSE
 
 /obj/item/weapon/scythe/suicide_act(mob/user)
 	user.visible_message("<span class='suicide'>[user] is beheading \himself with the [src.name]! It looks like \he's trying to commit suicide.</span>")
@@ -130,6 +131,21 @@
 			playsound(loc, pick('sound/misc/desceration-01.ogg','sound/misc/desceration-02.ogg','sound/misc/desceration-01.ogg'), 50, 1, -1)
 	return (BRUTELOSS)
 
+/obj/item/weapon/scythe/pre_attackby(atom/A, mob/living/user, params)
+	if(swiping || !istype(A, /obj/structure/spacevine) || get_turf(A) == get_turf(user))
+		return ..()
+	else
+		var/turf/user_turf = get_turf(user)
+		var/dir_to_target = get_dir(user_turf, get_turf(A))
+		swiping = TRUE
+		var/static/list/scythe_slash_angles = list(0, 45, 90, -45, -90)
+		for(var/i in scythe_slash_angles)
+			var/turf/T = get_step(user_turf, turn(dir_to_target, i))
+			for(var/obj/structure/spacevine/V in T)
+				if(user.Adjacent(V))
+					melee_attack_chain(user, V)
+		swiping = FALSE
+
 /obj/item/weapon/scythe/tele
 	icon_state = "tscythe0"
 	item_state = null	//no sprite for folded version, like a tele-baton

code/modules/mining/lavaland/loot/colossus_loot.dm

@@ -335,6 +335,7 @@
 	friendly = "mends"
 	density = 0
 	flying = 1
+	obj_damage = 0
 	pass_flags = PASSTABLE | PASSGRILLE | PASSMOB
 	ventcrawler = 2
 	mob_size = MOB_SIZE_TINY

code/modules/mining/mine_turfs.dm

@@ -418,7 +418,7 @@ var/global/list/rockTurfEdgeCache = list(
 	return
 
 /turf/simulated/mineral/attack_animal(mob/living/simple_animal/user as mob)
-	if(user.environment_smash >= 2)
+	if((user.environment_smash & ENVIRONMENT_SMASH_WALLS) || (user.environment_smash & ENVIRONMENT_SMASH_RWALLS))
 		gets_drilled()
 	..()
 

code/modules/mining/minebot.dm

@@ -23,6 +23,7 @@
 	maxHealth = 125
 	melee_damage_lower = 15
 	melee_damage_upper = 15
+	obj_damage = 0
 	environment_smash = 0
 	check_friendly_fire = 1
 	stop_automated_movement_when_pulled = 1

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

@@ -24,7 +24,7 @@
 				for(var/datum/surgery/S in surgeries)
 					if(S.next_step(user, src))
 						return 1
-	..()
+	return ..()
 
 /mob/living/carbon/attack_hand(mob/living/carbon/human/user)
 	if(!iscarbon(user))

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

@@ -228,6 +228,3 @@
 			playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
 			visible_message("<span class='danger'>[M] attempted to disarm [src]!</span>")
 	return
-
-/mob/living/carbon/human/proc/afterattack(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, inrange, params)
-	return

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

@@ -176,21 +176,22 @@ emp_act
 	return 1
 
 //Returns 1 if the attack hit, 0 if it missed.
-/mob/living/carbon/human/proc/attacked_by(var/obj/item/I, var/mob/living/user, var/def_zone)
-	if(!I || !user)	return 0
+/mob/living/carbon/human/attacked_by(obj/item/I, mob/living/user, def_zone)
+	if(!I || !user)
+		return 0
 
-	if((istype(I, /obj/item/weapon/kitchen/knife/butcher/meatcleaver) || istype(I, /obj/item/weapon/twohanded/chainsaw)) && src.stat == DEAD && user.a_intent == INTENT_HARM)
-		var/obj/item/weapon/reagent_containers/food/snacks/meat/human/newmeat = new /obj/item/weapon/reagent_containers/food/snacks/meat/human(get_turf(src.loc))
-		newmeat.name = src.real_name + newmeat.name
-		newmeat.subjectname = src.real_name
-		newmeat.subjectjob = src.job
-		newmeat.reagents.add_reagent ("nutriment", (src.nutrition / 15) / 3)
-		src.reagents.trans_to (newmeat, round ((src.reagents.total_volume) / 3, 1))
+	if((istype(I, /obj/item/weapon/kitchen/knife/butcher/meatcleaver) || istype(I, /obj/item/weapon/twohanded/chainsaw)) && stat == DEAD && user.a_intent == INTENT_HARM)
+		var/obj/item/weapon/reagent_containers/food/snacks/meat/human/newmeat = new /obj/item/weapon/reagent_containers/food/snacks/meat/human(get_turf(loc))
+		newmeat.name = real_name + newmeat.name
+		newmeat.subjectname = real_name
+		newmeat.subjectjob = job
+		newmeat.reagents.add_reagent("nutriment", (nutrition / 15) / 3)
+		reagents.trans_to(newmeat, round((reagents.total_volume) / 3, 1))
 		add_mob_blood(src)
-		--src.meatleft
-		to_chat(user, "<span class='warning'>You hack off a chunk of meat from [src.name]</span>")
-		if(!src.meatleft)
-			src.create_attack_log("Was chopped up into meat by <b>[key_name(user)]</b>")
+		--meatleft
+		to_chat(user, "<span class='warning'>You hack off a chunk of meat from [name]</span>")
+		if(!meatleft)
+			create_attack_log("Was chopped up into meat by <b>[key_name(user)]</b>")
 			user.create_attack_log("Chopped up <b>[key_name(src)]</b> into meat</b>")
 			msg_admin_attack("[key_name_admin(user)] chopped up [key_name_admin(src)] into meat")
 			if(!iscarbon(user))
@@ -214,19 +215,18 @@ emp_act
 	if(istype(I,/obj/item/weapon/card/emag))
 		emag_act(user, affecting)
 
-	if(! I.discrete)
-		if(I.attack_verb.len)
-			visible_message("<span class='combat danger'>[src] has been [pick(I.attack_verb)] in the [hit_area] with [I.name] by [user]!</span>")
-		else
-			visible_message("<span class='combat danger'>[src] has been attacked in the [hit_area] with [I.name] by [user]!</span>")
+	send_item_attack_message(I, user, hit_area)
 
-	var/armor = run_armor_check(affecting, "melee", "Your armor has protected your [hit_area].", "Your armor has softened hit to your [hit_area].", armour_penetration = I.armour_penetration)
+	if(!I.force)
+		return 0 //item force is zero
+
+	var/armor = run_armor_check(affecting, "melee", "<span class='warning'>Your armour has protected your [hit_area].</span>", "<span class='warning'>Your armour has softened hit to your [hit_area].</span>", armour_penetration = I.armour_penetration)
 	var/weapon_sharp = is_sharp(I)
 	if(weapon_sharp && prob(getarmor(user.zone_sel.selecting, "melee")))
 		weapon_sharp = 0
 
-	if(armor >= 100)	return 0
-	if(!I.force)	return 0
+	if(armor >= 100)
+		return 0
 	var/Iforce = I.force //to avoid runtimes on the forcesay checks at the bottom. Some items might delete themselves if you drop them. (stunning yourself, ninja swords)
 
 	apply_damage(I.force, I.damtype, affecting, armor, sharp = weapon_sharp, used_weapon = I)
@@ -234,8 +234,6 @@ emp_act
 	var/bloody = 0
 	if(I.damtype == BRUTE && I.force && prob(25 + I.force * 2))
 		I.add_mob_blood(src)	//Make the weapon bloody, not the person.
-//		if(user.hand)	user.update_inv_l_hand()	//updates the attacker's overlay for the (now bloodied) weapon
-//		else			user.update_inv_r_hand()	//removed because weapons don't have on-mob blood overlays
 		if(prob(I.force * 2)) //blood spatter!
 			bloody = 1
 			var/turf/location = loc

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

@@ -193,6 +193,12 @@
 	updatehealth()
 	return
 
+/mob/living/carbon/slime/MouseDrop(atom/movable/A)
+	if(isliving(A) && A != usr)
+		var/mob/living/Food = A
+		if(Food.Adjacent(usr) && !stat && Food.stat != DEAD) //messy
+			Feedon(Food)
+	..()
 
 /mob/living/carbon/slime/unEquip(obj/item/W as obj)
 	return
@@ -200,28 +206,25 @@
 /mob/living/carbon/slime/attack_ui(slot)
 	return
 
-/mob/living/carbon/slime/attack_slime(mob/living/carbon/slime/M as mob)
+/mob/living/carbon/slime/attack_slime(mob/living/carbon/slime/M)
 	if(!ticker)
 		to_chat(M, "You cannot attack people before the game has started.")
 		return
 
-	if(Victim) return // can't attack while eating!
+	if(Victim)
+		return // can't attack while eating!
 
+	M.do_attack_animation(src)
+	visible_message("<span class='danger'>[M.name] has glomped [src]!</span>", \
+			"<span class='userdanger'>[M.name] has glomped [src]!</span>")
+	var/damage = rand(1, 3)
+	attacked += 5
+	if(M.is_adult)
+		damage = rand(1, 6)
+	else
+		damage = rand(1, 3)
 	if(health > -100)
-
-		M.do_attack_animation(src)
-		visible_message("<span class='danger'> The [M.name] has glomped [src]!</span>", \
-				"<span class='userdanger'> The [M.name] has glomped [src]!</span>")
-		var/damage = rand(1, 3)
-		attacked += 5
-
-		if(M.is_adult)
-			damage = rand(1, 6)
-		else
-			damage = rand(1, 3)
-
 		adjustBruteLoss(damage)
-
 		updatehealth()
 	return
 
@@ -327,20 +330,6 @@
 					if(S.next_step(M, src))
 						return 1
 
-/*
-	if(M.gloves && istype(M.gloves,/obj/item/clothing/gloves))
-		var/obj/item/clothing/gloves/G = M.gloves
-		if(G.cell)
-			if(M.a_intent == "hurt")//Stungloves. Any contact will stun the alien.
-				if(G.cell.charge >= 2500)
-					G.cell.use(2500)
-					visible_message("<span class='warning'>[src] has been touched with the stun gloves by [M]!</span>")
-					return
-				else
-					to_chat(M, "<span class='warning'>Not enough charge! </span>")
-					return
-*/
-
 	switch(M.a_intent)
 
 		if(INTENT_HELP)
@@ -373,9 +362,9 @@
 				playsound(loc, "punch", 25, 1, -1)
 				visible_message("<span class='danger'>[M] has punched [src]!</span>", \
 						"<span class='userdanger'>[M] has punched [src]!</span>")
-
-				adjustBruteLoss(damage)
-				updatehealth()
+				if(health > -100)
+					adjustBruteLoss(damage)
+					updatehealth()
 			else
 				playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
 				visible_message("<span class='danger'>[M] has attempted to punch [src]!</span>")
@@ -404,13 +393,14 @@
 				var/damage = rand(15, 30)
 				if(damage >= 25)
 					damage = rand(20, 40)
-					visible_message("<span class='danger'>[M] has attacked [name]!</span>", \
-							"<span class='userdanger'>[M] has attacked [name]!</span>")
+					visible_message("<span class='danger'>[M] has slashed [name]!</span>", \
+							"<span class='userdanger'>[M] has slashed [name]!</span>")
 				else
 					visible_message("<span class='danger'>[M] has wounded [name]!</span>", \
 							"<span class='userdanger'>)[M] has wounded [name]!</span>")
-				adjustBruteLoss(damage)
-				updatehealth()
+				if(health > -100)
+					adjustBruteLoss(damage)
+					updatehealth()
 			else
 				playsound(loc, 'sound/weapons/slashmiss.ogg', 25, 1, -1)
 				visible_message("<span class='danger'>[M] has attempted to lunge at [name]!</span>", \

code/modules/mob/living/living.dm

@@ -983,11 +983,12 @@
 	return 0
 
 /mob/living/proc/attempt_harvest(obj/item/I, mob/user)
-	if(stat == DEAD && !isnull(butcher_results)) //can we butcher it?
-		if(istype(I, /obj/item/weapon/kitchen/knife))
+	if(user.a_intent == INTENT_HARM && stat == DEAD && butcher_results) //can we butcher it?
+		var/sharpness = is_sharp(I)
+		if(sharpness)
 			to_chat(user, "<span class='notice'>You begin to butcher [src]...</span>")
 			playsound(loc, 'sound/weapons/slice.ogg', 50, 1, -1)
-			if(do_mob(user, src, 80))
+			if(do_mob(user, src, 80 / sharpness) && Adjacent(I))
 				harvest(user)
 			return 1
 

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

@@ -567,10 +567,7 @@ var/list/robot_verbs_default = list(
 	return 2
 
 
-/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
-
+/mob/living/silicon/robot/attackby(obj/item/weapon/W, mob/user, params)
 	if(opened) // Are they trying to insert something?
 		for(var/V in components)
 			var/datum/robot_component/C = components[V]
@@ -610,6 +607,7 @@ var/list/robot_verbs_default = list(
 
 
 	else if(istype(W, /obj/item/stack/cable_coil) && user.a_intent == INTENT_HELP && (wiresexposed || istype(src,/mob/living/silicon/robot/drone)))
+		user.changeNext_move(CLICK_CD_MELEE)
 		if(!getFireLoss())
 			to_chat(user, "<span class='notice'>Nothing to fix!</span>")
 			return
@@ -744,9 +742,13 @@ var/list/robot_verbs_default = list(
 				to_chat(user, "<span class='danger'>Upgrade error.</span>")
 
 	else
-		spark_system.start()
 		return ..()
 
+/mob/living/silicon/robot/attacked_by(obj/item/I, mob/living/user, def_zone)
+	if(I.force && I.damtype != STAMINA && stat != DEAD) //only sparks if real damage is dealt.
+		spark_system.start()
+	..()
+
 /mob/living/silicon/robot/emag_act(user as mob)
 	if(!ishuman(user) && !issilicon(user))
 		return

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

@@ -8,7 +8,7 @@
 	health = 100
 	maxHealth = 100
 	damage_coeff = list(BRUTE = 0.5, BURN = 0.7, TOX = 0, CLONE = 0, STAMINA = 0, OXY = 0)
-
+	obj_damage = 60
 	environment_smash = 2 //Walls can't stop THE LAW
 	mob_size = MOB_SIZE_LARGE
 

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

@@ -221,8 +221,9 @@
 	update_controls()
 	return
 
-/mob/living/simple_animal/bot/medbot/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
+/mob/living/simple_animal/bot/medbot/attackby(obj/item/weapon/W, mob/user, params)
 	if(istype(W, /obj/item/weapon/reagent_containers/glass))
+		. = 1 //no afterattack
 		if(locked)
 			to_chat(user, "<span class='warning'>You cannot insert a beaker because the panel is locked!</span>")
 			return
@@ -236,7 +237,6 @@
 		reagent_glass = W
 		to_chat(user, "<span class='notice'>You insert [W].</span>")
 		show_controls(user)
-		return
 
 	else
 		var/current_health = health

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

@@ -100,6 +100,7 @@
 	health = 250
 	response_harm   = "harmlessly punches"
 	harm_intent_damage = 0
+	obj_damage = 90
 	melee_damage_lower = 30
 	melee_damage_upper = 30
 	attacktext = "smashes their armoured gauntlet into"
@@ -189,6 +190,7 @@
 	health = 50
 	response_harm = "viciously beats"
 	harm_intent_damage = 5
+	obj_damage = 60
 	melee_damage_lower = 5
 	melee_damage_upper = 5
 	attacktext = "rams"
@@ -302,7 +304,7 @@
 	melee_damage_lower = 1
 	melee_damage_upper = 5
 	attacktext = "prods"
-	environment_smash = 3
+	environment_smash = ENVIRONMENT_SMASH_RWALLS
 	see_in_dark = 8
 	attack_sound = 'sound/weapons/tap.ogg'
 	const_type = "harvester"

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

@@ -9,7 +9,7 @@
 	health = 5
 	maxHealth = 5
 	attacktext = "bites"
-	attacktext = "bites"
+	obj_damage = 0
 	melee_damage_lower = 1
 	melee_damage_upper = 2
 	response_help  = "pets"

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

@@ -14,6 +14,7 @@
 	maxHealth = 100
 	health = 100
 	harm_intent_damage = 5
+	obj_damage = 60
 	melee_damage_lower = 25
 	melee_damage_upper = 25
 	attacktext = "slashes"
@@ -145,6 +146,7 @@
 	melee_damage_upper = 0
 	a_intent = INTENT_HELP
 	friendly = "caresses"
+	obj_damage = 0
 	environment_smash = 0
 	icon_state = "maid"
 	icon_living = "maid"

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

@@ -20,6 +20,7 @@
 	stop_automated_movement_when_pulled = 0
 	maxHealth = 60
 	health = 60
+	obj_damage = 60
 	melee_damage_lower = 20
 	melee_damage_upper = 30
 	attacktext = "mauls"

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

@@ -29,6 +29,7 @@
 	health = 10
 	faction = list("hostile")
 	move_to_delay = 0
+	obj_damage = 0
 	environment_smash = 0
 	mouse_opacity = 2
 	pass_flags = PASSTABLE | PASSGRILLE | PASSMOB

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

@@ -18,6 +18,7 @@
 	health = 25
 
 	harm_intent_damage = 8
+	obj_damage = 50
 	melee_damage_lower = 15
 	melee_damage_upper = 15
 	attacktext = "bites"
@@ -70,6 +71,6 @@
 	health = 65
 	pixel_x = -16
 	mob_size = MOB_SIZE_LARGE
-
+	obj_damage = 80
 	melee_damage_lower = 20
 	melee_damage_upper = 20

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

@@ -8,6 +8,7 @@
 	icon_dead = "otherthing-dead"
 	health = 80
 	maxHealth = 80
+	obj_damage = 100
 	melee_damage_lower = 25
 	melee_damage_upper = 50
 	attacktext = "chomps"

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

@@ -17,7 +17,7 @@
 	armour_penetration = 25
 	melee_damage_lower = 10
 	melee_damage_upper = 100
-	environment_smash = 3
+	environment_smash = ENVIRONMENT_SMASH_RWALLS
 
 	force_threshold = 15
 	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/living/simple_animal/hostile/faithless.dm

@@ -12,7 +12,7 @@
 	speed = 0
 	maxHealth = 80
 	health = 80
-
+	obj_damage = 50
 	harm_intent_damage = 10
 	melee_damage_lower = 15
 	melee_damage_upper = 15

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

@@ -39,6 +39,7 @@
 	response_harm   = "hits"
 	maxHealth = 200
 	health = 200
+	obj_damage = 60
 	melee_damage_lower = 15
 	melee_damage_upper = 20
 	heat_damage_per_tick = 20	//amount of damage applied if animal's body temperature is higher than maxbodytemp

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

@@ -16,6 +16,7 @@
 	faction = list("creature")
 	robust_searching = 1
 	stat_attack = 2
+	obj_damage = 0
 	environment_smash = 0
 	speak_emote = list("squeaks")
 	ventcrawler = 2

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

@@ -1,6 +1,7 @@
 /mob/living/simple_animal/hostile
 	faction = list("hostile")
 	stop_automated_movement_when_pulled = 0
+	obj_damage = 40
 	environment_smash = 1 //Set to 1 to break closets,tables,racks, etc; 2 for walls; 3 for rwalls
 	var/atom/target
 	var/ranged = 0
@@ -241,7 +242,7 @@
 		if(target.loc != null && get_dist(targets_from, target.loc) <= vision_range) //We can't see our target, but he's in our vision range still
 			if(ranged_ignores_vision && ranged_cooldown <= world.time) //we can't see our target... but we can fire at them!
 				OpenFire(target)
-			if(environment_smash >= 2) //If we're capable of smashing through walls, forget about vision completely after finding our target
+			if((environment_smash & ENVIRONMENT_SMASH_WALLS) || (environment_smash & ENVIRONMENT_SMASH_RWALLS)) //If we're capable of smashing through walls, forget about vision completely after finding our target
 				Goto(target,move_to_delay,minimum_distance)
 				FindHidden()
 				return 1

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

@@ -65,6 +65,7 @@
 	melee_damage_lower = 0
 	melee_damage_upper = 0
 	speed = -1
+	obj_damage = 0
 	environment_smash = 0
 
 

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

@@ -267,6 +267,7 @@ Difficulty: Medium
 	maxHealth = 200
 	health = 200
 	faction = list("neutral")
+	obj_damage = 80
 	melee_damage_upper = 30
 	melee_damage_lower = 30
 	damage_coeff = list(BRUTE = 1, BURN = 1, TOX = 1, CLONE = 1, STAMINA = 0, OXY = 1)

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

@@ -7,7 +7,8 @@
 	maxHealth = 1000
 	a_intent = INTENT_HARM
 	sentience_type = SENTIENCE_BOSS
-	environment_smash = 3
+	environment_smash = ENVIRONMENT_SMASH_RWALLS
+	obj_damage = 400
 	luminosity = 3
 	faction = list("mining", "boss")
 	weather_immunities = list("lava","ash")

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

@@ -225,6 +225,7 @@ var/global/list/protected_objects = list(/obj/structure/table, /obj/structure/ca
 /mob/living/simple_animal/hostile/mimic/copy/ranged/CopyObject(obj/O, mob/living/creator, destroy_original = 0)
 	if(..())
 		emote_see = list("aims menacingly")
+		obj_damage = 0
 		environment_smash = 0 //needed? seems weird for them to do so
 		ranged = 1
 		retreat_distance = 1 //just enough to shoot

code/modules/mob/living/simple_animal/hostile/mining/hivelord.dm

@@ -17,6 +17,7 @@
 	maxHealth = 75
 	health = 75
 	harm_intent_damage = 5
+	obj_damage = 0
 	melee_damage_lower = 0
 	melee_damage_upper = 0
 	attacktext = "lashes out at"

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

@@ -4,6 +4,7 @@
 	unsuitable_atmos_damage = 15
 	faction = list("mining")
 	weather_immunities = list("lava","ash")
+	obj_damage = 30
 	environment_smash = 2
 	minbodytemp = 0
 	heat_damage_per_tick = 20
@@ -65,6 +66,7 @@
 	maxHealth = 200
 	health = 200
 	harm_intent_damage = 5
+	obj_damage = 60
 	melee_damage_lower = 12
 	melee_damage_upper = 12
 	attacktext = "bites into"
@@ -125,6 +127,7 @@
 	maxHealth = 300
 	health = 300
 	harm_intent_damage = 1 //Only the manliest of men can kill a Goliath with only their fists.
+	obj_damage = 100
 	melee_damage_lower = 25
 	melee_damage_upper = 25
 	attacktext = "pulverizes"

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

@@ -13,6 +13,7 @@
 	response_disarm = "gently pushes aside"
 	response_harm   = "whacks"
 	harm_intent_damage = 5
+	obj_damage = 0
 	melee_damage_lower = 1
 	melee_damage_upper = 1
 	attack_same = 2

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

@@ -14,6 +14,7 @@
 	health = 100
 
 	harm_intent_damage = 5
+	obj_damage = 60
 	melee_damage_lower = 30
 	melee_damage_upper = 30
 	attacktext = "slashes"

code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm

@@ -22,6 +22,7 @@
 	melee_damage_upper = 10
 	attacktext = "attacks"
 	attack_sound = 'sound/items/bikehorn.ogg'
+	obj_damage = 0
 	environment_smash = 0
 	minbodytemp = 270
 	maxbodytemp = 370

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

@@ -19,6 +19,7 @@
 	healable = 0
 
 	harm_intent_damage = 35
+	obj_damage = 100
 	melee_damage_lower = 34
 	melee_damage_upper = 42
 	attacktext = "claws"

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

@@ -112,6 +112,7 @@
 	pass_flags = PASSTABLE
 	health = 15
 	maxHealth = 15
+	obj_damage = 0
 	melee_damage_lower = 15
 	melee_damage_upper = 15
 	attacktext = "cuts"

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

@@ -24,7 +24,7 @@
 	move_to_delay = 4 // faster than normal
 	ventcrawler = 0
 	ai_ventcrawls = 0
-	environment_smash = 3
+	environment_smash = ENVIRONMENT_SMASH_RWALLS
 	loot = list(/obj/item/clothing/accessory/medal)
 	idle_ventcrawl_chance = 0
 	spider_tier = TS_TIER_3

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

@@ -25,7 +25,7 @@
 	spider_opens_doors = 2
 	ventcrawler = 0
 	ai_ventcrawls = 0
-	environment_smash = 3
+	environment_smash = ENVIRONMENT_SMASH_RWALLS
 	idle_ventcrawl_chance = 0 // stick to the queen!
 	var/dcheck_counter = 0
 	var/queen_visible = 1

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

@@ -232,7 +232,7 @@
 	hasnested = 1
 	ventcrawler = 0
 	ai_ventcrawls = 0
-	environment_smash = 3
+	environment_smash = ENVIRONMENT_SMASH_RWALLS
 	DoQueenScreech(8, 100, 8, 100)
 	MassFlicker()
 	to_chat(src, "<span class='notice'>You have matured to your egglaying stage. You can now smash through walls, and lay eggs, but can no longer ventcrawl.</span>")

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

@@ -54,6 +54,7 @@
 	maxHealth = 50
 	ranged = 1
 	harm_intent_damage = 5
+	obj_damage = 60
 	melee_damage_lower = 25
 	melee_damage_upper = 25
 	a_intent = INTENT_HARM

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

@@ -46,6 +46,7 @@
 	//LETTING SIMPLE ANIMALS ATTACK? WHAT COULD GO WRONG. Defaults to zero so Ian can still be cuddly
 	var/melee_damage_lower = 0
 	var/melee_damage_upper = 0
+	var/obj_damage = 0 //how much damage this simple animal does to objects, if any
 	var/armour_penetration = 0 //How much armour they ignore, as a flat reduction from the targets armour value
 	var/melee_damage_type = BRUTE //Damage type of a simple mob's melee attack, should it do damage.
 	var/list/damage_coeff = list(BRUTE = 1, BURN = 1, TOX = 1, CLONE = 1, STAMINA = 0, OXY = 1) // 1 for full damage , 0 for none , -1 for 1:1 heal from that source
@@ -276,9 +277,6 @@
 		var/damage = rand(M.melee_damage_lower, M.melee_damage_upper)
 		attack_threshold_check(damage,M.melee_damage_type)
 
-/mob/living/simple_animal/proc/attacked_by(obj/item/I, mob/living/user) // Handled in _onclick/click.dm
-	return
-
 /mob/living/simple_animal/bullet_act(var/obj/item/projectile/Proj)
 	if(!Proj)
 		return
@@ -385,7 +383,7 @@
 
 	return
 
-/mob/living/simple_animal/attackby(var/obj/item/O as obj, var/mob/living/user as mob)  //Marker -Agouri
+/mob/living/simple_animal/attackby(obj/item/O, mob/living/user)
 	if(can_collar && !collar && istype(O, /obj/item/clothing/accessory/petcollar))
 		var/obj/item/clothing/accessory/petcollar/C = O
 		user.drop_item()
@@ -399,33 +397,7 @@
 			real_name = C.tagname
 		return
 	else
-		user.changeNext_move(CLICK_CD_MELEE)
-		if(attempt_harvest(O, user))
-			return
-		user.do_attack_animation(src)
-		if(istype(O) && istype(user) && !O.attack(src, user))
-			var/damage = 0
-			if(O.force)
-				if(O.force >= force_threshold)
-					damage = O.force
-					if(O.damtype == STAMINA)
-						damage = 0
-					if(O.damtype == BRUTE)
-						if(prob(33))
-							O.add_mob_blood(src)
-							var/turf/location = get_turf(src)
-							add_splatter_floor(location)
-							if(get_dist(user, src) <= 1)	//people with TK won't get smeared with blood
-								user.add_mob_blood(src)
-					visible_message("<span class='danger'>[user] has [O.attack_verb.len ? "[pick(O.attack_verb)]": "attacked"] [src] with [O]!</span>",\
-									"<span class='userdanger'>[user] has [O.attack_verb.len ? "[pick(O.attack_verb)]": "attacked"] you with [O]!</span>")
-				else
-					visible_message("<span class='danger'>[O] bounces harmlessly off of [src].</span>",\
-									"<span class='userdanger'>[O] bounces harmlessly off of [src].</span>")
-			else
-				user.visible_message("<span class='warning'>[user] gently taps [src] with [O].</span>",\
-									"<span class='warning'>This weapon is ineffective, it does no damage.</span>")
-			adjustBruteLoss(damage)
+		..()
 
 /mob/living/simple_animal/movement_delay()
 	. = ..()

code/modules/mob/mob.dm

@@ -946,6 +946,25 @@ var/list/slot_equipment_priority = list( \
 
 			if(processScheduler)
 				processScheduler.statProcesses()
+		if(statpanel("MC")) //looking at that panel
+			var/turf/T = get_turf(client.eye)
+			stat("Location:", COORD(T))
+			stat("CPU:", "[world.cpu]")
+			stat("Instances:", "[num2text(world.contents.len, 10)]")
+			GLOB.stat_entry()
+			stat(null)
+			if(Master)
+				Master.stat_entry()
+			else
+				stat("Master Controller:", "ERROR")
+			if(Failsafe)
+				Failsafe.stat_entry()
+			else
+				stat("Failsafe Controller:", "ERROR")
+			if(Master)
+				stat(null)
+				for(var/datum/controller/subsystem/SS in Master.subsystems)
+					SS.stat_entry()
 
 	statpanel("Status") // Switch to the Status panel again, for the sake of the lazy Stat procs
 

code/modules/modular_computers/computers/item/computer.dm

@@ -32,7 +32,7 @@
 
 	integrity_failure = 50
 	max_integrity = 100
-	armor = list(melee = 0, bullet = 20, laser = 20, energy = 100, bomb = 0, bio = 100, rad = 100, fire = 0, acid = 0)
+	armor = list(melee = 0, bullet = 20, laser = 20, energy = 100, bomb = 0, bio = 100, rad = 100)
 
 	// Important hardware (must be installed for computer to work)
 

code/modules/modular_computers/computers/item/computer_damage.dm

@@ -1,29 +1,3 @@
-/obj/item/device/modular_computer/emp_act(severity)
-	if(prob(20 / severity))
-		take_damage(obj_integrity, BURN)
-	..()
-
-/obj/item/device/modular_computer/ex_act(severity)
-	switch(severity)
-		if(1)
-			qdel(src)
-		if(2)
-			if(prob(25))
-				qdel(src)
-			else if(prob(50))
-				obj_integrity = 0
-		if(3)
-			if(prob(25))
-				obj_integrity = 0
-
-/obj/item/device/modular_computer/bullet_act(obj/item/projectile/P)
-	take_damage(P.damage, P.damage_type)
-	..()
-
-/obj/item/device/modular_computer/blob_act()
-	if(prob(75))
-		take_damage(obj_integrity, BRUTE)
-
 /obj/item/device/modular_computer/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1)
 	. = ..()
 	var/component_probability = min(50, max(damage_amount*0.1, 1 - obj_integrity/max_integrity))
@@ -36,17 +10,21 @@
 		for(var/I in all_components)
 			var/obj/item/weapon/computer_hardware/H = all_components[I]
 			if(prob(component_probability))
-				H.take_damage(round(damage_amount*0.5))
+				H.take_damage(round(damage_amount*0.5), damage_type, damage_flag, 0)
 
-/obj/item/device/modular_computer/proc/break_apart(damage = TRUE)
-	physical.visible_message("\The [src] breaks apart!")
-	var/turf/newloc = get_turf(src)
-	new /obj/item/stack/sheet/metal(newloc, round(steel_sheet_cost/2))
-	for(var/C in all_components)
-		var/obj/item/weapon/computer_hardware/H = all_components[C]
-		uninstall_component(H)
-		H.forceMove(newloc)
-		if(damage && prob(25))
-			H.take_damage(rand(10, 30))
+/obj/item/device/modular_computer/deconstruct(disassembled = TRUE)
+	break_apart()
+
+/obj/item/device/modular_computer/proc/break_apart()
+	if(can_deconstruct)
+		physical.visible_message("\The [src] breaks apart!")
+		var/turf/newloc = get_turf(src)
+		new /obj/item/stack/sheet/metal(newloc, round(steel_sheet_cost/2))
+		for(var/C in all_components)
+			var/obj/item/weapon/computer_hardware/H = all_components[C]
+			uninstall_component(H)
+			H.forceMove(newloc)
+			if(prob(25))
+				H.take_damage(rand(10,30), BRUTE, 0, 0)
 	relay_qdel()
 	qdel(src)

code/modules/power/apc.dm

@@ -138,6 +138,8 @@
 		terminal.connect_to_network()
 
 /obj/machinery/power/apc/New(turf/loc, var/ndir, var/building=0)
+	if(!armor)
+		armor = list(melee = 20, bullet = 20, laser = 10, energy = 100, bomb = 30, bio = 100, rad = 100)
 	..()
 	apcs += src
 	apcs = sortAtom(apcs)

code/modules/power/lighting.dm

@@ -16,6 +16,7 @@
 	icon_state = "tube-construct-stage1"
 	anchored = 1
 	layer = 5
+	armor = list(melee = 50, bullet = 10, laser = 10, energy = 0, bomb = 0, bio = 0, rad = 0)
 	var/stage = 1
 	var/fixture_type = "tube"
 	var/sheets_refunded = 2

code/modules/power/singularity/field_generator.dm

@@ -27,6 +27,7 @@ field_generator power level display
 	anchored = 0
 	density = 1
 	use_power = 0
+	armor = list(melee = 25, bullet = 10, laser = 100, energy = 100, bomb = 0, bio = 0, rad = 0)
 	var/const/num_power_levels = 6	// Total number of power level icon has
 	var/power_level = 0
 	var/active = FG_OFFLINE

code/modules/power/singularity/particle_accelerator/particle_accelerator.dm

@@ -62,6 +62,7 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin
 	icon_state = "none"
 	anchored = 0
 	density = 1
+	armor = list(melee = 30, bullet = 20, laser = 20, energy = 0, bomb = 0, bio = 0, rad = 0)
 	var/obj/machinery/particle_accelerator/control_box/master = null
 	var/construction_state = 0
 	var/reference = null

code/modules/procedural_mapping/mapGeneratorModules/helpers.dm

@@ -11,7 +11,7 @@
 		return
 	var/list/map = mother.map
 	for(var/turf/simulated/T in map)
-		air_master.remove_from_active(T)
+		SSair.remove_from_active(T)
 	for(var/turf/simulated/T in map)
 		if(T.air)
 			T.air.oxygen = T.oxygen
@@ -19,7 +19,7 @@
 			T.air.carbon_dioxide = T.carbon_dioxide
 			T.air.toxins = T.toxins
 			T.air.temperature = T.temperature
-		air_master.add_to_active(T)
+		SSair.add_to_active(T)
 
 //Only places atoms/turfs on area borders
 /datum/mapGeneratorModule/border

code/modules/recycling/disposal.dm

@@ -15,6 +15,7 @@
 	anchored = 1
 	density = 1
 	on_blueprints = TRUE
+	armor = list(melee = 25, bullet = 10, laser = 10, energy = 100, bomb = 0, bio = 100, rad = 100)
 	var/datum/gas_mixture/air_contents	// internal reservoir
 	var/mode = 1	// item mode 0=off 1=charging 2=charged
 	var/flush = 0	// true if flush handle is pulled
@@ -659,6 +660,7 @@
 	var/dpdir = 0		// bitmask of pipe directions
 	dir = 0				// dir will contain dominant direction for junction pipes
 	var/health = 10 	// health points 0-10
+	armor = list("melee" = 25, "bullet" = 10, "laser" = 10, "energy" = 100, "bomb" = 0, "bio" = 100, "rad" = 100)
 	layer = 2.3			// slightly lower than wires and other pipes
 	var/base_icon_state	// initial icon state on map
 

code/modules/shuttle/shuttle.dm

@@ -33,6 +33,9 @@
 
 		return QDEL_HINT_LETMELIVE
 
+/obj/docking_port/take_damage()
+	return
+
 /obj/docking_port/singularity_pull()
 	return
 
@@ -490,15 +493,15 @@
 			T1.shuttleRotate(rotation)
 
 		//lighting stuff
-		air_master.remove_from_active(T1)
+		SSair.remove_from_active(T1)
 		T1.CalculateAdjacentTurfs()
-		air_master.add_to_active(T1,1)
+		SSair.add_to_active(T1,1)
 
 		T0.ChangeTurf(turf_type)
 
-		air_master.remove_from_active(T0)
+		SSair.remove_from_active(T0)
 		T0.CalculateAdjacentTurfs()
-		air_master.add_to_active(T0,1)
+		SSair.add_to_active(T0,1)
 
 	for(var/A1 in L1)
 		var/turf/T1 = A1

code/modules/vehicle/vehicle.dm

@@ -8,6 +8,7 @@
 	anchored = 0
 	can_buckle = 1
 	buckle_lying = 0
+	armor = list("melee" = 30, "bullet" = 30, "laser" = 30, "energy" = 0, "bomb" = 30, "bio" = 0, "rad" = 0)
 	var/keytype = null //item typepath, if non-null an item of this type is needed in your hands to drive this vehicle
 	var/next_vehicle_move = 0 //used for move delays
 	var/vehicle_move_delay = 2 //tick delay between movements, lower = faster, higher = slower