cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 04:02:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Part two of the objective system. Also fixed up AIs on the shuttle, bug #747, and interacting with windows.

Browse Source
This commit is contained in:
SkyMarshal
2012-03-25 00:33:38 -07:00
parent 09546b7fe0
commit a5a7df1c20
10 changed files with 176 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -106,7 +106,7 @@
src.see_in_dark = 0
src.see_invisible = 0
if (((!loc.master.power_equip) || istype(T, /turf/space)) && !istype(src.loc,/obj/item))
if (((!loc.master.power_equip) || istype(T, /turf/space)) && !istype(src.loc,/obj/item) && !istype(get_area(src), /area/shuttle))
if (src:aiRestorePowerRoutine==0)
src:aiRestorePowerRoutine = 1

2
code/modules/power/singularity/emitter.dm
View File

@@ -109,7 +109,7 @@
else // Any other
A.yo = -20
A.xo = 0
A.process()
A.fired()
attackby(obj/item/W, mob/user)