cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-28 06:28:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes conflicts with casino PR

Browse Source
This commit is contained in:
Heroman
2022-07-12 16:12:00 +10:00
parent 5886970e5f
commit 69cbc2e62b
4 changed files with 47 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/stacks/tiles/fifty_spawner_tiles.dm
+3 -3
View File
@@ -40,15 +40,15 @@
name = "stack of brown carpet"
type_to_spawn = /obj/item/stack/tile/carpet/brncarpet
/obj/fiftyspawner/brncarpet
/obj/fiftyspawner/blucarpet2
name = "stack of blue carpet"
type_to_spawn = /obj/item/stack/tile/carpet/blucarpet2
/obj/fiftyspawner/brncarpet
/obj/fiftyspawner/greencarpet
name = "stack of green carpet"
type_to_spawn = /obj/item/stack/tile/carpet/greencarpet
/obj/fiftyspawner/brncarpet
/obj/fiftyspawner/purplecarpet
name = "stack of purple carpet"
type_to_spawn = /obj/item/stack/tile/carpet/purplecarpet
code/modules/casino/boxes_casino.dm
+43 -1
View File
@@ -49,4 +49,46 @@
/obj/item/clothing/accessory/holster/hip,
/obj/item/clothing/head/cowboy/ranger,
/obj/item/clothing/shoes/boots/cowboy/brown
)
)
/obj/item/weapon/storage/box/roulette_balls_normal
name = "roulette ball box"
desc = "A box of spare roulette balls."
icon_state = "balls"
can_hold = list(/obj/item/roulette_ball)
starts_with = list(
/obj/item/roulette_ball = 7,
/obj/item/roulette_ball/hollow = 2)
/obj/item/weapon/storage/box/roulette_balls_fancy
name = "fancy roulette ball box"
desc = "A box of extra-pretty roulette balls."
icon_state = "balls"
can_hold = list(/obj/item/roulette_ball)
starts_with = list(
/obj/item/roulette_ball,
/obj/item/roulette_ball/hollow,
/obj/item/roulette_ball/red,
/obj/item/roulette_ball/orange,
/obj/item/roulette_ball/yellow,
/obj/item/roulette_ball/green,
/obj/item/roulette_ball/blue,
/obj/item/roulette_ball/purple,
/obj/item/roulette_ball/moon,
/obj/item/roulette_ball/planet,
/obj/item/roulette_ball/gold)
/obj/item/weapon/storage/box/roulette_balls_cheat
name = "special roulette ball box"
desc = "A box of 'special' roulette balls."
icon_state = "balls"
can_hold = list(/obj/item/roulette_ball)
starts_with = list(
/obj/item/roulette_ball/cheat/first_twelve,
/obj/item/roulette_ball/cheat/second_twelve,
/obj/item/roulette_ball/cheat/third_twelve,
/obj/item/roulette_ball/cheat/red,
/obj/item/roulette_ball/cheat/black,
/obj/item/roulette_ball/cheat/zeros,
/obj/item/roulette_ball/cheat/odd,
/obj/item/roulette_ball/cheat/even)
code/modules/casino/casino.dm
+1 -43
View File
@@ -311,49 +311,7 @@
desc = "A small ball used for roulette wheel. This one is made of regular metal. Its weighted to only land on odd."
/obj/item/roulette_ball/cheat/odd/get_cheated_result()
return pick(list(1,3,5,7,9,11,13,15,17,19,21,23,25,27,29,31,33,35))
/obj/item/weapon/storage/box/roulette_balls_normal
name = "roulette ball box"
desc = "A box of spare roulette balls."
icon_state = "balls"
can_hold = list(/obj/item/roulette_ball)
starts_with = list(
/obj/item/roulette_ball = 7,
/obj/item/roulette_ball/hollow = 2)
/obj/item/weapon/storage/box/roulette_balls_fancy
name = "fancy roulette ball box"
desc = "A box of extra-pretty roulette balls."
icon_state = "balls"
can_hold = list(/obj/item/roulette_ball)
starts_with = list(
/obj/item/roulette_ball,
/obj/item/roulette_ball/hollow,
/obj/item/roulette_ball/red,
/obj/item/roulette_ball/orange,
/obj/item/roulette_ball/yellow,
/obj/item/roulette_ball/green,
/obj/item/roulette_ball/blue,
/obj/item/roulette_ball/purple,
/obj/item/roulette_ball/moon,
/obj/item/roulette_ball/planet,
/obj/item/roulette_ball/gold)
/obj/item/weapon/storage/box/roulette_balls_cheat
name = "special roulette ball box"
desc = "A box of 'special' roulette balls."
icon_state = "balls"
can_hold = list(/obj/item/roulette_ball)
starts_with = list(
/obj/item/roulette_ball/cheat/first_twelve,
/obj/item/roulette_ball/cheat/second_twelve,
/obj/item/roulette_ball/cheat/third_twelve,
/obj/item/roulette_ball/cheat/red,
/obj/item/roulette_ball/cheat/black,
/obj/item/roulette_ball/cheat/zeros,
/obj/item/roulette_ball/cheat/odd,
/obj/item/roulette_ball/cheat/even)
return pick(list(1,3,5,7,9,11,13,15,17,19,21,23,25,27,29,31,33,35))s
//
//Blackjack table
icons/obj/casino.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 73 KiB

After

Width:  |  Height:  |  Size: 76 KiB