Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Project ARES: Working Joe uniform cameras. #6344

Merged
merged 3 commits into from
Jun 4, 2024
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
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
6 changes: 3 additions & 3 deletions code/game/camera_manager/camera_manager.dm
Original file line number Diff line number Diff line change
Expand Up @@ -188,9 +188,9 @@
var/cam_location = current
if(isliving(current.loc) || isVehicle(current.loc))
cam_location = current.loc
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))
var/obj/item/clothing/clothing = current.loc
cam_location = clothing.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
25 changes: 25 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,31 @@
desc = "A cheap uniform made for Synthetic labor. Tomorrow, Together."
icon_state = "working_joe"
worn_state = "working_joe"
flags_item = NO_CRYO_STORE
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"
harryob marked this conversation as resolved.
Show resolved Hide resolved
..()

/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
Loading