cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-24 12:37:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into solgov_ERT

Browse Source
This commit is contained in:
S34NW
2021-07-10 15:43:33 +01:00
parent b8ff112b43 52e86bd0ed
commit 59938c00e5
212 changed files with 1812 additions and 2443 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/tgui/modules/crew_monitor.dm
+1
View File
@@ -38,5 +38,6 @@
data["isAI"] = isAI(user)
data["crewmembers"] = GLOB.crew_repository.health_data(T)
data["critThreshold"] = HEALTH_THRESHOLD_CRIT
return data
code/modules/tgui/states.dm
+1 -1
View File
@@ -113,6 +113,6 @@
return STATUS_CLOSE // Otherwise, we got nothing.
/mob/living/carbon/human/shared_living_ui_distance(atom/movable/src_object)
if(dna.GetSEState(GLOB.teleblock) && (get_dist(src, src_object) <= 2))
if(HAS_TRAIT(src, TRAIT_TELEKINESIS) && (get_dist(src, src_object) <= 2))
return STATUS_INTERACTIVE
return ..()