cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Helmet Camera Verb No Longer Shows Without Helmet Camera (#6856)

Browse Source 
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.
This commit is contained in:
Andrew
2020-03-17 14:46:04 -05:00
committed by VirgoBot
parent 03896fecf1
commit f043c8e42e
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
code/modules/clothing/spacesuits/spacesuits.dm
View File

@@ -32,7 +32,12 @@
brightness_on = 4 brightness_on = 4
on = 0 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 name = "Toggle Helmet Camera"
set desc = "Turn your helmet's camera on or off." set desc = "Turn your helmet's camera on or off."
set category = "Hardsuit" set category = "Hardsuit"
@@ -40,7 +45,6 @@
if(usr.stat || usr.restrained() || usr.incapacitated()) if(usr.stat || usr.restrained() || usr.incapacitated())
return return
if(camera_networks)
if(!camera) if(!camera)
camera = new /obj/machinery/camera(src) camera = new /obj/machinery/camera(src)
camera.replace_networks(camera_networks) camera.replace_networks(camera_networks)
@@ -54,10 +58,6 @@
camera.c_tag = usr.name camera.c_tag = usr.name
to_chat(usr, "<font color='blue'>User scanned as [camera.c_tag]. Camera activated.</font>") to_chat(usr, "<font color='blue'>User scanned as [camera.c_tag]. Camera activated.</font>")
else
to_chat(usr, "This helmet does not have a built-in camera.")
return
/obj/item/clothing/head/helmet/space/examine() /obj/item/clothing/head/helmet/space/examine()
..() ..()
if(camera_networks && get_dist(usr,src) <= 1) if(camera_networks && get_dist(usr,src) <= 1)