mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 10:43:20 +00:00
Fixes SSMobs Shattering due to Proteans
Port of https://github.com/PolarisSS13/Polaris/pull/8073
This commit is contained in:
@@ -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
|
||||
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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."))
|
||||
|
||||
@@ -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))
|
||||
|
||||
@@ -457,5 +457,5 @@
|
||||
return 0
|
||||
|
||||
|
||||
/mob/living/bot/isSynthetic() //Robots are synthetic, no?
|
||||
/mob/living/bot/isSynthetic(var/skip_emote_update) //Robots are synthetic, no?
|
||||
return 1
|
||||
|
||||
@@ -42,7 +42,7 @@
|
||||
canmove = 0
|
||||
return canmove
|
||||
|
||||
/mob/living/carbon/brain/isSynthetic()
|
||||
/mob/living/carbon/brain/isSynthetic(var/skip_emote_update)
|
||||
return istype(loc, /obj/item/device/mmi)
|
||||
|
||||
/mob/living/carbon/brain/set_typing_indicator(var/state)
|
||||
|
||||
@@ -33,7 +33,6 @@ var/list/_human_default_emotes = list(
|
||||
/decl/emote/audible/grunt,
|
||||
/decl/emote/audible/slap,
|
||||
/decl/emote/audible/crack,
|
||||
/decl/emote/human,
|
||||
/decl/emote/human/deathgasp,
|
||||
/decl/emote/audible/giggle,
|
||||
/decl/emote/audible/scream,
|
||||
|
||||
@@ -97,7 +97,7 @@
|
||||
|
||||
// This is the 'mechanical' check for synthetic-ness, not appearance
|
||||
// Returns the company that made the synthetic
|
||||
/mob/living/carbon/human/isSynthetic()
|
||||
/mob/living/carbon/human/isSynthetic(var/skip_emote_update)
|
||||
if(synthetic)
|
||||
return synthetic //Your synthetic-ness is not going away
|
||||
var/obj/item/organ/external/T = organs_by_name[BP_TORSO]
|
||||
@@ -108,6 +108,7 @@
|
||||
src.verbs += /mob/living/carbon/human/proc/setmonitor_state
|
||||
var/datum/robolimb/R = all_robolimbs[T.model]
|
||||
synthetic = R
|
||||
if(!skip_emote_update)
|
||||
update_emotes()
|
||||
return synthetic
|
||||
return FALSE
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
poison_resist = 1.0
|
||||
shock_resist = -0.5
|
||||
|
||||
/mob/living/simple_mob/mechanical/isSynthetic()
|
||||
/mob/living/simple_mob/mechanical/isSynthetic(var/skip_emote_update)
|
||||
return TRUE
|
||||
|
||||
/mob/living/simple_mob/mechanical/speech_bubble_appearance()
|
||||
|
||||
@@ -1073,7 +1073,7 @@ mob/verb/shifteast()
|
||||
if(src.throw_icon)
|
||||
src.throw_icon.icon_state = "act_throw_on"
|
||||
|
||||
/mob/proc/isSynthetic()
|
||||
/mob/proc/isSynthetic(var/skip_emote_update)
|
||||
return 0
|
||||
|
||||
/mob/proc/is_muzzled()
|
||||
|
||||
@@ -33,7 +33,7 @@
|
||||
return L.mob_size <= MOB_MINISCULE
|
||||
return 0
|
||||
|
||||
/mob/living/silicon/isSynthetic()
|
||||
/mob/living/silicon/isSynthetic(var/skip_emote_update)
|
||||
return 1
|
||||
|
||||
/mob/proc/isMonkey()
|
||||
|
||||
Reference in New Issue
Block a user