cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

ok

Browse Source
This commit is contained in:
Teletubby2
2020-05-09 19:49:02 -04:00
parent 6021131272
commit dc64755e52
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/modules/projectiles/guns/energy/cell_loaded_vr/multi_cannon.dm
View File

@@ -20,6 +20,7 @@
icon_override = 'icons/vore/custom_guns_vr.dmi'
item_state = "multicannon"
slot_flags = SLOT_BACK
recoil = FALSE
/obj/item/weapon/gun/projectile/multi_cannon/update_icon()
. = ..()

10
code/modules/projectiles/guns/energy/cell_loaded_vr/multi_cannon_cells.dm
View File

@@ -11,7 +11,7 @@
var/charge
var/max_charge = 10
var/ticks = 1
var/ticks_to_charge = 5 //10 secs per shot charged
var/ticks_to_charge = 15 //10 secs per shot charged
/obj/item/ammo_casing/macrobattery/Initialize(mapload, ...)
. = ..()
@@ -77,7 +77,7 @@
name = "Macrobattery - LETHAL"
icon_state = "macrobat_ouchie"
bat_colour = "#cc3300"
projectile_type = /obj/item/projectile/beam
projectile_type = /obj/item/projectile/beam/heavylaser/lessheavy
/obj/item/ammo_casing/macrobattery/healie
name = "Macrobattery - RESTORE"
@@ -97,4 +97,8 @@
target.adjustToxLoss(-15)
target.radiation = max(target.radiation - 75, 0) //worse than mlem for rad, better for tox.
else
return 1
return 1
/obj/item/projectile/beam/heavylaser/lessheavy //all bark. no (or little) bite.
damage = 15
fire_sound = 'sound/weapons/Gunshot_cannon.ogg'