From f45cdbf0475d10437401fa2ac826615b5796a2cc Mon Sep 17 00:00:00 2001 From: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> Date: Mon, 4 Oct 2021 20:36:41 -0400 Subject: [PATCH] Cyborg variant, sprites --- code/modules/projectiles/ammunition/energy.dm | 7 +++++-- code/modules/projectiles/guns/energy/laser.dm | 8 +++++--- icons/obj/guns/energy.dmi | Bin 42036 -> 43105 bytes 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/code/modules/projectiles/ammunition/energy.dm b/code/modules/projectiles/ammunition/energy.dm index d8802045ba9..049bf13c174 100644 --- a/code/modules/projectiles/ammunition/energy.dm +++ b/code/modules/projectiles/ammunition/energy.dm @@ -275,10 +275,13 @@ projectile_type = /obj/item/projectile/beam/emitter muzzle_flash_color = LIGHT_COLOR_GREEN fire_sound = 'sound/weapons/emitter.ogg' - e_cost = 500 // about 28 shots on an engineering borg from a borging machine, assuming some power is used for lights / movement. May need to change. - delay = 3 SECONDS // Lasers fire every second + e_cost = 100 + delay = 2 SECONDS // Lasers fire twice every second for 40 dps, this fires every 2 seconds for 15 dps. Seems fair, since every cyborg will have this with more shots? select_name = "emitter" +/obj/item/ammo_casing/energy/emitter/cyborg + e_cost = 500 // about 28 shots on an engineering borg from a borging machine, assuming some power is used for lights / movement. May need to change. + /obj/item/ammo_casing/energy/bsg projectile_type = /obj/item/projectile/energy/bsg muzzle_flash_color = LIGHT_COLOR_DARKBLUE diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm index d6284adb0c0..c30119f3be6 100644 --- a/code/modules/projectiles/guns/energy/laser.dm +++ b/code/modules/projectiles/guns/energy/laser.dm @@ -143,10 +143,11 @@ /obj/item/gun/energy/emitter name = "mobile emitter" - desc = "An emitter someone removed from its base, and an attached to a power cell, to try to make a weapon." - icon_state = "lasercannon" + desc = "An emitter someone removed from its base, and attached to a laser cannon frame, to try to make a weapon." + icon_state = "emittercannon" item_state = "laser" w_class = WEIGHT_CLASS_BULKY + shaded_charge = TRUE can_holster = FALSE origin_tech = "combat=4;magnets=4;powerstorage=3" ammo_type = list(/obj/item/ammo_casing/energy/emitter) @@ -154,7 +155,8 @@ /obj/item/gun/energy/emitter/cyborg name = "mounted emitter" - desc = "An emitter mounted to your cyborg frame, draining charge from your cell." + desc = "An emitter built into to your cyborg frame, draining charge from your cell." + ammo_type = list(/obj/item/ammo_casing/energy/emitter/cyborg) /obj/item/gun/energy/emitter/cyborg/newshot() ..() diff --git a/icons/obj/guns/energy.dmi b/icons/obj/guns/energy.dmi index b4f2c2204abdcec01522e6518a872a464f75dea0..4adf1a45e30fdcbe06fae4eaf44fc16958eeef72 100644 GIT binary patch delta 5620 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 delta 4544 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