cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into dev-freeze

Browse Source 
Conflicts:
	code/modules/mob/living/silicon/ai/life.dm
This commit is contained in:
PsiOmegaDelta
2015-07-01 22:35:00 +02:00
parent 791b9eb27d 30d0f3d783
commit 977ed13e14
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/mob/living/silicon/ai/life.dm
View File

@@ -5,10 +5,9 @@
//Being dead doesn't mean your temperature never changes //Being dead doesn't mean your temperature never changes
var/turf/T = get_turf(src) var/turf/T = get_turf(src)
if (src.stat!=0) if (src.stat!=CONSCIOUS)
src.cameraFollow = null src.cameraFollow = null
src.reset_view(null) src.reset_view(null)
src.unset_machine()
src.updatehealth() src.updatehealth()
@@ -20,9 +19,6 @@
if(!psupply) if(!psupply)
create_powersupply() create_powersupply()
if (src.machine)
if (!( src.machine.check_eye(src) ))
src.reset_view(null)
// Handle power damage (oxy) // Handle power damage (oxy)
if(aiRestorePowerRoutine != 0 && !APU_power) if(aiRestorePowerRoutine != 0 && !APU_power)