cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-26 14:39:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

stuffs (#20633)

Browse Source
This commit is contained in:
kevinz000
2016-09-26 14:55:12 +13:00
committed by oranges
parent 55b9c645e5
commit 125209cfd4
5 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/ammunition/energy.dm
+2 -2
View File
@@ -172,11 +172,11 @@ obj/item/ammo_casing/energy/net
/obj/item/ammo_casing/energy/instakill/red
projectile_type = /obj/item/projectile/beam/instakill/red
/obj/item/ammo_casing/energy/shock_revolver
/obj/item/ammo_casing/energy/tesla_revolver
fire_sound = 'sound/magic/lightningbolt.ogg'
e_cost = 200
select_name = "stun"
projectile_type = /obj/item/projectile/energy/shock_revolver
projectile_type = /obj/item/projectile/energy/tesla_revolver
/obj/item/ammo_casing/energy/gravityrepulse
projectile_type = /obj/item/projectile/gravityrepulse
code/modules/projectiles/guns/energy/stun.dm
+2 -2
View File
@@ -7,12 +7,12 @@
origin_tech = "combat=3"
ammo_x_offset = 3
/obj/item/weapon/gun/energy/shock_revolver
/obj/item/weapon/gun/energy/tesla_revolver
name = "tesla gun"
desc = "An experimental gun based on an experimental engine, it's about as likely to kill it's operator as it is the target."
icon_state = "tesla"
item_state = "tesla"
ammo_type = list(/obj/item/ammo_casing/energy/shock_revolver)
ammo_type = list(/obj/item/ammo_casing/energy/tesla_revolver)
origin_tech = "combat=4;materials=4;powerstorage=4"
can_flashlight = 0
pin = null
code/modules/projectiles/projectile/energy.dm
+8 -7
View File
@@ -165,22 +165,23 @@
/obj/item/projectile/energy/bolt/large
damage = 20
/obj/item/projectile/energy/shock_revolver
name = "shock bolt"
icon_state = "purple_laser"
impact_effect_type = /obj/effect/overlay/temp/impact_effect/purple_laser
/obj/item/projectile/energy/tesla_revolver
name = "tesla bolt"
icon_state = "tesla_projectile"
impact_effect_type = /obj/effect/overlay/temp/impact_effect/blue_laser
var/chain
/obj/item/projectile/energy/shock_revolver/fire(setAngle)
/obj/item/projectile/energy/tesla_revolver/fire(setAngle)
if(firer)
chain = firer.Beam(src, icon_state = "lightning[rand(1, 12)]", time = INFINITY, maxdistance = INFINITY)
..()
/obj/item/projectile/energy/shock_revolver/on_hit(atom/target)
/obj/item/projectile/energy/tesla_revolver/on_hit(atom/target)
. = ..()
if(isliving(target))
tesla_zap(src, 3, 10000)
qdel(src)
/obj/item/projectile/energy/shock_revolver/Destroy()
/obj/item/projectile/energy/tesla_revolver/Destroy()
qdel(chain)
return ..()
code/modules/research/designs/weapon_designs.dm
+1 -1
View File
@@ -29,7 +29,7 @@
req_tech = list("combat" = 4, "materials" = 4, "powerstorage" = 5)
build_type = PROTOLATHE
materials = list(MAT_METAL = 10000, MAT_GLASS = 10000, MAT_SILVER = 10000)
build_path = /obj/item/weapon/gun/energy/shock_revolver
build_path = /obj/item/weapon/gun/energy/tesla_revolver
category = list("Weapons")
/datum/design/nuclear_gun