Skip to content

Commit

Permalink
Merge branch 'project/ares/cameras' into project/ares/tm_holder
Browse files Browse the repository at this point in the history
  • Loading branch information
realforest2001 committed May 27, 2024
2 parents a6aa56e + 11f250d commit 42b8fe0
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 0 deletions.
1 change: 1 addition & 0 deletions code/__DEFINES/objects.dm
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ GLOBAL_LIST_INIT(RESTRICTED_CAMERA_NETWORKS, list( //Those networks can only be
CAMERA_NET_LADDER,
CAMERA_NET_COLONY,
CAMERA_NET_OVERWATCH,
CAMERA_NET_ARES,
))

#define STASIS_IN_BAG 1
Expand Down
3 changes: 3 additions & 0 deletions code/game/camera_manager/camera_manager.dm
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,9 @@
else if(istype(current.loc, /obj/item/clothing/head/helmet/marine))
var/obj/item/clothing/head/helmet/marine/helmet = current.loc
cam_location = helmet.loc
else if(istype(current.loc, /obj/item/clothing/under/rank/synthetic/joe))
var/obj/item/clothing/under/rank/synthetic/joe/uniform = current.loc
cam_location = uniform.loc

// If we're not forcing an update for some reason and the cameras are in the same location,
// we don't need to update anything.
Expand Down
24 changes: 24 additions & 0 deletions code/modules/clothing/under/marine_uniform.dm
Original file line number Diff line number Diff line change
Expand Up @@ -998,6 +998,30 @@
desc = "A cheap uniform made for Synthetic labor. Tomorrow, Together."
icon_state = "working_joe"
worn_state = "working_joe"
var/obj/structure/machinery/camera/camera

/obj/item/clothing/under/rank/synthetic/joe/Initialize()
. = ..()
camera = new /obj/structure/machinery/camera/autoname/almayer/containment/ares(src)

/obj/item/clothing/under/rank/synthetic/joe/Destroy()
QDEL_NULL(camera)
return ..()

/obj/item/clothing/under/rank/synthetic/joe/equipped(mob/living/carbon/human/mob, slot)
if(camera)
camera.c_tag = mob.name
..()

/obj/item/clothing/under/rank/synthetic/joe/dropped(mob/living/carbon/human/mob)
if(camera)
camera.c_tag = "3RR0R"
..()

/obj/item/clothing/under/rank/synthetic/joe/get_examine_text(mob/user)
. = ..()
if(camera)
. += SPAN_ORANGE("There is a small camera mounted to the front.")

/obj/item/clothing/under/rank/synthetic/joe/engi
name = "\improper Working Joe Hazardous Uniform"
Expand Down

0 comments on commit 42b8fe0

Please sign in to comment.