Merge branch 'master' into upstream-merge-29923

code/modules/mob/living/carbon/monkey/combat.dm

@@ -78,7 +78,7 @@
 
 	// WEAPONS
 	if(istype(I, /obj/item/weapon))
-		var/obj/item/weapon/W = I
+		var/obj/item/W = I
 		if(W.force >= best_force)
 			put_in_hands(W)
 			best_force = W.force
@@ -153,7 +153,7 @@
 	if(!locate(/obj/item/weapon) in held_items)
 		best_force = 0
 
-	if(restrained() || blacklistItems[pickupTarget] || (pickupTarget && (pickupTarget.flags & NODROP)))
+	if(restrained() || blacklistItems[pickupTarget] || (pickupTarget && (pickupTarget.flags_1 & NODROP_1)))
 		pickupTarget = null
 
 	if(!resisting && pickupTarget)
@@ -245,7 +245,7 @@
 
 			// pickup any nearby weapon
 			if(!pickupTarget && prob(MONKEY_WEAPON_PROB))
-				var/obj/item/weapon/W = locate(/obj/item/weapon/) in oview(2,src)
+				var/obj/item/W = locate(/obj/item/) in oview(2,src)
 				if(W && !blacklistItems[W] && W.force > best_force)
 					pickupTarget = W
 
@@ -272,9 +272,9 @@
 				if(Adjacent(target) && isturf(target.loc))	// if right next to perp
 
 					// check if target has a weapon
-					var/obj/item/weapon/W
-					for(var/obj/item/weapon/I in target.held_items)
-						if(!(I.flags & ABSTRACT))
+					var/obj/item/W
+					for(var/obj/item/I in target.held_items)
+						if(!(I.flags_1 & ABSTRACT_1))
 							W = I
 							break
 
@@ -388,7 +388,7 @@
 
 // attack using a held weapon otherwise bite the enemy, then if we are angry there is a chance we might calm down a little
 /mob/living/carbon/monkey/proc/monkey_attack(mob/living/L)
-	var/obj/item/weapon/Weapon = locate(/obj/item/weapon) in held_items
+	var/obj/item/Weapon = locate(/obj/item/weapon) in held_items
 
 	// attack with weapon if we have one
 	if(Weapon)
@@ -439,7 +439,7 @@
 		retaliate(L)
 	return ..()
 
-/mob/living/carbon/monkey/attackby(obj/item/weapon/W, mob/user, params)
+/mob/living/carbon/monkey/attackby(obj/item/W, mob/user, params)
 	..()
 	if((W.force) && (!target) && (W.damtype != STAMINA) )
 		retaliate(user)

code/modules/mob/living/carbon/monkey/combat.dm.rej

@@ -0,0 +1,19 @@
+diff a/code/modules/mob/living/carbon/monkey/combat.dm b/code/modules/mob/living/carbon/monkey/combat.dm	(rejected hunks)
+@@ -153,7 +153,7 @@
+ 	if(!locate(/obj/item) in held_items)
+ 		best_force = 0
+ 
+-	if(restrained() || blacklistItems[pickupTarget] || (pickupTarget && (pickupTarget.flags & NODROP)))
++	if(restrained() || blacklistItems[pickupTarget] || (pickupTarget && (pickupTarget.flags_1 & NODROP_1)))
+ 		pickupTarget = null
+ 
+ 	if(!resisting && pickupTarget)
+@@ -274,7 +274,7 @@
+ 					// check if target has a weapon
+ 					var/obj/item/W
+ 					for(var/obj/item/I in target.held_items)
+-						if(!(I.flags & ABSTRACT))
++						if(!(I.flags_1 & ABSTRACT_1))
+ 							W = I
+ 							break
+ 

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

@@ -137,7 +137,7 @@
 
 /mob/living/carbon/monkey/has_smoke_protection()
 	if(wear_mask)
-		if(wear_mask.flags & BLOCK_GAS_SMOKE_EFFECT)
+		if(wear_mask.flags_1 & BLOCK_GAS_SMOKE_EFFECT_1)
 			return 1
 
 /mob/living/carbon/monkey/handle_fire()

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

@@ -8,8 +8,8 @@
 	gender = NEUTER
 	pass_flags = PASSTABLE
 	ventcrawler = VENTCRAWLER_NUDE
-	butcher_results = list(/obj/item/weapon/reagent_containers/food/snacks/meat/slab/monkey = 5, /obj/item/stack/sheet/animalhide/monkey = 1)
-	type_of_meat = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/monkey
+	butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab/monkey = 5, /obj/item/stack/sheet/animalhide/monkey = 1)
+	type_of_meat = /obj/item/reagent_containers/food/snacks/meat/slab/monkey
 	gib_type = /obj/effect/decal/cleanable/blood/gibs
 	unique_name = 1
 	bodyparts = list(/obj/item/bodypart/chest/monkey, /obj/item/bodypart/head/monkey, /obj/item/bodypart/l_arm/monkey,
@@ -105,11 +105,11 @@
 	//Lasertag bullshit
 	if(lasercolor)
 		if(lasercolor == "b")//Lasertag turrets target the opposing team, how great is that? -Sieve
-			if(is_holding_item_of_type(/obj/item/weapon/gun/energy/laser/redtag))
+			if(is_holding_item_of_type(/obj/item/gun/energy/laser/redtag))
 				threatcount += 4
 
 		if(lasercolor == "r")
-			if(is_holding_item_of_type(/obj/item/weapon/gun/energy/laser/bluetag))
+			if(is_holding_item_of_type(/obj/item/gun/energy/laser/bluetag))
 				threatcount += 4
 
 		return threatcount
@@ -140,7 +140,7 @@
 		return 0
 	return 1
 
-/mob/living/carbon/monkey/can_use_guns(var/obj/item/weapon/G)
+/mob/living/carbon/monkey/can_use_guns(var/obj/item/G)
 	return 1
 
 /mob/living/carbon/monkey/angry