From 15dd80a0851f07ebc50240b9bfcd55cc01727cfc Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Sat, 20 Mar 2021 13:39:59 -0700 Subject: [PATCH] less awful --- .../objects/items/robot/robot_upgrades.dm | 2 +- .../projectiles/ammunition/energy/laser.dm | 3 ++ .../boxes_magazines/internal/misc.dm | 6 --- .../guns/ballistic/laser_gatling.dm | 38 ++++++++++--------- code/modules/surgery/bodyparts/_bodyparts.dm | 2 +- 5 files changed, 25 insertions(+), 26 deletions(-) diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm index 291fc30aa2..ed92623a37 100644 --- a/code/game/objects/items/robot/robot_upgrades.dm +++ b/code/game/objects/items/robot/robot_upgrades.dm @@ -681,7 +681,7 @@ as performing this in action() will cause the upgrade to end up in the borg inst action_icon_state = "Chevron_State_0" var/currentState = 0 - var/maxReduction = 1 + var/maxReduction = 0.5 /obj/effect/proc_holder/silicon/cyborg/vtecControl/Trigger(mob/living/silicon/robot/user) diff --git a/code/modules/projectiles/ammunition/energy/laser.dm b/code/modules/projectiles/ammunition/energy/laser.dm index f6eca57e29..5b727d76de 100644 --- a/code/modules/projectiles/ammunition/energy/laser.dm +++ b/code/modules/projectiles/ammunition/energy/laser.dm @@ -2,6 +2,9 @@ projectile_type = /obj/item/projectile/beam/laser select_name = "kill" +/obj/item/ammo_casing/energy/laser/minigun + click_cooldown_override = 2 + /obj/item/ammo_casing/energy/lasergun projectile_type = /obj/item/projectile/beam/laser e_cost = 83 diff --git a/code/modules/projectiles/boxes_magazines/internal/misc.dm b/code/modules/projectiles/boxes_magazines/internal/misc.dm index 2b87557b39..76f3c88381 100644 --- a/code/modules/projectiles/boxes_magazines/internal/misc.dm +++ b/code/modules/projectiles/boxes_magazines/internal/misc.dm @@ -3,9 +3,3 @@ ammo_type = /obj/item/ammo_casing/caseless/magspear caliber = "speargun" max_ammo = 1 - -/obj/item/ammo_box/magazine/internal/minigun - name = "gatling gun fusion core" - ammo_type = /obj/item/ammo_casing/caseless/laser/gatling - caliber = "gatling" - max_ammo = 5000 diff --git a/code/modules/projectiles/guns/ballistic/laser_gatling.dm b/code/modules/projectiles/guns/ballistic/laser_gatling.dm index 244bc5b124..2abb7b720f 100644 --- a/code/modules/projectiles/guns/ballistic/laser_gatling.dm +++ b/code/modules/projectiles/guns/ballistic/laser_gatling.dm @@ -11,19 +11,19 @@ righthand_file = 'icons/mob/inhands/equipment/backpack_righthand.dmi' slot_flags = ITEM_SLOT_BACK w_class = WEIGHT_CLASS_HUGE - var/obj/item/gun/ballistic/minigun/gun + 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 = 40 + var/overheat_max = 50 var/heat_diffusion = 1 /obj/item/minigunpack/Initialize() . = ..() gun = new(src) - START_PROCESSING(SSobj, src) + START_PROCESSING(SSfastprocess, src) /obj/item/minigunpack/Destroy() - STOP_PROCESSING(SSobj, src) + STOP_PROCESSING(SSfastprocess, src) return ..() /obj/item/minigunpack/process() @@ -72,7 +72,6 @@ var/obj/screen/inventory/hand/H = over_object M.putItemFromInventoryInHandIfPossible(src, H.held_index) - /obj/item/minigunpack/update_icon_state() if(armed) icon_state = "notholstered" @@ -92,7 +91,7 @@ user.update_inv_back() -/obj/item/gun/ballistic/minigun +/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' @@ -103,17 +102,20 @@ slot_flags = null w_class = WEIGHT_CLASS_HUGE custom_materials = null - burst_size = 3 - automatic = 0 - fire_delay = 1 + automatic = 0.5 + fire_delay = 2 + ammo_type = list( + /obj/item/ammo_casing/energy/laser + ) + weapon_weight = WEAPON_HEAVY fire_sound = 'sound/weapons/laser.ogg' - mag_type = /obj/item/ammo_box/magazine/internal/minigun - casing_ejector = FALSE + charge_sections = 0 + shaded_charge = 0 item_flags = NEEDS_PERMIT | SLOWS_WHILE_IN_HAND var/obj/item/minigunpack/ammo_pack -/obj/item/gun/ballistic/minigun/Initialize() +/obj/item/gun/energy/minigun/Initialize() if(istype(loc, /obj/item/minigunpack)) //We should spawn inside an ammo pack so let's use that one. ammo_pack = loc else @@ -121,29 +123,29 @@ return ..() -/obj/item/gun/ballistic/minigun/attack_self(mob/living/user) +/obj/item/gun/energy/minigun/attack_self(mob/living/user) return -/obj/item/gun/ballistic/minigun/dropped(mob/user) +/obj/item/gun/energy/minigun/dropped(mob/user) . = ..() if(ammo_pack) ammo_pack.attach_gun(user) else qdel(src) -/obj/item/gun/ballistic/minigun/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0, stam_cost = 0) +/obj/item/gun/energy/minigun/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0, stam_cost = 0) if(ammo_pack) if(ammo_pack.overheat < ammo_pack.overheat_max) - ammo_pack.overheat += burst_size + ammo_pack.overheat++ ..() else to_chat(user, "The gun's heat sensor locked the trigger to prevent lens damage.") -/obj/item/gun/ballistic/minigun/afterattack(atom/target, mob/living/user, flag, params) +/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/ballistic/minigun/dropped(mob/living/user) +/obj/item/gun/energy/minigun/dropped(mob/living/user) . = ..() ammo_pack.attach_gun(user) diff --git a/code/modules/surgery/bodyparts/_bodyparts.dm b/code/modules/surgery/bodyparts/_bodyparts.dm index d6379e1166..9144eefdbc 100644 --- a/code/modules/surgery/bodyparts/_bodyparts.dm +++ b/code/modules/surgery/bodyparts/_bodyparts.dm @@ -211,7 +211,7 @@ switch(animal_origin) if(ALIEN_BODYPART,LARVA_BODYPART) //aliens take some additional burn //nothing can burn with so much snowflake code around - burn *= 1.2 + burn *= 1.5 /* // START WOUND HANDLING