Skip to content

Commit

Permalink
mod vending machine
Browse files Browse the repository at this point in the history
  • Loading branch information
@Tk420634
Tk420634 committed Jan 6, 2025
1 parent 15d95de commit 12d4f52
Show file tree
Hide file tree
Showing 2 changed files with 43 additions and 61 deletions.
26 changes: 13 additions & 13 deletions _maps/map_files/coyote_bayou/Newboston.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14233,6 +14233,10 @@
/obj/item/storage/trash_stack/loot/uncommon,
/turf/open/indestructible/ground/inside/mountain,
/area/f13/caves)
"fZj" = (
/obj/machinery/mineral/wasteland_vendor/ammo,
/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,
/area/f13/building/workshop/nash)
"fZo" = (
/turf/open/floor/f13{
dir = 10;
Expand Down Expand Up @@ -18991,6 +18995,13 @@
color = "#666666"
},
/area/f13/caves)
"hVD" = (
/obj/machinery/light{
dir = 4
},
/obj/machinery/mineral/wasteland_vendor/weapons,
/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,
/area/f13/building/workshop/nash)
"hVP" = (
/obj/structure/simple_door/room,
/turf/open/floor/f13{
Expand Down Expand Up @@ -25792,10 +25803,6 @@
icon_state = "yellowsiding"
},
/area/f13/brotherhood)
"kCq" = (
/obj/machinery/mineral/wasteland_vendor/ammo,
/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,
/area/f13/building/workshop/nash)
"kCM" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/bed/wooden{
Expand Down Expand Up @@ -40572,13 +40579,6 @@
},
/turf/open/floor/plasteel/f13/vault_floor/purple,
/area/f13/building/hospital/clinic/nash)
"qvF" = (
/obj/machinery/light{
dir = 4
},
/obj/machinery/mineral/wasteland_vendor/ammo,
/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,
/area/f13/building/workshop/nash)
"qvW" = (
/obj/structure/camera_assembly,
/obj/item/storage/trash_stack{
Expand Down Expand Up @@ -116057,8 +116057,8 @@ nJt
cki
wBU
qpV
qvF
kCq
hVD
fZj
nIN
nIN
nIN
Expand Down
78 changes: 30 additions & 48 deletions code/modules/WVM/wvm.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -704,56 +704,38 @@ 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, 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("Hunting Revolver (.45-70)", /obj/item/gun/ballistic/revolver/hunting, 350),
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("Sport Carbine (.22)", /obj/item/gun/ballistic/automatic/sportcarbine, 75),
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("Plasma Rifle (MFC)", /obj/item/gun/energy/laser/plasma, 350),
new /datum/data/wasteland_equipment("Pulse Rifle (MFC)", /obj/item/gun/energy/ionrifle, 350),
new /datum/data/wasteland_equipment("Mk. II TG Rifle (Crank Charge)", /obj/item/gun/energy/laser/cranklasergun/tg/rifle, 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, 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),
new /datum/data/wasteland_equipment("(Damage Up I) Heavy Barrel", /obj/item/gun_upgrade/barrelone, 350),
new /datum/data/wasteland_equipment("(Damage Up II) Magnetic Accelerator Coil", /obj/item/gun_upgrade/barreltwo, 500),
new /datum/data/wasteland_equipment("(Damage Up III) Polarized Magnetic Hyper-Accelerator", /obj/item/gun_upgrade/barreltwo, 750),
new /datum/data/wasteland_equipment("(1H Recoil I) Mesh Grip", /obj/item/gun_upgrade/gripone, 150),
new /datum/data/wasteland_equipment("(1H Recoil II) Styrene-Butadiene Grip", /obj/item/gun_upgrade/griptwo, 250),
new /datum/data/wasteland_equipment("(1H Recoil III) Gyration Stabilization Sleeve", /obj/item/gun_upgrade/gripthree, 350),
new /datum/data/wasteland_equipment("(2H Recoil I) Mesh Grip", /obj/item/gun_upgrade/muzzleone, 150),
new /datum/data/wasteland_equipment("(2H Recoil II) Mesh Grip", /obj/item/gun_upgrade/muzzletwo, 150),
new /datum/data/wasteland_equipment("(2H Recoil III) Mesh Grip", /obj/item/gun_upgrade/muzzlethree, 150),
new /datum/data/wasteland_equipment("(Fire Delay I) Match Trigger", /obj/item/gun_upgrade/triggerone, 250),
new /datum/data/wasteland_equipment("(Fire Delay II) Military Trigger", /obj/item/gun_upgrade/triggertwo, 450),
new /datum/data/wasteland_equipment("(Fire Delay III) Pristine Trigger", /obj/item/gun_upgrade/triggerthree, 650),
new /datum/data/wasteland_equipment("(Scope I) Reflex Sight", /obj/item/gun_upgrade/sightone, 250),
new /datum/data/wasteland_equipment("(Scope II) Old Scope", /obj/item/gun_upgrade/sighttwo, 350),
new /datum/data/wasteland_equipment("(Scope III) Pristine Scope", /obj/item/gun_upgrade/sightthree, 550),
)
highpop_list = list(
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("Hunting Revolver (.45-70)", /obj/item/gun/ballistic/revolver/hunting, 350),
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("Sport Carbine (.22)", /obj/item/gun/ballistic/automatic/sportcarbine, 75),
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("Plasma Rifle (MFC)", /obj/item/gun/energy/laser/plasma, 350),
new /datum/data/wasteland_equipment("Pulse Rifle (MFC)", /obj/item/gun/energy/ionrifle, 350),
new /datum/data/wasteland_equipment("Mk. II TG Rifle (Crank Charge)", /obj/item/gun/energy/laser/cranklasergun/tg/rifle, 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, 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),
new /datum/data/wasteland_equipment("(Damage Up I) Heavy Barrel", /obj/item/gun_upgrade/barrelone, 350),
new /datum/data/wasteland_equipment("(Damage Up II) Magnetic Accelerator Coil", /obj/item/gun_upgrade/barreltwo, 500),
new /datum/data/wasteland_equipment("(Damage Up III) Polarized Magnetic Hyper-Accelerator", /obj/item/gun_upgrade/barreltwo, 750),
new /datum/data/wasteland_equipment("(1H Recoil I) Mesh Grip", /obj/item/gun_upgrade/gripone, 150),
new /datum/data/wasteland_equipment("(1H Recoil II) Styrene-Butadiene Grip", /obj/item/gun_upgrade/griptwo, 250),
new /datum/data/wasteland_equipment("(1H Recoil III) Gyration Stabilization Sleeve", /obj/item/gun_upgrade/gripthree, 350),
new /datum/data/wasteland_equipment("(2H Recoil I) Mesh Grip", /obj/item/gun_upgrade/muzzleone, 150),
new /datum/data/wasteland_equipment("(2H Recoil II) Mesh Grip", /obj/item/gun_upgrade/muzzletwo, 150),
new /datum/data/wasteland_equipment("(2H Recoil III) Mesh Grip", /obj/item/gun_upgrade/muzzlethree, 150),
new /datum/data/wasteland_equipment("(Fire Delay I) Match Trigger", /obj/item/gun_upgrade/triggerone, 250),
new /datum/data/wasteland_equipment("(Fire Delay II) Military Trigger", /obj/item/gun_upgrade/triggertwo, 450),
new /datum/data/wasteland_equipment("(Fire Delay III) Pristine Trigger", /obj/item/gun_upgrade/triggerthree, 650),
new /datum/data/wasteland_equipment("(Scope I) Reflex Sight", /obj/item/gun_upgrade/sightone, 250),
new /datum/data/wasteland_equipment("(Scope II) Old Scope", /obj/item/gun_upgrade/sighttwo, 350),
new /datum/data/wasteland_equipment("(Scope III) Pristine Scope", /obj/item/gun_upgrade/sightthree, 550),
)


Expand Down

0 comments on commit 12d4f52

Please sign in to comment.