shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

here we go again (#2456)

Browse Source
This commit is contained in:
LetterJay
2017-08-24 19:24:25 -07:00
committed by kevinz000
parent c7ed043fd5
commit 188193eb61
1107 changed files with 25420 additions and 25417 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/camera/camera.dm
+9 -9
View File
@@ -122,14 +122,14 @@
var/msg2 = "<span class='notice'>[src] already has that upgrade!</span>"
// DECONSTRUCTION
if(istype(W, /obj/item/weapon/screwdriver))
if(istype(W, /obj/item/screwdriver))
panel_open = !panel_open
to_chat(user, "<span class='notice'>You screw the camera's panel [panel_open ? "open" : "closed"].</span>")
playsound(src.loc, W.usesound, 50, 1)
return
if(panel_open)
if(istype(W, /obj/item/weapon/wirecutters)) //enable/disable the camera
if(istype(W, /obj/item/wirecutters)) //enable/disable the camera
toggle_cam(user, 1)
obj_integrity = max_integrity //this is a pretty simplistic way to heal the camera, but there's no reason for this to be complex.
return
@@ -139,7 +139,7 @@
to_chat(user, "<span class='notice'>You [(view_range == initial(view_range)) ? "restore" : "mess up"] the camera's focus.</span>")
return
else if(istype(W, /obj/item/weapon/weldingtool))
else if(istype(W, /obj/item/weldingtool))
if(weld(W, user))
visible_message("<span class='warning'>[user] unwelds [src], leaving it as just a frame bolted to the wall.</span>", "<span class='warning'>You unweld [src], leaving it as just a frame bolted to the wall</span>")
deconstruct(TRUE)
@@ -176,14 +176,14 @@
return
// OTHER
if((istype(W, /obj/item/weapon/paper) || istype(W, /obj/item/device/pda)) && isliving(user))
if((istype(W, /obj/item/paper) || istype(W, /obj/item/device/pda)) && isliving(user))
var/mob/living/U = user
var/obj/item/weapon/paper/X = null
var/obj/item/paper/X = null
var/obj/item/device/pda/P = null
var/itemname = ""
var/info = ""
if(istype(W, /obj/item/weapon/paper))
if(istype(W, /obj/item/paper))
X = W
itemname = X.name
info = X.info
@@ -222,8 +222,8 @@
bug.bugged_cameras[src.c_tag] = src
return
else if(istype(W, /obj/item/weapon/pai_cable))
var/obj/item/weapon/pai_cable/cable = W
else if(istype(W, /obj/item/pai_cable))
var/obj/item/pai_cable/cable = W
cable.plugin(src, user)
return
@@ -346,7 +346,7 @@
return null
/obj/machinery/camera/proc/weld(obj/item/weapon/weldingtool/WT, mob/living/user)
/obj/machinery/camera/proc/weld(obj/item/weldingtool/WT, mob/living/user)
if(busy)
return FALSE
if(!WT.remove_fuel(0, user))
code/game/machinery/camera/camera_assembly.dm
+7 -7
View File
@@ -39,14 +39,14 @@
switch(state)
if(1)
// State 1
if(istype(W, /obj/item/weapon/weldingtool))
if(istype(W, /obj/item/weldingtool))
if(weld(W, user))
to_chat(user, "<span class='notice'>You weld the assembly securely into place.</span>")
anchored = TRUE
state = 2
return
else if(istype(W, /obj/item/weapon/wrench))
else if(istype(W, /obj/item/wrench))
playsound(src.loc, W.usesound, 50, 1)
to_chat(user, "<span class='notice'>You unattach the assembly from its place.</span>")
new /obj/item/wallframe/camera(get_turf(src))
@@ -65,7 +65,7 @@
return
return
else if(istype(W, /obj/item/weapon/weldingtool))
else if(istype(W, /obj/item/weldingtool))
if(weld(W, user))
to_chat(user, "<span class='notice'>You unweld the assembly from its place.</span>")
@@ -76,7 +76,7 @@
if(3)
// State 3
if(istype(W, /obj/item/weapon/screwdriver))
if(istype(W, /obj/item/screwdriver))
playsound(src.loc, W.usesound, 50, 1)
var/input = stripped_input(user, "Which networks would you like to connect this camera to? Separate networks with a comma. No Spaces!\nFor example: SS13,Security,Secret ", "Set Network", "SS13")
@@ -100,7 +100,7 @@
C.c_tag = "[A.name] ([rand(1, 999)])"
else if(istype(W, /obj/item/weapon/wirecutters))
else if(istype(W, /obj/item/wirecutters))
new/obj/item/stack/cable_coil(get_turf(src), 2)
playsound(src.loc, W.usesound, 50, 1)
to_chat(user, "<span class='notice'>You cut the wires from the circuits.</span>")
@@ -117,7 +117,7 @@
return
// Taking out upgrades
else if(istype(W, /obj/item/weapon/crowbar) && upgrades.len)
else if(istype(W, /obj/item/crowbar) && upgrades.len)
var/obj/U = locate(/obj) in upgrades
if(U)
to_chat(user, "<span class='notice'>You unattach an upgrade from the assembly.</span>")
@@ -128,7 +128,7 @@
return ..()
/obj/structure/camera_assembly/proc/weld(obj/item/weapon/weldingtool/WT, mob/living/user)
/obj/structure/camera_assembly/proc/weld(obj/item/weldingtool/WT, mob/living/user)
if(!WT.remove_fuel(0, user))
return 0
to_chat(user, "<span class='notice'>You start to weld \the [src]...</span>")