diff --git a/code/game/objects/items/weapons/dice.dm b/code/game/objects/items/weapons/dice.dm index a2a8d9f752e..a34577a29bb 100644 --- a/code/game/objects/items/weapons/dice.dm +++ b/code/game/objects/items/weapons/dice.dm @@ -10,12 +10,6 @@ /obj/item/weapon/dice/New() icon_state = "[name][rand(1,sides)]" -/obj/item/weapon/dice/d20 - name = "d20" - desc = "A dice with twenty sides." - icon_state = "d2020" - sides = 20 - /obj/item/weapon/dice/throw_impact(atom/hit_atom) ..() var/result = rand(1, sides) @@ -26,3 +20,39 @@ comment = "Ouch, bad luck." icon_state = "[name][result]" src.visible_message("\The [name] lands on [result]. [comment]") + +/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 \ No newline at end of file diff --git a/code/game/objects/items/weapons/storage/misc.dm b/code/game/objects/items/weapons/storage/misc.dm index c83c3f9f775..74aba58cca2 100644 --- a/code/game/objects/items/weapons/storage/misc.dm +++ b/code/game/objects/items/weapons/storage/misc.dm @@ -1,11 +1,26 @@ /obj/item/weapon/storage/pill_bottle/dice name = "pack of dice" desc = "It's a small container with dice inside." + icon = 'icons/obj/dice.dmi' + icon_state = "dicebag" - New() - ..() - new /obj/item/weapon/dice( src ) - new /obj/item/weapon/dice/d20( src ) +/obj/item/weapon/storage/pill_bottle/dice/fill() + ..() + new /obj/item/weapon/dice( src ) + new /obj/item/weapon/dice/d20( src ) + +/obj/item/weapon/storage/pill_bottle/dice/gaming + name = "pack of gaming dice" + desc = "It's a small container with gaming dice inside." + icon_state = "magicdicebag" + +/obj/item/weapon/storage/pill_bottle/dice/gaming/fill() + ..() + new /obj/item/weapon/dice/d4(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/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 27f4b7ef043..1345fb3fd5d 100644 --- a/code/modules/client/preference_setup/loadout/loadout_general.dm +++ b/code/modules/client/preference_setup/loadout/loadout_general.dm @@ -3,8 +3,12 @@ path = /obj/item/weapon/cane /datum/gear/dice - display_name = "d20" - path = /obj/item/weapon/dice/d20 + display_name = "pack of dice" + path = /obj/item/weapon/storage/pill_bottle/dice + +/datum/gear/dicegaming + display_name = "pack of gaming dice" + path = /obj/item/weapon/storage/pill_bottle/dice/gaming /datum/gear/cards display_name = "deck of cards" diff --git a/html/changelogs/alberyk-PR-3429.yml b/html/changelogs/alberyk-PR-3429.yml new file mode 100644 index 00000000000..4f3614d2174 --- /dev/null +++ b/html/changelogs/alberyk-PR-3429.yml @@ -0,0 +1,6 @@ +author: Alberyk + +delete-after: True + +changes: + - rscadd: "Added dice to the custom loadout." diff --git a/icons/obj/dice.dmi b/icons/obj/dice.dmi index 669ad215c5c..f6a209b4687 100644 Binary files a/icons/obj/dice.dmi and b/icons/obj/dice.dmi differ