diff --git a/code/modules/mining/minebot.dm b/code/modules/mining/minebot.dm index 16e3b0dbfb3..575fbf3b5b6 100644 --- a/code/modules/mining/minebot.dm +++ b/code/modules/mining/minebot.dm @@ -32,7 +32,7 @@ sentience_type = SENTIENCE_MINEBOT ranged_message = "shoots" ranged_cooldown_time = 30 - projectiletype = /obj/item/projectile/kinetic/minebot + projectiletype = /obj/item/projectile/kinetic projectilesound = 'sound/weapons/Gunshot4.ogg' speak_emote = list("states") wanted_objects = list(/obj/item/weapon/ore/diamond, /obj/item/weapon/ore/gold, /obj/item/weapon/ore/silver, diff --git a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm index 1f8b1a287fa..b859fc400fc 100644 --- a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm +++ b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm @@ -153,15 +153,15 @@ var/obj/item/weapon/gun/energy/kinetic_accelerator/KA = loc KA.modify_projectile(BB) - 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 + 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 @@ -178,10 +178,6 @@ var/turf_aoe = FALSE var/mob_aoe = FALSE var/list/hit_overlays = list() - -/obj/item/projectile/kinetic/minebot - damage = 10 - pressure_decrease = 1 /obj/item/projectile/kinetic/on_range() strike_thing()