From f375595d30e9bf2b948311932d8373ea8b760903 Mon Sep 17 00:00:00 2001 From: Anewbe Date: Sun, 3 Jul 2016 13:48:28 -0500 Subject: [PATCH] #MoreDice2016 (#2016) * Adds more dice * Adds sprites, fixes some pathing --- code/game/objects/items/weapons/dice.dm | 30 ++++++++++++++++++ .../objects/items/weapons/storage/misc.dm | 30 ++++++++++++++---- .../loadout/loadout_general.dm | 8 +++-- icons/obj/dice.dmi | Bin 2679 -> 2961 bytes 4 files changed, 60 insertions(+), 8 deletions(-) diff --git a/code/game/objects/items/weapons/dice.dm b/code/game/objects/items/weapons/dice.dm index 074543296f..86310d2b78 100644 --- a/code/game/objects/items/weapons/dice.dm +++ b/code/game/objects/items/weapons/dice.dm @@ -10,12 +10,42 @@ /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 = "" diff --git a/code/game/objects/items/weapons/storage/misc.dm b/code/game/objects/items/weapons/storage/misc.dm index cf1af1ea79..4bd34c52c7 100644 --- a/code/game/objects/items/weapons/storage/misc.dm +++ b/code/game/objects/items/weapons/storage/misc.dm @@ -1,11 +1,29 @@ -/obj/item/weapon/storage/pill_bottle/dice - name = "pack of dice" - desc = "It's a small container with dice inside." +/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" - New() - ..() +/obj/item/weapon/storage/pill_bottle/dice/New() + ..() + for(var/i = 1 to 7) new /obj/item/weapon/dice( src ) - new /obj/item/weapon/dice/d20( 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 b659f8db13..a97d5776fc 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 = "dice pack" + path = /obj/item/weapon/storage/pill_bottle/dice + +/datum/gear/dice/nerd + display_name = "dice pack (gaming)" + path = /obj/item/weapon/storage/pill_bottle/dice_nerd /datum/gear/cards display_name = "deck of cards" diff --git a/icons/obj/dice.dmi b/icons/obj/dice.dmi index 669ad215c5c3ad4df8aea2265eb66f2b31277851..f6a209b4687244f764fa7fe155f776199588d020 100644 GIT binary patch literal 2961 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 E16^lA)c^nh