Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prize pool rebalance for arcade machines #7150

Merged
merged 19 commits into from
Oct 26, 2024
Merged
Changes from 6 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 30 additions & 11 deletions code/game/machinery/computer/arcade.dm
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,38 @@
var/enemy_mp = 25
var/gameover = 0
var/blocked = 0 //Player cannot attack/heal while set
var/list/prizes = list( /obj/item/storage/box/MRE = 3,
/obj/item/spacecash/c10 = 4,
/obj/item/ammo_magazine/flamer_tank = 1,
/obj/item/tool/lighter/zippo = 2,
/obj/item/tool/weldingtool = 1,
/obj/item/storage/box/uscm_mre = 2,
/obj/item/device/camera = 2,
/obj/item/device/camera_film = 4,
/obj/item/cell/crap/empty = 3,
/obj/item/tool/hand_labeler = 1
var/list/prizes = list( /obj/item/tool/lighter/zippo = 10,
/obj/item/facepaint/sniper = 10,
/obj/item/toy/gun = 10,
/obj/item/toy/crossbow = 10,
/obj/item/toy/sword = 5,
/obj/item/toy/katana = 1,
/obj/item/toy/spinningtoy = 2,
/obj/item/toy/prize/ripley = 2,
/obj/item/toy/prize/fireripley = 2,
/obj/item/toy/prize/deathripley = 2,
/obj/item/toy/prize/gygax = 2,
/obj/item/toy/prize/durand = 2,
/obj/item/toy/prize/honk = 2,
/obj/item/toy/prize/marauder = 2,
/obj/item/toy/prize/seraph = 2,
/obj/item/toy/prize/mauler = 2,
/obj/item/toy/prize/odysseus = 2,
/obj/item/toy/bikehorn = 2, // honk
/obj/item/clothing/head/collectable/tophat/super = 2,
/obj/item/toy/plush/farwa = 2,
/obj/item/toy/plush/barricade = 2,
/obj/item/toy/plush/shark = 2,
/obj/item/toy/plush/bee = 2,
/obj/item/toy/plush/moth = 2,
/obj/item/toy/plush/rock = 5,
/obj/item/storage/box/snappops = 5,
/obj/item/clothing/mask/owlf_mask = 1,
/obj/item/facepaint/lipstick = 1,
/obj/item/facepaint/lipstick/jade = 1
)

/obj/structure/machinery/computer/arcade
obj/structure/machinery/computer/arcade

Check warning on line 49 in code/game/machinery/computer/arcade.dm

View workflow job for this annotation

GitHub Actions / Run Linters

relatively pathed type defined here
deathrobotpunch marked this conversation as resolved.
Show resolved Hide resolved
var/turtle = 0

/obj/structure/machinery/computer/arcade/attack_remote(mob/user as mob)
Expand Down
Loading