Revert "Fixes SSMobs Shattering due to Proteans"

This reverts commit aa9c0c566c.
This commit is contained in:
Aronai Sieyes
2021-05-11 13:27:43 -04:00
parent 87127f81a8
commit f3d8c04216
12 changed files with 20 additions and 14 deletions
+2 -2
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(skip_emote_update = TRUE))
if(istype(user) && !user.isSynthetic())
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(skip_emote_update = TRUE))
if(istype(user) && user.isSynthetic())
return ..()
return FALSE
+7 -1
View File
@@ -1,5 +1,11 @@
/decl/emote/human
key = "vomit"
/decl/emote/human/check_user(var/mob/living/carbon/human/user)
return istype(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()
/decl/emote/human/deathgasp
key = "deathgasp"
@@ -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(skip_emote_update = TRUE))
if(istype(user) && user.isSynthetic())
return ..()
return FALSE
@@ -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(skip_emote_update = TRUE))
if(!M.isSynthetic())
M.vomit()
return
to_chat(src, SPAN_WARNING("You are unable to vomit."))
+1 -1
View File
@@ -172,7 +172,7 @@
return key
/decl/emote/proc/check_synthetic(var/mob/living/user)
. = istype(user) && user.isSynthetic(skip_emote_update = TRUE)
. = istype(user) && user.isSynthetic()
if(!. && ishuman(user) && message_type == AUDIBLE_MESSAGE)
var/mob/living/carbon/human/H = user
if(H.should_have_organ(O_LUNGS))