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

powder that makes you say yes

Browse Source
This commit is contained in:
Razgriz
2022-08-17 01:27:20 -07:00
committed by GitHub
parent 6869732e32
commit 36ec46103e
1 changed files with 5 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
code/modules/projectiles/guns/energy/special_vr.dm
View File

@@ -1,43 +1,14 @@
<<<<<<< HEAD
/obj/item/weapon/gun/energy/ionrifle/pistol
projectile_type = /obj/item/projectile/ion/pistol // still packs a punch but no AoE
w_class = ITEMSIZE_NORMAL //CHOMP Edit.
move_delay = 0 // CHOMPEdit: Pistols have move_delay of 0
/obj/item/weapon/gun/energy/ionrifle/weak
projectile_type = /obj/item/projectile/ion/small
/obj/item/weapon/gun/energy/medigun //Adminspawn/ERT etc // CH edit - Changes ML3M to NERD
name = "directed restoration system"
desc = "The BL-3 'Phoenix' is an adaptation on the NERD 'Medbeam' design that channels the power of the beam into a single healing laser. It is highly energy-inefficient, but its medical power cannot be denied."
force = 5
icon_state = "medbeam"
item_state = "medbeam"
icon = 'icons/obj/gun_vr.dmi'
item_icons = list(
slot_l_hand_str = 'icons/mob/items/lefthand_guns_vr.dmi',
slot_r_hand_str = 'icons/mob/items/righthand_guns_vr.dmi',
)
slot_flags = SLOT_BELT
accuracy = 100
fire_delay = 12
fire_sound = 'sound/weapons/eluger.ogg'
projectile_type = /obj/item/projectile/beam/medigun
accept_cell_type = /obj/item/weapon/cell
cell_type = /obj/item/weapon/cell/high
charge_cost = 2500
=======
/obj/item/weapon/gun/energy/ionrifle/pistol
projectile_type = /obj/item/projectile/ion/pistol // still packs a punch but no AoE
w_class = ITEMSIZE_NORMAL //CHOMP Edit.
move_delay = 0 // CHOMPEdit: Pistols have move_delay of 0
/obj/item/weapon/gun/energy/ionrifle/weak
projectile_type = /obj/item/projectile/ion/small
/obj/item/weapon/gun/energy/medigun //Adminspawn/ERT etc
/obj/item/weapon/gun/energy/medigun //Adminspawn/ERT etc // CH edit - Changes ML3M to NERD
name = "directed restoration system"
desc = "The BL-3 'Phoenix' is an adaptation on the ML-3 'Medbeam' design that channels the power of the beam into a single healing laser. It is highly energy-inefficient, but its medical power cannot be denied."
desc = "The BL-3 'Phoenix' is an adaptation on the NERD 'Medbeam' design that channels the power of the beam into a single healing laser. It is highly energy-inefficient, but its medical power cannot be denied."
force = 5
icon_state = "medbeam"
item_state = "medbeam"
@@ -130,5 +101,4 @@
for(var/target in victims)
var/obj/item/projectile/P = new zaptype(src.loc)
P.launch_projectile_from_turf(target = target, target_zone = null, user = firer, params = null, angle_override = null, forced_spread = 0)
..()
>>>>>>> 332eeb9850... Merge pull request #13436 from Screemonster/thebiggun
..()