Skip to content

Commit

Permalink
byeah
Browse files Browse the repository at this point in the history
  • Loading branch information
Paxilmaniac committed Oct 29, 2024
1 parent a9c3d7e commit 2d19925
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
/// The sound of fermentation
var/datum/looping_sound/boiling/soundloop
/// Sound played when the lid is opened.
var/lid_open_sound = 'sound/items/handling/cardboardbox_pickup.ogg'
var/lid_open_sound = 'sound/items/handling/cardboard_box/cardboardbox_pickup.ogg'
/// Sound played when the lid is closed.
var/lid_close_sound = 'sound/effects/footstep/woodclaw2.ogg'
/// How much volume should the vessel have inside it
Expand Down
2 changes: 1 addition & 1 deletion code/modules/fantasystation_content/crafting/floors.dm
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
if(object.tool_behaviour == TOOL_KNIFE)
if(!do_after(user, 3 SECONDS, src))
return
playsound(src, 'sound/items/poster_ripped.ogg', 50, TRUE)
playsound(src, 'sound/items/weapons/bladeslice.ogg', 50, TRUE)
new torn_up_result(src)
src.ScrapeAway(flags = CHANGETURF_INHERIT_AIR)
else
Expand Down
6 changes: 3 additions & 3 deletions code/modules/fantasystation_content/crafting/tools_weapons.dm
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
embed_type = /datum/embed_data/spear
attack_verb_continuous = list("attacks", "pokes", "jabs", "tears", "lacerates", "gores")
attack_verb_simple = list("attack", "poke", "jab", "tear", "lacerate", "gore")
hitsound = 'sound/weapons/bladeslice.ogg'
hitsound = 'sound/items/weapons/bladeslice.ogg'
sharpness = SHARP_EDGED
wound_bonus = -15
bare_wound_bonus = 10
Expand Down Expand Up @@ -85,7 +85,7 @@
embed_type = /datum/embed_data/hatchet
attack_verb_continuous = list("chops", "tears", "lacerates", "cuts")
attack_verb_simple = list("chop", "tear", "lacerate", "cut")
hitsound = 'sound/weapons/bladeslice.ogg'
hitsound = 'sound/items/weapons/bladeslice.ogg'
slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BACK

/obj/item/fantasy_axe/Initialize(mapload)
Expand Down Expand Up @@ -131,7 +131,7 @@
sharpness = SHARP_EDGED
tool_behaviour = TOOL_KNIFE
toolspeed = 1.75
hitsound = 'sound/weapons/bladeslice.ogg'
hitsound = 'sound/items/weapons/bladeslice.ogg'
attack_verb_continuous = list("slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "cuts")
attack_verb_simple = list("slash", "stab", "slice", "tear", "lacerate", "rip", "dice", "cut")
slot_flags = ITEM_SLOT_BELT
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
name = "Underground"
icon_state = "explored"
ambience_index = AMBIENCE_MINING
ambient_buzz = 'sound/ambience/magma.ogg'
ambient_buzz = 'sound/ambience/lavaland/magma.ogg'
min_ambience_cooldown = 70 SECONDS
max_ambience_cooldown = 220 SECONDS

Expand Down

0 comments on commit 2d19925

Please sign in to comment.