Merge branch 'master' of https://github.com/tgstation/-tg-station into pinned

code/game/objects/effects/mines.dm

@@ -31,7 +31,7 @@
 	s.start()
 	obj:radiation += 50
 	randmutb(obj)
-	domutcheck(obj,null)
+	domutcheck(obj)
 	qdel(src)
 
 /obj/effect/mine/proc/triggerstun(obj)

code/game/objects/items.dm

@@ -58,7 +58,6 @@
 	else
 		return 1
 
-	var/attackback = 0 //calls calls attackby() when you hit an obj with an item with this var set to 1.
 
 /obj/item/device
 	icon = 'icons/obj/device.dmi'

code/game/objects/items/blueprints.dm

@@ -169,7 +169,7 @@
 /obj/item/areaeditor/proc/edit_area()
 	var/area/A = get_area()
 	var/prevname = "[A.name]"
-	var/str = trim(stripped_input(usr,"New area name:", "Blueprint Editing", prevname, MAX_NAME_LEN))
+	var/str = trim(stripped_input(usr,"New area name:", "Blueprint Editing", "", MAX_NAME_LEN))
 	if(!str || !length(str) || str==prevname) //cancel
 		return
 	if(length(str) > 50)

code/game/objects/items/devices/transfer_valve.dm

@@ -158,7 +158,7 @@
 	*/
 
 /obj/item/device/transfer_valve/proc/toggle_valve()
-	if(valve_open==0 && (tank_one && tank_two))
+	if(!valve_open && tank_one && tank_two)
 		valve_open = 1
 		var/turf/bombturf = get_turf(src)
 		var/area/A = get_area(bombturf)
@@ -203,7 +203,7 @@
 				sleep(10)
 			src.update_icon()
 
-	else if(valve_open==1 && (tank_one && tank_two))
+	else if(valve_open && tank_one && tank_two)
 		split_gases()
 		valve_open = 0
 		src.update_icon()

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

@@ -24,7 +24,7 @@
 		M.radiation += rand(20/(damage_coeff  ** 2),50/(damage_coeff  ** 2))
 		var/log_msg = "[key_name(user)] injected [key_name(M)] with the [name]"
 		for(var/datum/mutation/human/HM in remove_mutations)
-			HM.on_losing(M)
+			HM.force_lose(M)
 		for(var/datum/mutation/human/HM in add_mutations)
 			if(HM.name == RACEMUT)
 				message_admins("[key_name_admin(user)] injected [key_name_admin(M)] with the [name] <span class='danger'>(MONKEY)</span>")

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

@@ -74,8 +74,8 @@
 	if(user)
 		var/obj/item/weapon/twohanded/O = user.get_inactive_hand()
 		if(istype(O))
-			O.unwield()
-	return	unwield()
+			O.unwield(user)
+	return	unwield(user)
 
 /obj/item/weapon/twohanded/update_icon()
 	return

code/game/objects/structures/crates_lockers/closets/crittercrate.dm

@@ -77,3 +77,7 @@
 /obj/structure/closet/critter/pug
 	name = "pug crate"
 	content_mob = /mob/living/simple_animal/pug
+
+/obj/structure/closet/critter/fox
+	name = "fox crate"
+	content_mob = /mob/living/simple_animal/fox