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.

Sign up for GitHub

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

Jump to bottom

Prize pool rebalance for arcade machines #7150

Draft
wants to merge 16 commits into
base: master
Choose a base branch
from
+33 −10
Draft

Prize pool rebalance for arcade machines #7150

Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
2ce4b4b
mech toys
deathrobotpunch Sep 12, 2024
a18ddc5
the plushening
deathrobotpunch Sep 12, 2024
fa2dfc7
DONE!
deathrobotpunch Sep 12, 2024
355db14
fixes list
deathrobotpunch Sep 12, 2024
f3ebcee
Update arcade.dm
deathrobotpunch Sep 12, 2024
1e3ee0b
Update arcade.dm
deathrobotpunch Sep 12, 2024
934e2ff
committing suggestion
deathrobotpunch Sep 12, 2024
22331cf
removes OWLF mask
deathrobotpunch Sep 13, 2024
96db362
Update arcade.dm
deathrobotpunch Sep 13, 2024
14ec368
I’m dumb
deathrobotpunch Sep 13, 2024
ba81138
adds stompy shoes
deathrobotpunch Sep 13, 2024
7195a04
Merge branch 'master' into better-prizes
deathrobotpunch Sep 13, 2024
d626e09
Update arcade.dm
deathrobotpunch Sep 19, 2024
2dc88d5
add /
deathrobotpunch Sep 19, 2024
28e8e98
Update arcade.dm
deathrobotpunch Sep 19, 2024
e6200e4
Update arcade.dm
deathrobotpunch Sep 19, 2024
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
43 changes: 33 additions & 10 deletions code/game/machinery/computer/arcade.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,39 @@
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 = 4,
/obj/item/facepaint/sniper = 4,
/obj/item/toy/gun = 4,
/obj/item/toy/crossbow = 4,
/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/facepaint/lipstick = 1,
/obj/item/facepaint/lipstick/jade = 1,
/obj/item/clothing/head/headband/gray = 5,
/obj/item/clothing/head/headband/red = 5,
/obj/item/clothing/mask/tornscarf = 5,
/obj/item/clothing/shoes/stompers = 1
Blundir marked this conversation as resolved.
Show resolved Hide resolved
Copy link
Contributor

@Blundir Blundir Sep 19, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll make this more clear, as a person who added them in the first place, i don't think those shoes fit in this list logically, remove them


)

/obj/structure/machinery/computer/arcade
Expand Down
Loading