Adhomian dice: Suns and Moon edition (#9213)

Adds some adhomian dice, so people can play Suns and Moon on station with total immersion. Also, makes dice code less awful.

code/game/objects/items/tajara.dm

@@ -92,7 +92,9 @@
 /obj/item/pocketwatch/adhomai
 	name = "adhomian watch"
 	desc = "A watch made in the traditional adhomian style. It can be stored in a pocket or worn around the neck."
-	desc_fluff = "Because your wrists have better things to do."
+	desc_fluff = "Baltoris a fortress founded during the Gunpowder Age; it was the landing site of the royal armies during the Suns'wars. Baltor plays a strategic role in controlling the \
+	Ras'val sea during the war. A town emerged around the fort over time, attracted by the safety provided by the military presence. The city is known for its skilled watchmaker artisans, \
+	a trade that has been passed down through generations. The Mez'gin clock tower, located at the town square, is one of its points of interest."
 	icon = 'icons/obj/tajara_items.dmi'
 	icon_state = "adhomai_clock"
 	item_state = "adhomai_clock"
@@ -136,7 +138,7 @@
 					adhomian_day = current_day + 30
 
 			if("October", "November", "December")
-				adhomian_month = "Sil’nryy-rhazzimy"
+				adhomian_month = "Sil'nryy-rhazzimy"
 				if (current_month == "November")
 					adhomian_day = current_day + 15
 				if (current_month == "December")
@@ -210,3 +212,26 @@
 		..()
 
 	add_fingerprint(user)
+
+/obj/item/dice/tajara
+	name = "adhomian dice"
+	desc = "An adhomian dice made out of wood. Commonly used to play Suns and Moon."
+	icon = 'icons/obj/tajara_items.dmi'
+	icon_state = "brother1"
+	base_icon = "brother"
+
+/obj/item/dice/tajara/alt
+	icon_state = "sister1"
+	base_icon = "sister"
+
+/obj/item/storage/pill_bottle/dice/tajara
+	name = "bag of adhomian dice"
+	desc = "A bag containing enough dice to play Suns and Moon."
+	icon = 'icons/obj/tajara_items.dmi'
+	desc_fluff = "Suns and Moon is a very common dice game. It is played by all, though the lower classes have the tendency to gamble whereas upper classes play it just for fun. The ease and universality \
+	of the rules has garnered it quite the reputation. Die will usually have an image of Rredouane fixed upon them. Parks will commonly have designated spots for people to play Suns and Moon. Disputes are \
+	also solved through this game."
+	starts_with = list(
+		/obj/item/dice/tajara = 3,
+		/obj/item/dice/tajara/alt = 3
+	)

code/game/objects/items/weapons/dice.dm

@@ -4,6 +4,7 @@
 	icon = 'icons/obj/dice.dmi'
 	icon_state = "d66"
 	w_class = 1
+	var/base_icon = "d6"
 	var/side_mult = 1 // Used for d100s.
 	var/sides = 6
 	var/weighted = FALSE //if this dice can cheat or something
@@ -11,8 +12,13 @@
 	var/weighted_value = 70 //what is the chance of falling on the favored number
 	attack_verb = list("diced")
 
-/obj/item/dice/New()
-	icon_state = "[name][rand(1,sides)]"
+/obj/item/dice/Initialize()
+	. = ..()
+	icon_state = "[base_icon][rand(1,sides)]"
+
+/obj/item/dice/update_icon(var/result)
+	if(result)
+		icon_state = "[base_icon][result]"
 
 /obj/item/dice/throw_impact(atom/hit_atom)
 	..()
@@ -27,7 +33,7 @@
 		comment = "Nat 20!"
 	else if(sides == 20 && result == 1)
 		comment = "Ouch, bad luck."
-	icon_state = "[name][result]"
+	update_icon(result)
 	src.visible_message("<span class='notice'>\The [name] lands on [result * side_mult]. [comment]</span>")
 
 /obj/item/dice/d4
@@ -35,34 +41,40 @@
 	desc = "A dice with four sides."
 	icon_state = "d44"
 	sides = 4
+	base_icon = "d4"
 
 /obj/item/dice/d8
 	name = "d8"
 	desc = "A dice with eight sides."
 	icon_state = "d88"
 	sides = 8
+	base_icon = "d8"
 
 /obj/item/dice/d10
 	name = "d10"
 	desc = "A dice with ten sides."
 	icon_state = "d1010"
 	sides = 10
+	base_icon = "d10"
 
 /obj/item/dice/d12
 	name = "d12"
 	desc = "A dice with twelve sides."
 	icon_state = "d1212"
 	sides = 12
+	base_icon = "d12"
 
 /obj/item/dice/d20
 	name = "d20"
 	desc = "A dice with twenty sides."
 	icon_state = "d2020"
 	sides = 20
+	base_icon = "d20"
 
 /obj/item/dice/d100
 	name = "d100"
 	desc = "A dice with ten sides. This one is for the tens digit."
 	icon_state = "d10010"
 	sides = 10
-	side_mult = 10
+	side_mult = 10
+	base_icon = "d100"