From b7751bab106f8dd1d7de1154ef23bcbf6dc67a4b Mon Sep 17 00:00:00 2001 From: Anewbe Date: Mon, 17 Apr 2017 12:44:34 -0500 Subject: [PATCH] Changelog, adds the dicecup to the loadout --- .../objects/items/weapons/storage/misc.dm | 27 ------------ .../loadout/loadout_general.dm | 4 ++ code/modules/games/dice.dm | 44 ++++++++++++++++++- html/changelogs/Anewbe - Dice Cup.yml | 36 +++++++++++++++ 4 files changed, 82 insertions(+), 29 deletions(-) create mode 100644 html/changelogs/Anewbe - Dice Cup.yml diff --git a/code/game/objects/items/weapons/storage/misc.dm b/code/game/objects/items/weapons/storage/misc.dm index bf4856501a..64952046a5 100644 --- a/code/game/objects/items/weapons/storage/misc.dm +++ b/code/game/objects/items/weapons/storage/misc.dm @@ -1,30 +1,3 @@ -/obj/item/weapon/storage/pill_bottle/dice //7d6 - name = "bag of dice" - desc = "It's a small bag with dice inside." - icon = 'icons/obj/dice.dmi' - icon_state = "dicebag" - -/obj/item/weapon/storage/pill_bottle/dice/New() - ..() - for(var/i = 1 to 7) - new /obj/item/weapon/dice( src ) - -/obj/item/weapon/storage/pill_bottle/dice_nerd //DnD dice - name = "bag of gaming dice" - desc = "It's a small bag with gaming dice inside." - icon = 'icons/obj/dice.dmi' - icon_state = "magicdicebag" - -/obj/item/weapon/storage/pill_bottle/dice_nerd/New() - ..() - new /obj/item/weapon/dice/d4( src ) - new /obj/item/weapon/dice( src ) - new /obj/item/weapon/dice/d8( src ) - new /obj/item/weapon/dice/d10( src ) - new /obj/item/weapon/dice/d12( src ) - new /obj/item/weapon/dice/d20( src ) - new /obj/item/weapon/dice/d100( src ) - /* * Donut Box */ diff --git a/code/modules/client/preference_setup/loadout/loadout_general.dm b/code/modules/client/preference_setup/loadout/loadout_general.dm index a97d5776fc..6f3115fd2f 100644 --- a/code/modules/client/preference_setup/loadout/loadout_general.dm +++ b/code/modules/client/preference_setup/loadout/loadout_general.dm @@ -10,6 +10,10 @@ display_name = "dice pack (gaming)" path = /obj/item/weapon/storage/pill_bottle/dice_nerd +/datum/gear/dice/cup + display_name = "dice cup and dice" + path = /obj/item/weapon/storage/dicecup/loaded + /datum/gear/cards display_name = "deck of cards" path = /obj/item/weapon/deck/cards diff --git a/code/modules/games/dice.dm b/code/modules/games/dice.dm index 333d5ee5c3..039631cdb4 100644 --- a/code/modules/games/dice.dm +++ b/code/modules/games/dice.dm @@ -71,7 +71,41 @@ "You throw [src]. It lands on a [result]. [comment]", \ "You hear [src] landing on a [result]. [comment]") -//Liar's Dice cup +/* + * Dice packs + */ + +/obj/item/weapon/storage/pill_bottle/dice //7d6 + name = "bag of dice" + desc = "It's a small bag with dice inside." + icon = 'icons/obj/dice.dmi' + icon_state = "dicebag" + +/obj/item/weapon/storage/pill_bottle/dice/New() + ..() + for(var/i = 1 to 7) + new /obj/item/weapon/dice( src ) + +/obj/item/weapon/storage/pill_bottle/dice_nerd //DnD dice + name = "bag of gaming dice" + desc = "It's a small bag with gaming dice inside." + icon = 'icons/obj/dice.dmi' + icon_state = "magicdicebag" + +/obj/item/weapon/storage/pill_bottle/dice_nerd/New() + ..() + new /obj/item/weapon/dice/d4( src ) + new /obj/item/weapon/dice( src ) + new /obj/item/weapon/dice/d8( src ) + new /obj/item/weapon/dice/d10( src ) + new /obj/item/weapon/dice/d12( src ) + new /obj/item/weapon/dice/d20( src ) + new /obj/item/weapon/dice/d100( src ) + +/* + *Liar's Dice cup + */ + /obj/item/weapon/storage/dicecup name = "dice cup" desc = "A cup used to conceal and hold dice." @@ -114,4 +148,10 @@ for(var/mob/living/player in viewers(3)) to_chat(player, "[usr] reveals their dice.") - revealDice(player) \ No newline at end of file + revealDice(player) + + +/obj/item/weapon/storage/dicecup/loaded/New() + ..() + for(var/i = 1 to 5) + new /obj/item/weapon/dice( src ) \ No newline at end of file diff --git a/html/changelogs/Anewbe - Dice Cup.yml b/html/changelogs/Anewbe - Dice Cup.yml new file mode 100644 index 0000000000..8c9803b363 --- /dev/null +++ b/html/changelogs/Anewbe - Dice Cup.yml @@ -0,0 +1,36 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +################################# + +# Your name. +author: Anewbe + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Adds a cup for dice games, in the loadout." \ No newline at end of file