cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-24 05:23:22 +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/modules/mob/mob.dm
+1 -5
View File
@@ -496,12 +496,8 @@
/mob/verb/cancel_camera()
set name = "Cancel Camera View"
set category = "OOC"
reset_view(null)
unset_machine()
if(istype(src, /mob/living))
var/mob/living/M = src
if(M.cameraFollow)
M.cameraFollow = null
reset_view(null)
/mob/Topic(href, href_list)
if(href_list["mach_close"])