From 13319748267e737152834e06bec1dea9a41010e2 Mon Sep 17 00:00:00 2001 From: TheDavestDave <30513964+TheDavestDave@users.noreply.github.com> Date: Sat, 29 May 2021 21:33:26 +0100 Subject: [PATCH] replaces the vender holdout with an upgraded one this holdout charges faster than the normal one --- .../ore_redemption_machine/survey_vendor.dm | 2 +- code/modules/projectiles/guns/energy/laser_vr.dm | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/code/modules/mining/ore_redemption_machine/survey_vendor.dm b/code/modules/mining/ore_redemption_machine/survey_vendor.dm index 4ce11da2733..9a11349a3a0 100644 --- a/code/modules/mining/ore_redemption_machine/survey_vendor.dm +++ b/code/modules/mining/ore_redemption_machine/survey_vendor.dm @@ -56,7 +56,7 @@ EQUIPMENT("Defense Equipment - Razor Drone Deployer", /obj/item/weapon/grenade/spawnergrenade/manhacks/station/locked, 100), EQUIPMENT("Defense Equipment - Sentry Drone Deployer", /obj/item/weapon/grenade/spawnergrenade/ward, 150), EQUIPMENT("Defense Equipment - Frontier Carbine", /obj/item/weapon/gun/energy/locked/frontier/carbine, 750), - EQUIPMENT("Defense Equipment - Frontier Holdout", /obj/item/weapon/gun/energy/locked/frontier/holdout, 500), + EQUIPMENT("Defense Equipment - Frontier Holdout Plus", /obj/item/weapon/gun/energy/locked/frontier/holdout/holdoutplus, 500), EQUIPMENT("Fishing Net", /obj/item/weapon/material/fishing_net, 50), EQUIPMENT("Titanium Fishing Rod", /obj/item/weapon/material/fishing_rod/modern, 100), EQUIPMENT("Durasteel Fishing Rod", /obj/item/weapon/material/fishing_rod/modern/strong, 750), diff --git a/code/modules/projectiles/guns/energy/laser_vr.dm b/code/modules/projectiles/guns/energy/laser_vr.dm index 4256cb50d45..89e6edbdb6f 100644 --- a/code/modules/projectiles/guns/energy/laser_vr.dm +++ b/code/modules/projectiles/guns/energy/laser_vr.dm @@ -263,7 +263,7 @@ icon_state = "carbinekill" item_state = "energykill" item_icons = list(slot_l_hand_str = 'icons/mob/items/lefthand_guns.dmi', slot_r_hand_str = 'icons/mob/items/righthand_guns.dmi') - phase_power = 150 + modifystate = "carbinekill" firemodes = list( @@ -309,6 +309,19 @@ locked = 0 lockable = 0 +////////////////Frontier Holdout Plus//////////////// + +/obj/item/weapon/gun/energy/locked/frontier/holdout/holdoutplus + name = "holdout frontier phaser plus" + desc = "An minaturized weapon designed for the purpose of expeditionary support to defend themselves on the field. Includes a more economic built-in crank charger for recharging away from civilization. This one has a safety interlock that prevents firing while in proximity to the facility." + phase_power = 150 + + obj/item/weapon/gun/energy/locked/frontier/holdout/holdoutplus/unlocked + desc = "An minaturized weapon designed for the purpose of expeditionary support to defend themselves on the field. Includes a more economic built-in crank charger for recharging away from civilization." + req_access = newlist() //for toggling safety + locked = 0 + lockable = 0 + ////////////////Phaser Rifle//////////////// /obj/item/weapon/gun/energy/locked/frontier/rifle