From acdde85f4d27d037dfb6020b6c686f3b605c0ac6 Mon Sep 17 00:00:00 2001 From: Layne <31356648+MisterLayne@users.noreply.github.com> Date: Sat, 10 Mar 2018 15:58:25 -0500 Subject: [PATCH] Reinforced snowball fix. (#4991) * temp snowball fix * Create MisterLayne - SnowballTEMPFIX * Update and rename MisterLayne - SnowballTEMPFIX to MisterLayne - SnowballTEMPFIX.yml --- code/game/objects/items/weapons/material/misc.dm | 6 +++--- html/changelogs/MisterLayne - SnowballTEMPFIX.yml | 6 ++++++ 2 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 html/changelogs/MisterLayne - SnowballTEMPFIX.yml diff --git a/code/game/objects/items/weapons/material/misc.dm b/code/game/objects/items/weapons/material/misc.dm index 97cf8b33db2..87bfb0454d3 100644 --- a/code/game/objects/items/weapons/material/misc.dm +++ b/code/game/objects/items/weapons/material/misc.dm @@ -100,7 +100,7 @@ user.put_in_hands(S) else visible_message("[user] starts compacting the snowball.", "You start compacting the snowball.") - if(do_after(user, 2000)) + if(do_after(user, 2 SECONDS)) var/atom/S = new /obj/item/weapon/material/snow/snowball/reinforced(user.loc) del(src) user.put_in_hands(S) @@ -108,6 +108,6 @@ /obj/item/weapon/material/snow/snowball/reinforced name = "snowball" desc = "A well-formed and fun snowball. It looks kind of dangerous." - icon_state = "snowball-reinf" + //icon_state = "reinf-snowball" force_divisor = 0.20 - thrown_force_divisor = 0.25 \ No newline at end of file + thrown_force_divisor = 0.25 diff --git a/html/changelogs/MisterLayne - SnowballTEMPFIX.yml b/html/changelogs/MisterLayne - SnowballTEMPFIX.yml new file mode 100644 index 00000000000..88edc4f77c6 --- /dev/null +++ b/html/changelogs/MisterLayne - SnowballTEMPFIX.yml @@ -0,0 +1,6 @@ +author: MisterLayne + +delete-after: False + +changes: + - bugfix "Reinforced snowballs can now actually be made in a reasonable time limit."