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

Fixes SSMobs Shattering due to Proteans

Browse Source 
Port of https://github.com/PolarisSS13/Polaris/pull/8073
This commit is contained in:
Unknown
2021-05-11 01:46:57 -04:00
committed by Shadow-Quill
parent 8d92f1037b
commit fd3a02f318
12 changed files with 14 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,7 +5,7 @@
emote_message_3p = "is sweating heavily."
/decl/emote/exertion/biological/check_user(mob/living/user)
if(istype(user) && !user.isSynthetic())
if(istype(user) && !user.isSynthetic(skip_emote_update = TRUE))
return ..()
return FALSE
@@ -30,7 +30,7 @@
emote_message_3p = "USER's actuators whine with strain."
/decl/emote/exertion/synthetic/check_user(mob/living/user)
if(istype(user) && user.isSynthetic())
if(istype(user) && user.isSynthetic(skip_emote_update = TRUE))
return ..()
return FALSE

8
code/modules/emotes/definitions/human.dm
View File

@@ -1,11 +1,5 @@
/decl/emote/human
key = "vomit"
/decl/emote/human/check_user(var/mob/living/carbon/human/user)
return (istype(user))//VOREStation Edit - What does a mouth have to do with wagging?? && user.check_has_mouth() && !user.isSynthetic())
/decl/emote/human/do_emote(var/mob/living/carbon/human/user)
user.vomit()
return istype(user)
/decl/emote/human/deathgasp
key = "deathgasp"

2
code/modules/emotes/definitions/synthetics.dm
View File

@@ -4,7 +4,7 @@
emote_sound = 'sound/machines/twobeep.ogg'
/decl/emote/audible/synth/check_user(var/mob/living/user)
if(istype(user) && user.isSynthetic())
if(istype(user) && user.isSynthetic(skip_emote_update = TRUE))
return ..()
return FALSE

2
code/modules/emotes/definitions/visible_vomit.dm
View File

@@ -4,7 +4,7 @@
/decl/emote/visible/vomit/do_emote(var/atom/user, var/extra_params)
if(isliving(user))
var/mob/living/M = user
if(!M.isSynthetic())
if(!M.isSynthetic(skip_emote_update = TRUE))
M.vomit()
return
to_chat(src, SPAN_WARNING("You are unable to vomit."))

2
code/modules/emotes/emote_define.dm
View File

@@ -172,7 +172,7 @@
return key
/decl/emote/proc/check_synthetic(var/mob/living/user)
. = istype(user) && user.isSynthetic()
. = istype(user) && user.isSynthetic(skip_emote_update = TRUE)
if(!. && ishuman(user) && message_type == AUDIBLE_MESSAGE)
var/mob/living/carbon/human/H = user
if(H.should_have_organ(O_LUNGS))