diff --git a/code/game/objects/items/stacks/tiles/fifty_spawner_tiles.dm b/code/game/objects/items/stacks/tiles/fifty_spawner_tiles.dm index f9634d76085..103b54c691a 100644 --- a/code/game/objects/items/stacks/tiles/fifty_spawner_tiles.dm +++ b/code/game/objects/items/stacks/tiles/fifty_spawner_tiles.dm @@ -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 diff --git a/code/modules/casino/boxes_casino.dm b/code/modules/casino/boxes_casino.dm index 03b6aa9d17e..3b4c5480560 100644 --- a/code/modules/casino/boxes_casino.dm +++ b/code/modules/casino/boxes_casino.dm @@ -49,4 +49,46 @@ /obj/item/clothing/accessory/holster/hip, /obj/item/clothing/head/cowboy/ranger, /obj/item/clothing/shoes/boots/cowboy/brown - ) \ No newline at end of file + ) + +/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) \ No newline at end of file diff --git a/code/modules/casino/casino.dm b/code/modules/casino/casino.dm index 103b483fe9d..cd802eb8831 100644 --- a/code/modules/casino/casino.dm +++ b/code/modules/casino/casino.dm @@ -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 diff --git a/icons/obj/casino.dmi b/icons/obj/casino.dmi index 472e1317d44..6a1bfda2ead 100644 Binary files a/icons/obj/casino.dmi and b/icons/obj/casino.dmi differ