From fd070196dd3f8a84ab03609a3c8b6cf0c8f374d9 Mon Sep 17 00:00:00 2001
From: Anewbe <matthwledder@gmail.com>
Date: Sat, 15 Apr 2017 20:18:46 -0500
Subject: [PATCH 1/2] Adds the Liar's Dice game

---
 code/game/objects/items/weapons/dice.dm |  59 ------------
 code/modules/games/dice.dm              | 117 ++++++++++++++++++++++++
 icons/obj/dice.dmi                      | Bin 2961 -> 3130 bytes
 polaris.dme                             |   2 +-
 4 files changed, 118 insertions(+), 60 deletions(-)
 delete mode 100644 code/game/objects/items/weapons/dice.dm
 create mode 100644 code/modules/games/dice.dm

diff --git a/code/game/objects/items/weapons/dice.dm b/code/game/objects/items/weapons/dice.dm
deleted file mode 100644
index 9099ff3bd1..0000000000
--- a/code/game/objects/items/weapons/dice.dm
+++ /dev/null
@@ -1,59 +0,0 @@
-/obj/item/weapon/dice
-	name = "d6"
-	desc = "A dice with six sides."
-	icon = 'icons/obj/dice.dmi'
-	icon_state = "d66"
-	w_class = ITEMSIZE_TINY
-	var/sides = 6
-	attack_verb = list("diced")
-
-/obj/item/weapon/dice/New()
-	icon_state = "[name][rand(1,sides)]"
-
-/obj/item/weapon/dice/d4
-	name = "d4"
-	desc = "A dice with four sides."
-	icon_state = "d44"
-	sides = 4
-
-/obj/item/weapon/dice/d8
-	name = "d8"
-	desc = "A dice with eight sides."
-	icon_state = "d88"
-	sides = 8
-
-/obj/item/weapon/dice/d10
-	name = "d10"
-	desc = "A dice with ten sides."
-	icon_state = "d1010"
-	sides = 10
-
-/obj/item/weapon/dice/d12
-	name = "d12"
-	desc = "A dice with twelve sides."
-	icon_state = "d1212"
-	sides = 12
-
-/obj/item/weapon/dice/d20
-	name = "d20"
-	desc = "A dice with twenty sides."
-	icon_state = "d2020"
-	sides = 20
-
-/obj/item/weapon/dice/d100
-	name = "d100"
-	desc = "A dice with ten sides. This one is for the tens digit."
-	icon_state = "d10010"
-	sides = 10
-
-/obj/item/weapon/dice/attack_self(mob/user as mob)
-	var/result = rand(1, sides)
-	var/comment = ""
-	if(sides == 20 && result == 20)
-		comment = "Nat 20!"
-	else if(sides == 20 && result == 1)
-		comment = "Ouch, bad luck."
-	icon_state = "[name][result]"
-	user.visible_message("<span class='notice'>[user] has thrown [src]. It lands on [result]. [comment]</span>", \
-						 "<span class='notice'>You throw [src]. It lands on a [result]. [comment]</span>", \
-						 "<span class='notice'>You hear [src] landing on a [result]. [comment]</span>")
diff --git a/code/modules/games/dice.dm b/code/modules/games/dice.dm
new file mode 100644
index 0000000000..333d5ee5c3
--- /dev/null
+++ b/code/modules/games/dice.dm
@@ -0,0 +1,117 @@
+/obj/item/weapon/dice
+	name = "d6"
+	desc = "A dice with six sides."
+	icon = 'icons/obj/dice.dmi'
+	icon_state = "d66"
+	w_class = ITEMSIZE_TINY
+	var/sides = 6
+	var/result = 6
+	attack_verb = list("diced")
+
+/obj/item/weapon/dice/New()
+	icon_state = "[name][rand(1,sides)]"
+
+/obj/item/weapon/dice/d4
+	name = "d4"
+	desc = "A dice with four sides."
+	icon_state = "d44"
+	sides = 4
+	result = 4
+
+/obj/item/weapon/dice/d8
+	name = "d8"
+	desc = "A dice with eight sides."
+	icon_state = "d88"
+	sides = 8
+	result = 8
+
+/obj/item/weapon/dice/d10
+	name = "d10"
+	desc = "A dice with ten sides."
+	icon_state = "d1010"
+	sides = 10
+	result = 10
+
+/obj/item/weapon/dice/d12
+	name = "d12"
+	desc = "A dice with twelve sides."
+	icon_state = "d1212"
+	sides = 12
+	result = 12
+
+/obj/item/weapon/dice/d20
+	name = "d20"
+	desc = "A dice with twenty sides."
+	icon_state = "d2020"
+	sides = 20
+	result = 20
+
+/obj/item/weapon/dice/d100
+	name = "d100"
+	desc = "A dice with ten sides. This one is for the tens digit."
+	icon_state = "d10010"
+	sides = 10
+	result = 10
+
+/obj/item/weapon/dice/attack_self(mob/user as mob)
+	rollDice(user, 0)
+
+/obj/item/weapon/dice/proc/rollDice(mob/user as mob, var/silent = 0)
+	result = rand(1, sides)
+	icon_state = "[name][result]"
+
+	if(!silent)
+		var/comment = ""
+		if(sides == 20 && result == 20)
+			comment = "Nat 20!"
+		else if(sides == 20 && result == 1)
+			comment = "Ouch, bad luck."
+
+		user.visible_message("<span class='notice'>[user] has thrown [src]. It lands on [result]. [comment]</span>", \
+							 "<span class='notice'>You throw [src]. It lands on a [result]. [comment]</span>", \
+							 "<span class='notice'>You hear [src] landing on a [result]. [comment]</span>")
+
+//Liar's Dice cup
+/obj/item/weapon/storage/dicecup
+	name = "dice cup"
+	desc = "A cup used to conceal and hold dice."
+	icon = 'icons/obj/dice.dmi'
+	icon_state = "dicecup"
+	w_class = ITEMSIZE_SMALL
+	storage_slots = 5
+	can_hold = list(
+		/obj/item/weapon/dice,
+		)
+
+/obj/item/weapon/storage/dicecup/attack_self(mob/user as mob)
+	user.visible_message("<span class='notice'>[user] shakes [src].</span>", \
+							 "<span class='notice'>You shake [src].</span>", \
+							 "<span class='notice'>You hear dice rolling.</span>")
+	rollCup(user)
+
+/obj/item/weapon/storage/dicecup/proc/rollCup(mob/user as mob)
+	for(var/obj/item/weapon/dice/I in src.contents)
+		var/obj/item/weapon/dice/D = I
+		D.rollDice(user, 1)
+
+/obj/item/weapon/storage/dicecup/proc/revealDice(var/mob/viewer)
+	for(var/obj/item/weapon/dice/I in src.contents)
+		var/obj/item/weapon/dice/D = I
+		to_chat(viewer, "The [D.name] shows a [D.result].")
+
+/obj/item/weapon/storage/dicecup/verb/peekAtDice()
+	set category = "Object"
+	set name = "Peek at Dice"
+	set desc = "Peek at the dice under your cup."
+
+	revealDice(usr)
+
+/obj/item/weapon/storage/dicecup/verb/revealDiceHand()
+
+	set category = "Object"
+	set name = "Reveal Dice"
+	set desc = "Reveal the dice hidden under your cup."
+
+	for(var/mob/living/player in viewers(3))
+		to_chat(player, "[usr] reveals their dice.")
+		revealDice(player)
\ No newline at end of file
diff --git a/icons/obj/dice.dmi b/icons/obj/dice.dmi
index f6a209b4687244f764fa7fe155f776199588d020..17a3c64cd4163fba6faeeb4f102f22071d6aec7d 100644
GIT binary patch
delta 2957
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
T&kc_GEeU)5f_%%oPh9#pGqnnk

delta 2816
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
MPPjQ&IbKQq4_UXbegFUf

diff --git a/polaris.dme b/polaris.dme
index 14c6914ade..f050279144 100644
--- a/polaris.dme
+++ b/polaris.dme
@@ -818,7 +818,6 @@
 #include "code\game\objects\items\weapons\cigs_lighters.dm"
 #include "code\game\objects\items\weapons\clown_items.dm"
 #include "code\game\objects\items\weapons\cosmetics.dm"
-#include "code\game\objects\items\weapons\dice.dm"
 #include "code\game\objects\items\weapons\dna_injector.dm"
 #include "code\game\objects\items\weapons\explosives.dm"
 #include "code\game\objects\items\weapons\extinguisher.dm"
@@ -1394,6 +1393,7 @@
 #include "code\modules\games\cah_white_cards.dm"
 #include "code\modules\games\cardemon.dm"
 #include "code\modules\games\cards.dm"
+#include "code\modules\games\dice.dm"
 #include "code\modules\games\spaceball_cards.dm"
 #include "code\modules\games\tarot.dm"
 #include "code\modules\genetics\side_effects.dm"

From b7751bab106f8dd1d7de1154ef23bcbf6dc67a4b Mon Sep 17 00:00:00 2001
From: Anewbe <matthwledder@gmail.com>
Date: Mon, 17 Apr 2017 12:44:34 -0500
Subject: [PATCH 2/2] 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 @@
 							 "<span class='notice'>You throw [src]. It lands on a [result]. [comment]</span>", \
 							 "<span class='notice'>You hear [src] landing on a [result]. [comment]</span>")
 
-//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