diff --git a/code/game/machinery/computer/orders/order_items/mining/order_pka.dm b/code/game/machinery/computer/orders/order_items/mining/order_pka.dm index 350ab513077b..94299e28d538 100644 --- a/code/game/machinery/computer/orders/order_items/mining/order_pka.dm +++ b/code/game/machinery/computer/orders/order_items/mining/order_pka.dm @@ -25,10 +25,6 @@ item_path = /obj/item/gun/energy/recharge/kinetic_accelerator/railgun cost_per_order = 1250 -/datum/orderable_item/accelerator/gun/m79 //monke edit - item_path = /obj/item/gun/energy/recharge/kinetic_accelerator/m79 - cost_per_order = 1250 - /datum/orderable_item/accelerator/range item_path = /obj/item/borg/upgrade/modkit/range cost_per_order = 1000 diff --git a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm index b44b4878144f..3445c5aff769 100644 --- a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm +++ b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm @@ -573,7 +573,6 @@ /obj/item/borg/upgrade/modkit/chassis_mod/install(obj/item/gun/energy/recharge/kinetic_accelerator/KA, mob/user) //monkestation edit start if(is_type_in_list(KA, list(/obj/item/gun/energy/recharge/kinetic_accelerator/glock, - /obj/item/gun/energy/recharge/kinetic_accelerator/m79, /obj/item/gun/energy/recharge/kinetic_accelerator/meme, /obj/item/gun/energy/recharge/kinetic_accelerator/railgun, /obj/item/gun/energy/recharge/kinetic_accelerator/repeater, diff --git a/monkestation/code/modules/mining/accelerators/grenade.dm b/monkestation/code/modules/mining/accelerators/grenade.dm deleted file mode 100644 index 46fcfbaa8007..000000000000 --- a/monkestation/code/modules/mining/accelerators/grenade.dm +++ /dev/null @@ -1,19 +0,0 @@ -/obj/item/gun/energy/recharge/kinetic_accelerator/m79 - name = "proto-kinetic grenade launcher" - desc = "Made in a drunk frenzy during the creation of the kinetic railgun, the kinetic grenade launcher fires the same bombs used by \ - the mining modsuit. Due to the technology needed to pack the bombs into this weapon, there is no space for modification." - icon = 'monkestation/icons/obj/guns/guns.dmi' - icon_state = "kineticglauncher" - base_icon_state = "kineticglauncher" - pin = /obj/item/firing_pin/wastes - recharge_time = 2 SECONDS - ammo_type = list(/obj/item/ammo_casing/energy/kinetic/m79) - w_class = WEIGHT_CLASS_HUGE - weapon_weight = WEAPON_HEAVY - can_bayonet = FALSE - max_mod_capacity = 0 - disablemodification = TRUE - -/obj/item/ammo_casing/energy/kinetic/m79 - projectile_type = /obj/projectile/bullet/reusable/mining_bomb //uses the mining bomb projectile from the mining modsuit - fire_sound = 'sound/weapons/gun/general/grenade_launch.ogg' diff --git a/tgstation.dme b/tgstation.dme index 530ed7030603..5b7b9d79bee3 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -7690,7 +7690,6 @@ #include "monkestation\code\modules\microfusion\code\projectiles.dm" #include "monkestation\code\modules\mining\accelerators\_wastes_pin.dm" #include "monkestation\code\modules\mining\accelerators\admin.dm" -#include "monkestation\code\modules\mining\accelerators\grenade.dm" #include "monkestation\code\modules\mining\accelerators\pistol.dm" #include "monkestation\code\modules\mining\accelerators\railgun.dm" #include "monkestation\code\modules\mining\accelerators\repeater.dm"