Merge pull request #6681 from Baystation12/dev-freeze

Dev freeze -> Dev

code/game/area/Space Station 13 areas.dm

@@ -708,6 +708,10 @@ var/list/ghostteleportlocs = list()
 	name = "\improper EVA Maintenance"
 	icon_state = "maint_eva"
 
+/area/maintenance/dormitory
+	name = "Dormitory Maintenance"
+	icon_state = "maint_dormitory"
+
 /area/maintenance/incinerator
 	name = "\improper Incinerator"
 	icon_state = "disposal"
@@ -720,13 +724,17 @@ var/list/ghostteleportlocs = list()
 	name = "Medbay Maintenance"
 	icon_state = "maint_medbay"
 
-/area/maintenance/misc_research
-	name = "Misc. Research Maintenance"
-	icon_state = "maint_misc_research"
+/area/maintenance/research_port
+	name = "Port Research Maintenance"
+	icon_state = "maint_research_port"
+
+/area/maintenance/research_starboard
+	name = "Starboard Research Maintenance"
+	icon_state = "maint_research_starboard"
 
 /area/maintenance/research_shuttle
 	name = "Research Shuttle Dock Maintenance"
-	icon_state = "maint_r_shuttle"
+	icon_state = "maint_research_shuttle"
 
 /area/maintenance/security_port
 	name = "Port Security Maintenance"
@@ -740,14 +748,6 @@ var/list/ghostteleportlocs = list()
 	name = "Atmospherics"
 	icon_state = "green"
 
-/area/maintenance/virology
-	name = "Virology Maintenance"
-	icon_state = "maint_viro"
-
-/area/maintenance/xeno
-	name = "Xeno Maintenance"
-	icon_state = "maint_xeno"
-
 // SUBSTATIONS (Subtype of maint, that should let them serve as shielded area during radstorm)
 
 /area/maintenance/substation

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

@@ -477,10 +477,12 @@
 	if(H.a_intent != "hurt")
 		return 0
 
-	if(unarmed.shredding && unarmed.is_usable(H))
-		return 1
-	else if(secondary_unarmed.shredding && secondary_unarmed.is_usable(H))
-		return 1
+	if(unarmed.is_usable(H))
+		if(unarmed.shredding)
+			return 1
+	else if(secondary_unarmed.is_usable(H))
+		if(secondary_unarmed.shredding)
+			return 1
 
 	return 0
 
@@ -512,7 +514,7 @@
 /datum/unarmed_attack/bite
 	attack_verb = list("bite") // 'x has biteed y', needs work.
 	attack_sound = 'sound/weapons/bite.ogg'
-	shredding = 1
+	shredding = 0
 	damage = 5
 	sharp = 1
 	edge = 1

code/modules/power/breaker_box.dm

@@ -21,7 +21,7 @@
 	icon_state = "bbox_on"
 
 	// Enabled on server startup. Used in substations to keep them in bypass mode.
-/obj/machinery/power/breakerbox/activated/New()
+/obj/machinery/power/breakerbox/activated/initialize()
 	set_state(1)
 
 /obj/machinery/power/breakerbox/examine()