diff --git a/code/modules/crafting/recipes.dm b/code/modules/crafting/recipes.dm index 5f8f1f145d..f86691c067 100644 --- a/code/modules/crafting/recipes.dm +++ b/code/modules/crafting/recipes.dm @@ -133,18 +133,6 @@ category = CAT_WEAPONRY subcategory = CAT_WEAPON -/datum/crafting_recipe/minigun - name = "Laser Minigun" - result = /obj/item/minigunpack2 - reqs = list(/obj/item/gun/energy/laser/carbine = 3, - /obj/item/stack/sheet/plasteel = 5, - /obj/item/stack/cable_coil = 30, - /obj/item/stock_parts/cell/bluespace = 2) - tools = list(TOOL_WIRECUTTER, TOOL_SCREWDRIVER, TOOL_WELDER) - time = 150 - category = CAT_WEAPONRY - subcategory = CAT_WEAPON - /datum/crafting_recipe/ed209 name = "ED209" result = /mob/living/simple_animal/bot/ed209 diff --git a/code/modules/projectiles/ammunition/energy/laser.dm b/code/modules/projectiles/ammunition/energy/laser.dm index 638711e8d4..0940144721 100644 --- a/code/modules/projectiles/ammunition/energy/laser.dm +++ b/code/modules/projectiles/ammunition/energy/laser.dm @@ -71,9 +71,3 @@ projectile_type = /obj/item/projectile/beam/mindflayer select_name = "MINDFUCK" fire_sound = 'sound/weapons/laser.ogg' - -/obj/item/ammo_casing/energy/laser/weak - projectile_type = /obj/item/projectile/beam/weak/minigun - e_cost = 10 - fire_sound = 'sound/weapons/gatling.ogg' - click_cooldown_override = 1 diff --git a/code/modules/projectiles/guns/energy/minigun.dm b/code/modules/projectiles/guns/energy/minigun.dm deleted file mode 100644 index d903cda47c..0000000000 --- a/code/modules/projectiles/guns/energy/minigun.dm +++ /dev/null @@ -1,149 +0,0 @@ -//The ammo/gun is stored in a back slot item -/obj/item/minigunpack2 - name = " Laser Gatling Pack" - desc = "A massive battery pack with an attached laser gatling gun!" - icon = 'icons/obj/guns/minigun.dmi' - icon_state = "holstered" - item_state = "backpack" - lefthand_file = 'icons/mob/inhands/equipment/backpack_lefthand.dmi' - righthand_file = 'icons/mob/inhands/equipment/backpack_righthand.dmi' - slot_flags = ITEM_SLOT_BACK - w_class = WEIGHT_CLASS_HUGE - var/obj/item/gun/energy/minigun/gun - var/armed = 0 //whether the gun is attached, 0 is attached, 1 is the gun is wielded. - var/overheat = 0 - var/overheat_max = 60 - var/heat_diffusion = 5 - -/obj/item/minigunpack2/Initialize() - . = ..() - gun = new(src) - START_PROCESSING(SSobj, src) - -/obj/item/minigunpack2/Destroy() - STOP_PROCESSING(SSobj, src) - return ..() - -/obj/item/minigunpack2/process() - overheat = max(0, overheat - heat_diffusion) - -//ATTACK HAND IGNORING PARENT RETURN VALUE -/obj/item/minigunpack2/attack_hand(var/mob/living/carbon/user) - if(src.loc == user) - if(!armed) - if(user.get_item_by_slot(SLOT_BACK) == src) - armed = 1 - if(!user.put_in_hands(gun)) - armed = 0 - to_chat(user, "You need a free hand to hold the gun!") - return - update_icon() - user.update_inv_back() - else - to_chat(user, "You are already holding the gun!") - else - ..() - -/obj/item/minigunpack2/attackby(obj/item/W, mob/user, params) - if(W == gun) //Don't need armed check, because if you have the gun assume its armed. - user.dropItemToGround(gun, TRUE) - else - ..() - -/obj/item/minigunpack2/dropped(mob/user) - if(armed) - user.dropItemToGround(gun, TRUE) - -/obj/item/minigunpack2/MouseDrop(atom/over_object) - . = ..() - if(armed) - return - if(iscarbon(usr)) - var/mob/M = usr - - if(!over_object) - return - - if(!M.incapacitated()) - - if(istype(over_object, /obj/screen/inventory/hand)) - var/obj/screen/inventory/hand/H = over_object - M.putItemFromInventoryInHandIfPossible(src, H.held_index) - - -/obj/item/minigunpack2/update_icon() - if(armed) - icon_state = "notholstered" - else - icon_state = "holstered" - -/obj/item/minigunpack2/proc/attach_gun(var/mob/user) - if(!gun) - gun = new(src) - gun.forceMove(src) - armed = 0 - if(user) - to_chat(user, "You attach the [gun.name] to the [name].") - else - src.visible_message("The [gun.name] snaps back onto the [name]!") - update_icon() - user.update_inv_back() - - -/obj/item/gun/energy/minigun - name = "laser gatling gun" - desc = "An advanced laser cannon with an incredible rate of fire. Requires a bulky backpack power source to use." - icon = 'icons/obj/guns/minigun.dmi' - icon_state = "minigun_spin" - item_state = "minigun" - flags_1 = CONDUCT_1 - force = 15 - recoil = 2 - slowdown = 1 - slot_flags = null - w_class = WEIGHT_CLASS_HUGE - materials = list() - ammo_type = list(/obj/item/ammo_casing/energy/laser/weak) - burst_size = 2 - automatic = 1 - can_charge = 0 - selfcharge = EGUN_SELFCHARGE - charge_tick = 2 - charge_delay = 5 - weapon_weight = WEAPON_HEAVY - item_flags = NEEDS_PERMIT | SLOWS_WHILE_IN_HAND - var/obj/item/minigunpack2/ammo_pack - -/obj/item/gun/energy/minigun/Initialize() - if(istype(loc, /obj/item/minigunpack2)) //We should spawn inside an ammo pack so let's use that one. - ammo_pack = loc - else - return INITIALIZE_HINT_QDEL //No pack, no gun - - return ..() - -/obj/item/gun/energy/minigun/attack_self(mob/living/user) - return - -/obj/item/gun/energy/minigun/dropped(mob/user) - if(ammo_pack) - ammo_pack.attach_gun(user) - else - qdel(src) - -/obj/item/gun/energy/minigun/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0) - if(ammo_pack) - if(ammo_pack.overheat < ammo_pack.overheat_max) - ammo_pack.overheat += burst_size - ..() - else - to_chat(user, "The gun's heat sensor locked the trigger to prevent lens damage.") - -/obj/item/gun/energy/minigun/afterattack(atom/target, mob/living/user, flag, params) - if(!ammo_pack || ammo_pack.loc != user) - to_chat(user, "You need the backpack power source to fire the gun!") - . = ..() - -/obj/item/gun/energy/minigun/dropped(mob/living/user) - ammo_pack.attach_gun(user) - diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm index d8154b367d..e43eb5a3bc 100644 --- a/code/modules/projectiles/projectile/beams.dm +++ b/code/modules/projectiles/projectile/beams.dm @@ -39,14 +39,6 @@ /obj/item/projectile/beam/weak damage = 15 -/obj/item/projectile/beam/weak/minigun - damage = 12.5 - armour_penetration = 40 - -/obj/item/projectile/beam/weak/minigun/Initialize() - .=..() - speed = pick(0.7,0.75,0.8,0.85,0.9,0.95,1,1.05,1.1,1.15) - /obj/item/projectile/beam/weak/penetrator armour_penetration = 50 diff --git a/sound/weapons/gatling.ogg b/sound/weapons/gatling.ogg deleted file mode 100644 index 0f8045560d..0000000000 Binary files a/sound/weapons/gatling.ogg and /dev/null differ diff --git a/tgstation.dme b/tgstation.dme index ad1531b5be..644db4f3a2 100755 --- a/tgstation.dme +++ b/tgstation.dme @@ -2487,7 +2487,6 @@ #include "code\modules\projectiles\guns\energy\kinetic_accelerator.dm" #include "code\modules\projectiles\guns\energy\laser.dm" #include "code\modules\projectiles\guns\energy\megabuster.dm" -#include "code\modules\projectiles\guns\energy\minigun.dm" #include "code\modules\projectiles\guns\energy\mounted.dm" #include "code\modules\projectiles\guns\energy\plasma_cit.dm" #include "code\modules\projectiles\guns\energy\pulse.dm"