cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 18:32:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Posibrains emote oversights (#19208)

Browse Source 
* Posibrains emote oversights

* Whoops

* "Helpers"
This commit is contained in:
ShiftyRail
2018-08-08 22:55:45 +02:00
committed by jknpj
parent 62aac2e22b
commit bea206fad7
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/mob/emote.dm
View File

@@ -19,7 +19,7 @@
key_third_person = "flips" key_third_person = "flips"
restraint_check = TRUE restraint_check = TRUE
mob_type_allowed_typelist = list(/mob/living, /mob/dead/observer) mob_type_allowed_typelist = list(/mob/living, /mob/dead/observer)
mob_type_blacklist_typelist = list(/mob/living/silicon/ai, /mob/living/silicon/pai) mob_type_blacklist_typelist = list(/mob/living/silicon/ai, /mob/living/silicon/pai, /mob/living/carbon/brain)
mob_type_ignore_stat_typelist = list(/mob/dead/observer) mob_type_ignore_stat_typelist = list(/mob/dead/observer)
/datum/emote/flip/run_emote(mob/user, params) /datum/emote/flip/run_emote(mob/user, params)
@@ -36,7 +36,7 @@
key_third_person = "spins" key_third_person = "spins"
restraint_check = TRUE restraint_check = TRUE
mob_type_allowed_typelist = list(/mob/living, /mob/dead/observer) mob_type_allowed_typelist = list(/mob/living, /mob/dead/observer)
mob_type_blacklist_typelist = list(/mob/living/silicon/ai, /mob/living/silicon/pai) mob_type_blacklist_typelist = list(/mob/living/silicon/ai, /mob/living/silicon/pai, /mob/living/carbon/brain)
mob_type_ignore_stat_typelist = list(/mob/dead/observer) mob_type_ignore_stat_typelist = list(/mob/dead/observer)
/datum/emote/spin/run_emote(mob/user) /datum/emote/spin/run_emote(mob/user)

4
code/modules/mob/living/silicon/emote.dm
View File

@@ -5,13 +5,15 @@
var/pai_software_required var/pai_software_required
/datum/emote/sound/silicon /datum/emote/sound/silicon
mob_type_allowed_typelist = list(/mob/living/silicon) mob_type_allowed_typelist = list(/mob/living/silicon, /mob/living/carbon/brain)
emote_type = EMOTE_AUDIBLE emote_type = EMOTE_AUDIBLE
var/module_quirk_required var/module_quirk_required
var/pai_software_required var/pai_software_required
/datum/emote/sound/silicon/can_run_emote(var/mob/user, var/status_check = TRUE) /datum/emote/sound/silicon/can_run_emote(var/mob/user, var/status_check = TRUE)
. = ..() . = ..()
if (. && isbrain(user) && !module_quirk_required)
return TRUE
if (. && isAI(user) && !module_quirk_required) if (. && isAI(user) && !module_quirk_required)
return TRUE return TRUE
var/mob/living/silicon/pai/the_pai = user var/mob/living/silicon/pai/the_pai = user