From fa81e2767692b3e58bc02b5b883803b7408f33b7 Mon Sep 17 00:00:00 2001 From: Slignerd Date: Sat, 3 Mar 2018 07:30:38 +0100 Subject: [PATCH 1/2] d (#36046) Dice icon name and desc change --- code/game/objects/items/dice.dm | 8 ++++---- icons/obj/dice.dmi | Bin 3896 -> 3905 bytes 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/game/objects/items/dice.dm b/code/game/objects/items/dice.dm index 0ea5fe1b03..a944230925 100644 --- a/code/game/objects/items/dice.dm +++ b/code/game/objects/items/dice.dm @@ -57,7 +57,7 @@ /obj/item/dice/d1 name = "d1" - desc = "A die with one side. Deterministic!" + desc = "A die with only one side. Deterministic!" icon_state = "d1" sides = 1 @@ -131,7 +131,7 @@ name = "d100" desc = "A die with one hundred sides! Probably not fairly weighted..." icon_state = "d100" - w_class = WEIGHT_CLASS_SMALL + w_class = WEIGHT_CLASS_SMALL sides = 100 /obj/item/dice/d100/update_icon() @@ -149,7 +149,7 @@ /obj/item/dice/fourdd6 name = "4d d6" - desc = "A die that exists in four dimensional space. Properly interpreting them can only be properly done with the help of a mathematician, a physicist, and a priest." + desc = "A die that exists in four dimensional space. Properly interpreting them can only be done with the help of a mathematician, a physicist, and a priest." icon_state = "4dd6" sides = 48 special_faces = list("Cube-Side: 1-1","Cube-Side: 1-2","Cube-Side: 1-3","Cube-Side: 1-4","Cube-Side: 1-5","Cube-Side: 1-6","Cube-Side: 2-1","Cube-Side: 2-2","Cube-Side: 2-3","Cube-Side: 2-4","Cube-Side: 2-5","Cube-Side: 2-6","Cube-Side: 3-1","Cube-Side: 3-2","Cube-Side: 3-3","Cube-Side: 3-4","Cube-Side: 3-5","Cube-Side: 3-6","Cube-Side: 4-1","Cube-Side: 4-2","Cube-Side: 4-3","Cube-Side: 4-4","Cube-Side: 4-5","Cube-Side: 4-6","Cube-Side: 5-1","Cube-Side: 5-2","Cube-Side: 5-3","Cube-Side: 5-4","Cube-Side: 5-5","Cube-Side: 5-6","Cube-Side: 6-1","Cube-Side: 6-2","Cube-Side: 6-3","Cube-Side: 6-4","Cube-Side: 6-5","Cube-Side: 6-6","Cube-Side: 7-1","Cube-Side: 7-2","Cube-Side: 7-3","Cube-Side: 7-4","Cube-Side: 7-5","Cube-Side: 7-6","Cube-Side: 8-1","Cube-Side: 8-2","Cube-Side: 8-3","Cube-Side: 8-4","Cube-Side: 8-5","Cube-Side: 8-6") @@ -189,7 +189,7 @@ /obj/item/dice/update_icon() cut_overlays() - add_overlay("[src.icon_state][src.result]") + add_overlay("[src.icon_state]-[src.result]") /obj/item/dice/microwave_act(obj/machinery/microwave/M) if(can_be_rigged) diff --git a/icons/obj/dice.dmi b/icons/obj/dice.dmi index 0ca008e37ea4c90abcfca55c994007e1c6d1a8dc..1d6601aa310086c4f994d9e506720c40ff531268 100644 GIT binary patch delta 3447 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 Vxut7P(&WGGH_|uPBkMTF{1