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

Merge pull request #8674 from GinjaNinja32/rig_guns

Browse Source 
Rig weapon fixes
This commit is contained in:
PsiOmegaDelta
2015-03-30 15:02:22 +02:00
parent bdbb61f0f8 e342bf8a3a
commit fefb55db93
4 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/clothing/spacesuits/rig/modules/combat.dm
View File

@@ -85,7 +85,7 @@
desc = "A shoulder-mounted battery-powered laser cannon mount." desc = "A shoulder-mounted battery-powered laser cannon mount."
selectable = 1 selectable = 1
usable = 1 usable = 1
use_power_cost = 10 module_cooldown = 0
engage_string = "Configure" engage_string = "Configure"

1
code/modules/projectiles/guns/energy/laser.dm
View File

@@ -57,6 +57,7 @@ obj/item/weapon/gun/energy/retro
fire_delay = 20 fire_delay = 20
/obj/item/weapon/gun/energy/lasercannon/mounted /obj/item/weapon/gun/energy/lasercannon/mounted
name = "mounted laser cannon"
self_recharge = 1 self_recharge = 1
use_external_power = 1 use_external_power = 1
recharge_time = 10 recharge_time = 10

1
code/modules/projectiles/guns/energy/nuclear.dm
View File

@@ -35,6 +35,7 @@
user.update_inv_r_hand() user.update_inv_r_hand()
/obj/item/weapon/gun/energy/gun/mounted /obj/item/weapon/gun/energy/gun/mounted
name = "mounted energy gun"
self_recharge = 1 self_recharge = 1
use_external_power = 1 use_external_power = 1

2
code/modules/projectiles/guns/energy/stun.dm
View File

@@ -9,10 +9,12 @@
cell_type = /obj/item/weapon/cell/crap cell_type = /obj/item/weapon/cell/crap
/obj/item/weapon/gun/energy/taser/mounted /obj/item/weapon/gun/energy/taser/mounted
name = "mounted taser gun"
self_recharge = 1 self_recharge = 1
use_external_power = 1 use_external_power = 1
/obj/item/weapon/gun/energy/taser/mounted/cyborg /obj/item/weapon/gun/energy/taser/mounted/cyborg
name = "taser gun"
cell_type = /obj/item/weapon/cell/secborg cell_type = /obj/item/weapon/cell/secborg
recharge_time = 10 //Time it takes for shots to recharge (in ticks) recharge_time = 10 //Time it takes for shots to recharge (in ticks)