NT-USP revamp (#17501)

* NT-USP revamp

* wound bonus

* rule of cool

* changed wound bonus

* angery ntusp

* sprite change

* =new moodkit sprite by biome

Co-authored-by: Byemoh <baiomurang@gmail.com>

code/modules/projectiles/boxes_magazines/external/rechargable.dm

@@ -44,13 +44,22 @@
 		"fire" = 2
 	)
 
+/obj/item/gun/ballistic/automatic/pistol/ntusp/update_icon()
+	icon_state = initial(icon_state)
+	if(istype(magazine, /obj/item/ammo_box/magazine/recharge/ntusp/laser))
+		icon_state = "ntusp-l"
+	..()
+
 //NT-USP Clip
 /obj/item/ammo_box/magazine/recharge/ntusp
 	name = "small power pack"
-	desc = "A small rechargable power pack that synthesizes .22HL bullets, used in the NT-USP."
+	desc = "A small, rechargeable power pack for the NT-USP. Synthesizes up to twelve .22HL bullets that tire targets."
 	icon_state = "powerpack_small"
 	ammo_type = /obj/item/ammo_casing/caseless/c22hl
-	max_ammo = 9
+	max_ammo = 12
+
+/obj/item/ammo_box/magazine/recharge/ntusp/empty
+	start_empty = TRUE
 
 /obj/item/ammo_box/magazine/recharge/ntusp/emp_act(severity) //shooting physical bullets wont stop you dying to an EMP
 	. = ..()
@@ -66,10 +75,59 @@
 	projectile_type = /obj/item/projectile/bullet/c22hl
 
 /obj/item/projectile/bullet/c22hl //.22 HL
-	name = "NT-USP beam"
+	name = "hardlight beam"
 	icon_state = "disabler_bullet"
 	flag = ENERGY
 	damage = 2 //ouch ouch my skin ouchie
 	damage_type = BURN
 	stamina = 25
+	speed = 0.55
 
+//NT-USP Lethal Clip
+/obj/item/ammo_box/magazine/recharge/ntusp/laser
+	desc = "A small, rechargeable power pack for the NT-USP that has been modified. Synthesizes up to eight .22LS bullets that fire lasers."
+	ammo_type = /obj/item/ammo_casing/caseless/c22ls
+	icon_state = "powerpack_small-l"
+	max_ammo = 8
+
+/obj/item/ammo_box/magazine/recharge/ntusp/laser/empty
+	start_empty = TRUE
+
+/obj/item/ammo_casing/caseless/c22ls
+	caliber = LASER
+	projectile_type = /obj/item/projectile/bullet/c22ls
+
+/obj/item/projectile/bullet/c22ls //.22 LS
+	name = "laser beam"
+	icon_state = "disabler_bullet"
+	flag = LASER
+	damage = 18
+	damage_type = BURN
+	color = "#ff0000"
+	speed = 0.55
+	wound_bonus = -15
+	bare_wound_bonus = 5
+	splatter = TRUE
+
+/obj/item/ntusp_conversion_kit
+	name = "NT-USP magazine conversion kit"
+	desc = "A standard conversion kit for use in converting NT-USP magazines to be more lethal or less lethal."
+	icon = 'icons/obj/objects.dmi'
+	icon_state = "modkit_ntusp"
+	w_class = WEIGHT_CLASS_TINY
+
+/obj/item/ammo_box/magazine/recharge/ntusp/attackby(obj/item/A, mob/user)
+	if(istype(A, /obj/item/ntusp_conversion_kit))
+		to_chat(user, span_danger("[A] makes a whirring sound as it modifies \the [src]'s lens to fabricate more lethal rounds."))
+		new /obj/item/ammo_box/magazine/recharge/ntusp/laser/empty(get_turf(src)) // you thought you were getting free bullets?
+		qdel(src)
+	else
+		return ..()
+
+/obj/item/ammo_box/magazine/recharge/ntusp/laser/attackby(obj/item/A, mob/user)
+	if(istype(A, /obj/item/ntusp_conversion_kit))
+		to_chat(user, span_notice("[A] makes a whirring sound as it modifies \the [src]'s lens to fabricate less lethal rounds."))
+		new /obj/item/ammo_box/magazine/recharge/ntusp/empty(get_turf(src))
+		qdel(src)
+	else
+		return ..()

code/modules/projectiles/projectile.dm

@@ -116,6 +116,8 @@
 	///How much we want to drop both wound_bonus and bare_wound_bonus (to a minimum of 0 for the latter) per tile, for falloff purposes
 	var/wound_falloff_tile
 
+	var/splatter = FALSE // Make a cool splatter effect even if it doesn't do brute damage
+
 /obj/item/projectile/Initialize()
 	. = ..()
 	permutated = list()
@@ -186,7 +188,7 @@
 	var/mob/living/L = target
 
 	if(blocked != 100) // not completely blocked
-		if(damage && L.blood_volume && damage_type == BRUTE)
+		if(damage && L.blood_volume && (damage_type == BRUTE || splatter))
 			var/mob/living/carbon/C = L
 			var/splatter_dir = dir
 			if(starting)

code/modules/research/designs/weapon_designs.dm

@@ -179,6 +179,16 @@
 	category = list("Weapons")
 	departmental_flags = DEPARTMENTAL_FLAG_ARMORY
 
+/datum/design/ntusp_conversion
+	name = "NT-USP Conversion Kit"
+	desc = "A standard conversion kit for use in converting NT-USP magazines to be more lethal or less lethal."
+	id = "ntusp_conversion"
+	build_type = PROTOLATHE
+	materials = list(/datum/material/iron = 500, /datum/material/glass = 200, /datum/material/silver = 200)
+	build_path = /obj/item/ntusp_conversion_kit
+	category = list("Weapons")
+	departmental_flags = DEPARTMENTAL_FLAG_ARMORY
+
 /datum/design/tele_shield
 	name = "Telescopic Riot Shield"
 	desc = "An advanced riot shield made of lightweight materials that collapses for easy storage."

code/modules/research/techweb/all_nodes.dm

@@ -9,7 +9,7 @@
 	// Default research tech, prevents bricking
 	design_ids = list("basic_matter_bin", "basic_cell", "basic_scanning", "basic_capacitor", "basic_micro_laser", "micro_mani", "desttagger", "handlabel", "packagewrap",
 	"destructive_analyzer", "circuit_imprinter", "rack_creator", "experimentor", "rdconsole", "design_disk", "tech_disk", "rdserver", "rdservercontrol", "mechfab", "paystand", "ticket_machine", "ticket_remote", "light_tube", "light_bulb",
-	"space_heater", "beaker", "large_beaker", "vial", "large_vial", "bucket", "fork", "tray","plate", "bowl", "mixing_bowl", "drinking_glass", "shot_glass", "shaker", "xlarge_beaker", "sec_rshot", "sec_beanbag_slug", "sec_bshot", "sec_slug", "sec_Islug", "sec_Brslug", "sec_38", "apc_control", "power control", "airlock_board", "firelock_board", "airalarm_electronics", "firealarm_electronics", "blastdoorcontroller", "aac_electronics", "mousetrap",
+	"space_heater", "beaker", "large_beaker", "vial", "large_vial", "bucket", "fork", "tray","plate", "bowl", "mixing_bowl", "drinking_glass", "shot_glass", "shaker", "xlarge_beaker", "sec_rshot", "sec_beanbag_slug", "sec_bshot", "sec_slug", "sec_Islug", "sec_Brslug", "sec_38", "ntusp_conversion", "apc_control", "power control", "airlock_board", "firelock_board", "airalarm_electronics", "firealarm_electronics", "blastdoorcontroller", "aac_electronics", "mousetrap",
 	"rglass","plasteel","plastitanium","plasmaglass","plasmareinforcedglass","titaniumglass","plastitaniumglass","wallframe/flasher", "rsf", "oven_tray", "bounced_radio", "signaler", "intercom_frame", "infrared_emitter", "health_sensor", "timer", "voice_analyser", "camera_assembly", "newscaster_frame", "prox_sensor", "flashlight", "extinguisher", "pocketfireextinguisher")
 
 /datum/techweb_node/mmi