Refactors sound groups to use decls instead of a massive switch with dozens of global lists. (#9702)

This commit is contained in:
Matt Atlas
2020-08-28 20:47:00 +02:00
committed by GitHub
parent db1b0cece0
commit 0dd08df5b2
125 changed files with 629 additions and 557 deletions
+5 -6
View File
@@ -104,9 +104,9 @@
//for use in material weapons. because tiles and stacks sound different. since cardboard baseball bats sound different from wooden ones and et cetera.
var/weapon_drop_sound = 'sound/items/drop/metalweapon.ogg'
var/weapon_pickup_sound = 'sound/items/pickup/metalweapon.ogg'
var/weapon_hitsound = "swing_hit"
var/weapon_hitsound = /decl/sound_category/swing_hit_sound
var/shatter_sound = "glass_break" //sound it makes when it breaks.
var/shatter_sound = /decl/sound_category/glass_break_sound //sound it makes when it breaks.
/material/proc/build_rod_product(var/mob/user, var/obj/item/stack/used_stack, var/obj/item/stack/target_stack)
if(!rod_product)
@@ -701,7 +701,7 @@
dooropen_noise = 'sound/effects/doorcreaky.ogg'
door_icon_base = "wood"
destruction_desc = "splinters"
shatter_sound = "shatter_wood"
shatter_sound = /decl/sound_category/wood_break_sound
sheet_singular_name = "plank"
sheet_plural_name = "planks"
golem = SPECIES_GOLEM_WOOD
@@ -711,7 +711,7 @@
weapon_drop_sound = 'sound/items/drop/woodweapon.ogg'
weapon_pickup_sound = 'sound/items/pickup/woodweapon.ogg'
weapon_hitsound = 'sound/weapons/woodenhit.ogg'
shatter_sound = "wood_break"
shatter_sound = /decl/sound_category/wood_break_sound
/material/wood/log //This is gonna replace wood planks in a way for NBT, leaving it here for now
name = MATERIAL_WOOD_LOG
@@ -777,12 +777,11 @@
stack_origin_tech = list(TECH_MATERIAL = 1)
door_icon_base = "wood"
destruction_desc = "crumples"
shatter_sound = "shatter_cardboard"
shatter_sound = /decl/sound_category/cardboard_break_sound
golem = SPECIES_GOLEM_CARDBOARD
drop_sound = 'sound/items/drop/cardboardbox.ogg'
pickup_sound = 'sound/items/pickup/cardboardbox.ogg'
weapon_hitsound = 'sound/weapons/cardboardhit.ogg'
shatter_sound = "cardboard_break"
/material/cult
name = MATERIAL_CULT