cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-26 01:52:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bit of blob work.

Browse Source 
Moved the radio defines into the actual radio code files.
Fixed a few runtimes.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2229 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
mport2004@gmail.com
2011-09-19 10:06:55 +00:00
parent 451ebb2d75
commit 1fa2d19cfb
15 changed files with 274 additions and 285 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
code/modules/critters/hivebots/hivebot.dm
View File

@@ -73,16 +73,20 @@
if(!src.attack)
for(var/obj/critter/C in view(src.seekrange,src))
if(istype(C, /obj/critter) && !src.atkcritter) continue
if(istype(C, /obj/mecha) && !src.atkmech) continue
if(C.health <= 0) continue
if(istype(C, /obj/critter) && src.atkcritter)
if((istype(C, /obj/critter/hivebot) && !src.atksame) || (C == src)) continue
src.attack = 1
if(istype(C, /obj/mecha) && src.atkmech) src.attack = 1
if(src.attack)
T = C
break
for(var/obj/mecha/M in view(src.seekrange,src))
if(istype(M, /obj/mecha) && !src.atkmech) continue
if(M.health <= 0) continue
if(istype(M, /obj/mecha) && src.atkmech) src.attack = 1
if(src.attack)
T = M
break
if(src.attack)
src.target = T
src.oldtarget_name = T:name

8
code/modules/mob/living/silicon/robot/life.dm
View File

@@ -88,10 +88,10 @@
handle_regular_status_updates()
//Stop AI using us as a camera
src.camera.status = 1//bluh bluh ugly fix but it will work till this whole thing gets recoded
if(src.stat)
src.camera.status = 0
if(camera)
src.camera.status = 1//bluh bluh ugly fix but it will work till this whole thing gets recoded
if(src.stat)
src.camera.status = 0
health = 300 - (oxyloss + fireloss + bruteloss)