Merge resolution in Engineering.dm

code/modules/clothing/head/jobs.dm

@@ -59,6 +59,11 @@
 	desc = "A beret with the security insignia emblazoned on it. For officers that are more inclined towards style than safety."
 	icon_state = "beret_badge"
 	flags = FPRINT | TABLEPASS
+/obj/item/clothing/head/beret/eng
+	name = "engineering beret"
+	desc = "A beret with the engineering insignia emblazoned on it. For engineers that are more inclined towards style than safety."
+	icon_state = "e_beret_badge"
+	flags = FPRINT | TABLEPASS
 
 //Medical
 /obj/item/clothing/head/surgery

code/modules/projectiles/ammunition/bullets.dm

@@ -47,7 +47,7 @@
 /obj/item/ammo_casing/a12mm
 	desc = "A 12mm bullet casing."
 	caliber = "12mm"
-	projectile_type = "/obj/item/projectile/bullet/midbullet"
+	projectile_type = "/obj/item/projectile/bullet/midbullet2"
 
 
 /obj/item/ammo_casing/shotgun
@@ -93,4 +93,4 @@
 /obj/item/ammo_casing/a762
 	desc = "A 7.62 bullet casing."
 	caliber = "a762"
-	projectile_type = "/obj/item/projectile/bullet"
+	projectile_type = "/obj/item/projectile/bullet/a762"

code/modules/reagents/Chemistry-Reagents.dm

@@ -2035,8 +2035,10 @@ datum
 							victim << "\red Your [safe_thing] protect you from most of the pepperspray!"
 							victim.eye_blurry = max(M.eye_blurry, 15)
 							victim.eye_blind = max(M.eye_blind, 5)
-							victim.Paralyse(1)
-							victim.drop_item()
+							victim.Stun(5)
+							victim.Weaken(5)
+							//victim.Paralyse(10)
+							//victim.drop_item()
 							return
 						else if ( eyes_covered ) // Eye cover is better than mouth cover
 							victim << "\red Your [safe_thing] protects your eyes from the pepperspray!"
@@ -2048,8 +2050,10 @@ datum
 							victim << "\red You're sprayed directly in the eyes with pepperspray!"
 							victim.eye_blurry = max(M.eye_blurry, 25)
 							victim.eye_blind = max(M.eye_blind, 10)
-							victim.Paralyse(1)
-							victim.drop_item()
+							victim.Stun(5)
+							victim.Weaken(5)
+							//victim.Paralyse(10)
+							//victim.drop_item()
 
 		frostoil
 			name = "Frost Oil"