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

Merge pull request #5757 from Rykka-Stormheart/shep-dev-phaser-buff

Browse Source 
Buff Frontier Phasers by reducing charge time to sub-30 seconds.
This commit is contained in:
Novacat
2019-08-31 17:21:08 -04:00
committed by GitHub
parent 85d4160b6a ca6c795661
commit 5eaebcf0df
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/modules/vore/fluffstuff/custom_guns_vr.dm
View File

@@ -730,7 +730,7 @@
icon_state = "r357" icon_state = "r357"
ammo_type = /obj/item/ammo_casing/a44/rubber ammo_type = /obj/item/ammo_casing/a44/rubber
//Expedition pistol //Expedition Frontier Phaser
/obj/item/weapon/gun/energy/frontier /obj/item/weapon/gun/energy/frontier
name = "frontier phaser" name = "frontier phaser"
desc = "An extraordinarily rugged laser weapon, built to last and requiring effectively no maintenance. Includes a built-in crank charger for recharging away from civilization." desc = "An extraordinarily rugged laser weapon, built to last and requiring effectively no maintenance. Includes a built-in crank charger for recharging away from civilization."
@@ -746,6 +746,7 @@
unacidable = 1 unacidable = 1
var/recharging = 0 var/recharging = 0
var/phase_power = 75
projectile_type = /obj/item/projectile/beam projectile_type = /obj/item/projectile/beam
firemodes = list( firemodes = list(
@@ -764,7 +765,7 @@
if(!do_after(user, 10, src)) if(!do_after(user, 10, src))
break break
playsound(get_turf(src),'sound/items/change_drill.ogg',25,1) playsound(get_turf(src),'sound/items/change_drill.ogg',25,1)
if(power_supply.give(60) < 60) if(power_supply.give(phase_power) < phase_power)
break break
recharging = 0 recharging = 0
@@ -835,13 +836,14 @@
return return
..() ..()
//Expeditionary Holdout Phaser //Expeditionary Holdout Phaser Pistol
/obj/item/weapon/gun/energy/frontier/locked/holdout /obj/item/weapon/gun/energy/frontier/locked/holdout
name = "holdout frontier phaser" name = "holdout frontier phaser"
desc = "An minaturized weapon designed for the purpose of expeditionary support to defend themselves on the field. Includes a built-in crank charger for recharging away from civilization. This one has a safety interlock that prevents firing while in proximity to the facility." desc = "An minaturized weapon designed for the purpose of expeditionary support to defend themselves on the field. Includes a built-in crank charger for recharging away from civilization. This one has a safety interlock that prevents firing while in proximity to the facility."
icon = 'icons/obj/gun_vr.dmi' icon = 'icons/obj/gun_vr.dmi'
icon_state = "holdoutkill" icon_state = "holdoutkill"
item_state = null item_state = null
phase_power = 100
w_class = ITEMSIZE_SMALL w_class = ITEMSIZE_SMALL
charge_cost = 600 charge_cost = 600