Merge branch 'dev' of github.com:Baystation12/Baystation12 into dev

code/game/jobs/job/assistant.dm

@@ -15,6 +15,10 @@
 	if(!H)	return 0
 	H.equip_to_slot_or_del(new /obj/item/clothing/under/color/grey(H), slot_w_uniform)
 	H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(H), slot_shoes)
+	if(H.backbag == 1)
+		H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand)
+	else
+		H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack)
 	return 1
 
 /datum/job/assistant/get_access()

code/game/jobs/job/civilian.dm

@@ -342,6 +342,7 @@
 
 	equip(var/mob/living/carbon/human/H)
 		if(!H)	return 0
+		H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_sec(H), slot_ears)
 		switch(H.backbag)
 			if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(H), slot_back)
 			if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_norm(H), slot_back)

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"