cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-20 03:26:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	.travis.yml
	code/modules/mob/living/carbon/brain/life.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/living_defines.dm
	code/modules/mob/living/silicon/silicon.dm
	code/setup.dm
This commit is contained in:
PsiOmegaDelta
2015-06-30 08:59:34 +02:00
parent 4a2d7b661e 194c786205
commit f420dd9f01
31 changed files with 1140 additions and 182 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