From eb1bbac0427bc869cab9f00096ff1963dcf003f4 Mon Sep 17 00:00:00 2001 From: Atermonera Date: Sat, 13 Oct 2018 14:16:51 -0700 Subject: [PATCH] Merge pull request #5656 from lbnesquik/Kates-AshTray-Fix Fix plastic ashtrays only holding one butt. Now they hold 4 butts. --- code/game/objects/items/weapons/material/ashtray.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/material/ashtray.dm b/code/game/objects/items/weapons/material/ashtray.dm index d5e7cd67bb7..8becb480103 100644 --- a/code/game/objects/items/weapons/material/ashtray.dm +++ b/code/game/objects/items/weapons/material/ashtray.dm @@ -14,7 +14,7 @@ var/global/list/ashtray_cache = list() if(!material) qdel(src) return - max_butts = round(material.hardness/10) //This is arbitrary but whatever. + max_butts = round(material.hardness/5) //This is arbitrary but whatever. src.pixel_y = rand(-5, 5) src.pixel_x = rand(-6, 6) update_icon()