shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tweaking some cyborg mounted energy guns. (#8037)

Browse Source 
* You get yourself a bottle and say, "I don't love anything anymore."

* the sunset.

* I'm nuclear gun, I'm wild.
This commit is contained in:
Ghom
2019-02-28 01:02:33 +01:00
committed by kevinz000
parent 22e3145901
commit 704d7403ac
15 changed files with 79 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_citadel/code/modules/projectiles/guns/ballistic/handguns.dm
+1 -1
View File
@@ -144,4 +144,4 @@ obj/item/projectile/bullet/c10mm/soporific
icon_state = "raygun"
desc = "A toy laser with a classic, retro feel and look. Compatible with existing laser tag systems."
ammo_type = list(/obj/item/ammo_casing/energy/laser/raytag)
selfcharge = TRUE
selfcharge = EGUN_SELFCHARGE
modular_citadel/code/modules/projectiles/guns/ballistic/magweapon.dm
+1 -1
View File
@@ -456,7 +456,7 @@
obj_flags = 0
fire_delay = 40
weapon_weight = WEAPON_HEAVY
selfcharge = TRUE
selfcharge = EGUN_SELFCHARGE
charge_delay = 2
recoil = 2
cell_type = /obj/item/stock_parts/cell/toymagburst
modular_citadel/code/modules/projectiles/guns/pumpenergy.dm
+10 -3
View File
@@ -16,13 +16,20 @@
update_icon()
/obj/item/gun/energy/pumpaction/process() //makes it not rack itself when self-charging
if(selfcharge)
if(selfcharge && cell?.charge < cell.maxcharge)
charge_tick++
if(charge_tick < charge_delay)
return
charge_tick = 0
if(!cell)
return
if(selfcharge == EGUN_SELFCHARGE_BORG)
var/atom/owner = loc
if(istype(owner, /obj/item/robot_module))
owner = owner.loc
if(!iscyborg(owner))
return
var/mob/living/silicon/robot/R = owner
if(!R.cell?.use(100))
return
cell.give(100)
update_icon()
modular_citadel/code/modules/projectiles/guns/toys.dm
+1 -1
View File
@@ -15,7 +15,7 @@
ammo_type = list(/obj/item/ammo_casing/energy/laser/dispersal, /obj/item/ammo_casing/energy/laser/wavemotion)
ammo_x_offset = 2
modifystate = 1
selfcharge = TRUE
selfcharge = EGUN_SELFCHARGE
item_flags = NONE
clumsy_check = FALSE
modular_citadel/code/modules/vore/resizing/sizegun_vr.dm
+2 -2
View File
@@ -12,7 +12,7 @@
charge_cost = 100
projectile_type = /obj/item/projectile/beam/shrinklaser
modifystate = "sizegun-shrink"
selfcharge = 1
selfcharge = EGUN_SELFCHARGE
firemodes = list(
list(mode_name = "grow",
projectile_type = /obj/item/projectile/beam/growlaser,
@@ -153,7 +153,7 @@ datum/design/sizeray
desc = "Size manipulator using bluespace breakthroughs."
item_state = null //so the human update icon uses the icon_state instead.
ammo_type = list(/obj/item/ammo_casing/energy/laser/shrinkray, /obj/item/ammo_casing/energy/laser/growthray)
selfcharge = 1
selfcharge = EGUN_SELFCHARGE
charge_delay = 5
ammo_x_offset = 2
clumsy_check = 1