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

Merge branch 'master' into upstream-merge-6882

Browse Source
This commit is contained in:
Novacat
2020-03-23 23:25:26 -04:00
committed by GitHub
parent 61bde5ddc7 94f5eda84c
commit 4b2b3b3a2f
38 changed files with 258 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/defib.dm
+1 -1
View File
@@ -495,7 +495,7 @@
living_mob_list += M
M.timeofdeath = 0
M.stat = UNCONSCIOUS //Life() can bring them back to consciousness if it needs to.
M.set_stat(UNCONSCIOUS) //Life() can bring them back to consciousness if it needs to.
M.failed_last_breath = 0 //So mobs that died of oxyloss don't revive and have perpetual out of breath.
M.reload_fullscreen()
code/game/objects/items/robot/robot_upgrades.dm
+1 -1
View File
@@ -66,7 +66,7 @@
if(ghost.mind && ghost.mind.current == R)
R.key = ghost.key
R.stat = CONSCIOUS
R.set_stat(CONSCIOUS)
dead_mob_list -= R
living_mob_list |= R
R.notify_ai(ROBOT_NOTIFICATION_NEW_UNIT)