cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-01-06 07:22:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Illegal KA Fix (#8590)

Browse Source
This commit is contained in:
Geeves
2020-04-03 20:36:32 +02:00
committed by GitHub
parent 21e32113d1
commit 390d91a405
3 changed files with 27 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/modules/custom_ka/cells.dm
View File

@@ -149,17 +149,17 @@
//Pump Action
name = "pump action KA cell"
build_name = "pump-action"
desc = "A clusterfuck of circuitry and battery parts all snuggly fit inside a solid, static plastisteel frame. A single pump is enough for any shot of any weapon."
desc = "A clusterfuck of circuitry and battery parts all snuggly fit inside a solid, static plastisteel frame. A single pump is enough to fully charge any set-up."
icon_state = "cell_illegal"
firedelay_increase = 0
recoil_increase = 0
cost_increase = -100
stored_charge = 1
cell_increase = 1
stored_charge = 5
cell_increase = 5
capacity_increase = 0
mod_limit_increase = 0
pump_restore = 1
pump_restore = 30
pump_delay = 0.3 SECONDS
origin_tech = list(TECH_MATERIAL = 3,TECH_ENGINEERING = 3,TECH_MAGNET = 3,TECH_POWER = 3, TECH_ILLEGAL = 4)

26
code/modules/custom_ka/core.dm
View File

@@ -225,26 +225,32 @@
next_fire_time = world.time + fire_delay
/obj/item/gun/custom_ka/consume_next_projectile()
if(!installed_cell || installed_cell.stored_charge < cost_increase)
if(!installed_cell || !installed_barrel || installed_cell.stored_charge < cost_increase)
return null
installed_cell.stored_charge -= cost_increase
var/obj/item/projectile/kinetic/shot_projectile
//Send fire events
if(installed_cell)
installed_cell.on_fire(src)
if(installed_barrel)
installed_barrel.on_fire(src)
shot_projectile = new installed_barrel.projectile_type(src.loc)
if(installed_upgrade_chip)
installed_upgrade_chip.on_fire(src)
if(installed_barrel)
installed_barrel.on_fire(src)
shot_projectile.damage = damage_increase
shot_projectile.range = range_increase
shot_projectile.aoe = aoe_increase
shot_projectile.base_damage = damage_increase
return shot_projectile
if(ispath(installed_barrel.projectile_type, /obj/item/projectile/kinetic))
var/obj/item/projectile/kinetic/shot_projectile = new installed_barrel.projectile_type(get_turf(src))
new installed_barrel.projectile_type(get_turf(src))
shot_projectile.damage = damage_increase
shot_projectile.range = range_increase
shot_projectile.aoe = aoe_increase
shot_projectile.base_damage = damage_increase
return shot_projectile
if(ispath(installed_barrel.projectile_type, /obj/item/projectile/beam))
var/obj/item/projectile/beam/shot_projectile = new installed_barrel.projectile_type(get_turf(src))
shot_projectile.damage = damage_increase
shot_projectile.range = range_increase
return shot_projectile
/obj/item/gun/custom_ka/Initialize()
. = ..()