Add meat hook, warp cube, wisp lantern, rename flashlight variable on weapons, add layer/inventory definitions

code/modules/projectiles/guns/energy.dm

@@ -30,6 +30,12 @@
 	else
 		power_supply = new(src)
 	power_supply.give(power_supply.maxcharge)
+	update_ammo_types()
+	if(selfcharge)
+		processing_objects.Add(src)
+	update_icon()
+	
+/obj/item/weapon/gun/energy/proc/update_ammo_types()
 	var/obj/item/ammo_casing/energy/shot
 	for(var/i = 1, i <= ammo_type.len, i++)
 		var/shottype = ammo_type[i]
@@ -38,9 +44,6 @@
 	shot = ammo_type[select]
 	fire_sound = shot.fire_sound
 	fire_delay = shot.delay
-	if(selfcharge)
-		processing_objects.Add(src)
-	update_icon()
 
 /obj/item/weapon/gun/energy/Destroy()
 	if(selfcharge)
@@ -129,9 +132,9 @@
 				overlays += image(icon = icon, icon_state = iconState, pixel_x = ammo_x_offset * (i -1))
 		else
 			overlays += image(icon = icon, icon_state = "[icon_state]_[modifystate ? "[shot.select_name]_" : ""]charge[ratio]")
-	if(F && can_flashlight)
+	if(gun_light && can_flashlight)
 		var/iconF = "flight"
-		if(F.on)
+		if(gun_light.on)
 			iconF = "flight_on"
 		overlays += image(icon = icon, icon_state = iconF, pixel_x = flight_x_offset, pixel_y = flight_y_offset)
 	if(itemState)

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

@@ -1,6 +1,6 @@
 /obj/item/weapon/gun/energy/kinetic_accelerator
 	name = "proto-kinetic accelerator"
-	desc = "A self recharging, "
+	desc = "A self recharging, ranged mining tool that does increased damage in low pressure. Capable of holding up to six slots worth of mod kits."
 	icon_state = "kineticgun"
 	item_state = "kineticgun"
 	ammo_type = list(/obj/item/ammo_casing/energy/kinetic)
@@ -17,44 +17,55 @@
 	var/unique_frequency = FALSE // modified by KA modkits
 	var/overheat = FALSE
 
-	var/list/max_mod_capacity = 2
+	var/max_mod_capacity = 100
 	var/list/modkits = list()
 
+	var/empty_state = "kineticgun_empty"
+
+/obj/item/weapon/gun/energy/kinetic_accelerator/examine(mob/user)
+	..()
+	if(max_mod_capacity)
+		to_chat(user, "<b>[get_remaining_mod_capacity()]%</b> mod capacity remaining.")
+		for(var/A in get_modkits())
+			var/obj/item/borg/upgrade/modkit/M = A
+			to_chat(user, "<span class='notice'>There is a [M.name] mod installed, using <b>[M.cost]%</b> capacity.</span>")
 
 /obj/item/weapon/gun/energy/kinetic_accelerator/attackby(obj/item/A, mob/user)
 	if(istype(A, /obj/item/weapon/crowbar))
 		if(modkits.len)
-			user << "<span class='notice'>You pry the modifications out.</span>"
-			for(var/obj/item/modkit/M in modkits)
-				M.forceMove(get_turf(user))
+			to_chat(user, "<span class='notice'>You pry the modifications out.</span>")
+			playsound(loc, 'sound/items/Crowbar.ogg', 100, 1)
+			for(var/obj/item/borg/upgrade/modkit/M in modkits)
+				M.uninstall(src)
 		else
-			user << "<span class='notice'>There are no modifications currently installed.</span>"
-	else if(istype(A, /obj/item/modkit))
-		var/obj/item/modkit/MK = A
-		var/current_mod_capacity = 0
-		for(var/obj/item/modkit/M in modkits)
-			current_mod_capacity += M.cost
-		if((current_mod_capacity + MK.cost) > max_mod_capacity)
-			user << "<span class='notice'>You don't have room to install this modkit. Use a crowbar to remove existing modkits.</span>"
-			return
-		else
-			user << "<span class='notice'>You install the modkit.</span>"
-			MK.install(src)
+			to_chat(user, "<span class='notice'>There are no modifications currently installed.</span>")
+	else if(istype(A, /obj/item/borg/upgrade/modkit))
+		var/obj/item/borg/upgrade/modkit/MK = A
+		MK.install(src, user)
 	else
 		..()
 
+/obj/item/weapon/gun/energy/kinetic_accelerator/proc/get_remaining_mod_capacity()
+	var/current_capacity_used = 0
+	for(var/A in get_modkits())
+		var/obj/item/borg/upgrade/modkit/M = A
+		current_capacity_used += M.cost
+	return max_mod_capacity - current_capacity_used
+
+/obj/item/weapon/gun/energy/kinetic_accelerator/proc/get_modkits()
+	. = list()
+	for(var/A in modkits)
+		. += A
 
 /obj/item/weapon/gun/energy/kinetic_accelerator/proc/modify_projectile(obj/item/projectile/kinetic/K)
-	for(var/obj/item/modkit/M in src)
+	for(var/A in get_modkits())
+		var/obj/item/borg/upgrade/modkit/M = A
 		M.modify_projectile(K)
 
 /obj/item/weapon/gun/energy/kinetic_accelerator/cyborg
 	holds_charge = TRUE
 	unique_frequency = TRUE
-
-/obj/item/weapon/gun/energy/kinetic_accelerator/hyper/cyborg
-	holds_charge = TRUE
-	unique_frequency = TRUE
+	max_mod_capacity = 80
 
 /obj/item/weapon/gun/energy/kinetic_accelerator/New()
 	. = ..()
@@ -75,9 +86,12 @@
 	if(!holds_charge)
 		// Put it on a delay because moving item from slot to hand
 		// calls dropped().
-		sleep(1)
-		if(!ismob(loc))
-			empty()
+		spawn(2)
+			empty_if_not_held()
+
+/obj/item/weapon/gun/energy/kinetic_accelerator/proc/empty_if_not_held()
+	if(!ismob(loc))
+		empty()
 
 /obj/item/weapon/gun/energy/kinetic_accelerator/proc/empty()
 	power_supply.use(500)
@@ -99,7 +113,8 @@
 	else
 		carried = 1
 
-	addtimer(src, "reload", overheat_time * carried)
+	spawn(overheat_time * carried)
+		reload()
 
 /obj/item/weapon/gun/energy/kinetic_accelerator/emp_act(severity)
 	return
@@ -107,35 +122,25 @@
 /obj/item/weapon/gun/energy/kinetic_accelerator/proc/reload()
 	power_supply.give(500)
 	if(!suppressed)
-		playsound(src.loc, 'sound/weapons/kenetic_reload.ogg', 60, 1)
+		playsound(loc, 'sound/weapons/kenetic_reload.ogg', 60, 1)
 	else
-		loc << "<span class='warning'>[src] silently charges up.<span>"
+		to_chat(loc, "<span class='warning'>[src] silently charges up.<span>")
 	update_icon()
 	overheat = FALSE
 
 /obj/item/weapon/gun/energy/kinetic_accelerator/update_icon()
-	cut_overlays()
-	if(!can_shoot())
-		add_overlay("kineticgun_empty")
+	overlays.Cut()
+	if(empty_state && !can_shoot())
+		overlays += empty_state
 
-	if(F && can_flashlight)
+	if(gun_light && can_flashlight)
 		var/iconF = "flight"
-		if(F.on)
+		if(gun_light.on)
 			iconF = "flight_on"
-		add_overlay(image(icon = icon, icon_state = iconF, pixel_x = flight_x_offset, pixel_y = flight_y_offset))
-
-
-
-
-
-
-
-
+		overlays += image(icon = icon, icon_state = iconF, pixel_x = flight_x_offset, pixel_y = flight_y_offset)
 
 
 //Casing
-
-
 /obj/item/ammo_casing/energy/kinetic
 	projectile_type = /obj/item/projectile/kinetic
 	select_name = "kinetic"
@@ -148,87 +153,262 @@
 		var/obj/item/weapon/gun/energy/kinetic_accelerator/KA = loc
 		KA.modify_projectile(BB)
 
-/obj/item/ammo_casing/energy/kinetic/hyper
-	projectile_type = /obj/item/projectile/kinetic/hyper
-
+		var/turf/proj_turf = get_turf(BB)
+		if(!isturf(proj_turf))
+			return
+		var/datum/gas_mixture/environment = proj_turf.return_air()
+		var/pressure = environment.return_pressure()
+		if(pressure > 50)
+			BB.name = "weakened [BB.name]"
+			var/obj/item/projectile/kinetic/K = BB
+			K.damage *= K.pressure_decrease
 
 
 //Projectiles
-
 /obj/item/projectile/kinetic
 	name = "kinetic force"
 	icon_state = null
-	damage = 10
+	damage = 40
 	damage_type = BRUTE
 	flag = "bomb"
 	range = 3
-	var/damage_multiplier = 4
+	log_override = TRUE
 
-/obj/item/projectile/kinetic/super
-	damage = 11
-	range = 4
-
-/obj/item/projectile/kinetic/New()
-	var/turf/proj_turf = get_turf(src)
-	if(!istype(proj_turf, /turf))
-		return
-	var/datum/gas_mixture/environment = proj_turf.return_air()
-	var/pressure = environment.return_pressure()
-	if(pressure < 50)
-		name = "full strength [name]"
-		damage *= damage_multiplier
-	..()
+	var/pressure_decrease = 0.25
+	var/turf_aoe = FALSE
+	var/mob_aoe = 0
+	var/list/hit_overlays = list()
 
 /obj/item/projectile/kinetic/on_range()
-	PoolOrNew(/obj/effect/overlay/temp/kinetic_blast, loc)
+	strike_thing()
 	..()
 
 /obj/item/projectile/kinetic/on_hit(atom/target)
-	var/turf/target_turf= get_turf(target)
-	if(istype(target_turf, /turf/closed/mineral))
-		var/turf/closed/mineral/M = target_turf
-		M.gets_drilled(firer)
-	PoolOrNew(/obj/effect/overlay/temp/kinetic_blast, target_turf)
+	strike_thing(target)
 	. = ..()
 
-
-//AoE
-
-/obj/item/projectile/kinetic/hyper
-	name = "kinetic explosion"
-	damage = 10
-	range = 3
-
-/obj/item/projectile/kinetic/hyper/proc/aoe_blast(atom/target)
+/obj/item/projectile/kinetic/proc/strike_thing(atom/target)
 	var/turf/target_turf = get_turf(target)
 	if(!target_turf)
 		target_turf = get_turf(src)
-	PoolOrNew(/obj/effect/overlay/temp/explosion/fast, target_turf)
-	for(var/T in RANGE_TURFS(1, target_turf) - target_turf)
-		if(istype(T, /turf/closed/mineral))
-			var/turf/closed/mineral/M = T
-			M.gets_drilled(firer)
+	if(ismineralturf(target_turf))
+		var/turf/simulated/mineral/M = target_turf
+		M.gets_drilled(firer)
+	var/obj/effect/overlay/temp/kinetic_blast/K = new /obj/effect/overlay/temp/kinetic_blast(target_turf)
+	K.color = color
+	for(var/type in hit_overlays)
+		new type(target_turf)
+	if(turf_aoe)
+		for(var/T in RANGE_TURFS(1, target_turf) - target_turf)
+			if(ismineralturf(T))
+				var/turf/simulated/mineral/M = T
+				M.gets_drilled(firer)
+	if(mob_aoe)
+		for(var/mob/living/L in range(1, target_turf) - firer - target)
+			var/armor = L.run_armor_check(def_zone, flag, "", "", armour_penetration)
+			L.apply_damage(damage*mob_aoe, damage_type, def_zone, armor)
+			to_chat(L, "<span class='userdanger'>You're struck by a [name]!</span>")
 
-/obj/item/projectile/kinetic/hyper/on_range()
-	aoe_blast()
-	..()
-
-/obj/item/projectile/kinetic/hyper/on_hit(atom/target)
-	aoe_blast(target)
-	. = ..()
 
 //Modkits
-
-/obj/item/modkit
+/obj/item/borg/upgrade/modkit
 	name = "modification kit"
-	desc = "An upgrade for kinetic accelerators.."
+	desc = "An upgrade for kinetic accelerators."
 	icon = 'icons/obj/objects.dmi'
 	icon_state = "modkit"
 	origin_tech = "programming=2;materials=2;magnets=4"
-	var/cost = 2
+	require_module = 1
+	module_type = /obj/item/weapon/robot_module/miner
+	var/denied_type = null
+	var/maximum_of_type = 1
+	var/cost = 30
+	var/modifier = 1 //For use in any mod kit that has numerical modifiers
 
-/obj/item/modkit/proc/install(obj/item/weapon/gun/energy/kinetic_accelerator/KA)
-	return
+/obj/item/borg/upgrade/modkit/examine(mob/user)
+	..()
+	to_chat(user, "<span class='notice'>Occupies <b>[cost]%</b> of mod capacity.</span>")
 
-/obj/item/modkit/proc/modify_projectile(/obj/item/projectile/kinetic/K)
-	return
+/obj/item/borg/upgrade/modkit/attackby(obj/item/A, mob/user)
+	if(istype(A, /obj/item/weapon/gun/energy/kinetic_accelerator) && !issilicon(user))
+		install(A, user)
+	else
+		..()
+
+/obj/item/borg/upgrade/modkit/action(mob/living/silicon/robot/R)
+	if(..())
+		return
+
+	for(var/obj/item/weapon/gun/energy/kinetic_accelerator/cyborg/H in R.module.modules)
+		return install(H, usr)
+
+/obj/item/borg/upgrade/modkit/proc/install(obj/item/weapon/gun/energy/kinetic_accelerator/KA, mob/user)
+	. = TRUE
+	if(denied_type)
+		var/number_of_denied = 0
+		for(var/A in KA.get_modkits())
+			var/obj/item/borg/upgrade/modkit/M = A
+			if(istype(M, denied_type))
+				number_of_denied++
+			if(number_of_denied >= maximum_of_type)
+				. = FALSE
+				break
+	if(KA.get_remaining_mod_capacity() >= cost)
+		if(.)
+			to_chat(user, "<span class='notice'>You install the modkit.</span>")
+			playsound(loc, 'sound/items/Screwdriver.ogg', 100, 1)
+			user.unEquip(src)
+			forceMove(KA)
+			KA.modkits += src
+		else
+			to_chat(user, "<span class='notice'>The modkit you're trying to install would conflict with an already installed modkit. Use a crowbar to remove existing modkits.</span>")
+	else
+		to_chat(user, "<span class='notice'>You don't have room(<b>[KA.get_remaining_mod_capacity()]%</b> remaining, [cost]% needed) to install this modkit. Use a crowbar to remove existing modkits.</span>")
+		. = FALSE
+
+
+
+/obj/item/borg/upgrade/modkit/proc/uninstall(obj/item/weapon/gun/energy/kinetic_accelerator/KA)
+	forceMove(get_turf(KA))
+	KA.modkits -= src
+
+/obj/item/borg/upgrade/modkit/proc/modify_projectile(obj/item/projectile/kinetic/K)
+
+
+//Range
+/obj/item/borg/upgrade/modkit/range
+	name = "range increase"
+	desc = "Increases the range of a kinetic accelerator when installed."
+	modifier = 1
+	cost = 24 //so you can fit four plus a tracer cosmetic
+
+/obj/item/borg/upgrade/modkit/range/modify_projectile(obj/item/projectile/kinetic/K)
+	K.range += modifier
+
+
+//Damage
+/obj/item/borg/upgrade/modkit/damage
+	name = "damage increase"
+	desc = "Increases the damage of kinetic accelerator when installed."
+	modifier = 10
+
+/obj/item/borg/upgrade/modkit/damage/modify_projectile(obj/item/projectile/kinetic/K)
+	K.damage += modifier
+
+
+//Cooldown
+/obj/item/borg/upgrade/modkit/cooldown
+	name = "cooldown decrease"
+	desc = "Decreases the cooldown of a kinetic accelerator."
+	modifier = 2.5
+
+/obj/item/borg/upgrade/modkit/cooldown/install(obj/item/weapon/gun/energy/kinetic_accelerator/KA, mob/user)
+	. = ..()
+	if(.)
+		KA.overheat_time -= modifier
+
+/obj/item/borg/upgrade/modkit/cooldown/uninstall(obj/item/weapon/gun/energy/kinetic_accelerator/KA)
+	KA.overheat_time += modifier
+	..()
+
+
+//AoE blasts
+/obj/item/borg/upgrade/modkit/aoe
+	modifier = 0
+
+/obj/item/borg/upgrade/modkit/aoe/modify_projectile(obj/item/projectile/kinetic/K)
+	K.name = "kinetic explosion"
+	if(!K.turf_aoe && !K.mob_aoe)
+		K.hit_overlays += /obj/effect/overlay/temp/explosion/fast
+	K.mob_aoe += modifier
+
+/obj/item/borg/upgrade/modkit/aoe/turfs
+	name = "mining explosion"
+	desc = "Causes the kinetic accelerator to destroy rock in an AoE."
+	denied_type = /obj/item/borg/upgrade/modkit/aoe/turfs
+
+/obj/item/borg/upgrade/modkit/aoe/turfs/modify_projectile(obj/item/projectile/kinetic/K)
+	..()
+	K.turf_aoe = TRUE
+
+/obj/item/borg/upgrade/modkit/aoe/turfs/andmobs
+	name = "offensive mining explosion"
+	desc = "Causes the kinetic accelerator to destroy rock and damage mobs in an AoE."
+	maximum_of_type = 3
+	modifier = 0.25
+
+/obj/item/borg/upgrade/modkit/aoe/mobs
+	name = "offensive explosion"
+	desc = "Causes the kinetic accelerator to damage mobs in an AoE."
+	modifier = 0.2
+
+
+//Indoors
+/obj/item/borg/upgrade/modkit/indoors
+	name = "decrease pressure penalty"
+	desc = "Increases the damage a kinetic accelerator does in a high pressure environment."
+	modifier = 2
+	denied_type = /obj/item/borg/upgrade/modkit/indoors
+	maximum_of_type = 2
+	cost = 40
+
+/obj/item/borg/upgrade/modkit/indoors/modify_projectile(obj/item/projectile/kinetic/K)
+	K.pressure_decrease *= modifier
+
+
+//Trigger Guard
+/obj/item/borg/upgrade/modkit/trigger_guard
+	name = "modified trigger guard"
+	desc = "Allows creatures normally incapable of firing guns to operate the weapon when installed."
+	cost = 20
+	denied_type = /obj/item/borg/upgrade/modkit/trigger_guard
+
+/obj/item/borg/upgrade/modkit/trigger_guard/install(obj/item/weapon/gun/energy/kinetic_accelerator/KA, mob/user)
+	. = ..()
+	if(.)
+		KA.trigger_guard = TRIGGER_GUARD_ALLOW_ALL
+
+/obj/item/borg/upgrade/modkit/trigger_guard/uninstall(obj/item/weapon/gun/energy/kinetic_accelerator/KA)
+	KA.trigger_guard = TRIGGER_GUARD_NORMAL
+	..()
+
+
+//Cosmetic
+
+/obj/item/borg/upgrade/modkit/chassis_mod
+	name = "super chassis"
+	desc = "Makes your KA yellow. All the fun of having a more powerful KA without actually having a more powerful KA."
+	cost = 10
+	denied_type = /obj/item/borg/upgrade/modkit/chassis_mod
+	var/chassis_icon = "kineticgun_u"
+
+/obj/item/borg/upgrade/modkit/chassis_mod/install(obj/item/weapon/gun/energy/kinetic_accelerator/KA, mob/user)
+	. = ..()
+	if(.)
+		KA.icon_state = chassis_icon
+
+/obj/item/borg/upgrade/modkit/chassis_mod/uninstall(obj/item/weapon/gun/energy/kinetic_accelerator/KA)
+	KA.icon_state = initial(KA.icon_state)
+	..()
+
+/obj/item/borg/upgrade/modkit/chassis_mod/orange
+	name = "hyper chassis"
+	desc = "Makes your KA orange. All the fun of having explosive blasts without actually having explosive blasts."
+	chassis_icon = "kineticgun_h"
+
+/obj/item/borg/upgrade/modkit/tracer
+	name = "white tracer bolts"
+	desc = "Causes kinetic accelerator bolts to have a white tracer trail and explosion."
+	cost = 4
+	denied_type = /obj/item/borg/upgrade/modkit/tracer
+	var/bolt_color = "#FFFFFF"
+
+/obj/item/borg/upgrade/modkit/tracer/modify_projectile(obj/item/projectile/kinetic/K)
+	K.icon_state = "ka_tracer"
+	K.color = bolt_color
+
+/obj/item/borg/upgrade/modkit/tracer/adjustable
+	name = "adjustable tracer bolts"
+	desc = "Causes kinetic accelerator bolts to have a adjustably-colored tracer trail and explosion. Use in-hand to change color."
+
+/obj/item/borg/upgrade/modkit/tracer/adjustable/attack_self(mob/user)
+	bolt_color = input(user,"Choose Color") as color

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

@@ -37,14 +37,14 @@
 	can_flashlight = 0 // Can't attach or detach the flashlight, and override it's icon update
 
 /obj/item/weapon/gun/energy/gun/mini/New()
-	F = new /obj/item/device/flashlight/seclite(src)
+	gun_light = new /obj/item/device/flashlight/seclite(src)
 	..()
 	power_supply.maxcharge = 6000
 	power_supply.charge = 6000
 
 /obj/item/weapon/gun/energy/gun/mini/update_icon()
 	..()
-	if(F && F.on)
+	if(gun_light && gun_light.on)
 		overlays += "mini-light"
 
 /obj/item/weapon/gun/energy/gun/hos

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

@@ -99,6 +99,9 @@
 	overheat_time = 20
 	holds_charge = TRUE
 	unique_frequency = TRUE
+	can_flashlight = 0
+	max_mod_capacity = 0
+	empty_state = null
 
 /obj/item/weapon/gun/energy/kinetic_accelerator/crossbow/ninja
 	name = "energy dart thrower"