Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions code/game/turfs/open/floor/plating/catwalk_plating.dm
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
baseturfs = /turf/open/floor/plating
floor_tile = /obj/item/stack/tile/catwalk_tile
layer = CATWALK_LAYER
plane = FLOOR_PLANE
footstep = FOOTSTEP_CATWALK
overfloor_placed = TRUE
underfloor_accessibility = UNDERFLOOR_VISIBLE
Expand All @@ -27,7 +26,7 @@
var/mutable_appearance/plating_underlay = mutable_appearance(icon, "[catwalk_type]_below", TURF_LAYER)
catwalk_underlays[catwalk_type] = plating_underlay
underlays += catwalk_underlays[catwalk_type]
update_icon()
update_appearance()

/turf/open/floor/catwalk_floor/examine(mob/user)
. = ..()
Expand All @@ -44,16 +43,16 @@
if(!covered)
underfloor_accessibility = UNDERFLOOR_INTERACTABLE
layer = TURF_LAYER
plane = FLOOR_PLANE
icon_state = "[catwalk_type]_below"
else
underfloor_accessibility = UNDERFLOOR_VISIBLE
layer = CATWALK_LAYER
plane = FLOOR_PLANE //for some reason these are black
icon_state = "[catwalk_type]_above"

levelupdate()
user.balloon_alert(user, "[!covered ? "cover removed" : "cover added"]")
tool.play_tool_sound(src)
update_icon()
update_appearance()

/turf/open/floor/catwalk_floor/crowbar_act(mob/user, obj/item/crowbar)
if(covered)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/antagonists/abductor/machinery/camera.dm
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
eyeobj.visible_icon = TRUE
eyeobj.icon = 'icons/mob/cameramob.dmi'
eyeobj.icon_state = "abductor_camera"
eyeobj.invisibility = INVISIBILITY_OBSERVER
eyeobj.SetInvisibility(INVISIBILITY_OBSERVER)

/obj/machinery/computer/camera_advanced/abductor/GrantActions(mob/living/carbon/user)
..()
Expand Down
2 changes: 0 additions & 2 deletions code/modules/atmospherics/machinery/atmosmachinery.dm
Original file line number Diff line number Diff line change
Expand Up @@ -345,8 +345,6 @@ GLOBAL_LIST_EMPTY(pipeimages)
add_atom_colour(obj_color, FIXED_COLOUR_PRIORITY)
pipe_color = obj_color
set_piping_layer(set_layer)
//var/turf/T = get_turf(src)
AddElement(/datum/element/undertile, TRAIT_T_RAY_VISIBLE)
atmos_init()
var/list/nodes = pipeline_expansion()
for(var/obj/machinery/atmospherics/A in nodes)
Expand Down
1 change: 1 addition & 0 deletions code/modules/mining/aux_base_camera.dm
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@
return FALSE
eyeobj = new /mob/camera/ai_eye/remote/base_construction(get_turf(spawn_spot))
eyeobj.origin = src
return TRUE


/obj/machinery/computer/camera_advanced/base_construction/attackby(obj/item/W, mob/user, params)
Expand Down
5 changes: 5 additions & 0 deletions code/modules/mob/living/silicon/ai/freelook/eye.dm
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,11 @@
update_appearance()
update_ai_detect_hud()
setLoc(loc, TRUE)

//Yog: make all remote camera eyes visible to ghosts
//"It's probably fine."
//-Cowbot93
SetInvisibility(INVISIBILITY_OBSERVER)

/mob/camera/ai_eye/on_changed_z_level(turf/old_turf, turf/new_turf, same_z_layer, notify_contents)
. = ..()
Expand Down
10 changes: 9 additions & 1 deletion code/modules/research/xenobiology/xenobio_camera.dm
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,17 @@

/mob/camera/ai_eye/remote/xenobio/setLoc(turf/destination, force_update = FALSE)
var/area/new_area = get_area(destination)

if(new_area && new_area.name == allowed_area || new_area && new_area.xenobiology_compatible)
return ..()
else

/mob/camera/ai_eye/remote/xenobio/can_z_move(direction, turf/start, turf/destination, z_move_flags = NONE, mob/living/rider)
. = ..()
if(!.)
return
var/area/new_area = get_area(.)
if(new_area.name != allowed_area && !new_area.xenobiology_compatible)
return FALSE

/obj/machinery/computer/camera_advanced/xenobio
name = "Slime management console"
Expand Down Expand Up @@ -67,6 +74,7 @@
return ..()

/obj/machinery/computer/camera_advanced/xenobio/CreateEye()
. = ..()
eyeobj = new /mob/camera/ai_eye/remote/xenobio(get_turf(src))
eyeobj.origin = src
eyeobj.visible_icon = TRUE
Expand Down
Binary file modified icons/mob/cameramob.dmi
Binary file not shown.