cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-13 08:04:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	code/modules/mob/new_player/preferences_setup.dm
	code/setup.dm
This commit is contained in:
PsiOmega
2015-08-01 19:45:42 +02:00
parent 82152daa30 f8799035f4
commit f8d86900a5
29 changed files with 899 additions and 252 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/aicard.dm
+1
View File
@@ -110,6 +110,7 @@
ai.loc = src
ai.cancel_camera()
ai.destroy_eyeobj(src)
ai.control_disabled = 1
ai.aiRestorePowerRoutine = 0
carded_ai = ai