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

Fixes bug with holdout phasers

Browse Source
This commit is contained in:
Unknown
2018-10-05 02:04:30 -04:00
parent 3203fbfa34
commit af4afc3e32
3 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/datums/supplypacks/munitions_vr.dm
View File

@@ -1,7 +1,8 @@
/datum/supply_pack/munitions/expeditionguns /datum/supply_pack/munitions/expeditionguns
name = "Frontier phaser (station-locked) crate" name = "Frontier phaser (station-locked) crate"
contains = list( contains = list(
/obj/item/weapon/gun/energy/frontier/locked = 2, /obj/item/weapon/gun/energy/frontier/locked/basic = 2,
/obj/item/weapon/gun/energy/frontier/locked/holdout = 1,
) )
cost = 35 cost = 35
containertype = /obj/structure/closet/crate/secure containertype = /obj/structure/closet/crate/secure

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

@@ -743,10 +743,6 @@
var/recharging = 0 var/recharging = 0
projectile_type = /obj/item/projectile/beam projectile_type = /obj/item/projectile/beam
firemodes = list(
list(mode_name="normal", fire_delay=12, projectile_type=/obj/item/projectile/beam, charge_cost = 600),
list(mode_name="low-power", fire_delay=8, projectile_type=/obj/item/projectile/beam/weaklaser, charge_cost = 120),
)
/obj/item/weapon/gun/energy/frontier/unload_ammo(var/mob/user) /obj/item/weapon/gun/energy/frontier/unload_ammo(var/mob/user)
if(recharging) if(recharging)
@@ -778,6 +774,13 @@
/obj/item/weapon/gun/energy/frontier/ex_act() //|rugged| /obj/item/weapon/gun/energy/frontier/ex_act() //|rugged|
return return
//Needed to fix a bug with the holdout phaser
/obj/item/weapon/gun/energy/frontier/basic
firemodes = list(
list(mode_name="normal", fire_delay=12, projectile_type=/obj/item/projectile/beam, charge_cost = 600),
list(mode_name="low-power", fire_delay=8, projectile_type=/obj/item/projectile/beam/weaklaser, charge_cost = 120),
)
/obj/item/weapon/gun/energy/frontier/locked /obj/item/weapon/gun/energy/frontier/locked
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. This one has a safety interlock that prevents firing while in proximity to the facility." 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. This one has a safety interlock that prevents firing while in proximity to the facility."
req_access = list(access_armory) //for toggling safety req_access = list(access_armory) //for toggling safety
@@ -808,6 +811,13 @@
return 0 return 0
return ..() return ..()
//Needed to fix a bug with the holdout phaser
/obj/item/weapon/gun/energy/frontier/locked/basic
firemodes = list(
list(mode_name="normal", fire_delay=12, projectile_type=/obj/item/projectile/beam, charge_cost = 600),
list(mode_name="low-power", fire_delay=8, projectile_type=/obj/item/projectile/beam/weaklaser, charge_cost = 120),
)
//Expeditionary Holdout Phaser //Expeditionary Holdout Phaser
/obj/item/weapon/gun/energy/frontier/locked/holdout /obj/item/weapon/gun/energy/frontier/locked/holdout
name = "holdout frontier phaser" name = "holdout frontier phaser"

2
maps/tether/tether_things.dm
View File

@@ -395,7 +395,7 @@ var/global/list/latejoin_tram = list()
/obj/structure/closet/secure_closet/guncabinet/excursion/New() /obj/structure/closet/secure_closet/guncabinet/excursion/New()
..() ..()
for(var/i = 1 to 4) for(var/i = 1 to 4)
new /obj/item/weapon/gun/energy/frontier/locked(src) new /obj/item/weapon/gun/energy/frontier/locked/basic(src)
for(var/i = 1 to 4) for(var/i = 1 to 4)
new /obj/item/weapon/gun/energy/frontier/locked/holdout(src) new /obj/item/weapon/gun/energy/frontier/locked/holdout(src)