Merge pull request #4030 from Fox-McCloud/advanced-camera-port

Ports Advanced Cameras
This commit is contained in:
TheDZD
2016-03-30 18:48:16 -04:00
15 changed files with 380 additions and 3 deletions
@@ -939,6 +939,9 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
src << "<span class='alert'>Your psy-connection grows too faint to maintain!</span>"
isRemoteObserve = 0
if(remote_view)
isRemoteObserve = 1
if(!isRemoteObserve && client && !client.adminobs)
remoteview_target = null
reset_view(null)
@@ -66,6 +66,12 @@
coretype = text2path("/obj/item/slime_extract/[sanitizedcolour]")
..()
/mob/living/carbon/slime/Destroy()
for(var/obj/machinery/computer/camera_advanced/xenobio/X in machines)
if(src in X.stored_slimes)
X.stored_slimes -= src
return ..()
/mob/living/carbon/slime/regenerate_icons()
icon_state = "[colour] [is_adult ? "adult" : "baby"] slime"
overlays.len = 0
+1 -1
View File
@@ -212,7 +212,7 @@
if (!( machine.check_eye(src) ))
reset_view(null)
else
if(!client.adminobs)
if(!remote_view && !client.adminobs)
reset_view(null)
/mob/living/proc/update_sight()
+2
View File
@@ -211,6 +211,8 @@
var/atom/movable/remote_control //Calls relaymove() to whatever it is
var/remote_view = 0 // Set to 1 to prevent view resets on Life
var/obj/control_object //Used by admins to possess objects. All mobs should have this var
var/datum/visibility_interface/visibility_interface = null // used by the visibility system to provide an interface for the visibility networks