Polaris December Sync

code/modules/projectiles/ammunition/boxes.dm

@@ -53,6 +53,10 @@
 	name = "magazine (.45 flash)"
 	ammo_type = /obj/item/ammo_casing/c45f
 
+/obj/item/ammo_magazine/c45m/ap
+	name = "magazine (.45 AP)"
+	ammo_type = /obj/item/ammo_casing/c45ap
+
 /obj/item/ammo_magazine/c45uzi
 	name = "stick magazine (.45)"
 	icon_state = "uzi45"
@@ -75,6 +79,10 @@
 	caliber = ".45"
 	max_ammo = 20
 
+/obj/item/ammo_magazine/tommymag/ap
+	name = "tommygun magazine (.45 AP)"
+	ammo_type = /obj/item/ammo_casing/c45ap
+
 /obj/item/ammo_magazine/tommymag/empty
 	initial_ammo = 0
 
@@ -88,6 +96,10 @@
 	caliber = ".45"
 	max_ammo = 50
 
+/obj/item/ammo_magazine/tommydrum/ap
+	name = "tommygun drum magazine (.45 AP)"
+	ammo_type = /obj/item/ammo_casing/c45ap
+
 /obj/item/ammo_magazine/tommydrum/empty
 	initial_ammo = 0
 

code/modules/projectiles/ammunition/bullets.dm

@@ -63,6 +63,12 @@
 	caliber = ".45"
 	projectile_type = /obj/item/projectile/bullet/pistol/medium
 
+/obj/item/ammo_casing/c45ap
+	desc = "A .45 Armor-Piercing bullet casing."
+	caliber = ".45"
+	icon_state = "r-casing"
+	projectile_type = /obj/item/projectile/bullet/pistol/medium/ap
+
 /obj/item/ammo_casing/c45p
 	desc = "A .45 practice bullet casing."
 	caliber = ".45"

code/modules/projectiles/gun.dm

@@ -284,7 +284,10 @@
 			if(one_handed_penalty >= 2)
 				user << "<span class='warning'>You struggle to keep \the [src] pointed at the correct position with just one hand!</span>"
 
-	admin_attack_log(usr, attacker_message="Fired [src]", admin_message="fired a gun ([src]) (MODE: [src.mode_name]) [reflex ? "by reflex" : "manually"].")
+	if(reflex)
+		admin_attack_log(user, target, attacker_message = "fired [src] by reflex.", victim_message = "triggered a reflex shot from [src].", admin_message = "shot [target], who triggered gunfire ([src]) by reflex)")
+	else
+		admin_attack_log(usr, attacker_message="Fired [src]", admin_message="fired a gun ([src]) (MODE: [src.mode_name]) [reflex ? "by reflex" : "manually"].")
 
 	//update timing
 	user.setClickCooldown(DEFAULT_QUICK_COOLDOWN)

code/modules/projectiles/guns/projectile/shotgun.dm

@@ -90,10 +90,11 @@
 	if(istype(A, /obj/item/weapon/circular_saw) || istype(A, /obj/item/weapon/melee/energy) || istype(A, /obj/item/weapon/pickaxe/plasmacutter))
 		user << "<span class='notice'>You begin to shorten the barrel of \the [src].</span>"
 		if(loaded.len)
-			for(var/i in 1 to max_shells)
-				afterattack(user, user)	//will this work? //it will. we call it twice, for twice the FUN
-				playsound(user, fire_sound, 50, 1)
+			var/burstsetting = burst
+			burst = 2
 			user.visible_message("<span class='danger'>The shotgun goes off!</span>", "<span class='danger'>The shotgun goes off in your face!</span>")
+			Fire_userless(user)
+			burst = burstsetting
 			return
 		if(do_after(user, 30))	//SHIT IS STEALTHY EYYYYY
 			icon_state = "sawnshotgun"

code/modules/projectiles/projectile/bullets.dm

@@ -127,12 +127,16 @@
 	damage = 20
 
 /obj/item/projectile/bullet/pistol/ap
-	damage = 20
+	damage = 15
 	armor_penetration = 30
 
 /obj/item/projectile/bullet/pistol/medium
 	damage = 25
 
+/obj/item/projectile/bullet/pistol/medium/ap
+	damage = 20
+	armor_penetration = 15
+
 /obj/item/projectile/bullet/pistol/strong //revolvers and matebas
 	damage = 60
 

code/modules/projectiles/targeting/targeting_triggers.dm

@@ -26,4 +26,4 @@
 	owner.visible_message("<span class='danger'>\The [owner] pulls the trigger reflexively!</span>")
 	var/obj/item/weapon/gun/G = aiming_with
 	if(istype(G))
-		G.Fire(aiming_at, owner)
+		G.Fire(aiming_at, owner, reflex = 1)