diff --git a/code/game/machinery/camera/camera_assembly.dm b/code/game/machinery/camera/camera_assembly.dm
index 8baf02088bb..03ebe757789 100644
--- a/code/game/machinery/camera/camera_assembly.dm
+++ b/code/game/machinery/camera/camera_assembly.dm
@@ -1,25 +1,25 @@
+#define ASSEMBLY_UNBUILT 0 // Nothing done to it
+#define ASSEMBLY_WRENCHED 1 // Wrenched in place
+#define ASSEMBLY_WELDED 2 // Welded in place
+#define ASSEMBLY_WIRED 3 // Wires attached (Upgradable now)
+#define ASSEMBLY_BUILT 4 // Fully built (incl panel closed)
+
/obj/item/camera_assembly
name = "camera assembly"
desc = "A pre-fabricated security camera kit, ready to be assembled and mounted to a surface."
icon = 'icons/obj/monitors.dmi'
icon_state = "cameracase"
w_class = WEIGHT_CLASS_SMALL
- anchored = 0
+ anchored = FALSE
materials = list(MAT_METAL=400, MAT_GLASS=250)
max_integrity = 150
can_be_hit = TRUE
// Motion, EMP-Proof, X-Ray
var/list/obj/item/possible_upgrades = list(/obj/item/assembly/prox_sensor, /obj/item/stack/sheet/mineral/plasma, /obj/item/analyzer)
var/list/upgrades = list()
- var/state = 0
- var/busy = 0
- /*
- 0 = Nothing done to it
- 1 = Wrenched in place
- 2 = Welded in place
- 3 = Wires attached to it (you can now attach/dettach upgrades)
- 4 = Screwdriver panel closed and is fully built (you cannot attach upgrades)
- */
+ var/state = ASSEMBLY_UNBUILT
+ var/busy = FALSE
+
/obj/item/camera_assembly/Destroy()
QDEL_LIST(upgrades)
@@ -28,74 +28,72 @@
/obj/item/camera_assembly/attackby(obj/item/I, mob/living/user, params)
switch(state)
- if(0)
+ if(ASSEMBLY_UNBUILT)
// State 0
if(iswrench(I) && isturf(loc))
playsound(loc, I.usesound, 50, 1)
- to_chat(user, "You wrench the assembly into place.")
+ to_chat(user, "You wrench the assembly into place.")
anchored = 1
- state = 1
+ state = ASSEMBLY_WRENCHED
update_icon()
auto_turn()
return
- if(1)
+ if(ASSEMBLY_WRENCHED)
// State 1
if(iswelder(I))
if(weld(I, user))
- to_chat(user, "You weld the assembly securely into place.")
- anchored = 1
- state = 2
+ to_chat(user, "You weld the assembly securely into place.")
+ anchored = TRUE
+ state = ASSEMBLY_WELDED
return
else if(iswrench(I))
playsound(loc, I.usesound, 50, 1)
- to_chat(user, "You unattach the assembly from it's place.")
- anchored = 0
+ to_chat(user, "You unattach the assembly from it's place.")
+ anchored = FALSE
update_icon()
- state = 0
+ state = ASSEMBLY_UNBUILT
return
- if(2)
- // State 2
+ if(ASSEMBLY_WELDED)
if(iscoil(I))
var/obj/item/stack/cable_coil/C = I
if(C.use(2))
to_chat(user, "You add wires to the assembly.")
playsound(loc, I.usesound, 50, 1)
- state = 3
+ state = ASSEMBLY_WIRED
else
to_chat(user, "You need 2 coils of wire to wire the assembly.")
return
else if(iswelder(I))
if(weld(I, user))
- to_chat(user, "You unweld the assembly from it's place.")
- state = 1
- anchored = 1
+ to_chat(user, "You unweld the assembly from it's place.")
+ state = ASSEMBLY_WRENCHED
+ anchored = TRUE
return
- if(3)
- // State 3
+ if(ASSEMBLY_WIRED)
if(isscrewdriver(I))
playsound(loc, I.usesound, 50, 1)
var/input = strip_html(input(usr, "Which networks would you like to connect this camera to? Seperate networks with a comma. No Spaces!\nFor example: SS13,Security,Secret ", "Set Network", "SS13"))
if(!input)
- to_chat(usr, "No input found please hang up and try your call again.")
+ to_chat(usr, "No input found please hang up and try your call again.")
return
var/list/tempnetwork = splittext(input, ",")
if(tempnetwork.len < 1)
- to_chat(usr, "No network found please hang up and try your call again.")
+ to_chat(usr, "No network found please hang up and try your call again.")
return
var/area/camera_area = get_area(src)
var/temptag = "[sanitize(camera_area.name)] ([rand(1, 999)])"
input = strip_html(input(usr, "How would you like to name the camera?", "Set Camera Name", temptag))
- state = 4
+ state = ASSEMBLY_BUILT
var/obj/machinery/camera/C = new(loc)
loc = C
C.assembly = src
@@ -104,7 +102,7 @@
C.network = uniquelist(tempnetwork)
tempnetwork = difflist(C.network,restricted_camera_networks)
- if(!tempnetwork.len)//Camera isn't on any open network - remove its chunk from AI visibility.
+ if(!tempnetwork.len) // Camera isn't on any open network - remove its chunk from AI visibility.
cameranet.removeCamera(C)
C.c_tag = input
@@ -122,8 +120,8 @@
else if(iswirecutter(I))
new/obj/item/stack/cable_coil(get_turf(src), 2)
playsound(loc, I.usesound, 50, 1)
- to_chat(user, "You cut the wires from the circuits.")
- state = 2
+ to_chat(user, "You cut the wires from the circuits.")
+ state = ASSEMBLY_WELDED
return
// Upgrades!
@@ -131,7 +129,7 @@
if(!user.unEquip(I))
to_chat(user, "[I] is stuck!")
return
- to_chat(user, "You attach [I] into the assembly inner circuits.")
+ to_chat(user, "You attach [I] into the assembly inner circuits.")
upgrades += I
user.drop_item()
I.loc = src
@@ -141,7 +139,7 @@
else if(iscrowbar(I) && upgrades.len)
var/obj/U = locate(/obj) in upgrades
if(U)
- to_chat(user, "You unattach an upgrade from the assembly.")
+ to_chat(user, "You unattach an upgrade from the assembly.")
playsound(loc, I.usesound, 50, 1)
U.loc = get_turf(src)
upgrades -= U
@@ -161,23 +159,29 @@
..()
/obj/item/camera_assembly/proc/weld(obj/item/weldingtool/WT, mob/living/user)
-
if(busy)
- return 0
+ return FALSE
if(!WT.remove_fuel(0, user))
- return 0
+ return FALSE
- to_chat(user, "You start to weld the [src]..")
+ to_chat(user, "You start to weld the [src]...")
playsound(loc, WT.usesound, 50, 1)
- busy = 1
+ busy = TRUE
if(do_after(user, 20 * WT.toolspeed, target = src))
- busy = 0
+ busy = FALSE
if(!WT.isOn())
- return 0
- return 1
- busy = 0
- return 0
+ return FALSE
+ return TRUE
+ busy = FALSE
+ return FALSE
/obj/item/camera_assembly/deconstruct(disassembled = TRUE)
new /obj/item/stack/sheet/metal(loc)
- qdel(src)
\ No newline at end of file
+ qdel(src)
+
+
+#undef ASSEMBLY_UNBUILT
+#undef ASSEMBLY_WRENCHED
+#undef ASSEMBLY_WELDED
+#undef ASSEMBLY_WIRED
+#undef ASSEMBLY_BUILT