From a2454795f95a3124dfab0add480dfdca9c2eba62 Mon Sep 17 00:00:00 2001 From: Razgriz Date: Tue, 24 Jan 2023 17:16:00 -0700 Subject: [PATCH] no --- code/datums/supplypacks/munitions_vr.dm | 30 +++++++++++-------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/code/datums/supplypacks/munitions_vr.dm b/code/datums/supplypacks/munitions_vr.dm index 3184edb7a2..f18f8a6044 100644 --- a/code/datums/supplypacks/munitions_vr.dm +++ b/code/datums/supplypacks/munitions_vr.dm @@ -1,29 +1,25 @@ -/* -/datum/supply_pack/munitions/expeditionguns - name = "Frontier phaser (station-locked) crate" +/datum/supply_pack/munitions/expeditionguns //CHOMP Edit begin: Re-appropriating this whole block. Changing frontier phasers to phaseguns. + name = "Exploration phasegun (station-locked) crate" contains = list( - /obj/item/weapon/gun/energy/locked/frontier = 2, - /obj/item/weapon/gun/energy/locked/frontier/holdout = 2, + /obj/item/weapon/gun/energy/locked/phasegun/pistol = 2, + /obj/item/weapon/gun/energy/locked/phasegun/rifle = 2, + /obj/item/weapon/gun/energy/locked/phasegun = 2 ) cost = 35 containertype = /obj/structure/closet/crate/secure - containername = "frontier phaser crate" + containername = "phasegun crate" access = access_explorer -/datum/supply_pack/munitions/expeditionbows - name = "Frontier bows (station-locked) crate" +/datum/supply_pack/munitions/expeditioncannon + name = "Exploration phasecannon (station-locked) crate" contains = list( - /obj/item/weapon/gun/energy/locked/frontier/handbow=2 + /obj/item/weapon/gun/energy/locked/phasegun/cannon = 1 ) - cost = 20 + cost = 50 containertype = /obj/structure/closet/crate/secure - containername = "phaser handbow crate" -<<<<<<< HEAD - access = access_explorer -======= - access = access_security -*/ ->>>>>>> 7dec3dbaeb... Merge pull request #14234 from Novacat/nova-basicfixes + containername = "phasegun cannon crate" + access = access_explorer +//CHOMP Edit end /datum/supply_pack/munitions/ofd_charge_emp name = "OFD Charge - EMP"