cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-22 05:17:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	.travis.yml
	code/game/atoms.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/monkey/life.dm
	code/modules/mob/living/silicon/silicon.dm
This commit is contained in:
PsiOmegaDelta
2015-06-30 08:24:43 +02:00
parent 3a391250a2 cdd1059e93
commit cf10dc38b1
21 changed files with 850 additions and 898 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/spy_bug.dm
+1 -1
View File
@@ -143,7 +143,7 @@
c_tag = name
/obj/machinery/camera/spy/check_eye(var/mob/user as mob)
return 1
return 0
/obj/item/device/radio/spy
listening = 0