cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14504 from Very-Soft/misc_fixes

Browse Source 
Misc fixes
This commit is contained in:
Casey
2023-02-17 14:22:17 -05:00
committed by CHOMPStation2
parent ddedbf2a8c
commit b82736dc53
12 changed files with 62 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/emotes/definitions/audible_furry_vr.dm
View File

@@ -198,6 +198,10 @@
emote_sound = pick(smolsound)
else
emote_sound = pick(bigsound)
else if(istype(user, /mob/living/silicon/pai))
var/mob/living/silicon/pai/me = user
if(me.chassis == "teppi")
emote_sound = pick(bigsound)
else if(user.size_multiplier >= 1.5)
emote_sound = pick(bigsound)
else

9
code/modules/emotes/definitions/audible_snap.dm
View File

@@ -13,7 +13,14 @@
var/obj/item/organ/external/L = H.get_organ(limb)
if(istype(L) && L.is_usable() && !L.splinted)
return TRUE
return FALSE
else if(isanimal(user)) //VOREStation Addition Start
var/mob/living/simple_mob/S = user
if(S.has_hands)
return TRUE
else if(ispAI(user))
return TRUE
else //VOREStation Addition End
return FALSE
/decl/emote/audible/snap/do_emote(var/atom/user, var/extra_params)
if(!can_snap(user))