cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-28 07:38:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Reorganizes the sound folder (#86726)

Browse Source 
## About The Pull Request

<details>

- renamed ai folder to announcer

-- announcer --
- moved vox_fem to announcer
- moved approachingTG to announcer

- separated the ambience folder into ambience and instrumental
-- ambience --

- created holy folder moved all related sounds there
- created engineering folder and moved all related sounds there
- created security folder and moved ambidet there
- created general folder and moved ambigen there
- created icemoon folder and moved all icebox-related ambience there
- created medical folder and moved all medbay-related ambi there
- created ruin folder and moves all ruins ambi there
- created beach folder and moved seag and shore there
- created lavaland folder and moved related ambi there
- created aurora_caelus folder and placed its ambi there
- created misc folder and moved the rest of the files that don't have a
specific category into it

-- instrumental --

- moved traitor folder here
- created lobby_music folder and placed our songs there (title0 not used
anywhere? - server-side modification?)

-- items --

- moved secdeath to hailer
- moved surgery to handling

-- effects --

- moved chemistry into effects
- moved hallucinations into effects
- moved health into effects
- moved magic into effects

-- vehicles --

- moved mecha into vehicles


created mobs folder

-- mobs --

- moved creatures folder into mobs
- moved voice into mobs

renamed creatures to non-humanoids
renamed voice to humanoids

-- non-humanoids--

created cyborg folder
created hiss folder
moved harmalarm.ogg to cyborg

-- humanoids --




-- misc --

moved ghostwhisper to misc
moved insane_low_laugh to misc

I give up trying to document this.

</details>

- [X] ambience
- [x] announcer
- [x] effects
- [X] instrumental
- [x] items
- [x] machines
- [x] misc 
- [X] mobs
- [X] runtime
- [X] vehicles

- [ ] attributions

## Why It's Good For The Game

This folder is so disorganized that it's vomit inducing, will make it
easier to find and add new sounds, providng a minor structure to the
sound folder.

## Changelog
🆑 grungussuss
refactor: the sound folder in the source code has been reorganized,
please report any oddities with sounds playing or not playing
server: lobby music has been repathed to sound/music/lobby_music
/🆑
This commit is contained in:
grungussuss
2024-09-23 22:24:50 -07:00
committed by GitHub
parent 8c494a4736
commit 58501dce77
3639 changed files with 5089 additions and 5093 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/basic/alien/_alien.dm
+2 -2
View File
@@ -35,10 +35,10 @@
attack_verb_continuous = "slashes"
attack_verb_simple = "slash"
attack_sound = 'sound/weapons/bladeslice.ogg'
attack_sound = 'sound/items/weapons/bladeslice.ogg'
attack_vis_effect = ATTACK_EFFECT_CLAW
gold_core_spawnable = NO_SPAWN
death_sound = 'sound/voice/hiss6.ogg'
death_sound = 'sound/mobs/non-humanoids/hiss/hiss6.ogg'
death_message = "lets out a waning guttural screech, green blood bubbling from its maw..."
habitable_atmos = null
code/modules/mob/living/basic/alien/queen.dm
+1 -1
View File
@@ -15,7 +15,7 @@
///The type of projectile that fires from attacks.
var/projectiletype = /obj/projectile/neurotoxin/damaging
///The sound that plays when the projectile is fired.
var/projectilesound = 'sound/weapons/pierce.ogg'
var/projectilesound = 'sound/items/weapons/pierce.ogg'
/mob/living/basic/alien/queen/Initialize(mapload)
. = ..()
code/modules/mob/living/basic/alien/sentinel.dm
+1 -1
View File
@@ -13,7 +13,7 @@
///The type of projectile that fires from attacks.
var/projectiletype = /obj/projectile/neurotoxin/damaging
///The sound that plays when the projectile is fired.
var/projectilesound = 'sound/weapons/pierce.ogg'
var/projectilesound = 'sound/items/weapons/pierce.ogg'
/mob/living/basic/alien/sentinel/Initialize(mapload)
. = ..()
code/modules/mob/living/basic/basic_defense.dm
+4 -4
View File
@@ -15,7 +15,7 @@
ignored_mobs = user,
)
to_chat(user, span_notice("You [response_help_simple] [src]."))
playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, TRUE, -1)
playsound(loc, 'sound/items/weapons/thudswoosh.ogg', 50, TRUE, -1)
return TRUE
if(HAS_TRAIT(user, TRAIT_PACIFISM))
@@ -72,7 +72,7 @@
visible_message(span_notice("[user.name] [response_help_continuous] [src]."), \
span_notice("[user.name] [response_help_continuous] you."), null, COMBAT_MESSAGE_RANGE, user)
to_chat(user, span_notice("You [response_help_simple] [src]."))
playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, TRUE, -1)
playsound(loc, 'sound/items/weapons/thudswoosh.ogg', 50, TRUE, -1)
/mob/living/basic/attack_alien(mob/living/carbon/alien/adult/user, list/modifiers)
@@ -80,7 +80,7 @@
if(!.)
return
if(LAZYACCESS(modifiers, RIGHT_CLICK))
playsound(loc, 'sound/weapons/pierce.ogg', 25, TRUE, -1)
playsound(loc, 'sound/items/weapons/pierce.ogg', 25, TRUE, -1)
visible_message(span_danger("[user] [response_disarm_continuous] [name]!"), \
span_userdanger("[user] [response_disarm_continuous] you!"), null, COMBAT_MESSAGE_RANGE, user)
to_chat(user, span_danger("You [response_disarm_simple] [name]!"))
@@ -90,7 +90,7 @@
visible_message(span_danger("[user] slashes at [src]!"), \
span_userdanger("You're slashed at by [user]!"), null, COMBAT_MESSAGE_RANGE, user)
to_chat(user, span_danger("You slash at [src]!"))
playsound(loc, 'sound/weapons/slice.ogg', 25, TRUE, -1)
playsound(loc, 'sound/items/weapons/slice.ogg', 25, TRUE, -1)
apply_damage(damage)
log_combat(user, src, "attacked")
code/modules/mob/living/basic/blob_minions/blob_spore.dm
+1 -1
View File
@@ -19,7 +19,7 @@
obj_damage = 0
attack_verb_continuous = "batters"
attack_verb_simple = "batter"
attack_sound = 'sound/weapons/genhit1.ogg'
attack_sound = 'sound/items/weapons/genhit1.ogg'
death_message = "explodes into a cloud of gas!"
gold_core_spawnable = HOSTILE_SPAWN
basic_mob_flags = DEL_ON_DEATH
code/modules/mob/living/basic/blob_minions/blob_zombie.dm
+1 -1
View File
@@ -18,7 +18,7 @@
obj_damage = 20
attack_verb_continuous = "punches"
attack_verb_simple = "punch"
attack_sound = 'sound/weapons/genhit1.ogg'
attack_sound = 'sound/items/weapons/genhit1.ogg'
death_message = "collapses to the ground!"
gold_core_spawnable = NO_SPAWN
basic_mob_flags = DEL_ON_DEATH
code/modules/mob/living/basic/blob_minions/blobbernaut.dm
+3 -3
View File
@@ -17,7 +17,7 @@
obj_damage = BLOBMOB_BLOBBERNAUT_DMG_OBJ
attack_verb_continuous = "slams"
attack_verb_simple = "slam"
attack_sound = 'sound/effects/blobattack.ogg'
attack_sound = 'sound/effects/blob/blobattack.ogg'
verb_say = "gurgles"
verb_ask = "demands"
verb_exclaim = "roars"
@@ -84,8 +84,8 @@
key = ckey
flick("blobbernaut_produce", src)
health = maxHealth / 2 // Start out injured to encourage not beelining away from the blob
SEND_SOUND(src, sound('sound/effects/blobattack.ogg'))
SEND_SOUND(src, sound('sound/effects/attackblob.ogg'))
SEND_SOUND(src, sound('sound/effects/blob/blobattack.ogg'))
SEND_SOUND(src, sound('sound/effects/blob/attackblob.ogg'))
to_chat(src, span_infoplain("You are powerful, hard to kill, and slowly regenerate near nodes and cores, [span_cult_large("but will slowly die if not near the blob")] or if the factory that made you is killed."))
to_chat(src, span_infoplain("You can communicate with other blobbernauts and overminds <b>telepathically</b> by attempting to speak normally"))
to_chat(src, span_infoplain("Your overmind's blob reagent is: <b><font color=\"[blobstrain.color]\">[blobstrain.name]</b></font>!"))
code/modules/mob/living/basic/bots/dedbot.dm
+2 -2
View File
@@ -21,7 +21,7 @@
sharpness = SHARP_EDGED
attack_verb_continuous = "eviscerates"
attack_verb_simple = "eviscerate"
attack_sound = 'sound/weapons/bladeslice.ogg'
attack_sound = 'sound/items/weapons/bladeslice.ogg'
attack_vis_effect = ATTACK_EFFECT_SLASH
gold_core_spawnable = HOSTILE_SPAWN
limb_destroyer = TRUE
@@ -103,7 +103,7 @@
return FALSE
caster.Shake(1.4, 0.8, 0.3 SECONDS)
caster.visible_message(span_danger("[caster] shakes violently!"))
playsound(caster, 'sound/weapons/drill.ogg', 120 , TRUE)
playsound(caster, 'sound/items/weapons/drill.ogg', 120 , TRUE)
slash_em(caster)
StartCooldown(cooldown_time)
code/modules/mob/living/basic/bots/firebot/firebot.dm
+10 -10
View File
@@ -29,20 +29,20 @@
/mob/living/basic/bot/firebot/generate_speak_list()
var/static/list/idle_lines = list(
FIREBOT_VOICED_NO_FIRES = 'sound/voice/firebot/nofires.ogg',
FIREBOT_VOICED_ONLY_YOU = 'sound/voice/firebot/onlyyou.ogg',
FIREBOT_VOICED_TEMPERATURE_NOMINAL = 'sound/voice/firebot/tempnominal.ogg',
FIREBOT_VOICED_KEEP_COOL = 'sound/voice/firebot/keepitcool.ogg',
FIREBOT_VOICED_NO_FIRES = 'sound/mobs/non-humanoids/firebot/nofires.ogg',
FIREBOT_VOICED_ONLY_YOU = 'sound/mobs/non-humanoids/firebot/onlyyou.ogg',
FIREBOT_VOICED_TEMPERATURE_NOMINAL = 'sound/mobs/non-humanoids/firebot/tempnominal.ogg',
FIREBOT_VOICED_KEEP_COOL = 'sound/mobs/non-humanoids/firebot/keepitcool.ogg',
)
var/static/list/fire_detected_lines = list(
FIREBOT_VOICED_FIRE_DETECTED = 'sound/voice/firebot/detected.ogg',
FIREBOT_VOICED_STOP_DROP = 'sound/voice/firebot/stopdropnroll.ogg',
FIREBOT_VOICED_EXTINGUISHING = 'sound/voice/firebot/extinguishing.ogg',
FIREBOT_VOICED_FIRE_DETECTED = 'sound/mobs/non-humanoids/firebot/detected.ogg',
FIREBOT_VOICED_STOP_DROP = 'sound/mobs/non-humanoids/firebot/stopdropnroll.ogg',
FIREBOT_VOICED_EXTINGUISHING = 'sound/mobs/non-humanoids/firebot/extinguishing.ogg',
)
var/static/list/emagged_lines = list(
FIREBOT_VOICED_CANDLE_TIP = 'sound/voice/firebot/candle_tip.ogg',
FIREBOT_VOICED_ELECTRIC_FIRE = 'sound/voice/firebot/electric_fire_tip.ogg',
FIREBOT_VOICED_FUEL_TIP = 'sound/voice/firebot/gasoline_tip.ogg'
FIREBOT_VOICED_CANDLE_TIP = 'sound/mobs/non-humanoids/firebot/candle_tip.ogg',
FIREBOT_VOICED_ELECTRIC_FIRE = 'sound/mobs/non-humanoids/firebot/electric_fire_tip.ogg',
FIREBOT_VOICED_FUEL_TIP = 'sound/mobs/non-humanoids/firebot/gasoline_tip.ogg'
)
ai_controller.set_blackboard_key(BB_FIREBOT_EMAGGED_LINES, emagged_lines)
ai_controller.set_blackboard_key(BB_FIREBOT_IDLE_LINES, idle_lines)
code/modules/mob/living/basic/bots/honkbots/honkbot.dm
+1 -1
View File
@@ -48,7 +48,7 @@
can_slip_callback = CALLBACK(src, PROC_REF(pre_slip)),\
)
AddComponent(/datum/component/stun_n_cuff,\
stun_sound = 'sound/items/AirHorn.ogg',\
stun_sound = 'sound/items/airhorn/AirHorn.ogg',\
post_stun_callback = CALLBACK(src, PROC_REF(post_stun)),\
post_arrest_callback = CALLBACK(src, PROC_REF(post_arrest)),\
handcuff_type = /obj/item/restraints/handcuffs/cable/zipties/fake,\
code/modules/mob/living/basic/bots/hygienebot/hygienebot.dm
+11 -11
View File
@@ -29,23 +29,23 @@
var/static/mutable_appearance/fire_overlay = mutable_appearance('icons/mob/silicon/aibots.dmi', "hygienebot-fire")
///announcements we say when we find a target
var/static/list/found_announcements = list(
HYGIENEBOT_VOICED_UNHYGIENIC = 'sound/voice/hygienebot/unhygienicclient.ogg',
HYGIENEBOT_VOICED_UNHYGIENIC = 'sound/mobs/non-humanoids/hygienebot/unhygienicclient.ogg',
)
///announcements we say when the target keeps moving away
var/static/list/threat_announcements = list(
HYGIENEBOT_VOICED_THREAT_AIRLOCK = 'sound/voice/hygienebot/dragyouout.ogg',
HYGIENEBOT_VOICED_FOUL_SMELL = 'sound/voice/hygienebot/foulsmelling.ogg',
HYGIENEBOT_VOICED_TROGLODYTE = 'sound/voice/hygienebot/troglodyte.ogg',
HYGIENEBOT_VOICED_GREEN_CLOUD = 'sound/voice/hygienebot/greencloud.ogg',
HYGIENEBOT_VOICED_ARSEHOLE = 'sound/voice/hygienebot/letmeclean.ogg',
HYGIENEBOT_VOICED_THREAT_ARTERIES = 'sound/voice/hygienebot/cutarteries.ogg',
HYGIENEBOT_VOICED_STOP_RUNNING = 'sound/voice/hygienebot/stoprunning.ogg',
HYGIENEBOT_VOICED_THREAT_AIRLOCK = 'sound/mobs/non-humanoids/hygienebot/dragyouout.ogg',
HYGIENEBOT_VOICED_FOUL_SMELL = 'sound/mobs/non-humanoids/hygienebot/foulsmelling.ogg',
HYGIENEBOT_VOICED_TROGLODYTE = 'sound/mobs/non-humanoids/hygienebot/troglodyte.ogg',
HYGIENEBOT_VOICED_GREEN_CLOUD = 'sound/mobs/non-humanoids/hygienebot/greencloud.ogg',
HYGIENEBOT_VOICED_ARSEHOLE = 'sound/mobs/non-humanoids/hygienebot/letmeclean.ogg',
HYGIENEBOT_VOICED_THREAT_ARTERIES = 'sound/mobs/non-humanoids/hygienebot/cutarteries.ogg',
HYGIENEBOT_VOICED_STOP_RUNNING = 'sound/mobs/non-humanoids/hygienebot/stoprunning.ogg',
)
///announcements we say after we have cleaned our target
var/static/list/cleaned_announcements = list(
HYGIENEBOT_VOICED_FUCKING_FINALLY = 'sound/voice/hygienebot/finally.ogg',
HYGIENEBOT_VOICED_THANK_GOD = 'sound/voice/hygienebot/thankgod.ogg',
HYGIENEBOT_VOICED_DEGENERATE = 'sound/voice/hygienebot/degenerate.ogg',
HYGIENEBOT_VOICED_FUCKING_FINALLY = 'sound/mobs/non-humanoids/hygienebot/finally.ogg',
HYGIENEBOT_VOICED_THANK_GOD = 'sound/mobs/non-humanoids/hygienebot/thankgod.ogg',
HYGIENEBOT_VOICED_DEGENERATE = 'sound/mobs/non-humanoids/hygienebot/degenerate.ogg',
)
/mob/living/basic/bot/hygienebot/Initialize(mapload)
code/modules/mob/living/basic/bots/medbot/medbot.dm
+35 -35
View File
@@ -29,66 +29,66 @@
///anouncements when we find a target to heal
var/static/list/wait_announcements = list(
MEDIBOT_VOICED_HOLD_ON = 'sound/voice/medbot/coming.ogg',
MEDIBOT_VOICED_WANT_TO_HELP = 'sound/voice/medbot/help.ogg',
MEDIBOT_VOICED_YOU_ARE_INJURED = 'sound/voice/medbot/injured.ogg',
MEDIBOT_VOICED_HOLD_ON = 'sound/mobs/non-humanoids/medbot/coming.ogg',
MEDIBOT_VOICED_WANT_TO_HELP = 'sound/mobs/non-humanoids/medbot/help.ogg',
MEDIBOT_VOICED_YOU_ARE_INJURED = 'sound/mobs/non-humanoids/medbot/injured.ogg',
)
///announcements after we heal someone
var/static/list/afterheal_announcements = list(
MEDIBOT_VOICED_ALL_PATCHED_UP = 'sound/voice/medbot/patchedup.ogg',
MEDIBOT_VOICED_APPLE_A_DAY = 'sound/voice/medbot/apple.ogg',
MEDIBOT_VOICED_FEEL_BETTER = 'sound/voice/medbot/feelbetter.ogg',
MEDIBOT_VOICED_ALL_PATCHED_UP = 'sound/mobs/non-humanoids/medbot/patchedup.ogg',
MEDIBOT_VOICED_APPLE_A_DAY = 'sound/mobs/non-humanoids/medbot/apple.ogg',
MEDIBOT_VOICED_FEEL_BETTER = 'sound/mobs/non-humanoids/medbot/feelbetter.ogg',
)
///announcements when we are healing someone near death
var/static/list/near_death_announcements = list(
MEDIBOT_VOICED_STAY_WITH_ME = 'sound/voice/medbot/no.ogg',
MEDIBOT_VOICED_LIVE = 'sound/voice/medbot/live.ogg',
MEDIBOT_VOICED_NEVER_LOST = 'sound/voice/medbot/lost.ogg',
MEDIBOT_VOICED_STAY_WITH_ME = 'sound/mobs/non-humanoids/medbot/no.ogg',
MEDIBOT_VOICED_LIVE = 'sound/mobs/non-humanoids/medbot/live.ogg',
MEDIBOT_VOICED_NEVER_LOST = 'sound/mobs/non-humanoids/medbot/lost.ogg',
)
///announcements when we are idle
var/static/list/idle_lines = list(
MEDIBOT_VOICED_DELICIOUS = 'sound/voice/medbot/delicious.ogg',
MEDIBOT_VOICED_PLASTIC_SURGEON = 'sound/voice/medbot/surgeon.ogg',
MEDIBOT_VOICED_MASK_ON = 'sound/voice/medbot/radar.ogg',
MEDIBOT_VOICED_ALWAYS_A_CATCH = 'sound/voice/medbot/catch.ogg',
MEDIBOT_VOICED_LIKE_FLIES = 'sound/voice/medbot/flies.ogg',
MEDIBOT_VOICED_SUFFER = 'sound/voice/medbot/why.ogg',
MEDIBOT_VOICED_DELICIOUS = 'sound/mobs/non-humanoids/medbot/delicious.ogg',
MEDIBOT_VOICED_PLASTIC_SURGEON = 'sound/mobs/non-humanoids/medbot/surgeon.ogg',
MEDIBOT_VOICED_MASK_ON = 'sound/mobs/non-humanoids/medbot/radar.ogg',
MEDIBOT_VOICED_ALWAYS_A_CATCH = 'sound/mobs/non-humanoids/medbot/catch.ogg',
MEDIBOT_VOICED_LIKE_FLIES = 'sound/mobs/non-humanoids/medbot/flies.ogg',
MEDIBOT_VOICED_SUFFER = 'sound/mobs/non-humanoids/medbot/why.ogg',
)
///announcements when we are emagged
var/static/list/emagged_announcements = list(
MEDIBOT_VOICED_FUCK_YOU = 'sound/voice/medbot/fuck_you.ogg',
MEDIBOT_VOICED_NOT_A_GAME = 'sound/voice/medbot/turn_off.ogg',
MEDIBOT_VOICED_IM_DIFFERENT = 'sound/voice/medbot/im_different.ogg',
MEDIBOT_VOICED_FOURTH_WALL = 'sound/voice/medbot/close.ogg',
MEDIBOT_VOICED_SHINDEMASHOU = 'sound/voice/medbot/shindemashou.ogg',
MEDIBOT_VOICED_FUCK_YOU = 'sound/mobs/non-humanoids/medbot/fuck_you.ogg',
MEDIBOT_VOICED_NOT_A_GAME = 'sound/mobs/non-humanoids/medbot/turn_off.ogg',
MEDIBOT_VOICED_IM_DIFFERENT = 'sound/mobs/non-humanoids/medbot/im_different.ogg',
MEDIBOT_VOICED_FOURTH_WALL = 'sound/mobs/non-humanoids/medbot/close.ogg',
MEDIBOT_VOICED_SHINDEMASHOU = 'sound/mobs/non-humanoids/medbot/shindemashou.ogg',
)
///announcements when we are being tipped
var/static/list/tipped_announcements = list(
MEDIBOT_VOICED_WAIT = 'sound/voice/medbot/hey_wait.ogg',
MEDIBOT_VOICED_DONT = 'sound/voice/medbot/please_dont.ogg',
MEDIBOT_VOICED_TRUSTED_YOU = 'sound/voice/medbot/i_trusted_you.ogg',
MEDIBOT_VOICED_NO_SAD = 'sound/voice/medbot/nooo.ogg',
MEDIBOT_VOICED_OH_FUCK = 'sound/voice/medbot/oh_fuck.ogg',
MEDIBOT_VOICED_WAIT = 'sound/mobs/non-humanoids/medbot/hey_wait.ogg',
MEDIBOT_VOICED_DONT = 'sound/mobs/non-humanoids/medbot/please_dont.ogg',
MEDIBOT_VOICED_TRUSTED_YOU = 'sound/mobs/non-humanoids/medbot/i_trusted_you.ogg',
MEDIBOT_VOICED_NO_SAD = 'sound/mobs/non-humanoids/medbot/nooo.ogg',
MEDIBOT_VOICED_OH_FUCK = 'sound/mobs/non-humanoids/medbot/oh_fuck.ogg',
)
///announcements when we are being untipped
var/static/list/untipped_announcements = list(
MEDIBOT_VOICED_FORGIVE = 'sound/voice/medbot/forgive.ogg',
MEDIBOT_VOICED_THANKS = 'sound/voice/medbot/thank_you.ogg',
MEDIBOT_VOICED_GOOD_PERSON = 'sound/voice/medbot/youre_good.ogg',
MEDIBOT_VOICED_FORGIVE = 'sound/mobs/non-humanoids/medbot/forgive.ogg',
MEDIBOT_VOICED_THANKS = 'sound/mobs/non-humanoids/medbot/thank_you.ogg',
MEDIBOT_VOICED_GOOD_PERSON = 'sound/mobs/non-humanoids/medbot/youre_good.ogg',
)
///announcements when we are worried
var/static/list/worried_announcements = list(
MEDIBOT_VOICED_PUT_BACK = 'sound/voice/medbot/please_put_me_back.ogg',
MEDIBOT_VOICED_IM_SCARED = 'sound/voice/medbot/please_im_scared.ogg',
MEDIBOT_VOICED_NEED_HELP = 'sound/voice/medbot/dont_like.ogg',
MEDIBOT_VOICED_THIS_HURTS = 'sound/voice/medbot/pain_is_real.ogg',
MEDIBOT_VOICED_THE_END = 'sound/voice/medbot/is_this_the_end.ogg',
MEDIBOT_VOICED_NOOO = 'sound/voice/medbot/nooo.ogg',
MEDIBOT_VOICED_PUT_BACK = 'sound/mobs/non-humanoids/medbot/please_put_me_back.ogg',
MEDIBOT_VOICED_IM_SCARED = 'sound/mobs/non-humanoids/medbot/please_im_scared.ogg',
MEDIBOT_VOICED_NEED_HELP = 'sound/mobs/non-humanoids/medbot/dont_like.ogg',
MEDIBOT_VOICED_THIS_HURTS = 'sound/mobs/non-humanoids/medbot/pain_is_real.ogg',
MEDIBOT_VOICED_THE_END = 'sound/mobs/non-humanoids/medbot/is_this_the_end.ogg',
MEDIBOT_VOICED_NOOO = 'sound/mobs/non-humanoids/medbot/nooo.ogg',
)
var/static/list/misc_announcements= list(
MEDIBOT_VOICED_CHICKEN = 'sound/voice/medbot/i_am_chicken.ogg',
MEDIBOT_VOICED_CHICKEN = 'sound/mobs/non-humanoids/medbot/i_am_chicken.ogg',
)
/// drop determining variable
var/health_analyzer = /obj/item/healthanalyzer
code/modules/mob/living/basic/clown/clown.dm
+4 -4
View File
@@ -247,7 +247,7 @@
armour_penetration = 20
attack_verb_continuous = "steals the girlfriend of"
attack_verb_simple = "steal the girlfriend of"
attack_sound = 'sound/items/airhorn2.ogg'
attack_sound = 'sound/items/airhorn/airhorn2.ogg'
loot = list(
/obj/effect/gibspawner/human,
/obj/effect/spawner/foam_starter/small,
@@ -584,7 +584,7 @@
var/peels_to_spawn = min(peel_amount, reachable_turfs.len)
for(var/i in 1 to peels_to_spawn)
new banana_type(pick_n_take(reachable_turfs))
playsound(owner, 'sound/creatures/clown/clownana_rustle.ogg', 60)
playsound(owner, 'sound/mobs/non-humanoids/clown/clownana_rustle.ogg', 60)
animate(owner, time = 1, pixel_x = 6, easing = CUBIC_EASING | EASE_OUT)
animate(time = 2, pixel_x = -8, easing = CUBIC_EASING)
animate(time = 1, pixel_x = 0, easing = CUBIC_EASING | EASE_IN)
@@ -615,7 +615,7 @@
if(!do_after(owner, 1 SECONDS))
activating = FALSE
return
playsound(owner, 'sound/creatures/clown/hehe.ogg', 100)
playsound(owner, 'sound/mobs/non-humanoids/clown/hehe.ogg', 100)
if(!do_after(owner, 1 SECONDS))
activating = FALSE
return
@@ -626,5 +626,5 @@
. = ..()
new /obj/item/food/grown/banana/bunch(get_step(owner.loc, owner.dir))
playsound(owner, 'sound/items/bikehorn.ogg', 60)
addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(playsound), owner, 'sound/creatures/clown/hohoho.ogg', 100, 1), 1 SECONDS)
addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(playsound), owner, 'sound/mobs/non-humanoids/clown/hohoho.ogg', 100, 1), 1 SECONDS)
StartCooldown()
code/modules/mob/living/basic/cult/constructs/artificer.dm
+1 -1
View File
@@ -13,7 +13,7 @@
melee_damage_upper = 5
attack_verb_continuous = "rams"
attack_verb_simple = "ram"
attack_sound = 'sound/weapons/punch2.ogg'
attack_sound = 'sound/items/weapons/punch2.ogg'
construct_spells = list(
/datum/action/cooldown/spell/aoe/magic_missile/lesser,
/datum/action/cooldown/spell/conjure/construct/lesser,
code/modules/mob/living/basic/cult/constructs/harvester.dm
+1 -1
View File
@@ -11,7 +11,7 @@
melee_damage_upper = 20
attack_verb_continuous = "butchers"
attack_verb_simple = "butcher"
attack_sound = 'sound/weapons/bladeslice.ogg'
attack_sound = 'sound/items/weapons/bladeslice.ogg'
attack_vis_effect = ATTACK_EFFECT_SLASH
construct_spells = list(
/datum/action/cooldown/spell/aoe/area_conversion,
code/modules/mob/living/basic/cult/constructs/juggernaut.dm
+1 -1
View File
@@ -14,7 +14,7 @@
attack_verb_continuous = "smashes their armored gauntlet into"
attack_verb_simple = "smash your armored gauntlet into"
speed = 2.5
attack_sound = 'sound/weapons/punch3.ogg'
attack_sound = 'sound/items/weapons/punch3.ogg'
status_flags = NONE
mob_size = MOB_SIZE_LARGE
construct_spells = list(
code/modules/mob/living/basic/cult/constructs/proteon.dm
+1 -1
View File
@@ -12,7 +12,7 @@
attack_verb_continuous = "pinches"
attack_verb_simple = "pinch"
smashes_walls = TRUE
attack_sound = 'sound/weapons/punch2.ogg'
attack_sound = 'sound/items/weapons/punch2.ogg'
playstyle_string = span_bold("You are a Proteon. Your abilities in combat are outmatched by most combat constructs, but you are still fast and nimble. Run metal and supplies, and cooperate with your fellow cultists.")
/// Hostile NPC version
code/modules/mob/living/basic/cult/constructs/wraith.dm
+1 -1
View File
@@ -10,7 +10,7 @@
melee_damage_upper = 20
attack_verb_continuous = "slashes"
attack_verb_simple = "slash"
attack_sound = 'sound/weapons/bladeslice.ogg'
attack_sound = 'sound/items/weapons/bladeslice.ogg'
attack_vis_effect = ATTACK_EFFECT_SLASH
construct_spells = list(
/datum/action/cooldown/spell/jaunt/ethereal_jaunt/shift,
code/modules/mob/living/basic/farm_animals/cow/_cow.dm
+1 -1
View File
@@ -20,7 +20,7 @@
response_harm_simple = "kick"
attack_verb_continuous = "kicks"
attack_verb_simple = "kick"
attack_sound = 'sound/weapons/punch1.ogg'
attack_sound = 'sound/items/weapons/punch1.ogg'
attack_vis_effect = ATTACK_EFFECT_KICK
health = 50
maxHealth = 50
code/modules/mob/living/basic/farm_animals/cow/cow_moonicorn.dm
+1 -1
View File
@@ -15,7 +15,7 @@
attack_verb_continuous = "telekinetically rams its moonihorn into"
attack_verb_simple = "telekinetically ram your moonihorn into"
gold_core_spawnable = NO_SPAWN
attack_sound = 'sound/weapons/bladeslice.ogg'
attack_sound = 'sound/items/weapons/bladeslice.ogg'
attack_vis_effect = ATTACK_EFFECT_SLASH
ai_controller = /datum/ai_controller/basic_controller/cow/moonicorn
food_types = list(/obj/item/food/grown/galaxythistle)
code/modules/mob/living/basic/farm_animals/deer/deer.dm
+1 -1
View File
@@ -16,7 +16,7 @@
response_harm_simple = "kick"
attack_verb_continuous = "bucks"
attack_verb_simple = "buck"
attack_sound = 'sound/weapons/punch1.ogg'
attack_sound = 'sound/items/weapons/punch1.ogg'
health = 75
maxHealth = 75
blood_volume = BLOOD_VOLUME_NORMAL
code/modules/mob/living/basic/farm_animals/goat/_goat.dm
+1 -1
View File
@@ -15,7 +15,7 @@
response_harm_simple = "kick"
attack_verb_continuous = "kicks"
attack_verb_simple = "kick"
attack_sound = 'sound/weapons/punch1.ogg'
attack_sound = 'sound/items/weapons/punch1.ogg'
attack_vis_effect = ATTACK_EFFECT_KICK
butcher_results = list(/obj/item/food/meat/slab/grassfed = 4)
code/modules/mob/living/basic/farm_animals/gorilla/gorilla.dm
+1 -1
View File
@@ -31,7 +31,7 @@
obj_damage = 40
attack_verb_continuous = "pummels"
attack_verb_simple = "pummel"
attack_sound = 'sound/weapons/punch1.ogg'
attack_sound = 'sound/items/weapons/punch1.ogg'
unique_name = TRUE
ai_controller = /datum/ai_controller/basic_controller/gorilla
faction = list(FACTION_MONKEY, FACTION_JUNGLE)
code/modules/mob/living/basic/farm_animals/gorilla/gorilla_emotes.dm
+1 -1
View File
@@ -8,4 +8,4 @@
message = "oogas."
message_param = "oogas at %t."
emote_type = EMOTE_AUDIBLE | EMOTE_VISIBLE
sound = 'sound/creatures/gorilla.ogg'
sound = 'sound/mobs/non-humanoids/gorilla/gorilla.ogg'
code/modules/mob/living/basic/farm_animals/pig.dm
+1 -1
View File
@@ -18,7 +18,7 @@
response_harm_simple = "kick"
attack_verb_continuous = "kicks"
attack_verb_simple = "kick"
attack_sound = 'sound/weapons/punch1.ogg'
attack_sound = 'sound/items/weapons/punch1.ogg'
attack_vis_effect = ATTACK_EFFECT_KICK
melee_damage_lower = 1
melee_damage_upper = 2
code/modules/mob/living/basic/farm_animals/pony.dm
+5 -5
View File
@@ -15,7 +15,7 @@
response_harm_simple = "kick"
attack_verb_continuous = "kicks"
attack_verb_simple = "kick"
attack_sound = 'sound/weapons/punch1.ogg'
attack_sound = 'sound/items/weapons/punch1.ogg'
attack_vis_effect = ATTACK_EFFECT_KICK
melee_damage_lower = 5
melee_damage_upper = 10
@@ -46,7 +46,7 @@
/mob/living/basic/pony/tamed(mob/living/tamer, atom/food)
can_buckle = TRUE
buckle_lying = 0
playsound(src, 'sound/creatures/pony/snort.ogg', 50)
playsound(src, 'sound/mobs/non-humanoids/pony/snort.ogg', 50)
AddElement(/datum/element/ridable, /datum/component/riding/creature/pony)
visible_message(span_notice("[src] snorts happily."))
new /obj/effect/temp_visual/heart(loc)
@@ -85,9 +85,9 @@
manual_emote("whinnies ANGRILY!")
playsound(src, pick(list(
'sound/creatures/pony/whinny01.ogg',
'sound/creatures/pony/whinny02.ogg',
'sound/creatures/pony/whinny03.ogg'
'sound/mobs/non-humanoids/pony/whinny01.ogg',
'sound/mobs/non-humanoids/pony/whinny02.ogg',
'sound/mobs/non-humanoids/pony/whinny03.ogg'
)), 50)
/mob/living/basic/pony/take_damage(damage_amount, damage_type, damage_flag, sound_effect, attack_dir, armour_penetration)
code/modules/mob/living/basic/farm_animals/rabbit.dm
+1 -1
View File
@@ -26,7 +26,7 @@
response_help_simple = "pet"
response_disarm_continuous = "gently pushes aside"
response_disarm_simple = "gently push aside"
attack_sound = 'sound/weapons/punch1.ogg'
attack_sound = 'sound/items/weapons/punch1.ogg'
attack_vis_effect = ATTACK_EFFECT_KICK
response_harm_continuous = "kicks"
response_harm_simple = "kick"
code/modules/mob/living/basic/farm_animals/sheep.dm
+2 -2
View File
@@ -18,7 +18,7 @@
response_harm_simple = "kick"
attack_verb_continuous = "kicks"
attack_verb_simple = "kick"
attack_sound = 'sound/weapons/punch1.ogg'
attack_sound = 'sound/items/weapons/punch1.ogg'
attack_vis_effect = ATTACK_EFFECT_KICK
health = 50
maxHealth = 50
@@ -40,7 +40,7 @@
item_generation_wait = 3 MINUTES, \
item_reduction_time = 30 SECONDS, \
item_harvest_time = 5 SECONDS, \
item_harvest_sound = 'sound/surgery/scalpel1.ogg', \
item_harvest_sound = 'sound/items/handling/surgery/scalpel1.ogg', \
)
AddElement(/datum/element/ai_retaliate)
RegisterSignal(src, COMSIG_LIVING_CULT_SACRIFICED, PROC_REF(on_sacrificed))
code/modules/mob/living/basic/festivus_pole.dm
+1 -1
View File
@@ -30,7 +30,7 @@
melee_damage_upper = 12
attack_verb_continuous = "bites"
attack_verb_simple = "bite"
attack_sound = 'sound/weapons/bite.ogg'
attack_sound = 'sound/items/weapons/bite.ogg'
attack_vis_effect = ATTACK_EFFECT_BITE
faction = list(FACTION_HOSTILE)
code/modules/mob/living/basic/guardian/guardian.dm
+1 -1
View File
@@ -31,7 +31,7 @@
response_disarm_simple = "flail at"
response_harm_continuous = "punches"
response_harm_simple = "punch"
attack_sound = 'sound/weapons/punch1.ogg'
attack_sound = 'sound/items/weapons/punch1.ogg'
attack_verb_continuous = "punches"
attack_verb_simple = "punch"
combat_mode = TRUE
code/modules/mob/living/basic/guardian/guardian_fluff.dm
+1 -1
View File
@@ -22,7 +22,7 @@
/// Verb shown to attacker when attacking
var/attack_verb_simple = "punch"
/// Sound played when we attack
var/attack_sound = 'sound/weapons/punch1.ogg'
var/attack_sound = 'sound/items/weapons/punch1.ogg'
/// Visible effect when we attack
var/attack_vis_effect = ATTACK_EFFECT_PUNCH
/// An associative list of type of guardian to some kind of descriptive text to show on appearance.
code/modules/mob/living/basic/guardian/guardian_types/assassin.dm
+1 -1
View File
@@ -9,7 +9,7 @@
melee_damage_upper = 15
attack_verb_continuous = "slashes"
attack_verb_simple = "slash"
attack_sound = 'sound/weapons/bladeslice.ogg'
attack_sound = 'sound/items/weapons/bladeslice.ogg'
attack_vis_effect = ATTACK_EFFECT_SLASH
sharpness = SHARP_POINTY
damage_coeff = list(BRUTE = 1, BURN = 1, TOX = 1, STAMINA = 0, OXY = 1)
code/modules/mob/living/basic/guardian/guardian_types/lightning.dm
+1 -1
View File
@@ -6,7 +6,7 @@
attack_verb_continuous = "shocks"
attack_verb_simple = "shock"
melee_damage_type = BURN
attack_sound = 'sound/machines/defib_zap.ogg'
attack_sound = 'sound/machines/defib/defib_zap.ogg'
damage_coeff = list(BRUTE = 0.7, BURN = 0.7, TOX = 0.7, STAMINA = 0, OXY = 0.7)
range = 7
playstyle_string = span_holoparasite("As a <b>lightning</b> type, you will apply lightning chains to targets on attack and have a lightning chain to your summoner. Lightning chains will shock anyone near them.")
code/modules/mob/living/basic/guardian/guardian_types/support.dm
+1 -1
View File
@@ -134,7 +134,7 @@
/// Start teleporting
/datum/action/cooldown/mob_cooldown/guardian_bluespace_beacon/proc/perform_teleport(mob/living/source, atom/target)
source.do_attack_animation(target)
playsound(target, 'sound/weapons/punch1.ogg', 50, TRUE, TRUE, frequency = -1)
playsound(target, 'sound/items/weapons/punch1.ogg', 50, TRUE, TRUE, frequency = -1)
source.balloon_alert(source, "teleporting...")
target.visible_message(
span_danger("[target] starts to glow faintly!"), \
code/modules/mob/living/basic/heretic/_heretic_summon.dm
+1 -1
View File
@@ -13,7 +13,7 @@
speed = 0
melee_attack_cooldown = CLICK_CD_MELEE
attack_sound = 'sound/weapons/punch1.ogg'
attack_sound = 'sound/items/weapons/punch1.ogg'
response_help_continuous = "thinks better of touching"
response_help_simple = "think better of touching"
response_disarm_continuous = "flails at"
code/modules/mob/living/basic/heretic/fire_shark.dm
+1 -1
View File
@@ -11,7 +11,7 @@
maxHealth = 16
melee_damage_lower = 8
melee_damage_upper = 8
attack_sound = 'sound/weapons/bite.ogg'
attack_sound = 'sound/items/weapons/bite.ogg'
attack_vis_effect = ATTACK_EFFECT_BITE
obj_damage = 0
attack_verb_continuous = "bites"
code/modules/mob/living/basic/heretic/flesh_worm.dm
+1 -1
View File
@@ -98,7 +98,7 @@
if(!istype(target, /obj/item/bodypart/arm))
return ..()
visible_message(span_warning("[src] devours [target]!"))
playsound(src, 'sound/magic/demon_consume.ogg', 50, TRUE)
playsound(src, 'sound/effects/magic/demon_consume.ogg', 50, TRUE)
qdel(target)
on_arm_eaten()
code/modules/mob/living/basic/heretic/star_gazer.dm
+2 -2
View File
@@ -21,11 +21,11 @@
attack_verb_continuous = "ravages"
attack_verb_simple = "ravage"
attack_vis_effect = ATTACK_EFFECT_SLASH
attack_sound = 'sound/weapons/bladeslice.ogg'
attack_sound = 'sound/items/weapons/bladeslice.ogg'
melee_attack_cooldown = 0.6 SECONDS
speak_emote = list("growls")
damage_coeff = list(BRUTE = 1, BURN = 0.5, TOX = 0, STAMINA = 0, OXY = 0)
death_sound = 'sound/magic/cosmic_expansion.ogg'
death_sound = 'sound/effects/magic/cosmic_expansion.ogg'
slowed_by_drag = FALSE
move_force = MOVE_FORCE_OVERPOWERING
code/modules/mob/living/basic/icemoon/ice_demon/ice_demon.dm
+4 -4
View File
@@ -16,7 +16,7 @@
melee_damage_upper = 15
attack_verb_continuous = "slices"
attack_verb_simple = "slice"
attack_sound = 'sound/weapons/bladeslice.ogg'
attack_sound = 'sound/items/weapons/bladeslice.ogg'
attack_vis_effect = ATTACK_EFFECT_SLASH
move_force = MOVE_FORCE_VERY_STRONG
move_resist = MOVE_FORCE_VERY_STRONG
@@ -24,7 +24,7 @@
crusher_loot = /obj/item/crusher_trophy/ice_demon_cube
ai_controller = /datum/ai_controller/basic_controller/ice_demon
death_message = "fades as the energies that tied it to this world dissipate."
death_sound = 'sound/magic/demon_dies.ogg'
death_sound = 'sound/effects/magic/demon_dies.ogg'
/mob/living/basic/mining/ice_demon/Initialize(mapload)
. = ..()
@@ -38,7 +38,7 @@
AddComponent(\
/datum/component/ranged_attacks,\
projectile_type = /obj/projectile/temp/ice_demon,\
projectile_sound = 'sound/weapons/pierce.ogg',\
projectile_sound = 'sound/items/weapons/pierce.ogg',\
)
var/static/list/death_loot = list(/obj/item/stack/ore/bluespace_crystal = 3)
AddElement(/datum/element/death_drops, death_loot)
@@ -66,7 +66,7 @@
melee_damage_upper = 5
attack_verb_continuous = "slices"
attack_verb_simple = "slice"
attack_sound = 'sound/weapons/bladeslice.ogg'
attack_sound = 'sound/items/weapons/bladeslice.ogg'
alpha = 80
ai_controller = /datum/ai_controller/basic_controller/ice_demon/afterimage
///how long do we exist for
code/modules/mob/living/basic/icemoon/ice_whelp/ice_whelp.dm
+2 -2
View File
@@ -26,9 +26,9 @@
attack_verb_continuous = "chomps"
attack_verb_simple = "chomp"
death_message = "collapses on its side."
death_sound = 'sound/magic/demon_dies.ogg'
death_sound = 'sound/effects/magic/demon_dies.ogg'
attack_sound = 'sound/magic/demon_attack1.ogg'
attack_sound = 'sound/effects/magic/demon_attack1.ogg'
move_force = MOVE_FORCE_VERY_STRONG
move_resist = MOVE_FORCE_VERY_STRONG
pull_force = MOVE_FORCE_VERY_STRONG
code/modules/mob/living/basic/icemoon/wolf/wolf.dm
+1 -1
View File
@@ -30,7 +30,7 @@
attack_verb_simple = "bite"
death_message = "snarls its last and perishes."
attack_sound = 'sound/weapons/bite.ogg'
attack_sound = 'sound/items/weapons/bite.ogg'
move_force = MOVE_FORCE_WEAK
move_resist = MOVE_FORCE_WEAK
pull_force = MOVE_FORCE_WEAK
code/modules/mob/living/basic/jungle/leaper/leaper.dm
+1 -1
View File
@@ -23,7 +23,7 @@
minimum_survivable_temperature = 0
maximum_survivable_temperature = INFINITY
attack_sound = 'sound/weapons/bladeslice.ogg'
attack_sound = 'sound/items/weapons/bladeslice.ogg'
attack_vis_effect = ATTACK_EFFECT_SLASH
status_flags = NONE
lighting_cutoff_red = 5
code/modules/mob/living/basic/jungle/leaper/leaper_abilities.dm
+1 -1
View File
@@ -137,7 +137,7 @@
if(!length(possible_turfs))
return FALSE
playsound(owner, 'sound/magic/fireball.ogg', 70, TRUE)
playsound(owner, 'sound/effects/magic/fireball.ogg', 70, TRUE)
new /obj/effect/temp_visual/blood_drop_rising(get_turf(owner))
addtimer(CALLBACK(src, PROC_REF(fire_droplets), possible_turfs), 1.5 SECONDS)
StartCooldown()
code/modules/mob/living/basic/jungle/mega_arachnid/mega_arachnid.dm
+1 -1
View File
@@ -29,7 +29,7 @@
mob_size = MOB_SIZE_LARGE
speak_emote = list("chitters")
attack_sound = 'sound/weapons/bladeslice.ogg'
attack_sound = 'sound/items/weapons/bladeslice.ogg'
attack_vis_effect = ATTACK_EFFECT_SLASH
ai_controller = /datum/ai_controller/basic_controller/mega_arachnid
alpha = 40
code/modules/mob/living/basic/jungle/seedling/seedling.dm
+2 -2
View File
@@ -31,7 +31,7 @@
lighting_cutoff_blue = 25
mob_size = MOB_SIZE_LARGE
faction = list(FACTION_PLANTS)
attack_sound = 'sound/weapons/bladeslice.ogg'
attack_sound = 'sound/items/weapons/bladeslice.ogg'
attack_vis_effect = ATTACK_EFFECT_SLASH
ai_controller = /datum/ai_controller/basic_controller/seedling
///the state of combat we are in
@@ -338,7 +338,7 @@
living_target.ignite_mob()
living_target.adjustFireLoss(30)
playsound(target_turf, 'sound/magic/lightningbolt.ogg', 50, TRUE)
playsound(target_turf, 'sound/effects/magic/lightningbolt.ogg', 50, TRUE)
if(!is_seedling)
return
var/mob/living/basic/seedling/seed_firer = firer
code/modules/mob/living/basic/jungle/seedling/seedling_projectiles.dm
+2 -2
View File
@@ -7,8 +7,8 @@
armor_flag = ENERGY
light_color = LIGHT_COLOR_DIM_YELLOW
speed = 1.6
hitsound = 'sound/weapons/sear.ogg'
hitsound_wall = 'sound/weapons/effects/searwall.ogg'
hitsound = 'sound/items/weapons/sear.ogg'
hitsound_wall = 'sound/items/weapons/effects/searwall.ogg'
nondirectional_sprite = TRUE
/obj/projectile/seedling/on_hit(atom/target, blocked = 0, pierce_hit)
code/modules/mob/living/basic/jungle/venus_human_trap.dm
+3 -3
View File
@@ -143,9 +143,9 @@
combat_mode = TRUE
basic_mob_flags = DEL_ON_DEATH
death_message = "collapses into bits of plant matter."
attacked_sound = 'sound/creatures/venus_trap_hurt.ogg'
death_sound = 'sound/creatures/venus_trap_death.ogg'
attack_sound = 'sound/creatures/venus_trap_hit.ogg'
attacked_sound = 'sound/mobs/non-humanoids/venus_trap/venus_trap_hurt.ogg'
death_sound = 'sound/mobs/non-humanoids/venus_trap/venus_trap_death.ogg'
attack_sound = 'sound/mobs/non-humanoids/venus_trap/venus_trap_hit.ogg'
unsuitable_heat_damage = 5 // heat damage is different from cold damage since coldmos is significantly more common than plasmafires
unsuitable_cold_damage = 2 // they now do take cold damage, but this should be sufficiently small that it does not cause major issues
habitable_atmos = null
code/modules/mob/living/basic/lavaland/basilisk/basilisk.dm
+2 -2
View File
@@ -16,7 +16,7 @@
attack_verb_continuous = "bites into"
attack_verb_simple = "bite into"
throw_blocked_message = "bounces off the shell of"
attack_sound = 'sound/weapons/bladeslice.ogg'
attack_sound = 'sound/items/weapons/bladeslice.ogg'
attack_vis_effect = ATTACK_EFFECT_BITE
ai_controller = /datum/ai_controller/basic_controller/basilisk
butcher_results = list(
@@ -30,7 +30,7 @@
/mob/living/basic/mining/basilisk/Initialize(mapload)
. = ..()
AddComponent(/datum/component/basic_mob_attack_telegraph)
ranged_attacks = AddComponent(/datum/component/ranged_attacks, projectile_type = /obj/projectile/temp/watcher, projectile_sound = 'sound/weapons/pierce.ogg')
ranged_attacks = AddComponent(/datum/component/ranged_attacks, projectile_type = /obj/projectile/temp/watcher, projectile_sound = 'sound/items/weapons/pierce.ogg')
RegisterSignal(src, COMSIG_MOVABLE_MOVED, PROC_REF(check_lava))
/mob/living/basic/mining/basilisk/Destroy()
code/modules/mob/living/basic/lavaland/bileworm/bileworm_actions.dm
+2 -2
View File
@@ -53,7 +53,7 @@
name = "Spew Bile"
desc = "Spews bile everywhere. Must resurface after use to refresh."
projectile_type = /obj/projectile/bileworm_acid
projectile_sound = 'sound/creatures/bileworm/bileworm_spit.ogg'
projectile_sound = 'sound/mobs/non-humanoids/bileworm/bileworm_spit.ogg'
shared_cooldown = MOB_SHARED_COOLDOWN_1 | MOB_SHARED_COOLDOWN_2
/datum/action/cooldown/mob_cooldown/projectile_attack/dir_shots/bileworm/Activate(atom/target_atom)
@@ -70,7 +70,7 @@
/obj/projectile/bileworm_acid
name = "acidic bile"
icon_state = "neurotoxin"
hitsound = 'sound/weapons/sear.ogg'
hitsound = 'sound/items/weapons/sear.ogg'
damage = 20
speed = 2
range = 20
code/modules/mob/living/basic/lavaland/bileworm/bileworm_loot.dm
+1 -1
View File
@@ -51,7 +51,7 @@
owner_has_control = FALSE
cooldown_time = 10 SECONDS
projectile_type = /obj/projectile/bileworm_acid
projectile_sound = 'sound/creatures/bileworm/bileworm_spit.ogg'
projectile_sound = 'sound/mobs/non-humanoids/bileworm/bileworm_spit.ogg'
/datum/action/cooldown/mob_cooldown/projectile_attack/dir_shots/spewlet/New(Target)
firing_directions = GLOB.cardinals.Copy()
code/modules/mob/living/basic/lavaland/brimdemon/brimbeam.dm
+1 -1
View File
@@ -52,7 +52,7 @@
/// Create a laser in the direction we are facing
/datum/action/cooldown/mob_cooldown/brimbeam/proc/fire_laser()
owner.visible_message(span_danger("[owner] fires a brimbeam!"))
playsound(owner, 'sound/creatures/brimdemon.ogg', 150, FALSE, 0, 3)
playsound(owner, 'sound/mobs/non-humanoids/brimdemon/brimdemon.ogg', 150, FALSE, 0, 3)
var/turf/target_turf = get_ranged_target_turf(owner, owner.dir, beam_range)
var/turf/origin_turf = get_turf(owner)
var/list/affected_turfs = get_line(origin_turf, target_turf) - origin_turf
code/modules/mob/living/basic/lavaland/brimdemon/brimdemon.dm
+2 -2
View File
@@ -14,13 +14,13 @@
speak_emote = list("cackles")
melee_damage_lower = 7.5
melee_damage_upper = 7.5
attack_sound = 'sound/weapons/bite.ogg'
attack_sound = 'sound/items/weapons/bite.ogg'
melee_attack_cooldown = 0.6 SECONDS
attack_vis_effect = ATTACK_EFFECT_BITE
attack_verb_continuous = "bites"
attack_verb_simple = "bite"
death_message = "wails as infernal energy escapes from its wounds, leaving it an empty husk."
death_sound = 'sound/magic/demon_dies.ogg'
death_sound = 'sound/effects/magic/demon_dies.ogg'
light_color = LIGHT_COLOR_BLOOD_MAGIC
light_power = 5
light_range = 1.4
code/modules/mob/living/basic/lavaland/brimdemon/brimdemon_loot.dm
+1 -1
View File
@@ -12,7 +12,7 @@
/obj/item/crusher_trophy/brimdemon_fang/on_mark_detonation(mob/living/target, mob/living/user)
target.balloon_alert_to_viewers("[pick(comic_phrases)]!")
playsound(target, 'sound/lavaland/brimdemon_crush.ogg', 100)
playsound(target, 'sound/mobs/non-humanoids/brimdemon/brimdemon_crush.ogg', 100)
/// Reagent pool left by dying brimdemon
/obj/effect/decal/cleanable/brimdust
code/modules/mob/living/basic/lavaland/goldgrub/goldgrub.dm
+1 -1
View File
@@ -19,7 +19,7 @@
melee_damage_upper = 0
attack_verb_continuous = "barrels into"
attack_verb_simple = "barrel into"
attack_sound = 'sound/weapons/punch1.ogg'
attack_sound = 'sound/items/weapons/punch1.ogg'
combat_mode = FALSE
speak_emote = list("screeches")
death_message = "stops moving as green liquid oozes from the carcass!"
code/modules/mob/living/basic/lavaland/goliath/goliath.dm
+2 -2
View File
@@ -19,7 +19,7 @@
obj_damage = 100
melee_damage_lower = 25
melee_damage_upper = 25
attack_sound = 'sound/weapons/punch1.ogg'
attack_sound = 'sound/items/weapons/punch1.ogg'
attack_verb_continuous = "pulverizes"
attack_verb_simple = "pulverize"
throw_blocked_message = "does nothing to the tough hide of"
@@ -136,7 +136,7 @@
if (!COOLDOWN_FINISHED(src, ability_animation_cooldown))
return
COOLDOWN_START(src, ability_animation_cooldown, 2 SECONDS)
playsound(src, 'sound/magic/demon_attack1.ogg', vol = 50, vary = TRUE)
playsound(src, 'sound/effects/magic/demon_attack1.ogg', vol = 50, vary = TRUE)
Shake(1, 0, 1.5 SECONDS)
/// Called slightly before tentacles ability comes off cooldown, as a warning
code/modules/mob/living/basic/lavaland/hivelord/hivelord.dm
+2 -2
View File
@@ -17,7 +17,7 @@
attack_verb_continuous = "weakly tackles"
attack_verb_simple = "weakly tackles"
speak_emote = list("telepathically cries")
attack_sound = 'sound/weapons/pierce.ogg'
attack_sound = 'sound/items/weapons/pierce.ogg'
throw_blocked_message = "passes between the bodies of the"
obj_damage = 0
pass_flags = PASSTABLE
@@ -94,7 +94,7 @@
attack_verb_continuous = "bites"
attack_verb_simple = "bite"
speak_emote = list("telepathically cries")
attack_sound = 'sound/weapons/bite.ogg'
attack_sound = 'sound/items/weapons/bite.ogg'
attack_vis_effect = ATTACK_EFFECT_BITE
obj_damage = 0
density = FALSE
code/modules/mob/living/basic/lavaland/legion/legion.dm
+1 -1
View File
@@ -21,7 +21,7 @@
attack_verb_continuous = "lashes out at"
attack_verb_simple = "lash out at"
speak_emote = list("gurgles")
attack_sound = 'sound/weapons/pierce.ogg'
attack_sound = 'sound/items/weapons/pierce.ogg'
throw_blocked_message = "bounces harmlessly off of"
crusher_loot = /obj/item/crusher_trophy/legion_skull
death_message = "wails in chorus and dissolves into quivering flesh."
code/modules/mob/living/basic/lavaland/legion/legion_brood.dm
+1 -1
View File
@@ -26,7 +26,7 @@
attack_verb_simple = "bite"
attack_vis_effect = ATTACK_EFFECT_BITE
speak_emote = list("echoes") // who the fuck speaking as this mob it dies 10 seconds after it spawns
attack_sound = 'sound/weapons/pierce.ogg'
attack_sound = 'sound/items/weapons/pierce.ogg'
density = FALSE
ai_controller = /datum/ai_controller/basic_controller/legion_brood
/// Reference to a guy who made us
code/modules/mob/living/basic/lavaland/legion/legion_monkey.dm
+1 -1
View File
@@ -12,7 +12,7 @@
attack_verb_continuous = "mauls"
attack_verb_simple = "maul"
attack_vis_effect = ATTACK_EFFECT_BITE
attack_sound = 'sound/weapons/bite.ogg'
attack_sound = 'sound/items/weapons/bite.ogg'
speak_emote = list("chimpers")
corpse_type = /obj/effect/mob_spawn/corpse/human/monkey
ai_controller = /datum/ai_controller/basic_controller/legion_monkey
code/modules/mob/living/basic/lavaland/legion/legion_tumour.dm
+5 -5
View File
@@ -21,10 +21,10 @@
var/spawn_type = /mob/living/basic/mining/legion
/// Spooky sounds to play as you start to turn
var/static/list/spooky_sounds = list(
'sound/voice/lowHiss1.ogg',
'sound/voice/lowHiss2.ogg',
'sound/voice/lowHiss3.ogg',
'sound/voice/lowHiss4.ogg',
'sound/mobs/non-humanoids/hiss/lowHiss1.ogg',
'sound/mobs/non-humanoids/hiss/lowHiss2.ogg',
'sound/mobs/non-humanoids/hiss/lowHiss3.ogg',
'sound/mobs/non-humanoids/hiss/lowHiss4.ogg',
)
/obj/item/organ/internal/legion_tumour/Initialize(mapload)
@@ -117,7 +117,7 @@
to_chat(owner, span_danger("Something flexes under your skin."))
if(SPT_PROB(2, seconds_per_tick))
if (prob(40))
SEND_SOUND(owner, sound('sound/voice/ghost_whisper.ogg'))
SEND_SOUND(owner, sound('sound/music/antag/bloodcult/ghost_whisper.ogg'))
else
SEND_SOUND(owner, sound(pick(spooky_sounds)))
if(SPT_PROB(3, seconds_per_tick))
code/modules/mob/living/basic/lavaland/lobstrosity/lobstrosity.dm
+1 -1
View File
@@ -16,7 +16,7 @@
melee_damage_upper = 19
attack_verb_continuous = "snips"
attack_verb_simple = "snip"
attack_sound = 'sound/weapons/bite.ogg'
attack_sound = 'sound/items/weapons/bite.ogg'
attack_vis_effect = ATTACK_EFFECT_BITE // Closer than a scratch to a crustacean pinching effect
melee_attack_cooldown = 1 SECONDS
butcher_results = list(
code/modules/mob/living/basic/lavaland/mook/mook.dm
+4 -4
View File
@@ -15,9 +15,9 @@
move_resist = MOVE_FORCE_VERY_STRONG
melee_damage_lower = 8
melee_damage_upper = 8
attack_sound = 'sound/weapons/rapierhit.ogg'
attack_sound = 'sound/items/weapons/rapierhit.ogg'
attack_vis_effect = ATTACK_EFFECT_SLASH
death_sound = 'sound/voice/mook_death.ogg'
death_sound = 'sound/mobs/non-humanoids/mook/mook_death.ogg'
ai_controller = /datum/ai_controller/basic_controller/mook/support
speed = 5
pixel_x = -16
@@ -243,8 +243,8 @@
melee_damage_lower = 10
melee_damage_upper = 10
gender = MALE
attack_sound = 'sound/weapons/stringsmash.ogg'
death_sound = 'sound/voice/mook_death.ogg'
attack_sound = 'sound/items/weapons/stringsmash.ogg'
death_sound = 'sound/mobs/non-humanoids/mook/mook_death.ogg'
ai_controller = /datum/ai_controller/basic_controller/mook/bard
///our guitar
var/obj/item/instrument/guitar/held_guitar
code/modules/mob/living/basic/lavaland/mook/mook_abilities.dm
+3 -3
View File
@@ -53,8 +53,8 @@
/datum/action/cooldown/mob_cooldown/mook_ability/mook_leap/proc/launch_towards_target(atom/target)
new /obj/effect/temp_visual/mook_dust(get_turf(owner))
playsound(get_turf(owner), 'sound/weapons/thudswoosh.ogg', 25, TRUE)
playsound(owner, 'sound/voice/mook_leap_yell.ogg', 100, TRUE)
playsound(get_turf(owner), 'sound/items/weapons/thudswoosh.ogg', 25, TRUE)
playsound(owner, 'sound/mobs/non-humanoids/mook/mook_leap_yell.ogg', 100, TRUE)
var/turf/target_turf = get_turf(target)
if(!target_turf.is_blocked_turf())
@@ -117,7 +117,7 @@
var/mob/living/basic/mining/mook/mook_owner = owner
mook_owner.change_combatant_state(state = MOOK_ATTACK_ACTIVE)
new /obj/effect/temp_visual/mook_dust(get_turf(owner))
playsound(get_turf(owner), 'sound/weapons/thudswoosh.ogg', 50, TRUE)
playsound(get_turf(owner), 'sound/items/weapons/thudswoosh.ogg', 50, TRUE)
animate(owner, pixel_y = owner.base_pixel_y + 146, time = 0.5 SECONDS)
addtimer(CALLBACK(src, PROC_REF(land_on_turf), target), 0.5 SECONDS)
code/modules/mob/living/basic/lavaland/node_drone/node_drone.dm
+1 -1
View File
@@ -126,7 +126,7 @@
animate(src, pixel_z = 400, time = 2 SECONDS, easing = QUAD_EASING|EASE_IN, flags = ANIMATION_PARALLEL)
sleep(2 SECONDS)
if(funny_ending)
playsound(src, 'sound/effects/explosion3.ogg', 50, FALSE) //node drone died on the way back to his home planet.
playsound(src, 'sound/effects/explosion/explosion3.ogg', 50, FALSE) //node drone died on the way back to his home planet.
visible_message(span_notice("...or maybe not."))
qdel(src)
code/modules/mob/living/basic/lavaland/raptor/_raptor.dm
+6 -6
View File
@@ -36,7 +36,7 @@ GLOBAL_LIST_EMPTY(raptor_population)
maximum_survivable_temperature = INFINITY
attack_verb_continuous = "pecks"
attack_verb_simple = "chomps"
attack_sound = 'sound/weapons/punch1.ogg'
attack_sound = 'sound/items/weapons/punch1.ogg'
faction = list(FACTION_RAPTOR, FACTION_NEUTRAL)
speak_emote = list("screeches")
ai_controller = /datum/ai_controller/basic_controller/raptor
@@ -85,11 +85,11 @@ GLOBAL_LIST_EMPTY(raptor_population)
BB_EMOTE_SAY = list("Chirp chirp chirp!", "Kweh!", "Bwark!"),
BB_EMOTE_SEE = list("shakes its feathers!", "stretches!", "flaps its wings!", "pecks at the ground!"),
BB_EMOTE_SOUND = list(
'sound/creatures/raptor_1.ogg',
'sound/creatures/raptor_2.ogg',
'sound/creatures/raptor_3.ogg',
'sound/creatures/raptor_4.ogg',
'sound/creatures/raptor_5.ogg',
'sound/mobs/non-humanoids/raptor/raptor_1.ogg',
'sound/mobs/non-humanoids/raptor/raptor_2.ogg',
'sound/mobs/non-humanoids/raptor/raptor_3.ogg',
'sound/mobs/non-humanoids/raptor/raptor_4.ogg',
'sound/mobs/non-humanoids/raptor/raptor_5.ogg',
),
BB_SPEAK_CHANCE = 2,
)
code/modules/mob/living/basic/lavaland/raptor/raptor_dex.dm
+1 -1
View File
@@ -56,7 +56,7 @@
return NONE
raptor = WEAKREF(attacked_atom)
playsound(src, 'sound/items/orbie_send_out.ogg', 20)
playsound(src, 'sound/mobs/non-humanoids/orbie/orbie_send_out.ogg', 20)
balloon_alert(user, "scanned")
ui_interact(user)
return ITEM_INTERACT_SUCCESS
code/modules/mob/living/basic/lavaland/watcher/watcher.dm
+1 -1
View File
@@ -29,7 +29,7 @@
/// Icon state for our eye overlay
var/eye_glow = "ice_glow"
/// Sound to play when we shoot
var/shoot_sound = 'sound/weapons/pierce.ogg'
var/shoot_sound = 'sound/items/weapons/pierce.ogg'
/// Typepath of our gaze ability
var/gaze_attack = /datum/action/cooldown/mob_cooldown/watcher_gaze
// We attract and eat these things for some reason
code/modules/mob/living/basic/lavaland/watcher/watcher_overwatch.dm
+1 -1
View File
@@ -17,7 +17,7 @@
/// Type of projectile to fire
var/projectile_type = /obj/projectile/temp/watcher
/// Sound the projectile we fire makes
var/projectile_sound = 'sound/weapons/pierce.ogg'
var/projectile_sound = 'sound/items/weapons/pierce.ogg'
/// Time to watch for
var/overwatch_duration = 3 SECONDS
code/modules/mob/living/basic/minebots/minebot.dm
+1 -1
View File
@@ -18,7 +18,7 @@
obj_damage = 10
attack_verb_continuous = "drills"
attack_verb_simple = "drill"
attack_sound = 'sound/weapons/circsawhit.ogg'
attack_sound = 'sound/items/weapons/circsawhit.ogg'
sentience_type = SENTIENCE_MINEBOT
speak_emote = list("states")
mob_biotypes = MOB_ROBOTIC
code/modules/mob/living/basic/minebots/minebot_abilities.dm
+4 -4
View File
@@ -119,7 +119,7 @@
return FALSE
var/obj/effect/mine/minebot/my_mine = new(my_turf)
my_mine.ignore_list = owner.faction.Copy()
playsound(my_turf, 'sound/weapons/armbomb.ogg', 20)
playsound(my_turf, 'sound/items/weapons/armbomb.ogg', 20)
StartCooldown()
return TRUE
@@ -132,7 +132,7 @@
/obj/effect/temp_visual/rising_rocket/Initialize(mapload)
. = ..()
playsound(src, 'sound/weapons/minebot_rocket.ogg', 100, FALSE)
playsound(src, 'sound/items/weapons/minebot_rocket.ogg', 100, FALSE)
animate(src, pixel_y = base_pixel_y + 500, time = duration, easing = EASE_IN)
/obj/effect/temp_visual/falling_rocket
@@ -154,7 +154,7 @@
animate(src, pixel_y = 0, time = duration)
/obj/effect/temp_visual/falling_rocket/proc/create_explosion()
playsound(src, 'sound/weapons/minebot_rocket.ogg', 100, FALSE)
playsound(src, 'sound/items/weapons/minebot_rocket.ogg', 100, FALSE)
var/datum/effect_system/fluid_spread/smoke/smoke = new
smoke.set_up(1, holder = src)
smoke.start()
@@ -176,7 +176,7 @@
var/datum/effect_system/fluid_spread/smoke/smoke = new
smoke.set_up(0, holder = src)
smoke.start()
playsound(src, 'sound/effects/explosion3.ogg', 100)
playsound(src, 'sound/effects/explosion/explosion3.ogg', 100)
victim.apply_damage(damage_to_apply)
/obj/effect/mine/minebot/can_trigger(atom/movable/on_who)
code/modules/mob/living/basic/minebots/minebot_remote_control.dm
+1 -1
View File
@@ -56,7 +56,7 @@
if(isnull(target_turf) || isclosedturf(target_turf) || isgroundlessturf(target_turf))
user.balloon_alert(user, "invalid target!")
return ITEM_INTERACT_BLOCKING
playsound(src, 'sound/machines/beep.ogg', 30)
playsound(src, 'sound/machines/beep/beep.ogg', 30)
clear_priming()
new /obj/effect/temp_visual/minebot_target(target_turf)
COOLDOWN_START(src, bomb_timer, BOMB_COOLDOWN)
code/modules/mob/living/basic/pets/cat/cat.dm
+1 -1
View File
@@ -29,7 +29,7 @@
held_state = "cat2"
attack_verb_continuous = "claws"
attack_verb_simple = "claw"
attack_sound = 'sound/weapons/slash.ogg'
attack_sound = 'sound/items/weapons/slash.ogg'
attack_vis_effect = ATTACK_EFFECT_CLAW
///icon of the collar we can wear
var/collar_icon_state = "cat"
code/modules/mob/living/basic/pets/dog/_dog.dm
+1 -1
View File
@@ -31,7 +31,7 @@
// The dog attack pet command can raise melee attack above 0
attack_verb_continuous = "bites"
attack_verb_simple = "bite"
attack_sound = 'sound/weapons/bite.ogg'
attack_sound = 'sound/items/weapons/bite.ogg'
attack_vis_effect = ATTACK_EFFECT_BITE
melee_attack_cooldown = 0.8 SECONDS
/// Instructions you can give to dogs
code/modules/mob/living/basic/pets/dog/corgi.dm
+3 -3
View File
@@ -116,7 +116,7 @@
user.visible_message(span_notice("[user] starts to shave [src] using \the [attacking_item]."), span_notice("You start to shave [src] using \the [attacking_item]..."))
if(do_after(user, 5 SECONDS, target = src))
user.visible_message(span_notice("[user] shaves [src]'s hair using \the [attacking_item]."))
playsound(get_turf(src), 'sound/items/welder2.ogg', 20, TRUE)
playsound(get_turf(src), 'sound/items/tools/welder2.ogg', 20, TRUE)
shaved = TRUE
icon_living = "[icon_living]_shaved"
icon_dead = "[icon_living]_shaved_dead"
@@ -399,7 +399,7 @@
place_on_head(new /obj/item/clothing/glasses/eyepatch/medical)
/mob/living/basic/pet/dog/corgi/ian/narsie_act()
playsound(src, 'sound/magic/demon_dies.ogg', 75, TRUE)
playsound(src, 'sound/effects/magic/demon_dies.ogg', 75, TRUE)
var/mob/living/basic/pet/dog/corgi/narsie/narsIan = new(loc)
narsIan.setDir(dir)
investigate_log("has been gibbed and replaced with Nars-Ian by Nar'Sie.", INVESTIGATE_DEATHS)
@@ -486,7 +486,7 @@
return
visible_message(span_warning("Dark magic resonating from [src] devours [prey]!"), \
"<span class='cult big bold'>DELICIOUS SOULS</span>")
playsound(src, 'sound/magic/demon_attack1.ogg', 75, TRUE)
playsound(src, 'sound/effects/magic/demon_attack1.ogg', 75, TRUE)
new /obj/effect/temp_visual/cult/sac(get_turf(prey))
narsie_act()
prey.investigate_log("has been sacrificed by [src].", INVESTIGATE_DEATHS)
code/modules/mob/living/basic/pets/fox.dm
+1 -1
View File
@@ -25,7 +25,7 @@
melee_damage_upper = 5
attack_verb_continuous = "bites"
attack_verb_simple = "bite"
attack_sound = 'sound/weapons/bite.ogg'
attack_sound = 'sound/items/weapons/bite.ogg'
attack_vis_effect = ATTACK_EFFECT_BITE
ai_controller = /datum/ai_controller/basic_controller/fox
code/modules/mob/living/basic/pets/pet_cult/pet_cult_abilities.dm
+1 -1
View File
@@ -11,4 +11,4 @@
)
summon_radius = 0
create_summon_timer = 5 SECONDS
sound = 'sound/magic/exit_blood.ogg'
sound = 'sound/effects/magic/exit_blood.ogg'
code/modules/mob/living/basic/pets/sloth.dm
+1 -1
View File
@@ -22,7 +22,7 @@ GLOBAL_DATUM(cargo_sloth, /mob/living/basic/sloth)
attack_verb_continuous = "bites"
attack_verb_simple = "bite"
attack_sound = 'sound/weapons/bite.ogg'
attack_sound = 'sound/items/weapons/bite.ogg'
attack_vis_effect = ATTACK_EFFECT_BITE
mob_biotypes = MOB_ORGANIC|MOB_BEAST
code/modules/mob/living/basic/revolutionary.dm
+15 -15
View File
@@ -13,7 +13,7 @@
melee_damage_lower = 15
melee_damage_upper = 20
obj_damage = 20
attack_sound = 'sound/weapons/smash.ogg'
attack_sound = 'sound/items/weapons/smash.ogg'
ai_controller = /datum/ai_controller/basic_controller/revolutionary
/// list of weapons we can have
var/static/list/possible_weapons = list(
@@ -49,26 +49,26 @@
)
/// Monkey screeches
var/static/list/monkey_screeches = list(
'sound/creatures/monkey/monkey_screech_1.ogg',
'sound/creatures/monkey/monkey_screech_2.ogg',
'sound/creatures/monkey/monkey_screech_3.ogg',
'sound/creatures/monkey/monkey_screech_4.ogg',
'sound/mobs/non-humanoids/monkey/monkey_screech_1.ogg',
'sound/mobs/non-humanoids/monkey/monkey_screech_2.ogg',
'sound/mobs/non-humanoids/monkey/monkey_screech_3.ogg',
'sound/mobs/non-humanoids/monkey/monkey_screech_4.ogg',
)
/// Male screams
var/static/list/male_screams = list(
'sound/voice/human/malescream_1.ogg',
'sound/voice/human/malescream_2.ogg',
'sound/voice/human/malescream_3.ogg',
'sound/voice/human/malescream_4.ogg',
'sound/voice/human/malescream_5.ogg',
'sound/mobs/humanoids/human/scream/malescream_1.ogg',
'sound/mobs/humanoids/human/scream/malescream_2.ogg',
'sound/mobs/humanoids/human/scream/malescream_3.ogg',
'sound/mobs/humanoids/human/scream/malescream_4.ogg',
'sound/mobs/humanoids/human/scream/malescream_5.ogg',
)
/// Female screams
var/static/list/female_screams = list(
'sound/voice/human/femalescream_1.ogg',
'sound/voice/human/femalescream_2.ogg',
'sound/voice/human/femalescream_3.ogg',
'sound/voice/human/femalescream_4.ogg',
'sound/voice/human/femalescream_5.ogg',
'sound/mobs/humanoids/human/scream/femalescream_1.ogg',
'sound/mobs/humanoids/human/scream/femalescream_2.ogg',
'sound/mobs/humanoids/human/scream/femalescream_3.ogg',
'sound/mobs/humanoids/human/scream/femalescream_4.ogg',
'sound/mobs/humanoids/human/scream/femalescream_5.ogg',
)
code/modules/mob/living/basic/ruin_defender/cybersun_aicore.dm
+4 -4
View File
@@ -77,7 +77,7 @@
///dramatic death animations
var/turf/my_turf = get_turf(src)
new /obj/effect/gibspawner/robot(my_turf)
playsound(loc, 'sound/effects/explosion2.ogg', vol = 75, vary = TRUE, pressure_affected = FALSE)
playsound(loc, 'sound/effects/explosion/explosion2.ogg', vol = 75, vary = TRUE, pressure_affected = FALSE)
for (var/mob/witness in range(10, src))
if (!witness.client || !isliving(witness))
continue
@@ -119,7 +119,7 @@
. = ..()
//this is where the spell will hit. it will not move even if the target does, allowing the spell to be dodged.
new/obj/effect/temp_visual/lightning_strike(get_turf(target))
playsound(owner, 'sound/effects/sparks1.ogg', vol = 120, vary = TRUE)
playsound(owner, 'sound/effects/sparks/sparks1.ogg', vol = 120, vary = TRUE)
/obj/effect/temp_visual/lightning_strike
name = "lightning strike"
@@ -142,7 +142,7 @@
/obj/effect/temp_visual/lightning_strike/proc/zap()
new/obj/effect/temp_visual/lightning_strike_zap(loc)
playsound(src, 'sound/magic/lightningbolt.ogg', vol = 70, vary = TRUE)
playsound(src, 'sound/effects/magic/lightningbolt.ogg', vol = 70, vary = TRUE)
if (!isturf(loc))
return
for(var/mob/living/victim in loc)
@@ -188,7 +188,7 @@
if(lockon_zone == my_turf)
return
my_turf.Beam(lockon_zone, icon_state = "1-full", beam_color = COLOR_MEDIUM_DARK_RED, time = barrage_delay)
playsound(lockon_zone, 'sound/machines/terminal_prompt_deny.ogg', vol = 60, vary = TRUE)
playsound(lockon_zone, 'sound/machines/terminal/terminal_prompt_deny.ogg', vol = 60, vary = TRUE)
StartCooldown(cooldown_time)
return ..()
code/modules/mob/living/basic/ruin_defender/flesh.dm
+1 -1
View File
@@ -25,7 +25,7 @@
melee_damage_upper = 10
health = 20
maxHealth = 20
attack_sound = 'sound/weapons/bite.ogg'
attack_sound = 'sound/items/weapons/bite.ogg'
attack_vis_effect = ATTACK_EFFECT_BITE
attack_verb_continuous = "tries desperately to attach to"
attack_verb_simple = "try to attach to"
code/modules/mob/living/basic/ruin_defender/living_floor.dm
+2 -2
View File
@@ -40,7 +40,7 @@
faction = list(FACTION_HOSTILE)
melee_damage_lower = 20
melee_damage_upper = 40 //pranked.....
attack_sound = 'sound/weapons/bite.ogg'
attack_sound = 'sound/items/weapons/bite.ogg'
attack_vis_effect = ATTACK_EFFECT_BITE
attack_verb_continuous = "bites"
attack_verb_simple = "bite"
@@ -84,7 +84,7 @@
if(weapon.tool_behaviour != TOOL_CROWBAR)
return ..()
balloon_alert(user, "prying...")
playsound(src, 'sound/items/crowbar.ogg', 45, TRUE)
playsound(src, 'sound/items/tools/crowbar.ogg', 45, TRUE)
if(!do_after(user, 5 SECONDS, src))
return
new /obj/effect/gibspawner/generic(loc)
code/modules/mob/living/basic/ruin_defender/skeleton.dm
+4 -4
View File
@@ -15,7 +15,7 @@
unsuitable_heat_damage = 0
attack_verb_continuous = "slashes"
attack_verb_simple = "slash"
attack_sound = 'sound/weapons/slash.ogg'
attack_sound = 'sound/items/weapons/slash.ogg'
attack_vis_effect = ATTACK_EFFECT_CLAW
faction = list(FACTION_SKELETON)
// Going for a sort of pale bluegreen here, shooting for boneish
@@ -63,7 +63,7 @@
melee_damage_upper = 20
attack_verb_continuous = "jabs"
attack_verb_simple = "jab"
attack_sound = 'sound/weapons/bladeslice.ogg'
attack_sound = 'sound/items/weapons/bladeslice.ogg'
attack_vis_effect = ATTACK_EFFECT_SLASH
death_message = "collapses into a pile of bones, its gear falling to the floor!"
loot = list(
@@ -92,7 +92,7 @@
melee_damage_upper = 30
attack_verb_continuous = "slices"
attack_verb_simple = "slice"
attack_sound = 'sound/weapons/bladeslice.ogg'
attack_sound = 'sound/items/weapons/bladeslice.ogg'
attack_vis_effect = ATTACK_EFFECT_SLASH
death_message = "collapses into a pile of bones, its gear clanging as it hits the ground!"
loot = list(
@@ -146,7 +146,7 @@
melee_damage_upper = 25
attack_verb_continuous = "blasts"
attack_verb_simple = "blast"
attack_sound = 'sound/weapons/sonic_jackhammer.ogg'
attack_sound = 'sound/items/weapons/sonic_jackhammer.ogg'
attack_vis_effect = null
loot = list(/obj/effect/decal/remains/plasma, /obj/item/pickaxe/drill/jackhammer)
held_item = /obj/item/pickaxe/drill/jackhammer
code/modules/mob/living/basic/ruin_defender/stickman.dm
+3 -3
View File
@@ -14,7 +14,7 @@
melee_damage_lower = 10
melee_damage_upper = 10
melee_attack_cooldown = 1.5 SECONDS
attack_sound = 'sound/weapons/punch1.ogg'
attack_sound = 'sound/items/weapons/punch1.ogg'
combat_mode = TRUE
faction = list(FACTION_STICKMAN)
unsuitable_atmos_damage = 7.5
@@ -54,7 +54,7 @@
attack_vis_effect = ATTACK_EFFECT_BITE
sharpness = SHARP_POINTY
mob_biotypes = MOB_BEAST
attack_sound = 'sound/weapons/bite.ogg'
attack_sound = 'sound/items/weapons/bite.ogg'
/mob/living/basic/stickman/ranged
name = "Angry Stick Gunman"
@@ -65,7 +65,7 @@
attack_verb_simple = "whack"
melee_damage_lower = 5
melee_damage_upper = 5
attack_sound = 'sound/weapons/genhit1.ogg'
attack_sound = 'sound/items/weapons/genhit1.ogg'
ai_controller = /datum/ai_controller/basic_controller/stickman/ranged
code/modules/mob/living/basic/ruin_defender/wizard/wizard.dm
+1 -1
View File
@@ -14,7 +14,7 @@
melee_damage_upper = 5
attack_verb_continuous = "punches"
attack_verb_simple = "punch"
attack_sound = 'sound/weapons/punch1.ogg'
attack_sound = 'sound/items/weapons/punch1.ogg'
combat_mode = TRUE
habitable_atmos = list("min_oxy" = 5, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0)
unsuitable_atmos_damage = 7.5
code/modules/mob/living/basic/slime/defense.dm
+4 -4
View File
@@ -15,11 +15,11 @@
if(buckled == attacker ? prob(60) : prob(30)) //its easier to remove the slime from yourself
attacker.visible_message(span_warning("[attacker] attempts to wrestle \the [defender_slime.name] off [buckled == attacker ? "" : buckled] !"), \
span_danger("[buckled == attacker ? "You attempt" : "[attacker] attempts" ] to wrestle \the [defender_slime.name] off [buckled == attacker ? "" : buckled]!"))
playsound(loc, 'sound/weapons/punchmiss.ogg', 25, TRUE, -1)
playsound(loc, 'sound/items/weapons/punchmiss.ogg', 25, TRUE, -1)
return
attacker.visible_message(span_warning("[attacker] manages to wrestle \the [defender_slime.name] off!"), span_notice("You manage to wrestle \the [defender_slime.name] off!"))
playsound(loc, 'sound/weapons/shove.ogg', 50, TRUE, -1)
playsound(loc, 'sound/items/weapons/shove.ogg', 50, TRUE, -1)
defender_slime.discipline_slime()
@@ -87,7 +87,7 @@
has_found = TRUE
if(applied_crossbreed_amount >= SLIME_EXTRACT_CROSSING_REQUIRED)
to_chat(user, span_notice("You feed the slime as many of the extracts from the bag as you can, and it mutates!"))
playsound(src, 'sound/effects/attackblob.ogg', 50, TRUE)
playsound(src, 'sound/effects/blob/attackblob.ogg', 50, TRUE)
spawn_corecross()
has_output = TRUE
break
@@ -99,7 +99,7 @@
to_chat(user, span_warning("There are no extracts in the bag that this slime will accept!"))
else
to_chat(user, span_notice("You feed the slime some extracts from the bag."))
playsound(src, 'sound/effects/attackblob.ogg', 50, TRUE)
playsound(src, 'sound/effects/blob/attackblob.ogg', 50, TRUE)
///Handles the adverse effects of water on slimes
/mob/living/basic/slime/proc/apply_water()
code/modules/mob/living/basic/slime/slime.dm
+2 -2
View File
@@ -14,7 +14,7 @@
icon_living = "grey-baby"
icon_dead = "grey-baby-dead"
attack_sound = 'sound/weapons/bite.ogg'
attack_sound = 'sound/items/weapons/bite.ogg'
//Base physiology
@@ -353,7 +353,7 @@
/mob/living/basic/slime/proc/spawn_corecross()
var/static/list/crossbreeds = subtypesof(/obj/item/slimecross)
visible_message(span_danger("[src] shudders, its mutated core consuming the rest of its body!"))
playsound(src, 'sound/magic/smoke.ogg', 50, TRUE)
playsound(src, 'sound/effects/magic/smoke.ogg', 50, TRUE)
var/selected_crossbreed_path
for(var/crossbreed_path in crossbreeds)
var/obj/item/slimecross/cross_item = crossbreed_path
code/modules/mob/living/basic/space_fauna/ant.dm
+1 -1
View File
@@ -15,7 +15,7 @@
melee_damage_upper = 10
attack_verb_continuous = "bites"
attack_verb_simple = "bite"
attack_sound = 'sound/weapons/bite.ogg'
attack_sound = 'sound/items/weapons/bite.ogg'
attack_vis_effect = ATTACK_EFFECT_BITE
butcher_results = list(/obj/effect/decal/cleanable/ants = 3) //It's just a bunch of ants glued together into a larger ant
response_help_continuous = "pets"
code/modules/mob/living/basic/space_fauna/bear/_bear.dm
+2 -2
View File
@@ -26,7 +26,7 @@
sharpness = SHARP_EDGED
attack_verb_continuous = "claws"
attack_verb_simple = "claw"
attack_sound = 'sound/weapons/bladeslice.ogg'
attack_sound = 'sound/items/weapons/bladeslice.ogg'
attack_vis_effect = ATTACK_EFFECT_CLAW
friendly_verb_continuous = "bear hugs"
friendly_verb_simple = "bear hug"
@@ -135,7 +135,7 @@
attacked_sound = 'sound/items/eatfood.ogg'
death_message = "loses its false life and collapses!"
butcher_results = list(/obj/item/food/butter = 6, /obj/item/food/meat/slab = 3, /obj/item/organ/internal/brain = 1, /obj/item/organ/internal/heart = 1)
attack_sound = 'sound/weapons/slap.ogg'
attack_sound = 'sound/items/weapons/slap.ogg'
attack_vis_effect = ATTACK_EFFECT_DISARM
attack_verb_simple = "slap"
attack_verb_continuous = "slaps"
code/modules/mob/living/basic/space_fauna/carp/carp.dm
+1 -1
View File
@@ -27,7 +27,7 @@
obj_damage = 50
melee_damage_lower = 20
melee_damage_upper = 20
attack_sound = 'sound/weapons/bite.ogg'
attack_sound = 'sound/items/weapons/bite.ogg'
attack_vis_effect = ATTACK_EFFECT_BITE
attack_verb_continuous = "bites"
attack_verb_simple = "bite"
code/modules/mob/living/basic/space_fauna/carp/carp_abilities.dm
+3 -3
View File
@@ -9,7 +9,7 @@
button_icon = 'icons/obj/weapons/guns/projectiles.dmi'
button_icon_state = "arcane_barrage"
cooldown_time = 5 SECONDS
projectile_sound = 'sound/weapons/emitter.ogg'
projectile_sound = 'sound/items/weapons/emitter.ogg'
melee_cooldown_time = 0 SECONDS // Without this they become extremely hesitant to bite anyone ever
shared_cooldown = MOB_SHARED_COOLDOWN_2
@@ -140,8 +140,8 @@
var/turf/destination = pick(exit_locs)
do_teleport(entered_atom, destination, channel = TELEPORT_CHANNEL_MAGIC)
playsound(src, 'sound/magic/wand_teleport.ogg', 50)
playsound(destination, 'sound/magic/wand_teleport.ogg', 50)
playsound(src, 'sound/effects/magic/wand_teleport.ogg', 50)
playsound(destination, 'sound/effects/magic/wand_teleport.ogg', 50)
/// Doesn't actually do anything, just a visual marker
/obj/effect/temp_visual/lesser_carp_rift/exit
code/modules/mob/living/basic/space_fauna/cat_surgeon.dm
+1 -1
View File
@@ -19,7 +19,7 @@
melee_damage_upper = 15
attack_verb_continuous = "slashes at"
attack_verb_simple = "slash at"
attack_sound = 'sound/weapons/circsawhit.ogg'
attack_sound = 'sound/items/weapons/circsawhit.ogg'
combat_mode = TRUE
mob_biotypes = MOB_ORGANIC|MOB_HUMANOID
sentience_type = SENTIENCE_HUMANOID
code/modules/mob/living/basic/space_fauna/changeling/flesh_spider.dm
+1 -1
View File
@@ -28,7 +28,7 @@
melee_attack_cooldown = CLICK_CD_MELEE
attack_verb_continuous = "bites"
attack_verb_simple = "bite"
attack_sound = 'sound/weapons/bite.ogg'
attack_sound = 'sound/items/weapons/bite.ogg'
attack_vis_effect = ATTACK_EFFECT_BITE
unsuitable_cold_damage = 4
unsuitable_heat_damage = 4
code/modules/mob/living/basic/space_fauna/changeling/headslug.dm
+1 -1
View File
@@ -16,7 +16,7 @@
melee_damage_upper = 5
attack_verb_continuous = "chomps"
attack_verb_simple = "chomp"
attack_sound = 'sound/weapons/bite.ogg'
attack_sound = 'sound/items/weapons/bite.ogg'
attack_vis_effect = ATTACK_EFFECT_BITE
mob_biotypes = MOB_ORGANIC|MOB_SPECIAL
faction = list(FACTION_CREATURE)
code/modules/mob/living/basic/space_fauna/demon/demon.dm
+3 -3
View File
@@ -23,7 +23,7 @@
status_flags = CANPUSH
combat_mode = TRUE
attack_sound = 'sound/magic/demon_attack1.ogg'
attack_sound = 'sound/effects/magic/demon_attack1.ogg'
attack_vis_effect = ATTACK_EFFECT_CLAW
faction = list(FACTION_HELL)
@@ -34,7 +34,7 @@
melee_damage_upper = 15
melee_attack_cooldown = CLICK_CD_MELEE
death_message = "screams in agony as it sublimates into a sulfurous smoke."
death_sound = 'sound/magic/demon_dies.ogg'
death_sound = 'sound/effects/magic/demon_dies.ogg'
habitable_atmos = null
minimum_survivable_temperature = T0C - 25 //Weak to cold
@@ -70,5 +70,5 @@
mind.special_role = ROLE_SLAUGHTER_DEMON
mind.add_antag_datum(antag_type)
SEND_SOUND(src, 'sound/magic/demon_dies.ogg')
SEND_SOUND(src, 'sound/effects/magic/demon_dies.ogg')
to_chat(src, span_bold("You are currently not currently in the same plane of existence as the station. Use your Blood Crawl ability near a pool of blood to manifest and wreak havoc."))
code/modules/mob/living/basic/space_fauna/demon/demon_items.dm
+1 -1
View File
@@ -18,7 +18,7 @@
span_warning("[user] raises [src] to [user.p_their()] mouth and tears into it with [user.p_their()] teeth!"),
span_danger("An unnatural hunger consumes you. You raise [src] your mouth and devour it!"),
)
playsound(user, 'sound/magic/demon_consume.ogg', 50, TRUE)
playsound(user, 'sound/effects/magic/demon_consume.ogg', 50, TRUE)
if(locate(/datum/action/cooldown/spell/jaunt/bloodcrawl) in user.actions)
to_chat(user, span_warning("...and you don't feel any different."))
code/modules/mob/living/basic/space_fauna/eyeball/_eyeball.dm
+1 -1
View File
@@ -24,7 +24,7 @@
attack_verb_continuous = "bites"
attack_verb_simple = "bite"
attack_sound = 'sound/weapons/bite.ogg'
attack_sound = 'sound/items/weapons/bite.ogg'
attack_vis_effect = ATTACK_EFFECT_BITE
faction = list(FACTION_SPOOKY)
code/modules/mob/living/basic/space_fauna/faithless.dm
+1 -1
View File
@@ -17,7 +17,7 @@
melee_damage_upper = 15
attack_verb_continuous = "grips"
attack_verb_simple = "grip"
attack_sound = 'sound/hallucinations/growl1.ogg'
attack_sound = 'sound/effects/hallucinations/growl1.ogg'
melee_attack_cooldown = 1 SECONDS
speak_emote = list("growls")
code/modules/mob/living/basic/space_fauna/garden_gnome.dm
+1 -1
View File
@@ -16,7 +16,7 @@
melee_damage_upper = 10
attack_verb_continuous = "punches"
attack_verb_simple = "punch"
attack_sound = 'sound/weapons/punch1.ogg'
attack_sound = 'sound/items/weapons/punch1.ogg'
melee_attack_cooldown = 1.2 SECONDS
damage_coeff = list(BRUTE = 1, BURN = 1, TOX = 1, STAMINA = 0, OXY = 1)
speak_emote = list("announces")
code/modules/mob/living/basic/space_fauna/ghost.dm
+1 -1
View File
@@ -19,7 +19,7 @@
unsuitable_atmos_damage = 0
unsuitable_cold_damage = 0
unsuitable_heat_damage = 0
attack_sound = 'sound/hallucinations/growl1.ogg'
attack_sound = 'sound/effects/hallucinations/growl1.ogg'
death_message = "wails, disintegrating into a pile of ectoplasm!"
gold_core_spawnable = NO_SPAWN //too spooky for science
light_system = OVERLAY_LIGHT
code/modules/mob/living/basic/space_fauna/hivebot/_hivebot.dm
+1 -1
View File
@@ -16,7 +16,7 @@
attack_verb_continuous = "claws"
attack_verb_simple = "claw"
attack_sound = 'sound/weapons/bladeslice.ogg'
attack_sound = 'sound/items/weapons/bladeslice.ogg'
attack_vis_effect = ATTACK_EFFECT_CLAW
verb_say = "states"
verb_ask = "queries"

Some files were not shown because too many files have changed in this diff Show More