cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-20 19:44:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

upports syndicate pai pet from chomp and emag behaviors (#19249)

Browse Source 
* upporting syndicate pai pet

* tgui data

* don't emag cards without a pai

* aaugghh

* allow bingle pai, pai counts for lonely

* modular computers

* fix that

* .

* emag

* that'S fine

* pai card as antag tools

* .

* trashcatch

* that

* .

* only show emag chassis if we have a toolkit too

* .

* .

---------

Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
Will
2026-03-05 15:53:36 -05:00
committed by GitHub
parent cfd9a46036
commit 14e23e07f0
42 changed files with 453 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/components/traits/crowd_detection.dm
+5 -1
View File
@@ -96,7 +96,7 @@
var/list/in_range = list()
if(!istype(M))
return in_range
var/social_check = only_people && !istype(M, /mob/living/carbon) && !istype(M, /mob/living/silicon/robot)
var/social_check = only_people && !istype(M, /mob/living/carbon) && !istype(M, /mob/living/silicon/robot) && !istype(M, /mob/living/silicon/pai)
var/self_invisible_check = M == human_parent || M.invisibility > human_parent.see_invisible
var/ckey_check = only_people && !M.ckey
var/overall_checks = M == human_parent || M.stat == DEAD || social_check || ckey_check
@@ -199,6 +199,10 @@
for(var/obj/item/toy/plushie/teshari/P in range(5, human_parent))
calm_discomfort()
return
for(var/obj/item/paicard/P in range(5, human_parent))
if(P.pai && !P.pai.stat && P.pai.client) // Must have pai and it must be alive
calm_discomfort()
return
increase_discomfort()