mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-01-17 12:35:26 +00:00
1d173fe020
Fixed a few unforseen bugs and smoothed out a few odd quirks. Fixed bugs, added flipping mechanics. Made the cards less cheater friendly by making certain actions visible. Added the ability to choose between "Random Card" and "draw from Top" with a verb on the deck. While held in hand the deck can now be shuffled. Had to improve sprites, was really bugging me. Now uses the shuffle() list helper. Added cardshuffle.ogg to sound/items/ Cooldown applied to shuffling for "sanity" as the term seems to be. Made a few changes to the way the cards prompt you for less clutter. Merge pull request #1 from Zelacks/deckstuff Replaces the global decks variable with a reference Now card is taken from hand on topic choice. Examine card has been scrapped, just attack_self() with the card to see what it is. New Icons. Dig that NanoTrasen blue. Thanks Nienhaus! Merge pull request #2 from Zelacks/deckstuff Hopefully you will like these changes - Several deck changes Fixed a few nits and picks. Made Deck of Cards available as a prize from the arcade machines. Merge pull request #3 from Zelacks/deckstuff Card sprites! Thanks, was toying with doing that, saved me a bundle of work! Fixed the adjacency issue. Added more checks to the cards and object verb. Adeed a series of fixes to the Mousedrop function. Made all notices uniform. Made changes to keep cards being flipped by the wrong sorts. Added Razharas' "more readable" pixel art for the cards. Made messages about the deck work while the deck is held. (I guess you might want to carry it) Un-Needed cooldown removed from shuffling the deck. Added blue contours to the cards to make them stand out against floor tiles. Merge branch 'master' into 11-23-2013-Games
52 lines
1.1 KiB
Plaintext
52 lines
1.1 KiB
Plaintext
//Added by Jack Rost
|
|
/obj/item/trash
|
|
icon = 'icons/obj/janitor.dmi'
|
|
desc = "This is rubbish."
|
|
w_class = 1.0
|
|
|
|
raisins
|
|
name = "\improper 4no raisins"
|
|
icon_state= "4no_raisins"
|
|
candy
|
|
name = "candy"
|
|
icon_state= "candy"
|
|
cheesie
|
|
name = "cheesie honkers"
|
|
icon_state = "cheesie_honkers"
|
|
chips
|
|
name = "chips"
|
|
icon_state = "chips"
|
|
popcorn
|
|
name = "popcorn"
|
|
icon_state = "popcorn"
|
|
sosjerky
|
|
name = "\improper Scaredy's Private Reserve Beef Jerky"
|
|
icon_state = "sosjerky"
|
|
syndi_cakes
|
|
name = "syndi-cakes"
|
|
icon_state = "syndi_cakes"
|
|
waffles
|
|
name = "waffles"
|
|
icon_state = "waffles"
|
|
plate
|
|
name = "plate"
|
|
icon_state = "plate"
|
|
snack_bowl
|
|
name = "snack bowl"
|
|
icon_state = "snack_bowl"
|
|
pistachios
|
|
name = "pistachios pack"
|
|
icon_state = "pistachios_pack"
|
|
semki
|
|
name = "semki pack"
|
|
icon_state = "semki_pack"
|
|
tray
|
|
name = "tray"
|
|
icon_state = "tray"
|
|
candle
|
|
name = "candle"
|
|
icon = 'icons/obj/candle.dmi'
|
|
icon_state = "candle4"
|
|
|
|
/obj/item/trash/attack(mob/M, mob/living/user)
|
|
return |