cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-29 08:11:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/dev' into span_class=notice

Browse Source 
Conflicts:
	code/game/antagonist/station/rogue_ai.dm
	code/game/gamemodes/malfunction/Malf_Modules.dm
	code/game/jobs/job_controller.dm
	code/game/verbs/ooc.dm
This commit is contained in:
GinjaNinja32
2015-05-29 21:55:37 +01:00
parent de4f085057 b6ddafb476
commit d09cd2fe57
58 changed files with 1773 additions and 875 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/_onclick/oldcode.dm
+1 -1
View File
@@ -122,7 +122,7 @@
if ((!( src in usr.contents ) && (((!( isturf(src) ) && (!( isturf(src.loc) ) && (src.loc && !( isturf(src.loc.loc) )))) || !( isturf(usr.loc) )) && (src.loc != usr.loc && (!( istype(src, /obj/screen) ) && !( usr.contents.Find(src.loc) ))))))
if (istype(usr, /mob/living/silicon/ai))
var/mob/living/silicon/ai/ai = usr
if (ai.control_disabled || ai.malfhacking)
if (ai.control_disabled)
return
else
return