mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-21 12:04:48 +01:00
Add Cat/Corgi emotes and sounds
Organized creature sounds into creature sound folder.
This commit is contained in:
@@ -11,6 +11,7 @@
|
||||
speak_emote = list("purrs", "meows")
|
||||
emote_hear = list("meows", "mews")
|
||||
emote_see = list("shakes its head", "shivers")
|
||||
var/meow_sound = 'sound/creatures/cat_meow.ogg' //Used in emote.
|
||||
speak_chance = 1
|
||||
turns_per_move = 5
|
||||
see_in_dark = 6
|
||||
@@ -146,6 +147,40 @@
|
||||
stop_automated_movement = 1
|
||||
walk_to(src,movement_target,0,3)
|
||||
|
||||
/mob/living/simple_animal/pet/cat/emote(act, m_type=1, message = null)
|
||||
if(stat != CONSCIOUS)
|
||||
return
|
||||
|
||||
var/on_CD = 0
|
||||
act = lowertext(act)
|
||||
switch(act)
|
||||
if("meow")
|
||||
on_CD = handle_emote_CD()
|
||||
if("hiss")
|
||||
on_CD = handle_emote_CD()
|
||||
if("purr")
|
||||
on_CD = handle_emote_CD()
|
||||
else
|
||||
on_CD = 0
|
||||
|
||||
if(on_CD == 1)
|
||||
return
|
||||
|
||||
switch(act)
|
||||
if("meow")
|
||||
message = "<B>[src]</B> meows!"
|
||||
m_type = 2 //audible
|
||||
playsound(src, meow_sound, 50, 0.75)
|
||||
if("hiss")
|
||||
message = "<B>[src]</B> hisses!"
|
||||
m_type = 2
|
||||
if("purr")
|
||||
message = "<B>[src]</B> purrs."
|
||||
m_type = 2
|
||||
if("help")
|
||||
to_chat(src, "scream, meow, hiss, purr")
|
||||
|
||||
..()
|
||||
|
||||
/mob/living/simple_animal/pet/cat/Proc
|
||||
name = "Proc"
|
||||
@@ -168,6 +203,7 @@
|
||||
icon_living = "Syndicat"
|
||||
icon_dead = "Syndicat_dead"
|
||||
icon_resting = "Syndicat_rest"
|
||||
meow_sound = null //Need robo-meow.
|
||||
gender = FEMALE
|
||||
mutations = list(BREATHLESS)
|
||||
faction = list("syndicate")
|
||||
|
||||
@@ -13,6 +13,8 @@
|
||||
speak_emote = list("barks", "woofs")
|
||||
emote_hear = list("barks", "woofs", "yaps","pants")
|
||||
emote_see = list("shakes its head", "shivers")
|
||||
var/bark_sound = list('sound/creatures/dog_bark1.ogg','sound/creatures/dog_bark2.ogg') //Used in emote.
|
||||
var/yelp_sound = 'sound/creatures/dog_yelp.ogg' //Used on death.
|
||||
speak_chance = 1
|
||||
turns_per_move = 10
|
||||
butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/corgi = 3)
|
||||
@@ -394,6 +396,40 @@
|
||||
|
||||
return valid
|
||||
|
||||
/mob/living/simple_animal/pet/corgi/death(gibbed)
|
||||
playsound(src, yelp_sound, 75, 1)
|
||||
..()
|
||||
|
||||
/mob/living/simple_animal/pet/corgi/emote(act, m_type=1, message = null)
|
||||
if(stat != CONSCIOUS)
|
||||
return
|
||||
|
||||
var/on_CD = 0
|
||||
act = lowertext(act)
|
||||
switch(act)
|
||||
if("bark")
|
||||
on_CD = handle_emote_CD()
|
||||
if("growl")
|
||||
on_CD = handle_emote_CD()
|
||||
else
|
||||
on_CD = 0
|
||||
|
||||
if(on_CD == 1)
|
||||
return
|
||||
|
||||
switch(act)
|
||||
if("bark")
|
||||
message = "<B>[src]</B> [pick(src.speak_emote)]!"
|
||||
m_type = 2 //audible
|
||||
playsound(src, pick(src.bark_sound), 50, 0.85)
|
||||
if("growl")
|
||||
message = "<B>[src]</B> growls!"
|
||||
m_type = 2 //audible
|
||||
if("help")
|
||||
to_chat(src, "scream, bark, growl")
|
||||
|
||||
..()
|
||||
|
||||
|
||||
//IAN! SQUEEEEEEEEE~
|
||||
/mob/living/simple_animal/pet/corgi/Ian
|
||||
@@ -567,6 +603,8 @@
|
||||
desc = "It's a borgi."
|
||||
icon_state = "borgi"
|
||||
icon_living = "borgi"
|
||||
bark_sound = null //No robo-bjork...
|
||||
yelp_sound = null //Or robo-Yelp.
|
||||
var/emagged = 0
|
||||
atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
|
||||
minbodytemp = 0
|
||||
|
||||
@@ -32,7 +32,7 @@
|
||||
melee_damage_upper = 8
|
||||
attacktext = "bites"
|
||||
attack_sound = 'sound/weapons/bite.ogg'
|
||||
var/chirp_sound = 'sound/misc/nymphchirp.ogg' //used in emote
|
||||
var/chirp_sound = 'sound/creatures/nymphchirp.ogg' //used in emote
|
||||
|
||||
speed = 0
|
||||
stop_automated_movement = 0
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
speak_emote = list("squeeks","squeaks","squiks")
|
||||
emote_hear = list("squeeks","squeaks","squiks")
|
||||
emote_see = list("runs in a circle", "shakes", "scritches at something")
|
||||
var/squeak_sound = 'sound/effects/mousesqueek.ogg'
|
||||
var/squeak_sound = 'sound/creatures/mousesqueak.ogg'
|
||||
speak_chance = 1
|
||||
turns_per_move = 5
|
||||
see_in_dark = 6
|
||||
@@ -72,7 +72,6 @@
|
||||
desc = "It's a small [mouse_color] rodent, often seen hiding in maintenance areas and making a nuisance of itself."
|
||||
|
||||
/mob/living/simple_animal/mouse/proc/splat()
|
||||
playsound(src, squeak_sound, 40, 1)
|
||||
src.health = 0
|
||||
src.stat = DEAD
|
||||
src.icon_dead = "mouse_[mouse_color]_splat"
|
||||
@@ -100,6 +99,7 @@
|
||||
|
||||
/mob/living/simple_animal/mouse/death(gibbed)
|
||||
// Only execute the below if we successfully died
|
||||
playsound(src, squeak_sound, 40, 1)
|
||||
. = ..(gibbed)
|
||||
if(!.)
|
||||
return FALSE
|
||||
|
||||
Reference in New Issue
Block a user