Skip to content

Commit

Permalink
Gives the Valhalla seasonal vendor tabs (and adds a few missing guns) (…
Browse files Browse the repository at this point in the history 
…#13553)

* reshuffling!

added the missing M1911 and skorpion SMGs and categorized the various guns in here. Tracking 12 gauge was removed because it's in marine vendors.

* Update marine_vending.dm

whoops!

* Update marine_vending.dm

who put this here?
  • Loading branch information
@yyzsong
yyzsong authored Jul 24, 2023
1 parent 21af3b1 commit 2ebce4c
Showing 1 changed file with 37 additions and 21 deletions.
58 changes: 37 additions & 21 deletions code/game/objects/machinery/vending/marine_vending.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1435,43 +1435,54 @@
resistance_flags = INDESTRUCTIBLE
use_power = NO_POWER_USE
products = list(
"Weapon" = list(
"Seasonal" = list(
/obj/item/weapon/gun/revolver/small = -1,
/obj/item/ammo_magazine/revolver/small = -1,
/obj/item/weapon/gun/revolver/single_action/m44 = -1,
/obj/item/ammo_magazine/revolver = -1,
/obj/item/weapon/gun/revolver/judge = -1,
/obj/item/ammo_magazine/revolver/judge = -1,
/obj/item/ammo_magazine/revolver/judge/buckshot = -1,
/obj/item/weapon/gun/revolver/upp = -1,
/obj/item/ammo_magazine/revolver/upp = -1,
/obj/item/weapon/gun/pistol/g22 = -1,
/obj/item/ammo_magazine/pistol/g22 = -1,
/obj/item/weapon/gun/pistol/heavy = -1,
/obj/item/ammo_magazine/pistol/heavy = -1,
/obj/item/weapon/gun/pistol/vp78 = -1,
/obj/item/ammo_magazine/pistol/vp78 = -1,
/obj/item/weapon/gun/pistol/heavy = -1,
/obj/item/ammo_magazine/pistol/heavy = -1,
/obj/item/weapon/gun/pistol/highpower = -1,
/obj/item/ammo_magazine/pistol/highpower = -1,
/obj/item/weapon/gun/revolver/judge = -1,
/obj/item/ammo_magazine/revolver/judge = -1,
/obj/item/ammo_magazine/revolver/judge/buckshot = -1,
/obj/item/weapon/gun/revolver/upp = -1,
/obj/item/ammo_magazine/revolver/upp = -1,
/obj/item/weapon/gun/smg/uzi = -1,
/obj/item/ammo_magazine/smg/uzi = -1,
/obj/item/weapon/gun/revolver/cmb = -1,
/obj/item/ammo_magazine/revolver/cmb = -1,
/obj/item/weapon/gun/smg/m25 = -1,
/obj/item/ammo_magazine/smg/m25 = -1,
/obj/item/weapon/gun/smg/mp7 = -1,
/obj/item/ammo_magazine/smg/mp7 = -1,
/obj/item/weapon/gun/smg/skorpion = -1,
/obj/item/ammo_magazine/smg/skorpion = -1,
/obj/item/weapon/gun/revolver/cmb = -1,
/obj/item/ammo_magazine/revolver/cmb = -1,
/obj/item/weapon/gun/rifle/mkh = -1,
/obj/item/ammo_magazine/rifle/mkh = -1,
/obj/item/weapon/gun/smg/ppsh = -1,
/obj/item/ammo_magazine/smg/ppsh = -1,
/obj/item/ammo_magazine/smg/ppsh/extended = -1,
/obj/item/weapon/gun/rifle/garand = -1,
/obj/item/ammo_magazine/rifle/garand = -1,
/obj/item/weapon/gun/pistol/m1911 = -1,
/obj/item/ammo_magazine/pistol/m1911 = -1,
/obj/item/weapon/gun/shotgun/combat = -1,
/obj/item/weapon/gun/shotgun/pump = -1,
/obj/item/weapon/gun/shotgun/pump/cmb = -1,
/obj/item/weapon/gun/rifle/mpi_km = -1,
/obj/item/ammo_magazine/rifle/mpi_km/plum = -1,
/obj/item/ammo_magazine/packet/pwarsaw = -1,
/obj/item/weapon/gun/rifle/m16 = -1,
/obj/item/ammo_magazine/rifle/m16 = -1,
/obj/item/ammo_magazine/packet/pnato = -1,
/obj/item/weapon/gun/rifle/sniper/svd = -1,
/obj/item/ammo_magazine/sniper/svd = -1,
/obj/item/weapon/gun/rifle/m412 = -1,
/obj/item/ammo_magazine/rifle = -1,
/obj/item/weapon/gun/rifle/m41a = -1,
Expand All @@ -1480,10 +1491,13 @@
/obj/item/ammo_magazine/rifle/type71 = -1,
/obj/item/weapon/gun/rifle/alf_machinecarbine = -1,
/obj/item/ammo_magazine/rifle/alf_machinecarbine = -1,
/obj/item/weapon/gun/shotgun/double = -1,
/obj/item/weapon/gun/shotgun/double/sawn = -1,
/obj/item/weapon/gun/rifle/sniper/svd = -1,
/obj/item/ammo_magazine/sniper/svd = -1,
/obj/item/weapon/gun/shotgun/pump/lever = -1,
/obj/item/weapon/gun/shotgun/pump/lever/mbx900 = -1,
/obj/item/ammo_magazine/shotgun/mbx900 = -1,
/obj/item/ammo_magazine/shotgun/mbx900/buckshot = -1,
/obj/item/ammo_magazine/shotgun/mbx900/tracking = -1,
),
"Sons of Mars" = list(
/obj/item/weapon/gun/rifle/som = -1,
/obj/item/ammo_magazine/rifle/som = -1,
/obj/item/ammo_magazine/handful/micro_grenade = -1,
Expand All @@ -1498,22 +1512,26 @@
/obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/culverin = -1,
/obj/item/cell/lasgun/volkite = -1,
/obj/item/cell/lasgun/volkite/powerpack = -1,
),
"ICC" = list(
/obj/item/weapon/gun/rifle/icc_battlecarbine = -1,
/obj/item/ammo_magazine/rifle/icc_battlecarbine = -1,
/obj/item/weapon/gun/rifle/icc_confrontationrifle = -1,
/obj/item/ammo_magazine/rifle/icc_confrontationrifle = -1,
/obj/item/weapon/gun/rifle/icc_sharpshooter = -1,
/obj/item/ammo_magazine/rifle/icc_sharpshooter = -1,
/obj/item/weapon/gun/smg/icc_pdw = -1,
/obj/item/ammo_magazine/smg/icc_pdw = -1,
/obj/item/weapon/gun/smg/icc_machinepistol = -1,
/obj/item/ammo_magazine/smg/icc_machinepistol = -1,
/obj/item/ammo_magazine/smg/icc_machinepistol/hp = -1,
/obj/item/ammo_magazine/smg/icc_pdw = -1,
/obj/item/weapon/gun/pistol/icc_dpistol = -1,
/obj/item/ammo_magazine/pistol/icc_dpistol = -1,
/obj/item/weapon/gun/rifle/icc_coilgun = -1,
/obj/item/ammo_magazine/rifle/icc_coilgun = -1,
/obj/item/weapon/gun/shotgun/pump/trenchgun = -1,
),
"PMC" = list(
/obj/item/weapon/gun/rifle/sniper/elite = -1,
/obj/item/ammo_magazine/sniper/elite = -1,
/obj/item/weapon/gun/rifle/standard_smartmachinegun/pmc = -1,
Expand All @@ -1522,12 +1540,10 @@
/obj/item/ammo_magazine/smg/m25/ap = -1,
/obj/item/weapon/gun/rifle/m412/elite = -1,
/obj/item/ammo_magazine/rifle/ap = -1,
/obj/item/weapon/gun/rifle/garand = -1,
/obj/item/ammo_magazine/rifle/garand = -1,
/obj/item/weapon/gun/shotgun/pump/lever/mbx900 = -1,
/obj/item/ammo_magazine/shotgun/mbx900 = -1,
/obj/item/ammo_magazine/shotgun/mbx900/buckshot = -1,
/obj/item/ammo_magazine/shotgun/tracker = -1,
),
"Misc" = list(
/obj/item/weapon/gun/shotgun/double = -1,
/obj/item/weapon/gun/shotgun/double/sawn = -1,
)
)

Expand Down

0 comments on commit 2ebce4c

Please sign in to comment.