From 082ef28fd15dec4850942d2307d5afacdede3d78 Mon Sep 17 00:00:00 2001 From: Fluffy <65877598+FluffyGhoster@users.noreply.github.com> Date: Sun, 26 Mar 2023 14:59:12 +0200 Subject: [PATCH] fix (#16107) --- code/game/machinery/computer/slotmachine.dm | 8 ++-- .../fluffyghost-fixslotmachinesinit.yml | 41 +++++++++++++++++++ 2 files changed, 45 insertions(+), 4 deletions(-) create mode 100644 html/changelogs/fluffyghost-fixslotmachinesinit.yml diff --git a/code/game/machinery/computer/slotmachine.dm b/code/game/machinery/computer/slotmachine.dm index 03ed4f6517c..151c1b8a26d 100644 --- a/code/game/machinery/computer/slotmachine.dm +++ b/code/game/machinery/computer/slotmachine.dm @@ -47,9 +47,7 @@ toggle_reel_spin(FALSE) for(cointype in typesof(/obj/item/coin)) - var/obj/item/coin/C = new cointype - coinvalues["[cointype]"] = get_value(C) - qdel(C) //Sigh + coinvalues["[cointype]"] = get_value(cointype) /obj/machinery/computer/slot_machine/Destroy() if(balance) @@ -249,7 +247,9 @@ /obj/machinery/computer/slot_machine/proc/toggle_reel_spin(value, delay = 0) //value is 1 or 0 aka on or off for(var/list/reel in reels) reels[reel] = value - sleep(delay) + + if(delay) + sleep(delay) /obj/machinery/computer/slot_machine/proc/randomize_reels() for(var/reel in reels) diff --git a/html/changelogs/fluffyghost-fixslotmachinesinit.yml b/html/changelogs/fluffyghost-fixslotmachinesinit.yml new file mode 100644 index 00000000000..ced5b6dafbe --- /dev/null +++ b/html/changelogs/fluffyghost-fixslotmachinesinit.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: Fluffyghost + +# 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: + - bugfix: "Fix slot machines init, they were unnecessarily creating the coins to add and then immediately QDELing them, making SSAtoms angry. They were also sleeping during init, making SSAtoms doubly angry."