Proto-Kinetic Pump-Shotgun (#37192)

* wip shotgun

* protoclown pumpquackgun

* quack

* quack2

Author: jwhitak

code/game/machinery/vending.dm

@@ -3587,6 +3587,7 @@ var/global/num_vending_terminals = 1
 		/obj/item/weapon/pickaxe/silver = 1,
 		/obj/item/weapon/pickaxe/gold = 1,
 		/obj/item/weapon/pickaxe/diamond = 1,
+		/obj/item/device/modkit/kineticshotgun = 1,
 		/obj/item/borg/upgrade/hook = 1,
 		)
 	prices = list(
@@ -3612,6 +3613,7 @@ var/global/num_vending_terminals = 1
 		/obj/item/weapon/gun/hookshot = 300,
 		/obj/item/weapon/lazarus_injector/advanced = 150,
 		/obj/item/weapon/pickaxe/diamond = 300,
+		/obj/item/device/modkit/kineticshotgun = 250,
 		/obj/item/borg/upgrade/hook = 300,
 		)
 

code/game/objects/items/devices/modkit.dm

@@ -197,3 +197,19 @@
 	parts[1] =	1
 	original[1] = /obj/item/weapon/fireaxe
 	finished[1] = /obj/item/weapon/fireaxe/antimatter
+
+/obj/item/device/modkit/kineticshotgun
+	name = "proto-kinetic pump-shotgun conversion kit"
+	desc = "A set of tools that enables conversion of a proto-kinetic accelerator into a proto-kinetic pump-shotgun, capable of pump-action self-charging."
+	icon_state = "modkit_kinetic"
+	item_state = "modkit"
+
+/obj/item/device/modkit/kineticshotgun/New()
+	..()
+	parts = new/list(1)
+	original = new/list(1)
+	finished = new/list(1)
+
+	parts[1] =	1
+	original[1] = /obj/item/weapon/gun/energy/kinetic_accelerator
+	finished[1] = /obj/item/weapon/gun/energy/kinetic_accelerator/shotgun

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

@@ -507,29 +507,54 @@
 	desc = "According to Nanotrasen accounting, this is mining equipment. It's been modified for extreme power output to crush rocks, but often serves as a miner's first defense against hostile alien life; it's not very powerful unless used in a low pressure environment."
 	icon_state = "kineticgun"
 	item_state = "kineticgun"
+	inhand_states = list("left_hand" = 'icons/mob/in-hand/left/guns.dmi', "right_hand" = 'icons/mob/in-hand/right/guns.dmi')
 	fire_sound = 'sound/weapons/kinetic_accelerator.ogg'
 	projectile_type = "/obj/item/projectile/kinetic"
 	cell_type = "/obj/item/weapon/cell/crap"
 	charge_cost = 50
 	icon_charge_multiple = 20
+
+/obj/item/weapon/gun/energy/kinetic_accelerator/shotgun
+	name = "proto-kinetic pump-shotgun"
+	desc = "An upgraded proto-kinetic accelerator, with the ability to pump to reload."
+	icon_state = "kineticshotgun"
+	item_state = "kineticshotgun"
+	rechargeable = FALSE
+	charge_cost = 250
+	icon_charge_multiple = 50
+	clowned = CLOWNABLE
 	var/overheat = 0
-	var/recent_reload = 1
-/*
-/obj/item/weapon/gun/energy/kinetic_accelerator/shoot_live_shot()
+	var/pump_delay = 20 //cooldown after last real shot in decaseconds before reloading
+
+/obj/item/weapon/gun/energy/kinetic_accelerator/shotgun/attack_self(var/mob/living/user)
+	. = ..()
+	if(overheat)
+		to_chat(user, span_warning("The pump-recharger is still cooling down!"))
+		return
 	overheat = 1
-	spawn(20)
+	var/image/lightning_effect = image('icons/effects/effects.dmi', src, "shield2")
+	overlays += lightning_effect
+	spawn(5)
+		overlays -= lightning_effect
+	if(clowned == CLOWNED)
+		playsound(src.loc, 'sound/items/bikehorn.ogg', 50, 1)
+	else
+		playsound(src.loc, 'sound/weapons/shotgunpump.ogg', 50, 1)
+	power_supply.give(power_supply.maxcharge)
+	update_icon()
+	spawn(pump_delay)
 		overheat = 0
-		recent_reload = 0
+
+/obj/item/weapon/gun/energy/kinetic_accelerator/shotgun/update_icon()
 	..()
-*/
-/obj/item/weapon/gun/energy/kinetic_accelerator/attack_self(var/mob/living/user)
-	if(overheat || recent_reload)
-		return
-	power_supply.give(500)
-	playsound(src.loc, 'sound/weapons/shotgunpump.ogg', 60, 1)
-	recent_reload = 1
-	update_icon()
-	return
+	if(clowned == CLOWNED)
+		fire_sound = 'sound/items/quack.ogg'
+		empty_sound = 'sound/items/quack.ogg'
+		hitsound = 'sound/items/bikehorn.ogg'
+	else
+		fire_sound = 'sound/weapons/kinetic_accelerator.ogg'
+		empty_sound = 'sound/weapons/empty.ogg'
+		hitsound = 'sound/weapons/smash.ogg'
 
 /obj/item/weapon/gun/energy/kinetic_accelerator/cyborg
 	name = "proto-kinetic accelerator"

code/modules/projectiles/projectile/special.dm

@@ -135,8 +135,10 @@
 	damage = 15
 	damage_type = BRUTE
 	flag = "energy"
-	var/range = 2
 	fire_sound = 'sound/weapons/Taser.ogg'
+	color = "#a7ff96"
+	var/low_pressure_bonus = 15 //bonus in pressures below 50kpa
+	var/monster_bonus = 0 //bonus against simple_animals (roid mobs) and xenos
 
 /obj/item/projectile/kinetic/New()
 	var/turf/proj_turf = get_turf(src)
@@ -146,7 +148,8 @@
 	var/pressure = environment.return_pressure()
 	if(pressure < 50)
 		name = "full strength kinetic force"
-		damage += 15
+		damage += low_pressure_bonus
+		color = "#ccffff"// "#ff4444"
 	..()
 
 /* wat - N3X
@@ -170,6 +173,8 @@
 	..(target,blocked)
 
 /obj/item/projectile/kinetic/to_bump(atom/A as mob|obj|turf|area)
+	if(istype(A, /mob/living/simple_animal) || istype(A, /mob/living/carbon/alien))
+		damage += monster_bonus
 	if(!loc)
 		return
 	if(A == firer)
@@ -185,6 +190,7 @@
 				var/turf/unsimulated/mineral/M = target_turf
 				if(M.mining_difficulty < MINE_DIFFICULTY_TOUGH)
 					M.GetDrilled()
+				new /obj/item/effect/kinetic_blast(target_turf)
 			// Now we bump as a bullet, if the atom is a non-turf.
 			if(!isturf(A))
 				..(A)
@@ -196,6 +202,12 @@
 		qdel(src)
 		return 0
 
+/obj/item/projectile/kinetic/shotgun
+	low_pressure_bonus = 25
+
+/obj/item/projectile/kinetic/cutter
+	monster_bonus = 15
+
 /obj/item/effect/kinetic_blast
 	name = "kinetic explosion"
 	icon = 'icons/obj/projectiles.dmi'
@@ -207,13 +219,6 @@
 	spawn(4)
 		qdel(src)
 
-/obj/item/projectile/kinetic/cutter
-
-/obj/item/projectile/kinetic/cutter/to_bump(atom/A)
-	if(istype(A, /mob/living/simple_animal) || istype(A, /mob/living/carbon/alien))
-		damage += 15
-	..()
-
 /obj/item/projectile/stickybomb
 	icon = 'icons/obj/projectiles_experimental.dmi'
 	icon_state = "stickybomb"