cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-21 12:02:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes borgs blowing up if they enter the recharger (or other objects) (#6403)

Browse Source 
Fixes #6400
This commit is contained in:
Werner
2019-05-08 14:04:12 +03:00
committed by Erki
parent 5b6ccd44ff
commit fdca0f5a01
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/silicon/robot/life.dm
+6 -5
View File
@@ -334,15 +334,16 @@
return canmove
/mob/living/silicon/robot/proc/process_level_restrictions()
//If they are on a player level -> abort
if (src.z in current_map.player_levels)
//Abort if they should not get blown
if (lockcharge || scrambledcodes || emagged)
return
//Check if they are on a player level -> abort
var/turf/T = get_turf(src)
if (!T || (T.z in current_map.player_levels))
return
//If they are on centcom -> abort
if (istype(get_area(src), /area/centcom) || istype(get_area(src), /area/shuttle/escape) || istype(get_area(src), /area/shuttle/arrival))
return
//Make sure they should not get blown
if (lockcharge || scrambledcodes || emagged)
return
self_destruct(TRUE)
/mob/living/silicon/robot/update_fire()