From 2f0b0bf80c82e38f351fdd39f823b099b261312b Mon Sep 17 00:00:00 2001 From: "Wowzewow (Wezzy)" <42310821+alsoandanswer@users.noreply.github.com> Date: Sat, 12 Sep 2020 01:40:48 +0800 Subject: [PATCH] lever tile correct sound + wired glass show correct sprite (#9958) --- code/game/turfs/simulated/floor_attackby.dm | 2 +- code/modules/materials/material_sheets.dm | 4 +- html/changelogs/wezzy_crowbar.yml | 42 +++++++++++++++++++++ 3 files changed, 45 insertions(+), 3 deletions(-) create mode 100644 html/changelogs/wezzy_crowbar.yml diff --git a/code/game/turfs/simulated/floor_attackby.dm b/code/game/turfs/simulated/floor_attackby.dm index a3afc109a68..fa1c3a3c84c 100644 --- a/code/game/turfs/simulated/floor_attackby.dm +++ b/code/game/turfs/simulated/floor_attackby.dm @@ -16,7 +16,7 @@ make_plating(1) else return - playsound(src, C.usesound, 80, 1) + playsound(src, 'sound/items/crowbar_tile.ogg', 80, 1) return else if(C.isscrewdriver() && (flooring.flags & TURF_REMOVE_SCREWDRIVER)) if(broken || burnt) diff --git a/code/modules/materials/material_sheets.dm b/code/modules/materials/material_sheets.dm index 20d2c00bdfb..de834a9e9ad 100644 --- a/code/modules/materials/material_sheets.dm +++ b/code/modules/materials/material_sheets.dm @@ -352,8 +352,8 @@ /obj/item/stack/material/glass/wired name = "wired glass" icon = 'icons/obj/stacks/tiles.dmi' - icon_state = MATERIAL_GLASS_WIRED - default_type = "wired glass" + icon_state = "glass_wire" + default_type = MATERIAL_GLASS_WIRED /obj/item/stack/material/glass/wired/full/Initialize() . = ..() diff --git a/html/changelogs/wezzy_crowbar.yml b/html/changelogs/wezzy_crowbar.yml new file mode 100644 index 00000000000..ab36af051ce --- /dev/null +++ b/html/changelogs/wezzy_crowbar.yml @@ -0,0 +1,42 @@ +################################ +# 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: Wowzewow (Wezzy) + +# 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: "Levering off tiles should play the correct sound now." + - bugfix: "Wired glass shows the correct sprite." \ No newline at end of file