diff --git a/code/game/objects/items/weapons/dice.dm b/code/game/objects/items/weapons/dice.dm index bcba720ddce..4b5f1071e4e 100644 --- a/code/game/objects/items/weapons/dice.dm +++ b/code/game/objects/items/weapons/dice.dm @@ -4,6 +4,7 @@ icon = 'icons/obj/dice.dmi' icon_state = "d66" w_class = 1 + var/side_mult = 1 // Used for d100s. var/sides = 6 var/weighted = FALSE //if this dice can cheat or something var/favored_number = 1 //related to the var above @@ -27,7 +28,7 @@ else if(sides == 20 && result == 1) comment = "Ouch, bad luck." icon_state = "[name][result]" - src.visible_message("\The [name] lands on [result]. [comment]") + src.visible_message("\The [name] lands on [result * side_mult]. [comment]") /obj/item/weapon/dice/d4 name = "d4" @@ -63,4 +64,5 @@ 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 + sides = 10 + side_mult = 10 \ No newline at end of file diff --git a/html/changelogs/TehFlaminTaco - D100 Fix.yml b/html/changelogs/TehFlaminTaco - D100 Fix.yml new file mode 100644 index 00000000000..d0e8bf43ce3 --- /dev/null +++ b/html/changelogs/TehFlaminTaco - D100 Fix.yml @@ -0,0 +1,41 @@ +################################ +# 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 +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: Teh Flamin' Taco + +# 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: + - tweak: "d100s now correctly show their result as multiples of 10."