From c93754dff0f5b4832e630f61d23c18cba691ef21 Mon Sep 17 00:00:00 2001 From: Reo Lozzot <84661000+ReoDaProtovali@users.noreply.github.com> Date: Fri, 15 Mar 2024 07:50:16 -0500 Subject: [PATCH] Gives Synx simplemobs more emotes (and scugs can wawa) (#7964) --- .../mob/living/simple_animal/aliens/synx.dm | 23 +++++++++++++++---- .../modules/mob/living/simple_mob/catslug.dm | 4 ++++ vorestation.dme | 1 + 3 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 modular_chomp/code/modules/mob/living/simple_mob/catslug.dm diff --git a/modular_chomp/code/modules/mob/living/simple_animal/aliens/synx.dm b/modular_chomp/code/modules/mob/living/simple_animal/aliens/synx.dm index cc28daf603..875212ca73 100644 --- a/modular_chomp/code/modules/mob/living/simple_animal/aliens/synx.dm +++ b/modular_chomp/code/modules/mob/living/simple_animal/aliens/synx.dm @@ -89,10 +89,15 @@ has_hands = 1 pass_flags = PASSTABLE + /* response_help = "pokes the synx, shifting the fur-like bristles on its body." response_disarm = "gently pushes aside the synx, dislodging a clump of bristly hair in your hand. The substance quickly melts upon contact with your sweat." response_harm = "tries to hit the synx. This tears out an area of fur which firmly melts upon contact, covering you in something sticky." - + */ + // I dont think the person who wrote the above descriptions realized what they were used for, because they dont work at all. Leaving these commented incase someone wants to reimplement this properly someday. + response_help = "pokes" + response_disarm = "awkwardly shoves" + //Leaving response_harm the same as default; "hits". melee_damage_lower = SYNX_LOWER_DAMAGE //Massive damage reduction, will be balanced with toxin injection/ //LO- Made up for in skills. Toxin injection does not technically cause damage with these guys. Stomach acid does when they disegage their stomach from their mouths does, but that could be done differently. melee_damage_upper = SYNX_UPPER_DAMAGE @@ -124,7 +129,7 @@ vore_digest_chance = 45 // Chance to switch to digest mode if resisted vore_absorb_chance = 0 vore_escape_chance = 10 - vore_icons = 0 //no vore icons //TODO: Implement these, I have the sprites done but they're unnecessary for core function rn and I'd rather get this into a working state first -Azel + vore_icons = SA_ICON_LIVING //no vore icons //TODO: Implement these, I have the sprites done but they're unnecessary for core function rn and I'd rather get this into a working state first -Azel swallowTime = 6 SECONDS //Enter the eel you nerd //Shouldn't be affected by lack of atmos, it's a space eel. //nah lets give him some temperature @@ -141,11 +146,14 @@ max_n2 = 0 //Maybe add a max // TODO: Set a max temperature of about 20-30 above room temperatures. Synx don't like the heat. +/mob/living/simple_mob/animal/synx/get_available_emotes() + . = ..() + . |= _human_default_emotes //Synx are great at mimicking + /mob/living/simple_mob/animal/synx/ai //AI controlled variant ai_holder_type = /datum/ai_holder/simple_mob/retaliate - /mob/living/simple_mob/animal/synx/init_vore() if(!voremob_loaded) return @@ -598,7 +606,14 @@ /mob/living/simple_mob/animal/synx/update_icon() update_fullness() build_icons() - + for(var/belly_class in vore_fullness_ex) + var/vs_fullness = vore_fullness_ex[belly_class] + if(vs_fullness > 0) + if(transformed) + //transformed bellysprites dont exist yet. Uncomment this when they do. -Reo + //add_overlay("[iconstate]-t_[belly_class]-[vs_fullness]") + else + add_overlay("[icon_state]_[belly_class]-[vs_fullness]") /mob/living/simple_mob/animal/synx/proc/build_icons(var/random) diff --git a/modular_chomp/code/modules/mob/living/simple_mob/catslug.dm b/modular_chomp/code/modules/mob/living/simple_mob/catslug.dm new file mode 100644 index 0000000000..a0f1ae1166 --- /dev/null +++ b/modular_chomp/code/modules/mob/living/simple_mob/catslug.dm @@ -0,0 +1,4 @@ +//Scug go wawa +/mob/living/simple_mob/animal/synx/get_available_emotes() + . = ..() + . |= /decl/emote/audible/wawa diff --git a/vorestation.dme b/vorestation.dme index bacedb93ae..1576ab1b1d 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -4821,6 +4821,7 @@ #include "modular_chomp\code\modules\mob\living\silicon\robot\sprites\security.dm" #include "modular_chomp\code\modules\mob\living\simple_animal\aliens\synx.dm" #include "modular_chomp\code\modules\mob\living\simple_mob\butchering.dm" +#include "modular_chomp\code\modules\mob\living\simple_mob\catslug.dm" #include "modular_chomp\code\modules\mob\living\simple_mob\donteatbossmonsters.dm" #include "modular_chomp\code\modules\mob\living\simple_mob\simple_mob.dm" #include "modular_chomp\code\modules\mob\living\simple_mob\simple_mob_abilities.dm"