Skip to content

Commit

Permalink
Merge pull request #5011 from Kilmented/master
Browse files Browse the repository at this point in the history 
SUPPLY REWORK PART 0.5
  • Loading branch information
@Kilmented
Kilmented authored Apr 22, 2024
2 parents 9bc9eb1 + bf43313 commit de85dfd
Show file tree
Hide file tree
Showing 4 changed files with 49 additions and 613 deletions.
72 changes: 36 additions & 36 deletions code/modules/WVM/wvm.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -704,45 +704,45 @@ GLOBAL_VAR_INIT(vendor_cash, 0)
name = "Wasteland Vending Machine - Weapons"
icon_state = "nuweapon_idle"
prize_list = list(
new /datum/data/wasteland_equipment("Civilian Weapon Kit (Starter Weapons + Ammo)", /obj/item/kit_spawner/townie, 400),
new /datum/data/wasteland_equipment("Beretta M93R (9mm)", /obj/item/gun/ballistic/automatic/pistol/beretta/automatic, 500),
new /datum/data/wasteland_equipment("Sig P220 (.45)", /obj/item/gun/ballistic/automatic/pistol/sig, 500),
new /datum/data/wasteland_equipment("Hunting Shotgun (12 gauge)", /obj/item/gun/ballistic/shotgun/hunting, 500),
new /datum/data/wasteland_equipment("10mm SMG (10mm)", /obj/item/gun/ballistic/automatic/smg/smg10mm, 800),
new /datum/data/wasteland_equipment("Lee Enfield (.308)", /obj/item/gun/ballistic/rifle/enfield, 800),
new /datum/data/wasteland_equipment("Hunting Rifle (.30-06)", /obj/item/gun/ballistic/rifle/hunting, 800),
new /datum/data/wasteland_equipment("Surplus Nash Police Rifle (5.56)", /obj/item/gun/ballistic/automatic/marksman/policerifle, 800),
new /datum/data/wasteland_equipment("Surplus Nash Auto Rifle (5mm)", /obj/item/gun/ballistic/automatic/assault_carbine/policerifle, 300),
new /datum/data/wasteland_equipment("Compliance Regulator (SEC)", /obj/item/gun/energy/laser/complianceregulator, 300),
new /datum/data/wasteland_equipment("AEP-7 (SEC)", /obj/item/gun/energy/laser/pistol, 300),
new /datum/data/wasteland_equipment("Pulse Pistol (ECP)", /obj/item/gun/energy/ionrifle/compact, 300),
new /datum/data/wasteland_equipment("AER-9 (MFC)", /obj/item/gun/energy/laser/aer9, 300),
new /datum/data/wasteland_equipment("Portable Cell Charger", /obj/item/storage/battery_box, 50),
new /datum/data/wasteland_equipment("Seclite Flashlight", /obj/item/flashlight/seclite, 25),
new /datum/data/wasteland_equipment("Guns and Bullets, Part 1", /obj/item/book/granter/crafting_recipe/gunsmith_one, 25),
new /datum/data/wasteland_equipment("Guns and Bullets, Part 2", /obj/item/book/granter/crafting_recipe/gunsmith_two, 50),
new /datum/data/wasteland_equipment("Guns and Bullets, Part 3", /obj/item/book/granter/crafting_recipe/gunsmith_three, 75),
new /datum/data/wasteland_equipment("Civilian Weapon Kit (Starter Weapons + Ammo)", /obj/item/kit_spawner/townie, 300),
new /datum/data/wasteland_equipment("Beretta M93R (9mm)", /obj/item/gun/ballistic/automatic/pistol/beretta/automatic, 100),
new /datum/data/wasteland_equipment("Sig P220 (.45)", /obj/item/gun/ballistic/automatic/pistol/sig, 150),
new /datum/data/wasteland_equipment("Hunting Shotgun (12 gauge)", /obj/item/gun/ballistic/shotgun/hunting, 200),
new /datum/data/wasteland_equipment("10mm SMG (10mm)", /obj/item/gun/ballistic/automatic/smg/smg10mm, 300),
new /datum/data/wasteland_equipment("Lee Enfield (.308)", /obj/item/gun/ballistic/rifle/enfield, 225),
new /datum/data/wasteland_equipment("Hunting Rifle (.30-06)", /obj/item/gun/ballistic/rifle/hunting, 250),
new /datum/data/wasteland_equipment("Surplus Nash Police Rifle (5.56)", /obj/item/gun/ballistic/automatic/marksman/policerifle, 200),
new /datum/data/wasteland_equipment("Surplus Nash Auto Rifle (5mm)", /obj/item/gun/ballistic/automatic/assault_carbine/policerifle, 200),
new /datum/data/wasteland_equipment("Compliance Regulator (SEC)", /obj/item/gun/energy/laser/complianceregulator, 50),
new /datum/data/wasteland_equipment("AEP-7 (SEC)", /obj/item/gun/energy/laser/pistol, 100),
new /datum/data/wasteland_equipment("Pulse Pistol (ECP)", /obj/item/gun/energy/ionrifle/compact, 250),
new /datum/data/wasteland_equipment("AER-9 (MFC)", /obj/item/gun/energy/laser/aer9, 200),
new /datum/data/wasteland_equipment("Portable Cell Charger", /obj/item/storage/battery_box, 50),
new /datum/data/wasteland_equipment("Seclite Flashlight", /obj/item/flashlight/seclite, 50),
new /datum/data/wasteland_equipment("Guns and Bullets, Part 1", /obj/item/book/granter/crafting_recipe/gunsmith_one, 100),
new /datum/data/wasteland_equipment("Guns and Bullets, Part 2", /obj/item/book/granter/crafting_recipe/gunsmith_two, 100),
new /datum/data/wasteland_equipment("Guns and Bullets, Part 3", /obj/item/book/granter/crafting_recipe/gunsmith_three, 100),
new /datum/data/wasteland_equipment("Guns and Bullets, Part 4", /obj/item/book/granter/crafting_recipe/gunsmith_four, 100),
)
highpop_list = list(
new /datum/data/wasteland_equipment("Civilian Weapon Kit (Starter Weapons + Ammo)", /obj/item/kit_spawner/townie, 400),
new /datum/data/wasteland_equipment("Beretta M93R (9mm)", /obj/item/gun/ballistic/automatic/pistol/beretta/automatic, 500),
new /datum/data/wasteland_equipment("Sig P220 (.45)", /obj/item/gun/ballistic/automatic/pistol/sig, 500),
new /datum/data/wasteland_equipment("Hunting Shotgun (12 gauge)", /obj/item/gun/ballistic/shotgun/hunting, 500),
new /datum/data/wasteland_equipment("10mm SMG (10mm)", /obj/item/gun/ballistic/automatic/smg/smg10mm, 800),
new /datum/data/wasteland_equipment("Lee Enfield (.308)", /obj/item/gun/ballistic/rifle/enfield, 800),
new /datum/data/wasteland_equipment("Hunting Rifle (.30-06)", /obj/item/gun/ballistic/rifle/hunting, 800),
new /datum/data/wasteland_equipment("Surplus Nash Police Rifle (5.56)", /obj/item/gun/ballistic/automatic/marksman/policerifle, 800),
new /datum/data/wasteland_equipment("Surplus Nash Auto Rifle (5mm)", /obj/item/gun/ballistic/automatic/assault_carbine/policerifle, 300),
new /datum/data/wasteland_equipment("Compliance Regulator (SEC)", /obj/item/gun/energy/laser/complianceregulator, 300),
new /datum/data/wasteland_equipment("AEP-7 (SEC)", /obj/item/gun/energy/laser/pistol, 300),
new /datum/data/wasteland_equipment("Pulse Pistol (ECP)", /obj/item/gun/energy/ionrifle/compact, 300),
new /datum/data/wasteland_equipment("AER-9 (MFC)", /obj/item/gun/energy/laser/aer9, 300),
new /datum/data/wasteland_equipment("Portable Cell Charger", /obj/item/storage/battery_box, 50),
new /datum/data/wasteland_equipment("Seclite Flashlight", /obj/item/flashlight/seclite, 25),
new /datum/data/wasteland_equipment("Guns and Bullets, Part 1", /obj/item/book/granter/crafting_recipe/gunsmith_one, 25),
new /datum/data/wasteland_equipment("Guns and Bullets, Part 2", /obj/item/book/granter/crafting_recipe/gunsmith_two, 50),
new /datum/data/wasteland_equipment("Guns and Bullets, Part 3", /obj/item/book/granter/crafting_recipe/gunsmith_three, 75),
new /datum/data/wasteland_equipment("Civilian Weapon Kit (Starter Weapons + Ammo)", /obj/item/kit_spawner/townie, 300),
new /datum/data/wasteland_equipment("Beretta M93R (9mm)", /obj/item/gun/ballistic/automatic/pistol/beretta/automatic, 100),
new /datum/data/wasteland_equipment("Sig P220 (.45)", /obj/item/gun/ballistic/automatic/pistol/sig, 150),
new /datum/data/wasteland_equipment("Hunting Shotgun (12 gauge)", /obj/item/gun/ballistic/shotgun/hunting, 200),
new /datum/data/wasteland_equipment("10mm SMG (10mm)", /obj/item/gun/ballistic/automatic/smg/smg10mm, 300),
new /datum/data/wasteland_equipment("Lee Enfield (.308)", /obj/item/gun/ballistic/rifle/enfield, 225),
new /datum/data/wasteland_equipment("Hunting Rifle (.30-06)", /obj/item/gun/ballistic/rifle/hunting, 250),
new /datum/data/wasteland_equipment("Surplus Nash Police Rifle (5.56)", /obj/item/gun/ballistic/automatic/marksman/policerifle, 200),
new /datum/data/wasteland_equipment("Surplus Nash Auto Rifle (5mm)", /obj/item/gun/ballistic/automatic/assault_carbine/policerifle, 200),
new /datum/data/wasteland_equipment("Compliance Regulator (SEC)", /obj/item/gun/energy/laser/complianceregulator, 50),
new /datum/data/wasteland_equipment("AEP-7 (SEC)", /obj/item/gun/energy/laser/pistol, 100),
new /datum/data/wasteland_equipment("Pulse Pistol (ECP)", /obj/item/gun/energy/ionrifle/compact, 250),
new /datum/data/wasteland_equipment("AER-9 (MFC)", /obj/item/gun/energy/laser/aer9, 200),
new /datum/data/wasteland_equipment("Portable Cell Charger", /obj/item/storage/battery_box, 50),
new /datum/data/wasteland_equipment("Seclite Flashlight", /obj/item/flashlight/seclite, 50),
new /datum/data/wasteland_equipment("Guns and Bullets, Part 1", /obj/item/book/granter/crafting_recipe/gunsmith_one, 100),
new /datum/data/wasteland_equipment("Guns and Bullets, Part 2", /obj/item/book/granter/crafting_recipe/gunsmith_two, 100),
new /datum/data/wasteland_equipment("Guns and Bullets, Part 3", /obj/item/book/granter/crafting_recipe/gunsmith_three, 100),
new /datum/data/wasteland_equipment("Guns and Bullets, Part 4", /obj/item/book/granter/crafting_recipe/gunsmith_four, 100),
)

Expand Down
Loading

0 comments on commit de85dfd

Please sign in to comment.