Deck 3 Security Mapping Oversights Fixes (#15080)

code/modules/projectiles/ammunition/boxes.dm

@@ -107,6 +107,7 @@
 
 /obj/item/ammo_magazine/c45m/practice
 	name = "magazine (.45 practice)"
+	icon_state = "45_practice"
 	ammo_type = /obj/item/ammo_casing/c45/practice
 
 /obj/item/ammo_magazine/c45m/flash
@@ -326,6 +327,7 @@
 
 /obj/item/ammo_magazine/a556/carbine/practice
 	name = "carbine magazine (5.56mm practice)"
+	icon_state = "5.56c_practice"
 	ammo_type = /obj/item/ammo_casing/a556/practice
 
 /obj/item/ammo_magazine/a556/carbine/ap

code/modules/projectiles/gun.dm

@@ -548,15 +548,15 @@
 	var/mob/living/carbon/human/M = user
 
 	mouthshoot = TRUE
-	M.visible_message(SPAN_WARNING("\The [user] sticks their gun in their mouth, ready to pull the trigger..."))
+	M.visible_message(SPAN_DANGER("\The [user] sticks \the [src] in their mouth, their finger ready to pull the trigger..."))
 	if(!do_after(user, 40))
-		M.visible_message(SPAN_NOTICE("\The [user] decided life was worth living"))
+		M.visible_message(SPAN_GOOD("\The [user] takes \the [src] out of their mouth."))
 		mouthshoot = FALSE
 		return
 	var/obj/item/projectile/in_chamber = consume_next_projectile()
-	if (istype(in_chamber))
-		user.visible_message(SPAN_WARNING("\The [user] pulls the trigger."))
-		if (!pin && needspin)//Checks the pin of the gun.
+	if(istype(in_chamber))
+		user.visible_message(SPAN_DANGER("\The [user] pulls the trigger."))
+		if (!pin && needspin) // Checks the pin of the gun.
 			handle_click_empty(user)
 			mouthshoot = FALSE
 			return
@@ -565,7 +565,6 @@
 			mouthshoot = FALSE
 			return
 		if(safety() && user.a_intent != I_HURT)
-			user.visible_message(SPAN_WARNING("The safety was on. How anticlimatic!"))
 			handle_click_empty(user)
 			mouthshoot = FALSE
 			return
@@ -576,16 +575,15 @@
 
 		in_chamber.on_hit(M)
 
-		if (in_chamber.damage == 0)
+		if(in_chamber.damage == 0)
 			user.show_message(SPAN_WARNING("You feel rather silly, trying to commit suicide with a toy."))
 			mouthshoot = FALSE
 			return
-		else if (in_chamber.damage_type == PAIN)
-			to_chat(user, SPAN_NOTICE("Ow..."))
-			user.apply_effect(110,PAIN,0)
+		else if(in_chamber.damage_type == PAIN)
+			user.apply_damage(in_chamber.damage * 2, PAIN, BP_HEAD)
 		else
-			log_and_message_admins("[key_name(user)] commited suicide using \a [src]")
-			user.apply_damage(in_chamber.damage*2.5, in_chamber.damage_type, BP_HEAD, used_weapon = "Point blank shot in the mouth with \a [in_chamber]", damage_flags = DAM_SHARP)
+			log_and_message_admins("[key_name(user)] commited suicide using \a [src].")
+			user.apply_damage(in_chamber.damage * 20, in_chamber.damage_type, BP_HEAD, used_weapon = "Point blank shot in the mouth with \a [in_chamber]", damage_flags = DAM_SHARP)
 			user.death()
 
 		handle_post_fire(user, user, FALSE, FALSE, FALSE)

code/modules/projectiles/guns/bang/pistol.dm

@@ -8,7 +8,7 @@
 	pixel_offset_y = 18
 
 /obj/item/gun/bang/sec
-	name = ".45 pistol"
+	name = "\improper .45 pistol"
 	desc = "A NanoTrasen designed sidearm, found among law enforcement and security forces. Uses .45 rounds."
 	desc_fluff = "The NT Mk58 is a ballistic sidearm developed and produced by NanoTrasen. Bulky and heavy, the Mk58 is nonetheless used by security forces and law enforcement for its ease of use, low maintenance requirement, longevity, reliability - and most of all, extremely inexpensive price tag. A trademark of NanoTrasen security forces. It uses .45 rounds."
 	icon = 'icons/obj/guns/secgun.dmi'
@@ -21,9 +21,9 @@
 	name = ".45 signal pistol"
 
 /obj/item/gun/bang/sec/wood
+	name = "custom .45 pistol"
 	desc = "A NanoTrasen designed sidearm, found among law enforcement and security forces. It has a wooden grip. Uses .45 rounds."
 	desc_fluff = "The NT Mk58 is a ballistic sidearm developed and produced by NanoTrasen. Bulky and heavy, the Mk58 is nonetheless used by security forces and law enforcement for its ease of use, low maintenance requirement, longevity, reliability - and most of all, extremely inexpensive price tag. A trademark of NanoTrasen security forces. This one has a wooden grip. It uses .45 rounds."
-	name = "custom .45 Pistol"
 	icon = 'icons/obj/guns/secgun_wood.dmi'
 	icon_state = "secgunwood"
 	item_state = "secgunwood"

code/modules/projectiles/guns/energy/disruptor.dm

@@ -1,5 +1,3 @@
-
-
 /obj/item/gun/energy/disruptorpistol
 	name = "disruptor pistol"
 	desc = "A NanoTrasen designed blaster pistol with two settings: stun and lethal."
@@ -14,7 +12,7 @@
 	origin_tech = list(TECH_COMBAT = 3, TECH_MAGNET = 2)
 	matter = list(DEFAULT_WALL_MATERIAL = 2000)
 	projectile_type = /obj/item/projectile/energy/disruptorstun
-	secondary_projectile_type = /obj/item/projectile/energy/blaster
+	secondary_projectile_type = /obj/item/projectile/energy/blaster/disruptor
 	max_shots = 10
 	charge_cost = 150
 	accuracy = 1
@@ -24,10 +22,20 @@
 	firemodes = list(
 		list(mode_name="stun", projectile_type=/obj/item/projectile/energy/disruptorstun, modifystate="disruptorpistolstun", fire_sound = 'sound/weapons/gunshot/bolter.ogg'),
 		list(mode_name="lethal", projectile_type=/obj/item/projectile/energy/blaster/disruptor, modifystate="disruptorpistolkill", recoil = 1, fire_sound = 'sound/weapons/gunshot/bolter.ogg')
-		)
+	)
 	required_firemode_auth = list(WIRELESS_PIN_STUN, WIRELESS_PIN_LETHAL)
 	var/selectframecheck = FALSE
 
+/obj/item/gun/energy/disruptorpistol/practice
+	name = "practice disruptor pistol"
+	desc = "A variant of the NT DP-7. It fires less concentrated energy bolts that are visible, but ultimately harmless, designed for target practice."
+	projectile_type = /obj/item/projectile/energy/disruptorstun/practice
+	secondary_projectile_type = /obj/item/projectile/energy/blaster/disruptor/practice
+	firemodes = list(
+		list(mode_name="stun (practice)", projectile_type=/obj/item/projectile/energy/disruptorstun/practice, modifystate="disruptorpistolstun", fire_sound = 'sound/weapons/gunshot/bolter.ogg'),
+		list(mode_name="lethal (practice)", projectile_type=/obj/item/projectile/energy/blaster/disruptor/practice, modifystate="disruptorpistolkill", recoil = 1, fire_sound = 'sound/weapons/gunshot/bolter.ogg')
+	)
+
 /obj/item/gun/energy/disruptorpistol/security
 	pin = /obj/item/device/firing_pin/wireless
 

code/modules/projectiles/guns/energy/rifle.dm

@@ -60,6 +60,11 @@
 	firemodes = list()
 	modifystate = null
 
+/obj/item/gun/energy/rifle/laser/practice
+	name = "practice laser rifle"
+	desc = "A modified version of the NT LR-6. It fires less concentrated laser beams that are visible, but ultimately harmless, designed for target practice."
+	projectile_type = /obj/item/projectile/beam/practice
+
 /obj/item/gun/energy/rifle/laser/noctiluca
 	name = "combat laser rifle"
 	desc = "The Noctiluca XM/24 is a brand new model of laser rifle, developed entirely by Kumar Arms, a Zavodskoi Interstellar subsidiary. Easy to handle for users with minimal training, reliable and with a reasonable form factor, it is poised to become the new standard for laser weaponry."

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

@@ -88,7 +88,7 @@
 		icon_state = "coltauto-e"
 
 /obj/item/gun/projectile/sec
-	name = ".45 pistol"
+	name = "\improper .45 pistol"
 	desc = "A NanoTrasen designed sidearm, found among law enforcement and security forces. Uses .45 rounds."
 	desc_fluff = "The NT Mk58 is a ballistic sidearm developed and produced by NanoTrasen. Bulky and heavy, the Mk58 is nonetheless used by security forces and law enforcement for its ease of use, low maintenance requirement, longevity, reliability - and most of all, extremely inexpensive price tag. A trademark of NanoTrasen security forces. It uses .45 rounds."
 	icon = 'icons/obj/guns/secgun.dmi'
@@ -118,9 +118,9 @@
 	magazine_type = /obj/item/ammo_magazine/c45m/flash
 
 /obj/item/gun/projectile/sec/wood
+	name = "custom .45 pistol"
 	desc = "A NanoTrasen designed sidearm, found among law enforcement and security forces. It has a wooden grip. Uses .45 rounds."
 	desc_fluff = "The NT Mk58 is a ballistic sidearm developed and produced by NanoTrasen. Bulky and heavy, the Mk58 is nonetheless used by security forces and law enforcement for its ease of use, low maintenance requirement, longevity, reliability - and most of all, extremely inexpensive price tag. A trademark of NanoTrasen security forces. This one has a faux wooden grip. It uses .45 rounds."
-	name = "custom .45 Pistol"
 	icon = 'icons/obj/guns/secgun_wood.dmi'
 	icon_state = "secgunwood"
 	item_state = "secgunwood"

code/modules/projectiles/projectile/beams.dm

@@ -19,13 +19,9 @@
 
 /obj/item/projectile/beam/practice
 	name = "laser"
-	icon_state = "laser"
-	pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE | PASSRAILING
-	damage = 0
-	damage_type = BURN
-	no_attack_log = 1
-	check_armor = "laser"
-	eyeblur = 2
+	damage = 5
+	damage_type = PAIN
+	eyeblur = 0
 
 /obj/item/projectile/beam/pistol
 	damage = 25

code/modules/projectiles/projectile/energy.dm

@@ -184,6 +184,11 @@
 	damage = 20
 	pass_flags = PASSTABLE | PASSRAILING
 
+/obj/item/projectile/energy/blaster/disruptor/practice
+	damage = 5
+	damage_type = PAIN
+	eyeblur = 0
+
 /obj/item/projectile/energy/disruptorstun
 	name = "disruptor bolt"
 	icon_state = "blue_laser"
@@ -195,6 +200,11 @@
 	pass_flags = PASSTABLE | PASSRAILING
 	muzzle_type = /obj/effect/projectile/muzzle/bolt
 
+/obj/item/projectile/energy/disruptorstun/practice
+	damage = 5
+	damage_type = PAIN
+	eyeblur = 0
+
 /obj/item/projectile/energy/blaster/heavy
 	damage = 35
 	armor_penetration = 10