cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-25 05:51:56 +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/modules/mob/mob.dm
+1 -5
View File
@@ -480,12 +480,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"])