From f043c8e42e308e6525517dcf8ab5aedebaa5258b Mon Sep 17 00:00:00 2001 From: Andrew Date: Tue, 17 Mar 2020 14:46:04 -0500 Subject: [PATCH] Helmet Camera Verb No Longer Shows Without Helmet Camera (#6856) Changes the toggle helmet camera verb to a proc Adds a check in the initialization of spacesuit helmets to see if it has a camera network. Removes said check from the proc itself. Basically this means you won't get the toggle-camera verb if you don't have one on your helmet. --- .../modules/clothing/spacesuits/spacesuits.dm | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/code/modules/clothing/spacesuits/spacesuits.dm b/code/modules/clothing/spacesuits/spacesuits.dm index deb1dc53a2..c811cdaee9 100644 --- a/code/modules/clothing/spacesuits/spacesuits.dm +++ b/code/modules/clothing/spacesuits/spacesuits.dm @@ -32,7 +32,12 @@ brightness_on = 4 on = 0 -/obj/item/clothing/head/helmet/space/verb/toggle_camera() +/obj/item/clothing/head/helmet/space/Initialize() + . = ..() + if(camera_networks) + verbs |= /obj/item/clothing/head/helmet/space/proc/toggle_camera + +/obj/item/clothing/head/helmet/space/proc/toggle_camera() set name = "Toggle Helmet Camera" set desc = "Turn your helmet's camera on or off." set category = "Hardsuit" @@ -40,23 +45,18 @@ if(usr.stat || usr.restrained() || usr.incapacitated()) return - if(camera_networks) - if(!camera) - camera = new /obj/machinery/camera(src) - camera.replace_networks(camera_networks) - camera.set_status(FALSE) //So the camera will activate in the following check. - - if(camera.status == TRUE) - camera.set_status(FALSE) - to_chat(usr, "Camera deactivated.") - else - camera.set_status(TRUE) - camera.c_tag = usr.name - to_chat(usr, "User scanned as [camera.c_tag]. Camera activated.") + if(!camera) + camera = new /obj/machinery/camera(src) + camera.replace_networks(camera_networks) + camera.set_status(FALSE) //So the camera will activate in the following check. + if(camera.status == TRUE) + camera.set_status(FALSE) + to_chat(usr, "Camera deactivated.") else - to_chat(usr, "This helmet does not have a built-in camera.") - return + camera.set_status(TRUE) + camera.c_tag = usr.name + to_chat(usr, "User scanned as [camera.c_tag]. Camera activated.") /obj/item/clothing/head/helmet/space/examine() ..()